diff options
411 files changed, 6046 insertions, 1423 deletions
diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java index 9d363c806f5f..3af36ebb08ca 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -28,6 +28,7 @@ import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES; import static android.os.UserHandle.USER_CURRENT; import static android.os.UserHandle.USER_NULL; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_ID; import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_SIZE; import static com.android.server.blob.BlobStoreConfig.LOGV; @@ -1915,7 +1916,7 @@ public class BlobStoreManagerService extends SystemService { mStatsManager.setPullAtomCallback( FrameworkStatsLog.BLOB_INFO, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, mStatsCallbackImpl ); } diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java index eb1848d666f0..7e110eb741dd 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java @@ -16,6 +16,7 @@ package com.android.server.alarm; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__ALLOW_LIST; import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__CHANGE_DISABLED; import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__LISTENER; @@ -31,7 +32,6 @@ import android.app.StatsManager; import android.content.Context; import android.os.SystemClock; -import com.android.internal.os.BackgroundThread; import com.android.internal.util.FrameworkStatsLog; import java.util.function.Supplier; @@ -51,7 +51,7 @@ class MetricsHelper { void registerPuller(Supplier<AlarmStore> alarmStoreSupplier) { final StatsManager statsManager = mContext.getSystemService(StatsManager.class); statsManager.setPullAtomCallback(FrameworkStatsLog.PENDING_ALARM_INFO, null, - BackgroundThread.getExecutor(), (atomTag, data) -> { + DIRECT_EXECUTOR, (atomTag, data) -> { if (atomTag != FrameworkStatsLog.PENDING_ALARM_INFO) { throw new UnsupportedOperationException("Unknown tag" + atomTag); } diff --git a/core/api/test-current.txt b/core/api/test-current.txt index f53c0873c432..8a4b6afda161 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2151,6 +2151,7 @@ package android.net.wifi.sharedconnectivity.app { public class SharedConnectivityManager { method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String); + method @NonNull public android.content.BroadcastReceiver getBroadcastReceiver(); method @Nullable public android.content.ServiceConnection getServiceConnection(); method public void setService(@Nullable android.os.IInterface); } diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 2ae721648656..895dde760058 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1507,8 +1507,9 @@ public class ActivityOptions extends ComponentOptions { } /** @hide */ - public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) { + public ActivityOptions setRemoteTransition(@Nullable RemoteTransition remoteTransition) { mRemoteTransition = remoteTransition; + return this; } /** @hide */ diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl index d189bab85195..2c428efe4edb 100644 --- a/core/java/android/app/IActivityTaskManager.aidl +++ b/core/java/android/app/IActivityTaskManager.aidl @@ -236,6 +236,7 @@ interface IActivityTaskManager { * {@link android.view.WindowManagerPolicyConstants#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE} * etc. */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.CONTROL_KEYGUARD)") void keyguardGoingAway(int flags); void suppressResizeConfigChanges(boolean suppress); diff --git a/core/java/android/app/IUriGrantsManager.aidl b/core/java/android/app/IUriGrantsManager.aidl index 9e7f2fecfea0..b630d034dca9 100644 --- a/core/java/android/app/IUriGrantsManager.aidl +++ b/core/java/android/app/IUriGrantsManager.aidl @@ -39,4 +39,7 @@ interface IUriGrantsManager { void clearGrantedUriPermissions(in String packageName, int userId); ParceledListSlice getUriPermissions(in String packageName, boolean incoming, boolean persistedOnly); + + int checkGrantUriPermission_ignoreNonSystem( + int sourceUid, String targetPkg, in Uri uri, int modeFlags, int userId); } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index da5e40aedbd2..a1dd5a4b60ce 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11806,6 +11806,34 @@ public class DevicePolicyManager { } /** + * Returns the list of {@link EnforcingAdmin}s who have set this restriction. + * + * <p>Note that for {@link #POLICY_SUSPEND_PACKAGES} it returns the PO or DO to keep the + * behavior the same as before the bug fix for b/192245204. + * + * <p>This API is only callable by the system UID + * + * @param userId The user for whom to retrieve the information. + * @param restriction The restriction enforced by admins. It could be any user restriction or + * policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA} and + * {@link DevicePolicyManager#POLICY_DISABLE_SCREEN_CAPTURE}. + * + * @hide + */ + public @NonNull Set<EnforcingAdmin> getEnforcingAdminsForRestriction(int userId, + @NonNull String restriction) { + if (mService != null) { + try { + return new HashSet<>(mService.getEnforcingAdminsForRestriction( + userId, restriction)); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return null; + } + + /** * Hide or unhide packages. When a package is hidden it is unavailable for use, but the data and * actual package file remain. This function can be called by a device owner, profile owner, or * by a delegate given the {@link #DELEGATION_PACKAGE_ACCESS} scope via diff --git a/core/java/android/app/admin/EnforcingAdmin.aidl b/core/java/android/app/admin/EnforcingAdmin.aidl new file mode 100644 index 000000000000..bfbfdbeaf9aa --- /dev/null +++ b/core/java/android/app/admin/EnforcingAdmin.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.app.admin; + +parcelable EnforcingAdmin;
\ No newline at end of file diff --git a/core/java/android/app/admin/EnforcingAdmin.java b/core/java/android/app/admin/EnforcingAdmin.java index 771794dbe0fb..7c718f6651a2 100644 --- a/core/java/android/app/admin/EnforcingAdmin.java +++ b/core/java/android/app/admin/EnforcingAdmin.java @@ -19,6 +19,7 @@ package android.app.admin; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -38,6 +39,11 @@ public final class EnforcingAdmin implements Parcelable { private final UserHandle mUserHandle; /** + * @hide + */ + private final ComponentName mComponentName; + + /** * Creates an enforcing admin with the given params. */ public EnforcingAdmin( @@ -46,6 +52,21 @@ public final class EnforcingAdmin implements Parcelable { mPackageName = Objects.requireNonNull(packageName); mAuthority = Objects.requireNonNull(authority); mUserHandle = Objects.requireNonNull(userHandle); + mComponentName = null; + } + + /** + * Creates an enforcing admin with the given params. + * + * @hide + */ + public EnforcingAdmin( + @NonNull String packageName, @NonNull Authority authority, + @NonNull UserHandle userHandle, @Nullable ComponentName componentName) { + mPackageName = Objects.requireNonNull(packageName); + mAuthority = Objects.requireNonNull(authority); + mUserHandle = Objects.requireNonNull(userHandle); + mComponentName = componentName; } private EnforcingAdmin(Parcel source) { @@ -53,6 +74,7 @@ public final class EnforcingAdmin implements Parcelable { mUserHandle = new UserHandle(source.readInt()); mAuthority = Objects.requireNonNull( source.readParcelable(Authority.class.getClassLoader())); + mComponentName = source.readParcelable(ComponentName.class.getClassLoader()); } /** @@ -86,7 +108,8 @@ public final class EnforcingAdmin implements Parcelable { EnforcingAdmin other = (EnforcingAdmin) o; return Objects.equals(mPackageName, other.mPackageName) && Objects.equals(mAuthority, other.mAuthority) - && Objects.equals(mUserHandle, other.mUserHandle); + && Objects.equals(mUserHandle, other.mUserHandle) + && Objects.equals(mComponentName, other.mComponentName); } @Override @@ -97,7 +120,7 @@ public final class EnforcingAdmin implements Parcelable { @Override public String toString() { return "EnforcingAdmin { mPackageName= " + mPackageName + ", mAuthority= " + mAuthority - + ", mUserHandle= " + mUserHandle + " }"; + + ", mUserHandle= " + mUserHandle + ", mComponentName= " + mComponentName + " }"; } @Override @@ -110,6 +133,7 @@ public final class EnforcingAdmin implements Parcelable { dest.writeString(mPackageName); dest.writeInt(mUserHandle.getIdentifier()); dest.writeParcelable(mAuthority, flags); + dest.writeParcelable(mComponentName, flags); } @NonNull diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 003e804831a4..beb452cf2cfa 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -54,6 +54,7 @@ import android.security.keystore.ParcelableKeyGenParameterSpec; import android.telephony.data.ApnSetting; import com.android.internal.infra.AndroidFuture; import android.app.admin.DevicePolicyState; +import android.app.admin.EnforcingAdmin; import java.util.List; @@ -274,6 +275,7 @@ interface IDevicePolicyManager { Intent createAdminSupportIntent(in String restriction); Bundle getEnforcingAdminAndUserDetails(int userId,String restriction); + List<EnforcingAdmin> getEnforcingAdminsForRestriction(int userId,String restriction); boolean setApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName, boolean hidden, boolean parent); boolean isApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName, boolean parent); diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index b7ec7b55d7db..d66fca8945f1 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -22,6 +22,7 @@ import android.os.PooledStringWriter; import android.os.RemoteException; import android.os.SystemClock; import android.service.autofill.FillRequest; +import android.text.Spanned; import android.text.TextUtils; import android.util.Log; import android.util.Pair; @@ -1557,6 +1558,10 @@ public class AssistStructure implements Parcelable { /** * Returns any text associated with the node that is displayed to the user, or null * if there is none. + * + * <p> The text will be stripped of any spans that could potentially contain reference to + * the activity context, to avoid memory leak. If the text contained a span, a plain + * string version of the text will be returned. */ @Nullable public CharSequence getText() { @@ -1996,14 +2001,16 @@ public class AssistStructure implements Parcelable { @Override public void setText(CharSequence text) { ViewNodeText t = getNodeText(); - t.mText = TextUtils.trimNoCopySpans(text); + // Strip spans from the text to avoid memory leak + t.mText = TextUtils.trimToParcelableSize(stripAllSpansFromText(text)); t.mTextSelectionStart = t.mTextSelectionEnd = -1; } @Override public void setText(CharSequence text, int selectionStart, int selectionEnd) { ViewNodeText t = getNodeText(); - t.mText = TextUtils.trimNoCopySpans(text); + // Strip spans from the text to avoid memory leak + t.mText = stripAllSpansFromText(text); t.mTextSelectionStart = selectionStart; t.mTextSelectionEnd = selectionEnd; } @@ -2222,6 +2229,13 @@ public class AssistStructure implements Parcelable { public void setHtmlInfo(@NonNull HtmlInfo htmlInfo) { mNode.mHtmlInfo = htmlInfo; } + + private CharSequence stripAllSpansFromText(CharSequence text) { + if (text instanceof Spanned) { + return text.toString(); + } + return text; + } } private static final class HtmlInfoNode extends HtmlInfo implements Parcelable { diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index 4dea4a7e3aca..b17dfa62004f 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -36,6 +36,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; +import android.companion.datatransfer.PermissionSyncRequest; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -177,7 +178,7 @@ public final class CompanionDeviceManager { public @interface DataSyncTypes {} /** - * Used by {@link #enableSystemDataSync(int, int)}}. + * Used by {@link #enableSystemDataSyncForTypes(int, int)}}. * Sync call metadata like muting, ending and silencing a call. * */ @@ -529,6 +530,39 @@ public final class CompanionDeviceManager { } /** + * @hide + */ + public void enablePermissionsSync(int associationId) { + try { + mService.enablePermissionsSync(associationId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * @hide + */ + public void disablePermissionsSync(int associationId) { + try { + mService.disablePermissionsSync(associationId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * @hide + */ + public PermissionSyncRequest getPermissionSyncRequest(int associationId) { + try { + return mService.getPermissionSyncRequest(associationId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * <p>Calling this API requires a uses-feature * {@link PackageManager#FEATURE_COMPANION_DEVICE_SETUP} declaration in the manifest</p> * diff --git a/core/java/android/companion/ICompanionDeviceManager.aidl b/core/java/android/companion/ICompanionDeviceManager.aidl index b5e2670e5299..4d05a286848f 100644 --- a/core/java/android/companion/ICompanionDeviceManager.aidl +++ b/core/java/android/companion/ICompanionDeviceManager.aidl @@ -24,6 +24,7 @@ import android.companion.IOnTransportsChangedListener; import android.companion.ISystemDataTransferCallback; import android.companion.AssociationInfo; import android.companion.AssociationRequest; +import android.companion.datatransfer.PermissionSyncRequest; import android.content.ComponentName; /** @@ -101,5 +102,11 @@ interface ICompanionDeviceManager { void disableSystemDataSync(int associationId, int flags); + void enablePermissionsSync(int associationId); + + void disablePermissionsSync(int associationId); + + PermissionSyncRequest getPermissionSyncRequest(int associationId); + void enableSecureTransport(boolean enabled); } diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index be8b2a20cfb1..65f56f68ed3f 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -486,7 +486,7 @@ public class ServiceInfo extends ComponentInfo * Here is an example: * <pre> * <uses-permission - * android:name="android.permissions.FOREGROUND_SERVICE_SPECIAL_USE" + * android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" * /> * <service * android:name=".MySpecialForegroundService" @@ -506,7 +506,7 @@ public class ServiceInfo extends ComponentInfo * in both platforms. * <pre> * <uses-permission - * android:name="android.permissions.FOREGROUND_SERVICE_SPECIAL_USE" + * android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" * android:maxSdkVersion="last_sdk_version_without_type_foo" * /> * <service diff --git a/core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl b/core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl index addd622eef35..17cd18cc4182 100644 --- a/core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl +++ b/core/java/android/hardware/biometrics/IBiometricAuthenticator.aidl @@ -48,7 +48,8 @@ interface IBiometricAuthenticator { // startPreparedClient(). void prepareForAuthentication(boolean requireConfirmation, IBinder token, long operationId, int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName, - long requestId, int cookie, boolean allowBackgroundAuthentication); + long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager); // Starts authentication with the previously prepared client. void startPreparedClient(int cookie); diff --git a/core/java/android/hardware/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl index e2840ec20ff9..0100660669e9 100644 --- a/core/java/android/hardware/fingerprint/IFingerprintService.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl @@ -74,7 +74,8 @@ interface IFingerprintService { @EnforcePermission("MANAGE_BIOMETRIC") void prepareForAuthentication(IBinder token, long operationId, IBiometricSensorReceiver sensorReceiver, in FingerprintAuthenticateOptions options, long requestId, - int cookie, boolean allowBackgroundAuthentication); + int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager); // Starts authentication with the previously prepared client. @EnforcePermission("MANAGE_BIOMETRIC") diff --git a/core/java/android/hardware/usb/DisplayPortAltModeInfo.java b/core/java/android/hardware/usb/DisplayPortAltModeInfo.java index 9da2f4c12977..36c4a2ac09e4 100644 --- a/core/java/android/hardware/usb/DisplayPortAltModeInfo.java +++ b/core/java/android/hardware/usb/DisplayPortAltModeInfo.java @@ -200,19 +200,43 @@ public final class DisplayPortAltModeInfo implements Parcelable { dest.writeInt(mLinkTrainingStatus); } + private String displayPortAltModeStatusToString(@DisplayPortAltModeStatus int status) { + switch (status) { + case DISPLAYPORT_ALT_MODE_STATUS_NOT_CAPABLE: + return "not capable"; + case DISPLAYPORT_ALT_MODE_STATUS_CAPABLE_DISABLED: + return "capable disabled"; + case DISPLAYPORT_ALT_MODE_STATUS_ENABLED: + return "enabled"; + default: + return "unknown"; + } + } + + private String linkTrainingStatusToString(@LinkTrainingStatus int status) { + switch (status) { + case LINK_TRAINING_STATUS_SUCCESS: + return "success"; + case LINK_TRAINING_STATUS_FAILURE: + return "failure"; + default: + return "unknown"; + } + } + @NonNull @Override public String toString() { return "DisplayPortAltModeInfo{partnerSink=" - + mPartnerSinkStatus - + " cable=" - + mCableStatus - + " numLanes=" + + displayPortAltModeStatusToString(mPartnerSinkStatus) + + ", cable=" + + displayPortAltModeStatusToString(mCableStatus) + + ", numLanes=" + mNumLanes - + " hotPlugDetect=" + + ", hotPlugDetect=" + mHotPlugDetect - + " linkTrainingStatus=" - + mLinkTrainingStatus + + ", linkTrainingStatus=" + + linkTrainingStatusToString(mLinkTrainingStatus) + "}"; } diff --git a/core/java/android/inputmethodservice/InkWindow.java b/core/java/android/inputmethodservice/InkWindow.java index 24d1c9577f82..1b8d925ec1cd 100644 --- a/core/java/android/inputmethodservice/InkWindow.java +++ b/core/java/android/inputmethodservice/InkWindow.java @@ -104,7 +104,11 @@ final class InkWindow extends PhoneWindow { */ void hide(boolean remove) { if (getDecorView() != null) { - getDecorView().setVisibility(remove ? View.GONE : View.INVISIBLE); + if (remove) { + mWindowManager.removeViewImmediate(getDecorView()); + } else { + getDecorView().setVisibility(View.INVISIBLE); + } } } diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 2bad670617b9..143983ad5d11 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1655,6 +1655,8 @@ public abstract class BatteryStats { public abstract long[] getCpuFreqs(); public final static class HistoryTag { + public static final int HISTORY_TAG_POOL_OVERFLOW = -1; + public String string; public int uid; @@ -6786,10 +6788,11 @@ public abstract class BatteryStats { if (bd.mask == HistoryItem.STATE_WAKE_LOCK_FLAG && wakelockTag != null) { didWake = true; sb.append("="); - if (longNames) { + if (longNames + || wakelockTag.poolIdx == HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { UserHandle.formatUid(sb, wakelockTag.uid); sb.append(":\""); - sb.append(wakelockTag.string); + sb.append(wakelockTag.string.replace("\"", "\"\"")); sb.append("\""); } else { sb.append(wakelockTag.poolIdx); @@ -6809,7 +6812,7 @@ public abstract class BatteryStats { } if (!didWake && wakelockTag != null) { sb.append(longNames ? " wake_lock=" : ",w="); - if (longNames) { + if (longNames || wakelockTag.poolIdx == HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { UserHandle.formatUid(sb, wakelockTag.uid); sb.append(":\""); sb.append(wakelockTag.string); @@ -7070,7 +7073,14 @@ public abstract class BatteryStats { if (rec.wakeReasonTag != null) { if (checkin) { item.append(",wr="); - item.append(rec.wakeReasonTag.poolIdx); + if (rec.wakeReasonTag.poolIdx == HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { + item.append(sUidToString.applyAsString(rec.wakeReasonTag.uid)); + item.append(":\""); + item.append(rec.wakeReasonTag.string.replace("\"", "\"\"")); + item.append("\""); + } else { + item.append(rec.wakeReasonTag.poolIdx); + } } else { item.append(" wake_reason="); item.append(rec.wakeReasonTag.uid); @@ -7098,7 +7108,15 @@ public abstract class BatteryStats { } item.append("="); if (checkin) { - item.append(rec.eventTag.poolIdx); + if (rec.eventTag.poolIdx == HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { + item.append(HISTORY_EVENT_INT_FORMATTERS[idx] + .applyAsString(rec.eventTag.uid)); + item.append(":\""); + item.append(rec.eventTag.string.replace("\"", "\"\"")); + item.append("\""); + } else { + item.append(rec.eventTag.poolIdx); + } } else { item.append(HISTORY_EVENT_INT_FORMATTERS[idx] .applyAsString(rec.eventTag.uid)); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0b486c00c2da..a55183c0f7c5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10505,6 +10505,14 @@ public final class Settings { "search_press_hold_nav_handle_enabled"; /** + * Whether long-pressing on the home button can trigger search. + * + * @hide + */ + public static final String SEARCH_LONG_PRESS_HOME_ENABLED = + "search_long_press_home_enabled"; + + /** * Control whether Trust Agents are in active unlock or extend unlock mode. * @hide */ diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java index de2a99bfac44..75ec028b85db 100644 --- a/core/java/android/service/voice/VoiceInteractionService.java +++ b/core/java/android/service/voice/VoiceInteractionService.java @@ -46,6 +46,7 @@ import android.os.PersistableBundle; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SharedMemory; +import android.os.SystemProperties; import android.provider.Settings; import android.util.ArraySet; import android.util.Log; @@ -131,6 +132,9 @@ public class VoiceInteractionService extends Service { @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) static final long MULTIPLE_ACTIVE_HOTWORD_DETECTORS = 193232191L; + private static final boolean SYSPROP_VISUAL_QUERY_SERVICE_ENABLED = + SystemProperties.getBoolean("ro.hotword.visual_query_service_enabled", false); + IVoiceInteractionService mInterface = new IVoiceInteractionService.Stub() { @Override public void ready() { @@ -947,6 +951,10 @@ public class VoiceInteractionService extends Service { Objects.requireNonNull(executor); Objects.requireNonNull(callback); + if (!SYSPROP_VISUAL_QUERY_SERVICE_ENABLED) { + throw new IllegalStateException("VisualQueryDetectionService is not enabled on this " + + "system. Please set ro.hotword.visual_query_service_enabled to true."); + } if (mSystemService == null) { throw new IllegalStateException("Not available until onReady() is called"); } diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java index 297754f7a5fd..dfade0167e22 100644 --- a/core/java/android/view/HandwritingInitiator.java +++ b/core/java/android/view/HandwritingInitiator.java @@ -24,6 +24,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; import android.widget.TextView; import com.android.internal.annotations.VisibleForTesting; @@ -81,6 +82,8 @@ public class HandwritingInitiator { private int mConnectionCount = 0; private final InputMethodManager mImm; + private final int[] mTempLocation = new int[2]; + private final Rect mTempRect = new Rect(); private final RectF mTempRectF = new RectF(); @@ -429,7 +432,19 @@ public class HandwritingInitiator { return null; } - private static void requestFocusWithoutReveal(View view) { + private void requestFocusWithoutReveal(View view) { + if (view instanceof EditText editText && !mState.mStylusDownWithinEditorBounds) { + // If the stylus down point was inside the EditText's bounds, then the EditText will + // automatically set its cursor position nearest to the stylus down point when it + // gains focus. If the stylus down point was outside the EditText's bounds (within + // the extended handwriting bounds), then we must calculate and set the cursor + // position manually. + view.getLocationInWindow(mTempLocation); + int offset = editText.getOffsetForPosition( + mState.mStylusDownX - mTempLocation[0], + mState.mStylusDownY - mTempLocation[1]); + editText.setSelection(offset); + } if (view.getRevealOnFocusHint()) { view.setRevealOnFocusHint(false); view.requestFocus(); @@ -457,6 +472,10 @@ public class HandwritingInitiator { if (getViewHandwritingArea(connectedView, handwritingArea) && isInHandwritingArea(handwritingArea, x, y, connectedView, isHover) && shouldTriggerStylusHandwritingForView(connectedView)) { + if (!isHover && mState != null) { + mState.mStylusDownWithinEditorBounds = + contains(handwritingArea, x, y, 0f, 0f, 0f, 0f); + } return connectedView; } } @@ -475,7 +494,12 @@ public class HandwritingInitiator { } final float distance = distance(handwritingArea, x, y); - if (distance == 0f) return view; + if (distance == 0f) { + if (!isHover && mState != null) { + mState.mStylusDownWithinEditorBounds = true; + } + return view; + } if (distance < minDistance) { minDistance = distance; bestCandidate = view; @@ -658,6 +682,12 @@ public class HandwritingInitiator { private boolean mExceedHandwritingSlop; /** + * Whether the stylus down point of the MotionEvent sequence was within the editor's bounds + * (not including the extended handwriting bounds). + */ + private boolean mStylusDownWithinEditorBounds; + + /** * A view which has requested focus and is pending input connection creation. When an input * connection is created for the view, a handwriting session should be started for the view. */ diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 7bdff8c5b858..c43962d5900c 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -7397,19 +7397,26 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } target = next; } - if (!childIsHit) { + if (!childIsHit && mFirstHoverTarget != null) { target = mFirstHoverTarget; + final ArrayList<View> preorderedList = buildTouchDispatchChildList(); while (notEmpty && target != null) { final HoverTarget next = target.next; final View hoveredView = target.child; - rect.set(hoveredView.mLeft, hoveredView.mTop, hoveredView.mRight, - hoveredView.mBottom); - matrix.mapRect(rect); - notEmpty = region.op(Math.round(rect.left), Math.round(rect.top), - Math.round(rect.right), Math.round(rect.bottom), Region.Op.DIFFERENCE); + if (!isOnTop(child, hoveredView, preorderedList)) { + rect.set(hoveredView.mLeft, hoveredView.mTop, hoveredView.mRight, + hoveredView.mBottom); + matrix.mapRect(rect); + notEmpty = region.op(Math.round(rect.left), Math.round(rect.top), + Math.round(rect.right), Math.round(rect.bottom), + Region.Op.DIFFERENCE); + } target = next; } + if (preorderedList != null) { + preorderedList.clear(); + } } } else { TouchTarget target = mFirstTouchTarget; @@ -7422,19 +7429,26 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } target = next; } - if (!childIsHit) { + if (!childIsHit && mFirstTouchTarget != null) { target = mFirstTouchTarget; + final ArrayList<View> preorderedList = buildOrderedChildList(); while (notEmpty && target != null) { final TouchTarget next = target.next; final View touchedView = target.child; - rect.set(touchedView.mLeft, touchedView.mTop, touchedView.mRight, - touchedView.mBottom); - matrix.mapRect(rect); - notEmpty = region.op(Math.round(rect.left), Math.round(rect.top), - Math.round(rect.right), Math.round(rect.bottom), Region.Op.DIFFERENCE); + if (!isOnTop(child, touchedView, preorderedList)) { + rect.set(touchedView.mLeft, touchedView.mTop, touchedView.mRight, + touchedView.mBottom); + matrix.mapRect(rect); + notEmpty = region.op(Math.round(rect.left), Math.round(rect.top), + Math.round(rect.right), Math.round(rect.bottom), + Region.Op.DIFFERENCE); + } target = next; } + if (preorderedList != null) { + preorderedList.clear(); + } } } @@ -7444,6 +7458,28 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager return notEmpty; } + /** + * Return true if the given {@code view} is drawn on top of the {@code otherView}. + * Both the {@code view} and {@code otherView} must be children of this ViewGroup. + * Otherwise, the returned value is meaningless. + */ + private boolean isOnTop(View view, View otherView, ArrayList<View> preorderedList) { + final int childrenCount = mChildrenCount; + final boolean customOrder = preorderedList == null && isChildrenDrawingOrderEnabled(); + final View[] children = mChildren; + for (int i = childrenCount - 1; i >= 0; i--) { + final int childIndex = getAndVerifyPreorderedIndex(childrenCount, i, customOrder); + final View child = getAndVerifyPreorderedView(preorderedList, children, childIndex); + if (child == view) { + return true; + } + if (child == otherView) { + return false; + } + } + // Can't find the view and otherView in the children list. Return value is meaningless. + return false; + } private static void applyOpToRegionByBounds(Region region, View view, Region.Op op) { final int[] locationInWindow = new int[2]; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d680d0432f25..cd2d36c60ade 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -434,15 +434,15 @@ public final class ViewRootImpl implements ViewParent, /** * Called when the typing hint is changed. This would be invoked by the * {@link android.view.inputmethod.RemoteInputConnectionImpl} - * to hint if the user is typing when the it is {@link #isActive() active}. + * to hint if the user is typing when it is {@link #isActive() active}. * - * This can be only happened on the UI thread. The behavior won't be guaranteed if - * invoking this on a non-UI thread. + * The operation in this method should be dispatched to the UI thread to + * keep the sequence. * * @param isTyping {@code true} if the user is typing. + * @param deactivate {code true} if the input connection deactivate */ - @UiThread - void onTypingHintChanged(boolean isTyping); + void onTypingHintChanged(boolean isTyping, boolean deactivate); /** * Indicates whether the notifier is currently in active state or not. @@ -468,19 +468,40 @@ public final class ViewRootImpl implements ViewParent, @NonNull private final ViewRootRefreshRateController mController; + @NonNull + private final Handler mHandler; + + @NonNull + private final Thread mThread; + TypingHintNotifierImpl(@NonNull AtomicReference<TypingHintNotifier> notifier, - @NonNull ViewRootRefreshRateController controller) { + @NonNull ViewRootRefreshRateController controller, @NonNull Handler handler, + @NonNull Thread thread) { mController = controller; mActiveNotifier = notifier; + mHandler = handler; + mThread = thread; } @Override - public void onTypingHintChanged(boolean isTyping) { - if (!isActive()) { - // No-op when the listener was deactivated. - return; + public void onTypingHintChanged(boolean isTyping, boolean deactivate) { + final Runnable runnable = () -> { + if (!isActive()) { + // No-op when the listener was deactivated. + return; + } + mController.updateRefreshRatePreference(isTyping ? LOWER : RESTORE); + if (deactivate) { + deactivate(); + } + }; + + if (Thread.currentThread() == mThread) { + // Run directly if it's on the UiThread. + runnable.run(); + } else { + mHandler.post(runnable); } - mController.updateRefreshRatePreference(isTyping ? LOWER : RESTORE); } @Override @@ -521,7 +542,7 @@ public final class ViewRootImpl implements ViewParent, return null; } final TypingHintNotifier newNotifier = new TypingHintNotifierImpl(mActiveTypingHintNotifier, - mRefreshRateController); + mRefreshRateController, mHandler, mThread); mActiveTypingHintNotifier.set(newNotifier); return newNotifier; @@ -566,6 +587,9 @@ public final class ViewRootImpl implements ViewParent, @NonNull Display mDisplay; final String mBasePackageName; + // If we would like to keep a particular eye on the corresponding package. + final boolean mExtraDisplayListenerLogging; + final int[] mTmpLocation = new int[2]; final TypedValue mTmpValue = new TypedValue(); @@ -1115,6 +1139,8 @@ public final class ViewRootImpl implements ViewParent, mWindowLayout = windowLayout; mDisplay = display; mBasePackageName = context.getBasePackageName(); + final String name = DisplayProperties.debug_vri_package().orElse(null); + mExtraDisplayListenerLogging = !TextUtils.isEmpty(name) && name.equals(mBasePackageName); mThread = Thread.currentThread(); mLocation = new WindowLeaked(null); mLocation.fillInStackTrace(); @@ -1556,6 +1582,10 @@ public final class ViewRootImpl implements ViewParent, // We should update mAttachInfo.mDisplayState after registerDisplayListener // because displayState might be changed before registerDisplayListener. mAttachInfo.mDisplayState = mDisplay.getState(); + if (mExtraDisplayListenerLogging) { + Slog.i(mTag, "(" + mBasePackageName + ") Initial DisplayState: " + + mAttachInfo.mDisplayState, new Throwable()); + } if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) { mUseBLASTAdapter = true; } @@ -1640,6 +1670,9 @@ public final class ViewRootImpl implements ViewParent, * Register any kind of listeners if setView was success. */ private void registerListeners() { + if (mExtraDisplayListenerLogging) { + Slog.i(mTag, "Register listeners: " + mBasePackageName); + } mAccessibilityManager.addAccessibilityStateChangeListener( mAccessibilityInteractionConnectionManager, mHandler); mAccessibilityManager.addHighTextContrastStateChangeListener( @@ -1665,6 +1698,9 @@ public final class ViewRootImpl implements ViewParent, DisplayManagerGlobal .getInstance() .unregisterDisplayListener(mDisplayListener); + if (mExtraDisplayListenerLogging) { + Slog.w(mTag, "Unregister listeners: " + mBasePackageName, new Throwable()); + } } private void setTag() { @@ -2072,9 +2108,16 @@ public final class ViewRootImpl implements ViewParent, private final DisplayListener mDisplayListener = new DisplayListener() { @Override public void onDisplayChanged(int displayId) { + if (mExtraDisplayListenerLogging) { + Slog.i(mTag, "Received onDisplayChanged - " + mView); + } if (mView != null && mDisplay.getDisplayId() == displayId) { final int oldDisplayState = mAttachInfo.mDisplayState; final int newDisplayState = mDisplay.getState(); + if (mExtraDisplayListenerLogging) { + Slog.i(mTag, "DisplayState - old: " + oldDisplayState + + ", new: " + newDisplayState); + } if (oldDisplayState != newDisplayState) { mAttachInfo.mDisplayState = newDisplayState; pokeDrawLockIfNeeded(); diff --git a/core/java/android/view/WindowLayout.java b/core/java/android/view/WindowLayout.java index 3b8298ed3627..dda399357d8c 100644 --- a/core/java/android/view/WindowLayout.java +++ b/core/java/android/view/WindowLayout.java @@ -124,16 +124,16 @@ public class WindowLayout { || cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES)) { final Insets systemBarsInsets = state.calculateInsets( displayFrame, systemBars(), requestedVisibleTypes); - if (systemBarsInsets.left > 0) { + if (systemBarsInsets.left >= cutout.getSafeInsetLeft()) { displayCutoutSafeExceptMaybeBars.left = MIN_X; } - if (systemBarsInsets.top > 0) { + if (systemBarsInsets.top >= cutout.getSafeInsetTop()) { displayCutoutSafeExceptMaybeBars.top = MIN_Y; } - if (systemBarsInsets.right > 0) { + if (systemBarsInsets.right >= cutout.getSafeInsetRight()) { displayCutoutSafeExceptMaybeBars.right = MAX_X; } - if (systemBarsInsets.bottom > 0) { + if (systemBarsInsets.bottom >= cutout.getSafeInsetBottom()) { displayCutoutSafeExceptMaybeBars.bottom = MAX_Y; } } diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index d729d494e104..a7fbaf63eaed 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -1436,7 +1436,7 @@ public final class AutofillManager { } for (int i = 0; i < infos.size(); i++) { final VirtualViewFillInfo info = infos.valueAt(i); - final int virtualId = infos.indexOfKey(i); + final int virtualId = infos.keyAt(i); notifyViewReadyInner(getAutofillId(view, virtualId), (info == null) ? null : info.getAutofillHints()); } @@ -1450,9 +1450,6 @@ public final class AutofillManager { * @hide */ public void notifyViewEnteredForFillDialog(View v) { - if (sDebug) { - Log.d(TAG, "notifyViewEnteredForFillDialog:" + v.getAutofillId()); - } if (v.isCredential() && mIsFillAndSaveDialogDisabledForCredentialManager) { if (sDebug) { @@ -1465,11 +1462,14 @@ public final class AutofillManager { notifyViewReadyInner(v.getAutofillId(), v.getAutofillHints()); } - private void notifyViewReadyInner(AutofillId id, String[] autofillHints) { + private void notifyViewReadyInner(AutofillId id, @Nullable String[] autofillHints) { + if (sDebug) { + Log.d(TAG, "notifyViewReadyInner:" + id); + } + if (!hasAutofillFeature()) { return; } - synchronized (mLock) { if (mAllTrackedViews.contains(id)) { // The id is tracked and will not trigger pre-fill request again. @@ -1505,26 +1505,38 @@ public final class AutofillManager { final boolean clientAdded = tryAddServiceClientIfNeededLocked(); if (clientAdded) { startSessionLocked(/* id= */ AutofillId.NO_AUTOFILL_ID, /* bounds= */ null, - /* value= */ null, /* flags= */ FLAG_PCC_DETECTION); + /* value= */ null, /* flags= */ FLAG_PCC_DETECTION); } else { if (sVerbose) { Log.v(TAG, "not starting session: no service client"); } } - } } } - if (mIsFillDialogEnabled - || ArrayUtils.containsAny(autofillHints, mFillDialogEnabledHints)) { + // Check if framework should send pre-fill request for fill dialog + boolean shouldSendPreFillRequestForFillDialog = false; + if (mIsFillDialogEnabled) { + shouldSendPreFillRequestForFillDialog = true; + } else if (autofillHints != null) { + // check if supported autofill hint is present + for (String autofillHint : autofillHints) { + for (String filldialogEnabledHint : mFillDialogEnabledHints) { + if (filldialogEnabledHint.equalsIgnoreCase(autofillHint)) { + shouldSendPreFillRequestForFillDialog = true; + break; + } + } + if (shouldSendPreFillRequestForFillDialog) break; + } + } + if (shouldSendPreFillRequestForFillDialog) { if (sDebug) { Log.d(TAG, "Triggering pre-emptive request for fill dialog."); } - int flags = FLAG_SUPPORTS_FILL_DIALOG; flags |= FLAG_VIEW_NOT_FOCUSED; - synchronized (mLock) { // To match the id of the IME served view, used AutofillId.NO_AUTOFILL_ID on prefill // request, because IME will reset the id of IME served view to 0 when activity @@ -1532,9 +1544,10 @@ public final class AutofillManager { // not match the IME served view's, Autofill will be blocking to wait inline // request from the IME. notifyViewEnteredLocked(/* view= */ null, AutofillId.NO_AUTOFILL_ID, - /* bounds= */ null, /* value= */ null, flags); + /* bounds= */ null, /* value= */ null, flags); } } + return; } private boolean hasFillDialogUiFeature() { diff --git a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java index 364adc77f7d3..3ad49afb1575 100644 --- a/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java +++ b/core/java/android/view/inputmethod/RemoteInputConnectionImpl.java @@ -28,8 +28,12 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.AnyThread; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.UiThread; +import android.app.UriGrantsManager; +import android.content.ContentProvider; +import android.content.Intent; import android.graphics.RectF; +import android.net.Uri; +import android.os.Binder; import android.os.Bundle; import android.os.CancellationSignal; import android.os.CancellationSignalBeamer; @@ -38,6 +42,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.ResultReceiver; import android.os.Trace; +import android.os.UserHandle; import android.util.Log; import android.util.proto.ProtoOutputStream; import android.view.KeyEvent; @@ -373,11 +378,8 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { return; } dispatch(() -> { - notifyTypingHint(false /* isTyping */); // Deactivate the notifier when finishing typing. - if (mTypingHintNotifier != null) { - mTypingHintNotifier.deactivate(); - } + notifyTypingHint(false /* isTyping */, true /* deactivate */); // Note that we do not need to worry about race condition here, because 1) mFinished is // updated only inside this block, and 2) the code here is running on a Handler hence we @@ -643,7 +645,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { return; } ic.commitText(text, newCursorPosition); - notifyTypingHint(true /* isTyping */); + notifyTypingHint(true /* isTyping */, false /* deactivate */); }); } @@ -799,7 +801,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { return; } ic.setComposingText(text, newCursorPosition); - notifyTypingHint(true /* isTyping */); + notifyTypingHint(true /* isTyping */, false /* deactivate */); }); } @@ -927,7 +929,7 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { return; } ic.deleteSurroundingText(beforeLength, afterLength); - notifyTypingHint(true /* isTyping */); + notifyTypingHint(true /* isTyping */, false /* deactivate */); }); } @@ -1197,7 +1199,22 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { public void commitContent(InputConnectionCommandHeader header, InputContentInfo inputContentInfo, int flags, Bundle opts, AndroidFuture future /* T=Boolean */) { + final int imeUid = Binder.getCallingUid(); dispatchWithTracing("commitContent", future, () -> { + // Check if the originator IME has the right permissions + try { + final int contentUriOwnerUserId = ContentProvider.getUserIdFromUri( + inputContentInfo.getContentUri(), UserHandle.getUserId(imeUid)); + final Uri contentUriWithoutUserId = ContentProvider.getUriWithoutUserId( + inputContentInfo.getContentUri()); + UriGrantsManager.getService().checkGrantUriPermission_ignoreNonSystem(imeUid, null, + contentUriWithoutUserId, Intent.FLAG_GRANT_READ_URI_PERMISSION, + contentUriOwnerUserId); + } catch (Exception e) { + Log.w(TAG, "commitContent with invalid Uri permission from IME:", e); + return false; + } + if (header.mSessionId != mCurrentSessionId.get()) { return false; // cancelled } @@ -1497,10 +1514,9 @@ final class RemoteInputConnectionImpl extends IRemoteInputConnection.Stub { * The input connection indicates that the user is typing when {@link #commitText} or * {@link #setComposingText)} and the user finish typing when {@link #deactivate()}. */ - @UiThread - private void notifyTypingHint(boolean isTyping) { + private void notifyTypingHint(boolean isTyping, boolean deactivate) { if (mTypingHintNotifier != null) { - mTypingHintNotifier.onTypingHintChanged(isTyping); + mTypingHintNotifier.onTypingHintChanged(isTyping, deactivate); } } } diff --git a/core/java/android/widget/AdapterViewFlipper.java b/core/java/android/widget/AdapterViewFlipper.java index 065089f53633..53c73c6bf161 100644 --- a/core/java/android/widget/AdapterViewFlipper.java +++ b/core/java/android/widget/AdapterViewFlipper.java @@ -16,10 +16,7 @@ package android.widget; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.res.TypedArray; import android.os.Message; import android.util.AttributeSet; @@ -48,7 +45,6 @@ public class AdapterViewFlipper extends AdapterViewAnimator { private boolean mRunning = false; private boolean mStarted = false; private boolean mVisible = false; - private boolean mUserPresent = true; private boolean mAdvancedByHost = false; public AdapterViewFlipper(Context context) { @@ -82,40 +78,10 @@ public class AdapterViewFlipper extends AdapterViewAnimator { a.recycle(); } - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (Intent.ACTION_SCREEN_OFF.equals(action)) { - mUserPresent = false; - updateRunning(); - } else if (Intent.ACTION_USER_PRESENT.equals(action)) { - mUserPresent = true; - updateRunning(false); - } - } - }; - @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - // Listen for broadcasts related to user-presence - final IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_SCREEN_OFF); - filter.addAction(Intent.ACTION_USER_PRESENT); - - // OK, this is gross but needed. This class is supported by the - // remote views machanism and as a part of that the remote views - // can be inflated by a context for another user without the app - // having interact users permission - just for loading resources. - // For exmaple, when adding widgets from a user profile to the - // home screen. Therefore, we register the receiver as the current - // user not the one the context is for. - getContext().registerReceiverAsUser(mReceiver, android.os.Process.myUserHandle(), - filter, null, getHandler()); - - if (mAutoStart) { // Automatically start when requested startFlipping(); @@ -126,8 +92,6 @@ public class AdapterViewFlipper extends AdapterViewAnimator { protected void onDetachedFromWindow() { super.onDetachedFromWindow(); mVisible = false; - - getContext().unregisterReceiver(mReceiver); updateRunning(); } @@ -235,8 +199,7 @@ public class AdapterViewFlipper extends AdapterViewAnimator { * true. */ private void updateRunning(boolean flipNow) { - boolean running = !mAdvancedByHost && mVisible && mStarted && mUserPresent - && mAdapter != null; + boolean running = !mAdvancedByHost && mVisible && mStarted && mAdapter != null; if (running != mRunning) { if (running) { showOnly(mWhichChild, flipNow); @@ -248,7 +211,7 @@ public class AdapterViewFlipper extends AdapterViewAnimator { } if (LOGD) { Log.d(TAG, "updateRunning() mVisible=" + mVisible + ", mStarted=" + mStarted - + ", mUserPresent=" + mUserPresent + ", mRunning=" + mRunning); + + ", mRunning=" + mRunning); } } diff --git a/core/java/android/widget/AnalogClock.java b/core/java/android/widget/AnalogClock.java index 1f0e95ea305a..e01583322979 100644 --- a/core/java/android/widget/AnalogClock.java +++ b/core/java/android/widget/AnalogClock.java @@ -23,7 +23,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.BlendMode; @@ -37,6 +36,9 @@ import android.view.RemotableViewMethod; import android.view.View; import android.view.inspector.InspectableProperty; import android.widget.RemoteViews.RemoteView; +import android.widget.TextClock.ClockEventDelegate; + +import com.android.internal.util.Preconditions; import java.time.Clock; import java.time.DateTimeException; @@ -112,6 +114,7 @@ public class AnalogClock extends View { public AnalogClock(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); + mClockEventDelegate = new ClockEventDelegate(context); mSecondsHandFps = AppGlobals.getIntCoreSetting( WidgetFlags.KEY_ANALOG_CLOCK_SECONDS_HAND_FPS, context.getResources() @@ -584,21 +587,9 @@ public class AnalogClock extends View { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - IntentFilter filter = new IntentFilter(); if (!mReceiverAttached) { - filter.addAction(Intent.ACTION_TIME_CHANGED); - filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); - - // OK, this is gross but needed. This class is supported by the - // remote views mechanism and as a part of that the remote views - // can be inflated by a context for another user without the app - // having interact users permission - just for loading resources. - // For example, when adding widgets from a user profile to the - // home screen. Therefore, we register the receiver as the current - // user not the one the context is for. - getContext().registerReceiverAsUser(mIntentReceiver, - android.os.Process.myUserHandle(), filter, null, getHandler()); + mClockEventDelegate.registerTimeChangeReceiver(mIntentReceiver, getHandler()); mReceiverAttached = true; } @@ -615,12 +606,23 @@ public class AnalogClock extends View { @Override protected void onDetachedFromWindow() { if (mReceiverAttached) { - getContext().unregisterReceiver(mIntentReceiver); + mClockEventDelegate.unregisterTimeChangeReceiver(mIntentReceiver); mReceiverAttached = false; } super.onDetachedFromWindow(); } + /** + * Sets a delegate to handle clock event registration. This must be called before the view is + * attached to the window + * + * @hide + */ + public void setClockEventDelegate(ClockEventDelegate delegate) { + Preconditions.checkState(!mReceiverAttached, "Clock events already registered"); + mClockEventDelegate = delegate; + } + private void onVisible() { if (!mVisible) { mVisible = true; @@ -797,6 +799,7 @@ public class AnalogClock extends View { } }; private boolean mReceiverAttached; + private ClockEventDelegate mClockEventDelegate; private final Runnable mTick = new Runnable() { @Override diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index e48afb2a3cc8..255bd679dc35 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -16,6 +16,7 @@ package android.widget; +import static android.os.Process.myUserHandle; import static android.view.ViewDebug.ExportedProperty; import static android.widget.RemoteViews.RemoteView; @@ -24,7 +25,6 @@ import android.annotation.TestApi; import android.app.ActivityManager; import android.compat.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -43,6 +43,7 @@ import android.view.ViewHierarchyEncoder; import android.view.inspector.InspectableProperty; import com.android.internal.R; +import com.android.internal.util.Preconditions; import java.time.Duration; import java.time.Instant; @@ -141,6 +142,8 @@ public class TextClock extends TextView { private boolean mRegistered; private boolean mShouldRunTicker; + private ClockEventDelegate mClockEventDelegate; + private Calendar mTime; private String mTimeZone; @@ -178,8 +181,7 @@ public class TextClock extends TextView { if (mTimeZone == null && Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) { final String timeZone = intent.getStringExtra(Intent.EXTRA_TIMEZONE); createTime(timeZone); - } else if (!mShouldRunTicker && (Intent.ACTION_TIME_TICK.equals(intent.getAction()) - || Intent.ACTION_TIME_CHANGED.equals(intent.getAction()))) { + } else if (!mShouldRunTicker && Intent.ACTION_TIME_CHANGED.equals(intent.getAction())) { return; } onTimeChanged(); @@ -282,6 +284,7 @@ public class TextClock extends TextView { if (mFormat24 == null) { mFormat24 = getBestDateTimePattern("Hm"); } + mClockEventDelegate = new ClockEventDelegate(getContext()); createTime(mTimeZone); chooseFormat(); @@ -431,6 +434,17 @@ public class TextClock extends TextView { } /** + * Sets a delegate to handle clock event registration. This must be called before the view is + * attached to the window + * + * @hide + */ + public void setClockEventDelegate(ClockEventDelegate delegate) { + Preconditions.checkState(!mRegistered, "Clock events already registered"); + mClockEventDelegate = delegate; + } + + /** * Update the displayed time if necessary and invalidate the view. */ public void refreshTime() { @@ -557,7 +571,7 @@ public class TextClock extends TextView { if (!mRegistered) { mRegistered = true; - registerReceiver(); + mClockEventDelegate.registerTimeChangeReceiver(mIntentReceiver, getHandler()); registerObserver(); createTime(mTimeZone); @@ -582,7 +596,7 @@ public class TextClock extends TextView { super.onDetachedFromWindow(); if (mRegistered) { - unregisterReceiver(); + mClockEventDelegate.unregisterTimeChangeReceiver(mIntentReceiver); unregisterObserver(); mRegistered = false; @@ -598,56 +612,27 @@ public class TextClock extends TextView { mStopTicking = true; } - private void registerReceiver() { - final IntentFilter filter = new IntentFilter(); - - filter.addAction(Intent.ACTION_TIME_CHANGED); - filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); - - // OK, this is gross but needed. This class is supported by the - // remote views mechanism and as a part of that the remote views - // can be inflated by a context for another user without the app - // having interact users permission - just for loading resources. - // For example, when adding widgets from a managed profile to the - // home screen. Therefore, we register the receiver as the user - // the app is running as not the one the context is for. - getContext().registerReceiverAsUser(mIntentReceiver, android.os.Process.myUserHandle(), - filter, null, getHandler()); - } - private void registerObserver() { if (mRegistered) { if (mFormatChangeObserver == null) { mFormatChangeObserver = new FormatChangeObserver(getHandler()); } - final ContentResolver resolver = getContext().getContentResolver(); - Uri uri = Settings.System.getUriFor(Settings.System.TIME_12_24); - if (mShowCurrentUserTime) { - resolver.registerContentObserver(uri, true, - mFormatChangeObserver, UserHandle.USER_ALL); - } else { - // UserHandle.myUserId() is needed. This class is supported by the - // remote views mechanism and as a part of that the remote views - // can be inflated by a context for another user without the app - // having interact users permission - just for loading resources. - // For example, when adding widgets from a managed profile to the - // home screen. Therefore, we register the ContentObserver with the user - // the app is running (e.g. the launcher) and not the user of the - // context (e.g. the widget's profile). - resolver.registerContentObserver(uri, true, - mFormatChangeObserver, UserHandle.myUserId()); - } + // UserHandle.myUserId() is needed. This class is supported by the + // remote views mechanism and as a part of that the remote views + // can be inflated by a context for another user without the app + // having interact users permission - just for loading resources. + // For example, when adding widgets from a managed profile to the + // home screen. Therefore, we register the ContentObserver with the user + // the app is running (e.g. the launcher) and not the user of the + // context (e.g. the widget's profile). + int userHandle = mShowCurrentUserTime ? UserHandle.USER_ALL : UserHandle.myUserId(); + mClockEventDelegate.registerFormatChangeObserver(mFormatChangeObserver, userHandle); } } - private void unregisterReceiver() { - getContext().unregisterReceiver(mIntentReceiver); - } - private void unregisterObserver() { if (mFormatChangeObserver != null) { - final ContentResolver resolver = getContext().getContentResolver(); - resolver.unregisterContentObserver(mFormatChangeObserver); + mClockEventDelegate.unregisterFormatChangeObserver(mFormatChangeObserver); } } @@ -674,4 +659,59 @@ public class TextClock extends TextView { stream.addProperty("format", mFormat == null ? null : mFormat.toString()); stream.addProperty("hasSeconds", mHasSeconds); } + + /** + * Utility class to delegate some system event handling to allow overring the default behavior + * + * @hide + */ + public static class ClockEventDelegate { + + private final Context mContext; + + public ClockEventDelegate(Context context) { + mContext = context; + } + + /** + * Registers a receiver for actions {@link Intent#ACTION_TIME_CHANGED} and + * {@link Intent#ACTION_TIMEZONE_CHANGED} + * + * OK, this is gross but needed. This class is supported by the remote views mechanism and + * as a part of that the remote views can be inflated by a context for another user without + * the app having interact users permission - just for loading resources. For example, + * when adding widgets from a managed profile to the home screen. Therefore, we register + * the receiver as the user the app is running as not the one the context is for. + */ + public void registerTimeChangeReceiver(BroadcastReceiver receiver, Handler handler) { + final IntentFilter filter = new IntentFilter(); + + filter.addAction(Intent.ACTION_TIME_CHANGED); + filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); + + mContext.registerReceiverAsUser(receiver, myUserHandle(), filter, null, handler); + } + + /** + * Unregisters a previously registered receiver + */ + public void unregisterTimeChangeReceiver(BroadcastReceiver receiver) { + mContext.unregisterReceiver(receiver); + } + + /** + * Registers an observer for time format changes + */ + public void registerFormatChangeObserver(ContentObserver observer, int userHandle) { + Uri uri = Settings.System.getUriFor(Settings.System.TIME_12_24); + mContext.getContentResolver().registerContentObserver(uri, true, observer, userHandle); + } + + /** + * Unregisters a previously registered observer + */ + public void unregisterFormatChangeObserver(ContentObserver observer) { + mContext.getContentResolver().unregisterContentObserver(observer); + } + } } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 63e882533a4c..c990e941a11b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -14051,7 +14051,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener selectionStart, OffsetMapping.MAP_STRATEGY_CURSOR); final int line = layout.getLineForOffset(offsetTransformed); final float insertionMarkerX = - layout.getPrimaryHorizontal(offsetTransformed) + layout.getPrimaryHorizontal( + offsetTransformed, layout.shouldClampCursor(line)) + viewportToContentHorizontalOffset; final float insertionMarkerTop = layout.getLineTop(line) + viewportToContentVerticalOffset; diff --git a/core/java/android/widget/ToastPresenter.java b/core/java/android/widget/ToastPresenter.java index 7cb61fe597db..0a0071ae3001 100644 --- a/core/java/android/widget/ToastPresenter.java +++ b/core/java/android/widget/ToastPresenter.java @@ -89,9 +89,10 @@ public class ToastPresenter { return view; } + private final WeakReference<Context> mContext; private final Resources mResources; private final WeakReference<WindowManager> mWindowManager; - private final WeakReference<AccessibilityManager> mAccessibilityManager; + private final IAccessibilityManager mAccessibilityManagerService; private final INotificationManager mNotificationManager; private final String mPackageName; private final String mContextPackageName; @@ -101,21 +102,14 @@ public class ToastPresenter { public ToastPresenter(Context context, IAccessibilityManager accessibilityManager, INotificationManager notificationManager, String packageName) { + mContext = new WeakReference<>(context); mResources = context.getResources(); mWindowManager = new WeakReference<>(context.getSystemService(WindowManager.class)); mNotificationManager = notificationManager; mPackageName = packageName; mContextPackageName = context.getPackageName(); mParams = createLayoutParams(); - - // We obtain AccessibilityManager manually via its constructor instead of using method - // AccessibilityManager.getInstance() for 2 reasons: - // 1. We want to be able to inject IAccessibilityManager in tests to verify behavior. - // 2. getInstance() caches the instance for the process even if we pass a different - // context to it. This is problematic for multi-user because callers can pass a context - // created via Context.createContextAsUser(). - mAccessibilityManager = new WeakReference<>( - new AccessibilityManager(context, accessibilityManager, context.getUserId())); + mAccessibilityManagerService = accessibilityManager; } public String getPackageName() { @@ -306,11 +300,20 @@ public class ToastPresenter { * enabled. */ public void trySendAccessibilityEvent(View view, String packageName) { - final AccessibilityManager accessibilityManager = mAccessibilityManager.get(); - if (accessibilityManager == null) { + final Context context = mContext.get(); + if (context == null) { return; } + // We obtain AccessibilityManager manually via its constructor instead of using method + // AccessibilityManager.getInstance() for 2 reasons: + // 1. We want to be able to inject IAccessibilityManager in tests to verify behavior. + // 2. getInstance() caches the instance for the process even if we pass a different + // context to it. This is problematic for multi-user because callers can pass a context + // created via Context.createContextAsUser(). + final AccessibilityManager accessibilityManager = new AccessibilityManager(context, + mAccessibilityManagerService, context.getUserId()); + if (!accessibilityManager.isEnabled()) { accessibilityManager.removeClient(); return; diff --git a/core/java/android/widget/ViewFlipper.java b/core/java/android/widget/ViewFlipper.java index 5abb6e1637e7..eaf037e68976 100644 --- a/core/java/android/widget/ViewFlipper.java +++ b/core/java/android/widget/ViewFlipper.java @@ -18,10 +18,7 @@ package android.widget; import android.annotation.IntRange; import android.compat.annotation.UnsupportedAppUsage; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.res.TypedArray; import android.os.Build; import android.os.Message; @@ -51,8 +48,6 @@ public class ViewFlipper extends ViewAnimator { private boolean mRunning = false; private boolean mStarted = false; private boolean mVisible = false; - @UnsupportedAppUsage - private boolean mUserPresent = true; public ViewFlipper(Context context) { super(context); @@ -70,39 +65,10 @@ public class ViewFlipper extends ViewAnimator { a.recycle(); } - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (Intent.ACTION_SCREEN_OFF.equals(action)) { - mUserPresent = false; - updateRunning(); - } else if (Intent.ACTION_USER_PRESENT.equals(action)) { - mUserPresent = true; - updateRunning(false); - } - } - }; - @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - // Listen for broadcasts related to user-presence - final IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_SCREEN_OFF); - filter.addAction(Intent.ACTION_USER_PRESENT); - - // OK, this is gross but needed. This class is supported by the - // remote views machanism and as a part of that the remote views - // can be inflated by a context for another user without the app - // having interact users permission - just for loading resources. - // For exmaple, when adding widgets from a user profile to the - // home screen. Therefore, we register the receiver as the current - // user not the one the context is for. - getContext().registerReceiverAsUser(mReceiver, android.os.Process.myUserHandle(), - filter, null, getHandler()); - if (mAutoStart) { // Automatically start when requested startFlipping(); @@ -113,8 +79,6 @@ public class ViewFlipper extends ViewAnimator { protected void onDetachedFromWindow() { super.onDetachedFromWindow(); mVisible = false; - - getContext().unregisterReceiver(mReceiver); updateRunning(); } @@ -186,7 +150,7 @@ public class ViewFlipper extends ViewAnimator { */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateRunning(boolean flipNow) { - boolean running = mVisible && mStarted && mUserPresent; + boolean running = mVisible && mStarted; if (running != mRunning) { if (running) { showOnly(mWhichChild, flipNow); @@ -198,7 +162,7 @@ public class ViewFlipper extends ViewAnimator { } if (LOGD) { Log.d(TAG, "updateRunning() mVisible=" + mVisible + ", mStarted=" + mStarted - + ", mUserPresent=" + mUserPresent + ", mRunning=" + mRunning); + + ", mRunning=" + mRunning); } } diff --git a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java index 5e2eceb23789..dee49350d93e 100644 --- a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java @@ -177,7 +177,7 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { * <code>1</code> would return the work profile {@link ProfileDescriptor}.</li> * </ul> */ - abstract ProfileDescriptor getItem(int pageIndex); + public abstract ProfileDescriptor getItem(int pageIndex); /** * Returns the number of {@link ProfileDescriptor} objects. @@ -438,8 +438,8 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { && isQuietModeEnabled(mWorkProfileUserHandle)); } - protected class ProfileDescriptor { - final ViewGroup rootView; + public static class ProfileDescriptor { + public final ViewGroup rootView; private final ViewGroup mEmptyStateView; ProfileDescriptor(ViewGroup rootView) { this.rootView = rootView; diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 2b39bb4eb7a5..0a726d99723a 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -3023,28 +3023,31 @@ public class ChooserActivity extends ResolverActivity implements return shouldShowTabs() && (mMultiProfilePagerAdapter.getListAdapterForUserHandle( UserHandle.of(UserHandle.myUserId())).getCount() > 0 - || shouldShowContentPreviewWhenEmpty()) + || shouldShowStickyContentPreviewWhenEmpty()) && shouldShowContentPreview(); } /** - * This method could be used to override the default behavior when we hide the preview area - * when the current tab doesn't have any items. + * This method could be used to override the default behavior when we hide the sticky preview + * area when the current tab doesn't have any items. * - * @return true if we want to show the content preview area even if the tab for the current - * user is empty + * @return {@code true} if we want to show the sticky content preview area even if the tab for + * the current user is empty */ - protected boolean shouldShowContentPreviewWhenEmpty() { + protected boolean shouldShowStickyContentPreviewWhenEmpty() { return false; } - /** - * @return true if we want to show the content preview area - */ - protected boolean shouldShowContentPreview() { + @Override + public boolean shouldShowContentPreview() { return isSendAction(getTargetIntent()); } + @Override + public boolean shouldShowServiceTargets() { + return shouldShowContentPreview() && !ActivityManager.isLowRamDeviceStatic(); + } + private void updateStickyContentPreview() { if (shouldShowStickyContentPreviewNoOrientationCheck()) { // The sticky content preview is only shown when we show the work and personal tabs. @@ -3406,11 +3409,7 @@ public class ChooserActivity extends ResolverActivity implements // There can be at most one row in the listview, that is internally // a ViewGroup with 2 rows public int getServiceTargetRowCount() { - if (shouldShowContentPreview() - && !ActivityManager.isLowRamDeviceStatic()) { - return 1; - } - return 0; + return shouldShowServiceTargets() ? 1 : 0; } public int getAzLabelRowCount() { diff --git a/core/java/com/android/internal/app/ChooserListAdapter.java b/core/java/com/android/internal/app/ChooserListAdapter.java index 1eecb413adcb..36038ae15853 100644 --- a/core/java/com/android/internal/app/ChooserListAdapter.java +++ b/core/java/com/android/internal/app/ChooserListAdapter.java @@ -19,7 +19,6 @@ package com.android.internal.app; import static com.android.internal.app.ChooserActivity.TARGET_TYPE_SHORTCUTS_FROM_PREDICTION_SERVICE; import static com.android.internal.app.ChooserActivity.TARGET_TYPE_SHORTCUTS_FROM_SHORTCUT_MANAGER; -import android.app.ActivityManager; import android.app.prediction.AppPredictor; import android.content.ComponentName; import android.content.Context; @@ -425,11 +424,9 @@ public class ChooserListAdapter extends ResolverListAdapter { } public int getServiceTargetCount() { - if (mChooserListCommunicator.isSendAction(mChooserListCommunicator.getTargetIntent()) - && !ActivityManager.isLowRamDeviceStatic()) { + if (mChooserListCommunicator.shouldShowServiceTargets()) { return Math.min(mServiceTargets.size(), mChooserListCommunicator.getMaxRankedTargets()); } - return 0; } @@ -771,6 +768,10 @@ public class ChooserListAdapter extends ResolverListAdapter { void sendListViewUpdateMessage(UserHandle userHandle); boolean isSendAction(Intent targetIntent); + + boolean shouldShowContentPreview(); + + boolean shouldShowServiceTargets(); } /** diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java index 7beb059fb648..8197e265ca29 100644 --- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java @@ -94,7 +94,7 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd } @Override - ChooserProfileDescriptor getItem(int pageIndex) { + public ChooserProfileDescriptor getItem(int pageIndex) { return mItems[pageIndex]; } diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index ac15f11ee989..7534d2960b7c 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -2623,13 +2623,13 @@ public class ResolverActivity extends Activity implements * An a11y delegate that expands resolver drawer when gesture navigation reaches a partially * invisible target in the list. */ - private static class AppListAccessibilityDelegate extends View.AccessibilityDelegate { + public static class AppListAccessibilityDelegate extends View.AccessibilityDelegate { private final ResolverDrawerLayout mDrawer; @Nullable private final View mBottomBar; private final Rect mRect = new Rect(); - private AppListAccessibilityDelegate(ResolverDrawerLayout drawer) { + public AppListAccessibilityDelegate(ResolverDrawerLayout drawer) { mDrawer = drawer; mBottomBar = mDrawer.findViewById(R.id.button_bar_container); } diff --git a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java index 767791263673..031f9d3168bf 100644 --- a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java @@ -79,7 +79,7 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA } @Override - ResolverProfileDescriptor getItem(int pageIndex) { + public ResolverProfileDescriptor getItem(int pageIndex) { return mItems[pageIndex]; } diff --git a/core/java/com/android/internal/os/BatteryStatsHistory.java b/core/java/com/android/internal/os/BatteryStatsHistory.java index bbaaa472cbbb..a823c29b3f6e 100644 --- a/core/java/com/android/internal/os/BatteryStatsHistory.java +++ b/core/java/com/android/internal/os/BatteryStatsHistory.java @@ -178,7 +178,7 @@ public class BatteryStatsHistory { private boolean mHaveBatteryLevel; private boolean mRecordingHistory; - private static final int HISTORY_TAG_INDEX_LIMIT = 0x7ffe; + static final int HISTORY_TAG_INDEX_LIMIT = 0x7ffe; private static final int MAX_HISTORY_TAG_STRING_LENGTH = 1024; private final HashMap<HistoryTag, Integer> mHistoryTagPool = new HashMap<>(); @@ -1848,6 +1848,7 @@ public class BatteryStatsHistory { } return idx | BatteryStatsHistory.TAG_FIRST_OCCURRENCE_FLAG; } else { + tag.poolIdx = HistoryTag.HISTORY_TAG_POOL_OVERFLOW; // Tag pool overflow: include the tag itself in the parcel return HISTORY_TAG_INDEX_LIMIT | BatteryStatsHistory.TAG_FIRST_OCCURRENCE_FLAG; } diff --git a/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java b/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java index ccc3454624f8..4c2b2854df88 100644 --- a/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java +++ b/core/java/com/android/internal/os/BatteryStatsHistoryIterator.java @@ -309,7 +309,11 @@ public class BatteryStatsHistoryIterator implements Iterator<BatteryStats.Histor BatteryStats.HistoryTag tag = new BatteryStats.HistoryTag(); tag.readFromParcel(src); tag.poolIdx = index & ~BatteryStatsHistory.TAG_FIRST_OCCURRENCE_FLAG; - mHistoryTags.put(tag.poolIdx, tag); + if (tag.poolIdx < BatteryStatsHistory.HISTORY_TAG_INDEX_LIMIT) { + mHistoryTags.put(tag.poolIdx, tag); + } else { + tag.poolIdx = BatteryStats.HistoryTag.HISTORY_TAG_POOL_OVERFLOW; + } outTag.setTo(tag); } else { diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 86ca077d77d9..a93e984294f7 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -1160,7 +1160,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind mForceWindowDrawsBarBackgrounds, requestedVisibleTypes); boolean oldDrawLegacy = mDrawLegacyNavigationBarBackground; mDrawLegacyNavigationBarBackground = - (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0; + ((requestedVisibleTypes | mLastForceConsumingTypes) + & WindowInsets.Type.navigationBars()) != 0 + && (mWindow.getAttributes().flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0; if (oldDrawLegacy != mDrawLegacyNavigationBarBackground) { mDrawLegacyNavigationBarBackgroundHandled = mWindow.onDrawLegacyNavigationBarBackgroundChanged( diff --git a/core/java/com/android/internal/usb/DumpUtils.java b/core/java/com/android/internal/usb/DumpUtils.java index f974d9d10efd..21c3e7b5c6b8 100644 --- a/core/java/com/android/internal/usb/DumpUtils.java +++ b/core/java/com/android/internal/usb/DumpUtils.java @@ -16,6 +16,7 @@ package com.android.internal.usb; +import static android.hardware.usb.UsbPort.FLAG_ALT_MODE_TYPE_DISPLAYPORT; import static android.hardware.usb.UsbPortStatus.MODE_AUDIO_ACCESSORY; import static android.hardware.usb.UsbPortStatus.MODE_DEBUG_ACCESSORY; import static android.hardware.usb.UsbPortStatus.MODE_DFP; @@ -26,6 +27,7 @@ import static android.hardware.usb.UsbPortStatus.MODE_UFP; import static com.android.internal.util.dump.DumpUtils.writeStringIfNotNull; import android.annotation.NonNull; +import android.hardware.usb.DisplayPortAltModeInfo; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbConfiguration; import android.hardware.usb.UsbDevice; @@ -177,6 +179,10 @@ public class DumpUtils { dump.write("supports_compliance_warnings", UsbPortProto.SUPPORTS_COMPLIANCE_WARNINGS, port.supportsComplianceWarnings()); + if (port.isAltModeSupported(FLAG_ALT_MODE_TYPE_DISPLAYPORT)) { + dump.write("supported_alt_modes", UsbPortProto.SUPPORTED_ALT_MODES, + FLAG_ALT_MODE_TYPE_DISPLAYPORT); + } dump.end(token); } @@ -255,6 +261,12 @@ public class DumpUtils { UsbPort.powerBrickConnectionStatusToString(status.getPowerBrickConnectionStatus())); dump.write("compliance_warning_status", UsbPortStatusProto.COMPLIANCE_WARNINGS_STRING, UsbPort.complianceWarningsToString(status.getComplianceWarnings())); + DisplayPortAltModeInfo displayPortAltModeInfo = status.getDisplayPortAltModeInfo(); + if (displayPortAltModeInfo != null) { + dump.write("displayport_alt_mode_status", + UsbPortStatusProto.DISPLAYPORT_ALT_MODE_STATUS, + status.getDisplayPortAltModeInfo().toString()); + } dump.end(token); } } diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java index 52ffc984c41e..a513ca535620 100644 --- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java +++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java @@ -21,6 +21,7 @@ import static android.content.res.Resources.ID_NULL; import android.annotation.IdRes; import android.content.Context; +import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; @@ -53,10 +54,13 @@ public class ResolverDrawerLayout extends ViewGroup { private static final String TAG = "ResolverDrawerLayout"; private MetricsLogger mMetricsLogger; + + /** - * Max width of the whole drawer layout + * Max width of the whole drawer layout and its res id */ - private final int mMaxWidth; + private int mMaxWidthResId; + private int mMaxWidth; /** * Max total visible height of views not marked always-show when in the closed/initial state @@ -152,6 +156,7 @@ public class ResolverDrawerLayout extends ViewGroup { final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ResolverDrawerLayout, defStyleAttr, 0); + mMaxWidthResId = a.getResourceId(R.styleable.ResolverDrawerLayout_maxWidth, -1); mMaxWidth = a.getDimensionPixelSize(R.styleable.ResolverDrawerLayout_maxWidth, -1); mMaxCollapsedHeight = a.getDimensionPixelSize( R.styleable.ResolverDrawerLayout_maxCollapsedHeight, 0); @@ -1042,6 +1047,18 @@ public class ResolverDrawerLayout extends ViewGroup { return mAlwaysShowHeight; } + /** + * Max width of the drawer needs to be updated after the configuration is changed. + * For example, foldables have different layout width when the device is folded and unfolded. + */ + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + if (mMaxWidthResId > 0) { + mMaxWidth = getResources().getDimensionPixelSize(mMaxWidthResId); + } + } + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { final int width = getWidth(); diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index c368fa85c379..56066b2d813c 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -1806,15 +1806,10 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, if (!is_system_server && getuid() == 0) { const int rc = createProcessGroup(uid, getpid()); if (rc != 0) { - if (rc == -ESRCH) { - // If process is dead, treat this as a non-fatal error - ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc)); - } else { - fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing " - "CONFIG_CGROUP_CPUACCT?") - : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid, - /* pid= */ 0, strerror(-rc))); - } + fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing " + "CONFIG_CGROUP_CPUACCT?") + : CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid, + /* pid= */ 0, strerror(-rc))); } } diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index 481a2fbd546f..f425c60b2d76 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -138,6 +138,7 @@ message SecureSettingsProto { optional SettingProto touch_gesture_enabled = 10 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto long_press_home_enabled = 11 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC ]; } optional Assist assist = 7; diff --git a/core/proto/android/service/usb.proto b/core/proto/android/service/usb.proto index 88893205c79e..49b8450fcc67 100644 --- a/core/proto/android/service/usb.proto +++ b/core/proto/android/service/usb.proto @@ -238,10 +238,15 @@ message UsbPortProto { MODE_DEBUG_ACCESSORY = 8; } + enum AltMode { + ALT_MODE_DISPLAYPORT = 1; + } + // ID of the port. A device (eg: Chromebooks) might have multiple ports. optional string id = 1; repeated Mode supported_modes = 2; optional bool supports_compliance_warnings = 3; + repeated AltMode supported_alt_modes = 4; } message UsbPortStatusProto { @@ -271,6 +276,7 @@ message UsbPortStatusProto { optional bool is_power_transfer_limited = 8; optional string usb_power_brick_status = 9; optional string compliance_warnings_string = 10; + optional string displayport_alt_mode_status = 11; } message UsbPortStatusRoleCombinationProto { diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 9f33f501409c..9ab6ce946deb 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -810,7 +810,7 @@ <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Сачыць за колькасцю няправільных набраных пароляў падчас разблакоўкі экрана і блакаваць планшэт або сціраць усе дадзеныя на ім, калі няправільны пароль набраны занадта шмат разоў."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і заблакіраваць прыладу Android TV або сцерці ўсе даныя на прыладзе, калі няправільны пароль набраны занадта шмат разоў."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Падчас разблакіроўкі экрана сачыць за колькасцю няправільна набраных пароляў і, калі няправільны пароль набраны занадта шмат разоў, заблакіраваць інфармацыйна-забаўляльную сістэму ці сцерці ў ёй усе даныя."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Сачыць за колькасцю няправільных набраных пароляў падчас разблакоўкі экрана і блакаваць тяэлефон або сціраць усе дадзеныя на ім, калі набрана занадта шмат няправільных пароляў."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць тэлефон або сціраць усе даныя на ім, калі набрана занадта шмат няправільных пароляў."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць планшэт або сцерці ўсе даныя гэтага карыстальніка, калі няправільны пароль набраны занадта шмат разоў."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і заблакіраваць прыладу Android TV або сцерці ўсе даныя карыстальніка, калі няправільны пароль набраны занадта шмат разоў."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Падчас разблакіроўкі экрана сачыць за колькасцю няправільна набраных пароляў і, калі няправільны пароль набраны занадта шмат разоў, заблакіраваць інфармацыйна-забаўляльную сістэму ці сцерці ўсе даныя гэтага профілю."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index dd2a0acc2c5a..08e07dceaf55 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1887,8 +1887,8 @@ <string name="zen_mode_duration_hours" msgid="7841806065034711849">"{count,plural, =1{Durant 1 hora}many{Durant # hores}other{Durant # hores}}"</string> <string name="zen_mode_duration_hours_short" msgid="3666949653933099065">"{count,plural, =1{Durant 1 h}many{Durant # h}other{Durant # h}}"</string> <string name="zen_mode_until_next_day" msgid="1403042784161725038">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_until" msgid="2250286190237669079">"Fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_alarm" msgid="7046911727540499275">"Fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (propera alarma)"</string> + <string name="zen_mode_until" msgid="2250286190237669079">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_alarm" msgid="7046911727540499275">"Finalitza: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (propera alarma)"</string> <string name="zen_mode_forever" msgid="740585666364912448">"Fins que no el desactivis"</string> <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Fins que desactivis el mode No molestis"</string> <string name="zen_mode_rule_name_combination" msgid="7174598364351313725">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 21aea82d8eb1..f32c6e1c3882 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -670,8 +670,8 @@ <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Ícono de huella dactilar"</string> <string name="device_unlock_notification_name" msgid="2632928999862915709">"Desbloqueo del dispositivo"</string> <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"Prueba otra forma para desbloquear el dispositivo"</string> - <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa la función de Desbloqueo facial cuando no se reconoce tu huella dactilar (por ejemplo cuando tienes los dedos mojados)"</string> - <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa la función de Desbloqueo facial cuando no se reconoce tu rostro (por ejemplo cuando no hay suficiente luz)"</string> + <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa el Desbloqueo facial si no se reconoce tu huella dactilar (p. ej., si tienes los dedos mojados)"</string> + <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa el Desbloqueo con huellas dactilares si no se reconoce tu rostro (p. ej., si hay poca luz)"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Desbloqueo facial"</string> <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problema con el Desbloqueo facial"</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Presiona para borrar el modelo de rostro y, luego, vuelve a agregar tu rostro"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index ae55f4201407..5ed5e639d3bf 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -670,8 +670,8 @@ <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Icono de huella digital"</string> <string name="device_unlock_notification_name" msgid="2632928999862915709">"Desbloqueo del dispositivo"</string> <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"Prueba otro método de desbloqueo"</string> - <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa Desbloqueo facial cuando no se reconozca tu huella digital (por ejemplo, cuando tus dedos estén húmedos)"</string> - <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa Desbloqueo con huella digital cuando no se reconozca tu cara (por ejemplo, cuando no haya suficiente luz)"</string> + <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa Desbloqueo facial cuando no se reconozca tu huella (p. ej., si tienes los dedos mojados)"</string> + <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa Desbloqueo con huella digital cuando no se reconozca tu cara (p. ej., si hay poca luz)"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Desbloqueo facial"</string> <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problema con Desbloqueo facial"</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Toca para eliminar tu modelo facial y luego añade de nuevo tu cara"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 4bf5e8e2e419..6c3824b2b4c7 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -821,7 +821,7 @@ <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Kustutage tahvelarvuti andmed hoiatamata, lähtestades arvuti tehaseandmetele."</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Kustutatakse teie Android TV seadme andmed ilma hoiatamata, lähtestades seadme tehase andmetele."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Teabe ja meelelahutuse süsteemi andmete hoiatamata kustutamine tehase andmetele lähtestamise abil."</string> - <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"Telefoniandmete hoiatuseta kustutamine, lähtestades telefoni tehaseseadetele."</string> + <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"Kustutab telefoniandmed hoiatuseta, lähtestades telefoni tehaseseadetele."</string> <string name="policylab_wipeData_secondaryUser" product="automotive" msgid="115034358520328373">"Profiili andmete kustutamine"</string> <string name="policylab_wipeData_secondaryUser" product="default" msgid="413813645323433166">"Kasutaja andmete kustutamine"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"Kustutatakse selle kasutaja andmed sellest tahvelarvutist ilma hoiatamata."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index a1064c297ebb..44bb4a35c132 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -670,8 +670,8 @@ <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Icône d\'empreinte digitale"</string> <string name="device_unlock_notification_name" msgid="2632928999862915709">"Déverrouillage de l\'appareil"</string> <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"Essayez une autre façon de déverrouiller"</string> - <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Utilisez Déverrouillage par reconnaissance faciale lorsque votre empreinte digitale n\'est pas reconnue, par exemple lorsque vos doigts sont mouillés"</string> - <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Utilisez Déverrouillage par empreinte digitale lorsque votre visage n\'est pas reconnu, par exemple lorsque la luminosité est insuffisante"</string> + <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Utilisez le Déverrouillage par reconnaissance faciale lorsque votre empreinte digitale n\'est pas reconnue, par exemple lorsque vos doigts sont mouillés"</string> + <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Utilisez le Déverrouillage par empreinte digitale lorsque votre visage n\'est pas reconnu, par exemple lorsque la luminosité est insuffisante"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Déverrouillage par reconnaissance faciale"</string> <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problème avec la fonctionnalité de déverrouillage par reconnaissance faciale"</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Touchez pour supprimer votre modèle facial, puis ajoutez votre visage de nouveau"</string> @@ -809,7 +809,7 @@ <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Contrôler le nombre de mots de passe incorrects saisis pour le déverrouillage de l\'écran, puis verrouiller la tablette ou effacer toutes ses données si le nombre maximal de tentatives de saisie du mot de passe est atteint"</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Surveillez le nombre de mots de passe incorrects entrés lors du déverrouillage de l\'écran et verrouillez votre appareil Android TV ou effacez toutes les données qu\'il contient en cas d\'un nombre trop élevé de tentatives."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Surveillez le nombre de mots de passe incorrects entrés lors du déverrouillage de l\'écran et verrouillez le système d\'infodivertissement ou effacez toutes ses données en cas d\'un nombre trop élevé de tentatives."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Contrôler le nombre de mots de passe incorrects saisis pour le déverrouillage de l\'écran, puis verrouille le téléphone ou efface toutes ses données si le nombre maximal de tentatives de saisie du mot de passe est atteint."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Le nombre de mots de passe incorrects saisis pour le déverrouillage de l\'écran est contrôlé. Si le nombre maximal de tentatives de saisie du mot de passe est atteint, le téléphone est verrouillé ou toutes ses données sont effacées."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"Surveille le nombre de mots de passe incorrects entrés lors du déverrouillage de l\'écran et verrouille la tablette ou efface toutes les données de l\'utilisateur en cas d\'un nombre trop élevé de tentatives."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Surveillez le nombre de mots de passe incorrects entrés lors du déverrouillage de l\'écran et verrouillez votre appareil Android TV ou effacez toutes les données de l\'utilisateur en cas d\'un nombre trop élevé de tentatives."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Surveillez le nombre de mots de passe incorrects entrés lors du déverrouillage de l\'écran et verrouillez le système d\'infodivertissement ou effacez toutes les données de ce profil en cas d\'un nombre trop élevé de tentatives."</string> @@ -822,7 +822,7 @@ <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Effacer les données de la tablette sans avertissement, en rétablissant les paramètres par défaut"</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Effacez les données de votre appareil Android TV sans avertissement en effectuant une réinitialisation des paramètres d\'usine."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Effacez les données du système d\'infodivertissement sans avertissement en rétablissant les paramètres par défaut."</string> - <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"Effacer les données du téléphone sans avertissement en rétablissant les paramètres par défaut."</string> + <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"Les données du téléphone sont effacées sans avertissement en rétablissant les paramètres par défaut."</string> <string name="policylab_wipeData_secondaryUser" product="automotive" msgid="115034358520328373">"Effacer les données de profil"</string> <string name="policylab_wipeData_secondaryUser" product="default" msgid="413813645323433166">"Effacer les données de l\'utilisateur"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"Effacer les données de l\'utilisateur sur cette tablette sans avertissement."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 702f77449431..10852191d9d8 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -2125,7 +2125,7 @@ <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"Le Bluetooth restera activé en mode Avion"</string> <string name="car_loading_profile" msgid="8219978381196748070">"Chargement…"</string> <string name="file_count" msgid="3220018595056126969">"{count,plural, =1{{file_name} + # fichier}one{{file_name} + # fichier}many{{file_name} + # fichiers}other{{file_name} + # fichiers}}"</string> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Aucune recommandation de personnes avec lesquelles effectuer un partage"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Aucun destinataire recommandé"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Liste des applications"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Cette application n\'a pas reçu l\'autorisation d\'enregistrer des contenus audio, mais peut le faire via ce périphérique USB."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Accueil"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index f38db9222700..97f8c2dc7001 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -804,11 +804,11 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"इससे होल्डर उस ऐप्लिकेशन को अपने-आप अपडेट कर पाएगा जो उसने पहले इंस्टॉल किया था"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"पासवर्ड नियम सेट करना"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"स्क्रीन लॉक पासवर्ड और पिन की लंबाई और उनमें स्वीकृत वर्णों को नियंत्रित करना."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक करने के की कोशिशों पर नज़र रखना"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक करने की कोशिशों पर नज़र रखना"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"स्क्रीन को अनलॉक करते समय गलत लिखे गए पासवर्ड की संख्या पर निगरानी करें, और बहुत ज़्यादा बार गलत पासवर्ड लिखे जाने पर टैबलेट लॉक करें या टैबलेट का संपूर्ण डेटा मिटाएं."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"स्क्रीन को अनलॉक करते समय ध्यान रखें कि कितनी बार गलत पासवर्ड डाला गया है. अगर बहुत ज़्यादा बार गलत पासवर्ड डाला गया है, तो अपने Android TV डिवाइस को तुरंत लॉक करें या इसका सभी डेटा मिटाएं."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"स्क्रीन को अनलॉक करते समय ध्यान रखें कि कितनी बार गलत पासवर्ड डाला गया है. अगर बहुत ज़्यादा बार गलत पासवर्ड डाला गया है, तो सूचना और मनोरंजन की सुविधा देने वाले डिवाइस को लॉक करें या इस डिवाइस का सारा डेटा मिटाएं."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"स्क्रीन को अनलॉक करते समय जितनी बार गलत पासवर्ड लिखा गया है, उसकी संख्या पर नज़र रखना और अगर बहुत बार गलत पासवर्ड डाले गए हैं, तो फ़ोन को लॉक कर देना या फ़ोन का सारा डेटा मिटा देना."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"स्क्रीन को अनलॉक करते समय ध्यान रखें कि कितनी बार गलत पासवर्ड डाला गया है. अगर बहुत ज़्यादा बार गलत पासवर्ड डाला गया है, तो अपने फ़ोन को तुरंत लॉक करें या फ़ोन का सारा डेटा मिटा दें."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"स्क्रीन का लॉक खोलते समय गलत तरीके से लिखे गए पासवर्ड पर नज़र रखें, और अगर बार-बार ज़्यादा पासवर्ड लिखे जाते हैं तो टैबलेट को लॉक करें या इस उपयोगकर्ता का सभी डेटा मिटा दें."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"स्क्रीन को अनलॉक करते समय ध्यान रखें कि कितनी बार गलत पासवर्ड डाला गया है. अगर बहुत ज़्यादा बार गलत पासवर्ड डाला गया है, तो अपने Android TV डिवाइस को तुरंत लॉक करें या इस उपयोगकर्ता का सभी डेटा मिटाएं."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"स्क्रीन को अनलॉक करते समय ध्यान रखें कि कितनी बार गलत पासवर्ड डाला गया है. अगर बहुत ज़्यादा बार गलत पासवर्ड डाला गया है, तो सूचना और मनोरंजन की सुविधा देने वाले डिवाइस को लॉक करें या इस प्रोफ़ाइल का सारा डेटा मिटाएं."</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index d26f41de7d5f..c1add6c5c753 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -805,7 +805,7 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Nositelju omogućuje ažuriranje aplikacije koju je prethodno instalirao bez radnje korisnika"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Postavi pravila zaporke"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Upravlja duljinom i znakovima koji su dopušteni u zaporkama i PIN-ovima zaključavanja zaslona."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Nadziri pokušaje otključavanja zaslona"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Nadzor pokušaja otključavanja zaslona"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Nadziri broj netočnih zaporki unesenih pri otključavanju zaslona i zaključaj tabletno računalo ili izbriši sve podatke na njemu ako je uneseno previše netočnih zaporki."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Prati broj netočnih zaporki unesenih prilikom otključavanja zaslona i zaključava Android TV uređaj ili s njega briše sve podatke ako se unese previše netočnih zaporki."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Prati broj netočnih zaporki unesenih prilikom otključavanja zaslona i zaključava sustav za informiranje i zabavu ili briše sve njegove podatke ako se unese previše netočnih zaporki."</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 7b23decfbb06..f1f2cc814f60 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -804,7 +804,7 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Mengizinkan pemegang mengupdate aplikasi yang sebelumnya diinstal tanpa tindakan pengguna"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Setel aturan sandi"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Mengontrol panjang dan karakter yang diizinkan dalam sandi dan PIN kunci layar."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Pantau upaya pembukaan kunci layar"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Memantau upaya pembukaan kunci layar"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Memantau berapa kali sandi yang dimasukkan salah saat ingin membuka kunci layar, dan mengunci tablet atau menghapus semua data tablet jika terjadi terlalu banyak kesalahan memasukkan sandi."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Memantau banyaknya sandi salah yang diketikkan saat membuka kunci layar, dan mengunci perangkat Android TV atau menghapus semua data perangkat Android TV jika terlalu banyak sandi salah diketikkan."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Memantau berapa kali sandi yang dimasukkan salah saat ingin membuka kunci layar, dan mengunci sistem infotainmen atau menghapus semua data sistem infotainmen jika terlalu banyak kesalahan memasukkan sandi."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index f475716cc508..651927a53f08 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -670,13 +670,13 @@ <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Icona dell\'impronta"</string> <string name="device_unlock_notification_name" msgid="2632928999862915709">"Sblocco dispositivo"</string> <string name="alternative_unlock_setup_notification_title" msgid="6241508547901933544">"Prova un\'altra modalità di sblocco"</string> - <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa lo sblocco con il volto se la tua impronta non viene riconosciuta, ad esempio quando hai le dita bagnate"</string> - <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa lo sblocco con l\'impronta se il tuo volto non viene riconosciuto, ad esempio quando non c\'è abbastanza luce"</string> - <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Sblocco con il volto"</string> - <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problema con Sblocco con il volto"</string> + <string name="alternative_face_setup_notification_content" msgid="3384959224091897331">"Usa lo Sblocco con il Volto se la tua impronta non viene riconosciuta, ad esempio se hai le dita bagnate"</string> + <string name="alternative_fp_setup_notification_content" msgid="7454096947415721639">"Usa lo Sblocco con l\'Impronta se il tuo volto non viene riconosciuto, ad esempio se non c\'è abbastanza luce"</string> + <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Sblocco con il Volto"</string> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problema con Sblocco con il Volto"</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Tocca per eliminare il tuo modello del volto e poi riaggiungi il tuo volto"</string> - <string name="face_sensor_privacy_enabled" msgid="7407126963510598508">"Per utilizzare lo sblocco con il volto, attiva "<b>"l\'accesso alla fotocamera"</b>" in Impostazioni > Privacy"</string> - <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Sblocco con l\'impronta"</string> + <string name="face_sensor_privacy_enabled" msgid="7407126963510598508">"Per utilizzare lo Sblocco con il Volto, attiva "<b>"l\'accesso alla fotocamera"</b>" in Impostazioni > Privacy"</string> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Sblocco con l\'Impronta"</string> <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Impossibile utilizzare il sensore di impronte digitali"</string> <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Contatta un fornitore di servizi di riparazione."</string> <string name="face_acquired_insufficient" msgid="6889245852748492218">"Impossibile creare il modello del volto. Riprova."</string> @@ -709,20 +709,20 @@ <string-array name="face_acquired_vendor"> </string-array> <string name="face_error_hw_not_available" msgid="5085202213036026288">"Imposs. verificare volto. Hardware non disponibile."</string> - <string name="face_error_timeout" msgid="2598544068593889762">"Riprova lo sblocco con il volto"</string> + <string name="face_error_timeout" msgid="2598544068593889762">"Riprova lo Sblocco con il Volto"</string> <string name="face_error_no_space" msgid="5649264057026021723">"Imposs. salvare dati nuovi volti. Elimina un volto vecchio."</string> <string name="face_error_canceled" msgid="2164434737103802131">"Operazione associata al volto annullata."</string> - <string name="face_error_user_canceled" msgid="5766472033202928373">"Sblocco con il volto annullato dall\'utente"</string> + <string name="face_error_user_canceled" msgid="5766472033202928373">"Sblocco con il Volto annullato dall\'utente"</string> <string name="face_error_lockout" msgid="7864408714994529437">"Troppi tentativi. Riprova più tardi."</string> - <string name="face_error_lockout_permanent" msgid="8533257333130473422">"Troppi tentativi. Sblocco con il volto non disponibile."</string> + <string name="face_error_lockout_permanent" msgid="8533257333130473422">"Troppi tentativi. Sblocco con il Volto non disponibile."</string> <string name="face_error_lockout_screen_lock" msgid="5062609811636860928">"Troppi tentativi. Inserisci il blocco schermo."</string> <string name="face_error_unable_to_process" msgid="5723292697366130070">"Impossibile verificare il volto. Riprova."</string> - <string name="face_error_not_enrolled" msgid="1134739108536328412">"Non hai configurato lo sblocco con il volto"</string> - <string name="face_error_hw_not_present" msgid="7940978724978763011">"Sblocco con il volto non è supportato su questo dispositivo"</string> + <string name="face_error_not_enrolled" msgid="1134739108536328412">"Non hai configurato lo Sblocco con il Volto"</string> + <string name="face_error_hw_not_present" msgid="7940978724978763011">"Sblocco con il Volto non è supportato su questo dispositivo"</string> <string name="face_error_security_update_required" msgid="5076017208528750161">"Sensore temporaneamente disattivato."</string> <string name="face_name_template" msgid="3877037340223318119">"Volto <xliff:g id="FACEID">%d</xliff:g>"</string> - <string name="face_app_setting_name" msgid="5854024256907828015">"Usa lo sblocco con il volto"</string> - <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Usa lo sblocco con il volto o il blocco schermo"</string> + <string name="face_app_setting_name" msgid="5854024256907828015">"Usa lo Sblocco con il Volto"</string> + <string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Usa lo Sblocco con il Volto o il blocco schermo"</string> <string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Usa il tuo volto per continuare"</string> <string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Per continuare devi usare il tuo volto o il tuo blocco schermo"</string> <string-array name="face_error_vendor"> @@ -974,7 +974,7 @@ <string name="lockscreen_pattern_wrong" msgid="2940138714468358458">"Riprova"</string> <string name="lockscreen_password_wrong" msgid="8605355913868947490">"Riprova"</string> <string name="lockscreen_storage_locked" msgid="634993789186443380">"Sblocca per accedere a funzioni e dati"</string> - <string name="faceunlock_multiple_failures" msgid="681991538434031708">"Numero massimo di tentativi di sblocco con il volto superato"</string> + <string name="faceunlock_multiple_failures" msgid="681991538434031708">"Numero massimo di tentativi di Sblocco con il Volto superato"</string> <string name="lockscreen_missing_sim_message_short" msgid="1229301273156907613">"Nessuna SIM presente"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="3986843848305639161">"Nessuna SIM presente nel tablet."</string> <string name="lockscreen_missing_sim_message" product="tv" msgid="3903140876952198273">"Nessuna SIM presente nel dispositivo Android TV."</string> @@ -1044,7 +1044,7 @@ <string name="keyguard_accessibility_expand_lock_area" msgid="4215280881346033434">"Espandi area di sblocco."</string> <string name="keyguard_accessibility_slide_unlock" msgid="2968195219692413046">"Sblocco con scorrimento."</string> <string name="keyguard_accessibility_pattern_unlock" msgid="8669128146589233293">"Sblocco con sequenza."</string> - <string name="keyguard_accessibility_face_unlock" msgid="4533832120787386728">"Sblocco con il volto."</string> + <string name="keyguard_accessibility_face_unlock" msgid="4533832120787386728">"Sblocco con il Volto."</string> <string name="keyguard_accessibility_pin_unlock" msgid="4020864007967340068">"Sblocco con PIN."</string> <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"Sblocco tramite PIN della SIM."</string> <string name="keyguard_accessibility_sim_puk_unlock" msgid="3459003464041899101">"Sblocco tramite PUK della SIM."</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index a710300362ac..2a432587936c 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -804,7 +804,7 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Бұған дейін орнатылған қолданбаның автоматты түрде жаңартылуына мүмкіндік береді."</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Құпия сөз ережелерін тағайындау"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Экран бекітпесінің құпия сөздерінің және PIN кодтарының ұзындығын және оларда рұқсат етілген таңбаларды басқару."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Экран құлпын ашу әркеттерін бақылау"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Экран құлпын ашу әрекеттерін бақылау"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Экран бекітпесін ашқан кезде терілген қате құпия сөздердің санын бақылау және планшетті бекіту немесе тым көп қате құпия сөздер терілген болса, планшеттің бүкіл деректерін өшіру."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Экранның құлпын ашу кезінде қате енгізілген құпия сөздердің санын бақылау, құпия сөз тым көп қате енгізілген жағдайда, Android TV құрылғысын құлыптау және Android TV құрылғыңыздың барлық деректерінен тазарту."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Экран құлпын ашқан кезде, терілген қате құпия сөздердің саны бақыланады, сондай-ақ құпия сөздер бірнеше рет қате терілсе, ақпараттық-сауықтық жүйе құлыпталады немесе оның барлық дерегі жойылады."</string> @@ -817,7 +817,7 @@ <string name="policydesc_resetPassword" msgid="4626419138439341851">"Экран құлпын өзгерте алады."</string> <string name="policylab_forceLock" msgid="7360335502968476434">"Экранды құлыптау"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"Экранның қашан және қалай құлыпталатынын басқара алады."</string> - <string name="policylab_wipeData" msgid="1359485247727537311">"Барлық деректерді өшіру"</string> + <string name="policylab_wipeData" msgid="1359485247727537311">"Барлық деректі өшіру"</string> <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Планшет дерекқорын ескертусіз, зауыттық дерекқорын қайта реттеу арқылы өшіру."</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Зауыттық деректерді қалпына келтіру арқылы Android TV құрылғыңыздың деректерін ескертусіз тазартыңыз."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Зауыттық деректерді қалпына келтіру арқылы ақпараттық-сауықтық жүйе дерегі ескертусіз өшіріледі."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index ee378dcff9cc..78f6a3487c67 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -808,7 +808,7 @@ <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Экрандын кулпусу ачылып жатканда туура эмес терилген сырсөздөрдүн санын текшерип, эгер алардын саны өтө эле көп болсо, планшетти кулпулаңыз же планшеттеги бардык маалыматтарды тазалап салыңыз."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Экрандын кулпусун ачуу учурунда сырсөздөр канча жолу туура эмес терилгенин тескөө жана сырсөз өтө көп жолу туура эмес терилген болсо, Android TV түзмөгүңүздү кулпулап же Android TV түзмөгүңүздөгү бардык дайын-даректериңизди тазалап салуу."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Экрандын кулпусу ачылып жатканда туура эмес терилген сырсөздөрдүн саны текшерилип, эгер алардын саны өтө эле көп болсо, инфозоок тутуму кулпуланып же инфозоок тутумундагы бардык маалыматтар өчүрүлөт."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Экрандын кулпусу ачылып жатканда туура эмес терилген сырсөздөрдүн санын текшерип, эгер алардын саны өтө эле көп болсо, телефонду кулпулаңыз же телефондогу бардык маалыматтарды тазалап салыңыз."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Экрандын кулпусун ачуу аракеттерине көз салып, сырсөз өтө көп жолу туура эмес терилсе, телефонду кулпулайт же андагы бардык нерселерди өчүрүп салат."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"Экрандын кулпусун ачуу учурунда туура эмес терилген сырсөздөрдү тескөө жана сырсөз өтө көп жолу туура эмес терилген болсо, планшетти кулпулап же бул колдонуучунун бардык дайындарын тазалап салуу."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Экрандын кулпусун ачуу учурунда сырсөздөр канча жолу туура эмес терилгенин тескөө жана сырсөз өтө көп жолу туура эмес терилген болсо, Android TV түзмөгүңүздү кулпулап же колдонуучунун бардык дайындарын тазалап салуу."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Экрандын кулпусун ачуу учурунда туура эмес терилген сырсөздөрдү тескөө жана сырсөз өтө көп жолу туура эмес терилген болсо, инфозоок тутуму кулпуланып же бул профилдин бардык дайындары өчүрүлөт."</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 1550c041acc7..570c49951bef 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -804,11 +804,11 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"होल्डरला वापरकर्त्याच्या कृतीशिवाय पूर्वी इंस्टॉल केलेले अॅप अपडेट करण्याची अनुमती देते"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"पासवर्ड नियम सेट करा"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"स्क्रीन लॉक पासवर्ड आणि पिन मध्ये अनुमती दिलेले लांबी आणि वर्ण नियंत्रित करा."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक प्रयत्नांचे परीक्षण करा"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"स्क्रीन अनलॉक प्रयत्नांवर लक्ष ठेवा"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"टाइप केलेल्या अयोग्य पासवर्डांच्या अंकांचे परीक्षण करा. स्क्रीन अनलॉक केली जाते, तेव्हा टॅबलेट लॉक करा किंवा बरेच पासवर्ड टाइप केले असल्यास टॅबलेटचा सर्व डेटा मिटवा."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"स्क्रीन अनलॉक करताना टाइप केलेल्या चुकीच्या पासवर्ड संख्येचे परीक्षण करते आणि Android TV डिव्हाइस लॉक करते किंवा अनेक चुकीचे पासवर्ड टाइप केले असल्यास Android TV डिव्हाइसचा सर्व डेटा मिटवते."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"टाइप केलेल्या चुकीच्या पासवर्डच्या संख्येचे निरीक्षण करा. स्क्रीन अनलॉक करताना, इंफोटेनमेंट सिस्टीम लॉक करा किंवा अनेक चुकीचे पासवर्ड टाइप केले असल्यास, इंफोटेनमेंट सिस्टीमचा सर्व डेटा मिटवा."</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"टाइप केलेल्या अयोग्य पासवर्डांच्या अंकांचे परीक्षण करा. स्क्रीन अनलॉक केली जाते, तेव्हा फोन लॉक करा किंवा बरेच पासवर्ड टाइप केले असल्यास फोनचा सर्व डेटा मिटवा."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"स्क्रीन अनलॉक करताना टाइप केलेल्या अयोग्य पासवर्डच्या संख्येवर लक्ष ठेवा. बरेच पासवर्ड टाइप केले असल्यास फोन लॉक करा किंवा फोनचा सर्व डेटा मिटवा."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"स्क्रीन अनलॉक करताना टाइप केलेल्या चुकीच्या पासवर्डांच्या संख्येचे परीक्षण करा आणि टॅबलेट लॉक करा किंवा अनेक चुकीचे पासवर्ड टाइप केले असल्यास या वापरकर्त्याचा सर्व डेटा मिटवा."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"स्क्रीन अनलॉक करताना टाइप केलेल्या चुकीच्या पासवर्ड संख्येचे परीक्षण करते आणि Android TV डिव्हाइस लॉक करते किंवा अनेक चुकीचे पासवर्ड टाइप केले असल्यास वापरकर्त्याचा सर्व डेटा मिटवते."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"स्क्रीन अनलॉक करताना टाइप केलेल्या चुकीच्या पासवर्डच्या संख्येचे निरीक्षण करा आणि इंफोटेनमेंट सिस्टीम लॉक करा किंवा अनेक चुकीचे पासवर्ड टाइप केले असल्यास, या प्रोफाइलचा सर्व डेटा मिटवा."</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 03d431aba036..db88c641c474 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -804,7 +804,7 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Lar innehaveren oppdatere appen hen tidligere installerte, uten brukerhandling"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Angi passordregler"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Kontrollerer tillatt lengde og tillatte tegn i passord og PIN-koder for opplåsing av skjermen."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Overvåk forsøk på å låse opp skjermen"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Overvåking av forsøk på å låse opp skjermen"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Overvåk antall feil passordforsøk ved opplåsing av skjerm, og lås nettbrettet eller slett alle data fra nettbrettet ved for mange feil passordforsøk."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Følg med på hvor mange ganger feil passord skrives inn når skjermen skal låses opp, og lås Android TV-enheten eller tøm alle dataene når feil passord skrives inn for mange ganger."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Overvåk antall feil passord som er skrevet inn ved opplåsing av skjermen, og lås infotainment-systemet eller tøm alle dataene i infotainment-systemet hvis feil passord skrives inn for mange ganger."</string> @@ -1286,13 +1286,13 @@ <string name="volume_call" msgid="7625321655265747433">"Samtalevolum"</string> <string name="volume_bluetooth_call" msgid="2930204618610115061">"Bluetooth-samtalevolum"</string> <string name="volume_alarm" msgid="4486241060751798448">"Alarmvolum"</string> - <string name="volume_notification" msgid="6864412249031660057">"Varslingsvolum"</string> + <string name="volume_notification" msgid="6864412249031660057">"Varselvolum"</string> <string name="volume_unknown" msgid="4041914008166576293">"Volum"</string> <string name="volume_icon_description_bluetooth" msgid="7540388479345558400">"Bluetooth-volum"</string> <string name="volume_icon_description_ringer" msgid="2187800636867423459">"Ringetonevolum"</string> <string name="volume_icon_description_incall" msgid="4491255105381227919">"Samtalevolum"</string> <string name="volume_icon_description_media" msgid="4997633254078171233">"Medievolum"</string> - <string name="volume_icon_description_notification" msgid="579091344110747279">"Varslingsvolum"</string> + <string name="volume_icon_description_notification" msgid="579091344110747279">"Varselvolum"</string> <string name="ringtone_default" msgid="9118299121288174597">"Standard ringetone"</string> <string name="ringtone_default_with_actual" msgid="2709686194556159773">"Standard (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="397111123930141876">"Ingen"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 62818b0e6736..cd1669d3ca89 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -329,7 +329,7 @@ <string name="permgrouplab_sensors" msgid="9134046949784064495">"Lichaamssensoren"</string> <string name="permgroupdesc_sensors" msgid="2610631290633747752">"toegang krijgen tot sensorgegevens over je vitale functies"</string> <string name="permgrouplab_notifications" msgid="5472972361980668884">"Meldingen"</string> - <string name="permgroupdesc_notifications" msgid="4608679556801506580">"meldingen laten zien"</string> + <string name="permgroupdesc_notifications" msgid="4608679556801506580">"meldingen tonen"</string> <string name="capability_title_canRetrieveWindowContent" msgid="7554282892101587296">"Content van vensters ophalen"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="6195610527625237661">"De content inspecteren van een venster waarmee je interactie hebt."</string> <string name="capability_title_canRequestTouchExploration" msgid="327598364696316213">"Verkennen via aanraking aanzetten"</string> @@ -594,8 +594,8 @@ <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Hiermee kan de app de toetsenblokkering en bijbehorende wachtwoordbeveiliging uitzetten. Zo kan de telefoon de toetsenblokkering uitzetten als je wordt gebeld en de toetsenblokkering weer aanzetten als het gesprek is beëindigd."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"complexiteit van schermvergrendeling opvragen"</string> <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Hiermee krijgt de app toestemming om het complexiteitsniveau van de schermvergrendeling te achterhalen (hoog, midden, laag of geen). Dat geeft een indicatie van het mogelijke lengtebereik en type van de schermvergrendeling. De app kan gebruikers ook voorstellen de schermvergrendeling naar een bepaald niveau te updaten, maar gebruikers kunnen dit altijd negeren en de app verlaten. De schermvergrendeling wordt niet opgeslagen als platte tekst, zodat de app het precieze wachtwoord niet weet."</string> - <string name="permlab_postNotification" msgid="4875401198597803658">"meldingen laten zien"</string> - <string name="permdesc_postNotification" msgid="5974977162462877075">"Hiermee kan de app meldingen laten zien"</string> + <string name="permlab_postNotification" msgid="4875401198597803658">"meldingen tonen"</string> + <string name="permdesc_postNotification" msgid="5974977162462877075">"Hiermee kan de app meldingen tonen"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"het scherm aanzetten"</string> <string name="permdesc_turnScreenOn" msgid="4394606875897601559">"Hiermee kan de app het scherm aanzetten."</string> <string name="permlab_useBiometric" msgid="6314741124749633786">"biometrische hardware gebruiken"</string> @@ -2094,7 +2094,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Uitzetten"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Meer informatie"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"In Android 12 hebben verbeterde meldingen aanpasbare Android-meldingen vervangen. Deze functie laat voorgestelde acties en antwoorden zien en ordent je meldingen.\n\nVerbeterde meldingen hebben toegang tot meldingscontent, waaronder persoonlijke informatie zoals contactnamen en berichten. Deze functie kan ook meldingen sluiten of erop reageren, zoals telefoongesprekken aannemen, en Niet storen beheren."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"In Android 12 hebben verbeterde meldingen aanpasbare Android-meldingen vervangen. Deze functie toont voorgestelde acties en antwoorden en ordent je meldingen.\n\nVerbeterde meldingen hebben toegang tot meldingscontent, waaronder persoonlijke informatie zoals contactnamen en berichten. Deze functie kan ook meldingen sluiten of erop reageren, zoals telefoongesprekken aannemen, en Niet storen beheren."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Informatiemelding voor routinemodus"</string> <string name="dynamic_mode_notification_title" msgid="1388718452788985481">"Batterijbesparing staat aan"</string> <string name="dynamic_mode_notification_summary" msgid="1639031262484979689">"Het batterijgebruik wordt beperkt om de batterijduur te verlengen"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 5102387699cd..88d9d4717888 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -2124,7 +2124,7 @@ <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"ଏୟାରପ୍ଲେନ୍ ମୋଡରେ ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ରହିବ"</string> <string name="car_loading_profile" msgid="8219978381196748070">"ଲୋଡ୍ ହେଉଛି"</string> <string name="file_count" msgid="3220018595056126969">"{count,plural, =1{{file_name} + #ଟି ଫାଇଲ}other{{file_name} + #ଟି ଫାଇଲ}}"</string> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"ଏହାକୁ ସେୟାର୍ କରିବା ପାଇଁ କୌଣସି ସୁପାରିଶ କରାଯାଇଥିବା ଲୋକ ନାହାଁନ୍ତି"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"ଏହାକୁ ସେୟାର କରିବା ପାଇଁ କୌଣସି ସୁପାରିଶ କରାଯାଇଥିବା ଲୋକ ନାହାଁନ୍ତି"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"ଆପ୍ସ ତାଲିକା"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"ଏହି ଆପ୍କୁ ରେକର୍ଡ କରିବାକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ କିନ୍ତୁ ଏହି USB ଡିଭାଇସ୍ ଜରିଆରେ ଅଡିଓ କ୍ୟାପ୍ଚର୍ କରିପାରିବ।"</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"ହୋମ"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index acefd071c617..f537d68685e6 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -806,7 +806,7 @@ <string name="permdesc_updatePackagesWithoutUserAction" msgid="4567739631260526366">"Povolí vlastníkovi aktualizovať aplikáciu, ktorá bola nainštalovaná bez akcie používateľa"</string> <string name="policylab_limitPassword" msgid="4851829918814422199">"Nastaviť pravidlá pre heslo"</string> <string name="policydesc_limitPassword" msgid="4105491021115793793">"Nastavte dĺžku hesiel na odomknutie obrazovky aj kódov PIN a v nich používané znaky."</string> - <string name="policylab_watchLogin" msgid="7599669460083719504">"Sledovanie pokusov o odomknutie obrazovky"</string> + <string name="policylab_watchLogin" msgid="7599669460083719504">"Sledovať pokusy o odomknutie obrazovky"</string> <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Sledovať počet nesprávnych hesiel zadaných pri odomykaní obrazovky a zamknúť tablet alebo vymazať všetky údaje tabletu v prípade príliš veľkého počtu neplatných pokusov o zadanie hesla."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Sledovanie počtu nesprávnych hesiel zadaných pri odomykaní obrazovky a v prípade, že ich je zadaných príliš mnoho, uzamknutie zariadenia Android TV alebo vymazanie všetkých jeho údajov."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Sledujte počet nesprávnych hesiel zadaných pri odomykaní obrazovky a uzamknite palubný systém alebo vymažte všetky údaje v palubnom systéme v prípade príliš veľkého počtu neplatných pokusov o zadanie hesla."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index c46b66605e39..327de1fc6757 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -810,7 +810,7 @@ <string name="policydesc_watchLogin" product="tablet" msgid="2388436408621909298">"Nadzoruje število nepravilno vnesenih gesel pri odklepanju zaslona in zaklene tablični računalnik ali izbriše vse podatke v njem, če je vnesenih preveč nepravilnih gesel."</string> <string name="policydesc_watchLogin" product="tv" msgid="2140588224468517507">"Nadzira število vnesenih nepravilnih gesel pri odklepanju zaslona in zaklene napravo Android TV ali izbriše vse podatke v napravi Android TV, če je vnesenih preveč nepravilnih gesel."</string> <string name="policydesc_watchLogin" product="automotive" msgid="7011438994051251521">"Spremljanje števila nepravilno vnesenih gesel pri odklepanju zaslona in zaklenitev informativno-razvedrilnega sistema ali izbris vseh podatkov v njem v primeru preveč vnosov nepravilnih gesel"</string> - <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Spremljajte število vnesenih napačnih gesel, s katerimi želite odkleniti zaslon. Če je teh vnosov preveč, zaklenite telefon ali izbrišite vse podatke v njem."</string> + <string name="policydesc_watchLogin" product="default" msgid="4885030206253600299">"Spremljanje števila vnosov napačnih gesel za odklepanje zaslona ter zaklenitev telefona ali izbris vseh podatkov v njem v primeru prevelikega števila vnosov napačnih gesel."</string> <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="2049038943004297474">"Nadzira število vnesenih nepravilnih gesel pri odklepanju zaslona in zaklene tablični računalnik ali izbriše vse podatke lastnika, če je vnesenih preveč nepravilnih gesel."</string> <string name="policydesc_watchLogin_secondaryUser" product="tv" msgid="8965224107449407052">"Nadzira število vnesenih nepravilnih gesel pri odklepanju zaslona in zaklene napravo Android TV ali izbriše vse podatke tega uporabnika, če je vnesenih preveč nepravilnih gesel."</string> <string name="policydesc_watchLogin_secondaryUser" product="automotive" msgid="7180857406058327941">"Spremljanje števila nepravilno vnesenih gesel pri odklepanju zaslona in zaklenitev informativno-razvedrilnega sistema ali izbris vseh podatkov tega profila v primeru preveč vnosov nepravilnih gesel"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index b05a861614be..54983f38618e 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -981,7 +981,7 @@ <string name="lockscreen_missing_sim_instructions" msgid="5823469004536805423">"Shto një kartë SIM."</string> <string name="lockscreen_missing_sim_instructions_long" msgid="4403843937236648032">"Karta SIM mungon ose është e palexueshme. Shto një kartë SIM."</string> <string name="lockscreen_permanent_disabled_sim_message_short" msgid="1925200607820809677">"Kartë SIM e papërdorshme."</string> - <string name="lockscreen_permanent_disabled_sim_instructions" msgid="6902979937802238429">"Karta jote SIM është çaktivizuar përgjithmonë.\n Kontakto me ofruesin e shërbimit me valë për një kartë tjetër SIM."</string> + <string name="lockscreen_permanent_disabled_sim_instructions" msgid="6902979937802238429">"Karta jote SIM është çaktivizuar përgjithmonë.\n Kontakto me ofruesin e shërbimit wireless për një tjetër kartë SIM."</string> <string name="lockscreen_transport_prev_description" msgid="2879469521751181478">"Kënga e mëparshme"</string> <string name="lockscreen_transport_next_description" msgid="2931509904881099919">"Kënga tjetër"</string> <string name="lockscreen_transport_pause_description" msgid="6705284702135372494">"Pauzë"</string> @@ -1196,7 +1196,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ërndaj me %1$s"</string> + <string name="whichSendApplicationNamed" msgid="4470386782693183461">"Ndaj 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> @@ -1521,7 +1521,7 @@ <string name="matches_found" msgid="2296462299979507689">"{count,plural, =1{# përputhje}other{# nga {total}}}"</string> <string name="action_mode_done" msgid="2536182504764803222">"U krye"</string> <string name="progress_erasing" msgid="6891435992721028004">"Po fshin hapësirën ruajtëse të brendshme…"</string> - <string name="share" msgid="4157615043345227321">"Shpërndaj"</string> + <string name="share" msgid="4157615043345227321">"Ndaj"</string> <string name="find" msgid="5015737188624767706">"Gjej"</string> <string name="websearch" msgid="5624340204512793290">"Kërkim në internet"</string> <string name="find_next" msgid="5341217051549648153">"Gjej tjetrën"</string> @@ -1566,8 +1566,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ë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="shareactionprovider_share_with" msgid="2753089758467748982">"Ndaj me"</string> + <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"Ndaj 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> @@ -1611,7 +1611,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ërndaj me"</string> + <string name="share_action_provider_share_with" msgid="1904096863622941880">"Ndaj 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> @@ -1627,7 +1627,7 @@ <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistemi"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"Audioja e \"bluetooth-it\""</string> - <string name="wireless_display_route_description" msgid="8297563323032966831">"Ekran pa tel"</string> + <string name="wireless_display_route_description" msgid="8297563323032966831">"Ekran wireless"</string> <string name="media_route_button_content_description" msgid="2299223698196869956">"Transmeto"</string> <string name="media_route_chooser_title" msgid="6646594924991269208">"Lidhu me pajisjen"</string> <string name="media_route_chooser_title_for_remote_display" msgid="3105906508794326446">"Transmeto ekranin në pajisje"</string> @@ -1885,9 +1885,9 @@ <string name="zen_mode_duration_minutes_short" msgid="2435756450204526554">"{count,plural, =1{Për 1 min.}other{Për # min.}}"</string> <string name="zen_mode_duration_hours" msgid="7841806065034711849">"{count,plural, =1{Për 1 orë}other{Për # orë}}"</string> <string name="zen_mode_duration_hours_short" msgid="3666949653933099065">"{count,plural, =1{Për 1 orë}other{Për # orë}}"</string> - <string name="zen_mode_until_next_day" msgid="1403042784161725038">"Deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_until" msgid="2250286190237669079">"Deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_alarm" msgid="7046911727540499275">"Deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (alarmi tjetër)"</string> + <string name="zen_mode_until_next_day" msgid="1403042784161725038">"Deri: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_until" msgid="2250286190237669079">"Deri: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_alarm" msgid="7046911727540499275">"Deri: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (alarmi tjetër)"</string> <string name="zen_mode_forever" msgid="740585666364912448">"Derisa ta çaktivizosh"</string> <string name="zen_mode_forever_dnd" msgid="3423201955704180067">"Deri sa të çaktivizosh gjendjen \"Mos shqetëso\""</string> <string name="zen_mode_rule_name_combination" msgid="7174598364351313725">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 5f62542218a1..113627074390 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -817,7 +817,7 @@ <string name="policydesc_resetPassword" msgid="4626419138439341851">"Ekran kilidini değiştirir."</string> <string name="policylab_forceLock" msgid="7360335502968476434">"Ekranı kilitleme"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"Ekranın nasıl ve ne zaman kilitleneceğini denetler."</string> - <string name="policylab_wipeData" msgid="1359485247727537311">"Tüm verileri silme"</string> + <string name="policylab_wipeData" msgid="1359485247727537311">"Tüm verileri sil"</string> <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Fabrika verilerine sıfırlama işlemi gerçekleştirerek tabletteki verileri uyarıda bulunmadan siler."</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Fabrika verilerine sıfırlama işlemi gerçekleştirerek Android TV cihazınızdaki verileri uyarıda bulunmadan siler."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Fabrika verilerine sıfırlama işlemi gerçekleştirerek bilgi-eğlence sistemindeki veriler uyarıda bulunmadan silinir."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index c1510b97aa15..dc1499fea1f0 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -819,7 +819,7 @@ <string name="policydesc_resetPassword" msgid="4626419138439341851">"Змінити спосіб розблокування екрана."</string> <string name="policylab_forceLock" msgid="7360335502968476434">"Блокувати екран"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"Контролювати, як і коли блокується екран."</string> - <string name="policylab_wipeData" msgid="1359485247727537311">"Видалити всі дані"</string> + <string name="policylab_wipeData" msgid="1359485247727537311">"Видаляти всі дані"</string> <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"Стирати дані планшетного ПК без попередження, відновлюючи заводські налаштування."</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"Видаляйте дані пристрою Android TV без попередження шляхом відновлення заводських налаштувань."</string> <string name="policydesc_wipeData" product="automotive" msgid="660804547737323300">"Видаляйте всі дані інформаційно-розважальної системи без попередження, відновлюючи заводські налаштування."</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f5b0711a37aa..24dbc5eaed41 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2791,7 +2791,7 @@ <!-- Base "handwriting slop" value used by ViewConfiguration as a movement threshold where stylus handwriting should begin. --> - <dimen name="config_viewConfigurationHandwritingSlop">4dp</dimen> + <dimen name="config_viewConfigurationHandwritingSlop">2dp</dimen> <!-- Base "hover slop" value used by ViewConfiguration as a movement threshold under which hover is considered "stationary". --> @@ -5348,6 +5348,10 @@ to enroll the other eligible biometric. --> <fraction name="config_biometricNotificationFrrThreshold">25%</fraction> + <!-- Whether to enable the biometric notification for dual-modality device that enrolled a + single biometric and experiences high FRR. --> + <bool name="config_biometricFrrNotificationEnabled">false</bool> + <!-- The component name for the default profile supervisor, which can be set as a profile owner even after user setup is complete. The defined component should be used for supervision purposes only. The component must be part of a system app. --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c78af86f0f39..be43a4fc238d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2584,6 +2584,7 @@ <!-- Biometric FRR config --> <java-symbol type="fraction" name="config_biometricNotificationFrrThreshold" /> + <java-symbol type="bool" name="config_biometricFrrNotificationEnabled" /> <!-- Biometric FRR notification messages --> <java-symbol type="string" name="device_unlock_notification_name" /> diff --git a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java index 2ef923d1339a..84a6c45adac2 100644 --- a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java +++ b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java @@ -251,6 +251,20 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { } @Test + public void identifierToHalProgramIdentifier_withDeprecateDabId() { + long value = 0x98765ABCDL; + ProgramSelector.Identifier dabId = new ProgramSelector.Identifier( + ProgramSelector.IDENTIFIER_TYPE_DAB_SID_EXT, value); + ProgramIdentifier halDabIdExpected = AidlTestUtils.makeHalIdentifier( + IdentifierType.DAB_SID_EXT, 0x987650000ABCDL); + + ProgramIdentifier halDabId = ConversionUtils.identifierToHalProgramIdentifier(dabId); + + expect.withMessage("Converted 28-bit DAB identifier for HAL").that(halDabId) + .isEqualTo(halDabIdExpected); + } + + @Test public void identifierFromHalProgramIdentifier_withDabId() { ProgramSelector.Identifier dabId = ConversionUtils.identifierFromHalProgramIdentifier(TEST_HAL_DAB_SID_EXT_ID); diff --git a/core/tests/coretests/src/android/content/BroadcastReceiverTests.java b/core/tests/coretests/src/android/content/BroadcastReceiverTests.java index 5dbeac2f32e9..407c6c3e2e2c 100644 --- a/core/tests/coretests/src/android/content/BroadcastReceiverTests.java +++ b/core/tests/coretests/src/android/content/BroadcastReceiverTests.java @@ -26,6 +26,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; +import java.util.List; + @RunWith(AndroidJUnit4.class) @SmallTest public class BroadcastReceiverTests { @@ -47,15 +50,22 @@ public class BroadcastReceiverTests { @Test public void testReceiverLimit() { final IntentFilter mockFilter = new IntentFilter("android.content.tests.TestAction"); + final List<EmptyReceiver> receivers = new ArrayList<>(RECEIVER_LIMIT_PER_APP); try { for (int i = 0; i < RECEIVER_LIMIT_PER_APP + 1; i++) { - mContext.registerReceiver(new EmptyReceiver(), mockFilter, + final EmptyReceiver receiver = new EmptyReceiver(); + mContext.registerReceiver(receiver, mockFilter, Context.RECEIVER_EXPORTED_UNAUDITED); + receivers.add(receiver); } fail("No exception thrown when registering " + (RECEIVER_LIMIT_PER_APP + 1) + " receivers"); } catch (IllegalStateException ise) { // Expected + } finally { + for (int i = receivers.size() - 1; i >= 0; i--) { + mContext.unregisterReceiver(receivers.remove(i)); + } } } } diff --git a/core/tests/coretests/src/android/view/ViewGroupGetChildLocalHitRegionTest.java b/core/tests/coretests/src/android/view/ViewGroupGetChildLocalHitRegionTest.java index 60a0a2adbbbe..c210fd631f06 100644 --- a/core/tests/coretests/src/android/view/ViewGroupGetChildLocalHitRegionTest.java +++ b/core/tests/coretests/src/android/view/ViewGroupGetChildLocalHitRegionTest.java @@ -90,22 +90,73 @@ public class ViewGroupGetChildLocalHitRegionTest { assertGetChildLocalHitRegionEmpty(R.id.view_cover_top, R.id.view_cover_bottom); } + @Test + public void testGetChildLocalHitRegion_topViewIsNotBlockedByBottomView() { + // In this case, two views overlap with each other and the MotionEvent is injected to the + // bottom view. It verifies that the hit region of the top view won't be blocked by the + // bottom view. + testGetChildLocalHitRegion_topViewIsNotBlockedByBottomView(/* isHover= */ true); + testGetChildLocalHitRegion_topViewIsNotBlockedByBottomView(/* isHover= */ false); + } + + private void testGetChildLocalHitRegion_topViewIsNotBlockedByBottomView(boolean isHover) { + // In this case, two views overlap with each other and the MotionEvent is injected to the + // bottom view. It verifies that the hit region of the top view won't be blocked by the + // bottom view. + mScenarioRule.getScenario().onActivity(activity -> { + View viewTop = activity.findViewById(R.id.view_overlap_top); + View viewBottom = activity.findViewById(R.id.view_overlap_bottom); + + // The viewTop covers the left side of the viewBottom. To avoid the MotionEvent gets + // blocked by viewTop, we inject MotionEvents into viewBottom's right bottom corner. + float x = viewBottom.getWidth() - 1; + float y = viewBottom.getHeight() - 1; + injectMotionEvent(viewBottom, x, y, isHover); + + Matrix actualMatrix = new Matrix(); + Region actualRegion = new Region(0, 0, viewTop.getWidth(), viewTop.getHeight()); + boolean actualNotEmpty = viewTop.getParent() + .getChildLocalHitRegion(viewTop, actualRegion, actualMatrix, isHover); + + int[] windowLocation = new int[2]; + viewTop.getLocationInWindow(windowLocation); + Matrix expectMatrix = new Matrix(); + expectMatrix.preTranslate(-windowLocation[0], -windowLocation[1]); + // Though viewTop and viewBottom overlaps, viewTop's hit region won't be blocked by + // viewBottom. + Region expectRegion = new Region(0, 0, viewTop.getWidth(), viewTop.getHeight()); + + assertThat(actualNotEmpty).isTrue(); + assertThat(actualMatrix).isEqualTo(expectMatrix); + assertThat(actualRegion).isEqualTo(expectRegion); + }); + } + private void injectMotionEvent(View view, boolean isHover) { + float x = view.getWidth() / 2f; + float y = view.getHeight() / 2f; + injectMotionEvent(view, x, y, isHover); + } + + /** + * Inject MotionEvent into the given view, at the given location specified in the view's + * coordinates. + */ + private void injectMotionEvent(View view, float x, float y, boolean isHover) { int[] location = new int[2]; view.getLocationInWindow(location); - float x = location[0] + view.getWidth() / 2f; - float y = location[1] + view.getHeight() / 2f; + float globalX = location[0] + x; + float globalY = location[1] + y; int action = isHover ? MotionEvent.ACTION_HOVER_ENTER : MotionEvent.ACTION_DOWN; MotionEvent motionEvent = MotionEvent.obtain(/* downtime= */ 0, /* eventTime= */ 0, action, - x, y, /* pressure= */ 0, /* size= */ 0, /* metaState= */ 0, + globalX, globalY, /* pressure= */ 0, /* size= */ 0, /* metaState= */ 0, /* xPrecision= */ 1, /* yPrecision= */ 1, /* deviceId= */0, /* edgeFlags= */0); View rootView = view.getRootView(); rootView.dispatchPointerEvent(motionEvent); } - private void assertGetChildLocalHitRegion(int viewId) { assertGetChildLocalHitRegion(viewId, /* isHover= */ true); assertGetChildLocalHitRegion(viewId, /* isHover= */ false); diff --git a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java index c46118db617f..f39bddd7f032 100644 --- a/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java +++ b/core/tests/coretests/src/android/view/stylus/HandwritingInitiatorTest.java @@ -88,8 +88,8 @@ public class HandwritingInitiatorTest { } private HandwritingInitiator mHandwritingInitiator; - private View mTestView1; - private View mTestView2; + private EditText mTestView1; + private EditText mTestView2; private Context mContext; @Before @@ -123,6 +123,9 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_startHandwriting_when_stylusMoveOnce_withinHWArea() { + mTestView1.setText("hello"); + when(mTestView1.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(4); + mHandwritingInitiator.onInputConnectionCreated(mTestView1); final int x1 = (sHwArea1.left + sHwArea1.right) / 2; final int y1 = (sHwArea1.top + sHwArea1.bottom) / 2; @@ -141,6 +144,9 @@ public class HandwritingInitiatorTest { // After IMM.startHandwriting is triggered, onTouchEvent should return true for ACTION_MOVE // events so that the events are not dispatched to the view tree. assertThat(onTouchEventResult2).isTrue(); + // Since the stylus down point was inside the TextView's bounds, the handwriting initiator + // does not need to set the cursor position. + verify(mTestView1, never()).setSelection(anyInt()); } @Test @@ -185,6 +191,9 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_startHandwriting_when_stylusMove_withinExtendedHWArea() { + mTestView1.setText("hello"); + when(mTestView1.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(4); + mHandwritingInitiator.onInputConnectionCreated(mTestView1); final int x1 = sHwArea1.left - HW_BOUNDS_OFFSETS_LEFT_PX / 2; final int y1 = sHwArea1.top - HW_BOUNDS_OFFSETS_TOP_PX / 2; @@ -199,6 +208,9 @@ public class HandwritingInitiatorTest { // Stylus movement within extended HandwritingArea should trigger IMM.startHandwriting once. verify(mHandwritingInitiator, times(1)).startHandwriting(mTestView1); + // Since the stylus down point was outside the TextView's bounds, the handwriting initiator + // sets the cursor position. + verify(mTestView1).setSelection(4); } @Test @@ -221,6 +233,8 @@ public class HandwritingInitiatorTest { @Test public void onTouchEvent_startHandwriting_inputConnectionBuilt_stylusMoveInExtendedHWArea() { + mTestView1.setText("hello"); + when(mTestView1.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(4); // The stylus down point is between mTestView1 and mTestView2, but it is within the // extended handwriting area of both views. It is closer to mTestView1. final int x1 = sHwArea1.right + HW_BOUNDS_OFFSETS_RIGHT_PX / 2; @@ -241,6 +255,9 @@ public class HandwritingInitiatorTest { // the stylus down point is closest to this view. mHandwritingInitiator.onInputConnectionCreated(mTestView1); verify(mHandwritingInitiator).startHandwriting(mTestView1); + // Since the stylus down point was outside the TextView's bounds, the handwriting initiator + // sets the cursor position. + verify(mTestView1).setSelection(4); } @Test diff --git a/core/tests/coretests/src/android/view/stylus/HandwritingTestUtil.java b/core/tests/coretests/src/android/view/stylus/HandwritingTestUtil.java index b4c72ca3226b..3b2ab4c8bb50 100644 --- a/core/tests/coretests/src/android/view/stylus/HandwritingTestUtil.java +++ b/core/tests/coretests/src/android/view/stylus/HandwritingTestUtil.java @@ -16,6 +16,9 @@ package android.view.stylus; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,22 +29,23 @@ import android.graphics.Rect; import android.graphics.Region; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; import androidx.test.platform.app.InstrumentationRegistry; public class HandwritingTestUtil { - public static View createView(Rect handwritingArea) { + public static EditText createView(Rect handwritingArea) { return createView(handwritingArea, true /* autoHandwritingEnabled */, true /* isStylusHandwritingAvailable */); } - public static View createView(Rect handwritingArea, boolean autoHandwritingEnabled, + public static EditText createView(Rect handwritingArea, boolean autoHandwritingEnabled, boolean isStylusHandwritingAvailable) { return createView(handwritingArea, autoHandwritingEnabled, isStylusHandwritingAvailable, 0, 0, 0, 0); } - public static View createView(Rect handwritingArea, boolean autoHandwritingEnabled, + public static EditText createView(Rect handwritingArea, boolean autoHandwritingEnabled, boolean isStylusHandwritingAvailable, float handwritingBoundsOffsetLeft, float handwritingBoundsOffsetTop, float handwritingBoundsOffsetRight, float handwritingBoundsOffsetBottom) { @@ -68,7 +72,7 @@ public class HandwritingTestUtil { } }; - View view = spy(new View(context)); + EditText view = spy(new EditText(context)); when(view.isAttachedToWindow()).thenReturn(true); when(view.isAggregatedVisible()).thenReturn(true); when(view.isStylusHandwritingAvailable()).thenReturn(isStylusHandwritingAvailable); @@ -77,6 +81,13 @@ public class HandwritingTestUtil { when(view.getHandwritingBoundsOffsetTop()).thenReturn(handwritingBoundsOffsetTop); when(view.getHandwritingBoundsOffsetRight()).thenReturn(handwritingBoundsOffsetRight); when(view.getHandwritingBoundsOffsetBottom()).thenReturn(handwritingBoundsOffsetBottom); + doAnswer(invocation -> { + int[] outLocation = invocation.getArgument(0); + outLocation[0] = handwritingArea.left; + outLocation[1] = handwritingArea.top; + return null; + }).when(view).getLocationInWindow(any()); + when(view.getOffsetForPosition(anyFloat(), anyFloat())).thenReturn(0); view.setAutoHandwritingEnabled(autoHandwritingEnabled); parent.addView(view); return view; diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserListAdapterTest.kt b/core/tests/coretests/src/com/android/internal/app/ChooserListAdapterTest.kt index 2eeaf53ef146..1c9f04a299cc 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserListAdapterTest.kt +++ b/core/tests/coretests/src/com/android/internal/app/ChooserListAdapterTest.kt @@ -19,8 +19,12 @@ package com.android.internal.app import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.pm.ActivityInfo +import android.content.pm.ApplicationInfo import android.content.pm.PackageManager import android.content.pm.ResolveInfo +import android.content.pm.ShortcutInfo +import android.graphics.drawable.Icon import android.os.Bundle import android.os.UserHandle import android.service.chooser.ChooserTarget @@ -32,12 +36,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.android.internal.R import com.android.internal.app.ChooserListAdapter.LoadDirectShareIconTask +import com.android.internal.app.chooser.DisplayResolveInfo import com.android.internal.app.chooser.SelectableTargetInfo import com.android.internal.app.chooser.SelectableTargetInfo.SelectableTargetInfoCommunicator import com.android.internal.app.chooser.TargetInfo import com.android.server.testutils.any import com.android.server.testutils.mock import com.android.server.testutils.whenever +import com.google.common.truth.Truth.assertThat +import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.anyInt @@ -46,22 +53,25 @@ import org.mockito.Mockito.verify @RunWith(AndroidJUnit4::class) class ChooserListAdapterTest { - private val packageManager = mock<PackageManager> { - whenever(resolveActivity(any(), anyInt())).thenReturn(mock()) - } + private val packageManager = + mock<PackageManager> { whenever(resolveActivity(any(), anyInt())).thenReturn(mock()) } private val context = InstrumentationRegistry.getInstrumentation().getContext() private val resolverListController = mock<ResolverListController>() - private val chooserListCommunicator = mock<ChooserListAdapter.ChooserListCommunicator> { - whenever(maxRankedTargets).thenReturn(0) - } - private val selectableTargetInfoCommunicator = - mock<SelectableTargetInfoCommunicator> { - whenever(targetIntent).thenReturn(mock()) + private val chooserListCommunicator = + mock<ChooserListAdapter.ChooserListCommunicator> { + whenever(maxRankedTargets).thenReturn(0) } + private val selectableTargetInfoCommunicator = + mock<SelectableTargetInfoCommunicator> { whenever(targetIntent).thenReturn(mock()) } private val chooserActivityLogger = mock<ChooserActivityLogger>() + @Before + fun setUp() { + whenever(resolverListController.userHandle).thenReturn(UserHandle.CURRENT) + } + private fun createChooserListAdapter( - taskProvider: (SelectableTargetInfo?) -> LoadDirectShareIconTask + taskProvider: (SelectableTargetInfo?) -> LoadDirectShareIconTask = createTaskProvider() ) = ChooserListAdapterOverride( context, @@ -98,9 +108,8 @@ class ChooserListAdapterTest { view.tag = viewHolderOne val targetInfo = createSelectableTargetInfo() val iconTaskOne = mock<LoadDirectShareIconTask>() - val testTaskProvider = mock<() -> LoadDirectShareIconTask> { - whenever(invoke()).thenReturn(iconTaskOne) - } + val testTaskProvider = + mock<() -> LoadDirectShareIconTask> { whenever(invoke()).thenReturn(iconTaskOne) } val testSubject = createChooserListAdapter { testTaskProvider.invoke() } testSubject.testViewBind(view, targetInfo, 0) @@ -114,6 +123,65 @@ class ChooserListAdapterTest { verify(testTaskProvider, times(1)).invoke() } + @Test + fun getServiceTargetCount_shouldNotShowServiceTargets_returnsZero() { + whenever(chooserListCommunicator.shouldShowServiceTargets()).thenReturn(false) + val adapter = createChooserListAdapter() + whenever(chooserListCommunicator.maxRankedTargets).thenReturn(10) + addServiceTargets(adapter, targetCount = 50) + + assertThat(adapter.serviceTargetCount).isEqualTo(0) + } + + private fun createTaskProvider(): (SelectableTargetInfo?) -> LoadDirectShareIconTask { + val iconTaskOne = mock<LoadDirectShareIconTask>() + val testTaskProvider = + mock<() -> LoadDirectShareIconTask> { whenever(invoke()).thenReturn(iconTaskOne) } + return { testTaskProvider.invoke() } + } + + private fun addServiceTargets(adapter: ChooserListAdapter, targetCount: Int) { + val origTarget = + DisplayResolveInfo( + Intent(), + createResolveInfo(), + Intent(), + ResolverListAdapter.ResolveInfoPresentationGetter(context, 200, createResolveInfo()) + ) + val targets = mutableListOf<ChooserTarget>() + for (i in 1..targetCount) { + val score = 1f + val componentName = ComponentName("chooser.list.adapter", "Test$i") + val extras = Bundle() + val icon: Icon? = null + targets += ChooserTarget("Title $i", icon, score, componentName, extras) + } + val directShareToShortcutInfos = mapOf<ChooserTarget, ShortcutInfo>() + adapter.addServiceResults( + origTarget, + targets, + ChooserActivity.TARGET_TYPE_DEFAULT, + directShareToShortcutInfos + ) + } + + private fun createResolveInfo(): ResolveInfo { + val applicationInfo = + ApplicationInfo().apply { + packageName = "chooser.list.adapter" + name = "ChooserListAdapterTestApplication" + } + val activityInfo = + ActivityInfo().apply { + packageName = applicationInfo.packageName + name = "ChooserListAdapterTest" + } + activityInfo.applicationInfo = applicationInfo + val resolveInfo = ResolveInfo() + resolveInfo.activityInfo = activityInfo + return resolveInfo + } + private fun createSelectableTargetInfo(): SelectableTargetInfo = SelectableTargetInfo( context, @@ -125,13 +193,7 @@ class ChooserListAdapterTest { ) private fun createChooserTarget(): ChooserTarget = - ChooserTarget( - "Title", - null, - 1f, - ComponentName("package", "package.Class"), - Bundle() - ) + ChooserTarget("Title", null, 1f, ComponentName("package", "package.Class"), Bundle()) private fun createView(): View { val view = FrameLayout(context) @@ -164,23 +226,23 @@ private class ChooserListAdapterOverride( chooserActivityLogger: ChooserActivityLogger?, initialIntentsUserHandle: UserHandle?, private val taskProvider: (SelectableTargetInfo?) -> LoadDirectShareIconTask -) : ChooserListAdapter( - context, - payloadIntents, - initialIntents, - rList, - filterLastUsed, - resolverListController, - chooserListCommunicator, - selectableTargetInfoCommunicator, - packageManager, - chooserActivityLogger, - initialIntentsUserHandle, -) { +) : + ChooserListAdapter( + context, + payloadIntents, + initialIntents, + rList, + filterLastUsed, + resolverListController, + chooserListCommunicator, + selectableTargetInfoCommunicator, + packageManager, + chooserActivityLogger, + initialIntentsUserHandle, + ) { override fun createLoadDirectShareIconTask( info: SelectableTargetInfo? - ): LoadDirectShareIconTask = - taskProvider.invoke(info) + ): LoadDirectShareIconTask = taskProvider.invoke(info) fun testViewBind(view: View?, info: TargetInfo?, position: Int) { onBindView(view, info, position) diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryInputSuspendTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryInputSuspendTest.java index e870d6022058..8d825e4deb81 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryInputSuspendTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryInputSuspendTest.java @@ -99,6 +99,7 @@ public class BatteryInputSuspendTest { if (isCharging(intent) == mExpectedChargingState) { mReady.open(); } + context.unregisterReceiver(this); } }, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); } diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index b6c39c67954d..13cf82e51b22 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -253,12 +253,6 @@ "group": "WM_DEBUG_BOOT", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "-1883484959": { - "message": "Content Recording: Display %d state is now (%d), so update recording?", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/DisplayContent.java" - }, "-1872288685": { "message": "applyAnimation: anim=%s nextAppTransition=%s transit=%s isEntrance=%b Callers=%s", "level": "VERBOSE", @@ -445,6 +439,12 @@ "group": "WM_DEBUG_TASKS", "at": "com\/android\/server\/wm\/ResetTargetTaskHelper.java" }, + "-1700778361": { + "message": "Content Recording: Going ahead with updating recording for display %d to new bounds %s and\/or orientation %d and\/or surface size %s", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "-1699018375": { "message": "Adding activity %s to task %s callers: %s", "level": "INFO", @@ -643,12 +643,6 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/DisplayContent.java" }, - "-1480264178": { - "message": "Content Recording: Unable to update recording for display %d to new bounds %s and\/or orientation %d, since the surface is not available.", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/ContentRecorder.java" - }, "-1478175541": { "message": "No longer animating wallpaper targets!", "level": "VERBOSE", @@ -1015,6 +1009,12 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/NonAppWindowAnimationAdapter.java" }, + "-1152771606": { + "message": "Content Recording: Display %d was already recording, but pause capture since the task is in PIP", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "-1145384901": { "message": "shouldWaitAnimatingExit: isTransition: %s", "level": "DEBUG", @@ -1837,12 +1837,6 @@ "group": "WM_DEBUG_ADD_REMOVE", "at": "com\/android\/server\/wm\/Task.java" }, - "-452750194": { - "message": "Content Recording: Going ahead with updating recording for display %d to new bounds %s and\/or orientation %d.", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/ContentRecorder.java" - }, "-451552570": { "message": "Current focused window being animated by recents. Overriding back callback to recents controller callback.", "level": "DEBUG", @@ -2053,12 +2047,6 @@ "group": "WM_DEBUG_WINDOW_TRANSITIONS_MIN", "at": "com\/android\/server\/wm\/TransitionController.java" }, - "-262984451": { - "message": "Relaunch failed %s", - "level": "INFO", - "group": "WM_DEBUG_STATES", - "at": "com\/android\/server\/wm\/ActivityRecord.java" - }, "-251259736": { "message": "No longer freezing: %s", "level": "VERBOSE", @@ -2323,6 +2311,12 @@ "group": "WM_DEBUG_SYNC_ENGINE", "at": "com\/android\/server\/wm\/WindowState.java" }, + "1877956": { + "message": "Content Recording: Display %d should start recording, but don't yet since the task is in PIP", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "3593205": { "message": "commitVisibility: %s: visible=%b mVisibleRequested=%b", "level": "VERBOSE", @@ -2353,6 +2347,12 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimationController.java" }, + "34106798": { + "message": "Content Recording: Display %d state was (%d), is now (%d), so update recording?", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/DisplayContent.java" + }, "34682671": { "message": "Not moving display (displayId=%d) to top. Top focused displayId=%d. Reason: FLAG_STEAL_TOP_FOCUS_DISABLED", "level": "INFO", @@ -3055,12 +3055,6 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, - "643263584": { - "message": "Content Recording: Apply transformations of shift %d x %d, scale %f, crop %d x %d for display %d", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/ContentRecorder.java" - }, "644675193": { "message": "Real start recents", "level": "DEBUG", @@ -4081,6 +4075,12 @@ "group": "WM_DEBUG_CONFIGURATION", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, + "1687944543": { + "message": "Content Recording: Unable to update recording for display %d to new bounds %s and\/or orientation %d and\/or surface size %s, since the surface is not available.", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "1699269281": { "message": "Don't organize or trigger events for untrusted displayId=%d", "level": "WARN", @@ -4303,6 +4303,12 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, + "1936800105": { + "message": "Content Recording: Apply transformations of shift %d x %d, scale %f, crop (aka recorded content size) %d x %d for display %d; display has size %d x %d; surface has size %d x %d", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "1945495497": { "message": "Focused window didn't have a valid surface drawn.", "level": "DEBUG", diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java index 0112e32e05a7..15d14e87fcf6 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java @@ -213,9 +213,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, if (mRearDisplayStateRequest != null || isRearDisplayActive()) { mRearDisplayStateRequest = null; mDeviceStateManager.cancelStateRequest(); - } else { - throw new IllegalStateException( - "Unable to cancel a rear display session as there is no active session"); } } } @@ -432,10 +429,6 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, synchronized (mLock) { if (mRearDisplayPresentationController != null) { mDeviceStateManager.cancelStateRequest(); - } else { - throw new IllegalStateException( - "Unable to cancel a rear display presentation session as there is no " - + "active session"); } } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java index 0000aa4cdfd8..6db2ae4d2141 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java @@ -17,7 +17,6 @@ package androidx.window.extensions.layout; import static android.view.Display.DEFAULT_DISPLAY; - import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_FLAT; import static androidx.window.common.CommonFoldingFeature.COMMON_STATE_HALF_OPENED; import static androidx.window.util.ExtensionHelper.isZero; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java index 15a329bd9509..a836e05b2d66 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java @@ -17,7 +17,6 @@ package androidx.window.sidecar; import static android.view.Display.DEFAULT_DISPLAY; - import static androidx.window.util.ExtensionHelper.rotateRectToDisplayRotation; import static androidx.window.util.ExtensionHelper.transformToWindowSpaceRect; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/util/ExtensionHelper.java b/libs/WindowManager/Jetpack/src/androidx/window/util/ExtensionHelper.java index 6b193fc53935..a08db7939eca 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/util/ExtensionHelper.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/util/ExtensionHelper.java @@ -19,6 +19,7 @@ package androidx.window.util; import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; +import android.annotation.SuppressLint; import android.app.WindowConfiguration; import android.content.Context; import android.graphics.Rect; @@ -57,6 +58,10 @@ public final class ExtensionHelper { rotateRectToDisplayRotation(displayInfo, rotation, inOutRect); } + // We suppress the Lint error CheckResult for Rect#intersect because in case the displayInfo and + // folding features are out of sync, e.g. when a foldable devices is unfolding, it is acceptable + // to provide the original folding feature Rect even if they don't intersect. + @SuppressLint("RectIntersectReturnValueIgnored") @VisibleForTesting static void rotateRectToDisplayRotation(@NonNull DisplayInfo displayInfo, @Surface.Rotation int rotation, @NonNull Rect inOutRect) { @@ -70,13 +75,7 @@ public final class ExtensionHelper { final int baseDisplayHeight = isSideRotation ? displayInfo.logicalWidth : displayInfo.logicalHeight; - final boolean success = inOutRect.intersect(0, 0, baseDisplayWidth, baseDisplayHeight); - if (!success) { - throw new IllegalArgumentException("inOutRect must intersect with the display." - + " inOutRect: " + inOutRect - + ", baseDisplayWidth: " + baseDisplayWidth - + ", baseDisplayHeight: " + baseDisplayHeight); - } + inOutRect.intersect(0, 0, baseDisplayWidth, baseDisplayHeight); RotationUtils.rotateBounds(inOutRect, baseDisplayWidth, baseDisplayHeight, rotation); } diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/util/ExtensionHelperTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/util/ExtensionHelperTest.java index ae783de228fb..3278cdf1c337 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/util/ExtensionHelperTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/util/ExtensionHelperTest.java @@ -17,7 +17,6 @@ package androidx.window.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; @@ -79,16 +78,6 @@ public class ExtensionHelperTest { } } - @Test - public void testRotateRectToDisplayRotation_invalidInputRect() { - final Rect invalidRect = new Rect( - MOCK_DISPLAY_WIDTH + 10, 0, MOCK_DISPLAY_WIDTH + 10, MOCK_DISPLAY_HEIGHT); - assertThrows(IllegalArgumentException.class, - () -> ExtensionHelper.rotateRectToDisplayRotation( - MOCK_DISPLAY_INFOS[0], ROTATIONS[0], invalidRect)); - } - - @NonNull private static DisplayInfo getMockDisplayInfo(@Surface.Rotation int rotation) { final DisplayInfo displayInfo = new DisplayInfo(); diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index 485a89502c86..34fad3c269a6 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -81,12 +81,9 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbulla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Xestionar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ignorouse a burbulla."</string> - <!-- no translation found for restart_button_description (4564728020654658478) --> - <skip /> - <!-- no translation found for user_aspect_ratio_settings_button_hint (734835849600713016) --> - <skip /> - <!-- no translation found for user_aspect_ratio_settings_button_description (4315566801697411684) --> - <skip /> + <string name="restart_button_description" msgid="4564728020654658478">"Toca o botón para reiniciar esta aplicación e gozar dunha mellor visualización"</string> + <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Cambia a proporción desta aplicación en Configuración"</string> + <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Cambiar a proporción"</string> <string name="camera_compat_treatment_suggested_button_description" msgid="8103916969024076767">"Tes problemas coa cámara?\nToca para reaxustala"</string> <string name="camera_compat_treatment_applied_button_description" msgid="2944157113330703897">"Non se solucionaron os problemas?\nToca para reverter o seu tratamento"</string> <string name="camera_compat_dismiss_button_description" msgid="2795364433503817511">"Non hai problemas coa cámara? Tocar para ignorar."</string> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index 8918821a8f27..58601b7e88c5 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -90,7 +90,7 @@ <string name="letterbox_education_dialog_title" msgid="7739895354143295358">"Visualizza più contenuti e fai di più"</string> <string name="letterbox_education_split_screen_text" msgid="449233070804658627">"Trascina in un\'altra app per usare lo schermo diviso"</string> <string name="letterbox_education_reposition_text" msgid="4589957299813220661">"Tocca due volte fuori da un\'app per riposizionarla"</string> - <string name="letterbox_education_got_it" msgid="4057634570866051177">"OK"</string> + <string name="letterbox_education_got_it" msgid="4057634570866051177">"Ok"</string> <string name="letterbox_education_expand_button_description" msgid="1729796567101129834">"Espandi per avere ulteriori informazioni."</string> <string name="letterbox_restart_dialog_title" msgid="8543049527871033505">"Vuoi riavviare per migliorare la visualizzazione?"</string> <string name="letterbox_restart_dialog_description" msgid="6096946078246557848">"Puoi riavviare l\'app affinché venga visualizzata meglio sullo schermo, ma potresti perdere i tuoi progressi o eventuali modifiche non salvate"</string> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java index c111ce623c1a..0e6b20332a4f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java @@ -22,10 +22,13 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.TaskInfo; import android.app.TaskInfo.CameraCompatControlState; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.hardware.display.DisplayManager; +import android.net.Uri; +import android.os.UserHandle; import android.provider.Settings; import android.util.ArraySet; import android.util.Log; @@ -577,7 +580,13 @@ public class CompatUIController implements OnDisplaysChangedListener, final Intent intent = new Intent(Settings.ACTION_MANAGE_USER_ASPECT_RATIO_SETTINGS); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - mContext.startActivity(intent); + final ComponentName appComponent = taskInfo.topActivity; + if (appComponent != null) { + final Uri packageUri = Uri.parse("package:" + appComponent.getPackageName()); + intent.setData(packageUri); + } + final UserHandle userHandle = UserHandle.of(taskInfo.userId); + mContext.startActivityAsUser(intent, userHandle); } private void removeLayouts(int taskId) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index a11d9528a170..50ba8975802b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -219,6 +219,13 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { private ArrayList<TaskState> mPausingTasks = null; /** + * List of tasks were pausing but closed in a subsequent merged transition. If a + * closing task is reopened, the leash is not initially hidden since it is already + * visible. + */ + private ArrayList<TaskState> mClosingTasks = null; + + /** * List of tasks that we are switching to. Upon finish, these will remain visible and * on top. */ @@ -369,6 +376,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { } mFinishTransaction = null; mPausingTasks = null; + mClosingTasks = null; mOpeningTasks = null; mInfo = null; mTransition = null; @@ -413,6 +421,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { mFinishCB = finishCB; mFinishTransaction = finishT; mPausingTasks = new ArrayList<>(); + mClosingTasks = new ArrayList<>(); mOpeningTasks = new ArrayList<>(); mLeashMap = new ArrayMap<>(); mKeyguardLocked = (info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0; @@ -659,7 +668,10 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { final TransitionInfo.Change change = closingTasks.get(i); final int pausingIdx = TaskState.indexOf(mPausingTasks, change); if (pausingIdx >= 0) { - mPausingTasks.remove(pausingIdx); + // We are closing the pausing task, but it is still visible and can be + // restart by another transition prior to this transition finishing + final TaskState closingTask = mPausingTasks.remove(pausingIdx); + mClosingTasks.add(closingTask); didMergeThings = true; ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, " closing pausing taskId=%d", change.getTaskInfo().taskId); @@ -695,7 +707,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { for (int i = 0; i < openingTasks.size(); ++i) { final TransitionInfo.Change change = openingTasks.get(i); final boolean isLeaf = openingTaskIsLeafs.get(i) == 1; - int pausingIdx = TaskState.indexOf(mPausingTasks, change); + final int closingIdx = TaskState.indexOf(mClosingTasks, change); + if (closingIdx >= 0) { + // Remove opening tasks from closing set + mClosingTasks.remove(closingIdx); + } + final int pausingIdx = TaskState.indexOf(mPausingTasks, change); if (pausingIdx >= 0) { // Something is showing/opening a previously-pausing app. if (isLeaf) { @@ -718,12 +735,23 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { appearedTargets[nextTargetIdx++] = target; // reparent into the original `mInfo` since that's where we are animating. final int rootIdx = TransitionUtil.rootIndexFor(change, mInfo); + final boolean wasClosing = closingIdx >= 0; t.reparent(target.leash, mInfo.getRoot(rootIdx).getLeash()); t.setLayer(target.leash, layer); - // Hide the animation leash, let listener show it. - t.hide(target.leash); + if (wasClosing) { + // App was previously visible and is closing + t.show(target.leash); + t.setAlpha(target.leash, 1f); + // Also override the task alpha as it was set earlier when dispatching + // the transition and setting up the leash to hide the + t.setAlpha(change.getLeash(), 1f); + } else { + // Hide the animation leash, let the listener show it + t.hide(target.leash); + } ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, - " opening new leaf taskId=%d", target.taskId); + " opening new leaf taskId=%d wasClosing=%b", + target.taskId, wasClosing); mOpeningTasks.add(new TaskState(change, target.leash)); } else { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 94fa485efd5c..8efdfd6ca1e1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -1551,6 +1551,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, @Nullable ActivityManager.RunningTaskInfo taskInfo, @SplitPosition int startPosition, boolean resizeAnim) { onSplitScreenEnter(); + // Preemptively reset the reparenting behavior if we know that we are entering, as starting + // split tasks with activity trampolines can inadvertently trigger the task to be + // reparented out of the split root mid-launch + wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + false /* setReparentLeafTaskIfRelaunch */); if (isSplitActive()) { prepareBringSplit(wct, taskInfo, startPosition, resizeAnim); } else { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SnapshotWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SnapshotWindowCreator.java index 20c4d5ae5f58..e7e1e0a98550 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SnapshotWindowCreator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SnapshotWindowCreator.java @@ -35,13 +35,14 @@ class SnapshotWindowCreator { void makeTaskSnapshotWindow(StartingWindowInfo startingWindowInfo, TaskSnapshot snapshot) { final int taskId = startingWindowInfo.taskInfo.taskId; // Remove any existing starting window for this task before adding. - mStartingWindowRecordManager.removeWindow(taskId, true); + mStartingWindowRecordManager.removeWindow(taskId); final TaskSnapshotWindow surface = TaskSnapshotWindow.create(startingWindowInfo, startingWindowInfo.appToken, snapshot, mMainExecutor, - () -> mStartingWindowRecordManager.removeWindow(taskId, true)); + () -> mStartingWindowRecordManager.removeWindow(taskId)); if (surface != null) { final SnapshotWindowRecord tView = new SnapshotWindowRecord(surface, - startingWindowInfo.taskInfo.topActivityType, mMainExecutor); + startingWindowInfo.taskInfo.topActivityType, mMainExecutor, + taskId, mStartingWindowRecordManager); mStartingWindowRecordManager.addRecord(taskId, tView); } } @@ -50,8 +51,9 @@ class SnapshotWindowCreator { private final TaskSnapshotWindow mTaskSnapshotWindow; SnapshotWindowRecord(TaskSnapshotWindow taskSnapshotWindow, - int activityType, ShellExecutor removeExecutor) { - super(activityType, removeExecutor); + int activityType, ShellExecutor removeExecutor, int id, + StartingSurfaceDrawer.StartingWindowRecordManager recordManager) { + super(activityType, removeExecutor, id, recordManager); mTaskSnapshotWindow = taskSnapshotWindow; mBGColor = mTaskSnapshotWindow.getBackgroundColor(); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java index 4cfbbd971fe3..31fc98b713ab 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenWindowCreator.java @@ -358,7 +358,7 @@ class SplashscreenWindowCreator extends AbsSplashWindowCreator { } } if (shouldSaveView) { - mStartingWindowRecordManager.removeWindow(taskId, true); + mStartingWindowRecordManager.removeWindow(taskId); saveSplashScreenRecord(appToken, taskId, view, suggestType); } return shouldSaveView; 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 7cbf263f7cb1..e2be1533118a 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 @@ -188,7 +188,7 @@ public class StartingSurfaceDrawer { final SnapshotRecord record = sRecord instanceof SnapshotRecord ? (SnapshotRecord) sRecord : null; if (record != null && record.hasImeSurface()) { - records.removeWindow(taskId, true); + records.removeWindow(taskId); } } @@ -256,10 +256,15 @@ public class StartingSurfaceDrawer { @WindowConfiguration.ActivityType protected final int mActivityType; protected final ShellExecutor mRemoveExecutor; + private final int mTaskId; + private final StartingWindowRecordManager mRecordManager; - SnapshotRecord(int activityType, ShellExecutor removeExecutor) { + SnapshotRecord(int activityType, ShellExecutor removeExecutor, int taskId, + StartingWindowRecordManager recordManager) { mActivityType = activityType; mRemoveExecutor = removeExecutor; + mTaskId = taskId; + mRecordManager = recordManager; } @Override @@ -301,6 +306,7 @@ public class StartingSurfaceDrawer { @CallSuper protected void removeImmediately() { mRemoveExecutor.removeCallbacks(mScheduledRunnable); + mRecordManager.onRecordRemoved(mTaskId); } } @@ -316,7 +322,7 @@ public class StartingSurfaceDrawer { taskIds[i] = mStartingWindowRecords.keyAt(i); } for (int i = taskSize - 1; i >= 0; --i) { - removeWindow(taskIds[i], true); + removeWindow(taskIds[i]); } } @@ -335,9 +341,13 @@ public class StartingSurfaceDrawer { } } - void removeWindow(int taskId, boolean immediately) { + void removeWindow(int taskId) { mTmpRemovalInfo.taskId = taskId; - removeWindow(mTmpRemovalInfo, immediately); + removeWindow(mTmpRemovalInfo, true/* immediately */); + } + + void onRecordRemoved(int taskId) { + mStartingWindowRecords.remove(taskId); } StartingWindowRecord getRecord(int taskId) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java index 144547885501..fed2f34b5e0c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java @@ -92,7 +92,8 @@ class WindowlessSnapshotWindowCreator { final SnapshotWindowRecord record = new SnapshotWindowRecord(mViewHost, wlw.mChildSurface, taskDescription.getBackgroundColor(), snapshot.hasImeSurface(), - runningTaskInfo.topActivityType, removeExecutor); + runningTaskInfo.topActivityType, removeExecutor, + taskId, mStartingWindowRecordManager); mStartingWindowRecordManager.addRecord(taskId, record); info.notifyAddComplete(wlw.mChildSurface); } @@ -104,8 +105,9 @@ class WindowlessSnapshotWindowCreator { SnapshotWindowRecord(SurfaceControlViewHost viewHost, SurfaceControl childSurface, int bgColor, boolean hasImeSurface, int activityType, - ShellExecutor removeExecutor) { - super(activityType, removeExecutor); + ShellExecutor removeExecutor, int id, + StartingSurfaceDrawer.StartingWindowRecordManager recordManager) { + super(activityType, removeExecutor, id, recordManager); mViewHost = viewHost; mChildSurface = childSurface; mBGColor = bgColor; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index adae21b20b3c..93d763608b5f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -54,12 +54,13 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { private static final String TAG = TaskViewTaskController.class.getSimpleName(); private final CloseGuard mGuard = new CloseGuard(); - + private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction(); + /** Used to inset the activity content to allow space for a caption bar. */ + private final Binder mCaptionInsetsOwner = new Binder(); private final ShellTaskOrganizer mTaskOrganizer; private final Executor mShellExecutor; private final SyncTransactionQueue mSyncQueue; private final TaskViewTransitions mTaskViewTransitions; - private TaskViewBase mTaskViewBase; private final Context mContext; /** @@ -70,21 +71,19 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { * in this situation to allow us to notify listeners correctly if the task failed to open. */ private ActivityManager.RunningTaskInfo mPendingInfo; - /* Indicates that the task we attempted to launch in the task view failed to launch. */ - private boolean mTaskNotFound; + private TaskViewBase mTaskViewBase; protected ActivityManager.RunningTaskInfo mTaskInfo; private WindowContainerToken mTaskToken; private SurfaceControl mTaskLeash; - private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction(); + /* Indicates that the task we attempted to launch in the task view failed to launch. */ + private boolean mTaskNotFound; private boolean mSurfaceCreated; private SurfaceControl mSurfaceControl; private boolean mIsInitialized; private boolean mNotifiedForInitialized; + private boolean mHideTaskWithSurface = true; private TaskView.Listener mListener; private Executor mListenerExecutor; - - /** Used to inset the activity content to allow space for a caption bar. */ - private final Binder mCaptionInsetsOwner = new Binder(); private Rect mCaptionInsets; public TaskViewTaskController(Context context, ShellTaskOrganizer organizer, @@ -102,6 +101,19 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { mGuard.open("release"); } + /** + * Specifies if the task should be hidden when the surface is destroyed. + * <p>This is {@code true} by default. + * + * @param hideTaskWithSurface {@code false} if task needs to remain visible even when the + * surface is destroyed, {@code true} otherwise. + */ + public void setHideTaskWithSurface(boolean hideTaskWithSurface) { + // TODO(b/299535374): Remove mHideTaskWithSurface once the taskviews with launch root tasks + // are moved to a window in SystemUI in auto. + mHideTaskWithSurface = hideTaskWithSurface; + } + SurfaceControl getSurfaceControl() { return mSurfaceControl; } @@ -257,9 +269,17 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { mTaskNotFound = false; } + /** This method shouldn't be called when shell transitions are enabled. */ private void updateTaskVisibility() { + boolean visible = mSurfaceCreated; + if (!visible && !mHideTaskWithSurface) { + return; + } WindowContainerTransaction wct = new WindowContainerTransaction(); - wct.setHidden(mTaskToken, !mSurfaceCreated /* hidden */); + wct.setHidden(mTaskToken, !visible /* hidden */); + if (!visible) { + wct.reorder(mTaskToken, false /* onTop */); + } mSyncQueue.queue(wct); if (mListener == null) { return; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTest.java index d098d332a376..0088051928fb 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/taskview/TaskViewTest.java @@ -221,6 +221,20 @@ public class TaskViewTest extends ShellTestCase { } @Test + public void testSurfaceDestroyed_withTask_shouldNotHideTask_legacyTransitions() { + assumeFalse(Transitions.ENABLE_SHELL_TRANSITIONS); + mTaskViewTaskController.setHideTaskWithSurface(false); + + SurfaceHolder sh = mock(SurfaceHolder.class); + mTaskViewTaskController.onTaskAppeared(mTaskInfo, mLeash); + mTaskView.surfaceCreated(sh); + reset(mViewListener); + mTaskView.surfaceDestroyed(sh); + + verify(mViewListener, never()).onTaskVisibilityChanged(anyInt(), anyBoolean()); + } + + @Test public void testSurfaceDestroyed_withTask_legacyTransitions() { assumeFalse(Transitions.ENABLE_SHELL_TRANSITIONS); SurfaceHolder sh = mock(SurfaceHolder.class); diff --git a/packages/CarrierDefaultApp/res/values-sq/strings.xml b/packages/CarrierDefaultApp/res/values-sq/strings.xml index 238921aaa8f0..d8a1ed7f6620 100644 --- a/packages/CarrierDefaultApp/res/values-sq/strings.xml +++ b/packages/CarrierDefaultApp/res/values-sq/strings.xml @@ -5,7 +5,7 @@ <string name="android_system_label" msgid="2797790869522345065">"Operatori celular"</string> <string name="portal_notification_id" msgid="5155057562457079297">"Të dhënat celulare kanë përfunduar"</string> <string name="no_data_notification_id" msgid="668400731803969521">"Të dhënat celulare janë çaktivizuar"</string> - <string name="portal_notification_detail" msgid="2295729385924660881">"Trokit për të vizituar sajtin e uebit të %s"</string> + <string name="portal_notification_detail" msgid="2295729385924660881">"Trokit për të vizituar uebsajtin e %s"</string> <string name="no_data_notification_detail" msgid="3112125343857014825">"Kontakto me ofruesin e shërbimit %s"</string> <string name="no_mobile_data_connection_title" msgid="7449525772416200578">"Nuk ka lidhje të të dhënave celulare"</string> <string name="no_mobile_data_connection" msgid="544980465184147010">"Shto plan të dhënash ose plan roaming përmes %s"</string> @@ -16,7 +16,7 @@ <string name="ssl_error_continue" msgid="1138548463994095584">"Vazhdo gjithsesi nëpërmjet shfletuesit"</string> <string name="performance_boost_notification_channel" msgid="3475440855635538592">"Përforcimi i performancës"</string> <string name="performance_boost_notification_title" msgid="3126203390685781861">"Opsionet 5G nga operatori yt celular"</string> - <string name="performance_boost_notification_detail" msgid="216569851036236346">"Vizito sajtin e uebit të %s për të parë opsione për përvojën tënde me aplikacionin"</string> + <string name="performance_boost_notification_detail" msgid="216569851036236346">"Vizito uebsajtin e %s për të parë opsione për përvojën tënde me aplikacionin"</string> <string name="performance_boost_notification_button_not_now" msgid="6459755324243683785">"Jo tani"</string> <string name="performance_boost_notification_button_manage" msgid="4976836444046497973">"Menaxho"</string> <string name="slice_purchase_app_label" msgid="7170191659233241166">"Bli një paketë përforcimi të performancës."</string> diff --git a/packages/CredentialManager/res/values-sq/strings.xml b/packages/CredentialManager/res/values-sq/strings.xml index 40f8dc48c5d5..bf6bc8bbbac9 100644 --- a/packages/CredentialManager/res/values-sq/strings.xml +++ b/packages/CredentialManager/res/values-sq/strings.xml @@ -34,7 +34,7 @@ <string name="public_key_cryptography_title" msgid="6751970819265298039">"Kriptografia e çelësit publik"</string> <string name="public_key_cryptography_detail" msgid="6937631710280562213">"Bazuar në aleancën FIDO (e cila përfshin Google, Apple, Microsoft e të tjera) dhe standardet W3C, çelësat e kalimit përdorin çifte çelësash kriptografikë. Ndryshe nga emri i përdoruesit dhe vargu i karaktereve që përdorim për fjalëkalime, një çift çelësash privat-publik krijohet për aplikacion ose sajtin e uebit. Çelësi privat ruhet i sigurt në pajisjen tënde ose në menaxherin e fjalëkalimeve dhe konfirmon identitetin tënd. Çelësi publik ndahet me aplikacionin ose serverin e sajtit të uebit. Me çelësat përkatës, mund të regjistrohesh dhe të identifikohesh në çast."</string> <string name="improved_account_security_title" msgid="1069841917893513424">"Siguri e përmirësuar e llogarisë"</string> - <string name="improved_account_security_detail" msgid="9123750251551844860">"Secili çelës është i lidhur ekskluzivisht me aplikacionin ose sajtin e uebit për të cilin është krijuar, kështu që nuk do të identifikohesh asnjëherë gabimisht në një aplikacion ose sajt uebi mashtrues. Gjithashtu, me serverët që mbajnë vetëm çelësa publikë, pirateria informatike është shumë më e vështirë."</string> + <string name="improved_account_security_detail" msgid="9123750251551844860">"Secili çelës është i lidhur ekskluzivisht me aplikacionin ose uebsajtin për të cilin është krijuar, kështu që nuk do të identifikohesh asnjëherë gabimisht në një aplikacion ose uebsajt mashtrues. Gjithashtu, me serverët që mbajnë vetëm çelësa publikë, pirateria informatike është shumë më e vështirë."</string> <string name="seamless_transition_title" msgid="5335622196351371961">"Kalim i thjeshtuar"</string> <string name="seamless_transition_detail" msgid="4475509237171739843">"Teksa shkojmë drejt një të ardhmeje pa fjalëkalime, këto të fundit do të ofrohen ende së bashku me çelësat e kalimit."</string> <string name="choose_provider_title" msgid="8870795677024868108">"Zgjidh se ku t\'i ruash <xliff:g id="CREATETYPES">%1$s</xliff:g>"</string> diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java index 3505cfb9d38a..74f04e093162 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallFailed.java @@ -33,8 +33,6 @@ import android.view.View; import androidx.annotation.Nullable; -import java.io.File; - /** * Installation failed: Return status code to the caller or display failure UI to user */ @@ -101,14 +99,8 @@ public class InstallFailed extends AlertActivity { // Set header icon and title PackageUtil.AppSnippet as; PackageManager pm = getPackageManager(); - - if ("package".equals(packageURI.getScheme())) { - as = new PackageUtil.AppSnippet(pm.getApplicationLabel(appInfo), - pm.getApplicationIcon(appInfo)); - } else { - final File sourceFile = new File(packageURI.getPath()); - as = PackageUtil.getAppSnippet(this, appInfo, sourceFile); - } + as = intent.getParcelableExtra(PackageInstallerActivity.EXTRA_APP_SNIPPET, + PackageUtil.AppSnippet.class); // Store label for dialog mLabel = as.label; diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java index 7bea33971259..1088acef0fb0 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java @@ -16,6 +16,7 @@ package com.android.packageinstaller; +import static com.android.packageinstaller.PackageInstallerActivity.EXTRA_APP_SNIPPET; import static com.android.packageinstaller.PackageInstallerActivity.EXTRA_STAGED_SESSION_ID; import android.app.PendingIntent; @@ -86,7 +87,8 @@ public class InstallInstalling extends AlertActivity { // ContentResolver.SCHEME_FILE // STAGED_SESSION_ID extra contains an ID of a previously staged install session. final File sourceFile = new File(mPackageURI.getPath()); - PackageUtil.AppSnippet as = PackageUtil.getAppSnippet(this, appInfo, sourceFile); + PackageUtil.AppSnippet as = getIntent() + .getParcelableExtra(EXTRA_APP_SNIPPET, PackageUtil.AppSnippet.class); mAlert.setIcon(as.icon); mAlert.setTitle(as.label); diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java index ff991d2f7ee3..fbc9525d4615 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -30,7 +29,6 @@ import android.widget.Button; import androidx.annotation.Nullable; -import java.io.File; import java.util.List; /** @@ -65,18 +63,8 @@ public class InstallSuccess extends AlertActivity { ApplicationInfo appInfo = intent.getParcelableExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO); mAppPackageName = appInfo.packageName; - Uri packageURI = intent.getData(); - - // Set header icon and title - PackageManager pm = getPackageManager(); - - if ("package".equals(packageURI.getScheme())) { - mAppSnippet = new PackageUtil.AppSnippet(pm.getApplicationLabel(appInfo), - pm.getApplicationIcon(appInfo)); - } else { - File sourceFile = new File(packageURI.getPath()); - mAppSnippet = PackageUtil.getAppSnippet(this, appInfo, sourceFile); - } + mAppSnippet = intent.getParcelableExtra(PackageInstallerActivity.EXTRA_APP_SNIPPET, + PackageUtil.AppSnippet.class); mLaunchIntent = getPackageManager().getLaunchIntentForPackage(mAppPackageName); diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java index c4780b7db17d..86aaba073cba 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -80,6 +80,7 @@ public class PackageInstallerActivity extends AlertActivity { static final String EXTRA_CALLING_ATTRIBUTION_TAG = "EXTRA_CALLING_ATTRIBUTION_TAG"; static final String EXTRA_ORIGINAL_SOURCE_INFO = "EXTRA_ORIGINAL_SOURCE_INFO"; static final String EXTRA_STAGED_SESSION_ID = "EXTRA_STAGED_SESSION_ID"; + static final String EXTRA_APP_SNIPPET = "EXTRA_APP_SNIPPET"; private static final String ALLOW_UNKNOWN_SOURCES_KEY = PackageInstallerActivity.class.getName() + "ALLOW_UNKNOWN_SOURCES_KEY"; @@ -692,6 +693,9 @@ public class PackageInstallerActivity extends AlertActivity { if (stagedSessionId > 0) { newIntent.putExtra(EXTRA_STAGED_SESSION_ID, stagedSessionId); } + if (mAppSnippet != null) { + newIntent.putExtra(EXTRA_APP_SNIPPET, mAppSnippet); + } newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); if (mLocalLOGV) Log.i(TAG, "downloaded app uri=" + mPackageURI); startActivity(newIntent); diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java index ff0e5fb296b1..6ab2def319cd 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java @@ -27,8 +27,13 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; import android.os.UserHandle; import android.util.Log; import android.view.View; @@ -115,7 +120,7 @@ public class PackageUtil { icon); } - static final class AppSnippet { + static final class AppSnippet implements Parcelable { @NonNull public CharSequence label; @Nullable public Drawable icon; public AppSnippet(@NonNull CharSequence label, @Nullable Drawable icon) { @@ -123,10 +128,52 @@ public class PackageUtil { this.icon = icon; } + private AppSnippet(Parcel in) { + label = in.readString(); + Bitmap bmp = in.readParcelable(getClass().getClassLoader(), Bitmap.class); + icon = new BitmapDrawable(Resources.getSystem(), bmp); + } + @Override public String toString() { return "AppSnippet[" + label + (icon != null ? "(has" : "(no ") + " icon)]"; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeString(label.toString()); + Bitmap bmp = getBitmapFromDrawable(icon); + dest.writeParcelable(bmp, 0); + } + + private Bitmap getBitmapFromDrawable(Drawable drawable) { + // Create an empty bitmap with the dimensions of our drawable + final Bitmap bmp = Bitmap.createBitmap(drawable.getIntrinsicWidth(), + drawable.getIntrinsicHeight(), + Bitmap.Config.ARGB_8888); + // Associate it with a canvas. This canvas will draw the icon on the bitmap + final Canvas canvas = new Canvas(bmp); + // Draw the drawable in the canvas. The canvas will ultimately paint the drawable in the + // bitmap held within + drawable.draw(canvas); + + return bmp; + } + + public static final Parcelable.Creator<AppSnippet> CREATOR = new Parcelable.Creator<>() { + public AppSnippet createFromParcel(Parcel in) { + return new AppSnippet(in); + } + + public AppSnippet[] newArray(int size) { + return new AppSnippet[size]; + } + }; } /** diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index a0056938e73c..c5880a3a074c 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -581,7 +581,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Beperkte profiel"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Voeg nuwe gebruiker by?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het hulle eie spasie wat hulle kan pasmaak met programme, muurpapier en so meer. Gebruikers kan ook toestelinstellings wat almal raak, soos wi-fi, aanpas.\n\nWanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul eie spasie opstel.\n\nEnige gebruiker kan programme vir alle ander gebruikers opdateer. Toeganklikheidinstellings en -dienste sal dalk nie na die nuwe gebruiker oorgedra word nie."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Wanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan programme vir al die ander gebruikers opdateer."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Wanneer jy \'n nuwe gebruiker byvoeg, moet daardie persoon hul spasie opstel.\n\nEnige gebruiker kan apps vir al die ander gebruikers opdateer."</string> <string name="user_grant_admin_title" msgid="5157031020083343984">"Maak hierdie gebruiker ’n admin?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Admins het spesiale voorregte wat ander gebruikers nie het nie. ’n Admin kan alle gebruikers bestuur, hierdie toestel opdateer of terugstel, instellings wysig, alle geïnstalleerde apps sien, en adminvoorregte vir ander mense gee of herroep."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Maak admin"</string> diff --git a/packages/SettingsLib/res/values-az/strings.xml b/packages/SettingsLib/res/values-az/strings.xml index 57b4694e93f7..f35177010b15 100644 --- a/packages/SettingsLib/res/values-az/strings.xml +++ b/packages/SettingsLib/res/values-az/strings.xml @@ -677,7 +677,7 @@ <string name="keyboard_layout_default_label" msgid="1997292217218546957">"Defolt"</string> <string name="turn_screen_on_title" msgid="3266937298097573424">"Ekranı aktiv etmək"</string> <string name="allow_turn_screen_on" msgid="6194845766392742639">"Ekranı aktiv etməyə icazə verin"</string> - <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Tətbiqin ekranı aktiv etməsinə icazə verin. İcazə verilərsə, tətbiq istənilən vaxt sizə soruşmadan ekranı aktiv edə bilər."</string> + <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Tətbiqin ekranı aktiv etməsinə icazə verin. İcazə verilərsə, tətbiq istənilən vaxt sizdən soruşmadan ekranı aktiv edə bilər."</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"<xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqinin yayımlanması dayandırılsın?"</string> <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> tətbiqini yayımlasanız və ya nəticəni dəyişsəniz, cari yayımınız dayandırılacaq"</string> <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> tətbiqini yayımlayın"</string> diff --git a/packages/SettingsLib/res/values-bn/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml index 8c83f6a39745..e38729ebf027 100644 --- a/packages/SettingsLib/res/values-bn/strings.xml +++ b/packages/SettingsLib/res/values-bn/strings.xml @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"আলতো চাপ দেখান"</string> <string name="show_touches_summary" msgid="3692861665994502193">"আলতো চাপ দিলে ভিজ্যুয়াল প্রতিক্রিয়া দেখান"</string> <string name="show_key_presses" msgid="6360141722735900214">"প্রেস করা কী দেখুন"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"প্রেস করা ফিজিকাল কীয়ের জন্য ভিস্যুয়াল মতামত দেখুন"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"ফিজিক্যাল কী প্রেস করা হলে ভিজুয়াল ফিডব্যাক দেখুন"</string> <string name="show_screen_updates" msgid="2078782895825535494">"সারফেস আপডেটগুলি দেখান"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"সম্পূর্ণ উইন্ডোর সারফেস আপডেট হয়ে গেলে সেটিকে ফ্ল্যাশ করুন"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"ভিউয়ের আপডেট দেখুন"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 1a37a3fb706b..67dbc1b7c290 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -676,8 +676,8 @@ <string name="keyboard_layout_dialog_title" msgid="3927180147005616290">"Odaberite raspored tastature"</string> <string name="keyboard_layout_default_label" msgid="1997292217218546957">"Zadano"</string> <string name="turn_screen_on_title" msgid="3266937298097573424">"Uključivanje ekrana"</string> - <string name="allow_turn_screen_on" msgid="6194845766392742639">"Dozvolite uključivanje ekrana"</string> - <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Dozvolite aplikaciji da uključi ekran. Ako se odobri, aplikacija može uključiti ekran bilo kada bez vaše izričite namjere."</string> + <string name="allow_turn_screen_on" msgid="6194845766392742639">"Dozvoli uključivanje ekrana"</string> + <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Dozvolite aplikaciji da uključuje ekran. Ako se odobri, aplikacija može uključiti ekran bilo kada bez vaše izričite namjere."</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"Zaustaviti emitiranje aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"Ako emitirate aplikaciju <xliff:g id="SWITCHAPP">%1$s</xliff:g> ili promijenite izlaz, trenutno emitiranje će se zaustaviti"</string> <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"Emitiraj aplikaciju <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 114742a237a7..bb69a84c8c13 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -586,7 +586,7 @@ <string name="user_grant_admin_message" msgid="1673791931033486709">"Οι διαχειριστές έχουν ειδικά προνόμια που δεν έχουν οι υπόλοιποι χρήστες Ένας διαχειριστής μπορεί να διαχειριστεί όλους τους χρήστες, να ενημερώσει ή να επαναφέρει αυτήν τη συσκευή, να τροποποιήσει τις ρυθμίσεις, να δει όλες τις εγκατεστημένες εφαρμογές και να εκχωρήσει ή να ανακαλέσει προνόμια διαχειριστή άλλων χρηστών."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Εκχώρηση δικαιωμάτων διαχειριστή"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Να γίνει ρύθμιση χρήστη τώρα;"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"Βεβαιωθείτε ότι ο χρήστης μπορεί να πάρει τη συσκευή και ρυθμίστε τον χώρο του"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"Βεβαιωθείτε ότι ο χρήστης μπορεί να πάρει τη συσκευή για τη ρύθμιση του χώρου του"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Να γίνει ρύθμιση προφίλ τώρα;"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"Ρύθμιση τώρα"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"Όχι τώρα"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index df256e5da742..0d13658053ea 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -355,8 +355,8 @@ <string name="pointer_location_summary" msgid="957120116989798464">"Superpone los datos de las pulsaciones en la pantalla"</string> <string name="show_touches" msgid="8437666942161289025">"Mostrar toques"</string> <string name="show_touches_summary" msgid="3692861665994502193">"Muestra la ubicación de los toques en la pantalla"</string> - <string name="show_key_presses" msgid="6360141722735900214">"Ver pulsación de teclas"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"Ver respuestas visuales al pulsar teclas físicas"</string> + <string name="show_key_presses" msgid="6360141722735900214">"Ver teclas pulsadas"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"Muestra respuestas visuales al pulsar teclas físicas"</string> <string name="show_screen_updates" msgid="2078782895825535494">"Mostrar cambios de superficies"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"Hace parpadear todas las superficies de la ventana cuando se actualizan"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"Ver actualizaciones de vista"</string> @@ -581,7 +581,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Perfil restringido"</string> <string name="user_add_user_title" msgid="5457079143694924885">"¿Añadir nuevo usuario?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Puedes compartir este dispositivo si creas más usuarios. Cada uno tendrá su propio espacio y podrá personalizarlo con aplicaciones, un fondo de pantalla y mucho más. Los usuarios también pueden ajustar opciones del dispositivo, como la conexión Wi‑Fi, que afectan a todos los usuarios.\n\nCuando añadas un usuario, tendrá que configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones de todos los usuarios. Es posible que no se transfieran los servicios y opciones de accesibilidad al nuevo usuario."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Al añadir un nuevo usuario, dicha persona debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Al añadir un nuevo usuario, dicha persona debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de los usuarios."</string> <string name="user_grant_admin_title" msgid="5157031020083343984">"¿Convertir a este usuario en administrador?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Los administradores tienen privilegios especiales que otros usuarios no tienen. Los administradores pueden gestionar todos los usuarios, actualizar o restablecer este dispositivo, modificar los ajustes, ver todas las aplicaciones instaladas y conceder o revocar privilegios de administrador a otros usuarios."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Convertir en administrador"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 9f33fa424425..a474ef558816 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -676,7 +676,7 @@ <string name="keyboard_layout_dialog_title" msgid="3927180147005616290">"انتخاب طرحبندی صفحهکلید"</string> <string name="keyboard_layout_default_label" msgid="1997292217218546957">"پیشفرض"</string> <string name="turn_screen_on_title" msgid="3266937298097573424">"روشن کردن صفحهنمایش"</string> - <string name="allow_turn_screen_on" msgid="6194845766392742639">"اعطای اجازه برای روشن کردن صفحهنمایش"</string> + <string name="allow_turn_screen_on" msgid="6194845766392742639">"اجازه روشن کردن صفحهنمایش"</string> <string name="allow_turn_screen_on_description" msgid="43834403291575164">"به برنامه اجازه میدهد صفحهنمایش را روشن کند. اگر اجازه داده شود، ممکن است این برنامه در هر زمانی بدون هدف صریح شما صفحهنمایش را روشن کند."</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"همهفرستی <xliff:g id="APP_NAME">%1$s</xliff:g> متوقف شود؟"</string> <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"اگر <xliff:g id="SWITCHAPP">%1$s</xliff:g> را همهفرستی کنید یا خروجی را تغییر دهید، همهفرستی کنونی متوقف خواهد شد"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index c54e8a93d024..5099da4b1995 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -355,8 +355,8 @@ <string name="pointer_location_summary" msgid="957120116989798464">"Superposition à l\'écran indiquant l\'emplacement actuel du curseur"</string> <string name="show_touches" msgid="8437666942161289025">"Indicateurs visuels"</string> <string name="show_touches_summary" msgid="3692861665994502193">"Afficher un indicateur visuel là où l\'utilisateur appuie sur l\'écran"</string> - <string name="show_key_presses" msgid="6360141722735900214">"Afficher appuis touche"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"Afficher retour visuel pour appuis de touches"</string> + <string name="show_key_presses" msgid="6360141722735900214">"Afficher les pressions sur les touches"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"Afficher un retour visuel des pressions sur les touches"</string> <string name="show_screen_updates" msgid="2078782895825535494">"Mises à jour de la surface"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"Faire clignoter les endroits où des mises à jour sont effectuées"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"Mises à jour de fenêtres"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index bd508d93e50d..864485260c2a 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -214,7 +214,7 @@ </string-array> <string name="choose_profile" msgid="343803890897657450">"प्रोफ़ाइल चुनें"</string> <string name="category_personal" msgid="6236798763159385225">"निजी"</string> - <string name="category_work" msgid="4014193632325996115">"वर्क ऐप्लिकेशन"</string> + <string name="category_work" msgid="4014193632325996115">"वर्क"</string> <string name="category_clone" msgid="1554511758987195974">"क्लोन"</string> <string name="development_settings_title" msgid="140296922921597393">"डेवलपर के लिए सेटिंग और टूल"</string> <string name="development_settings_enable" msgid="4285094651288242183">"डेवलपर के लिए सेटिंग और टूल चालू करें"</string> @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"टैप दिखाएं"</string> <string name="show_touches_summary" msgid="3692861665994502193">"टैप के लिए विज़ुअल फ़ीडबैक दिखाएं"</string> <string name="show_key_presses" msgid="6360141722735900214">"दबाए गए बटन दिखाएं"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"दबाए गए बटन के लिए विज़ुअल फ़ीडबैक दिखाएं"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"दबाए गए बटन का विज़ुअल फ़ीडबैक दिखाएं"</string> <string name="show_screen_updates" msgid="2078782895825535494">"सर्फ़ेस अपडेट दिखाएं"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"अपडेट होने पर पूरे विंडो सर्फ़ेस फ़्लैश करें"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"जीपीयू व्यू के अपडेट दिखाएं"</string> @@ -585,10 +585,10 @@ <string name="user_grant_admin_title" msgid="5157031020083343984">"क्या इस व्यक्ति को एडमिन बनाना है?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"एडमिन के पास अन्य लोगों के मुकाबले खास अधिकार होते हैं. एडमिन के पास ये अधिकार होते हैं: सभी लोगों को मैनेज करना, इस डिवाइस को अपडेट या रीसेट करना, सेटिंग में बदलाव करना, इंस्टॉल किए गए सभी ऐप्लिकेशन देखना, और अन्य लोगों को एडमिन के खास अधिकार देना या उन्हें वापस लेना."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"एडमिन बनाएं"</string> - <string name="user_setup_dialog_title" msgid="8037342066381939995">"उपयोगकर्ता को अभी सेट करें?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"पक्का करें कि व्यक्ति डिवाइस का इस्तेमाल करने और अपनी जगह सेट करने के लिए मौजूद है"</string> + <string name="user_setup_dialog_title" msgid="8037342066381939995">"उपयोगकर्ता खाता सेटअप करना है?"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"पक्का करें कि उपयोगकर्ता, डिवाइस पर अपने खाते को पसंद के हिसाब से सेट अप करने के लिए मौजूद हो"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"प्रोफ़ाइल अभी सेट करें?"</string> - <string name="user_setup_button_setup_now" msgid="1708269547187760639">"अभी सेट करें"</string> + <string name="user_setup_button_setup_now" msgid="1708269547187760639">"अभी सेट अप करें"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"रद्द करें"</string> <string name="user_add_user_type_title" msgid="551279664052914497">"जोड़ें"</string> <string name="user_new_user_name" msgid="60979820612818840">"नया उपयोगकर्ता"</string> @@ -675,7 +675,7 @@ <string name="physical_keyboard_title" msgid="4811935435315835220">"फ़िज़िकल कीबोर्ड"</string> <string name="keyboard_layout_dialog_title" msgid="3927180147005616290">"कीबोर्ड का लेआउट चुनें"</string> <string name="keyboard_layout_default_label" msgid="1997292217218546957">"डिफ़ॉल्ट"</string> - <string name="turn_screen_on_title" msgid="3266937298097573424">"स्क्रीन चालू करें"</string> + <string name="turn_screen_on_title" msgid="3266937298097573424">"स्क्रीन चालू करने की अनुमति"</string> <string name="allow_turn_screen_on" msgid="6194845766392742639">"स्क्रीन चालू करने की अनुमति दें"</string> <string name="allow_turn_screen_on_description" msgid="43834403291575164">"ऐप्लिकेशन को स्क्रीन चालू करने की अनुमति दें. ऐसा करने पर, ऐप्लिकेशन आपकी अनुमति लिए बिना भी, जब चाहे स्क्रीन चालू कर सकता है."</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"<xliff:g id="APP_NAME">%1$s</xliff:g> पर ब्रॉडकास्ट करना रोकें?"</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index d15b4effdf09..1f61bbf8bfb2 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"タップを表示"</string> <string name="show_touches_summary" msgid="3692861665994502193">"タップを視覚表示する"</string> <string name="show_key_presses" msgid="6360141722735900214">"キーの押下を表示"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"物理キーの押下に関する視覚的フィードバックを表示"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"物理キーが押下されたことを視覚的に表示"</string> <string name="show_screen_updates" msgid="2078782895825535494">"表示面の更新を通知"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"更新時にウィンドウの表示面全体を点滅させる"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"画面の更新を表示"</string> diff --git a/packages/SettingsLib/res/values-km/strings.xml b/packages/SettingsLib/res/values-km/strings.xml index f7a8bfdaaa80..047c4cda8178 100644 --- a/packages/SettingsLib/res/values-km/strings.xml +++ b/packages/SettingsLib/res/values-km/strings.xml @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"បង្ហាញការចុច"</string> <string name="show_touches_summary" msgid="3692861665994502193">"បង្ហាញដានចុច នៅពេលចុច"</string> <string name="show_key_presses" msgid="6360141722735900214">"បង្ហាញការចុចគ្រាប់ចុច"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"បង្ហាញព័ត៌មានឆ្លើយតបជារូបភាពសម្រាប់ការចុចគ្រាប់ចុចរូបវន្ត"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"បង្ហាញរូបភាពប្រតិកម្មសម្រាប់ការចុចគ្រាប់ចុចរូបវន្ត"</string> <string name="show_screen_updates" msgid="2078782895825535494">"បង្ហាញបច្ចុប្បន្នភាពផ្ទៃ"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"ផ្ទៃវីនដូទាំងមូលបញ្ចេញពន្លឺនៅពេលធ្វើបច្ចុប្បន្នភាព"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"បង្ហាញបច្ចុប្បន្នភាពទិដ្ឋភាព"</string> @@ -586,7 +586,7 @@ <string name="user_grant_admin_message" msgid="1673791931033486709">"អ្នកគ្រប់គ្រងមានសិទ្ធិពិសេសដែលអ្នកប្រើប្រាស់ផ្សេងទៀតមិនមាន។ អ្នកគ្រប់គ្រងអាចគ្រប់គ្រងអ្នកប្រើប្រាស់ទាំងអស់ ធ្វើបច្ចុប្បន្នភាពឬកំណត់ឧបករណ៍នេះឡើងវិញ កែសម្រួលការកំណត់ មើលកម្មវិធីដែលបានដំឡើងទាំងអស់ និងផ្ដល់ឬដកសិទ្ធិជាអ្នកគ្រប់គ្រងសម្រាប់អ្នកផ្សេងទៀត។"</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"ផ្ដល់សិទ្ធិជាអ្នកគ្រប់គ្រង"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"រៀបចំអ្នកប្រើប្រាស់ឥឡូវនេះ?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"សូមប្រាកដថាអ្នកប្រើប្រាស់នេះអាចយកឧបករណ៍ និងរៀបចំទំហំផ្ទុករបស់គេបាន"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"សូមប្រាកដថាអ្នកប្រើប្រាស់នេះអាចយកឧបករណ៍ និងរៀបចំទំហំផ្ទុករបស់គាត់បាន"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"រៀបចំប្រវត្តិរូបឥឡូវ?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"រៀបចំឥឡូវ"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"កុំទាន់"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index c1fc0f88ad98..e2cb3ed00d1e 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -585,8 +585,8 @@ <string name="user_grant_admin_title" msgid="5157031020083343984">"Бул колдонуучуну админ кыласызбы?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Админдердин өзгөчө укуктары бар. Админ бардык колдонуучуларды тескеп, бул түзмөктү жаңыртып же баштапкы абалга келтирип, параметрлерди өзгөртүп, орнотулган колдонмолордун баарын көрүп, башкаларга админ укуктарын берип же жокко чыгара алат."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Админ кылуу"</string> - <string name="user_setup_dialog_title" msgid="8037342066381939995">"Профилди жөндөйсүзбү?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"Өз мейкиндигин жөндөп алышы үчүн, түзмөктү колдонуучуга беришиңиз керек."</string> + <string name="user_setup_dialog_title" msgid="8037342066381939995">"Профиль түзөсүзбү?"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"Колдонуучу өз мейкиндигин түзүп алышы үчүн түзмөктү ага беришиңиз керек."</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Профайл азыр түзүлсүнбү?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"Азыр түзүү"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"Азыр эмес"</string> @@ -677,7 +677,7 @@ <string name="keyboard_layout_default_label" msgid="1997292217218546957">"Демейки"</string> <string name="turn_screen_on_title" msgid="3266937298097573424">"Экранды күйгүзүү"</string> <string name="allow_turn_screen_on" msgid="6194845766392742639">"Экранды күйгүзүүгө уруксат берүү"</string> - <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Колдонмого экранды күйгүзүүгө уруксат бериңиз. Уруксат берилсе, колдонмо экранды каалаган убакта сизден уруксат сурабастан күйгүзүшү мүмкүн."</string> + <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Колдонмого экранды күйгүзүүгө уруксат бересиз. Колдонмо экранды каалаган убакта сизден уруксат сурабастан күйгүзө берет."</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунда кабарлоо токтотулсунбу?"</string> <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"Эгер <xliff:g id="SWITCHAPP">%1$s</xliff:g> колдонмосунда кабарласаңыз же аудионун чыгуусун өзгөртсөңүз, учурдагы кабарлоо токтотулат"</string> <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> колдонмосунда кабарлоо"</string> diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml index 0a429fd5d5be..b61a28e31527 100644 --- a/packages/SettingsLib/res/values-lo/strings.xml +++ b/packages/SettingsLib/res/values-lo/strings.xml @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"ສະແດງການແຕະ"</string> <string name="show_touches_summary" msgid="3692861665994502193">"ສະແດງຄໍາຕິຊົມທາງຮູບພາບສຳລັບການແຕະ"</string> <string name="show_key_presses" msgid="6360141722735900214">"ສະແດງການກົດປຸ່ມ"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"ສະແດງຄຳຕິຊົມພາບສຳລັບການກົດປຸ່ມຈິງ"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"ສະແດງການຕອບສະໜອງທີ່ເປັນພາບສຳລັບການກົດປຸ່ມຈິງ"</string> <string name="show_screen_updates" msgid="2078782895825535494">"ສະແດງການອັບເດດພື້ນຜິວ"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"ກະພິບໜ້າຈໍທັງໜ້າເມື່ອມີການອັບເດດ"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"ສະແດງອັບເດດມຸມມອງ"</string> diff --git a/packages/SettingsLib/res/values-ms/strings.xml b/packages/SettingsLib/res/values-ms/strings.xml index 0a41c0f6a554..c924543a9af6 100644 --- a/packages/SettingsLib/res/values-ms/strings.xml +++ b/packages/SettingsLib/res/values-ms/strings.xml @@ -581,12 +581,12 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Profil terhad"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Tambah pengguna baharu?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri, yang boleh diperibadikan dengan apl, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan peranti seperti Wi-Fi yang akan memberi kesan kepada semua orang.\n\nApabila anda menambah pengguna baharu, orang itu perlu menyediakan ruang mereka.\n\nMana-mana pengguna boleh mengemaskinikan apl untuk semua pengguna lain. Tetapan dan perkhidmatan kebolehaksesan tidak boleh dipindahkan kepada pengguna baharu."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Apabila anda menambah pengguna baharu, orang itu perlu menyediakan ruangnya sendiri.\n\nMana-mana pengguna boleh mengemaskinikan apl untuk semua pengguna lain."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Apabila anda menambahkan pengguna baharu, orang itu perlu menyediakan ruangnya sendiri.\n\nMana-mana pengguna boleh mengemaskinikan apl untuk semua pengguna lain."</string> <string name="user_grant_admin_title" msgid="5157031020083343984">"Jadikan pengguna ini pentadbir?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Pentadbir mempunyai keistimewaan khas yang tiada pada pengguna lain. Pentadbir boleh mengurus semua pengguna, mengemaskinikan atau menetapkan semula peranti ini, mengubah suai tetapan, melihat semua apl yang telah dipasang dan memberikan atau membatalkan keistimewaan pentadbir untuk pengguna lain."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Jadikan pentadbir"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Sediakan pengguna sekarang?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"Pastikan orang itu tersedia untuk mengambil peranti dan menyediakan ruangan"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"Pastikan individu itu bersedia untuk mengambil peranti dan menyediakan ruangannya"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Sediakan profil sekarang?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"Sediakan sekarang"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"Bukan sekarang"</string> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 598304b77a56..1483adc1edfe 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -449,8 +449,8 @@ <string name="power_remaining_settings_home_page" msgid="4885165789445462557">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> – <xliff:g id="TIME_STRING">%2$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="8264199158671531431">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> igjen"</string> <string name="power_discharging_duration" msgid="1076561255466053220">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> igjen (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> - <string name="power_remaining_duration_only_enhanced" msgid="2527842780666073218">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> gjenstår basert på bruken din"</string> - <string name="power_discharging_duration_enhanced" msgid="1800465736237672323">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> gjenstår basert på bruken din (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> + <string name="power_remaining_duration_only_enhanced" msgid="2527842780666073218">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> igjen basert på bruken din"</string> + <string name="power_discharging_duration_enhanced" msgid="1800465736237672323">"Omtrent <xliff:g id="TIME_REMAINING">%1$s</xliff:g> igjen basert på bruken din (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> <!-- no translation found for power_remaining_duration_only_short (7438846066602840588) --> <skip /> <string name="power_discharge_by_enhanced" msgid="563438403581662942">"Skal vare til omtrent <xliff:g id="TIME">%1$s</xliff:g>, basert på bruken din (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index 825f8b32e723..4d9f1192ebdc 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -586,7 +586,7 @@ <string name="user_grant_admin_message" msgid="1673791931033486709">"एड्मिनहरूसँग अन्य प्रयोगकर्तासँग नभएका विशेषाधिकारहरू हुन्छन्। एड्मिन सबै प्रयोगकर्ताहरूलाई व्यवस्थापन गर्न, यो डिभाइस अपडेट वा रिसेट गर्न, सेटिङ परिमार्जन गर्न, इन्स्टल गरिएका सबै एपहरू हेर्न र अरूलाई एड्मिनका विशेषाधिकारहरू दिन वा अरूलाई दिइएका एड्मिनका विशेषाधिकारहरू खारेज गर्न सक्नुहुन्छ।"</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"एड्मिन बनाउनुहोस्"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"अहिले प्रयोगकर्ता सेटअप गर्ने हो?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"यी व्यक्ति यन्त्र यो डिभाइस चलाउन र आफ्नो ठाउँ सेट गर्न उपलब्ध छन् भन्ने कुरा सुनिश्चित गर्नुहोस्"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"यी व्यक्ति यो डिभाइस चलाउन र आफ्नो ठाउँ सेट गर्न उपलब्ध छन् भन्ने कुरा सुनिश्चित गर्नुहोस्"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"अहिले प्रोफाइल सेटअप गर्ने हो?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"अब सेटअप गर्नुहोस्"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"अहिले होइन"</string> @@ -603,8 +603,8 @@ <string name="add_user_failed" msgid="4809887794313944872">"नयाँ प्रयोगकर्ता सिर्जना गर्न सकिएन"</string> <string name="add_guest_failed" msgid="8074548434469843443">"नयाँ अतिथि बनाउन सकिएन"</string> <string name="user_nickname" msgid="262624187455825083">"उपनाम"</string> - <string name="user_add_user" msgid="7876449291500212468">"प्रयोगकर्ता थप्नुहोस्"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"अतिथि थप्नुहोस्"</string> + <string name="user_add_user" msgid="7876449291500212468">"प्रयोगकर्ता कनेक्ट गर्नुहोस्"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"अतिथि कनेक्ट गर्नुहोस्"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"गेस्ट मोडबाट बाहिर निस्कियोस्"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"अतिथि सत्र रिसेट गर्नुहोस्"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"अतिथिका रूपमा ब्राउज गर्ने सेसन रिसेट गर्ने हो?"</string> diff --git a/packages/SettingsLib/res/values-or/strings.xml b/packages/SettingsLib/res/values-or/strings.xml index 80945c7b5efa..93f3461fe86c 100644 --- a/packages/SettingsLib/res/values-or/strings.xml +++ b/packages/SettingsLib/res/values-or/strings.xml @@ -585,10 +585,10 @@ <string name="user_grant_admin_title" msgid="5157031020083343984">"ଏହି ୟୁଜରଙ୍କୁ ଜଣେ ଆଡମିନ କରିବେ?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"ଆଡମିନମାନଙ୍କର ବିଶେଷ ଅଧିକାରଗୁଡ଼ିକ ଥାଏ ଯାହା ଅନ୍ୟ ୟୁଜରମାନଙ୍କର ନଥାଏ। ଜଣେ ଆଡମିନ ସମସ୍ତ ୟୁଜରଙ୍କୁ ପରିଚାଳନା କରିପାରିବେ, ଏହି ଡିଭାଇସକୁ ଅପଡେଟ କିମ୍ବା ରିସେଟ କରିପାରିବେ, ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିପାରିବେ, ଇନଷ୍ଟଲ କରାଯାଇଥିବା ସମସ୍ତ ଆପ୍ସ ଦେଖିପାରିବେ ଏବଂ ଅନ୍ୟମାନଙ୍କ ପାଇଁ ଆଡମିନଙ୍କ ବିଶେଷ ଅଧିକାରଗୁଡ଼ିକୁ ଅନୁମତି ଦେଇପାରିବେ କିମ୍ବା ପ୍ରତ୍ୟାହାର କରିପାରିବେ।"</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"ଆଡମିନ କରନ୍ତୁ"</string> - <string name="user_setup_dialog_title" msgid="8037342066381939995">"ଏବେ ଉପଯୋଗକର୍ତ୍ତା ସେଟଅପ କରିବେ?"</string> - <string name="user_setup_dialog_message" msgid="269931619868102841">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ ଯେ, ବ୍ୟକ୍ତି ଜଣକ ଡିଭାଇସ୍ ଓ ନିଜର ସ୍ଥାନ ସେଟଅପ୍ କରିବା ପାଇଁ ଉପଲବ୍ଧ ଅଛନ୍ତି।"</string> + <string name="user_setup_dialog_title" msgid="8037342066381939995">"ଏବେ ୟୁଜର ସେଟଅପ କରିବେ?"</string> + <string name="user_setup_dialog_message" msgid="269931619868102841">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ ଯେ, ବ୍ୟକ୍ତି ଜଣକ ଡିଭାଇସ ଓ ନିଜର ସ୍ଥାନ ସେଟଅପ କରିବା ପାଇଁ ଉପଲବ୍ଧ ଅଛନ୍ତି।"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"ପ୍ରୋଫାଇଲ୍କୁ ଏବେ ସେଟ୍ କରିବେ?"</string> - <string name="user_setup_button_setup_now" msgid="1708269547187760639">"ଏବେ ସେଟଅପ୍ କରନ୍ତୁ"</string> + <string name="user_setup_button_setup_now" msgid="1708269547187760639">"ଏବେ ସେଟଅପ କରନ୍ତୁ"</string> <string name="user_setup_button_setup_later" msgid="8712980133555493516">"ଏବେ ନୁହେଁଁ"</string> <string name="user_add_user_type_title" msgid="551279664052914497">"ଯୋଡନ୍ତୁ"</string> <string name="user_new_user_name" msgid="60979820612818840">"ନୂଆ ୟୁଜର"</string> @@ -677,7 +677,7 @@ <string name="keyboard_layout_default_label" msgid="1997292217218546957">"ଡିଫଲ୍ଟ"</string> <string name="turn_screen_on_title" msgid="3266937298097573424">"ସ୍କ୍ରିନକୁ ଚାଲୁ କରନ୍ତୁ"</string> <string name="allow_turn_screen_on" msgid="6194845766392742639">"ସ୍କ୍ରିନକୁ ଚାଲୁ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string> - <string name="allow_turn_screen_on_description" msgid="43834403291575164">"ସ୍କ୍ରିନକୁ ଚାଲୁ କରିବା ପାଇଁ ଏକ ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଆପଟି ଆପଣଙ୍କ ସ୍ପଷ୍ଟ ଇଣ୍ଟେଣ୍ଟ ବିନା ଯେ କୌଣସି ସମୟରେ ସ୍କ୍ରିନକୁ ଚାଲୁ କରିପାରେ।"</string> + <string name="allow_turn_screen_on_description" msgid="43834403291575164">"ସ୍କ୍ରିନକୁ ଚାଲୁ କରିବା ପାଇଁ ଏକ ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଆପଟି ଆପଣଙ୍କ ଏକ୍ସପ୍ଲିସିଟ ଇଣ୍ଟେଣ୍ଟ ବିନା ଯେ କୌଣସି ସମୟରେ ସ୍କ୍ରିନକୁ ଚାଲୁ କରିପାରେ।"</string> <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବ୍ରଡକାଷ୍ଟ କରିବା ବନ୍ଦ କରିବେ?"</string> <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"ଯଦି ଆପଣ <xliff:g id="SWITCHAPP">%1$s</xliff:g> ବ୍ରଡକାଷ୍ଟ କରନ୍ତି କିମ୍ବା ଆଉଟପୁଟ ବଦଳାନ୍ତି, ତେବେ ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ବ୍ରଡକାଷ୍ଟ ବନ୍ଦ ହୋଇଯିବ"</string> <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> ବ୍ରଡକାଷ୍ଟ କରନ୍ତୁ"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index 62f7e81fe361..d485ccd5bc55 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -356,7 +356,7 @@ <string name="show_touches" msgid="8437666942161289025">"Pokazuj dotknięcia"</string> <string name="show_touches_summary" msgid="3692861665994502193">"Pokazuj potwierdzenie wizualne po dotknięciu"</string> <string name="show_key_presses" msgid="6360141722735900214">"Wyświetl naciśnięcia klawiszy"</string> - <string name="show_key_presses_summary" msgid="725387457373015024">"Wyświetl opinie wizualne dla naciśnięć fizycznego klucza"</string> + <string name="show_key_presses_summary" msgid="725387457373015024">"Pokaż wizualną informację zwrotną po naciśnięciu fizycznego klawisza"</string> <string name="show_screen_updates" msgid="2078782895825535494">"Pokazuj zmiany powierzchni"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"Podświetlaj całe aktualizowane powierzchnie okien"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"Pokazuj aktualizacje widoku"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index a69ded5a5964..79e0e087c541 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -268,7 +268,7 @@ <string name="mock_location_app_not_set" msgid="6972032787262831155">"Nuk është vendosur asnjë aplikacion që simulon vendndodhjen"</string> <string name="mock_location_app_set" msgid="4706722469342913843">"Aplikacioni për simulimin e vendndodhjes: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="debug_networking_category" msgid="6829757985772659599">"Rrjetet"</string> - <string name="wifi_display_certification" msgid="1805579519992520381">"Certifikimi i ekranit pa tel"</string> + <string name="wifi_display_certification" msgid="1805579519992520381">"Certifikimi i ekranit wireless"</string> <string name="wifi_verbose_logging" msgid="1785910450009679371">"Aktivizo regjistrimin Wi-Fi Verbose"</string> <string name="wifi_scan_throttling" msgid="2985624788509913617">"Përshpejtimi i skanimit të Wi‑Fi"</string> <string name="wifi_non_persistent_mac_randomization" msgid="7482769677894247316">"Renditje e rastësishme jo e përhershme e MAC për Wi‑Fi"</string> @@ -300,7 +300,7 @@ <string name="private_dns_mode_provider" msgid="3619040641762557028">"Emri i pritësit të ofruesit të DNS-së private"</string> <string name="private_dns_mode_provider_hostname_hint" msgid="6564868953748514595">"Fut emrin e pritësit të ofruesit të DNS-së"</string> <string name="private_dns_mode_provider_failure" msgid="8356259467861515108">"Nuk mund të lidhej"</string> - <string name="wifi_display_certification_summary" msgid="8111151348106907513">"Shfaq opsionet për certifikimin e ekranit pa tel"</string> + <string name="wifi_display_certification_summary" msgid="8111151348106907513">"Shfaq opsionet për certifikimin e ekranit wireless"</string> <string name="wifi_verbose_logging_summary" msgid="4993823188807767892">"Rrit nivelin regjistrues të Wi‑Fi duke shfaqur SSID RSSI-në te Zgjedhësi i Wi‑Fi"</string> <string name="wifi_scan_throttling_summary" msgid="2577105472017362814">"Zvogëlon shkarkimin e baterisë dhe përmirëson cilësinë e funksionimit të rrjetit"</string> <string name="wifi_non_persistent_mac_randomization_summary" msgid="2159794543105053930">"Kur ky modalitet është i aktivizuar, adresa MAC e kësaj pajisjeje mund të ndryshojë çdo herë që lidhet me një rrjet që ka të aktivizuar renditjen e rastësishme të adresave MAC."</string> @@ -478,7 +478,7 @@ <string name="battery_info_status_charging" msgid="4279958015430387405">"Po karikohet"</string> <string name="battery_info_status_charging_fast" msgid="8027559755902954885">"Karikim i shpejtë"</string> <string name="battery_info_status_charging_slow" msgid="3190803837168962319">"Po karikohet ngadalë"</string> - <string name="battery_info_status_charging_wireless" msgid="8924722966861282197">"Po karikohet pa tel"</string> + <string name="battery_info_status_charging_wireless" msgid="8924722966861282197">"Po karikohet wireless"</string> <string name="battery_info_status_charging_dock" msgid="8573274094093364791">"Po karikohet"</string> <string name="battery_info_status_discharging" msgid="6962689305413556485">"Nuk po karikohet"</string> <string name="battery_info_status_not_charging" msgid="3371084153747234837">"Lidhur, jo në karikim"</string> @@ -585,7 +585,7 @@ <string name="user_grant_admin_title" msgid="5157031020083343984">"Të bëhet administrator ky përdorues?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Administratorët kanë privilegje të veçanta që nuk i kanë përdoruesit e tjerë. Një administrator mund të menaxhojë të gjithë përdoruesit, të përditësojë ose të rivendosë këtë pajisje, të modifikojë cilësimet, të shikojë të gjitha aplikacionet e instaluara dhe të japë ose të revokojë privilegjet e administratorit për të tjerët."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Bëje administrator"</string> - <string name="user_setup_dialog_title" msgid="8037342066381939995">"Të konfig. përdoruesi tani?"</string> + <string name="user_setup_dialog_title" msgid="8037342066381939995">"Të konfigurohet përdoruesi?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"Sigurohu që personi të jetë i gatshëm të marrë pajisjen dhe të caktojë hapësirën e vet"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Të konfigurohet tani profili?"</string> <string name="user_setup_button_setup_now" msgid="1708269547187760639">"Konfiguro tani"</string> diff --git a/packages/SettingsLib/res/values-ta/strings.xml b/packages/SettingsLib/res/values-ta/strings.xml index b72c5339db38..aa86df9db2d4 100644 --- a/packages/SettingsLib/res/values-ta/strings.xml +++ b/packages/SettingsLib/res/values-ta/strings.xml @@ -355,7 +355,7 @@ <string name="pointer_location_summary" msgid="957120116989798464">"திரையின் மேல் அடுக்கானது தற்போது தொடப்பட்டிருக்கும் தரவைக் காண்பிக்கிறது"</string> <string name="show_touches" msgid="8437666942161289025">"தட்டல்களைக் காட்டு"</string> <string name="show_touches_summary" msgid="3692861665994502193">"தட்டல்களின் போது காட்சி அறிகுறிகளைக் காட்டும்"</string> - <string name="show_key_presses" msgid="6360141722735900214">"பட்டன் அழுத்தத்தை காட்டவா"</string> + <string name="show_key_presses" msgid="6360141722735900214">"பட்டன் அழுத்தத்தை காட்டு"</string> <string name="show_key_presses_summary" msgid="725387457373015024">"பட்டன் அழுத்தங்களைக் காட்சி மூலம் உறுதிப்படுத்தும்"</string> <string name="show_screen_updates" msgid="2078782895825535494">"மேலோட்ட புதுப்பிப்புகளைக் காட்டு"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"சாளரத்தின் பரப்புநிலைகள் புதுப்பிக்கப்படும்போது, அவற்றை முழுவதுமாகக் காட்டும்"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 96e5d6a085c2..24f838e37265 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -603,7 +603,7 @@ <string name="add_user_failed" msgid="4809887794313944872">"Yangi foydalanuvchi yaratilmadi"</string> <string name="add_guest_failed" msgid="8074548434469843443">"Yangi mehmon yaratilmadi"</string> <string name="user_nickname" msgid="262624187455825083">"Nik"</string> - <string name="user_add_user" msgid="7876449291500212468">"Foydalanuvchi"</string> + <string name="user_add_user" msgid="7876449291500212468">"Foydalanuvchi kiritish"</string> <string name="guest_new_guest" msgid="3482026122932643557">"Mehmon kiritish"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Mehmonni olib tashlash"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Mehmon seansini tiklash"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 7035077087ef..c63b8381017f 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -581,7 +581,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Tiểu sử bị hạn chế"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Thêm người dùng mới?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Bạn có thể chia sẻ thiết bị này với người khác bằng cách tạo thêm người dùng. Mỗi người dùng sẽ có không gian riêng của mình. Họ có thể tùy chỉnh không gian riêng đó bằng các ứng dụng, hình nền, v.v. Người dùng cũng có thể điều chỉnh các tùy chọn cài đặt thiết bị có ảnh hưởng đến tất cả mọi người, chẳng hạn như Wi‑Fi.\n\nKhi bạn thêm người dùng mới, họ cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác. Các dịch vụ và các tùy chọn cài đặt hỗ trợ tiếp cận có thể không chuyển sang người dùng mới."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Khi bạn thêm người dùng mới, họ cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Khi bạn thêm người dùng mới, người đó cần thiết lập không gian của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string> <string name="user_grant_admin_title" msgid="5157031020083343984">"Đặt người dùng này làm quản trị viên?"</string> <string name="user_grant_admin_message" msgid="1673791931033486709">"Quản trị viên có các đặc quyền mà những người dùng khác không có. Một quản trị viên có thể quản lý toàn bộ người dùng, cập nhật hoặc đặt lại thiết bị này, sửa đổi chế độ cài đặt, xem tất cả các ứng dụng đã cài đặt và cấp hoặc thu hồi đặc quyền của quản trị viên đối với những người khác."</string> <string name="user_grant_admin_button" msgid="5441486731331725756">"Đặt làm quản trị viên"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index ceda9024eaa6..898fee23e0b2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -54,6 +54,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.stream.Stream; /** * CachedBluetoothDevice represents a remote Bluetooth device. It contains @@ -652,6 +653,20 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> return mDevice.getBatteryLevel(); } + /** + * Get the lowest battery level from remote device and its member devices + * @return battery level in percentage [0-100] or + * {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN} + */ + public int getMinBatteryLevelWithMemberDevices() { + return Stream.concat(Stream.of(this), mMemberDevices.stream()) + .mapToInt(cachedDevice -> cachedDevice.getBatteryLevel()) + .filter(batteryLevel -> batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) + .min() + .orElse(BluetoothDevice.BATTERY_LEVEL_UNKNOWN); + } + + void refresh() { ThreadUtils.postOnBackgroundThread(() -> { if (BluetoothUtils.isAdvancedDetailsHeader(mDevice)) { @@ -1147,7 +1162,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN, // any other value should be a framework bug. Thus assume here that if value is greater // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid - final int batteryLevel = getBatteryLevel(); + final int batteryLevel = getMinBatteryLevelWithMemberDevices(); if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { // TODO: name com.android.settingslib.bluetooth.Utils something different batteryLevelPercentageString = @@ -1322,7 +1337,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN, // any other value should be a framework bug. Thus assume here that if value is greater // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid - final int batteryLevel = getBatteryLevel(); + final int batteryLevel = getMinBatteryLevelWithMemberDevices(); if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { // TODO: name com.android.settingslib.bluetooth.Utils something different batteryLevelPercentageString = diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java index 4b61ff1177bd..85efe69529b4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java @@ -529,6 +529,51 @@ public class CachedBluetoothDeviceTest { } @Test + public void getConnectionSummary_testMemberDevicesExist_returnMinBattery() { + // One device is active with battery level 70. + mBatteryLevel = 70; + updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED); + mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP); + + + // Add a member device with battery level 30. + int lowerBatteryLevel = 30; + mCachedDevice.addMemberDevice(mSubCachedDevice); + doAnswer((invocation) -> lowerBatteryLevel).when(mSubCachedDevice).getBatteryLevel(); + + assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, 30% battery"); + } + + @Test + public void getConnectionSummary_testMemberDevicesBatteryUnknown_returnMinBattery() { + // One device is active with battery level 70. + mBatteryLevel = 70; + updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED); + mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP); + + // Add a member device with battery level unknown. + mCachedDevice.addMemberDevice(mSubCachedDevice); + doAnswer((invocation) -> BluetoothDevice.BATTERY_LEVEL_UNKNOWN).when( + mSubCachedDevice).getBatteryLevel(); + + assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, 70% battery"); + } + + @Test + public void getConnectionSummary_testAllDevicesBatteryUnknown_returnNoBattery() { + // One device is active with battery level unknown. + updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED); + mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP); + + // Add a member device with battery level unknown. + mCachedDevice.addMemberDevice(mSubCachedDevice); + doAnswer((invocation) -> BluetoothDevice.BATTERY_LEVEL_UNKNOWN).when( + mSubCachedDevice).getBatteryLevel(); + + assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active"); + } + + @Test public void getConnectionSummary_testMultipleProfilesActiveDevice() { // Test without battery level // Set A2DP and HFP profiles to be connected and test connection state summary diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index c2dbf9813178..be6302141b0d 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -241,6 +241,7 @@ public class SecureSettings { Settings.Secure.HEARING_AID_MEDIA_ROUTING, Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING, Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, - Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED + Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, + Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index a49461e3a5af..ff32badf23fd 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -199,6 +199,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.ASSIST_TOUCH_GESTURE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.SEARCH_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"})); VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index ef4e84fcff7b..5c6729529fa8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1929,6 +1929,9 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, SecureSettingsProto.Assist.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED); + dumpSetting(s, p, + Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED, + SecureSettingsProto.Assist.SEARCH_LONG_PRESS_HOME_ENABLED); p.end(assistToken); final long assistHandlesToken = p.start(SecureSettingsProto.ASSIST_HANDLES); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index e3153e046a96..0a98032e26d8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -94,6 +94,7 @@ final class SettingsState { static final int SETTINGS_VERSION_NEW_ENCODING = 121; + public static final int MAX_LENGTH_PER_STRING = 32768; private static final long WRITE_SETTINGS_DELAY_MILLIS = 200; private static final long MAX_WRITE_SETTINGS_DELAY_MILLIS = 2000; @@ -430,6 +431,19 @@ final class SettingsState { return false; } + final boolean isNameTooLong = name.length() > SettingsState.MAX_LENGTH_PER_STRING; + final boolean isValueTooLong = + value != null && value.length() > SettingsState.MAX_LENGTH_PER_STRING; + if (isNameTooLong || isValueTooLong) { + // only print the first few bytes of the name in case it is long + final String errorMessage = "The " + (isNameTooLong ? "name" : "value") + + " of your setting [" + + (name.length() > 20 ? (name.substring(0, 20) + "...") : name) + + "] is too long. The max length allowed for the string is " + + MAX_LENGTH_PER_STRING + "."; + throw new IllegalArgumentException(errorMessage); + } + Setting oldState = mSettings.get(name); String oldValue = (oldState != null) ? oldState.value : null; String oldDefaultValue = (oldState != null) ? oldState.defaultValue : null; @@ -831,6 +845,7 @@ final class SettingsState { private void doWriteState() { boolean wroteState = false; + String settingFailedToBePersisted = null; final int version; final ArrayMap<String, Setting> settings; final ArrayMap<String, String> namespaceBannedHashes; @@ -860,7 +875,6 @@ final class SettingsState { final int settingCount = settings.size(); for (int i = 0; i < settingCount; i++) { - Setting setting = settings.valueAt(i); if (setting.isTransient()) { if (DEBUG_PERSISTENCE) { @@ -869,14 +883,27 @@ final class SettingsState { continue; } - if (writeSingleSetting(mVersion, serializer, setting.getId(), setting.getName(), - setting.getValue(), setting.getDefaultValue(), setting.getPackageName(), - setting.getTag(), setting.isDefaultFromSystem(), - setting.isValuePreservedInRestore())) { - if (DEBUG_PERSISTENCE) { - Slog.i(LOG_TAG, "[PERSISTED]" + setting.getName() + "=" - + setting.getValue()); + try { + if (writeSingleSetting(mVersion, serializer, setting.getId(), + setting.getName(), + setting.getValue(), setting.getDefaultValue(), + setting.getPackageName(), + setting.getTag(), setting.isDefaultFromSystem(), + setting.isValuePreservedInRestore())) { + if (DEBUG_PERSISTENCE) { + Slog.i(LOG_TAG, "[PERSISTED]" + setting.getName() + "=" + + setting.getValue()); + } } + } catch (IOException ex) { + Slog.e(LOG_TAG, "[ABORT PERSISTING]" + setting.getName() + + " due to error writing to disk", ex); + // A setting failed to be written. Abort the serialization to avoid leaving + // a partially serialized setting on disk, which can cause parsing errors. + // Note down the problematic setting, so that we can delete it before trying + // again to persist the rest of the settings. + settingFailedToBePersisted = setting.getName(); + throw ex; } } serializer.endTag(null, TAG_SETTINGS); @@ -902,14 +929,14 @@ final class SettingsState { Slog.i(LOG_TAG, "[PERSIST END]"); } } catch (Throwable t) { - Slog.wtf(LOG_TAG, "Failed to write settings, restoring backup", t); + Slog.wtf(LOG_TAG, "Failed to write settings, restoring old file", t); if (t instanceof IOException) { - if (DEBUG) { - // we failed to create a directory, so log the permissions and existence - // state for the settings file and directory - logSettingsDirectoryInformation(destination.getBaseFile()); - } if (t.getMessage().contains("Couldn't create directory")) { + if (DEBUG) { + // we failed to create a directory, so log the permissions and existence + // state for the settings file and directory + logSettingsDirectoryInformation(destination.getBaseFile()); + } // attempt to create the directory with Files.createDirectories, which // throws more informative errors than File.mkdirs. Path parentPath = destination.getBaseFile().getParentFile().toPath(); @@ -930,7 +957,15 @@ final class SettingsState { } } - if (wroteState) { + if (!wroteState) { + if (settingFailedToBePersisted != null) { + synchronized (mLock) { + // Delete the problematic setting. This will schedule a write as well. + deleteSettingLocked(settingFailedToBePersisted); + } + } + } else { + // success synchronized (mLock) { addHistoricalOperationLocked(HISTORICAL_OPERATION_PERSIST, null); } @@ -1090,7 +1125,10 @@ final class SettingsState { } catch (FileNotFoundException fnfe) { final String message = "No fallback file found for: " + mStatePersistFile; Slog.wtf(LOG_TAG, message); - throw new IllegalStateException(message); + if (!isConfigSettingsKey(mKey)) { + // Allow partially deserialized config settings because they can be updated later + throw new IllegalStateException(message); + } } if (parseStateFromXmlStreamLocked(in)) { // Parsed state from fallback file. Restore original file with fallback file @@ -1102,7 +1140,10 @@ final class SettingsState { } else { final String message = "Failed parsing settings file: " + mStatePersistFile; Slog.wtf(LOG_TAG, message); - throw new IllegalStateException(message); + if (!isConfigSettingsKey(mKey)) { + // Allow partially deserialized config settings because they can be updated later + throw new IllegalStateException(message); + } } } diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java index 55160fbfd92e..26cac37f8b35 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java @@ -31,21 +31,21 @@ import java.io.PrintStream; public class SettingsStateTest extends AndroidTestCase { public static final String CRAZY_STRING = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\n\u000b\u000c\r" + - "\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a" + - "\u001b\u001c\u001d\u001e\u001f\u0020" + - "fake_setting_value_1" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + - "\u1000 \u2000 \u5000 \u8000 \uc000 \ue000" + - "\ud800\udc00\udbff\udfff" + // surrogate pairs - "\uD800ab\uDC00 " + // broken surrogate pairs - "日本語"; + "\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a" + + "\u001b\u001c\u001d\u001e\u001f\u0020" + + "fake_setting_value_1" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "\u1000 \u2000 \u5000 \u8000 \uc000 \ue000" + + "\ud800\udc00\udbff\udfff" + // surrogate pairs + "\uD800ab\uDC00 " + // broken surrogate pairs + "日本語"; private static final String TEST_PACKAGE = "package"; private static final String SYSTEM_PACKAGE = "android"; @@ -170,11 +170,11 @@ public class SettingsStateTest extends AndroidTestCase { final PrintStream os = new PrintStream(new FileOutputStream(file)); os.print( "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" + - "<settings version=\"120\">" + - " <setting id=\"0\" name=\"k0\" value=\"null\" package=\"null\" />" + - " <setting id=\"1\" name=\"k1\" value=\"\" package=\"\" />" + - " <setting id=\"2\" name=\"k2\" value=\"v2\" package=\"p2\" />" + - "</settings>"); + "<settings version=\"120\">" + + " <setting id=\"0\" name=\"k0\" value=\"null\" package=\"null\" />" + + " <setting id=\"1\" name=\"k1\" value=\"\" package=\"\" />" + + " <setting id=\"2\" name=\"k2\" value=\"v2\" package=\"p2\" />" + + "</settings>"); os.close(); final SettingsState ss = new SettingsState(getContext(), lock, file, 1, @@ -408,4 +408,50 @@ public class SettingsStateTest extends AndroidTestCase { } assertEquals(expectedMemUsage, settingsState.getMemoryUsage(TEST_PACKAGE)); } + + public void testLargeSettingKey() { + SettingsState settingsState = new SettingsState(getContext(), mLock, mSettingsFile, 1, + SettingsState.MAX_BYTES_PER_APP_PACKAGE_LIMITED, Looper.getMainLooper()); + final String largeKey = Strings.repeat("A", SettingsState.MAX_LENGTH_PER_STRING + 1); + final String testValue = "testValue"; + synchronized (mLock) { + // Test system package + try { + settingsState.insertSettingLocked(largeKey, testValue, null, true, SYSTEM_PACKAGE); + fail("Should throw because it exceeded max string length"); + } catch (IllegalArgumentException ex) { + assertTrue(ex.getMessage().contains("The max length allowed for the string is ")); + } + // Test non system package + try { + settingsState.insertSettingLocked(largeKey, testValue, null, true, TEST_PACKAGE); + fail("Should throw because it exceeded max string length"); + } catch (IllegalArgumentException ex) { + assertTrue(ex.getMessage().contains("The max length allowed for the string is ")); + } + } + } + + public void testLargeSettingValue() { + SettingsState settingsState = new SettingsState(getContext(), mLock, mSettingsFile, 1, + SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper()); + final String testKey = "testKey"; + final String largeValue = Strings.repeat("A", SettingsState.MAX_LENGTH_PER_STRING + 1); + synchronized (mLock) { + // Test system package + try { + settingsState.insertSettingLocked(testKey, largeValue, null, true, SYSTEM_PACKAGE); + fail("Should throw because it exceeded max string length"); + } catch (IllegalArgumentException ex) { + assertTrue(ex.getMessage().contains("The max length allowed for the string is ")); + } + // Test non system package + try { + settingsState.insertSettingLocked(testKey, largeValue, null, true, TEST_PACKAGE); + fail("Should throw because it exceeded max string length"); + } catch (IllegalArgumentException ex) { + assertTrue(ex.getMessage().contains("The max length allowed for the string is ")); + } + } + } } diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index b708fc27448d..285fc5f1f332 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -6,6 +6,7 @@ dsandler@android.com aaliomer@google.com aaronjli@google.com +achalke@google.com acul@google.com adamcohen@google.com aioana@google.com @@ -70,6 +71,7 @@ omarmt@google.com patmanning@google.com peanutbutter@google.com peskal@google.com +petrcermak@google.com pinyaoting@google.com pixel@google.com pomini@google.com @@ -81,13 +83,17 @@ santie@google.com shanh@google.com snoeberger@google.com steell@google.com +stevenckng@google.com stwu@google.com syeonlee@google.com sunnygoyal@google.com thiruram@google.com +tkachenkoi@google.com tracyzhou@google.com tsuji@google.com twickham@google.com +vadimt@google.com +vanjan@google.com victortulias@google.com winsonc@google.com wleshner@google.com diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt index 764a8556a54d..76ea85734d38 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt @@ -24,6 +24,8 @@ import android.graphics.Matrix import android.graphics.Path import android.graphics.Rect import android.graphics.RectF +import android.os.Build +import android.os.Handler import android.os.Looper import android.os.RemoteException import android.util.Log @@ -57,7 +59,14 @@ class ActivityLaunchAnimator( /** The animator used when animating a Dialog into an app. */ // TODO(b/218989950): Remove this animator and instead set the duration of the dim fade out to // TIMINGS.contentBeforeFadeOutDuration. - private val dialogToAppAnimator: LaunchAnimator = DEFAULT_DIALOG_TO_APP_ANIMATOR + private val dialogToAppAnimator: LaunchAnimator = DEFAULT_DIALOG_TO_APP_ANIMATOR, + + /** + * Whether we should disable the WindowManager timeout. This should be set to true in tests + * only. + */ + // TODO(b/301385865): Remove this flag. + private val disableWmTimeout: Boolean = false, ) { companion object { /** The timings when animating a View into an app. */ @@ -88,6 +97,9 @@ class ActivityLaunchAnimator( contentAfterFadeInInterpolator = PathInterpolator(0f, 0f, 0.6f, 1f) ) + // TODO(b/288507023): Remove this flag. + @JvmField val DEBUG_LAUNCH_ANIMATION = Build.IS_DEBUGGABLE + private val DEFAULT_LAUNCH_ANIMATOR = LaunchAnimator(TIMINGS, INTERPOLATORS) private val DEFAULT_DIALOG_TO_APP_ANIMATOR = LaunchAnimator(DIALOG_TIMINGS, INTERPOLATORS) @@ -240,8 +252,17 @@ class ActivityLaunchAnimator( private fun Controller.callOnIntentStartedOnMainThread(willAnimate: Boolean) { if (Looper.myLooper() != Looper.getMainLooper()) { - this.launchContainer.context.mainExecutor.execute { this.onIntentStarted(willAnimate) } + this.launchContainer.context.mainExecutor.execute { + callOnIntentStartedOnMainThread(willAnimate) + } } else { + if (DEBUG_LAUNCH_ANIMATION) { + Log.d( + TAG, + "Calling controller.onIntentStarted(willAnimate=$willAnimate) " + + "[controller=$this]" + ) + } this.onIntentStarted(willAnimate) } } @@ -419,7 +440,8 @@ class ActivityLaunchAnimator( internal val delegate: AnimationDelegate init { - delegate = AnimationDelegate(controller, callback, listener, launchAnimator) + delegate = + AnimationDelegate(controller, callback, listener, launchAnimator, disableWmTimeout) } @BinderThread @@ -449,13 +471,26 @@ class ActivityLaunchAnimator( /** Listener for animation lifecycle events. */ private val listener: Listener? = null, /** The animator to use to animate the window launch. */ - private val launchAnimator: LaunchAnimator = DEFAULT_LAUNCH_ANIMATOR + private val launchAnimator: LaunchAnimator = DEFAULT_LAUNCH_ANIMATOR, + + /** + * Whether we should disable the WindowManager timeout. This should be set to true in tests + * only. + */ + // TODO(b/301385865): Remove this flag. + disableWmTimeout: Boolean = false, ) : RemoteAnimationDelegate<IRemoteAnimationFinishedCallback> { private val launchContainer = controller.launchContainer private val context = launchContainer.context private val transactionApplierView = controller.openingWindowSyncView ?: controller.launchContainer private val transactionApplier = SyncRtSurfaceTransactionApplier(transactionApplierView) + private val timeoutHandler = + if (!disableWmTimeout) { + Handler(Looper.getMainLooper()) + } else { + null + } private val matrix = Matrix() private val invertMatrix = Matrix() @@ -475,11 +510,11 @@ class ActivityLaunchAnimator( @UiThread internal fun postTimeout() { - launchContainer.postDelayed(onTimeout, LAUNCH_TIMEOUT) + timeoutHandler?.postDelayed(onTimeout, LAUNCH_TIMEOUT) } private fun removeTimeout() { - launchContainer.removeCallbacks(onTimeout) + timeoutHandler?.removeCallbacks(onTimeout) } @UiThread @@ -542,6 +577,13 @@ class ActivityLaunchAnimator( Log.i(TAG, "Aborting the animation as no window is opening") removeTimeout() iCallback?.invoke() + + if (DEBUG_LAUNCH_ANIMATION) { + Log.d( + TAG, + "Calling controller.onLaunchAnimationCancelled() [no window opening]" + ) + } controller.onLaunchAnimationCancelled() return } @@ -586,12 +628,28 @@ class ActivityLaunchAnimator( object : Controller by delegate { override fun onLaunchAnimationStart(isExpandingFullyAbove: Boolean) { listener?.onLaunchAnimationStart() + + if (DEBUG_LAUNCH_ANIMATION) { + Log.d( + TAG, + "Calling controller.onLaunchAnimationStart(isExpandingFullyAbove=" + + "$isExpandingFullyAbove) [controller=$delegate]" + ) + } delegate.onLaunchAnimationStart(isExpandingFullyAbove) } override fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) { listener?.onLaunchAnimationEnd() iCallback?.invoke() + + if (DEBUG_LAUNCH_ANIMATION) { + Log.d( + TAG, + "Calling controller.onLaunchAnimationEnd(isExpandingFullyAbove=" + + "$isExpandingFullyAbove) [controller=$delegate]" + ) + } delegate.onLaunchAnimationEnd(isExpandingFullyAbove) } @@ -759,6 +817,10 @@ class ActivityLaunchAnimator( Log.i(TAG, "Remote animation timed out") timedOut = true + + if (DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "Calling controller.onLaunchAnimationCancelled() [animation timed out]") + } controller.onLaunchAnimationCancelled() } @@ -773,6 +835,13 @@ class ActivityLaunchAnimator( removeTimeout() animation?.cancel() + + if (DEBUG_LAUNCH_ANIMATION) { + Log.d( + TAG, + "Calling controller.onLaunchAnimationCancelled() [remote animation cancelled]", + ) + } controller.onLaunchAnimationCancelled() } diff --git a/packages/SystemUI/ktfmt_includes.txt b/packages/SystemUI/ktfmt_includes.txt index 31df2baec08c..2d5796eedc78 100644 --- a/packages/SystemUI/ktfmt_includes.txt +++ b/packages/SystemUI/ktfmt_includes.txt @@ -303,7 +303,6 @@ -packages/SystemUI/src/com/android/systemui/statusbar/notification/LaunchAnimationParameters.kt -packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt -packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClickerLogger.kt --packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt -packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt -packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.kt -packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml index 84f7bb5b08a8..ce53b7ed3a98 100644 --- a/packages/SystemUI/res-keyguard/values-sq/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml @@ -28,7 +28,7 @@ <string name="keyguard_enter_password" msgid="6483623792371009758">"Fut fjalëkalimin"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"Karta e pavlefshme."</string> <string name="keyguard_charged" msgid="5478247181205188995">"I karikuar"</string> - <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet me valë"</string> + <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet në mënyrë wireless"</string> <string name="keyguard_plugged_in_dock" msgid="2122073051904360987">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet"</string> <string name="keyguard_plugged_in" msgid="8169926454348380863">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet"</string> <string name="keyguard_plugged_in_charging_fast" msgid="4386594091107340426">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet me shpejtësi"</string> @@ -41,7 +41,7 @@ <string name="keyguard_missing_sim_instructions" msgid="7735360104844653246">"Shto një kartë SIM."</string> <string name="keyguard_missing_sim_instructions_long" msgid="3451467338947610268">"Karta SIM mungon ose është e palexueshme. Shto një kartë SIM."</string> <string name="keyguard_permanent_disabled_sim_message_short" msgid="3955052454216046100">"Kartë SIM e papërdorshme."</string> - <string name="keyguard_permanent_disabled_sim_instructions" msgid="5034635040020685428">"Karta jote SIM është çaktivizuar përgjithmonë.\n Kontakto me ofruesin e shërbimit me valë për një kartë tjetër SIM."</string> + <string name="keyguard_permanent_disabled_sim_instructions" msgid="5034635040020685428">"Karta jote SIM është çaktivizuar përgjithmonë.\n Kontakto me ofruesin e shërbimit wireless për një tjetër kartë SIM."</string> <string name="keyguard_sim_locked_message" msgid="7095293254587575270">"Karta SIM është e kyçur."</string> <string name="keyguard_sim_puk_locked_message" msgid="2503428315518592542">"Karta SIM është e kyçur me PUK."</string> <string name="keyguard_sim_unlock_progress_dialog_message" msgid="8489092646014631659">"Karta SIM po shkyçet…"</string> diff --git a/packages/SystemUI/res-product/values-sq/strings.xml b/packages/SystemUI/res-product/values-sq/strings.xml index 619f22fe3978..f7421c1a2801 100644 --- a/packages/SystemUI/res-product/values-sq/strings.xml +++ b/packages/SystemUI/res-product/values-sq/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="dock_alignment_slow_charging" product="default" msgid="6997633396534416792">"Drejtvendose përsëri telefonin për karikim më të shpejtë"</string> - <string name="dock_alignment_not_charging" product="default" msgid="3980752926226749808">"Drejtvendose përsëri telefonin për ta karikuar me valë"</string> + <string name="dock_alignment_not_charging" product="default" msgid="3980752926226749808">"Drejtvendose përsëri telefonin për karikim wireless"</string> <string name="inattentive_sleep_warning_message" product="tv" msgid="6844464574089665063">"Pajisja Android TV së shpejti do të fiket. Shtyp një buton për ta mbajtur të ndezur."</string> <string name="inattentive_sleep_warning_message" product="default" msgid="5693904520452332224">"Pajisja së shpejti do të fiket. Shtype për ta mbajtur të ndezur."</string> <string name="keyguard_missing_sim_message" product="tablet" msgid="408124574073032188">"Nuk ka kartë SIM në tablet."</string> diff --git a/packages/SystemUI/res/layout/battery_percentage_view.xml b/packages/SystemUI/res/layout/battery_percentage_view.xml index 82facd0d7217..8b5aeaac424a 100644 --- a/packages/SystemUI/res/layout/battery_percentage_view.xml +++ b/packages/SystemUI/res/layout/battery_percentage_view.xml @@ -27,4 +27,5 @@ android:gravity="center_vertical|start" android:paddingStart="@dimen/battery_level_padding_start" android:importantForAccessibility="no" + android:includeFontPadding="false" /> diff --git a/packages/SystemUI/res/layout/battery_status_chip.xml b/packages/SystemUI/res/layout/battery_status_chip.xml index ff68ac0f9a71..74371839e247 100644 --- a/packages/SystemUI/res/layout/battery_status_chip.xml +++ b/packages/SystemUI/res/layout/battery_status_chip.xml @@ -25,7 +25,8 @@ <LinearLayout android:id="@+id/rounded_container" android:layout_width="wrap_content" - android:layout_height="@dimen/ongoing_appops_chip_height" + android:layout_height="wrap_content" + android:minHeight="@dimen/ongoing_appops_chip_height" android:layout_gravity="center" android:background="@drawable/statusbar_chip_bg" android:clipToOutline="true" @@ -36,7 +37,7 @@ <com.android.systemui.battery.BatteryMeterView android:id="@+id/battery_meter_view" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 5132e57e2786..c5351b15b594 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -79,6 +79,7 @@ android:id="@+id/status_bar_start_side_except_heads_up" android:layout_height="wrap_content" android:layout_width="match_parent" + android:layout_gravity="center_vertical|start" android:clipChildren="false"> <ViewStub android:id="@+id/operator_name" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 6f68580d3842..25aaeada249f 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Skuif af"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Beweeg links"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Beweeg regs"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Vergrotingwisselaar"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Vergroot die hele skerm"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Vergroot \'n deel van die skerm"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index ebc9dd558f78..c7a8c09b175c 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ወደ ታች ውሰድ"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ወደ ግራ ውሰድ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ወደ ቀኝ ውሰድ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"የማጉላት ማብሪያ/ማጥፊያ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ሙሉ ገፅ እይታን ያጉሉ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"የማያ ገጹን ክፍል አጉላ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 5412e534a449..1a7c195681d0 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"نقل للأسفل"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"نقل لليسار"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"نقل لليمين"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"مفتاح تبديل وضع التكبير"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"تكبير الشاشة كلها"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"تكبير جزء من الشاشة"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index ccfdf878b029..c7d06dda40f8 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"তললৈ নিয়ক"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"বাওঁফাললৈ নিয়ক"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"সোঁফাললৈ নিয়ক"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"বিবৰ্ধনৰ ছুইচ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"পূৰ্ণ স্ক্ৰীন বিবৰ্ধন কৰক"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"স্ক্ৰীনৰ কিছু অংশ বিবৰ্ধন কৰক"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 8d3e215f3286..321a58872c82 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Aşağı köçürün"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Sola köçürün"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Sağa köçürün"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Böyütmə dəyişdiricisi"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Tam ekranı böyüdün"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ekran hissəsinin böyüdülməsi"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index a115d7d84375..c41cad5b0803 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Pomerite nadole"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Pomerite nalevo"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Pomerite nadesno"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Prelazak na drugi režim uvećanja"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Uvećajte ceo ekran"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Uvećajte deo ekrana"</string> @@ -1180,10 +1188,10 @@ <string name="privacy_dialog_manage_permissions" msgid="2543451567190470413">"Upravljaj pristupom"</string> <string name="privacy_dialog_active_call_usage" msgid="7858746847946397562">"Koristi telefonski poziv"</string> <string name="privacy_dialog_recent_call_usage" msgid="1214810644978167344">"Nedavno korišćeno u telefonskom pozivu"</string> - <string name="privacy_dialog_active_app_usage" msgid="631997836335929880">"Koristi <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="privacy_dialog_active_app_usage" msgid="631997836335929880">"Koriste <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="privacy_dialog_recent_app_usage" msgid="4883417856848222450">"Nedavno koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="privacy_dialog_active_app_usage_1" msgid="9047570143069220911">"Koristi <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> + <string name="privacy_dialog_active_app_usage_1" msgid="9047570143069220911">"Koriste <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Nedavno koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> - <string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Koristi <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> + <string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Koriste <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> <string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Nedavno koristila aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index a8dd1a54c7ea..b1ae52980da0 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Перамясціць ніжэй"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Перамясціць улева"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Перамясціць управа"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Пераключальнік павелічэння"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Павялічыць увесь экран"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Павялічыць частку экрана"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 5b567dd153d3..ccf9f0714726 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Преместване надолу"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Преместване наляво"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Преместване надясно"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Превключване на увеличението"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Увеличаване на целия екран"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Увеличаване на част от екрана"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 9d2d9e8c8bf0..6d1327460a6d 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"নিচে নামান"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"বাঁদিকে সরান"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ডানদিকে সরান"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"বড় করে দেখার সুইচ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"সম্পূর্ণ স্ক্রিন বড় করে দেখা"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"স্ক্রিনের কিছুটা অংশ বড় করুন"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index fa17ef964545..8f0a0c234ce4 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Pomjeranje prema dolje"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Pomjeranje lijevo"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Pomjeranje desno"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Prekidač za uvećavanje"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Uvećavanje prikaza preko cijelog ekrana"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Uvećavanje dijela ekrana"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 65a3709aa571..c53bb8959a7a 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mou cap avall"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mou cap a l\'esquerra"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mou cap a la dreta"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Canvia al mode d\'ampliació"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Amplia la pantalla completa"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Amplia una part de la pantalla"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 39e729694de8..1c5eac120df9 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -111,7 +111,7 @@ <string name="screenrecord_continue" msgid="4055347133700593164">"Začít"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Nahrávání obrazovky"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Nahrávání obrazovky a zvuku"</string> - <string name="screenrecord_taps_label" msgid="1595690528298857649">"Zobrazovat klepnutí na obrazovku"</string> + <string name="screenrecord_taps_label" msgid="1595690528298857649">"Zobrazovat klepnutí na displej"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Zastavit"</string> <string name="screenrecord_share_label" msgid="5025590804030086930">"Sdílet"</string> <string name="screenrecord_save_title" msgid="1886652605520893850">"Nahrávka obrazovky se uložila"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Přesunout dolů"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Přesunout doleva"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Přesunout doprava"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Přepínač zvětšení"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Zvětšit celou obrazovku"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Zvětšit část obrazovky"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 9273a3a1fa6b..fc7b6544c076 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Flyt ned"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Flyt til venstre"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Flyt til højre"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Skift forstørrelsestilstand"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Forstør hele skærmen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Forstør en del af skærmen"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 56177ba236fa..70b1ef51e984 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Nach unten bewegen"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Nach links bewegen"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Nach rechts bewegen"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Vergrößerungsschalter"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ganzen Bildschirm vergrößern"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Teil des Bildschirms vergrößern"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 7b85ac8c0b7b..a029d0ceac98 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Μετακίνηση κάτω"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Μετακίνηση αριστερά"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Μετακίνηση δεξιά"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Εναλλαγή μεγιστοποίησης"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Μεγέθυνση πλήρους οθόνης"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Μεγέθυνση μέρους της οθόνης"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 83f76c63988a..61f7b5050e40 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Move down"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Move left"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Move right"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Magnification switch"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index f434bd30d613..ad17b3d15e96 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -861,6 +861,10 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Move down"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Move left"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Move right"</string> + <string name="accessibility_control_increase_window_width" msgid="6992249470832493283">"Increase width of magnifier"</string> + <string name="accessibility_control_decrease_window_width" msgid="5740401560105929681">"Decrease width of magnifier"</string> + <string name="accessibility_control_increase_window_height" msgid="2200966116612324260">"Increase height of magnifier"</string> + <string name="accessibility_control_decrease_window_height" msgid="2054479949445332761">"Decrease height of magnifier"</string> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Magnification switch"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 83f76c63988a..61f7b5050e40 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Move down"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Move left"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Move right"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Magnification switch"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 83f76c63988a..61f7b5050e40 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Move down"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Move left"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Move right"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Magnification switch"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 7851dad94dc6..e17acfdf42a2 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -861,6 +861,10 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Move down"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Move left"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Move right"</string> + <string name="accessibility_control_increase_window_width" msgid="6992249470832493283">"Increase width of magnifier"</string> + <string name="accessibility_control_decrease_window_width" msgid="5740401560105929681">"Decrease width of magnifier"</string> + <string name="accessibility_control_increase_window_height" msgid="2200966116612324260">"Increase height of magnifier"</string> + <string name="accessibility_control_decrease_window_height" msgid="2054479949445332761">"Decrease height of magnifier"</string> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Magnification switch"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Magnify full screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Magnify part of screen"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index bdc406a1ea8a..f6a45bfb5a6e 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover hacia abajo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover hacia la izquierda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover hacia la derecha"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Interruptor de ampliación"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar pantalla completa"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ampliar parte de la pantalla"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 93093a90f69c..d61f09dbe535 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover hacia abajo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover hacia la izquierda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover hacia la derecha"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Botón para cambiar el modo de ampliación"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar pantalla completa"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ampliar parte de la pantalla"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 9bb3c03008fd..e9b1769410c0 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Teisalda alla"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Teisalda vasakule"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Teisalda paremale"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Suurenduse lüliti"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Täisekraani suurendamine"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ekraanikuva osa suurendamine"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 5d32c00246d7..c524d1c3cca8 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Eraman behera"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Eraman ezkerrera"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Eraman eskuinera"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Lupa aplikatzeko botoia"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Handitu pantaila osoa"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Handitu pantailaren zati bat"</string> @@ -1078,7 +1086,7 @@ <string name="wifi_wont_autoconnect_for_now" msgid="5782282612749867762">"Oraingoz ez da automatikoki konektatuko wifira"</string> <string name="see_all_networks" msgid="3773666844913168122">"Ikusi guztiak"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Sarea aldatzeko, deskonektatu Etherneta"</string> - <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Gailuaren funtzionamendua hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Aukera hori aldatzeko, joan wifi-sareen bilaketaren ezarpenetara. "<annotation id="link">"Aldatu"</annotation></string> + <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Gailuaren funtzionamendua hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Aukera hori aldatzeko, joan wifi-sareak bilatzeko eginbidearen ezarpenetara. "<annotation id="link">"Aldatu"</annotation></string> <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Desaktibatu hegaldi modua"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak lauza hau gehitu nahi du Ezarpen bizkorrak menuan:"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Gehitu lauza"</string> @@ -1130,7 +1138,7 @@ <string name="log_access_confirmation_title" msgid="4843557604739943395">"Gailuko erregistro guztiak erabiltzeko baimena eman nahi diozu <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> aplikazioari?"</string> <string name="log_access_confirmation_allow" msgid="752147861593202968">"Eman behin erabiltzeko baimena"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"Ez eman baimenik"</string> - <string name="log_access_confirmation_body" msgid="6883031912003112634">"Gailuko erregistroetan gailuan gertatzen den guztia gordetzen da. Arazoak bilatu eta konpontzeko erabil ditzakete aplikazioek erregistro horiek.\n\nBaliteke erregistro batzuek kontuzko informazioa edukitzea. Beraz, eman gailuko erregistro guztiak erabiltzeko baimena fidagarritzat jotzen dituzun aplikazioei bakarrik. \n\nNahiz eta gailuko erregistro guztiak erabiltzeko baimena ez eman aplikazio honi, aplikazioak hari dagozkion erregistroak atzitu ahalko ditu. Gainera, baliteke gailuaren fabrikatzaileak gailuko erregistro edo datu batzuk atzitu ahal izatea."</string> + <string name="log_access_confirmation_body" msgid="6883031912003112634">"Gailuko erregistroetan gailuan gertatzen den guztia gordetzen da. Arazoak bilatu eta konpontzeko erabil ditzakete aplikazioek erregistro horiek.\n\nBaliteke erregistro batzuek kontuzko informazioa edukitzea. Beraz, eman gailuko erregistro guztiak erabiltzeko baimena fidagarritzat jotzen dituzun aplikazioei bakarrik. \n\nNahiz eta gailuko erregistro guztiak erabiltzeko baimena ez eman aplikazio honi, aplikazioak hari dagozkion erregistroak erabili ahalko ditu. Gainera, baliteke gailuaren fabrikatzaileak gailuko erregistro edo datu batzuk erabili ahal izatea."</string> <string name="log_access_confirmation_learn_more" msgid="3134565480986328004">"Lortu informazio gehiago"</string> <string name="log_access_confirmation_learn_more_at" msgid="5635666259505215905">"Lortu informazio gehiago <xliff:g id="URL">%s</xliff:g> helbidean"</string> <string name="keyguard_affordance_enablement_dialog_action_template" msgid="8164857863036314664">"Ireki <xliff:g id="APPNAME">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index bb948f43f9d5..ca65df2bb21e 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"انتقال به پایین"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"انتقال به راست"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"انتقال به چپ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"کلید درشتنمایی"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"درشتنمایی تمامصفحه"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"درشتنمایی بخشی از صفحه"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index c8349c51a104..4371f001fec4 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Siirrä alas"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Siirrä vasemmalle"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Siirrä oikealle"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Suurennusvalinta"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Koko näytön suurennus"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Suurenna osa näytöstä"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 36bcfc494081..96c94041a994 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Déplacer vers le bas"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Déplacer vers la gauche"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Déplacer vers la droite"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Commutateur d\'agrandissement"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Agrandir la totalité de l\'écran"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Agrandir une partie de l\'écran"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index a274d0f4e264..5c9efe4b86d3 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Déplacer vers le bas"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Déplacer vers la gauche"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Déplacer vers la droite"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Changer de mode d\'agrandissement"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Agrandir tout l\'écran"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Agrandir une partie de l\'écran"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 7105a3c55a0a..f7fc9b9a81f4 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover cara abaixo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover cara á esquerda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover cara á dereita"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Interruptor do modo de ampliación"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar pantalla completa"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Amplía parte da pantalla"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index fdc6a8ba0b31..7fba44596a39 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"નીચે ખસેડો"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ડાબી બાજુ ખસેડો"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"જમણી બાજુ ખસેડો"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"મોટું કરવાની સુવિધાવાળી સ્વિચ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"પૂર્ણ સ્ક્રીનને મોટી કરો"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"સ્ક્રીનનો કોઈ ભાગ મોટો કરો"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 7a948706c082..e043ac35ea72 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -297,7 +297,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"वर्क ऐप्लिकेशन"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"रोकी गई"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"नाइट लाइट"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"शाम को चालू की जाएगी"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"शाम को चालू होगी"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"सुबह तक चालू रहेगी"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"<xliff:g id="TIME">%s</xliff:g> पर चालू की जाएगी"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"<xliff:g id="TIME">%s</xliff:g> तक"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"नीचे ले जाएं"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"बाईं ओर ले जाएं"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"दाईं ओर ले जाएं"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ज़ूम करने की सुविधा वाला स्विच"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"फ़ुल स्क्रीन को ज़ूम करें"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"स्क्रीन के किसी हिस्से को ज़ूम करें"</string> @@ -903,8 +911,8 @@ <string name="controls_providers_title" msgid="6879775889857085056">"कंट्रोल जोड़ने के लिए ऐप्लिकेशन चुनें"</string> <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# कंट्रोल जोड़ा गया.}one{# कंट्रोल जोड़ा गया.}other{# कंट्रोल जोड़े गए.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"हटाया गया"</string> - <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> को जोड़ना है?"</string> - <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> यह चुन सकता है कि इस पैनल पर कौनसे कंट्रोल और कॉन्टेंट दिखे."</string> + <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> ऐप्लिकेशन को जोड़ना है?"</string> + <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> ऐप्लिकेशन यह चुन सकता है कि इस पैनल पर कौनसे कंट्रोल और कॉन्टेंट दिखे."</string> <string name="controls_panel_remove_app_authorization" msgid="5920442084735364674">"<xliff:g id="APPNAME">%s</xliff:g> के लिए कंट्रोल हटाने हैं?"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"पसंदीदा बनाया गया"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"पसंदीदा बनाया गया, क्रम संख्या <xliff:g id="NUMBER">%d</xliff:g>"</string> @@ -1127,7 +1135,7 @@ <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"कोई जानकारी नहीं"</string> <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> - <string name="log_access_confirmation_title" msgid="4843557604739943395">"क्या <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> को डिवाइस लॉग का ऐक्सेस देना है?"</string> + <string name="log_access_confirmation_title" msgid="4843557604739943395">"<xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> को डिवाइस लॉग ऐक्सेस करने की अनुमति देनी है?"</string> <string name="log_access_confirmation_allow" msgid="752147861593202968">"एक बार ऐक्सेस करने की अनुमति दें"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"अनुमति न दें"</string> <string name="log_access_confirmation_body" msgid="6883031912003112634">"डिवाइस लॉग में आपके डिवाइस पर की गई कार्रवाइयां रिकॉर्ड होती हैं. ऐप्लिकेशन, इन लॉग का इस्तेमाल गड़बड़ियां ढूंढने और उन्हें ठीक करने के लिए कर सकते हैं.\n\nकुछ लॉग में संवेदनशील जानकारी हो सकती है. इसलिए, सिर्फ़ भरोसेमंद ऐप्लिकेशन को डिवाइस के सभी लॉग का ऐक्सेस दें. \n\nअगर इस ऐप्लिकेशन को डिवाइस के सभी लॉग का ऐक्सेस नहीं दिया जाता है, तब भी यह डिवाइस पर मौजूद अपने लॉग ऐक्सेस कर सकता है. डिवाइस को बनाने वाली कंपनी फिर भी डिवाइस के कुछ लॉग या जानकारी ऐक्सेस कर सकती है."</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index cd0f67c8b338..8b198170cf3d 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Premjesti dolje"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Premjesti ulijevo"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Premjesti udesno"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Prebacivanje povećavanja"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Povećajte cijeli zaslon"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Povećaj dio zaslona"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 240b08274707..9accf6e7749c 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mozgatás lefelé"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mozgatás balra"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mozgatás jobbra"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Nagyításváltó"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"A teljes képernyő felnagyítása"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Képernyő bizonyos részének nagyítása"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index cc826bdd40ed..235d0401d26f 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -397,7 +397,7 @@ <string name="user_add_user_message_guest_remove" msgid="5589286604543355007">\n\n"Ավելացնելով նոր օգտատեր՝ դուք դուրս կգաք հյուրի ռեժիմից։ Հյուրի ընթացիկ աշխատաշրջանի բոլոր հավելվածներն ու տվյալները կջնջվեն։"</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"Սահմանաչափը սպառված է"</string> <string name="user_limit_reached_message" msgid="1070703858915935796">"{count,plural, =1{Հնարավոր է ստեղծել միայն մեկ օգտատեր։}one{Կարող եք առավելագույնը # օգտատեր ավելացնել։}other{Կարող եք առավելագույնը # օգտատեր ավելացնել։}}"</string> - <string name="user_remove_user_title" msgid="9124124694835811874">"Հեռացնե՞լ օգտատիրոջը:"</string> + <string name="user_remove_user_title" msgid="9124124694835811874">"Հեռացնե՞լ օգտատիրոջը"</string> <string name="user_remove_user_message" msgid="6702834122128031833">"Այս օգտատիրոջ բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string> <string name="user_remove_user_remove" msgid="8387386066949061256">"Հեռացնել"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Սկսե՞լ տեսագրումը կամ հեռարձակումը <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> հավելվածով"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Տեղափոխել ներքև"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Տեղափոխել ձախ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Տեղափոխել աջ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Խոշորացման փոփոխություն"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Խոշորացնել ամբողջ էկրանը"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Խոշորացնել էկրանի որոշակի հատվածը"</string> @@ -1128,7 +1136,7 @@ <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> <string name="log_access_confirmation_title" msgid="4843557604739943395">"Հասանելի դարձնե՞լ <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> հավելվածին սարքի բոլոր մատյանները"</string> - <string name="log_access_confirmation_allow" msgid="752147861593202968">"Թույլատրել մեկանգամյա մուտքը"</string> + <string name="log_access_confirmation_allow" msgid="752147861593202968">"Թույլատրել մեկանգամյա մուտք"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"Չթույլատրել"</string> <string name="log_access_confirmation_body" msgid="6883031912003112634">"Այն, ինչ տեղի է ունենում ձեր սարքում, գրանցվում է սարքի մատյաններում։ Հավելվածները կարող են դրանք օգտագործել անսարքությունները հայտնաբերելու և վերացնելու նպատակով։\n\nՔանի որ որոշ մատյաններ անձնական տեղեկություններ են պարունակում, խորհուրդ ենք տալիս հասանելի դարձնել ձեր սարքի բոլոր մատյանները միայն այն հավելվածներին, որոնց վստահում եք։ \n\nԵթե այս հավելվածին նման թույլտվություն չեք տվել, դրան նախկինի պես հասանելի կլինեն իր մատյանները։ Հնարավոր է՝ ձեր սարքի արտադրողին ևս հասանելի լինեն սարքի որոշ մատյաններ և տեղեկություններ։"</string> <string name="log_access_confirmation_learn_more" msgid="3134565480986328004">"Իմանալ ավելին"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 6e4ba4bff3d3..c9b6530f38a0 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Pindahkan ke bawah"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Pindahkan ke kiri"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Pindahkan ke kanan"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Tombol pembesaran"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Memperbesar tampilan layar penuh"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Perbesar sebagian layar"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 78fd712c3d7b..708394001d4c 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Færa niður"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Færa til vinstri"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Færa til hægri"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Stækkunarrofi"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Stækka allan skjáinn"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Stækka hluta skjásins"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 42c9e80c2c6e..568bac58fcc6 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -172,17 +172,17 @@ <string name="biometric_re_enroll_dialog_confirm" msgid="3049858021857801836">"Configura"</string> <string name="biometric_re_enroll_dialog_cancel" msgid="93760939407091417">"Non ora"</string> <string name="biometric_re_enroll_notification_content" msgid="8685925877186288180">"L\'operazione è necessaria per migliorare la sicurezza e le prestazioni"</string> - <string name="fingerprint_re_enroll_notification_title" msgid="4539432429683916604">"Riconfigura lo sblocco con l\'impronta"</string> - <string name="fingerprint_re_enroll_notification_name" msgid="630798657797645704">"Sblocco con l\'impronta"</string> - <string name="fingerprint_re_enroll_dialog_title" msgid="3526033128113925780">"Configura lo sblocco con l\'impronta"</string> - <string name="fingerprint_re_enroll_dialog_content" msgid="4866561176695984879">"Per riconfigurare lo sblocco con l\'impronta, i modelli e le immagini dell\'impronta correnti verranno eliminati.\n\nDopo la cancellazione, dovrai riconfigurare la funzionalità per usare l\'impronta per sbloccare il telefono o verificare la tua identità."</string> - <string name="fingerprint_re_enroll_dialog_content_singular" msgid="3083663339787381218">"Per riconfigurare lo sblocco con l\'impronta, il modello e le immagini dell\'impronta correnti verranno eliminati.\n\nDopo la cancellazione, dovrai riconfigurare la funzionalità per usare l\'impronta per sbloccare il telefono o verificare la tua identità."</string> - <string name="fingerprint_reenroll_failure_dialog_content" msgid="4733768492747300666">"Impossibile configurare lo sblocco con l\'impronta. Vai alle Impostazioni e riprova."</string> - <string name="face_re_enroll_notification_title" msgid="1850838867718410520">"Riconfigura lo sblocco con il volto"</string> - <string name="face_re_enroll_notification_name" msgid="7384545252206120659">"Sblocco con il volto"</string> - <string name="face_re_enroll_dialog_title" msgid="6392173708176069994">"Configura lo sblocco con il volto"</string> - <string name="face_re_enroll_dialog_content" msgid="7353502359464038511">"Per riconfigurare lo sblocco con il volto, l\'attuale modello del volto verrà eliminato.\n\nDovrai riconfigurare questa funzionalità per usare il volto per sbloccare il telefono."</string> - <string name="face_reenroll_failure_dialog_content" msgid="7073947334397236935">"Impossibile configurare lo sblocco con il volto. Vai alle Impostazioni e riprova."</string> + <string name="fingerprint_re_enroll_notification_title" msgid="4539432429683916604">"Riconfigura lo Sblocco con l\'Impronta"</string> + <string name="fingerprint_re_enroll_notification_name" msgid="630798657797645704">"Sblocco con l\'Impronta"</string> + <string name="fingerprint_re_enroll_dialog_title" msgid="3526033128113925780">"Configura lo Sblocco con l\'Impronta"</string> + <string name="fingerprint_re_enroll_dialog_content" msgid="4866561176695984879">"Per riconfigurare lo Sblocco con l\'Impronta, i modelli e le immagini dell\'impronta correnti verranno eliminati.\n\nDopo la cancellazione, dovrai riconfigurare la funzionalità per usare l\'impronta per sbloccare il telefono o verificare la tua identità."</string> + <string name="fingerprint_re_enroll_dialog_content_singular" msgid="3083663339787381218">"Per riconfigurare lo Sblocco con l\'Impronta, il modello e le immagini dell\'impronta correnti verranno eliminati.\n\nDopo la cancellazione, dovrai riconfigurare la funzionalità per usare l\'impronta per sbloccare il telefono o verificare la tua identità."</string> + <string name="fingerprint_reenroll_failure_dialog_content" msgid="4733768492747300666">"Impossibile configurare lo Sblocco con l\'Impronta. Vai alle Impostazioni e riprova."</string> + <string name="face_re_enroll_notification_title" msgid="1850838867718410520">"Riconfigura lo Sblocco con il Volto"</string> + <string name="face_re_enroll_notification_name" msgid="7384545252206120659">"Sblocco con il Volto"</string> + <string name="face_re_enroll_dialog_title" msgid="6392173708176069994">"Configura lo Sblocco con il Volto"</string> + <string name="face_re_enroll_dialog_content" msgid="7353502359464038511">"Per riconfigurare lo Sblocco con il Volto, l\'attuale modello del volto verrà eliminato.\n\nDovrai riconfigurare questa funzionalità per usare il volto per sbloccare il telefono."</string> + <string name="face_reenroll_failure_dialog_content" msgid="7073947334397236935">"Impossibile configurare lo Sblocco con il Volto. Vai alle Impostazioni e riprova."</string> <string name="fingerprint_dialog_touch_sensor" msgid="2817887108047658975">"Tocca il sensore di impronte"</string> <string name="fingerprint_dialog_authenticated_confirmation" msgid="1603899612957562862">"Premi l\'icona Sblocca per continuare"</string> <string name="fingerprint_dialog_use_fingerprint_instead" msgid="6178228876763024452">"Impossibile riconoscere il volto. Usa l\'impronta."</string> @@ -190,7 +190,7 @@ <skip /> <string name="keyguard_face_failed" msgid="9044619102286917151">"Volto non riconosciuto"</string> <string name="keyguard_suggest_fingerprint" msgid="8742015961962702960">"Usa l\'impronta"</string> - <string name="keyguard_face_unlock_unavailable" msgid="1581949044193418736">"Sblocco con il volto non disponibile"</string> + <string name="keyguard_face_unlock_unavailable" msgid="1581949044193418736">"Sblocco con il Volto non disponibile"</string> <string name="accessibility_bluetooth_connected" msgid="4745196874551115205">"Bluetooth collegato."</string> <string name="accessibility_battery_unknown" msgid="1807789554617976440">"Percentuale della batteria sconosciuta."</string> <string name="accessibility_bluetooth_name" msgid="7300973230214067678">"Connesso a <xliff:g id="BLUETOOTH">%s</xliff:g>."</string> @@ -365,7 +365,7 @@ <string name="keyguard_face_successful_unlock" msgid="4203999851465708287">"Sbloccato con il volto"</string> <string name="keyguard_face_successful_unlock_alt1" msgid="5853906076353839628">"Volto riconosciuto"</string> <string name="keyguard_retry" msgid="886802522584053523">"Scorri verso l\'alto per riprovare"</string> - <string name="accesssibility_keyguard_retry" msgid="8880238862712870676">"Scorri verso l\'alto per riprovare lo sblocco con il volto"</string> + <string name="accesssibility_keyguard_retry" msgid="8880238862712870676">"Scorri verso l\'alto per riprovare lo Sblocco con il Volto"</string> <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Sblocca per usare NFC"</string> <string name="do_disclosure_generic" msgid="4896482821974707167">"Questo dispositivo appartiene alla tua organizzazione"</string> <string name="do_disclosure_with_name" msgid="2091641464065004091">"Questo dispositivo appartiene a <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Sposta giù"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Sposta a sinistra"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Sposta a destra"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Opzione Ingrandimento"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ingrandisci l\'intero schermo"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ingrandisci parte dello schermo"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index fc15eabec748..d42451a70b27 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"הזזה למטה"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"הזזה שמאלה"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"הזזה ימינה"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"מעבר למצב הגדלה"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"הגדלה של המסך המלא"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"הגדלת חלק מהמסך"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 1883bf3a3d44..21a402c4bdac 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"下に移動"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"左に移動"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"右に移動"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"拡大スイッチ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"画面全体を拡大します"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"画面の一部を拡大します"</string> @@ -904,7 +912,7 @@ <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# 件のコントロールを追加しました。}other{# 件のコントロールを追加しました。}}"</string> <string name="controls_removed" msgid="3731789252222856959">"削除済み"</string> <string name="controls_panel_authorization_title" msgid="267429338785864842">"<xliff:g id="APPNAME">%s</xliff:g> を追加しますか？"</string> - <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> はここに表示されるコントロールとコンテンツを選択できます。"</string> + <string name="controls_panel_authorization" msgid="7045551688535104194">"ここに表示されるコントロールとコンテンツを <xliff:g id="APPNAME">%s</xliff:g> が選択できるようになります。"</string> <string name="controls_panel_remove_app_authorization" msgid="5920442084735364674">"<xliff:g id="APPNAME">%s</xliff:g> のコントロールを削除しますか？"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"お気に入りに追加済み"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"お気に入りに追加済み、位置: <xliff:g id="NUMBER">%d</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index c1e687e4688d..722f66dddba4 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ქვემოთ გადატანა"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"მარცხნივ გადატანა"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"მარჯვნივ გადატანა"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"გადიდების გადართვა"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"გაადიდეთ სრულ ეკრანზე"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ეკრანის ნაწილის გადიდება"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 0067de02d1c0..f8919f2df1e3 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Төмен қарай жылжыту"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Солға жылжыту"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Оңға жылжыту"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Ұлғайту режиміне ауыстырғыш"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Толық экранды ұлғайту"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Экранның бөлігін ұлғайту"</string> @@ -925,7 +933,7 @@ <string name="controls_favorite_load_none" msgid="7687593026725357775">"Үйлесімді басқару элементтері қолжетімді емес."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Басқа"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Құрылғы басқару элементтеріне қосу"</string> - <string name="controls_dialog_ok" msgid="2770230012857881822">"Енгізу"</string> + <string name="controls_dialog_ok" msgid="2770230012857881822">"Қосу"</string> <string name="controls_dialog_remove" msgid="3775288002711561936">"Жою"</string> <string name="controls_dialog_message" msgid="342066938390663844">"<xliff:g id="APP">%s</xliff:g> ұсынған"</string> <string name="controls_tile_locked" msgid="731547768182831938">"Құрылғы құлыпталды."</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 11eb61453f83..4206a10581be 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ផ្លាស់ទីចុះក្រោម"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ផ្លាស់ទីទៅឆ្វេង"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ផ្លាស់ទីទៅស្តាំ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ប៊ូតុងបិទបើកការពង្រីក"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ពង្រីកពេញអេក្រង់"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ពង្រីកផ្នែកនៃអេក្រង់"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 85b95b1f4618..5bb81f73adbe 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ಕೆಳಗೆ ಸರಿಸಿ"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ಎಡಕ್ಕೆ ಸರಿಸಿ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ಬಲಕ್ಕೆ ಸರಿಸಿ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ಝೂಮ್ ಮಾಡುವ ಸ್ವಿಚ್"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಹಿಗ್ಗಿಸಿ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ಸ್ಕ್ರೀನ್ನ ಅರ್ಧಭಾಗವನ್ನು ಝೂಮ್ ಮಾಡಿ"</string> @@ -1127,7 +1135,7 @@ <string name="bt_le_audio_broadcast_dialog_unknown_name" msgid="3791472237793443044">"ಅಪರಿಚಿತ"</string> <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> - <string name="log_access_confirmation_title" msgid="4843557604739943395">"ಎಲ್ಲಾ ಸಾಧನದ ಲಾಗ್ಗಳನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string> + <string name="log_access_confirmation_title" msgid="4843557604739943395">"ಎಲ್ಲಾ ಸಾಧನದ ಲಾಗ್ಗಳನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> ಗೆ ಅನುಮತಿಸಬೇಕೆ?"</string> <string name="log_access_confirmation_allow" msgid="752147861593202968">"ಒಂದು ಬಾರಿಯ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"ಅನುಮತಿಸಬೇಡಿ"</string> <string name="log_access_confirmation_body" msgid="6883031912003112634">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ಸಾಧನದ ಲಾಗ್ಗಳು ರೆಕಾರ್ಡ್ ಮಾಡುತ್ತವೆ. ಸಮಸ್ಯೆಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಮತ್ತು ಪರಿಹರಿಸಲು ಆ್ಯಪ್ಗಳು ಈ ಲಾಗ್ ಅನ್ನು ಬಳಸಬಹುದು.\n\nಕೆಲವು ಲಾಗ್ಗಳು ಸೂಕ್ಷ್ಮ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಿರಬಹುದು, ಆದ್ದರಿಂದ ನಿಮ್ಮ ವಿಶ್ವಾಸಾರ್ಹ ಆ್ಯಪ್ಗಳಿಗೆ ಮಾತ್ರ ಸಾಧನದ ಎಲ್ಲಾ ಲಾಗ್ಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ. \n\nಎಲ್ಲಾ ಸಾಧನ ಲಾಗ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ನೀವು ಈ ಆ್ಯಪ್ಗೆ ಅನುಮತಿಸದಿದ್ದರೆ, ಅದು ಆಗಲೂ ತನ್ನದೇ ಆದ ಲಾಗ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು. ನಿಮ್ಮ ಸಾಧನ ತಯಾರಕರಿಗೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿನ ಕೆಲವು ಲಾಗ್ಗಳು ಅಥವಾ ಮಾಹಿತಿಯನ್ನು ಪ್ರವೇಶಿಸಲು ಈಗಲೂ ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index ea625097f8b8..235b396cf0df 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"아래로 이동"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"왼쪽으로 이동"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"오른쪽으로 이동"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"확대 전환"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"전체 화면 확대"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"화면 일부 확대"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index fcbe6831b320..570c320836c4 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Төмөн жылдыруу"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Солго жылдыруу"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Оңго жылдыруу"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Чоңойтуу режимине которулуу"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Толук экранда ачуу"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Экрандын бир бөлүгүн чоңойтуу"</string> @@ -1130,7 +1138,7 @@ <string name="log_access_confirmation_title" msgid="4843557604739943395">"<xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> колдонмосуна түзмөктөгү бардык таржымалдарды жеткиликтүү кыласызбы?"</string> <string name="log_access_confirmation_allow" msgid="752147861593202968">"Бир жолу жеткиликтүү кылуу"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"Тыюу салуу"</string> - <string name="log_access_confirmation_body" msgid="6883031912003112634">"Түзмөктө аткарылган бардык аракеттер түзмөктүн таржымалдарында сакталып калат. Колдонмолор бул таржымалдарды колдонуп, маселелерди оңдошот.\n\nАйрым таржымалдарда купуя маалымат болушу мүмкүн, андыктан ишенимдүү колдонмолорго гана түзмөктөгү бардык таржымалдарды пайдаланууга уруксат бериңиз. \n\nЭгер бул колдонмого түзмөктөгү бардык таржымалдарга кирүүгө тыюу салсаңыз, ал өзүнүн таржымалдарын пайдалана берет. Түзмөктү өндүрүүчү түзмөгүңүздөгү айрым таржымалдарды же маалыматты көрө берет."</string> + <string name="log_access_confirmation_body" msgid="6883031912003112634">"Түзмөктө жасалган аракеттердин баары таржымалдарда сакталат. Колдонмолор алардын жардамы менен мүмкүн болгон мүчүлүштүктөрдү таап, оңдоп турат.\n\nАйрым таржымалдарда купуя маалымат камтылышы мүмкүн болгондуктан, түзмөктөгү бардык таржымалдарды ишенимдүү колдонмолорго гана жеткиликтүү кылыңыз. \n\nЭгер бул колдонмого түзмөктөгү айрым таржымалдарды гана жеткиликтүү кылсаңыз, ал мурункудай эле өзүнүн таржымалдарын көрө берет. Түзмөгүңүздөгү айрым таржымалдар же нерселер анын өндүрүүчүсүнө көрүнүшү мүмкүн."</string> <string name="log_access_confirmation_learn_more" msgid="3134565480986328004">"Кеңири маалымат"</string> <string name="log_access_confirmation_learn_more_at" msgid="5635666259505215905">"Кеңири маалымат: <xliff:g id="URL">%s</xliff:g>"</string> <string name="keyguard_affordance_enablement_dialog_action_template" msgid="8164857863036314664">"<xliff:g id="APPNAME">%1$s</xliff:g> ачуу"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index efbac484d155..9d6a3a12f5d5 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ຍ້າຍລົງ"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ຍ້າຍໄປຊ້າຍ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ຍ້າຍໄປຂວາ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ສະຫຼັບການຂະຫຍາຍ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ຂະຫຍາຍເຕັມຈໍ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ຂະຫຍາຍບາງສ່ວນຂອງໜ້າຈໍ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 810c3c1c7212..7f849a11627e 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Perkelti žemyn"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Perkelti kairėn"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Perkelti dešinėn"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Didinimo jungiklis"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Viso ekrano didinimas"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Didinti ekrano dalį"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index b86188d00c69..e37163c32abe 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Pārvietot uz leju"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Pārvietot pa kreisi"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Pārvietot pa labi"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Palielinājuma slēdzis"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Palielināt visu ekrānu"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Palielināt ekrāna daļu"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 9b28a0ed6273..3bef5694f132 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -297,13 +297,13 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Работни апликации"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Паузирано"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Ноќно светло"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Вклуч. на зајдисонце"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"На зајдисонце"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"До изгрејсонце"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Вклучување: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"До <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_ui_mode_night_label" msgid="1398928270610780470">"Темна тема"</string> <string name="quick_settings_dark_mode_secondary_label_battery_saver" msgid="4990712734503013251">"Штедач на батерија"</string> - <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"Вклуч. на зајдисонце"</string> + <string name="quick_settings_dark_mode_secondary_label_on_at_sunset" msgid="6017379738102015710">"На зајдисонце"</string> <string name="quick_settings_dark_mode_secondary_label_until_sunrise" msgid="4404885070316716472">"До изгрејсонце"</string> <string name="quick_settings_dark_mode_secondary_label_on_at" msgid="5128758823486361279">"Се вклучува во <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"До <xliff:g id="TIME">%s</xliff:g>"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Премести надолу"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Премести налево"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Премести надесно"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Прекинувач за зголемување"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Зголемете го целиот екран"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Зголемувајте дел од екранот"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index b8f08f33af55..32d6c0395435 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"താഴേക്ക് നീക്കുക"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ഇടത്തേക്ക് നീക്കുക"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"വലത്തേക്ക് നീക്കുക"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"മാഗ്നിഫിക്കേഷൻ മോഡ് മാറുക"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"സ്ക്രീൻ പൂർണ്ണമായും മാഗ്നിഫൈ ചെയ്യുക"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"സ്ക്രീനിന്റെ ഭാഗം മാഗ്നിഫൈ ചെയ്യുക"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 23f4f8dcd27b..78eba99920a7 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Доош зөөх"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Зүүн тийш зөөх"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Баруун тийш зөөх"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Томруулах сэлгэлт"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Бүтэн дэлгэцийг томруулах"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Дэлгэцийн нэг хэсгийг томруулах"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 25332db45076..08eaf70f4533 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"खाली हलवा"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"डावीकडे हलवा"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"उजवीकडे हलवा"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"मॅग्निफिकेशन स्विच"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"फुल स्क्रीन मॅग्निफाय करा"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"स्क्रीनचा काही भाग मॅग्निफाय करा"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 20d5afc2b4c7..16b4332d4d26 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Alih ke bawah"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Alih ke kiri"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Alih ke kanan"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Suis pembesaran"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Besarkan skrin penuh"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Besarkan sebahagian skrin"</string> @@ -904,7 +912,7 @@ <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# kawalan ditambah.}other{# kawalan ditambah.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Dialih keluar"</string> <string name="controls_panel_authorization_title" msgid="267429338785864842">"Tambahkan <xliff:g id="APPNAME">%s</xliff:g>?"</string> - <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g>boleh memilih kawalan dan kandungan yang dipaparkan di sini."</string> + <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> boleh memilih kawalan dan kandungan yang dipaparkan di sini."</string> <string name="controls_panel_remove_app_authorization" msgid="5920442084735364674">"Alih keluar kawalan untuk <xliff:g id="APPNAME">%s</xliff:g>?"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Digemari"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Digemari, kedudukan <xliff:g id="NUMBER">%d</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 8fa29e01426d..ba2488f216ac 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"အောက်သို့ရွှေ့ရန်"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ဘယ်ဘက်သို့ရွှေ့ရန်"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ညာဘက်သို့ရွှေ့ရန်"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ချဲ့ရန် ခလုတ်"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ဖန်သားပြင်အပြည့် ချဲ့သည်"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်းကို ချဲ့ပါ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index e8b495d6b923..d77fb44c5cd9 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Flytt ned"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Flytt til venstre"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Flytt til høyre"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Forstørringsbryter"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Forstørr hele skjermen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Forstørr en del av skjermen"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 94d6c46fe580..cdcadd61e743 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"तल सार्नुहोस्"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"बायाँ सार्नुहोस्"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"दायाँ सार्नुहोस्"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"म्याग्निफिकेसन स्विच"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"पूरै स्क्रिन जुम इन गर्नुहोस्"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"स्क्रिनको केही भाग म्याग्निफाइ गर्नुहोस्"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index e547c675c702..8fb4f3567f10 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Omlaag verplaatsen"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Naar links verplaatsen"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Naar rechts verplaatsen"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Vergrotingsschakelaar"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Volledig scherm vergroten"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Deel van het scherm vergroten"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index d34b84891503..af7e0901a439 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ତଳକୁ ମୁଭ୍ କରନ୍ତୁ"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ବାମକୁ ମୁଭ୍ କରନ୍ତୁ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ଡାହାଣକୁ ମୁଭ୍ କରନ୍ତୁ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ସ୍ୱିଚ୍"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନକୁ ମ୍ୟାଗ୍ନିଫାଏ କରନ୍ତୁ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ସ୍କ୍ରିନର ଅଂଶ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 867fd174be97..8025ad1fb33c 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ਹੇਠਾਂ ਲਿਜਾਓ"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ਖੱਬੇ ਲਿਜਾਓ"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ਸੱਜੇ ਲਿਜਾਓ"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਸਵਿੱਚ"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ਪੂਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੱਡਦਰਸ਼ੀ ਕਰੋ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ਸਕ੍ਰੀਨ ਦੇ ਹਿੱਸੇ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 3750c0e05a82..59b707235481 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Przesuń w dół"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Przesuń w lewo"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Przesuń w prawo"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Przełączanie powiększenia"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Powiększanie pełnego ekranu"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Powiększ część ekranu"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 53c34183bf6f..20819b708d7a 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -108,7 +108,7 @@ <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Sons do dispositivo, como música, chamadas e toques"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Microfone"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Áudio e microfone do dispositivo"</string> - <string name="screenrecord_continue" msgid="4055347133700593164">"Início"</string> + <string name="screenrecord_continue" msgid="4055347133700593164">"Iniciar"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Gravando tela"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Gravando tela e áudio"</string> <string name="screenrecord_taps_label" msgid="1595690528298857649">"Mostrar toques na tela"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover para baixo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover para a esquerda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover para a direita"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Chave de ampliação"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar toda a tela"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ampliar parte da tela"</string> @@ -904,7 +912,7 @@ <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controle adicionado.}one{# controle adicionado.}many{# de controles adicionados.}other{# controles adicionados.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removido"</string> <string name="controls_panel_authorization_title" msgid="267429338785864842">"Adicionar o app <xliff:g id="APPNAME">%s</xliff:g>?"</string> - <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> pode escolher quais controles e conteúdos aparecem aqui."</string> + <string name="controls_panel_authorization" msgid="7045551688535104194">"O app <xliff:g id="APPNAME">%s</xliff:g> pode escolher quais controles e conteúdos aparecem aqui."</string> <string name="controls_panel_remove_app_authorization" msgid="5920442084735364674">"Remover controles do app <xliff:g id="APPNAME">%s</xliff:g>?"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Adicionado como favorito"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Adicionado como favorito (posição <xliff:g id="NUMBER">%d</xliff:g>)"</string> @@ -1128,7 +1136,7 @@ <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> <string name="log_access_confirmation_title" msgid="4843557604739943395">"Permitir que o app <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> acesse todos os registros do dispositivo?"</string> - <string name="log_access_confirmation_allow" msgid="752147861593202968">"Permitir o acesso único"</string> + <string name="log_access_confirmation_allow" msgid="752147861593202968">"Permitir acesso único"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"Não permitir"</string> <string name="log_access_confirmation_body" msgid="6883031912003112634">"Os registros do dispositivo gravam o que acontece nele. Os apps podem usar esses registros para encontrar e corrigir problemas.\n\nAlguns registros podem conter informações sensíveis, então autorize o acesso a eles apenas para os apps em que você confia. \n\nSe você não permitir que esse app acesse todos os registros do dispositivo, ele ainda vai poder acessar os dele. O fabricante do dispositivo também pode ter acesso a alguns registros ou informações."</string> <string name="log_access_confirmation_learn_more" msgid="3134565480986328004">"Saiba mais"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 9516f6cb9f11..ae6c94479ecd 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover para baixo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover para a esquerda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover para a direita"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Interruptor de ampliação"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar o ecrã inteiro"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ampliar parte do ecrã"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 53c34183bf6f..20819b708d7a 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -108,7 +108,7 @@ <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Sons do dispositivo, como música, chamadas e toques"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"Microfone"</string> <string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Áudio e microfone do dispositivo"</string> - <string name="screenrecord_continue" msgid="4055347133700593164">"Início"</string> + <string name="screenrecord_continue" msgid="4055347133700593164">"Iniciar"</string> <string name="screenrecord_ongoing_screen_only" msgid="4459670242451527727">"Gravando tela"</string> <string name="screenrecord_ongoing_screen_and_audio" msgid="5351133763125180920">"Gravando tela e áudio"</string> <string name="screenrecord_taps_label" msgid="1595690528298857649">"Mostrar toques na tela"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mover para baixo"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mover para a esquerda"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mover para a direita"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Chave de ampliação"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ampliar toda a tela"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ampliar parte da tela"</string> @@ -904,7 +912,7 @@ <string name="controls_number_of_favorites" msgid="4481806788981836355">"{count,plural, =1{# controle adicionado.}one{# controle adicionado.}many{# de controles adicionados.}other{# controles adicionados.}}"</string> <string name="controls_removed" msgid="3731789252222856959">"Removido"</string> <string name="controls_panel_authorization_title" msgid="267429338785864842">"Adicionar o app <xliff:g id="APPNAME">%s</xliff:g>?"</string> - <string name="controls_panel_authorization" msgid="7045551688535104194">"<xliff:g id="APPNAME">%s</xliff:g> pode escolher quais controles e conteúdos aparecem aqui."</string> + <string name="controls_panel_authorization" msgid="7045551688535104194">"O app <xliff:g id="APPNAME">%s</xliff:g> pode escolher quais controles e conteúdos aparecem aqui."</string> <string name="controls_panel_remove_app_authorization" msgid="5920442084735364674">"Remover controles do app <xliff:g id="APPNAME">%s</xliff:g>?"</string> <string name="accessibility_control_favorite" msgid="8694362691985545985">"Adicionado como favorito"</string> <string name="accessibility_control_favorite_position" msgid="54220258048929221">"Adicionado como favorito (posição <xliff:g id="NUMBER">%d</xliff:g>)"</string> @@ -1128,7 +1136,7 @@ <string name="dream_time_complication_12_hr_time_format" msgid="4691197486690291529">"h:mm"</string> <string name="dream_time_complication_24_hr_time_format" msgid="6248280719733640813">"kk:mm"</string> <string name="log_access_confirmation_title" msgid="4843557604739943395">"Permitir que o app <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> acesse todos os registros do dispositivo?"</string> - <string name="log_access_confirmation_allow" msgid="752147861593202968">"Permitir o acesso único"</string> + <string name="log_access_confirmation_allow" msgid="752147861593202968">"Permitir acesso único"</string> <string name="log_access_confirmation_deny" msgid="2389461495803585795">"Não permitir"</string> <string name="log_access_confirmation_body" msgid="6883031912003112634">"Os registros do dispositivo gravam o que acontece nele. Os apps podem usar esses registros para encontrar e corrigir problemas.\n\nAlguns registros podem conter informações sensíveis, então autorize o acesso a eles apenas para os apps em que você confia. \n\nSe você não permitir que esse app acesse todos os registros do dispositivo, ele ainda vai poder acessar os dele. O fabricante do dispositivo também pode ter acesso a alguns registros ou informações."</string> <string name="log_access_confirmation_learn_more" msgid="3134565480986328004">"Saiba mais"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index c96a9d251266..d87415f92a8c 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Mută în jos"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Mută la stânga"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Mută spre dreapta"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Comutator de mărire"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Mărește tot ecranul"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Mărește o parte a ecranului"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index d1f137f15215..b271b1641986 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Переместить вниз"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Переместить влево"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Переместить вправо"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Переключатель режима увеличения"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Увеличение всего экрана"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Увеличить часть экрана"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 6e3d064d6bdf..655112832fe4 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"පහළට ගෙන යන්න"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"වමට ගෙන යන්න"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"දකුණට ගෙන යන්න"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"විශාලන ස්විචය"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"පූර්ණ තිරය විශාලනය කරන්න"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"තිරයේ කොටසක් විශාලනය කරන්න"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index c95eda8d3b69..0dd0477c8149 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -297,7 +297,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Pracovné aplikácie"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Pozastavené"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Nočný režim"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Zapne sa pri západe slnka"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Zap. pri záp. slnka"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"Do východu slnka"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Od <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"Do <xliff:g id="TIME">%s</xliff:g>"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Posunúť nadol"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Posunúť doľava"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Posunúť doprava"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Prepínač zväčenia"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Zväčšenie celej obrazovky"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Zväčšiť časť obrazovky"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 176e3fee1438..1608d595f628 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Premakni navzdol"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Premakni levo"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Premakni desno"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Stikalo za povečavo"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Povečanje celotnega zaslona"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Povečava dela zaslona"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 93c82ebd6c65..5acec41f69cf 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -380,7 +380,7 @@ <string name="interruption_level_none_twoline" msgid="8579382742855486372">"Heshtje\ne plotë"</string> <string name="interruption_level_priority_twoline" msgid="8523482736582498083">"Vetëm\nme prioritet"</string> <string name="interruption_level_alarms_twoline" msgid="2045067991335708767">"Vetëm\nalarmet"</string> - <string name="keyguard_indication_charging_time_wireless" msgid="577856646141738675">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po karikohet me valë • Plot për <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> + <string name="keyguard_indication_charging_time_wireless" msgid="577856646141738675">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po karikohet në mënyrë wireless • Plot për <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time" msgid="6492711711891071502">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po karikohet • Plot për <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_fast" msgid="8390311020603859480">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po karikohet shpejt • Plot për <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Po karikohet ngadalë • Plot për <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Lëvize poshtë"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Lëvize majtas"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Lëvize djathtas"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Ndërrimi i zmadhimit"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Zmadho ekranin e plotë"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Zmadho një pjesë të ekranit"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 84c2905fd505..5bd012187f42 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Померите надоле"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Померите налево"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Померите надесно"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Прелазак на други режим увећања"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Увећајте цео екран"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Увећајте део екрана"</string> @@ -1180,10 +1188,10 @@ <string name="privacy_dialog_manage_permissions" msgid="2543451567190470413">"Управљај приступом"</string> <string name="privacy_dialog_active_call_usage" msgid="7858746847946397562">"Користи телефонски позив"</string> <string name="privacy_dialog_recent_call_usage" msgid="1214810644978167344">"Недавно коришћено у телефонском позиву"</string> - <string name="privacy_dialog_active_app_usage" msgid="631997836335929880">"Користи <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="privacy_dialog_active_app_usage" msgid="631997836335929880">"Користе <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="privacy_dialog_recent_app_usage" msgid="4883417856848222450">"Недавно користила апликација <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="privacy_dialog_active_app_usage_1" msgid="9047570143069220911">"Користи <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> + <string name="privacy_dialog_active_app_usage_1" msgid="9047570143069220911">"Користе <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> <string name="privacy_dialog_recent_app_usage_1" msgid="2551340497722370109">"Недавно користила апликација <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string> - <string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Користи <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> + <string name="privacy_dialog_active_app_usage_2" msgid="2770926061339921767">"Користе <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> <string name="privacy_dialog_recent_app_usage_2" msgid="2874689735085367167">"Недавно користила апликација <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 69329c7ede79..fa9b8c50acb1 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Flytta nedåt"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Flytta åt vänster"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Flytta åt höger"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Förstoringsreglage"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Förstora hela skärmen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Förstora en del av skärmen"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 7f1500777264..aa72d9822ff9 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Sogeza chini"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Sogeza kushoto"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Sogeza kulia"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Swichi ya ukuzaji"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Kuza skrini nzima"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Kuza sehemu ya skrini"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 09a4cea16d1e..102b7c55a57c 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"கீழே நகர்த்து"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"இடப்புறம் நகர்த்து"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"வலப்புறம் நகர்த்து"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"பெரிதாக்கல் ஸ்விட்ச்"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"முழுத்திரையைப் பெரிதாக்கும்"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"திரையின் ஒரு பகுதியைப் பெரிதாக்கும்"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 1d6ce5892ed7..1c2499587ca2 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"కిందకి పంపండి"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ఎడమవైపుగా జరపండి"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"కుడివైపుగా జరపండి"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"మ్యాగ్నిఫికేషన్ స్విచ్"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ఫుల్ స్క్రీన్ను మ్యాగ్నిఫై చేయండి"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"స్క్రీన్లో భాగాన్ని మ్యాగ్నిఫై చేయండి"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 6c6eaa7a7429..97c6597eb1e1 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"ย้ายลง"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"ย้ายไปทางซ้าย"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"ย้ายไปทางขวา"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"เปลี่ยนโหมดการขยาย"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"ขยายเป็นเต็มหน้าจอ"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"ขยายบางส่วนของหน้าจอ"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index b5af2d2f79e7..423f7fb5aef8 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Ibaba"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Ilipat pakaliwa"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Ilipat pakanan"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Switch ng pag-magnify"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"I-magnify ang buong screen"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"I-magnify ang isang bahagi ng screen"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index b4114b28e464..69574d751c7b 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Aşağı taşı"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Sola taşı"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Sağa taşı"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Büyütme moduna geçin"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Tam ekran büyütme"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ekranın bir parçasını büyütün"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 1037fa9106c1..cbf739108646 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -297,7 +297,7 @@ <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Робочі додатки"</string> <string name="quick_settings_work_mode_paused_state" msgid="6681788236383735976">"Призупинено"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Нічний екран"</string> - <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Вмикається ввечері"</string> + <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Запуск увечері"</string> <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4063448287758262485">"До сходу сонця"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Вмикається о <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_secondary_label_until" msgid="1883981263191927372">"До <xliff:g id="TIME">%s</xliff:g>"</string> @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Перемістити вниз"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Перемістити ліворуч"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Перемістити праворуч"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Перемикач режиму збільшення"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Збільшення всього екрана"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Збільшити частину екрана"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 8f8612148740..315f5ec53dac 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"نیچے منتقل کریں"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"بائیں منتقل کریں"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"دائیں منتقل کریں"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"میگنیفکیشن پر سوئچ کریں"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"فُل اسکرین کو بڑا کریں"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"اسکرین کا حصہ بڑا کریں"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index cd719a671dec..4b62416b3c3b 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Pastga siljitish"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Chapga siljitish"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Oʻngga siljitish"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Kattalashtirish rejimini almashtirish"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Ekranni toʻliq kattalashtirish"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Ekran qismini kattalashtirish"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 1a7a38f8478d..331a64b9c53e 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Di chuyển xuống"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Di chuyển sang trái"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Di chuyển sang phải"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Nút chuyển phóng to"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Phóng to toàn màn hình"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Phóng to một phần màn hình"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index d54c0354e520..89857b5aec98 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"下移"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"左移"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"右移"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"切换放大模式"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"放大整个屏幕"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"放大部分屏幕"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 431ef9edb93a..db3aac56ed04 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"向下移"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"向左移"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"向右移"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"放大開關"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"放大成個畫面"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"放大部分螢幕畫面"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 3e43d72a7603..2d88b3fc1df0 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"向下移"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"向左移"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"向右移"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"切換放大模式"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"放大整個螢幕畫面"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"放大局部螢幕畫面"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 5b2b43e34d74..caeabdc8c286 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -861,6 +861,14 @@ <string name="accessibility_control_move_down" msgid="5390922476900974512">"Yehlisa"</string> <string name="accessibility_control_move_left" msgid="8156206978511401995">"Yisa kwesokunxele"</string> <string name="accessibility_control_move_right" msgid="8926821093629582888">"Yisa kwesokudla"</string> + <!-- no translation found for accessibility_control_increase_window_width (6992249470832493283) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_width (5740401560105929681) --> + <skip /> + <!-- no translation found for accessibility_control_increase_window_height (2200966116612324260) --> + <skip /> + <!-- no translation found for accessibility_control_decrease_window_height (2054479949445332761) --> + <skip /> <string name="magnification_mode_switch_description" msgid="2698364322069934733">"Iswishi yokukhulisa"</string> <string name="magnification_mode_switch_state_full_screen" msgid="5229653514979530561">"Khulisa isikrini esigcwele"</string> <string name="magnification_mode_switch_state_window" msgid="8597100249594076965">"Khulisa ingxenye eyesikrini"</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 3ada7c2341ae..34b08b4433e2 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1231,6 +1231,7 @@ <dimen name="magnification_setting_image_button_open_in_full_padding_horizontal">28dp</dimen> <dimen name="magnification_setting_drag_corner_radius">28dp</dimen> <dimen name="magnification_setting_drag_size">56dp</dimen> + <fraction name="magnification_resize_window_size_amount">10%</fraction> <!-- Seekbar with icon buttons --> <dimen name="seekbar_icon_size">24dp</dimen> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 9957429aaa6a..2fa895bb3e69 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -172,6 +172,10 @@ <item type="id" name="accessibility_action_move_right"/> <item type="id" name="accessibility_action_move_up"/> <item type="id" name="accessibility_action_move_down"/> + <item type="id" name="accessibility_action_increase_window_width"/> + <item type="id" name="accessibility_action_decrease_window_width"/> + <item type="id" name="accessibility_action_increase_window_height"/> + <item type="id" name="accessibility_action_decrease_window_height"/> <!-- Accessibility actions for Accessibility floating menu. --> <item type="id" name="action_move_top_left"/> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 275e5d8db153..3ca24afe6514 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2398,6 +2398,16 @@ <string name="accessibility_control_move_left">Move left</string> <!-- Action in accessibility menu to move the magnification window right. [CHAR LIMIT=30] --> <string name="accessibility_control_move_right">Move right</string> + + <!-- Action in accessibility menu to increase the magnification window width. [CHAR LIMIT=NONE] --> + <string name="accessibility_control_increase_window_width">Increase width of magnifier</string> + <!-- Action in accessibility menu to decrease the magnification window width. [CHAR LIMIT=NONE] --> + <string name="accessibility_control_decrease_window_width">Decrease width of magnifier</string> + <!-- Action in accessibility menu to increase the magnification window height. [CHAR LIMIT=NONE] --> + <string name="accessibility_control_increase_window_height">Increase height of magnifier</string> + <!-- Action in accessibility menu to decrease the magnification window height. [CHAR LIMIT=NONE] --> + <string name="accessibility_control_decrease_window_height">Decrease height of magnifier</string> + <!-- Content description for magnification mode switch. [CHAR LIMIT=NONE] --> <string name="magnification_mode_switch_description">Magnification switch</string> <!-- A11y state description for magnification mode switch that device is in full-screen mode. [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java index 8200e5c84186..905923039f8b 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java @@ -17,6 +17,7 @@ package com.android.systemui.shared.rotation; import static android.content.pm.PackageManager.FEATURE_PC; +import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static android.view.Display.DEFAULT_DISPLAY; import static com.android.internal.view.RotationPolicy.NATURAL_ROTATION; @@ -37,6 +38,8 @@ import android.content.IntentFilter; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; +import android.os.HandlerExecutor; +import android.os.HandlerThread; import android.os.Looper; import android.os.RemoteException; import android.os.SystemProperties; @@ -67,6 +70,7 @@ import com.android.systemui.shared.system.TaskStackChangeListeners; import java.io.PrintWriter; import java.util.Optional; +import java.util.concurrent.Executor; import java.util.function.Supplier; /** @@ -119,6 +123,8 @@ public class RotationButtonController { private final int mIconCwStart0ResId; @DrawableRes private final int mIconCwStart90ResId; + /** Defaults to mainExecutor if not set via {@link #setBgExecutor(Executor)}. */ + private Executor mBgExecutor; @DrawableRes private int mIconResId; @@ -178,6 +184,8 @@ public class RotationButtonController { mAccessibilityManager = AccessibilityManager.getInstance(context); mTaskStackListener = new TaskStackListenerImpl(); mWindowRotationProvider = windowRotationProvider; + + mBgExecutor = context.getMainExecutor(); } public void setRotationButton(RotationButton rotationButton, @@ -193,6 +201,10 @@ public class RotationButtonController { return mContext; } + public void setBgExecutor(Executor bgExecutor) { + mBgExecutor = bgExecutor; + } + /** * Called during Taskbar initialization. */ @@ -219,8 +231,11 @@ public class RotationButtonController { mListenersRegistered = true; - updateDockedState(mContext.registerReceiver(mDockedReceiver, - new IntentFilter(Intent.ACTION_DOCK_EVENT))); + mBgExecutor.execute(() -> { + final Intent intent = mContext.registerReceiver(mDockedReceiver, + new IntentFilter(Intent.ACTION_DOCK_EVENT)); + mContext.getMainExecutor().execute(() -> updateDockedState(intent)); + }); if (registerRotationWatcher) { try { @@ -246,11 +261,13 @@ public class RotationButtonController { mListenersRegistered = false; - try { - mContext.unregisterReceiver(mDockedReceiver); - } catch (IllegalArgumentException e) { - Log.e(TAG, "Docked receiver already unregistered", e); - } + mBgExecutor.execute(() -> { + try { + mContext.unregisterReceiver(mDockedReceiver); + } catch (IllegalArgumentException e) { + Log.e(TAG, "Docked receiver already unregistered", e); + } + }); if (mRotationWatcherRegistered) { try { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index 450010c1bcd4..8eab31e7f3f3 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -108,6 +108,8 @@ public class KeyguardClockSwitch extends RelativeLayout { private int mWeatherClockSmartspaceTranslateY = 0; private int mDrawAlpha = 255; + private int mStatusBarHeight = 0; + /** * Maintain state so that a newly connected plugin can be initialized. */ @@ -150,6 +152,8 @@ public class KeyguardClockSwitch extends RelativeLayout { R.dimen.weather_clock_smartspace_translateX); mWeatherClockSmartspaceTranslateY = mContext.getResources().getDimensionPixelSize( R.dimen.weather_clock_smartspace_translateY); + mStatusBarHeight = mContext.getResources().getDimensionPixelSize( + R.dimen.status_bar_height); updateStatusArea(/* animate= */false); } @@ -295,6 +299,8 @@ public class KeyguardClockSwitch extends RelativeLayout { mStatusAreaAnim = null; View in, out; + // statusAreaYTranslation uses for the translation for both mStatusArea and mSmallClockFrame + // statusAreaClockTranslateY only uses for mStatusArea float statusAreaYTranslation, statusAreaClockScale = 1f; float statusAreaClockTranslateX = 0f, statusAreaClockTranslateY = 0f; float clockInYTranslation, clockOutYTranslation; @@ -309,10 +315,21 @@ public class KeyguardClockSwitch extends RelativeLayout { && mClock.getLargeClock().getConfig().getHasCustomWeatherDataDisplay()) { statusAreaClockScale = mWeatherClockSmartspaceScaling; statusAreaClockTranslateX = mWeatherClockSmartspaceTranslateX; - statusAreaClockTranslateY = mWeatherClockSmartspaceTranslateY - mSmartspaceTop; if (mSplitShadeCentered) { statusAreaClockTranslateX *= SMARTSPACE_TRANSLATION_CENTER_MULTIPLIER; } + + // On large weather clock, + // top padding for time is status bar height from top of the screen. + // On small one, + // it's screenOffsetYPadding (translationY for KeyguardStatusView), + // Cause smartspace is positioned according to the smallClockFrame + // we need to translate the difference between bottom of large clock and small clock + // Also, we need to counter offset the empty date weather view, mSmartspaceTop + // mWeatherClockSmartspaceTranslateY is only for Felix + statusAreaClockTranslateY = mStatusBarHeight - 0.6F * mSmallClockFrame.getHeight() + - mSmartspaceTop - screenOffsetYPadding + - statusAreaYTranslation + mWeatherClockSmartspaceTranslateY; } clockInYTranslation = 0; clockOutYTranslation = 0; // Small clock translation is handled with statusArea diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardFaceListenModel.kt b/packages/SystemUI/src/com/android/keyguard/KeyguardFaceListenModel.kt index bb799fc55171..d7019b5c5d04 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardFaceListenModel.kt +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardFaceListenModel.kt @@ -27,7 +27,7 @@ data class KeyguardFaceListenModel( override var userId: Int = 0, override var listening: Boolean = false, // keep sorted - var allowedDisplayState: Boolean = false, + var allowedDisplayStateWhileAwake: Boolean = false, var alternateBouncerShowing: Boolean = false, var authInterruptActive: Boolean = false, var biometricSettingEnabledForUser: Boolean = false, @@ -58,7 +58,7 @@ data class KeyguardFaceListenModel( userId.toString(), listening.toString(), // keep sorted - allowedDisplayState.toString(), + allowedDisplayStateWhileAwake.toString(), alternateBouncerShowing.toString(), authInterruptActive.toString(), biometricSettingEnabledForUser.toString(), @@ -98,7 +98,7 @@ data class KeyguardFaceListenModel( userId = model.userId listening = model.listening // keep sorted - allowedDisplayState = model.allowedDisplayState + allowedDisplayStateWhileAwake = model.allowedDisplayStateWhileAwake alternateBouncerShowing = model.alternateBouncerShowing authInterruptActive = model.authInterruptActive biometricSettingEnabledForUser = model.biometricSettingEnabledForUser @@ -143,7 +143,7 @@ data class KeyguardFaceListenModel( "userId", "listening", // keep sorted - "allowedDisplayState", + "allowedDisplayStateWhileAwake", "alternateBouncerShowing", "authInterruptActive", "biometricSettingEnabledForUser", diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 5b9b53e65ff4..7d2043d7614d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -75,6 +75,7 @@ import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_UPDATED_STARTED_WAK import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_UPDATED_STRONG_AUTH_CHANGED; import static com.android.keyguard.FaceAuthUiEvent.FACE_AUTH_UPDATED_USER_SWITCHING; import static com.android.systemui.DejankUtils.whitelistIpcs; +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN; @@ -163,6 +164,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpsysTableLogger; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; +import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.keyguard.domain.interactor.FaceAuthenticationListener; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; import com.android.systemui.keyguard.shared.constants.TrustAgentUiEvent; @@ -345,15 +347,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab return; } - if (mDisplayTracker.getDisplay(mDisplayTracker.getDefaultDisplayId()).getState() + if (mWakefulness.getWakefulness() == WAKEFULNESS_AWAKE + && mDisplayTracker.getDisplay(mDisplayTracker.getDefaultDisplayId()).getState() == Display.STATE_OFF) { - mAllowedDisplayStateForFaceAuth = false; + mAllowedDisplayStateWhileAwakeForFaceAuth = false; updateFaceListeningState( BIOMETRIC_ACTION_STOP, FACE_AUTH_DISPLAY_OFF ); } else { - mAllowedDisplayStateForFaceAuth = true; + mAllowedDisplayStateWhileAwakeForFaceAuth = true; } } }; @@ -377,7 +380,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private boolean mOccludingAppRequestingFp; private boolean mOccludingAppRequestingFace; private boolean mSecureCameraLaunched; - private boolean mAllowedDisplayStateForFaceAuth = true; + private boolean mAllowedDisplayStateWhileAwakeForFaceAuth = true; @VisibleForTesting protected boolean mTelephonyCapable; private boolean mAllowFingerprintOnCurrentOccludingActivity; @@ -426,6 +429,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private KeyguardFaceAuthInteractor mFaceAuthInteractor; private final TaskStackChangeListeners mTaskStackChangeListeners; private final IActivityTaskManager mActivityTaskManager; + private final WakefulnessLifecycle mWakefulness; private final DisplayTracker mDisplayTracker; private final LockPatternUtils mLockPatternUtils; @VisibleForTesting @@ -2211,7 +2215,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab Trace.beginSection("KeyguardUpdateMonitor#handleStartedWakingUp"); Assert.isMainThread(); - mAllowedDisplayStateForFaceAuth = true; + mAllowedDisplayStateWhileAwakeForFaceAuth = true; updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE); if (mFaceWakeUpTriggersConfig.shouldTriggerFaceAuthOnWakeUpFrom(pmWakeReason)) { FACE_AUTH_UPDATED_STARTED_WAKING_UP.setExtraInfo(pmWakeReason); @@ -2368,7 +2372,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab FeatureFlags featureFlags, TaskStackChangeListeners taskStackChangeListeners, IActivityTaskManager activityTaskManagerService, - DisplayTracker displayTracker) { + DisplayTracker displayTracker, + WakefulnessLifecycle wakefulness) { mContext = context; mSubscriptionManager = subscriptionManager; mUserTracker = userTracker; @@ -2416,6 +2421,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab .collect(Collectors.toSet()); mTaskStackChangeListeners = taskStackChangeListeners; mActivityTaskManager = activityTaskManagerService; + mWakefulness = wakefulness; mDisplayTracker = displayTracker; if (mFeatureFlags.isEnabled(Flags.STOP_FACE_AUTH_ON_DISPLAY_OFF)) { mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor); @@ -3230,7 +3236,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab && faceAndFpNotAuthenticated && !mGoingToSleep && isPostureAllowedForFaceAuth - && mAllowedDisplayStateForFaceAuth; + && mAllowedDisplayStateWhileAwakeForFaceAuth; // Aggregate relevant fields for debug logging. logListenerModelData( @@ -3238,7 +3244,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab System.currentTimeMillis(), user, shouldListen, - mAllowedDisplayStateForFaceAuth, + mAllowedDisplayStateWhileAwakeForFaceAuth, mAlternateBouncerShowing, mAuthInterruptActive, biometricEnabledForUser, @@ -4214,7 +4220,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final boolean previousState = mAllowFingerprintOnCurrentOccludingActivity; mAllowFingerprintOnCurrentOccludingActivity = - standardTask.topActivity != null + standardTask != null && standardTask.topActivity != null && !TextUtils.isEmpty(standardTask.topActivity.getPackageName()) && mAllowFingerprintOnOccludingActivitiesFromPackage.contains( standardTask.topActivity.getPackageName()) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java index 3990b10267e1..c64ae0106b4a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java @@ -17,6 +17,7 @@ package com.android.keyguard; import static com.android.systemui.statusbar.StatusBarState.KEYGUARD; +import static com.android.systemui.statusbar.StatusBarState.SHADE; import android.util.Property; import android.view.View; @@ -124,7 +125,16 @@ public class KeyguardVisibilityHelper { true /* animate */); log("keyguardFadingAway transition w/ Y Aniamtion"); } else if (statusBarState == KEYGUARD) { - if (keyguardFadingAway) { + // Sometimes, device will be unlocked and then locked very quickly. + // keyguardFadingAway hasn't been set to false cause unlock animation hasn't finished + // So we should not animate keyguard fading away in this case (when oldState is SHADE) + if (oldStatusBarState != SHADE) { + log("statusBarState == KEYGUARD && oldStatusBarState != SHADE"); + } else { + log("statusBarState == KEYGUARD && oldStatusBarState == SHADE"); + } + + if (keyguardFadingAway && oldStatusBarState != SHADE) { mKeyguardViewVisibilityAnimating = true; AnimationProperties animProps = new AnimationProperties() .setDelay(0) diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index 28d59c21086b..c5887d392149 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -26,6 +26,7 @@ import static java.lang.Math.abs; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; +import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UiContext; @@ -703,6 +704,18 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold } /** + * Sets the window frame size with given width and height in pixels without changing the + * window center. + * + * @param width the window frame width in pixels + * @param height the window frame height in pixels. + */ + @MainThread + private void setMagnificationFrameSize(int width, int height) { + setWindowSize(width + 2 * mMirrorSurfaceMargin, height + 2 * mMirrorSurfaceMargin); + } + + /** * Sets the window size with given width and height in pixels without changing the * window center. The width or the height will be clamped in the range * [{@link #mMinWindowSize}, screen width or height]. @@ -1466,19 +1479,50 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold AccessibilityAction.ACTION_CLICK.getId(), getClickAccessibilityActionLabel()); info.addAction(clickAction); info.setClickable(true); + info.addAction( new AccessibilityAction(R.id.accessibility_action_zoom_in, mContext.getString(R.string.accessibility_control_zoom_in))); info.addAction(new AccessibilityAction(R.id.accessibility_action_zoom_out, mContext.getString(R.string.accessibility_control_zoom_out))); - info.addAction(new AccessibilityAction(R.id.accessibility_action_move_up, - mContext.getString(R.string.accessibility_control_move_up))); - info.addAction(new AccessibilityAction(R.id.accessibility_action_move_down, - mContext.getString(R.string.accessibility_control_move_down))); - info.addAction(new AccessibilityAction(R.id.accessibility_action_move_left, - mContext.getString(R.string.accessibility_control_move_left))); - info.addAction(new AccessibilityAction(R.id.accessibility_action_move_right, - mContext.getString(R.string.accessibility_control_move_right))); + + if (!mEditSizeEnable) { + info.addAction(new AccessibilityAction(R.id.accessibility_action_move_up, + mContext.getString(R.string.accessibility_control_move_up))); + info.addAction(new AccessibilityAction(R.id.accessibility_action_move_down, + mContext.getString(R.string.accessibility_control_move_down))); + info.addAction(new AccessibilityAction(R.id.accessibility_action_move_left, + mContext.getString(R.string.accessibility_control_move_left))); + info.addAction(new AccessibilityAction(R.id.accessibility_action_move_right, + mContext.getString(R.string.accessibility_control_move_right))); + } else { + if ((mMagnificationFrame.width() + 2 * mMirrorSurfaceMargin) + < mWindowBounds.width()) { + info.addAction(new AccessibilityAction( + R.id.accessibility_action_increase_window_width, + mContext.getString( + R.string.accessibility_control_increase_window_width))); + } + if ((mMagnificationFrame.height() + 2 * mMirrorSurfaceMargin) + < mWindowBounds.height()) { + info.addAction(new AccessibilityAction( + R.id.accessibility_action_increase_window_height, + mContext.getString( + R.string.accessibility_control_increase_window_height))); + } + if ((mMagnificationFrame.width() + 2 * mMirrorSurfaceMargin) > mMinWindowSize) { + info.addAction(new AccessibilityAction( + R.id.accessibility_action_decrease_window_width, + mContext.getString( + R.string.accessibility_control_decrease_window_width))); + } + if ((mMagnificationFrame.height() + 2 * mMirrorSurfaceMargin) > mMinWindowSize) { + info.addAction(new AccessibilityAction( + R.id.accessibility_action_decrease_window_height, + mContext.getString( + R.string.accessibility_control_decrease_window_height))); + } + } info.setContentDescription(mContext.getString(R.string.magnification_window_title)); info.setStateDescription(formatStateDescription(getScale())); @@ -1493,6 +1537,11 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold } private boolean performA11yAction(int action) { + final float changeWindowSizeAmount = mContext.getResources().getFraction( + R.fraction.magnification_resize_window_size_amount, + /* base= */ 1, + /* pbase= */ 1); + if (action == AccessibilityAction.ACTION_CLICK.getId()) { if (mEditSizeEnable) { // When edit mode is enabled, click the magnifier to exit edit mode. @@ -1514,9 +1563,26 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold move(-mSourceBounds.width(), 0); } else if (action == R.id.accessibility_action_move_right) { move(mSourceBounds.width(), 0); + } else if (action == R.id.accessibility_action_increase_window_width) { + int newFrameWidth = + (int) (mMagnificationFrame.width() * (1 + changeWindowSizeAmount)); + setMagnificationFrameSize(newFrameWidth, mMagnificationFrame.height()); + } else if (action == R.id.accessibility_action_increase_window_height) { + int newFrameHeight = + (int) (mMagnificationFrame.height() * (1 + changeWindowSizeAmount)); + setMagnificationFrameSize(mMagnificationFrame.width(), newFrameHeight); + } else if (action == R.id.accessibility_action_decrease_window_width) { + int newFrameWidth = + (int) (mMagnificationFrame.width() * (1 - changeWindowSizeAmount)); + setMagnificationFrameSize(newFrameWidth, mMagnificationFrame.height()); + } else if (action == R.id.accessibility_action_decrease_window_height) { + int newFrameHeight = + (int) (mMagnificationFrame.height() * (1 - changeWindowSizeAmount)); + setMagnificationFrameSize(mMagnificationFrame.width(), newFrameHeight); } else { return false; } + mWindowMagnifierCallback.onAccessibilityActionPerformed(mDisplayId); return true; } @@ -1527,4 +1593,5 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold mDisplayId, scale, /* updatePersistence= */ true); } } + }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index f26404cad02b..4416b1979524 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -309,8 +309,14 @@ public class AssistManager { } int invocationType = args.getInt(INVOCATION_TYPE_KEY); - return mAssistOverrideInvocationTypes != null && Arrays.stream( - mAssistOverrideInvocationTypes).anyMatch(override -> override == invocationType); + return shouldOverrideAssist(invocationType); + } + + /** @return true if the invocation type should be handled by OverviewProxy instead of SysUI. */ + public boolean shouldOverrideAssist(int invocationType) { + return mAssistOverrideInvocationTypes != null + && Arrays.stream(mAssistOverrideInvocationTypes).anyMatch( + override -> override == invocationType); } /** diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java index ca43705f0d13..a79be6efa3a5 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java @@ -354,11 +354,13 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { if (mPercentageStyleId != 0) { // Only set if specified as attribute mBatteryPercentView.setTextAppearance(mPercentageStyleId); } + float fontHeight = mBatteryPercentView.getPaint().getFontMetricsInt(null); + mBatteryPercentView.setLineHeight(TypedValue.COMPLEX_UNIT_PX, fontHeight); if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor); updatePercentText(); addView(mBatteryPercentView, new LayoutParams( LayoutParams.WRAP_CONTENT, - LayoutParams.WRAP_CONTENT)); + (int) Math.ceil(fontHeight))); } } else { if (showing) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt index 94b5fb2861b1..21451dc0ffdf 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt @@ -58,6 +58,7 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( // Notification shade can be expanded but not visible (fraction: 0.0), for example // when a heads-up notification (HUN) is showing. notificationShadeVisible = event.expanded && event.fraction > 0f + notificationShadeTracking = event.tracking view.onExpansionChanged(event.fraction) updatePauseAuth() } @@ -65,6 +66,9 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( /** If the notification shade is visible. */ var notificationShadeVisible: Boolean = false + /** If the notification shade is currently being dragged */ + var notificationShadeTracking: Boolean = false + /** * The amount of translation needed if the view currently requires the user to touch * somewhere other than the exact center of the sensor. For example, this can happen diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt index 802eea300bd4..96354c2a99ff 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt @@ -15,6 +15,7 @@ */ package com.android.systemui.biometrics +import com.android.internal.annotations.VisibleForTesting import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.shade.ShadeExpansionStateManager @@ -39,6 +40,12 @@ class UdfpsBpViewController( override val tag = "UdfpsBpViewController" override fun shouldPauseAuth(): Boolean { - return false + // Do not auth while notification shade is being dragged + return notificationShadeTracking + } + + @VisibleForTesting + public override fun onViewAttached() { + super.onViewAttached() } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index a36870346b9a..c29f884c848d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -549,8 +549,12 @@ public class UdfpsController implements DozeReceiver, Dumpable { Log.e(TAG, "ignoring the touch injected from outside of UdfpsView"); return false; } - if (mOverlay == null) { - Log.w(TAG, "ignoring onTouch with null overlay"); + if (mOverlay == null || mOverlay.getAnimationViewController() == null) { + Log.w(TAG, "ignoring onTouch with null overlay or animation view controller"); + return false; + } + if (mOverlay.getAnimationViewController().shouldPauseAuth()) { + Log.w(TAG, "ignoring onTouch with shouldPauseAuth = true"); return false; } if (!mOverlay.matchesRequestId(requestId)) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt b/packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt index 53dc0e3d4846..62e23699e6f1 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt @@ -25,8 +25,8 @@ import com.android.systemui.biometrics.data.repository.FingerprintPropertyReposi import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepositoryImpl import com.android.systemui.biometrics.data.repository.PromptRepository import com.android.systemui.biometrics.data.repository.PromptRepositoryImpl -import com.android.systemui.biometrics.data.repository.RearDisplayStateRepository -import com.android.systemui.biometrics.data.repository.RearDisplayStateRepositoryImpl +import com.android.systemui.biometrics.data.repository.DisplayStateRepository +import com.android.systemui.biometrics.data.repository.DisplayStateRepositoryImpl import com.android.systemui.biometrics.domain.interactor.CredentialInteractor import com.android.systemui.biometrics.domain.interactor.CredentialInteractorImpl import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor @@ -65,9 +65,10 @@ interface BiometricsModule { @SysUISingleton fun fingerprintRepository(impl: FingerprintPropertyRepositoryImpl): FingerprintPropertyRepository + @Binds @SysUISingleton - fun rearDisplayStateRepository(impl: RearDisplayStateRepositoryImpl): RearDisplayStateRepository + fun displayStateRepository(impl: DisplayStateRepositoryImpl): DisplayStateRepository @Binds @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/RearDisplayStateRepository.kt b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/DisplayStateRepository.kt index d17d961b5279..7a9efcf78999 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/RearDisplayStateRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/DisplayStateRepository.kt @@ -18,7 +18,14 @@ package com.android.systemui.biometrics.data.repository import android.content.Context import android.hardware.devicestate.DeviceStateManager +import android.hardware.display.DisplayManager +import android.hardware.display.DisplayManager.DisplayListener +import android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CHANGED +import android.os.Handler +import android.view.DisplayInfo import com.android.internal.util.ArrayUtils +import com.android.systemui.biometrics.shared.model.DisplayRotation +import com.android.systemui.biometrics.shared.model.toDisplayRotation import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton @@ -32,21 +39,26 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn -/** Provide current rear display state. */ -interface RearDisplayStateRepository { +/** Repository for the current state of the display */ +interface DisplayStateRepository { /** Provides the current rear display state. */ val isInRearDisplayMode: StateFlow<Boolean> + + /** Provides the current display rotation */ + val currentRotation: StateFlow<DisplayRotation> } @SysUISingleton -class RearDisplayStateRepositoryImpl +class DisplayStateRepositoryImpl @Inject constructor( @Application applicationScope: CoroutineScope, - @Application context: Context, + @Application val context: Context, deviceStateManager: DeviceStateManager, + displayManager: DisplayManager, + @Main handler: Handler, @Main mainExecutor: Executor -) : RearDisplayStateRepository { +) : DisplayStateRepository { override val isInRearDisplayMode: StateFlow<Boolean> = conflatedCallbackFlow { val sendRearDisplayStateUpdate = { state: Boolean -> @@ -79,7 +91,43 @@ constructor( initialValue = false, ) + private fun getDisplayRotation(): DisplayRotation { + val cachedDisplayInfo = DisplayInfo() + context.display?.getDisplayInfo(cachedDisplayInfo) + return cachedDisplayInfo.rotation.toDisplayRotation() + } + + override val currentRotation: StateFlow<DisplayRotation> = + conflatedCallbackFlow { + val callback = + object : DisplayListener { + override fun onDisplayRemoved(displayId: Int) {} + + override fun onDisplayAdded(displayId: Int) {} + + override fun onDisplayChanged(displayId: Int) { + val rotation = getDisplayRotation() + trySendWithFailureLogging( + rotation, + TAG, + "Error sending display rotation to $rotation" + ) + } + } + displayManager.registerDisplayListener( + callback, + handler, + EVENT_FLAG_DISPLAY_CHANGED + ) + awaitClose { displayManager.unregisterDisplayListener(callback) } + } + .stateIn( + applicationScope, + started = SharingStarted.Eagerly, + initialValue = getDisplayRotation(), + ) + companion object { - const val TAG = "RearDisplayStateRepositoryImpl" + const val TAG = "DisplayStateRepositoryImpl" } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt index daff5feb0123..aa33100a3abe 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt @@ -16,13 +16,19 @@ package com.android.systemui.biometrics.data.repository +import android.Manifest.permission.USE_BIOMETRIC_INTERNAL +import android.annotation.RequiresPermission +import android.hardware.biometrics.ComponentInfoInternal import android.hardware.biometrics.SensorLocationInternal +import android.hardware.biometrics.SensorProperties import android.hardware.fingerprint.FingerprintManager +import android.hardware.fingerprint.FingerprintSensorProperties import android.hardware.fingerprint.FingerprintSensorPropertiesInternal import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.biometrics.shared.model.toSensorStrength +import com.android.systemui.biometrics.shared.model.toSensorType import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.SysUISingleton @@ -31,11 +37,10 @@ import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn /** * A repository for the global state of FingerprintProperty. @@ -44,22 +49,17 @@ import kotlinx.coroutines.flow.shareIn */ interface FingerprintPropertyRepository { - /** - * If the repository is initialized or not. Other properties are defaults until this is true. - */ - val isInitialized: Flow<Boolean> - /** The id of fingerprint sensor. */ - val sensorId: StateFlow<Int> + val sensorId: Flow<Int> /** The security strength of sensor (convenience, weak, strong). */ - val strength: StateFlow<SensorStrength> + val strength: Flow<SensorStrength> /** The types of fingerprint sensor (rear, ultrasonic, optical, etc.). */ - val sensorType: StateFlow<FingerprintSensorType> + val sensorType: Flow<FingerprintSensorType> /** The sensor location relative to each physical display. */ - val sensorLocations: StateFlow<Map<String, SensorLocationInternal>> + val sensorLocations: Flow<Map<String, SensorLocationInternal>> } @SysUISingleton @@ -70,64 +70,64 @@ constructor( private val fingerprintManager: FingerprintManager?, ) : FingerprintPropertyRepository { - override val isInitialized: Flow<Boolean> = + @RequiresPermission(USE_BIOMETRIC_INTERNAL) + private val props: StateFlow<FingerprintSensorPropertiesInternal> = conflatedCallbackFlow { val callback = object : IFingerprintAuthenticatorsRegisteredCallback.Stub() { override fun onAllAuthenticatorsRegistered( sensors: List<FingerprintSensorPropertiesInternal> ) { - if (sensors.isNotEmpty()) { - setProperties(sensors[0]) - trySendWithFailureLogging(true, TAG, "initialize properties") + if (sensors.isEmpty()) { + trySendWithFailureLogging( + DEFAULT_PROPS, + TAG, + "no registered sensors, use default props" + ) + } else { + trySendWithFailureLogging( + sensors[0], + TAG, + "update properties on authenticators registered" + ) } } } fingerprintManager?.addAuthenticatorsRegisteredCallback(callback) - trySendWithFailureLogging(false, TAG, "initial value defaulting to false") awaitClose {} } - .shareIn(scope = applicationScope, started = SharingStarted.Eagerly, replay = 1) - - private val _sensorId: MutableStateFlow<Int> = MutableStateFlow(-1) - override val sensorId: StateFlow<Int> = _sensorId.asStateFlow() + .stateIn( + applicationScope, + started = SharingStarted.Eagerly, + initialValue = DEFAULT_PROPS, + ) - private val _strength: MutableStateFlow<SensorStrength> = - MutableStateFlow(SensorStrength.CONVENIENCE) - override val strength = _strength.asStateFlow() + override val sensorId: Flow<Int> = props.map { it.sensorId } - private val _sensorType: MutableStateFlow<FingerprintSensorType> = - MutableStateFlow(FingerprintSensorType.UNKNOWN) - override val sensorType = _sensorType.asStateFlow() + override val strength: Flow<SensorStrength> = props.map { it.sensorStrength.toSensorStrength() } - private val _sensorLocations: MutableStateFlow<Map<String, SensorLocationInternal>> = - MutableStateFlow(mapOf("" to SensorLocationInternal.DEFAULT)) - override val sensorLocations: StateFlow<Map<String, SensorLocationInternal>> = - _sensorLocations.asStateFlow() + override val sensorType: Flow<FingerprintSensorType> = + props.map { it.sensorType.toSensorType() } - private fun setProperties(prop: FingerprintSensorPropertiesInternal) { - _sensorId.value = prop.sensorId - _strength.value = prop.sensorStrength.toSensorStrength() - _sensorType.value = sensorTypeIntToObject(prop.sensorType) - _sensorLocations.value = - prop.allLocations.associateBy { sensorLocationInternal -> + override val sensorLocations: Flow<Map<String, SensorLocationInternal>> = + props.map { + it.allLocations.associateBy { sensorLocationInternal -> sensorLocationInternal.displayId } - } + } companion object { private const val TAG = "FingerprintPropertyRepositoryImpl" - } -} - -private fun sensorTypeIntToObject(value: Int): FingerprintSensorType { - return when (value) { - 0 -> FingerprintSensorType.UNKNOWN - 1 -> FingerprintSensorType.REAR - 2 -> FingerprintSensorType.UDFPS_ULTRASONIC - 3 -> FingerprintSensorType.UDFPS_OPTICAL - 4 -> FingerprintSensorType.POWER_BUTTON - 5 -> FingerprintSensorType.HOME_BUTTON - else -> throw IllegalArgumentException("Invalid SensorType value: $value") + private val DEFAULT_PROPS = + FingerprintSensorPropertiesInternal( + -1 /* sensorId */, + SensorProperties.STRENGTH_CONVENIENCE, + 0 /* maxEnrollmentsPerUser */, + listOf<ComponentInfoInternal>(), + FingerprintSensorProperties.TYPE_UNKNOWN, + false /* halControlsIllumination */, + true /* resetLockoutRequiresHardwareAuthToken */, + listOf<SensorLocationInternal>(SensorLocationInternal.DEFAULT) + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt index 26b6f2a7a3cc..6fe79c68ebb5 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt @@ -18,7 +18,8 @@ package com.android.systemui.biometrics.domain.interactor import android.content.Context import android.content.res.Configuration -import com.android.systemui.biometrics.data.repository.RearDisplayStateRepository +import com.android.systemui.biometrics.data.repository.DisplayStateRepository +import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow import com.android.systemui.dagger.qualifiers.Application @@ -43,6 +44,9 @@ interface DisplayStateInteractor { /** Whether the device is currently folded. */ val isFolded: Flow<Boolean> + /** Current rotation of the display */ + val currentRotation: StateFlow<DisplayRotation> + /** Called on configuration changes, used to keep the display state in sync */ fun onConfigurationChanged(newConfig: Configuration) } @@ -54,7 +58,7 @@ constructor( @Application applicationScope: CoroutineScope, @Application context: Context, @Main mainExecutor: Executor, - rearDisplayStateRepository: RearDisplayStateRepository, + displayStateRepository: DisplayStateRepository, ) : DisplayStateInteractor { private var screenSizeFoldProvider: ScreenSizeFoldProvider = ScreenSizeFoldProvider(context) @@ -90,7 +94,10 @@ constructor( ) override val isInRearDisplayMode: StateFlow<Boolean> = - rearDisplayStateRepository.isInRearDisplayMode + displayStateRepository.isInRearDisplayMode + + override val currentRotation: StateFlow<DisplayRotation> = + displayStateRepository.currentRotation override fun onConfigurationChanged(newConfig: Configuration) { screenSizeFoldProvider.onConfigurationChange(newConfig) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt index 5badcaf06003..a6ad24e47edb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt @@ -32,7 +32,6 @@ import com.android.systemui.biometrics.shared.model.PromptKind import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map @@ -69,7 +68,7 @@ interface PromptSelectorInteractor { val isConfirmationRequired: Flow<Boolean> /** Fingerprint sensor type */ - val sensorType: StateFlow<FingerprintSensorType> + val sensorType: Flow<FingerprintSensorType> /** Use biometrics for authentication. */ fun useBiometricsForAuthentication( @@ -95,7 +94,7 @@ interface PromptSelectorInteractor { class PromptSelectorInteractorImpl @Inject constructor( - private val fingerprintPropertyRepository: FingerprintPropertyRepository, + fingerprintPropertyRepository: FingerprintPropertyRepository, private val promptRepository: PromptRepository, lockPatternUtils: LockPatternUtils, ) : PromptSelectorInteractor { @@ -147,8 +146,7 @@ constructor( } } - override val sensorType: StateFlow<FingerprintSensorType> = - fingerprintPropertyRepository.sensorType + override val sensorType: Flow<FingerprintSensorType> = fingerprintPropertyRepository.sensorType override fun useBiometricsForAuthentication( promptInfo: PromptInfo, diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractor.kt index aa85e5f3b21a..75ae061f8cce 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractor.kt @@ -17,32 +17,43 @@ package com.android.systemui.biometrics.domain.interactor import android.hardware.biometrics.SensorLocationInternal -import android.util.Log import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepository import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.combine /** Business logic for SideFps overlay offsets. */ interface SideFpsOverlayInteractor { - /** Get the corresponding offsets based on different displayId. */ - fun getOverlayOffsets(displayId: String): SensorLocationInternal + /** The displayId of the current display. */ + val displayId: Flow<String> + + /** Overlay offsets corresponding to given displayId. */ + val overlayOffsets: Flow<SensorLocationInternal> + + /** Called on display changes, used to keep the display state in sync */ + fun onDisplayChanged(displayId: String) } @SysUISingleton class SideFpsOverlayInteractorImpl @Inject -constructor(private val fingerprintPropertyRepository: FingerprintPropertyRepository) : +constructor(fingerprintPropertyRepository: FingerprintPropertyRepository) : SideFpsOverlayInteractor { - override fun getOverlayOffsets(displayId: String): SensorLocationInternal { - val offsets = fingerprintPropertyRepository.sensorLocations.value - return if (offsets.containsKey(displayId)) { - offsets[displayId]!! - } else { - Log.w(TAG, "No location specified for display: $displayId") - offsets[""]!! + private val _displayId: MutableStateFlow<String> = MutableStateFlow("") + override val displayId: Flow<String> = _displayId.asStateFlow() + + override val overlayOffsets: Flow<SensorLocationInternal> = + combine(displayId, fingerprintPropertyRepository.sensorLocations) { displayId, offsets -> + offsets[displayId] ?: SensorLocationInternal.DEFAULT } + + override fun onDisplayChanged(displayId: String) { + _displayId.value = displayId } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/DisplayRotation.kt b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/DisplayRotation.kt new file mode 100644 index 000000000000..10a3e915fe80 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/DisplayRotation.kt @@ -0,0 +1,21 @@ +package com.android.systemui.biometrics.shared.model + +import android.view.Surface + +/** Shadows [Surface.Rotation] for kotlin use within SysUI. */ +enum class DisplayRotation { + ROTATION_0, + ROTATION_90, + ROTATION_180, + ROTATION_270, +} + +/** Converts [Surface.Rotation] to corresponding [DisplayRotation] */ +fun Int.toDisplayRotation(): DisplayRotation = + when (this) { + Surface.ROTATION_0 -> DisplayRotation.ROTATION_0 + Surface.ROTATION_90 -> DisplayRotation.ROTATION_90 + Surface.ROTATION_180 -> DisplayRotation.ROTATION_180 + Surface.ROTATION_270 -> DisplayRotation.ROTATION_270 + else -> throw IllegalArgumentException("Invalid DisplayRotation value: $this") + } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/FingerprintSensorType.kt b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/FingerprintSensorType.kt index df5cefdb876d..c6fdcb318998 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/FingerprintSensorType.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/FingerprintSensorType.kt @@ -27,3 +27,15 @@ enum class FingerprintSensorType { POWER_BUTTON, HOME_BUTTON, } + +/** Convert [this] to corresponding [FingerprintSensorType] */ +fun Int.toSensorType(): FingerprintSensorType = + when (this) { + FingerprintSensorProperties.TYPE_UNKNOWN -> FingerprintSensorType.UNKNOWN + FingerprintSensorProperties.TYPE_REAR -> FingerprintSensorType.REAR + FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC -> FingerprintSensorType.UDFPS_ULTRASONIC + FingerprintSensorProperties.TYPE_UDFPS_OPTICAL -> FingerprintSensorType.UDFPS_OPTICAL + FingerprintSensorProperties.TYPE_POWER_BUTTON -> FingerprintSensorType.POWER_BUTTON + FingerprintSensorProperties.TYPE_HOME_BUTTON -> FingerprintSensorType.HOME_BUTTON + else -> throw IllegalArgumentException("Invalid SensorType value: $this") + } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/SensorStrength.kt b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/SensorStrength.kt index 30e865eff8b8..476daac5ff00 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/SensorStrength.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/shared/model/SensorStrength.kt @@ -28,8 +28,8 @@ enum class SensorStrength { /** Convert [this] to corresponding [SensorStrength] */ fun Int.toSensorStrength(): SensorStrength = when (this) { - 0 -> SensorStrength.CONVENIENCE - 1 -> SensorStrength.WEAK - 2 -> SensorStrength.STRONG + SensorProperties.STRENGTH_CONVENIENCE -> SensorStrength.CONVENIENCE + SensorProperties.STRENGTH_WEAK -> SensorStrength.WEAK + SensorProperties.STRENGTH_STRONG -> SensorStrength.STRONG else -> throw IllegalArgumentException("Invalid SensorStrength value: $this") } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt index b1439fd7421d..ce31b5a2f3d2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt @@ -261,6 +261,18 @@ object BiometricViewBinder { } } + // set padding + launch { + viewModel.promptPadding.collect { promptPadding -> + view.setPadding( + promptPadding.left, + promptPadding.top, + promptPadding.right, + promptPadding.bottom + ) + } + } + // configure & hide/disable buttons launch { viewModel.credentialKind diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModel.kt index 9b30acb84428..b406ea41eff0 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModel.kt @@ -33,7 +33,7 @@ class PromptFingerprintIconViewModel @Inject constructor( private val displayStateInteractor: DisplayStateInteractor, - private val promptSelectorInteractor: PromptSelectorInteractor, + promptSelectorInteractor: PromptSelectorInteractor, ) { /** Current device rotation. */ private var rotation: Int = Surface.ROTATION_0 diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt index be08932cfa64..25634aa28635 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt @@ -15,16 +15,21 @@ */ package com.android.systemui.biometrics.ui.viewmodel +import android.content.Context +import android.graphics.Rect import android.hardware.biometrics.BiometricPrompt import android.util.Log import android.view.HapticFeedbackConstants import android.view.MotionEvent import com.android.systemui.biometrics.AuthBiometricView +import com.android.systemui.biometrics.Utils import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor import com.android.systemui.biometrics.domain.model.BiometricModalities import com.android.systemui.biometrics.shared.model.BiometricModality +import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.biometrics.shared.model.PromptKind +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION import com.android.systemui.statusbar.VibratorHelper @@ -49,6 +54,7 @@ constructor( private val displayStateInteractor: DisplayStateInteractor, private val promptSelectorInteractor: PromptSelectorInteractor, private val vibrator: VibratorHelper, + @Application context: Context, private val featureFlags: FeatureFlags, ) { /** Models UI of [BiometricPromptLayout.iconView] */ @@ -135,6 +141,23 @@ constructor( !isOverlayTouched && size.isNotSmall } + /** Padding for prompt UI elements */ + val promptPadding: Flow<Rect> = + combine(size, displayStateInteractor.currentRotation) { size, rotation -> + if (size != PromptSize.LARGE) { + val navBarInsets = Utils.getNavbarInsets(context) + if (rotation == DisplayRotation.ROTATION_90) { + Rect(0, 0, navBarInsets.right, 0) + } else if (rotation == DisplayRotation.ROTATION_270) { + Rect(navBarInsets.left, 0, 0, 0) + } else { + Rect(0, 0, 0, navBarInsets.bottom) + } + } else { + Rect(0, 0, 0, 0) + } + } + /** Title for the prompt. */ val title: Flow<String> = promptSelectorInteractor.prompt.map { it?.title ?: "" }.distinctUntilChanged() diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java index 0dcba50df4ca..ef0f4941d4cd 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java @@ -29,6 +29,7 @@ import android.app.IWallpaperManager; import android.app.KeyguardManager; import android.app.NotificationManager; import android.app.StatsManager; +import android.app.StatusBarManager; import android.app.UiModeManager; import android.app.WallpaperManager; import android.app.admin.DevicePolicyManager; @@ -680,4 +681,10 @@ public class FrameworkServicesModule { static TextClassificationManager provideTextClassificationManager(Context context) { return context.getSystemService(TextClassificationManager.class); } + + @Provides + @Singleton + static StatusBarManager provideStatusBarManager(Context context) { + return context.getSystemService(StatusBarManager.class); + } } diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 42cb739dba6a..b6c50f7603c7 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -119,7 +119,7 @@ object Flags { // TODO(b/292213543): Tracking Bug @JvmField val NOTIFICATION_GROUP_EXPANSION_CHANGE = - unreleasedFlag("notification_group_expansion_change", teamfood = true) + unreleasedFlag("notification_group_expansion_change") // 200 - keyguard/lockscreen // ** Flag retired ** diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index ab294a6579fe..5eb7ba1e9fb3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1964,6 +1964,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mExternallyEnabled = enabled; if (!enabled && mShowing) { + if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) { + Log.d(TAG, "keyguardEnabled(false) overridden by user lockdown"); + return; + } // hiding keyguard that is showing, remember to reshow later if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, " + "disabling status bar expansion"); @@ -2184,7 +2188,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, * Enable the keyguard if the settings are appropriate. */ private void doKeyguardLocked(Bundle options) { - // if another app is disabling us, don't show unless we're in lockdown mode + // if another app is disabling us, don't show if (!mExternallyEnabled && !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled"); @@ -2199,14 +2203,21 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // we explicitly re-set state. if (mShowing && mKeyguardStateController.isShowing()) { if (mPM.isInteractive() && !mHiding) { - // It's already showing, and we're not trying to show it while the screen is off. - // We can simply reset all of the views, but don't hide the bouncer in case the user - // is currently interacting with it. - if (DEBUG) Log.d(TAG, "doKeyguard: not showing (instead, resetting) because it is " - + "already showing, we're interactive, and we were not previously hiding. " - + "It should be safe to short-circuit here."); - resetStateLocked(/* hideBouncer= */ false); - return; + if (mKeyguardStateController.isKeyguardGoingAway()) { + Log.e(TAG, "doKeyguard: we're still showing, but going away. Re-show the " + + "keyguard rather than short-circuiting and resetting."); + } else { + // It's already showing, and we're not trying to show it while the screen is + // off. We can simply reset all of the views, but don't hide the bouncer in case + // the user is currently interacting with it. + if (DEBUG) Log.d(TAG, + "doKeyguard: not showing (instead, resetting) because it is " + + "already showing, we're interactive, we were not " + + "previously hiding. It should be safe to short-circuit " + + "here."); + resetStateLocked(/* hideBouncer= */ false); + return; + } } else { // We are trying to show the keyguard while the screen is off or while we were in // the middle of hiding - this results from race conditions involving locking while @@ -2731,13 +2742,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, setUnlockAndWakeFromDream(false, WakeAndUnlockUpdateReason.SHOW); setPendingLock(false); - // Force if we we're showing in the middle of hiding, to ensure we end up in the correct - // state. - setShowingLocked(true, mHiding /* force */); - if (mHiding) { - Log.d(TAG, "Forcing setShowingLocked because mHiding=true, which means we're " - + "showing in the middle of hiding."); + final boolean hidingOrGoingAway = + mHiding || mKeyguardStateController.isKeyguardGoingAway(); + if (hidingOrGoingAway) { + Log.d(TAG, "Forcing setShowingLocked because one of these is true:" + + "mHiding=" + mHiding + + ", keyguardGoingAway=" + mKeyguardStateController.isKeyguardGoingAway() + + ", which means we're showing in the middle of hiding."); } + + // Force if we we're showing in the middle of unlocking, to ensure we end up in the + // correct state. + setShowingLocked(true, hidingOrGoingAway /* force */); mHiding = false; if (!mFeatureFlags.isEnabled(Flags.KEYGUARD_WM_STATE_REFACTOR)) { @@ -2947,7 +2963,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime + " fadeoutDuration=" + fadeoutDuration); synchronized (KeyguardViewMediator.this) { - // Tell ActivityManager that we canceled the keyguard animation if // handleStartKeyguardExitAnimation was called, but we're not hiding the keyguard, // unless we're animating the surface behind the keyguard and will be hiding the @@ -3215,10 +3230,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, // Post layout changes to the next frame, so we don't hang at the end of the animation. DejankUtils.postAfterTraversal(() -> { - if (!mPM.isInteractive()) { - Log.e(TAG, "exitKeyguardAndFinishSurfaceBehindRemoteAnimation#postAfterTraversal" + - "Not interactive after traversal. Don't hide the keyguard. This means we " + - "re-locked the device during unlock."); + if (!mPM.isInteractive() && !mPendingLock) { + Log.e(TAG, "exitKeyguardAndFinishSurfaceBehindRemoteAnimation#postAfterTraversal:" + + "mPM.isInteractive()=" + mPM.isInteractive() + + "mPendingLock=" + mPendingLock + "." + + "One of these being false means we re-locked the device during unlock. " + + "Do not proceed to finish keyguard exit and unlock."); + finishSurfaceBehindRemoteAnimation(true /* showKeyguard */); return; } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt index 5d7a3d432dcb..23f50eaba7e7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt @@ -34,6 +34,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.plugins.ActivityStarter import com.android.systemui.wallet.controller.QuickAccessWalletController +import com.android.systemui.wallet.util.getPaymentCards import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow @@ -60,7 +61,7 @@ constructor( val callback = object : QuickAccessWalletClient.OnWalletCardsRetrievedCallback { override fun onWalletCardsRetrieved(response: GetWalletCardsResponse) { - val hasCards = response?.walletCards?.isNotEmpty() == true + val hasCards = getPaymentCards(response.walletCards)?.isNotEmpty() == true trySendWithFailureLogging( state( isFeatureEnabled = isWalletAvailable(), @@ -135,7 +136,7 @@ constructor( object : QuickAccessWalletClient.OnWalletCardsRetrievedCallback { override fun onWalletCardsRetrieved(response: GetWalletCardsResponse) { continuation.resumeWith( - Result.success(response?.walletCards ?: emptyList()) + Result.success(getPaymentCards(response.walletCards) ?: emptyList()) ) } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt index 053c9b56ef96..cf64a838c2bf 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt @@ -29,7 +29,10 @@ import android.os.Bundle import android.os.IBinder import android.os.ResultReceiver import android.os.UserHandle +import android.util.Log +import android.view.View import android.view.ViewGroup +import android.view.accessibility.AccessibilityEvent import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry @@ -40,6 +43,9 @@ import com.android.internal.app.ChooserActivity import com.android.internal.app.ResolverListController import com.android.internal.app.chooser.NotSelectableTargetInfo import com.android.internal.app.chooser.TargetInfo +import com.android.internal.widget.RecyclerView +import com.android.internal.widget.RecyclerViewAccessibilityDelegate +import com.android.internal.widget.ResolverDrawerLayout import com.android.systemui.R import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorComponent import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorController @@ -105,6 +111,10 @@ class MediaProjectionAppSelectorActivity( super.onCreate(bundle) controller.init() + // we override AppList's AccessibilityDelegate set in ResolverActivity.onCreate because in + // our case this delegate must extend RecyclerViewAccessibilityDelegate, otherwise + // RecyclerView scrolling is broken + setAppListAccessibilityDelegate() } override fun onStart() { @@ -264,7 +274,9 @@ class MediaProjectionAppSelectorActivity( recentsViewController.hasRecentTasks } - override fun shouldShowContentPreviewWhenEmpty() = shouldShowContentPreview() + override fun shouldShowStickyContentPreviewWhenEmpty() = shouldShowContentPreview() + + override fun shouldShowServiceTargets() = false private fun hasWorkProfile() = mMultiProfilePagerAdapter.count > 1 @@ -277,6 +289,8 @@ class MediaProjectionAppSelectorActivity( recentsViewController.createView(parent) companion object { + const val TAG = "MediaProjectionAppSelectorActivity" + /** * When EXTRA_CAPTURE_REGION_RESULT_RECEIVER is passed as intent extra the activity will * send the [CaptureRegion] to the result receiver instead of returning media projection @@ -313,4 +327,42 @@ class MediaProjectionAppSelectorActivity( putExtra(EXTRA_SELECTED_PROFILE, selectedProfile) } } + + private fun setAppListAccessibilityDelegate() { + val rdl = requireViewById<ResolverDrawerLayout>(com.android.internal.R.id.contentPanel) + for (i in 0 until mMultiProfilePagerAdapter.count) { + val list = + mMultiProfilePagerAdapter + .getItem(i) + .rootView + .findViewById<View>(com.android.internal.R.id.resolver_list) + if (list == null || list !is RecyclerView) { + Log.wtf(TAG, "MediaProjection only supports RecyclerView") + } else { + list.accessibilityDelegate = RecyclerViewExpandingAccessibilityDelegate(rdl, list) + } + } + } + + /** + * An a11y delegate propagating all a11y events to [AppListAccessibilityDelegate] so that it can + * expand drawer when needed. It needs to extend [RecyclerViewAccessibilityDelegate] because + * that superclass handles RecyclerView scrolling while using a11y services. + */ + private class RecyclerViewExpandingAccessibilityDelegate( + rdl: ResolverDrawerLayout, + view: RecyclerView + ) : RecyclerViewAccessibilityDelegate(view) { + + private val delegate = AppListAccessibilityDelegate(rdl) + + override fun onRequestSendAccessibilityEvent( + host: ViewGroup, + child: View, + event: AccessibilityEvent + ): Boolean { + super.onRequestSendAccessibilityEvent(host, child, event) + return delegate.onRequestSendAccessibilityEvent(host, child, event) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java index 4be572f8c0f6..d403788f2c66 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java @@ -29,6 +29,7 @@ import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityManager; import android.app.AlertDialog; +import android.app.StatusBarManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -72,6 +73,7 @@ public class MediaProjectionPermissionActivity extends Activity private final FeatureFlags mFeatureFlags; private final Lazy<ScreenCaptureDevicePolicyResolver> mScreenCaptureDevicePolicyResolver; + private final StatusBarManager mStatusBarManager; private String mPackageName; private int mUid; @@ -87,9 +89,11 @@ public class MediaProjectionPermissionActivity extends Activity @Inject public MediaProjectionPermissionActivity(FeatureFlags featureFlags, - Lazy<ScreenCaptureDevicePolicyResolver> screenCaptureDevicePolicyResolver) { + Lazy<ScreenCaptureDevicePolicyResolver> screenCaptureDevicePolicyResolver, + StatusBarManager statusBarManager) { mFeatureFlags = featureFlags; mScreenCaptureDevicePolicyResolver = screenCaptureDevicePolicyResolver; + mStatusBarManager = statusBarManager; } @Override @@ -311,6 +315,8 @@ public class MediaProjectionPermissionActivity extends Activity // WM Shell running inside. mUserSelectingTask = true; startActivityAsUser(intent, UserHandle.of(ActivityManager.getCurrentUser())); + // close shade if it's open + mStatusBarManager.collapsePanels(); } } catch (RemoteException e) { Log.e(TAG, "Error granting projection permission", e); diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt index 282a65af1424..1b9784fbf1e0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt @@ -22,12 +22,14 @@ import android.app.Notification import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME import android.app.PendingIntent import android.app.StatusBarManager +import android.app.UriGrantsManager import android.app.smartspace.SmartspaceAction import android.app.smartspace.SmartspaceConfig import android.app.smartspace.SmartspaceManager import android.app.smartspace.SmartspaceSession import android.app.smartspace.SmartspaceTarget import android.content.BroadcastReceiver +import android.content.ContentProvider import android.content.ContentResolver import android.content.Context import android.content.Intent @@ -700,10 +702,13 @@ class MediaDataManager( Log.d(TAG, "adding track for $userId from browser: $desc") } + val currentEntry = mediaEntries.get(packageName) + val appUid = currentEntry?.appUid ?: Process.INVALID_UID + // Album art var artworkBitmap = desc.iconBitmap if (artworkBitmap == null && desc.iconUri != null) { - artworkBitmap = loadBitmapFromUri(desc.iconUri!!) + artworkBitmap = loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName) } val artworkIcon = if (artworkBitmap != null) { @@ -712,9 +717,7 @@ class MediaDataManager( null } - val currentEntry = mediaEntries.get(packageName) val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId() - val appUid = currentEntry?.appUid ?: Process.INVALID_UID val isExplicit = desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) == MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT @@ -1261,6 +1264,30 @@ class MediaDataManager( false } } + + /** Returns a bitmap if the user can access the given URI, else null */ + private fun loadBitmapFromUriForUser( + uri: Uri, + userId: Int, + appUid: Int, + packageName: String, + ): Bitmap? { + try { + val ugm = UriGrantsManager.getService() + ugm.checkGrantUriPermission_ignoreNonSystem( + appUid, + packageName, + ContentProvider.getUriWithoutUserId(uri), + Intent.FLAG_GRANT_READ_URI_PERMISSION, + ContentProvider.getUserIdFromUri(uri, userId) + ) + return loadBitmapFromUri(uri) + } catch (e: SecurityException) { + Log.e(TAG, "Failed to get URI permission: $e") + } + return null + } + /** * Load a bitmap from a URI * diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt index 5d732fb8ace9..cbb7e1d0ef83 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt @@ -17,6 +17,7 @@ package com.android.systemui.mediaprojection.appselector.view import android.app.ActivityOptions +import android.app.ComponentOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED import android.app.IActivityTaskManager import android.graphics.Rect import android.os.Binder @@ -129,6 +130,9 @@ constructor( view.width, view.height ) + activityOptions.setPendingIntentBackgroundActivityStartMode( + MODE_BACKGROUND_ACTIVITY_START_ALLOWED + ) activityOptions.launchCookie = launchCookie activityTaskManager.startActivityFromRecents(task.taskId, activityOptions.toBundle()) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java index c6f73efdfdb1..d7e062fb926f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java @@ -233,6 +233,9 @@ public final class NavBarHelper implements Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED), false, mAssistContentObserver, UserHandle.USER_ALL); mContentResolver.registerContentObserver( + Settings.Secure.getUriFor(Secure.SEARCH_LONG_PRESS_HOME_ENABLED), + false, mAssistContentObserver, UserHandle.USER_ALL); + mContentResolver.registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED), false, mAssistContentObserver, UserHandle.USER_ALL); @@ -422,11 +425,17 @@ public final class NavBarHelper implements private void updateAssistantAvailability() { boolean assistantAvailableForUser = mAssistManagerLazy.get() .getAssistInfoForUser(mUserTracker.getUserId()) != null; - boolean longPressDefault = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault); + + boolean overrideLongPressHome = mAssistManagerLazy.get() + .shouldOverrideAssist(AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS); + boolean longPressDefault = mContext.getResources().getBoolean(overrideLongPressHome + ? com.android.internal.R.bool.config_searchLongPressHomeEnabledDefault + : com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault); mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver, - Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0, + overrideLongPressHome ? Secure.SEARCH_LONG_PRESS_HOME_ENABLED + : Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0, mUserTracker.getUserId()) != 0; + boolean gestureDefault = mContext.getResources().getBoolean( com.android.internal.R.bool.config_assistTouchGestureEnabledDefault); mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver, @@ -455,6 +464,7 @@ public final class NavBarHelper implements @Override public void setAssistantOverridesRequested(int[] invocationTypes) { mAssistManagerLazy.get().setAssistantOverridesRequested(invocationTypes); + updateAssistantAvailability(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index 146b5f57630e..79e7b710c56e 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -359,6 +359,7 @@ public class NavigationBarView extends FrameLayout { public void setBackgroundExecutor(Executor bgExecutor) { mBgExecutor = bgExecutor; + mRotationButtonController.setBgExecutor(bgExecutor); } public void setDisplayTracker(DisplayTracker displayTracker) { diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt index fe1034a6aa32..338d3ed42f95 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt @@ -23,6 +23,7 @@ import android.os.UserHandle import android.view.KeyEvent import android.view.KeyEvent.KEYCODE_N import android.view.KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL +import android.view.ViewConfiguration import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitorCallback import com.android.systemui.dagger.qualifiers.Background @@ -65,12 +66,6 @@ constructor( * [NoteTaskController], ensure custom actions can be triggered (i.e., keyboard shortcut). */ private fun initializeHandleSystemKey() { - val callbacks = - object : CommandQueue.Callbacks { - override fun handleSystemKey(key: KeyEvent) { - key.toNoteTaskEntryPointOrNull()?.let(controller::showNoteTask) - } - } commandQueue.addCallback(callbacks) } @@ -134,15 +129,39 @@ constructor( controller.updateNoteTaskForCurrentUserAndManagedProfiles() } } -} -/** - * Maps a [KeyEvent] to a [NoteTaskEntryPoint]. If the [KeyEvent] does not represent a - * [NoteTaskEntryPoint], returns null. - */ -private fun KeyEvent.toNoteTaskEntryPointOrNull(): NoteTaskEntryPoint? = - when { - keyCode == KEYCODE_STYLUS_BUTTON_TAIL -> TAIL_BUTTON - keyCode == KEYCODE_N && isMetaPressed && isCtrlPressed -> KEYBOARD_SHORTCUT - else -> null + /** + * Tracks a [KeyEvent], and determines if it should trigger an action to show the note task. + * Returns a [NoteTaskEntryPoint] if an action should be taken, and null otherwise. + */ + private fun KeyEvent.toNoteTaskEntryPointOrNull(): NoteTaskEntryPoint? = + when { + keyCode == KEYCODE_STYLUS_BUTTON_TAIL && isTailButtonNotesGesture() -> TAIL_BUTTON + keyCode == KEYCODE_N && isMetaPressed && isCtrlPressed -> KEYBOARD_SHORTCUT + else -> null + } + + private var lastStylusButtonTailUpEventTime: Long = -MULTI_PRESS_TIMEOUT + + /** + * Perform gesture detection for the stylus tail button to make sure we only show the note task + * when there is a single press. Long presses and multi-presses are ignored for now. + */ + private fun KeyEvent.isTailButtonNotesGesture(): Boolean { + if (keyCode != KEYCODE_STYLUS_BUTTON_TAIL || action != KeyEvent.ACTION_UP) { + return false + } + + val isMultiPress = (downTime - lastStylusButtonTailUpEventTime) < MULTI_PRESS_TIMEOUT + val isLongPress = (eventTime - downTime) >= LONG_PRESS_TIMEOUT + lastStylusButtonTailUpEventTime = eventTime + // For now, trigger action immediately on UP of a single press, without waiting for + // the multi-press timeout to expire. + return !isMultiPress && !isLongPress } + + companion object { + val MULTI_PRESS_TIMEOUT = ViewConfiguration.getMultiPressTimeout().toLong() + val LONG_PRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout().toLong() + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 30218a6a3180..26912f82b3a3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -226,7 +226,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { listenToMetadata(device); } else { stopListeningToStaleDeviceMetadata(); - batteryLevel = device.getBatteryLevel(); + batteryLevel = device.getMinBatteryLevelWithMemberDevices(); } if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java index 544e6ad295ff..e382eca17369 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -20,6 +20,7 @@ import static android.graphics.drawable.Icon.TYPE_URI; import static android.provider.Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT; import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE; +import static com.android.systemui.wallet.util.WalletCardUtilsKt.getPaymentCards; import android.content.Intent; import android.content.pm.PackageManager; @@ -210,7 +211,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { public void onWalletCardsRetrieved(@NonNull GetWalletCardsResponse response) { Log.i(TAG, "Successfully retrieved wallet cards."); mIsWalletUpdating = false; - List<WalletCard> cards = response.getWalletCards(); + List<WalletCard> cards = getPaymentCards(response.getWalletCards()); if (cards.isEmpty()) { Log.d(TAG, "No wallet cards exist."); mCardViewDrawable = null; diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java index 798f2d586bab..b4de914ce812 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java @@ -36,6 +36,7 @@ import com.android.keyguard.KeyguardMessageAreaController; import com.android.keyguard.LockIconViewController; import com.android.keyguard.dagger.KeyguardBouncerComponent; import com.android.systemui.R; +import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.back.domain.interactor.BackActionInteractor; import com.android.systemui.bouncer.domain.interactor.BouncerMessageInteractor; import com.android.systemui.bouncer.ui.binder.KeyguardBouncerViewBinder; @@ -288,7 +289,7 @@ public class NotificationShadeWindowViewController { } if (mExpandAnimationRunning) { if (isDown && mClock.uptimeMillis() > mLaunchAnimationTimeout) { - mShadeLogger.d("NSWVC: launch animation timed out"); + Log.wtf(TAG, "NSWVC: launch animation timed out"); setExpandAnimationRunning(false); } else { return logDownDispatch(ev, "expand animation running", false); @@ -545,6 +546,10 @@ public class NotificationShadeWindowViewController { @VisibleForTesting void setExpandAnimationRunning(boolean running) { if (mExpandAnimationRunning != running) { + // TODO(b/288507023): Remove this log. + if (ActivityLaunchAnimator.DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "Setting mExpandAnimationRunning=" + running); + } if (running) { mLaunchAnimationTimeout = mClock.uptimeMillis() + 5000; } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt index 656411874de5..54eba34ed55c 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt @@ -479,11 +479,13 @@ constructor( if (largeScreenActive) { logInstantEvent("Large screen constraints set") header.setTransition(LARGE_SCREEN_HEADER_TRANSITION_ID) + systemIcons.isClickable = true systemIcons.setOnClickListener { shadeCollapseAction?.run() } } else { logInstantEvent("Small screen constraints set") header.setTransition(HEADER_TRANSITION_ID) systemIcons.setOnClickListener(null) + systemIcons.isClickable = false } header.jumpToState(header.startState) updatePosition() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt index 91547a44c5f5..a08cd3bd869c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.notification +import android.util.Log import android.view.ViewGroup import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.animation.ActivityLaunchAnimator @@ -30,6 +31,8 @@ import javax.inject.Inject import kotlin.math.ceil import kotlin.math.max +private const val TAG = "NotificationLaunchAnimatorController" + /** A provider of [NotificationLaunchAnimatorController]. */ @CentralSurfacesComponent.CentralSurfacesScope class NotificationLaunchAnimatorControllerProvider @Inject constructor( @@ -89,28 +92,33 @@ class NotificationLaunchAnimatorController( val clipStartLocation = notificationListContainer.topClippingStartLocation val roundedTopClipping = (clipStartLocation - location[1]).coerceAtLeast(0) val windowTop = location[1] + roundedTopClipping - val topCornerRadius = if (roundedTopClipping > 0) { - // Because the rounded Rect clipping is complex, we start the top rounding at - // 0, which is pretty close to matching the real clipping. - // We'd have to clipOut the overlaid drawable too with the outer rounded rect in case - // if we'd like to have this perfect, but this is close enough. - 0f - } else { - notification.topCornerRadius - } - val params = LaunchAnimationParameters( - top = windowTop, - bottom = location[1] + height, - left = location[0], - right = location[0] + notification.width, - topCornerRadius = topCornerRadius, - bottomCornerRadius = notification.bottomCornerRadius - ) + val topCornerRadius = + if (roundedTopClipping > 0) { + // Because the rounded Rect clipping is complex, we start the top rounding at + // 0, which is pretty close to matching the real clipping. + // We'd have to clipOut the overlaid drawable too with the outer rounded rect in + // case + // if we'd like to have this perfect, but this is close enough. + 0f + } else { + notification.topCornerRadius + } + val params = + LaunchAnimationParameters( + top = windowTop, + bottom = location[1] + height, + left = location[0], + right = location[0] + notification.width, + topCornerRadius = topCornerRadius, + bottomCornerRadius = notification.bottomCornerRadius + ) params.startTranslationZ = notification.translationZ params.startNotificationTop = location[1] - params.notificationParentTop = notificationListContainer - .getViewParentForNotification(notificationEntry).locationOnScreen[1] + params.notificationParentTop = + notificationListContainer + .getViewParentForNotification(notificationEntry) + .locationOnScreen[1] params.startRoundedTopClipping = roundedTopClipping params.startClipTopAmount = notification.clipTopAmount if (notification.isChildInGroup) { @@ -135,6 +143,9 @@ class NotificationLaunchAnimatorController( } override fun onIntentStarted(willAnimate: Boolean) { + if (ActivityLaunchAnimator.DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "onIntentStarted(willAnimate=$willAnimate)") + } notificationExpansionRepository.setIsExpandAnimationRunning(willAnimate) notificationEntry.isExpandAnimationRunning = willAnimate @@ -165,6 +176,10 @@ class NotificationLaunchAnimatorController( } override fun onLaunchAnimationCancelled(newKeyguardOccludedState: Boolean?) { + if (ActivityLaunchAnimator.DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "onLaunchAnimationCancelled()") + } + // TODO(b/184121838): Should we call InteractionJankMonitor.cancel if the animation started // here? notificationExpansionRepository.setIsExpandAnimationRunning(false) @@ -177,11 +192,13 @@ class NotificationLaunchAnimatorController( notification.isExpandAnimationRunning = true notificationListContainer.setExpandingNotification(notification) - jankMonitor.begin(notification, - InteractionJankMonitor.CUJ_NOTIFICATION_APP_START) + jankMonitor.begin(notification, InteractionJankMonitor.CUJ_NOTIFICATION_APP_START) } override fun onLaunchAnimationEnd(isExpandingFullyAbove: Boolean) { + if (ActivityLaunchAnimator.DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "onLaunchAnimationEnd()") + } jankMonitor.end(InteractionJankMonitor.CUJ_NOTIFICATION_APP_START) notification.isExpandAnimationRunning = false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/NotificationExpansionRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/NotificationExpansionRepository.kt index f605bdffbfd9..6f0a97adb311 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/NotificationExpansionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/NotificationExpansionRepository.kt @@ -16,12 +16,16 @@ package com.android.systemui.statusbar.notification.data.repository +import android.util.Log +import com.android.systemui.animation.ActivityLaunchAnimator import com.android.systemui.dagger.SysUISingleton import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow +private const val TAG = "NotificationExpansionRepository" + /** A repository tracking the status of notification expansion animations. */ @SysUISingleton class NotificationExpansionRepository @Inject constructor() { @@ -37,6 +41,9 @@ class NotificationExpansionRepository @Inject constructor() { /** Sets whether the notification expansion animation is currently running. */ fun setIsExpandAnimationRunning(running: Boolean) { + if (ActivityLaunchAnimator.DEBUG_LAUNCH_ANIMATION) { + Log.d(TAG, "setIsExpandAnimationRunning(running=$running)") + } _isExpandAnimationRunning.value = running } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManager.java index 51eb9f7220fc..c24e9dcea29d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManager.java @@ -36,7 +36,7 @@ import javax.inject.Inject; @SysUISingleton public class NotifInflationErrorManager { - Set<NotificationEntry> mErroredNotifs = new ArraySet<>(); + Set<String> mErroredNotifs = new ArraySet<>(); List<NotifInflationErrorListener> mListeners = new ArrayList<>(); @Inject @@ -48,7 +48,7 @@ public class NotifInflationErrorManager { * @param e the exception encountered while inflating */ public void setInflationError(NotificationEntry entry, Exception e) { - mErroredNotifs.add(entry); + mErroredNotifs.add(entry.getKey()); for (int i = 0; i < mListeners.size(); i++) { mListeners.get(i).onNotifInflationError(entry, e); } @@ -58,8 +58,8 @@ public class NotifInflationErrorManager { * Notification inflated successfully and is no longer errored out. */ public void clearInflationError(NotificationEntry entry) { - if (mErroredNotifs.contains(entry)) { - mErroredNotifs.remove(entry); + if (mErroredNotifs.contains(entry.getKey())) { + mErroredNotifs.remove(entry.getKey()); for (int i = 0; i < mListeners.size(); i++) { mListeners.get(i).onNotifInflationErrorCleared(entry); } @@ -70,7 +70,7 @@ public class NotifInflationErrorManager { * Whether or not the notification encountered an exception while inflating. */ public boolean hasInflationError(@NonNull NotificationEntry entry) { - return mErroredNotifs.contains(entry); + return mErroredNotifs.contains(entry.getKey()); } /** 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 6db8df91edcc..05f837bc67cc 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 @@ -1662,8 +1662,9 @@ public class NotificationStackScrollLayoutController { @VisibleForTesting void onKeyguardTransitionChanged(TransitionStep transitionStep) { - boolean isTransitionToAod = transitionStep.getFrom().equals(KeyguardState.GONE) - && transitionStep.getTo().equals(KeyguardState.AOD); + boolean isTransitionToAod = transitionStep.getTo().equals(KeyguardState.AOD) + && (transitionStep.getFrom().equals(KeyguardState.GONE) + || transitionStep.getFrom().equals(KeyguardState.OCCLUDED)); if (mIsInTransitionToAod != isTransitionToAod) { mIsInTransitionToAod = isTransitionToAod; updateShowEmptyShadeView(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index a243356c8690..e76bae5e955b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -2368,10 +2368,16 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { // * When phone is unlocked: we still don't want to execute hiding of the keyguard // as the animation could prepare 'fake AOD' interface (without actually // transitioning to keyguard state) and this might reset the view states + // Log for b/290627350 + Log.d(TAG, "!shouldBeKeyguard mStatusBarStateController.isKeyguardRequested() " + + mStatusBarStateController.isKeyguardRequested() + " keyguardForDozing " + + keyguardForDozing + " wakeAndUnlocking " + wakeAndUnlocking + + " isWakingAndOccluded " + isWakingAndOccluded); if (!mScreenOffAnimationController.isKeyguardHideDelayed() // If we're animating occluded, there's an activity launching over the keyguard // UI. Wait to hide it until after the animation concludes. && !mKeyguardViewMediator.isOccludeAnimationPlaying()) { + Log.d(TAG, "hideKeyguardImpl " + forceStateChange); return hideKeyguardImpl(forceStateChange); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index 83a040cc17b8..1966033363d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -40,6 +40,7 @@ import com.android.systemui.R; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer; +import com.android.systemui.statusbar.policy.Clock; import com.android.systemui.user.ui.binder.StatusBarUserChipViewBinder; import com.android.systemui.user.ui.viewmodel.StatusBarUserChipViewModel; import com.android.systemui.util.leak.RotationUtils; @@ -51,7 +52,7 @@ public class PhoneStatusBarView extends FrameLayout { private final StatusBarContentInsetsProvider mContentInsetsProvider; private DarkReceiver mBattery; - private DarkReceiver mClock; + private Clock mClock; private int mRotationOrientation = -1; @Nullable private View mCutoutSpace; @@ -123,6 +124,10 @@ public class PhoneStatusBarView extends FrameLayout { } } + void onDensityOrFontScaleChanged() { + mClock.onDensityOrFontScaleChanged(); + } + @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { if (updateDisplayParameters()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt index 4de669c0b34a..85a75ea3c913 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewController.kt @@ -71,12 +71,20 @@ class PhoneStatusBarViewController private constructor( override fun onConfigChanged(newConfig: Configuration?) { mView.updateResources() } + + override fun onDensityOrFontScaleChanged() { + mView.onDensityOrFontScaleChanged() + } } override fun onViewAttached() { statusContainer = mView.requireViewById(R.id.system_icons) statusContainer.setOnHoverListener( statusOverlayHoverListenerFactory.createDarkAwareListener(statusContainer)) + + progressProvider?.setReadyToHandleTransition(true) + configurationController.addCallback(configurationListener) + if (moveFromCenterAnimationController == null) return val statusBarLeftSide: View = @@ -103,9 +111,6 @@ class PhoneStatusBarViewController private constructor( moveFromCenterAnimationController.onStatusBarWidthChanged() } } - - progressProvider?.setReadyToHandleTransition(true) - configurationController.addCallback(configurationListener) } override fun onViewDetached() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt index 4b2fb4373957..6483b7c647e8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.pipeline.mobile.ui.binder import android.content.res.ColorStateList import android.view.View import android.view.View.GONE -import android.view.View.INVISIBLE import android.view.View.VISIBLE import android.view.ViewGroup import android.widget.ImageView @@ -33,12 +32,11 @@ import com.android.systemui.common.ui.binder.ContentDescriptionViewBinder import com.android.systemui.common.ui.binder.IconViewBinder import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.statusbar.StatusBarIconView -import com.android.systemui.statusbar.StatusBarIconView.STATE_DOT import com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN -import com.android.systemui.statusbar.StatusBarIconView.STATE_ICON import com.android.systemui.statusbar.pipeline.mobile.ui.MobileViewLogger import com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel.LocationBasedMobileViewModel import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewBinding +import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewVisibilityHelper import kotlinx.coroutines.awaitCancellation import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.distinctUntilChanged @@ -83,20 +81,11 @@ object MobileIconBinder { launch { visibilityState.collect { state -> - when (state) { - STATE_ICON -> { - mobileGroupView.visibility = VISIBLE - dotView.visibility = GONE - } - STATE_DOT -> { - mobileGroupView.visibility = INVISIBLE - dotView.visibility = VISIBLE - } - STATE_HIDDEN -> { - mobileGroupView.visibility = INVISIBLE - dotView.visibility = INVISIBLE - } - } + ModernStatusBarViewVisibilityHelper.setVisibilityState( + state, + mobileGroupView, + dotView, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ModernStatusBarViewVisibilityHelper.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ModernStatusBarViewVisibilityHelper.kt new file mode 100644 index 000000000000..6668cbc290fc --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/ModernStatusBarViewVisibilityHelper.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2023 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.pipeline.shared.ui.binder + +import android.view.View +import com.android.systemui.statusbar.StatusBarIconView +import com.android.systemui.statusbar.pipeline.mobile.ui.binder.MobileIconBinder +import com.android.systemui.statusbar.pipeline.wifi.ui.binder.WifiViewBinder + +/** + * The helper to update the groupView and dotView visibility based on given visibility state, only + * used for [MobileIconBinder] and [WifiViewBinder] now. + */ +class ModernStatusBarViewVisibilityHelper { + companion object { + + fun setVisibilityState( + @StatusBarIconView.VisibleState state: Int, + groupView: View, + dotView: View, + ) { + when (state) { + StatusBarIconView.STATE_ICON -> { + groupView.visibility = View.VISIBLE + dotView.visibility = View.GONE + } + StatusBarIconView.STATE_DOT -> { + groupView.visibility = View.INVISIBLE + dotView.visibility = View.VISIBLE + } + StatusBarIconView.STATE_HIDDEN -> { + groupView.visibility = View.INVISIBLE + dotView.visibility = View.INVISIBLE + } + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt index 3082a6629dc2..e593575bd791 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt @@ -27,10 +27,9 @@ import com.android.systemui.R import com.android.systemui.common.ui.binder.IconViewBinder import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.statusbar.StatusBarIconView -import com.android.systemui.statusbar.StatusBarIconView.STATE_DOT import com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN -import com.android.systemui.statusbar.StatusBarIconView.STATE_ICON import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewBinding +import com.android.systemui.statusbar.pipeline.shared.ui.binder.ModernStatusBarViewVisibilityHelper import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel import kotlinx.coroutines.InternalCoroutinesApi @@ -83,8 +82,18 @@ object WifiViewBinder { launch { visibilityState.collect { visibilityState -> - groupView.isVisible = visibilityState == STATE_ICON - dotView.isVisible = visibilityState == STATE_DOT + // for b/296864006, we can not hide all the child views if visibilityState + // is STATE_HIDDEN. Because hiding all child views would cause the + // getWidth() of this view return 0, and that would cause the translation + // calculation fails in StatusIconContainer. Therefore, like class + // MobileIconBinder, instead of set the child views visibility to View.GONE, + // we set their visibility to View.INVISIBLE to make them invisible but + // keep the width. + ModernStatusBarViewVisibilityHelper.setVisibilityState( + visibilityState, + groupView, + dotView, + ) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java index f9943729ac7d..b7ae233c8e52 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -37,9 +37,11 @@ import android.text.format.DateFormat; import android.text.style.CharacterStyle; import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.ContextThemeWrapper; import android.view.Display; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import com.android.settingslib.Utils; @@ -143,6 +145,8 @@ public class Clock extends TextView implements } mBroadcastDispatcher = Dependency.get(BroadcastDispatcher.class); mUserTracker = Dependency.get(UserTracker.class); + + setIncludeFontPadding(false); } @Override @@ -389,6 +393,15 @@ public class Clock extends TextView implements mContext.getResources().getDimensionPixelSize( R.dimen.status_bar_clock_end_padding), 0); + + float fontHeight = getPaint().getFontMetricsInt(null); + setLineHeight(TypedValue.COMPLEX_UNIT_PX, fontHeight); + + ViewGroup.LayoutParams lp = getLayoutParams(); + if (lp != null) { + lp.height = (int) Math.ceil(fontHeight); + setLayoutParams(lp); + } } private void updateShowSeconds() { diff --git a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java index 81d04d4458c0..6fd0a4db5a14 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java @@ -16,6 +16,8 @@ package com.android.systemui.wallet.ui; +import static com.android.systemui.wallet.util.WalletCardUtilsKt.getPaymentCards; + import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -47,10 +49,10 @@ import com.android.systemui.plugins.FalsingManager; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.policy.KeyguardStateController; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** Controller for the wallet card carousel screen. */ public class WalletScreenController implements @@ -126,22 +128,11 @@ public class WalletScreenController implements return; } Log.i(TAG, "Successfully retrieved wallet cards."); - List<WalletCard> walletCards = response.getWalletCards(); - - boolean allUnknown = true; - for (WalletCard card : walletCards) { - if (card.getCardType() != WalletCard.CARD_TYPE_UNKNOWN) { - allUnknown = false; - break; - } - } + List<WalletCard> walletCards = getPaymentCards(response.getWalletCards()); - List<WalletCardViewInfo> paymentCardData = new ArrayList<>(); - for (WalletCard card : walletCards) { - if (allUnknown || card.getCardType() == WalletCard.CARD_TYPE_PAYMENT) { - paymentCardData.add(new QAWalletCardViewInfo(mContext, card)); - } - } + List<WalletCardViewInfo> paymentCardData = walletCards.stream().map( + card -> new QAWalletCardViewInfo(mContext, card) + ).collect(Collectors.toList()); // Get on main thread for UI updates. mHandler.post(() -> { diff --git a/packages/SystemUI/src/com/android/systemui/wallet/util/WalletCardUtils.kt b/packages/SystemUI/src/com/android/systemui/wallet/util/WalletCardUtils.kt new file mode 100644 index 000000000000..077b80bde953 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/wallet/util/WalletCardUtils.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 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.wallet.util + +import android.service.quickaccesswallet.WalletCard + +/** + * Filters wallet cards to only those of [WalletCard.CARD_TYPE_PAYMENT], or returns all cards if + * they are all of [WalletCard.CARD_TYPE_UNKNOWN] (maintaining pre-U behavior). Used by the wallet + * card carousel, quick settings tile, and lock screen. + */ +fun getPaymentCards(walletCards: List<WalletCard>): List<WalletCard> { + val atLeastOneKnownCardType = walletCards.any { it.cardType != WalletCard.CARD_TYPE_UNKNOWN } + + return if (atLeastOneKnownCardType) { + walletCards.filter { it.cardType == WalletCard.CARD_TYPE_PAYMENT } + } else { + walletCards + } +} diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 6f3322ab1b85..a052f77eaff3 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -41,6 +41,9 @@ import static com.android.keyguard.KeyguardUpdateMonitor.HAL_POWER_PRESS_TIMEOUT import static com.android.keyguard.KeyguardUpdateMonitor.getCurrentUser; import static com.android.systemui.flags.Flags.FP_LISTEN_OCCLUDING_APPS; import static com.android.systemui.flags.Flags.STOP_FACE_AUTH_ON_DISPLAY_OFF; +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP; +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_CLOSED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN; @@ -146,6 +149,7 @@ import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.log.SessionTracker; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.settings.FakeDisplayTracker; @@ -283,6 +287,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { private TaskStackChangeListeners mTaskStackChangeListeners; @Mock private IActivityTaskManager mActivityTaskManager; + @Mock + private WakefulnessLifecycle mWakefulness; private List<FaceSensorPropertiesInternal> mFaceSensorProperties; private List<FingerprintSensorPropertiesInternal> mFingerprintSensorProperties; @@ -3084,8 +3090,57 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { // THEN face listening is stopped. verify(faceCancel).cancel(); verify(callback).onBiometricRunningStateChanged( - eq(false), eq(BiometricSourceType.FACE)); // beverlyt + eq(false), eq(BiometricSourceType.FACE)); + } + + @Test + public void onDisplayOff_whileAsleep_doesNotStopFaceAuth() throws RemoteException { + enableStopFaceAuthOnDisplayOff(); + when(mWakefulness.getWakefulness()).thenReturn(WAKEFULNESS_ASLEEP); + // GIVEN device is listening for face + mKeyguardUpdateMonitor.setKeyguardShowing(true, false); + mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON); + mTestableLooper.processAllMessages(); + verifyFaceAuthenticateCall(); + + final CancellationSignal faceCancel = spy(mKeyguardUpdateMonitor.mFaceCancelSignal); + mKeyguardUpdateMonitor.mFaceCancelSignal = faceCancel; + KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class); + mKeyguardUpdateMonitor.registerCallback(callback); + + // WHEN the default display state changes to OFF + triggerDefaultDisplayStateChangeToOff(); + + // THEN face listening is NOT stopped. + verify(faceCancel, never()).cancel(); + verify(callback, never()).onBiometricRunningStateChanged( + eq(false), eq(BiometricSourceType.FACE)); + } + + @Test + public void onDisplayOff_whileWaking_doesNotStopFaceAuth() throws RemoteException { + enableStopFaceAuthOnDisplayOff(); + when(mWakefulness.getWakefulness()).thenReturn(WAKEFULNESS_WAKING); + + // GIVEN device is listening for face + mKeyguardUpdateMonitor.setKeyguardShowing(true, false); + mKeyguardUpdateMonitor.dispatchStartedWakingUp(PowerManager.WAKE_REASON_POWER_BUTTON); + mTestableLooper.processAllMessages(); + verifyFaceAuthenticateCall(); + + final CancellationSignal faceCancel = spy(mKeyguardUpdateMonitor.mFaceCancelSignal); + mKeyguardUpdateMonitor.mFaceCancelSignal = faceCancel; + KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class); + mKeyguardUpdateMonitor.registerCallback(callback); + + // WHEN the default display state changes to OFF + triggerDefaultDisplayStateChangeToOff(); + + // THEN face listening is NOT stopped. + verify(faceCancel, never()).cancel(); + verify(callback, never()).onBiometricRunningStateChanged( + eq(false), eq(BiometricSourceType.FACE)); } private void triggerDefaultDisplayStateChangeToOn() { @@ -3393,6 +3448,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mFeatureFlags.set(STOP_FACE_AUTH_ON_DISPLAY_OFF, true); mKeyguardUpdateMonitor = new TestableKeyguardUpdateMonitor(mContext); setupBiometrics(mKeyguardUpdateMonitor); + when(mWakefulness.getWakefulness()).thenReturn(WAKEFULNESS_AWAKE); assertThat(mDisplayTracker.getDisplayCallbacks().size()).isEqualTo(1); } @@ -3473,7 +3529,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mPackageManager, mFaceManager, mFingerprintManager, mBiometricManager, mFaceWakeUpTriggersConfig, mDevicePostureController, Optional.of(mInteractiveToAuthProvider), mFeatureFlags, - mTaskStackChangeListeners, mActivityTaskManager, mDisplayTracker); + mTaskStackChangeListeners, mActivityTaskManager, mDisplayTracker, + mWakefulness); setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java index e96ad876db3a..7ac80922e6a0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java @@ -712,6 +712,245 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { } @Test + public void windowWidthIsNotMax_performA11yActionIncreaseWidth_windowWidthIncreased() { + final Rect windowBounds = mWindowManager.getCurrentWindowMetrics().getBounds(); + final int startingWidth = (int) (windowBounds.width() * 0.8); + final int startingHeight = (int) (windowBounds.height() * 0.8); + final float changeWindowSizeAmount = mContext.getResources().getFraction( + R.fraction.magnification_resize_window_size_amount, + /* base= */ 1, + /* pbase= */ 1); + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AtomicInteger actualWindowHeight = new AtomicInteger(); + final AtomicInteger actualWindowWidth = new AtomicInteger(); + + mInstrumentation.runOnMainSync( + () -> { + mirrorView.performAccessibilityAction( + R.id.accessibility_action_increase_window_width, null); + actualWindowHeight.set(mWindowManager.getLayoutParamsFromAttachedView().height); + actualWindowWidth.set(mWindowManager.getLayoutParamsFromAttachedView().width); + }); + + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // Window width includes the magnifier frame and the margin. Increasing the window size + // will be increasing the amount of the frame size only. + int newWindowWidth = + (int) ((startingWidth - 2 * mirrorSurfaceMargin) * (1 + changeWindowSizeAmount)) + + 2 * mirrorSurfaceMargin; + assertEquals(newWindowWidth, actualWindowWidth.get()); + assertEquals(startingHeight, actualWindowHeight.get()); + } + + @Test + public void windowHeightIsNotMax_performA11yActionIncreaseHeight_windowHeightIncreased() { + final Rect windowBounds = mWindowManager.getCurrentWindowMetrics().getBounds(); + final int startingWidth = (int) (windowBounds.width() * 0.8); + final int startingHeight = (int) (windowBounds.height() * 0.8); + final float changeWindowSizeAmount = mContext.getResources().getFraction( + R.fraction.magnification_resize_window_size_amount, + /* base= */ 1, + /* pbase= */ 1); + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AtomicInteger actualWindowHeight = new AtomicInteger(); + final AtomicInteger actualWindowWidth = new AtomicInteger(); + + mInstrumentation.runOnMainSync( + () -> { + mirrorView.performAccessibilityAction( + R.id.accessibility_action_increase_window_height, null); + actualWindowHeight.set(mWindowManager.getLayoutParamsFromAttachedView().height); + actualWindowWidth.set(mWindowManager.getLayoutParamsFromAttachedView().width); + }); + + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // Window height includes the magnifier frame and the margin. Increasing the window size + // will be increasing the amount of the frame size only. + int newWindowHeight = + (int) ((startingHeight - 2 * mirrorSurfaceMargin) * (1 + changeWindowSizeAmount)) + + 2 * mirrorSurfaceMargin; + assertEquals(startingWidth, actualWindowWidth.get()); + assertEquals(newWindowHeight, actualWindowHeight.get()); + } + + @Test + public void windowWidthIsMax_noIncreaseWindowWidthA11yAction() { + final Rect windowBounds = mWindowManager.getCurrentWindowMetrics().getBounds(); + final int startingWidth = windowBounds.width(); + final int startingHeight = windowBounds.height(); + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AccessibilityNodeInfo accessibilityNodeInfo = + mirrorView.createAccessibilityNodeInfo(); + assertFalse(accessibilityNodeInfo.getActionList().contains( + new AccessibilityAction(R.id.accessibility_action_increase_window_width, null))); + } + + @Test + public void windowHeightIsMax_noIncreaseWindowHeightA11yAction() { + final Rect windowBounds = mWindowManager.getCurrentWindowMetrics().getBounds(); + final int startingWidth = windowBounds.width(); + final int startingHeight = windowBounds.height(); + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingWidth, startingHeight); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AccessibilityNodeInfo accessibilityNodeInfo = + mirrorView.createAccessibilityNodeInfo(); + assertFalse(accessibilityNodeInfo.getActionList().contains( + new AccessibilityAction(R.id.accessibility_action_increase_window_height, null))); + } + + @Test + public void windowWidthIsNotMin_performA11yActionDecreaseWidth_windowWidthDecreased() { + int mMinWindowSize = mResources.getDimensionPixelSize( + com.android.internal.R.dimen.accessibility_window_magnifier_min_size); + final int startingSize = (int) (mMinWindowSize * 1.1); + final float changeWindowSizeAmount = mContext.getResources().getFraction( + R.fraction.magnification_resize_window_size_amount, + /* base= */ 1, + /* pbase= */ 1); + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingSize, startingSize); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AtomicInteger actualWindowHeight = new AtomicInteger(); + final AtomicInteger actualWindowWidth = new AtomicInteger(); + + mInstrumentation.runOnMainSync( + () -> { + mirrorView.performAccessibilityAction( + R.id.accessibility_action_decrease_window_width, null); + actualWindowHeight.set(mWindowManager.getLayoutParamsFromAttachedView().height); + actualWindowWidth.set(mWindowManager.getLayoutParamsFromAttachedView().width); + }); + + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // Window width includes the magnifier frame and the margin. Decreasing the window size + // will be decreasing the amount of the frame size only. + int newWindowWidth = + (int) ((startingSize - 2 * mirrorSurfaceMargin) * (1 - changeWindowSizeAmount)) + + 2 * mirrorSurfaceMargin; + assertEquals(newWindowWidth, actualWindowWidth.get()); + assertEquals(startingSize, actualWindowHeight.get()); + } + + @Test + public void windowHeightIsNotMin_performA11yActionDecreaseHeight_windowHeightDecreased() { + int mMinWindowSize = mResources.getDimensionPixelSize( + com.android.internal.R.dimen.accessibility_window_magnifier_min_size); + final int startingSize = (int) (mMinWindowSize * 1.1); + final float changeWindowSizeAmount = mContext.getResources().getFraction( + R.fraction.magnification_resize_window_size_amount, + /* base= */ 1, + /* pbase= */ 1); + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingSize, startingSize); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AtomicInteger actualWindowHeight = new AtomicInteger(); + final AtomicInteger actualWindowWidth = new AtomicInteger(); + + mInstrumentation.runOnMainSync( + () -> { + mirrorView.performAccessibilityAction( + R.id.accessibility_action_decrease_window_height, null); + actualWindowHeight.set(mWindowManager.getLayoutParamsFromAttachedView().height); + actualWindowWidth.set(mWindowManager.getLayoutParamsFromAttachedView().width); + }); + + final int mirrorSurfaceMargin = mResources.getDimensionPixelSize( + R.dimen.magnification_mirror_surface_margin); + // Window height includes the magnifier frame and the margin. Decreasing the window size + // will be decreasing the amount of the frame size only. + int newWindowHeight = + (int) ((startingSize - 2 * mirrorSurfaceMargin) * (1 - changeWindowSizeAmount)) + + 2 * mirrorSurfaceMargin; + assertEquals(startingSize, actualWindowWidth.get()); + assertEquals(newWindowHeight, actualWindowHeight.get()); + } + + @Test + public void windowWidthIsMin_noDecreaseWindowWidthA11yAction() { + int mMinWindowSize = mResources.getDimensionPixelSize( + com.android.internal.R.dimen.accessibility_window_magnifier_min_size); + final int startingSize = mMinWindowSize; + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingSize, startingSize); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AccessibilityNodeInfo accessibilityNodeInfo = + mirrorView.createAccessibilityNodeInfo(); + assertFalse(accessibilityNodeInfo.getActionList().contains( + new AccessibilityAction(R.id.accessibility_action_decrease_window_width, null))); + } + + @Test + public void windowHeightIsMin_noDecreaseWindowHeightA11yAcyion() { + int mMinWindowSize = mResources.getDimensionPixelSize( + com.android.internal.R.dimen.accessibility_window_magnifier_min_size); + final int startingSize = mMinWindowSize; + + mInstrumentation.runOnMainSync(() -> { + mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, + Float.NaN); + mWindowMagnificationController.setWindowSize(startingSize, startingSize); + mWindowMagnificationController.setEditMagnifierSizeMode(true); + }); + + final View mirrorView = mWindowManager.getAttachedView(); + final AccessibilityNodeInfo accessibilityNodeInfo = + mirrorView.createAccessibilityNodeInfo(); + assertFalse(accessibilityNodeInfo.getActionList().contains( + new AccessibilityAction(R.id.accessibility_action_decrease_window_height, null))); + } + + @Test public void enableWindowMagnification_hasA11yWindowTitle() { mInstrumentation.runOnMainSync(() -> { mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN, @@ -1166,4 +1405,5 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { when(mContext.getDisplay()).thenReturn(display); return newRotation; } + } diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt index cc004363a049..59c7e7669b63 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt @@ -57,7 +57,8 @@ class ActivityLaunchAnimatorTest : SysuiTestCase() { @Before fun setup() { - activityLaunchAnimator = ActivityLaunchAnimator(testLaunchAnimator, testLaunchAnimator) + activityLaunchAnimator = + ActivityLaunchAnimator(testLaunchAnimator, testLaunchAnimator, disableWmTimeout = true) activityLaunchAnimator.callback = callback activityLaunchAnimator.addListener(listener) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt index 9584d888b01f..bddc4c3c07da 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt @@ -41,7 +41,7 @@ import com.android.systemui.R import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository import com.android.systemui.biometrics.data.repository.FakePromptRepository -import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository +import com.android.systemui.biometrics.data.repository.FakeDisplayStateRepository import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl import com.android.systemui.biometrics.domain.interactor.FakeCredentialInteractor import com.android.systemui.biometrics.domain.interactor.PromptCredentialInteractor @@ -110,7 +110,7 @@ open class AuthContainerViewTest : SysuiTestCase() { private val fakeExecutor = FakeExecutor(FakeSystemClock()) private val biometricPromptRepository = FakePromptRepository() private val fingerprintRepository = FakeFingerprintPropertyRepository() - private val rearDisplayStateRepository = FakeRearDisplayStateRepository() + private val displayStateRepository = FakeDisplayStateRepository() private val credentialInteractor = FakeCredentialInteractor() private val bpCredentialInteractor = PromptCredentialInteractor( Dispatchers.Main.immediate, @@ -129,7 +129,7 @@ open class AuthContainerViewTest : SysuiTestCase() { testScope.backgroundScope, mContext, fakeExecutor, - rearDisplayStateRepository + displayStateRepository ) @@ -531,6 +531,7 @@ open class AuthContainerViewTest : SysuiTestCase() { displayStateInteractor, promptSelectorInteractor, vibrator, + context, featureFlags ), { credentialViewModel }, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt index 994db460cdbb..c71ef47b649b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt @@ -56,7 +56,7 @@ import com.android.systemui.R import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestableContext -import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository +import com.android.systemui.biometrics.data.repository.FakeDisplayStateRepository import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository @@ -120,7 +120,7 @@ class SideFpsControllerTest : SysuiTestCase() { private lateinit var displayStateInteractor: DisplayStateInteractor private val executor = FakeExecutor(FakeSystemClock()) - private val rearDisplayStateRepository = FakeRearDisplayStateRepository() + private val displayStateRepository = FakeDisplayStateRepository() private val testScope = TestScope(StandardTestDispatcher()) private lateinit var overlayController: ISidefpsController @@ -157,7 +157,7 @@ class SideFpsControllerTest : SysuiTestCase() { testScope.backgroundScope, context, executor, - rearDisplayStateRepository + displayStateRepository ) context.addMockSystemService(DisplayManager::class.java, displayManager) @@ -268,7 +268,7 @@ class SideFpsControllerTest : SysuiTestCase() { TestCoroutineScope(), dumpManager ) - rearDisplayStateRepository.setIsInRearDisplayMode(inRearDisplayMode) + displayStateRepository.setIsInRearDisplayMode(inRearDisplayMode) overlayController = ArgumentCaptor.forClass(ISidefpsController::class.java) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsBpViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsBpViewControllerTest.kt index 7de78a60b73e..9be3d8201053 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsBpViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsBpViewControllerTest.kt @@ -23,14 +23,19 @@ import com.android.systemui.RoboPilotTest import com.android.systemui.SysuiTestCase import com.android.systemui.dump.DumpManager import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.shade.ShadeExpansionChangeEvent import com.android.systemui.shade.ShadeExpansionStateManager import com.android.systemui.statusbar.phone.SystemUIDialogManager +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.whenever +import com.android.systemui.util.mockito.withArgCaptor import org.junit.Assert.assertFalse import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock +import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit @SmallTest @@ -51,6 +56,8 @@ class UdfpsBpViewControllerTest : SysuiTestCase() { @Before fun setup() { + whenever(shadeExpansionStateManager.addExpansionListener(any())) + .thenReturn(ShadeExpansionChangeEvent(0f, false, false, 0f)) udfpsBpViewController = UdfpsBpViewController( udfpsBpView, @@ -62,7 +69,32 @@ class UdfpsBpViewControllerTest : SysuiTestCase() { } @Test - fun testShouldNeverPauseAuth() { + fun testPauseAuthWhenNotificationShadeDragging() { + udfpsBpViewController.onViewAttached() + val shadeExpansionListener = withArgCaptor { + verify(shadeExpansionStateManager).addExpansionListener(capture()) + } + + // When shade is tracking, should pause auth + shadeExpansionListener.onPanelExpansionChanged( + ShadeExpansionChangeEvent( + fraction = 0f, + expanded = false, + tracking = true, + dragDownPxAmount = 10f + ) + ) + assert(udfpsBpViewController.shouldPauseAuth()) + + // When shade is not tracking, don't pause auth even if expanded + shadeExpansionListener.onPanelExpansionChanged( + ShadeExpansionChangeEvent( + fraction = 0f, + expanded = true, + tracking = false, + dragDownPxAmount = 10f + ) + ) assertFalse(udfpsBpViewController.shouldPauseAuth()) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java index e56b5c7406b6..7dd88b437f17 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -207,6 +207,8 @@ public class UdfpsControllerTest extends SysuiTestCase { private final UdfpsAnimationViewController mUdfpsKeyguardViewController = mock(UdfpsKeyguardViewControllerLegacy.class); @Mock + private UdfpsAnimationViewController mUdfpsAnimationViewController; + @Mock private SystemUIDialogManager mSystemUIDialogManager; @Mock private ActivityLaunchAnimator mActivityLaunchAnimator; @@ -267,6 +269,7 @@ public class UdfpsControllerTest extends SysuiTestCase { when(mSessionTracker.getSessionId(anyInt())).thenReturn( (new InstanceIdSequence(1 << 20)).newInstanceId()); when(mUdfpsView.getViewRootImpl()).thenReturn(mViewRootImpl); + when(mUdfpsView.getAnimationViewController()).thenReturn(mUdfpsAnimationViewController); final List<ComponentInfoInternal> componentInfo = new ArrayList<>(); componentInfo.add(new ComponentInfoInternal("faceSensor" /* componentId */, @@ -1380,6 +1383,50 @@ public class UdfpsControllerTest extends SysuiTestCase { } @Test + public void onTouch_withNewTouchDetection_ignoreIfAuthPaused() throws RemoteException { + final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L, + 0L); + final TouchProcessorResult processorResultDown = + new TouchProcessorResult.ProcessedTouch(InteractionEvent.DOWN, + 1 /* pointerId */, touchData); + + // Enable new touch detection. + when(mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)).thenReturn(true); + + // Configure UdfpsController to use FingerprintManager as opposed to AlternateTouchProvider. + initUdfpsController(mOpticalProps, false /* hasAlternateTouchProvider */); + + // Configure UdfpsView to not accept the ACTION_DOWN event + when(mUdfpsView.isDisplayConfigured()).thenReturn(true); + when(mUdfpsView.isWithinSensorArea(anyFloat(), anyFloat())).thenReturn(true); + + // GIVEN that auth is paused + when(mUdfpsAnimationViewController.shouldPauseAuth()).thenReturn(true); + + // GIVEN that the overlay is showing and a11y touch exploration NOT enabled + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(false); + mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, mOpticalProps.sensorId, + BiometricOverlayConstants.REASON_AUTH_KEYGUARD, mUdfpsOverlayControllerCallback); + mFgExecutor.runAllReady(); + + verify(mUdfpsView).setOnTouchListener(mTouchListenerCaptor.capture()); + + // WHEN ACTION_DOWN is received and touch is within sensor + when(mSinglePointerTouchProcessor.processTouch(any(), anyInt(), any())).thenReturn( + processorResultDown); + MotionEvent downEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, 0, 0, 0); + mTouchListenerCaptor.getValue().onTouch(mUdfpsView, downEvent); + mBiometricExecutor.runAllReady(); + downEvent.recycle(); + + // THEN the touch is ignored + verify(mInputManager, never()).pilferPointers(any()); + verify(mFingerprintManager, never()).onPointerDown(anyLong(), anyInt(), anyInt(), + anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyFloat(), anyLong(), anyLong(), + anyBoolean()); + } + + @Test public void onTouch_withNewTouchDetection_pilferPointer() throws RemoteException { final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L, 0L); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/RearDisplayStateRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/DisplayStateRepositoryTest.kt index dfe8d36504d0..c9c46cbe8420 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/RearDisplayStateRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/DisplayStateRepositoryTest.kt @@ -17,13 +17,21 @@ package com.android.systemui.keyguard.data.repository import android.hardware.devicestate.DeviceStateManager +import android.hardware.display.DisplayManager +import android.os.Handler +import android.view.Display +import android.view.DisplayInfo +import android.view.Surface import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.biometrics.data.repository.RearDisplayStateRepository -import com.android.systemui.biometrics.data.repository.RearDisplayStateRepositoryImpl +import com.android.systemui.biometrics.data.repository.DisplayStateRepository +import com.android.systemui.biometrics.data.repository.DisplayStateRepositoryImpl +import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.coroutines.collectLastValue import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.withArgCaptor import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat @@ -38,8 +46,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.same import org.mockito.Captor import org.mockito.Mock +import org.mockito.Mockito.spy import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule @@ -50,16 +60,19 @@ private const val REAR_DISPLAY_MODE_DEVICE_STATE = 3 @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(JUnit4::class) -class RearDisplayStateRepositoryTest : SysuiTestCase() { +class DisplayStateRepositoryTest : SysuiTestCase() { @JvmField @Rule var mockitoRule: MockitoRule = MockitoJUnit.rule() @Mock private lateinit var deviceStateManager: DeviceStateManager - private lateinit var underTest: RearDisplayStateRepository + @Mock private lateinit var displayManager: DisplayManager + @Mock private lateinit var handler: Handler + @Mock private lateinit var display: Display + private lateinit var underTest: DisplayStateRepository private val testScope = TestScope(StandardTestDispatcher()) private val fakeExecutor = FakeExecutor(FakeSystemClock()) @Captor - private lateinit var callbackCaptor: ArgumentCaptor<DeviceStateManager.DeviceStateCallback> + private lateinit var displayListenerCaptor: ArgumentCaptor<DisplayManager.DisplayListener> @Before fun setUp() { @@ -69,11 +82,16 @@ class RearDisplayStateRepositoryTest : SysuiTestCase() { rearDisplayDeviceStates ) + mContext = spy(mContext) + whenever(mContext.display).thenReturn(display) + underTest = - RearDisplayStateRepositoryImpl( + DisplayStateRepositoryImpl( testScope.backgroundScope, mContext, deviceStateManager, + displayManager, + handler, fakeExecutor ) } @@ -81,16 +99,46 @@ class RearDisplayStateRepositoryTest : SysuiTestCase() { @Test fun updatesIsInRearDisplayMode_whenRearDisplayStateChanges() = testScope.runTest { - val isInRearDisplayMode = collectLastValue(underTest.isInRearDisplayMode) + val isInRearDisplayMode by collectLastValue(underTest.isInRearDisplayMode) runCurrent() val callback = deviceStateManager.captureCallback() callback.onStateChanged(NORMAL_DISPLAY_MODE_DEVICE_STATE) - assertThat(isInRearDisplayMode()).isFalse() + assertThat(isInRearDisplayMode).isFalse() callback.onStateChanged(REAR_DISPLAY_MODE_DEVICE_STATE) - assertThat(isInRearDisplayMode()).isTrue() + assertThat(isInRearDisplayMode).isTrue() + } + + @Test + fun updatesCurrentRotation_whenDisplayStateChanges() = + testScope.runTest { + val currentRotation by collectLastValue(underTest.currentRotation) + runCurrent() + + verify(displayManager) + .registerDisplayListener( + displayListenerCaptor.capture(), + same(handler), + eq(DisplayManager.EVENT_FLAG_DISPLAY_CHANGED) + ) + + whenever(display.getDisplayInfo(any())).then { + val info = it.getArgument<DisplayInfo>(0) + info.rotation = Surface.ROTATION_90 + return@then true + } + displayListenerCaptor.value.onDisplayChanged(Surface.ROTATION_90) + assertThat(currentRotation).isEqualTo(DisplayRotation.ROTATION_90) + + whenever(display.getDisplayInfo(any())).then { + val info = it.getArgument<DisplayInfo>(0) + info.rotation = Surface.ROTATION_180 + return@then true + } + displayListenerCaptor.value.onDisplayChanged(Surface.ROTATION_180) + assertThat(currentRotation).isEqualTo(DisplayRotation.ROTATION_180) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/FingerprintRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/FingerprintRepositoryImplTest.kt index 239e317b92f5..ed9ae5e3dc01 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/FingerprintRepositoryImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/data/repository/FingerprintRepositoryImplTest.kt @@ -29,6 +29,7 @@ import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.SensorStrength import com.android.systemui.coroutines.collectLastValue import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runCurrent @@ -44,6 +45,7 @@ import org.mockito.Mock import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit +@OptIn(ExperimentalCoroutinesApi::class) @SmallTest @RunWith(JUnit4::class) class FingerprintRepositoryImplTest : SysuiTestCase() { @@ -73,10 +75,15 @@ class FingerprintRepositoryImplTest : SysuiTestCase() { @Test fun initializeProperties() = testScope.runTest { - val isInitialized = collectLastValue(repository.isInitialized) + val sensorId by collectLastValue(repository.sensorId) + val strength by collectLastValue(repository.strength) + val sensorType by collectLastValue(repository.sensorType) + val sensorLocations by collectLastValue(repository.sensorLocations) - assertDefaultProperties() - assertThat(isInitialized()).isFalse() + // Assert default properties. + assertThat(sensorId).isEqualTo(-1) + assertThat(strength).isEqualTo(SensorStrength.CONVENIENCE) + assertThat(sensorType).isEqualTo(FingerprintSensorType.UNKNOWN) val fingerprintProps = listOf( @@ -115,31 +122,24 @@ class FingerprintRepositoryImplTest : SysuiTestCase() { fingerprintAuthenticatorsCaptor.value.onAllAuthenticatorsRegistered(fingerprintProps) - assertThat(repository.sensorId.value).isEqualTo(1) - assertThat(repository.strength.value).isEqualTo(SensorStrength.STRONG) - assertThat(repository.sensorType.value).isEqualTo(FingerprintSensorType.REAR) + assertThat(sensorId).isEqualTo(1) + assertThat(strength).isEqualTo(SensorStrength.STRONG) + assertThat(sensorType).isEqualTo(FingerprintSensorType.REAR) - assertThat(repository.sensorLocations.value.size).isEqualTo(2) - assertThat(repository.sensorLocations.value).containsKey("display_id_1") - with(repository.sensorLocations.value["display_id_1"]!!) { + assertThat(sensorLocations?.size).isEqualTo(2) + assertThat(sensorLocations).containsKey("display_id_1") + with(sensorLocations?.get("display_id_1")!!) { assertThat(displayId).isEqualTo("display_id_1") assertThat(sensorLocationX).isEqualTo(100) assertThat(sensorLocationY).isEqualTo(300) assertThat(sensorRadius).isEqualTo(20) } - assertThat(repository.sensorLocations.value).containsKey("") - with(repository.sensorLocations.value[""]!!) { + assertThat(sensorLocations).containsKey("") + with(sensorLocations?.get("")!!) { assertThat(displayId).isEqualTo("") assertThat(sensorLocationX).isEqualTo(540) assertThat(sensorLocationY).isEqualTo(1636) assertThat(sensorRadius).isEqualTo(130) } - assertThat(isInitialized()).isTrue() } - - private fun assertDefaultProperties() { - assertThat(repository.sensorId.value).isEqualTo(-1) - assertThat(repository.strength.value).isEqualTo(SensorStrength.CONVENIENCE) - assertThat(repository.sensorType.value).isEqualTo(FingerprintSensorType.UNKNOWN) - } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractorImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractorImplTest.kt index 2217c5c677d5..0f84d9d24ebe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractorImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractorImplTest.kt @@ -2,7 +2,8 @@ package com.android.systemui.biometrics.domain.interactor import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository +import com.android.systemui.biometrics.data.repository.FakeDisplayStateRepository +import com.android.systemui.biometrics.shared.model.DisplayRotation import com.android.systemui.coroutines.collectLastValue import com.android.systemui.unfold.compat.ScreenSizeFoldProvider import com.android.systemui.unfold.updates.FoldProvider @@ -34,7 +35,7 @@ class DisplayStateInteractorImplTest : SysuiTestCase() { private val fakeExecutor = FakeExecutor(FakeSystemClock()) private val testScope = TestScope(StandardTestDispatcher()) - private val rearDisplayStateRepository = FakeRearDisplayStateRepository() + private val displayStateRepository = FakeDisplayStateRepository() @Mock private lateinit var screenSizeFoldProvider: ScreenSizeFoldProvider private lateinit var interactor: DisplayStateInteractorImpl @@ -46,7 +47,7 @@ class DisplayStateInteractorImplTest : SysuiTestCase() { testScope.backgroundScope, mContext, fakeExecutor, - rearDisplayStateRepository + displayStateRepository ) interactor.setScreenSizeFoldProvider(screenSizeFoldProvider) } @@ -56,14 +57,26 @@ class DisplayStateInteractorImplTest : SysuiTestCase() { testScope.runTest { val isInRearDisplayMode = collectLastValue(interactor.isInRearDisplayMode) - rearDisplayStateRepository.setIsInRearDisplayMode(false) + displayStateRepository.setIsInRearDisplayMode(false) assertThat(isInRearDisplayMode()).isFalse() - rearDisplayStateRepository.setIsInRearDisplayMode(true) + displayStateRepository.setIsInRearDisplayMode(true) assertThat(isInRearDisplayMode()).isTrue() } @Test + fun currentRotationChanges() = + testScope.runTest { + val currentRotation = collectLastValue(interactor.currentRotation) + + displayStateRepository.setCurrentRotation(DisplayRotation.ROTATION_180) + assertThat(currentRotation()).isEqualTo(DisplayRotation.ROTATION_180) + + displayStateRepository.setCurrentRotation(DisplayRotation.ROTATION_90) + assertThat(currentRotation()).isEqualTo(DisplayRotation.ROTATION_90) + } + + @Test fun isFoldedChanges() = testScope.runTest { val isFolded = collectLastValue(interactor.isFolded) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractorTest.kt index fd96cf45504b..712eef13421b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/domain/interactor/SideFpsOverlayInteractorTest.kt @@ -22,6 +22,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.SensorStrength +import com.android.systemui.coroutines.collectLastValue import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope @@ -51,7 +52,7 @@ class SideFpsOverlayInteractorTest : SysuiTestCase() { } @Test - fun testGetOverlayOffsets() = + fun testOverlayOffsetUpdates() = testScope.runTest { fingerprintRepository.setProperties( sensorId = 1, @@ -76,16 +77,32 @@ class SideFpsOverlayInteractorTest : SysuiTestCase() { ) ) - var offsets = interactor.getOverlayOffsets("display_id_1") - assertThat(offsets.displayId).isEqualTo("display_id_1") - assertThat(offsets.sensorLocationX).isEqualTo(100) - assertThat(offsets.sensorLocationY).isEqualTo(300) - assertThat(offsets.sensorRadius).isEqualTo(20) + val displayId by collectLastValue(interactor.displayId) + val offsets by collectLastValue(interactor.overlayOffsets) - offsets = interactor.getOverlayOffsets("invalid_display_id") - assertThat(offsets.displayId).isEqualTo("") - assertThat(offsets.sensorLocationX).isEqualTo(540) - assertThat(offsets.sensorLocationY).isEqualTo(1636) - assertThat(offsets.sensorRadius).isEqualTo(130) + // Assert offsets of empty displayId. + assertThat(displayId).isEqualTo("") + assertThat(offsets?.displayId).isEqualTo("") + assertThat(offsets?.sensorLocationX).isEqualTo(540) + assertThat(offsets?.sensorLocationY).isEqualTo(1636) + assertThat(offsets?.sensorRadius).isEqualTo(130) + + // Offsets should be updated correctly. + interactor.onDisplayChanged("display_id_1") + assertThat(displayId).isEqualTo("display_id_1") + assertThat(offsets?.displayId).isEqualTo("display_id_1") + assertThat(offsets?.sensorLocationX).isEqualTo(100) + assertThat(offsets?.sensorLocationY).isEqualTo(300) + assertThat(offsets?.sensorRadius).isEqualTo(20) + + // Should return default offset when the displayId is invalid. + interactor.onDisplayChanged("invalid_display_id") + assertThat(displayId).isEqualTo("invalid_display_id") + assertThat(offsets?.displayId).isEqualTo(SensorLocationInternal.DEFAULT.displayId) + assertThat(offsets?.sensorLocationX) + .isEqualTo(SensorLocationInternal.DEFAULT.sensorLocationX) + assertThat(offsets?.sensorLocationY) + .isEqualTo(SensorLocationInternal.DEFAULT.sensorLocationY) + assertThat(offsets?.sensorRadius).isEqualTo(SensorLocationInternal.DEFAULT.sensorRadius) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModelTest.kt index 7697c098ed3d..0d61e304c79d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptFingerprintIconViewModelTest.kt @@ -4,9 +4,9 @@ import android.content.res.Configuration import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase +import com.android.systemui.biometrics.data.repository.FakeDisplayStateRepository import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository import com.android.systemui.biometrics.data.repository.FakePromptRepository -import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor @@ -41,7 +41,7 @@ class PromptFingerprintIconViewModelTest : SysuiTestCase() { private val fingerprintRepository = FakeFingerprintPropertyRepository() private val promptRepository = FakePromptRepository() - private val rearDisplayStateRepository = FakeRearDisplayStateRepository() + private val displayStateRepository = FakeDisplayStateRepository() private val testScope = TestScope(StandardTestDispatcher()) private val fakeExecutor = FakeExecutor(FakeSystemClock()) @@ -59,7 +59,7 @@ class PromptFingerprintIconViewModelTest : SysuiTestCase() { testScope.backgroundScope, mContext, fakeExecutor, - rearDisplayStateRepository + displayStateRepository ) viewModel = PromptFingerprintIconViewModel(displayStateInteractor, promptSelectorInteractor) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index 0ed46da27b55..c53172d85370 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt @@ -25,9 +25,9 @@ import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase import com.android.systemui.biometrics.AuthBiometricView +import com.android.systemui.biometrics.data.repository.FakeDisplayStateRepository import com.android.systemui.biometrics.data.repository.FakeFingerprintPropertyRepository import com.android.systemui.biometrics.data.repository.FakePromptRepository -import com.android.systemui.biometrics.data.repository.FakeRearDisplayStateRepository import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractorImpl import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractorImpl @@ -79,14 +79,14 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa private val testScope = TestScope() private val fingerprintRepository = FakeFingerprintPropertyRepository() private val promptRepository = FakePromptRepository() - private val rearDisplayStateRepository = FakeRearDisplayStateRepository() + private val displayStateRepository = FakeDisplayStateRepository() private val displayStateInteractor = DisplayStateInteractorImpl( testScope.backgroundScope, mContext, fakeExecutor, - rearDisplayStateRepository + displayStateRepository ) private lateinit var selector: PromptSelectorInteractor @@ -99,7 +99,8 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa PromptSelectorInteractorImpl(fingerprintRepository, promptRepository, lockPatternUtils) selector.resetPrompt() - viewModel = PromptViewModel(displayStateInteractor, selector, vibrator, featureFlags) + viewModel = + PromptViewModel(displayStateInteractor, selector, vibrator, mContext, featureFlags) featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index f73804dbc349..fdeed9fddf7a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -175,10 +175,10 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { private @Mock AuthController mAuthController; private @Mock ShadeExpansionStateManager mShadeExpansionStateManager; private @Mock ShadeWindowLogger mShadeWindowLogger; - private @Captor ArgumentCaptor<KeyguardUpdateMonitorCallback> - mKeyguardUpdateMonitorCallbackCaptor; private @Captor ArgumentCaptor<KeyguardStateController.Callback> mKeyguardStateControllerCallback; + private @Captor ArgumentCaptor<KeyguardUpdateMonitorCallback> + mKeyguardUpdateMonitorCallbackCaptor; private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake(); private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); @@ -258,6 +258,26 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { } @Test + @TestableLooper.RunWithLooper(setAsMainLooper = true) + public void doNotHideKeyguard_whenLockdown_onKeyguardNotEnabledExternally() { + // GIVEN keyguard is enabled and lockdown occurred so the keyguard is showing + mViewMediator.onSystemReady(); + mViewMediator.setKeyguardEnabled(true); + TestableLooper.get(this).processAllMessages(); + captureKeyguardUpdateMonitorCallback(); + when(mLockPatternUtils.isUserInLockdown(anyInt())).thenReturn(true); + mKeyguardUpdateMonitorCallbackCaptor.getValue().onStrongAuthStateChanged(0); + assertTrue(mViewMediator.isShowingAndNotOccluded()); + + // WHEN keyguard is externally not enabled anymore + mViewMediator.setKeyguardEnabled(false); + + // THEN keyguard is NOT dismissed; it continues to show + TestableLooper.get(this).processAllMessages(); + assertTrue(mViewMediator.isShowingAndNotOccluded()); + } + + @Test public void testOnGoingToSleep_UpdatesKeyguardGoingAway() { mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER); verify(mUpdateMonitor).dispatchKeyguardGoingAway(false); @@ -1000,11 +1020,11 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { mViewMediator.registerCentralSurfaces(mCentralSurfaces, null, null, null, null, null); } - private void captureKeyguardUpdateMonitorCallback() { - verify(mUpdateMonitor).registerCallback(mKeyguardUpdateMonitorCallbackCaptor.capture()); - } - private void captureKeyguardStateControllerCallback() { verify(mKeyguardStateController).addCallback(mKeyguardStateControllerCallback.capture()); } + + private void captureKeyguardUpdateMonitorCallback() { + verify(mUpdateMonitor).registerCallback(mKeyguardUpdateMonitorCallbackCaptor.capture()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt index d36e77889810..b9c0b7fe35d7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt @@ -20,6 +20,7 @@ package com.android.systemui.keyguard.data.quickaffordance import android.graphics.drawable.Drawable import android.service.quickaccesswallet.GetWalletCardsResponse import android.service.quickaccesswallet.QuickAccessWalletClient +import android.service.quickaccesswallet.WalletCard import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.R @@ -38,6 +39,7 @@ import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runBlockingTest import kotlinx.coroutines.test.runTest import org.junit.Before @@ -92,6 +94,40 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { } @Test + fun affordance_keyguardShowing_hasNonPaymentCard_modelIsNone() = + runTest(UnconfinedTestDispatcher()) { + setUpState(cardType = WalletCard.CARD_TYPE_NON_PAYMENT) + var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null + + val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this) + + assertThat(latest).isEqualTo(KeyguardQuickAffordanceConfig.LockScreenState.Hidden) + job.cancel() + } + + @Test + fun affordance_keyguardShowing_hasPaymentCard_visibleModel() = + runTest(UnconfinedTestDispatcher()) { + setUpState(cardType = WalletCard.CARD_TYPE_PAYMENT) + var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null + + val job = underTest.lockScreenState.onEach { latest = it }.launchIn(this) + + val visibleModel = latest as KeyguardQuickAffordanceConfig.LockScreenState.Visible + assertThat(visibleModel.icon) + .isEqualTo( + Icon.Loaded( + drawable = ICON, + contentDescription = + ContentDescription.Resource( + res = R.string.accessibility_wallet_button, + ), + ) + ) + job.cancel() + } + + @Test fun affordance_walletFeatureNotEnabled_modelIsNone() = runBlockingTest { setUpState(isWalletFeatureAvailable = false) var latest: KeyguardQuickAffordanceConfig.LockScreenState? = null @@ -187,6 +223,7 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { isWalletServiceAvailable: Boolean = true, isWalletQuerySuccessful: Boolean = true, hasSelectedCard: Boolean = true, + cardType: Int = WalletCard.CARD_TYPE_UNKNOWN ) { val walletClient: QuickAccessWalletClient = mock() whenever(walletClient.tileIcon).thenReturn(ICON) @@ -202,7 +239,19 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { if (isWalletQuerySuccessful) { onWalletCardsRetrieved( if (hasSelectedCard) { - GetWalletCardsResponse(listOf(mock()), 0) + GetWalletCardsResponse( + listOf( + WalletCard.Builder( + /*cardId= */ CARD_ID, + /*cardType= */ cardType, + /*cardImage= */ mock(), + /*contentDescription= */ CARD_DESCRIPTION, + /*pendingIntent= */ mock() + ) + .build() + ), + 0 + ) } else { GetWalletCardsResponse(emptyList(), 0) } @@ -216,5 +265,7 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { companion object { private val ICON: Drawable = mock() + private const val CARD_ID: String = "Id" + private const val CARD_DESCRIPTION: String = "Description" } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt index d1299d40ea12..5939bb50bb25 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt @@ -16,10 +16,12 @@ package com.android.systemui.media.controls.pipeline +import android.app.IUriGrantsManager import android.app.Notification import android.app.Notification.FLAG_NO_CLEAR import android.app.Notification.MediaStyle import android.app.PendingIntent +import android.app.UriGrantsManager import android.app.smartspace.SmartspaceAction import android.app.smartspace.SmartspaceConfig import android.app.smartspace.SmartspaceManager @@ -27,12 +29,14 @@ import android.app.smartspace.SmartspaceTarget import android.content.Intent import android.content.pm.PackageManager import android.graphics.Bitmap +import android.graphics.ImageDecoder import android.graphics.drawable.Icon import android.media.MediaDescription import android.media.MediaMetadata import android.media.session.MediaController import android.media.session.MediaSession import android.media.session.PlaybackState +import android.net.Uri import android.os.Bundle import android.provider.Settings import android.service.notification.StatusBarNotification @@ -40,6 +44,7 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper import androidx.media.utils.MediaConstants import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.internal.logging.InstanceId import com.android.keyguard.KeyguardUpdateMonitor import com.android.systemui.InstanceIdSequenceFake @@ -83,7 +88,9 @@ import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever +import org.mockito.MockitoSession import org.mockito.junit.MockitoJUnit +import org.mockito.quality.Strictness private const val KEY = "KEY" private const val KEY_2 = "KEY_2" @@ -149,6 +156,8 @@ class MediaDataManagerTest : SysuiTestCase() { @Captor lateinit var stateCallbackCaptor: ArgumentCaptor<(String, PlaybackState) -> Unit> @Captor lateinit var sessionCallbackCaptor: ArgumentCaptor<(String) -> Unit> @Captor lateinit var smartSpaceConfigBuilderCaptor: ArgumentCaptor<SmartspaceConfig> + @Mock private lateinit var ugm: IUriGrantsManager + @Mock private lateinit var imageSource: ImageDecoder.Source private val instanceIdSequence = InstanceIdSequenceFake(1 shl 20) @@ -159,8 +168,17 @@ class MediaDataManagerTest : SysuiTestCase() { 1 ) + private lateinit var staticMockSession: MockitoSession + @Before fun setup() { + staticMockSession = + ExtendedMockito.mockitoSession() + .mockStatic<UriGrantsManager>(UriGrantsManager::class.java) + .mockStatic<ImageDecoder>(ImageDecoder::class.java) + .strictness(Strictness.LENIENT) + .startMocking() + whenever(UriGrantsManager.getService()).thenReturn(ugm) foregroundExecutor = FakeExecutor(clock) backgroundExecutor = FakeExecutor(clock) uiExecutor = FakeExecutor(clock) @@ -270,6 +288,7 @@ class MediaDataManagerTest : SysuiTestCase() { @After fun tearDown() { + staticMockSession.finishMocking() session.release() mediaDataManager.destroy() Settings.Secure.putInt( @@ -2198,6 +2217,66 @@ class MediaDataManagerTest : SysuiTestCase() { verify(listener).onMediaDataRemoved(eq(KEY)) } + @Test + fun testResumeMediaLoaded_hasArtPermission_artLoaded() { + // When resume media is loaded and user/app has permission to access the art URI, + whenever( + ugm.checkGrantUriPermission_ignoreNonSystem( + anyInt(), + any(), + any(), + anyInt(), + anyInt() + ) + ) + .thenReturn(1) + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val uri = Uri.parse("content://example") + whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource) + whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork) + + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setIconUri(uri) + build() + } + addResumeControlAndLoad(desc) + + // Then the artwork is loaded + assertThat(mediaDataCaptor.value.artwork).isNotNull() + } + + @Test + fun testResumeMediaLoaded_noArtPermission_noArtLoaded() { + // When resume media is loaded and user/app does not have permission to access the art URI + whenever( + ugm.checkGrantUriPermission_ignoreNonSystem( + anyInt(), + any(), + any(), + anyInt(), + anyInt() + ) + ) + .thenThrow(SecurityException("Test no permission")) + val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) + val uri = Uri.parse("content://example") + whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource) + whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork) + + val desc = + MediaDescription.Builder().run { + setTitle(SESSION_TITLE) + setIconUri(uri) + build() + } + addResumeControlAndLoad(desc) + + // Then the artwork is not loaded + assertThat(mediaDataCaptor.value.artwork).isNull() + } + /** Helper function to add a basic media notification and capture the resulting MediaData */ private fun addNotificationAndLoad() { addNotificationAndLoad(mediaNotification) diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt index 95bb3e0a4538..78330078076c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt @@ -22,6 +22,8 @@ import android.os.UserManager import android.testing.AndroidTestingRunner import android.view.KeyEvent import android.view.KeyEvent.ACTION_DOWN +import android.view.KeyEvent.ACTION_UP +import android.view.KeyEvent.KEYCODE_N import android.view.KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL import androidx.test.filters.SmallTest import com.android.keyguard.KeyguardUpdateMonitor @@ -30,7 +32,6 @@ import com.android.systemui.settings.FakeUserTracker import com.android.systemui.statusbar.CommandQueue import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.whenever @@ -43,7 +44,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentCaptor import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.times @@ -66,6 +66,7 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { private val executor = FakeExecutor(FakeSystemClock()) private val userTracker = FakeUserTracker() + private val handlerCallbacks = mutableListOf<Runnable>() @Before fun setUp() { @@ -74,19 +75,27 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { } private fun createUnderTest( - isEnabled: Boolean, - bubbles: Bubbles?, + isEnabled: Boolean, + bubbles: Bubbles?, ): NoteTaskInitializer = - NoteTaskInitializer( - controller = controller, - commandQueue = commandQueue, - optionalBubbles = Optional.ofNullable(bubbles), - isEnabled = isEnabled, - roleManager = roleManager, - userTracker = userTracker, - keyguardUpdateMonitor = keyguardMonitor, - backgroundExecutor = executor, - ) + NoteTaskInitializer( + controller = controller, + commandQueue = commandQueue, + optionalBubbles = Optional.ofNullable(bubbles), + isEnabled = isEnabled, + roleManager = roleManager, + userTracker = userTracker, + keyguardUpdateMonitor = keyguardMonitor, + backgroundExecutor = executor, + ) + + private fun createKeyEvent( + action: Int, + code: Int, + downTime: Long = 0L, + eventTime: Long = 0L, + metaState: Int = 0 + ): KeyEvent = KeyEvent(downTime, eventTime, action, code, 0 /*repeat*/, metaState) @Test fun initialize_withUserUnlocked() { @@ -120,12 +129,12 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { underTest.initialize() verifyZeroInteractions( - commandQueue, - bubbles, - controller, - roleManager, - userManager, - keyguardMonitor, + commandQueue, + bubbles, + controller, + roleManager, + userManager, + keyguardMonitor, ) } @@ -136,18 +145,23 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { underTest.initialize() verifyZeroInteractions( - commandQueue, - bubbles, - controller, - roleManager, - userManager, - keyguardMonitor, + commandQueue, + bubbles, + controller, + roleManager, + userManager, + keyguardMonitor, ) } @Test fun initialize_handleSystemKey() { - val expectedKeyEvent = KeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL) + val expectedKeyEvent = + createKeyEvent( + ACTION_DOWN, + KEYCODE_N, + metaState = KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) underTest.initialize() val callback = withArgCaptor { verify(commandQueue).addCallback(capture()) } @@ -176,7 +190,7 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { underTest.initialize() val callback = withArgCaptor { verify(roleManager) - .addOnRoleHoldersChangedListenerAsUser(any(), capture(), eq(UserHandle.ALL)) + .addOnRoleHoldersChangedListenerAsUser(any(), capture(), eq(UserHandle.ALL)) } callback.onRoleHoldersChanged(ROLE_NOTES, userTracker.userHandle) @@ -203,4 +217,60 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { verify(controller, times(2)).updateNoteTaskForCurrentUserAndManagedProfiles() } + + @Test + fun tailButtonGestureDetection_singlePress_shouldShowNoteTaskOnUp() { + val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) + underTest.initialize() + val callback = withArgCaptor { verify(commandQueue).addCallback(capture()) } + + callback.handleSystemKey( + createKeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 0) + ) + verify(controller, never()).showNoteTask(any()) + + callback.handleSystemKey( + createKeyEvent(ACTION_UP, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 50) + ) + + verify(controller).showNoteTask(any()) + } + + @Test + fun tailButtonGestureDetection_doublePress_shouldNotShowNoteTaskTwice() { + val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) + underTest.initialize() + val callback = withArgCaptor { verify(commandQueue).addCallback(capture()) } + + callback.handleSystemKey( + createKeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 0) + ) + callback.handleSystemKey( + createKeyEvent(ACTION_UP, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 50) + ) + callback.handleSystemKey( + createKeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 99, eventTime = 99) + ) + callback.handleSystemKey( + createKeyEvent(ACTION_UP, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 99, eventTime = 150) + ) + + verify(controller, times(1)).showNoteTask(any()) + } + + @Test + fun tailButtonGestureDetection_longPress_shouldNotShowNoteTask() { + val underTest = createUnderTest(isEnabled = true, bubbles = bubbles) + underTest.initialize() + val callback = withArgCaptor { verify(commandQueue).addCallback(capture()) } + + callback.handleSystemKey( + createKeyEvent(ACTION_DOWN, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 0) + ) + callback.handleSystemKey( + createKeyEvent(ACTION_UP, KEYCODE_STYLUS_BUTTON_TAIL, downTime = 0, eventTime = 1000) + ) + + verify(controller, never()).showNoteTask(any()) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt index 5e7f68ccf3d7..e5c55d8b6c56 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt @@ -168,7 +168,7 @@ class BluetoothTileTest : SysuiTestCase() { val btDevice = mock<BluetoothDevice>() whenever(cachedDevice2.device).thenReturn(btDevice) whenever(btDevice.getMetadata(BluetoothDevice.METADATA_MAIN_BATTERY)).thenReturn(null) - whenever(cachedDevice2.batteryLevel).thenReturn(25) + whenever(cachedDevice2.minBatteryLevelWithMemberDevices).thenReturn(25) addConnectedDevice(cachedDevice2) tile.handleUpdateState(state, /* arg= */ null) diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java index b00ae399af21..dd55baddc2d9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java @@ -395,7 +395,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { PendingIntent.getActivity(mContext, 0, mWalletIntent, PendingIntent.FLAG_IMMUTABLE); WalletCard walletCard = new WalletCard.Builder( - CARD_ID, mCardImage, CARD_DESCRIPTION, pendingIntent).build(); + CARD_ID, mCardImage, CARD_DESCRIPTION, pendingIntent).build(); GetWalletCardsResponse response = new GetWalletCardsResponse(Collections.singletonList(walletCard), 0); @@ -410,6 +410,22 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + public void testQueryCards_cardDataPayment_updateSideViewDrawable() { + when(mKeyguardStateController.isUnlocked()).thenReturn(true); + setUpWalletCardWithType(/* hasCard =*/ true, WalletCard.CARD_TYPE_PAYMENT); + + assertNotNull(mTile.getState().sideViewCustomDrawable); + } + + @Test + public void testQueryCards_cardDataNonPayment_updateSideViewDrawable() { + when(mKeyguardStateController.isUnlocked()).thenReturn(true); + setUpWalletCardWithType(/* hasCard =*/ true, WalletCard.CARD_TYPE_NON_PAYMENT); + + assertNull(mTile.getState().sideViewCustomDrawable); + } + + @Test public void testQueryCards_noCards_notUpdateSideViewDrawable() { setUpWalletCard(/* hasCard= */ false); @@ -438,6 +454,29 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { verifyZeroInteractions(mQuickAccessWalletClient); } + private WalletCard createWalletCardWithType(Context context, int cardType) { + PendingIntent pendingIntent = + PendingIntent.getActivity(context, 0, mWalletIntent, PendingIntent.FLAG_IMMUTABLE); + return new WalletCard.Builder(CARD_ID, cardType, CARD_IMAGE, CARD_DESCRIPTION, + pendingIntent).build(); + } + + private void setUpWalletCardWithType(boolean hasCard, int cardType) { + GetWalletCardsResponse response = + new GetWalletCardsResponse( + hasCard + ? Collections.singletonList( + createWalletCardWithType(mContext, cardType)) + : Collections.EMPTY_LIST, 0); + + mTile.handleSetListening(true); + + verify(mController).queryWalletCards(mCallbackCaptor.capture()); + + mCallbackCaptor.getValue().onWalletCardsRetrieved(response); + mTestableLooper.processAllMessages(); + } + private void setUpWalletCard(boolean hasCard) { GetWalletCardsResponse response = new GetWalletCardsResponse( diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManagerTest.kt new file mode 100644 index 000000000000..e38adeb0fcd9 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotifInflationErrorManagerTest.kt @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2023 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.notification.row + +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder +import com.android.systemui.statusbar.notification.row.NotifInflationErrorManager.NotifInflationErrorListener +import com.android.systemui.util.mockito.any +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify + +@SmallTest +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +class NotifInflationErrorManagerTest : SysuiTestCase() { + private lateinit var manager: NotifInflationErrorManager + + private val listener1 = mock(NotifInflationErrorListener::class.java) + private val listener2 = mock(NotifInflationErrorListener::class.java) + + private val foo: NotificationEntry = NotificationEntryBuilder().setPkg("foo").build() + private val bar: NotificationEntry = NotificationEntryBuilder().setPkg("bar").build() + private val baz: NotificationEntry = NotificationEntryBuilder().setPkg("baz").build() + + private val fooException = Exception("foo") + private val barException = Exception("bar") + + @Before + fun setUp() { + // Reset manager instance before each test. + manager = NotifInflationErrorManager() + } + + @Test + fun testTracksInflationErrors() { + manager.setInflationError(foo, fooException) + manager.setInflationError(bar, barException) + + assertThat(manager.hasInflationError(foo)).isTrue() + assertThat(manager.hasInflationError(bar)).isTrue() + assertThat(manager.hasInflationError(baz)).isFalse() + + manager.clearInflationError(bar) + + assertThat(manager.hasInflationError(bar)).isFalse() + } + + @Test + fun testNotifiesListeners() { + manager.addInflationErrorListener(listener1) + manager.setInflationError(foo, fooException) + + verify(listener1).onNotifInflationError(foo, fooException) + + manager.addInflationErrorListener(listener2) + manager.setInflationError(bar, barException) + + verify(listener1).onNotifInflationError(bar, barException) + verify(listener2).onNotifInflationError(bar, barException) + + manager.clearInflationError(foo) + + verify(listener1).onNotifInflationErrorCleared(foo) + verify(listener2).onNotifInflationErrorCleared(foo) + } + + @Test + fun testClearUnknownEntry() { + manager.addInflationErrorListener(listener1) + manager.clearInflationError(foo) + + verify(listener1, never()).onNotifInflationErrorCleared(any()) + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java index 6f431be29d73..79cf932a1880 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java @@ -628,6 +628,16 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { verify(mNotificationStackScrollLayout).updateEmptyShadeView(eq(false), anyBoolean()); } + @Test + public void updateEmptyShadeView_onKeyguardOccludedTransitionToAod_hidesView() { + initController(/* viewIsAttached= */ true); + mController.onKeyguardTransitionChanged( + new TransitionStep( + /* from= */ KeyguardState.OCCLUDED, + /* to= */ KeyguardState.AOD)); + verify(mNotificationStackScrollLayout).updateEmptyShadeView(eq(false), anyBoolean()); + } + private LogMaker logMatcher(int category, int type) { return argThat(new LogMatcher(category, type)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt index 0b31523e9b98..af0d6b41514a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt @@ -103,6 +103,21 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() { } @Test + fun onViewAttachedAndDrawn_startListeningConfigurationControllerCallback() { + val view = createViewMock() + val argumentCaptor = ArgumentCaptor.forClass( + ConfigurationController.ConfigurationListener::class.java) + InstrumentationRegistry.getInstrumentation().runOnMainSync { + controller = createAndInitController(view) + } + + verify(configurationController).addCallback(argumentCaptor.capture()) + argumentCaptor.value.onDensityOrFontScaleChanged() + + verify(view).onDensityOrFontScaleChanged() + } + + @Test fun onViewAttachedAndDrawn_moveFromCenterAnimationEnabled_moveFromCenterAnimationInitialized() { whenever(featureFlags.isEnabled(Flags.ENABLE_UNFOLD_STATUS_BAR_ANIMATIONS)) .thenReturn(true) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt index a0d4d1390b2c..bbf048d6697f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt @@ -22,6 +22,7 @@ import android.testing.TestableLooper import android.testing.TestableLooper.RunWithLooper import android.testing.ViewUtils import android.view.View +import android.view.ViewGroup import android.widget.ImageView import androidx.test.filters.SmallTest import com.android.systemui.R @@ -138,7 +139,7 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { ViewUtils.attachView(view) testableLooper.processAllMessages() - assertThat(view.getIconGroupView().visibility).isEqualTo(View.GONE) + assertThat(view.getIconGroupView().visibility).isEqualTo(View.INVISIBLE) assertThat(view.getDotView().visibility).isEqualTo(View.VISIBLE) ViewUtils.detachView(view) @@ -153,8 +154,36 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { ViewUtils.attachView(view) testableLooper.processAllMessages() - assertThat(view.getIconGroupView().visibility).isEqualTo(View.GONE) - assertThat(view.getDotView().visibility).isEqualTo(View.GONE) + assertThat(view.getIconGroupView().visibility).isEqualTo(View.INVISIBLE) + assertThat(view.getDotView().visibility).isEqualTo(View.INVISIBLE) + + ViewUtils.detachView(view) + } + + /* Regression test for b/296864006. When STATE_HIDDEN we need to ensure the wifi view width + * would not break the StatusIconContainer translation calculation. */ + @Test + fun setVisibleState_hidden_keepWidth() { + val view = ModernStatusBarWifiView.constructAndBind(context, SLOT_NAME, viewModel) + + view.setVisibleState(STATE_ICON, /* animate= */ false) + + // get the view width when it's in visible state + ViewUtils.attachView(view) + val lp = view.layoutParams + lp.width = ViewGroup.LayoutParams.WRAP_CONTENT + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT + view.layoutParams = lp + testableLooper.processAllMessages() + val currentWidth = view.width + + view.setVisibleState(STATE_HIDDEN, /* animate= */ false) + testableLooper.processAllMessages() + + // the view width when STATE_HIDDEN should be at least the width when STATE_ICON. Because + // when STATE_HIDDEN the invisible dot view width might be larger than group view width, + // then the wifi view width would be enlarged. + assertThat(view.width).isAtLeast(currentWidth) ViewUtils.detachView(view) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java index a82088285e84..33deb6546d15 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java @@ -41,9 +41,11 @@ import static org.mockito.Mockito.when; import android.app.KeyguardManager; import android.content.res.Configuration; import android.media.AudioManager; +import android.os.Handler; import android.os.SystemClock; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; +import android.util.Log; import android.view.Gravity; import android.view.InputDevice; import android.view.MotionEvent; @@ -98,6 +100,8 @@ public class VolumeDialogImplTest extends SysuiTestCase { private ConfigurationController mConfigurationController; private int mOriginalOrientation; + private static final String TAG = "VolumeDialogImplTest"; + @Mock VolumeDialogController mVolumeDialogController; @Mock @@ -143,6 +147,10 @@ public class VolumeDialogImplTest extends SysuiTestCase { mTestableLooper = TestableLooper.get(this); allowTestableLooperAsMainThread(); + // Ensure previous tests have not left messages on main looper + Handler localHandler = new Handler(mTestableLooper.getLooper()); + localHandler.removeCallbacksAndMessages(null); + when(mPostureController.getDevicePosture()) .thenReturn(DevicePostureController.DEVICE_POSTURE_CLOSED); @@ -652,12 +660,20 @@ public class VolumeDialogImplTest extends SysuiTestCase { @After public void teardown() { + // Detailed logs to track down timeout issues in b/299491332 + Log.d(TAG, "teardown: entered"); setOrientation(mOriginalOrientation); + Log.d(TAG, "teardown: after setOrientation"); mAnimatorTestRule.advanceTimeBy(mLongestHideShowAnimationDuration); + Log.d(TAG, "teardown: after advanceTimeBy"); mTestableLooper.moveTimeForward(mLongestHideShowAnimationDuration); + Log.d(TAG, "teardown: after moveTimeForward"); mTestableLooper.processAllMessages(); + Log.d(TAG, "teardown: after processAllMessages"); reset(mPostureController); + Log.d(TAG, "teardown: after reset"); cleanUp(mDialog); + Log.d(TAG, "teardown: after cleanUp"); } private void cleanUp(VolumeDialogImpl dialog) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java index 692af6a9a37b..c1d11aa1eb89 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallet/ui/WalletScreenControllerTest.java @@ -459,7 +459,7 @@ public class WalletScreenControllerTest extends SysuiTestCase { WalletCard.CARD_TYPE_UNKNOWN), createWalletCardWithType(mContext, WalletCard.CARD_TYPE_PAYMENT), createWalletCardWithType(mContext, WalletCard.CARD_TYPE_NON_PAYMENT) - ); + ); GetWalletCardsResponse response = new GetWalletCardsResponse(walletCardList, 0); mController.onWalletCardsRetrieved(response); mTestableLooper.processAllMessages(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallet/util/WalletCardUtilsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/wallet/util/WalletCardUtilsTest.kt new file mode 100644 index 000000000000..e46c1f554dd6 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/wallet/util/WalletCardUtilsTest.kt @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 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.wallet.util + +import android.service.quickaccesswallet.WalletCard +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper.RunWithLooper +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.util.mockito.mock +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +/** Test class for WalletCardUtils */ +@RunWith(AndroidTestingRunner::class) +@RunWithLooper +@SmallTest +class WalletCardUtilsTest : SysuiTestCase() { + + private val paymentCard = createWalletCardWithType(WalletCard.CARD_TYPE_PAYMENT) + private val nonPaymentCard = createWalletCardWithType(WalletCard.CARD_TYPE_NON_PAYMENT) + private val unknownCard = createWalletCardWithType(WalletCard.CARD_TYPE_UNKNOWN) + + @Test + fun paymentCards_cardTypesAllUnknown_getsAllCards() { + val walletCardList = + mutableListOf( + createWalletCardWithType(WalletCard.CARD_TYPE_UNKNOWN), + createWalletCardWithType(WalletCard.CARD_TYPE_UNKNOWN), + createWalletCardWithType(WalletCard.CARD_TYPE_UNKNOWN) + ) + + assertThat(walletCardList).isEqualTo(getPaymentCards(walletCardList)) + } + + @Test + fun paymentCards_cardTypesDifferent_onlyGetsPayment() { + val walletCardList = mutableListOf(paymentCard, nonPaymentCard, unknownCard) + + assertThat(getPaymentCards(walletCardList)).isEqualTo(mutableListOf(paymentCard)) + } + + private fun createWalletCardWithType(cardType: Int): WalletCard { + return WalletCard.Builder( + /*cardId= */ CARD_ID, + /*cardType= */ cardType, + /*cardImage= */ mock(), + /*contentDescription= */ CARD_DESCRIPTION, + /*pendingIntent= */ mock() + ) + .build() + } + + companion object { + private const val CARD_ID: String = "ID" + private const val CARD_DESCRIPTION: String = "Description" + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeRearDisplayStateRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeDisplayStateRepository.kt index fd9139165c85..60291eece70b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeRearDisplayStateRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeDisplayStateRepository.kt @@ -17,15 +17,23 @@ package com.android.systemui.biometrics.data.repository +import com.android.systemui.biometrics.shared.model.DisplayRotation import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -class FakeRearDisplayStateRepository : RearDisplayStateRepository { +class FakeDisplayStateRepository : DisplayStateRepository { private val _isInRearDisplayMode = MutableStateFlow<Boolean>(false) override val isInRearDisplayMode: StateFlow<Boolean> = _isInRearDisplayMode.asStateFlow() + private val _currentRotation = MutableStateFlow<DisplayRotation>(DisplayRotation.ROTATION_0) + override val currentRotation: StateFlow<DisplayRotation> = _currentRotation.asStateFlow() + fun setIsInRearDisplayMode(isInRearDisplayMode: Boolean) { _isInRearDisplayMode.value = isInRearDisplayMode } + + fun setCurrentRotation(currentRotation: DisplayRotation) { + _currentRotation.value = currentRotation + } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeFingerprintPropertyRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeFingerprintPropertyRepository.kt index 2362a5241244..0c5e43809fab 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeFingerprintPropertyRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/biometrics/data/repository/FakeFingerprintPropertyRepository.kt @@ -20,16 +20,12 @@ import android.hardware.biometrics.SensorLocationInternal import com.android.systemui.biometrics.shared.model.FingerprintSensorType import com.android.systemui.biometrics.shared.model.SensorStrength import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow class FakeFingerprintPropertyRepository : FingerprintPropertyRepository { - private val _isInitialized: MutableStateFlow<Boolean> = MutableStateFlow(false) - override val isInitialized = _isInitialized.asStateFlow() - private val _sensorId: MutableStateFlow<Int> = MutableStateFlow(-1) - override val sensorId: StateFlow<Int> = _sensorId.asStateFlow() + override val sensorId = _sensorId.asStateFlow() private val _strength: MutableStateFlow<SensorStrength> = MutableStateFlow(SensorStrength.CONVENIENCE) @@ -37,12 +33,11 @@ class FakeFingerprintPropertyRepository : FingerprintPropertyRepository { private val _sensorType: MutableStateFlow<FingerprintSensorType> = MutableStateFlow(FingerprintSensorType.UNKNOWN) - override val sensorType: StateFlow<FingerprintSensorType> = _sensorType.asStateFlow() + override val sensorType = _sensorType.asStateFlow() private val _sensorLocations: MutableStateFlow<Map<String, SensorLocationInternal>> = MutableStateFlow(mapOf("" to SensorLocationInternal.DEFAULT)) - override val sensorLocations: StateFlow<Map<String, SensorLocationInternal>> = - _sensorLocations.asStateFlow() + override val sensorLocations = _sensorLocations.asStateFlow() fun setProperties( sensorId: Int, @@ -54,6 +49,5 @@ class FakeFingerprintPropertyRepository : FingerprintPropertyRepository { _strength.value = strength _sensorType.value = sensorType _sensorLocations.value = sensorLocations - _isInitialized.value = true } } diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java index 038847e2a759..e1c4aad66559 100644 --- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java +++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java @@ -177,7 +177,8 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH } if (!activated) { - clearAndTransitionToStateDetecting(); + // cancel the magnification shortcut + mDetectingState.setShortcutTriggered(false); } } diff --git a/services/backup/java/com/android/server/backup/TransportManager.java b/services/backup/java/com/android/server/backup/TransportManager.java index 05327dcc7903..a792db0f7c78 100644 --- a/services/backup/java/com/android/server/backup/TransportManager.java +++ b/services/backup/java/com/android/server/backup/TransportManager.java @@ -738,6 +738,9 @@ public class TransportManager { try { String transportName = transport.name(); String transportDirName = transport.transportDirName(); + if (transportName == null || transportDirName == null) { + return BackupManager.ERROR_TRANSPORT_INVALID; + } registerTransport(transportComponent, transport); // If registerTransport() hasn't thrown... Slog.d(TAG, addUserIdToLogMessage(mUserId, "Transport " + transportString diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 9d6283b85bd4..2511b50c2106 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -64,6 +64,7 @@ import android.companion.IOnAssociationsChangedListener; import android.companion.IOnMessageReceivedListener; import android.companion.IOnTransportsChangedListener; import android.companion.ISystemDataTransferCallback; +import android.companion.datatransfer.PermissionSyncRequest; import android.companion.utils.FeatureUtils; import android.content.ComponentName; import android.content.Context; @@ -794,6 +795,24 @@ public class CompanionDeviceManagerService extends SystemService { } @Override + public void enablePermissionsSync(int associationId) { + getAssociationWithCallerChecks(associationId); + mSystemDataTransferProcessor.enablePermissionsSync(associationId); + } + + @Override + public void disablePermissionsSync(int associationId) { + getAssociationWithCallerChecks(associationId); + mSystemDataTransferProcessor.disablePermissionsSync(associationId); + } + + @Override + public PermissionSyncRequest getPermissionSyncRequest(int associationId) { + getAssociationWithCallerChecks(associationId); + return mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + } + + @Override public void enableSecureTransport(boolean enabled) { mTransportManager.enableSecureTransport(enabled); } @@ -934,7 +953,7 @@ public class CompanionDeviceManagerService extends SystemService { String[] args, ShellCallback callback, ResultReceiver resultReceiver) throws RemoteException { new CompanionDeviceShellCommand(CompanionDeviceManagerService.this, mAssociationStore, - mDevicePresenceMonitor, mTransportManager, mSystemDataTransferRequestStore, + mDevicePresenceMonitor, mTransportManager, mSystemDataTransferProcessor, mAssociationRequestsProcessor) .exec(this, in, out, err, args, callback, resultReceiver); } diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java index 04fbab434d1f..d56436b17689 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java @@ -25,7 +25,7 @@ import android.os.Binder; import android.os.ShellCommand; import android.util.proto.ProtoOutputStream; -import com.android.server.companion.datatransfer.SystemDataTransferRequestStore; +import com.android.server.companion.datatransfer.SystemDataTransferProcessor; import com.android.server.companion.datatransfer.contextsync.BitmapUtils; import com.android.server.companion.datatransfer.contextsync.CrossDeviceSyncController; import com.android.server.companion.presence.CompanionDevicePresenceMonitor; @@ -43,20 +43,20 @@ class CompanionDeviceShellCommand extends ShellCommand { private final CompanionDevicePresenceMonitor mDevicePresenceMonitor; private final CompanionTransportManager mTransportManager; - private final SystemDataTransferRequestStore mSystemDataTransferRequestStore; + private final SystemDataTransferProcessor mSystemDataTransferProcessor; private final AssociationRequestsProcessor mAssociationRequestsProcessor; CompanionDeviceShellCommand(CompanionDeviceManagerService service, AssociationStoreImpl associationStore, CompanionDevicePresenceMonitor devicePresenceMonitor, CompanionTransportManager transportManager, - SystemDataTransferRequestStore systemDataTransferRequestStore, + SystemDataTransferProcessor systemDataTransferProcessor, AssociationRequestsProcessor associationRequestsProcessor) { mService = service; mAssociationStore = associationStore; mDevicePresenceMonitor = devicePresenceMonitor; mTransportManager = transportManager; - mSystemDataTransferRequestStore = systemDataTransferRequestStore; + mSystemDataTransferProcessor = systemDataTransferProcessor; mAssociationRequestsProcessor = associationRequestsProcessor; } @@ -265,16 +265,47 @@ class CompanionDeviceShellCommand extends ShellCommand { break; } - case "allow-permission-sync": { - int userId = getNextIntArgRequired(); + case "get-perm-sync-state": { associationId = getNextIntArgRequired(); - boolean enabled = getNextBooleanArgRequired(); - PermissionSyncRequest request = new PermissionSyncRequest(associationId); - request.setUserId(userId); - request.setUserConsented(enabled); - mSystemDataTransferRequestStore.writeRequest(userId, request); + PermissionSyncRequest request = + mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.println((request == null ? "null" : request.isUserConsented())); + break; + } + + case "remove-perm-sync-state": { + associationId = getNextIntArgRequired(); + PermissionSyncRequest request = + mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.print((request == null ? "null" : request.isUserConsented())); + mSystemDataTransferProcessor.removePermissionSyncRequest(associationId); + request = mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + // should print " -> null" + out.println(" -> " + (request == null ? "null" : request.isUserConsented())); + break; + } + + case "enable-perm-sync": { + associationId = getNextIntArgRequired(); + PermissionSyncRequest request = + mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.print((request == null ? "null" : request.isUserConsented())); + mSystemDataTransferProcessor.enablePermissionsSync(associationId); + request = mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.println(" -> " + request.isUserConsented()); // should print " -> true" + break; + } + + case "disable-perm-sync": { + associationId = getNextIntArgRequired(); + PermissionSyncRequest request = + mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.print((request == null ? "null" : request.isUserConsented())); + mSystemDataTransferProcessor.disablePermissionsSync(associationId); + request = mSystemDataTransferProcessor.getPermissionSyncRequest(associationId); + out.println(" -> " + request.isUserConsented()); // should print " -> false" + break; } - break; default: return handleDefaultCommands(cmd); @@ -346,5 +377,14 @@ class CompanionDeviceShellCommand extends ShellCommand { pw.println(" create-emulated-transport <ASSOCIATION_ID>"); pw.println(" Create an EmulatedTransport for testing purposes only"); + + pw.println(" enable-perm-sync <ASSOCIATION_ID>"); + pw.println(" Enable perm sync for the association."); + pw.println(" disable-perm-sync <ASSOCIATION_ID>"); + pw.println(" Disable perm sync for the association."); + pw.println(" get-perm-sync-state <ASSOCIATION_ID>"); + pw.println(" Get perm sync state for the association."); + pw.println(" remove-perm-sync-state <ASSOCIATION_ID>"); + pw.println(" Remove perm sync state for the association."); } } diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java index 800a3d9f6852..aeb273be0207 100644 --- a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java @@ -138,6 +138,13 @@ public class SystemDataTransferProcessor { @UserIdInt int userId, int associationId) { if (PackageUtils.isPackageAllowlisted(mContext, mPackageManager, packageName)) { Slog.i(LOG_TAG, "User consent Intent should be skipped. Returning null."); + // Auto enable perm sync for the allowlisted packages, but don't override user decision + PermissionSyncRequest request = getPermissionSyncRequest(associationId); + if (request == null) { + PermissionSyncRequest newRequest = new PermissionSyncRequest(associationId); + newRequest.setUserConsented(true); + mSystemDataTransferRequestStore.writeRequest(userId, newRequest); + } return null; } @@ -184,29 +191,17 @@ public class SystemDataTransferProcessor { final AssociationInfo association = resolveAssociation(packageName, userId, associationId); // Check if the request has been consented by the user. - if (PackageUtils.isPackageAllowlisted(mContext, mPackageManager, packageName)) { - Slog.i(LOG_TAG, "Skip user consent check due to the same OEM package."); - } else { - List<SystemDataTransferRequest> storedRequests = - mSystemDataTransferRequestStore.readRequestsByAssociationId(userId, - associationId); - boolean hasConsented = false; - for (SystemDataTransferRequest storedRequest : storedRequests) { - if (storedRequest instanceof PermissionSyncRequest - && storedRequest.isUserConsented()) { - hasConsented = true; - break; - } - } - if (!hasConsented) { - String message = "User " + userId + " hasn't consented permission sync."; - Slog.e(LOG_TAG, message); - try { - callback.onError(message); - } catch (RemoteException ignored) { - } - return; + PermissionSyncRequest request = getPermissionSyncRequest(associationId); + if (request == null || !request.isUserConsented()) { + String message = + "User " + userId + " hasn't consented permission sync for associationId [" + + associationId + "."; + Slog.e(LOG_TAG, message); + try { + callback.onError(message); + } catch (RemoteException ignored) { } + return; } // Start permission sync @@ -224,6 +219,66 @@ public class SystemDataTransferProcessor { } } + /** + * Enable perm sync for the association + */ + public void enablePermissionsSync(int associationId) { + final long callingIdentityToken = Binder.clearCallingIdentity(); + try { + int userId = mAssociationStore.getAssociationById(associationId).getUserId(); + PermissionSyncRequest request = new PermissionSyncRequest(associationId); + request.setUserConsented(true); + mSystemDataTransferRequestStore.writeRequest(userId, request); + } finally { + Binder.restoreCallingIdentity(callingIdentityToken); + } + } + + /** + * Disable perm sync for the association + */ + public void disablePermissionsSync(int associationId) { + final long callingIdentityToken = Binder.clearCallingIdentity(); + try { + int userId = mAssociationStore.getAssociationById(associationId).getUserId(); + PermissionSyncRequest request = new PermissionSyncRequest(associationId); + request.setUserConsented(false); + mSystemDataTransferRequestStore.writeRequest(userId, request); + } finally { + Binder.restoreCallingIdentity(callingIdentityToken); + } + } + + /** + * Get perm sync request for the association. + */ + @Nullable + public PermissionSyncRequest getPermissionSyncRequest(int associationId) { + final long callingIdentityToken = Binder.clearCallingIdentity(); + try { + int userId = mAssociationStore.getAssociationById(associationId).getUserId(); + List<SystemDataTransferRequest> requests = + mSystemDataTransferRequestStore.readRequestsByAssociationId(userId, + associationId); + for (SystemDataTransferRequest request : requests) { + if (request instanceof PermissionSyncRequest) { + return (PermissionSyncRequest) request; + } + } + return null; + } finally { + Binder.restoreCallingIdentity(callingIdentityToken); + } + } + + /** + * Remove perm sync request for the association. + */ + public void removePermissionSyncRequest(int associationId) { + int userId = mAssociationStore.getAssociationById(associationId).getUserId(); + mSystemDataTransferRequestStore.removeRequestsByAssociationId(userId, associationId); + } + private void onReceivePermissionRestore(byte[] message) { Slog.i(LOG_TAG, "Applying permissions."); // Start applying permissions diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java index 720cefa11d7c..9f489e8d613a 100644 --- a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java @@ -104,7 +104,7 @@ public class SystemDataTransferRequestStore { } @NonNull - List<SystemDataTransferRequest> readRequestsByAssociationId(@UserIdInt int userId, + public List<SystemDataTransferRequest> readRequestsByAssociationId(@UserIdInt int userId, int associationId) { List<SystemDataTransferRequest> cachedRequests; synchronized (mLock) { diff --git a/services/core/java/com/android/server/LogMteState.java b/services/core/java/com/android/server/LogMteState.java index 410dd8339b30..ec0492b19f89 100644 --- a/services/core/java/com/android/server/LogMteState.java +++ b/services/core/java/com/android/server/LogMteState.java @@ -16,11 +16,12 @@ package com.android.server; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; + import android.app.StatsManager; import android.content.Context; import android.util.StatsEvent; -import com.android.internal.os.BackgroundThread; import com.android.internal.os.Zygote; import com.android.internal.util.FrameworkStatsLog; @@ -32,7 +33,7 @@ public class LogMteState { .setPullAtomCallback( FrameworkStatsLog.MTE_STATE, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, new StatsManager.StatsPullAtomCallback() { @Override public int onPullAtom(int atomTag, List<StatsEvent> data) { diff --git a/services/core/java/com/android/server/SmartStorageMaintIdler.java b/services/core/java/com/android/server/SmartStorageMaintIdler.java index 899692611086..44f1e76f7a22 100644 --- a/services/core/java/com/android/server/SmartStorageMaintIdler.java +++ b/services/core/java/com/android/server/SmartStorageMaintIdler.java @@ -25,6 +25,7 @@ import android.content.Context; import android.util.Slog; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; public class SmartStorageMaintIdler extends JobService { private static final String TAG = "SmartStorageMaintIdler"; @@ -34,15 +35,15 @@ public class SmartStorageMaintIdler extends JobService { private static final int SMART_MAINT_JOB_ID = 2808; - private boolean mStarted; + private final AtomicBoolean mStarted = new AtomicBoolean(false); private JobParameters mJobParams; private final Runnable mFinishCallback = new Runnable() { @Override public void run() { Slog.i(TAG, "Got smart storage maintenance service completion callback"); - if (mStarted) { + if (mStarted.get()) { jobFinished(mJobParams, false); - mStarted = false; + mStarted.set(false); } // ... and try again in a next period scheduleSmartIdlePass(SmartStorageMaintIdler.this, @@ -52,18 +53,26 @@ public class SmartStorageMaintIdler extends JobService { @Override public boolean onStartJob(JobParameters params) { - mJobParams = params; - StorageManagerService ms = StorageManagerService.sSelf; - if (ms != null) { - mStarted = true; - ms.runSmartIdleMaint(mFinishCallback); + final StorageManagerService ms = StorageManagerService.sSelf; + if (mStarted.compareAndSet(false, true)) { + new Thread() { + public void run() { + mJobParams = params; + if (ms != null) { + ms.runSmartIdleMaint(mFinishCallback); + } else { + mStarted.set(false); + } + } + }.start(); + return ms != null; } - return ms != null; + return false; } @Override public boolean onStopJob(JobParameters params) { - mStarted = false; + mStarted.set(false); return false; } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index d47573d52767..2606757e008d 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -2771,7 +2771,7 @@ class StorageManagerService extends IStorageManager.Stub return true; } - void runSmartIdleMaint(Runnable callback) { + synchronized void runSmartIdleMaint(Runnable callback) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); try { diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 66ea4d06d2b7..592628af2a8d 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -97,6 +97,11 @@ import static android.os.Process.SYSTEM_UID; import static android.os.Process.ZYGOTE_POLICY_FLAG_EMPTY; import static com.android.internal.messages.nano.SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICE_BG_LAUNCH; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_DELEGATE; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NONE; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_START_FOREGROUND_SERVICE; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_START_SERVICE; import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED; import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER; import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT; @@ -122,6 +127,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import android.Manifest; +import android.Manifest.permission; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -901,7 +907,10 @@ public final class ActiveServices { showFgsBgRestrictedNotificationLocked(r); logFGSStateChangeLocked(r, FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED, - 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN); + 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); if (CompatChanges.isChangeEnabled(FGS_START_EXCEPTION_CHANGE_ID, callingUid)) { throw new ForegroundServiceStartNotAllowedException(msg); } @@ -2066,6 +2075,7 @@ public final class ActiveServices { boolean alreadyStartedOp = false; boolean stopProcStatsOp = false; + final boolean origFgRequired = r.fgRequired; if (r.fgRequired) { if (DEBUG_SERVICE || DEBUG_BACKGROUND_CHECK) { Slog.i(TAG, "Service called startForeground() as required: " + r); @@ -2117,6 +2127,9 @@ public final class ActiveServices { // Whether to extend the SHORT_SERVICE time out. boolean extendShortServiceTimeout = false; + // Whether setFgsRestrictionLocked() is called in here. Only used for logging. + boolean fgsRestrictionRecalculated = false; + int fgsTypeCheckCode = FGS_TYPE_POLICY_CHECK_UNKNOWN; if (!ignoreForeground) { if (foregroundServiceType == FOREGROUND_SERVICE_TYPE_SHORT_SERVICE @@ -2182,6 +2195,7 @@ public final class ActiveServices { r.appInfo.uid, r.intent.getIntent(), r, r.userId, BackgroundStartPrivileges.NONE, false /* isBindService */); + fgsRestrictionRecalculated = true; if (!r.isFgsAllowedStart()) { Slog.w(TAG_SERVICE, "FGS type change to/from SHORT_SERVICE: " + " BFSL DENIED."); @@ -2246,6 +2260,7 @@ public final class ActiveServices { r.appInfo.uid, r.intent.getIntent(), r, r.userId, BackgroundStartPrivileges.NONE, false /* isBindService */); + fgsRestrictionRecalculated = true; final String temp = "startForegroundDelayMs:" + delayMs; if (r.mInfoAllowStartForeground != null) { r.mInfoAllowStartForeground += "; " + temp; @@ -2266,6 +2281,25 @@ public final class ActiveServices { r.appInfo.uid, r.intent.getIntent(), r, r.userId, BackgroundStartPrivileges.NONE, false /* isBindService */); + fgsRestrictionRecalculated = true; + } + + // When startForeground() is called on a bound service, without having + // it started (i.e. no Context.startService() or startForegroundService() was + // called.) + // called on it, then we probably didn't call setFgsRestrictionLocked() + // in startService(). If fgsRestrictionRecalculated is false, then we + // didn't call setFgsRestrictionLocked() here either. + // + // In this situation, we call setFgsRestrictionLocked() with + // forBoundFgs = false, so we'd set the FGS allowed reason to the + // by-bindings fields, so we can put it in the log, without affecting the + // logic. + if (!fgsRestrictionRecalculated && !r.startRequested) { + setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.getPid(), + r.appInfo.uid, r.intent.getIntent(), r, r.userId, + BackgroundStartPrivileges.NONE, + false /* isBindService */, true /* forBoundFgs */); } // If the foreground service is not started from TOP process, do not allow it to @@ -2291,7 +2325,10 @@ public final class ActiveServices { ignoreForeground = true; logFGSStateChangeLocked(r, FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED, - 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN); + 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); if (CompatChanges.isChangeEnabled(FGS_START_EXCEPTION_CHANGE_ID, r.appInfo.uid)) { throw new ForegroundServiceStartNotAllowedException(msg); @@ -2331,7 +2368,10 @@ public final class ActiveServices { if (fgsTypeResult.second != null) { logFGSStateChangeLocked(r, FOREGROUND_SERVICE_STATE_CHANGED__STATE__DENIED, - 0, FGS_STOP_REASON_UNKNOWN, fgsTypeResult.first); + 0, FGS_STOP_REASON_UNKNOWN, fgsTypeResult.first, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); throw fgsTypeResult.second; } } @@ -2403,9 +2443,24 @@ public final class ActiveServices { AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE); registerAppOpCallbackLocked(r); mAm.updateForegroundServiceUsageStats(r.name, r.userId, true); + + int fgsStartApi = FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NONE; + if (r.startRequested) { + if (origFgRequired) { + fgsStartApi = + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_START_FOREGROUND_SERVICE; + } else { + fgsStartApi = + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_START_SERVICE; + } + } + logFGSStateChangeLocked(r, FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER, - 0, FGS_STOP_REASON_UNKNOWN, fgsTypeCheckCode); + 0, FGS_STOP_REASON_UNKNOWN, fgsTypeCheckCode, + fgsStartApi, + fgsRestrictionRecalculated + ); synchronized (mFGSLogger) { mFGSLogger.logForegroundServiceStart(r.appInfo.uid, 0, r); } @@ -2499,7 +2554,10 @@ public final class ActiveServices { r.mFgsExitTime > r.mFgsEnterTime ? (int) (r.mFgsExitTime - r.mFgsEnterTime) : 0, FGS_STOP_REASON_STOP_FOREGROUND, - FGS_TYPE_POLICY_CHECK_UNKNOWN); + FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); synchronized (mFGSLogger) { mFGSLogger.logForegroundServiceStop(r.appInfo.uid, r); @@ -3338,7 +3396,10 @@ public final class ActiveServices { FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT, nowUptime > sr.mFgsEnterTime ? (int) (nowUptime - sr.mFgsEnterTime) : 0, FGS_STOP_REASON_UNKNOWN, - FGS_TYPE_POLICY_CHECK_UNKNOWN); + FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); try { sr.app.getThread().scheduleTimeoutService(sr, sr.getShortFgsInfo().getStartId()); } catch (RemoteException e) { @@ -5685,7 +5746,10 @@ public final class ActiveServices { r.mFgsExitTime > r.mFgsEnterTime ? (int) (r.mFgsExitTime - r.mFgsEnterTime) : 0, FGS_STOP_REASON_STOP_SERVICE, - FGS_TYPE_POLICY_CHECK_UNKNOWN); + FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false /* fgsRestrictionRecalculated */ + ); synchronized (mFGSLogger) { mFGSLogger.logForegroundServiceStop(r.appInfo.uid, r); } @@ -7430,6 +7494,13 @@ public final class ActiveServices { } } + private void setFgsRestrictionLocked(String callingPackage, + int callingPid, int callingUid, Intent intent, ServiceRecord r, int userId, + BackgroundStartPrivileges backgroundStartPrivileges, boolean isBindService) { + setFgsRestrictionLocked(callingPackage, callingPid, callingUid, intent, r, userId, + backgroundStartPrivileges, isBindService, /*forBoundFgs*/ false); + } + /** * There are two FGS restrictions: * In R, mAllowWhileInUsePermissionInFgs is to allow while-in-use permissions in foreground @@ -7441,11 +7512,14 @@ public final class ActiveServices { * @param intent intent to start/bind service. * @param r the service to start. * @param isBindService True if it's called from bindService(). + * @param forBoundFgs set to true if it's called from Service.startForeground() for a + * service that's not started but bound. * @return true if allow, false otherwise. */ private void setFgsRestrictionLocked(String callingPackage, int callingPid, int callingUid, Intent intent, ServiceRecord r, int userId, - BackgroundStartPrivileges backgroundStartPrivileges, boolean isBindService) { + BackgroundStartPrivileges backgroundStartPrivileges, boolean isBindService, + boolean forBoundFgs) { @ReasonCode int allowWIU; @ReasonCode int allowStart; @@ -7489,9 +7563,19 @@ public final class ActiveServices { r.mAllowWIUInBindService = allowWIU; r.mAllowStartInBindService = allowStart; } else { - r.mAllowWhileInUsePermissionInFgsReasonNoBinding = allowWIU; - r.mAllowStartForegroundNoBinding = allowStart; - + if (!forBoundFgs) { + // This is for "normal" situation. + r.mAllowWhileInUsePermissionInFgsReasonNoBinding = allowWIU; + r.mAllowStartForegroundNoBinding = allowStart; + } else { + // This logic is only for logging, so we only update the "by-binding" fields. + if (r.mAllowWIUByBindings == REASON_DENIED) { + r.mAllowWIUByBindings = allowWIU; + } + if (r.mAllowStartByBindings == REASON_DENIED) { + r.mAllowStartByBindings = allowStart; + } + } // Also do a binding client check, unless called from bindService(). if (r.mAllowWIUByBindings == REASON_DENIED) { r.mAllowWIUByBindings = @@ -8115,7 +8199,10 @@ public final class ActiveServices { */ private void logFGSStateChangeLocked(ServiceRecord r, int state, int durationMs, @FgsStopReason int fgsStopReason, - @ForegroundServicePolicyCheckCode int fgsTypeCheckCode) { + @ForegroundServicePolicyCheckCode int fgsTypeCheckCode, + int fgsStartApi, // from ForegroundServiceStateChanged.FgsStartApi + boolean fgsRestrictionRecalculated + ) { if (!ActivityManagerUtils.shouldSamplePackageForAtom( r.packageName, mAm.mConstants.mFgsAtomSampleRate)) { return; @@ -8172,7 +8259,9 @@ public final class ActiveServices { r.mAllowWIUByBindings, r.mAllowStartForegroundNoBinding, r.mAllowStartInBindService, - r.mAllowStartByBindings); + r.mAllowStartByBindings, + fgsStartApi, + fgsRestrictionRecalculated); int event = 0; if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER) { @@ -8351,7 +8440,10 @@ public final class ActiveServices { } logFGSStateChangeLocked(r, FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER, - 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN); + 0, FGS_STOP_REASON_UNKNOWN, FGS_TYPE_POLICY_CHECK_UNKNOWN, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_DELEGATE, + false /* fgsRestrictionRecalculated */ + ); // Notify the caller. if (connection != null) { mAm.mHandler.post(() -> { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 967177219475..47abc1092c49 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -314,6 +314,7 @@ import android.net.ConnectivityManager; import android.net.Proxy; import android.net.Uri; import android.os.AppZygote; +import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Binder; import android.os.BinderProxy; @@ -15029,6 +15030,16 @@ public class ActivityManagerService extends IActivityManager.Stub } } + // STOPSHIP(b/298884211): Remove this logging + if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) { + final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); + if (level < 0) { + Slog.wtf(BroadcastQueue.TAG, "Unexpected broadcast: " + intent + + "; callingUid: " + callingUid + ", callingPid: " + callingPid, + new Throwable()); + } + } + int[] users; if (userId == UserHandle.USER_ALL) { // Caller wants broadcast to go to all started users. @@ -16756,7 +16767,7 @@ public class ActivityManagerService extends IActivityManager.Stub for (int i = 0; i < N; i++) { PendingTempAllowlist ptw = list[i]; mLocalDeviceIdleController.addPowerSaveTempWhitelistAppDirect(ptw.targetUid, - ptw.duration, ptw.type, true, ptw.reasonCode, ptw.tag, + ptw.duration, ptw.type, false, ptw.reasonCode, ptw.tag, ptw.callingUid); } } diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 2c745ae3bf55..be123f36ebcc 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -27,6 +27,8 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK; import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; + import android.annotation.EnforcePermission; import android.annotation.NonNull; import android.annotation.RequiresNoPermission; @@ -95,7 +97,6 @@ import android.util.StatsEvent; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IBatteryStats; -import com.android.internal.os.BackgroundThread; import com.android.internal.os.BinderCallsStats; import com.android.internal.os.PowerProfile; import com.android.internal.os.RailStats; @@ -839,15 +840,15 @@ public final class BatteryStatsService extends IBatteryStats.Stub statsManager.setPullAtomCallback( FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), pullAtomCallback); + DIRECT_EXECUTOR, pullAtomCallback); statsManager.setPullAtomCallback( FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), pullAtomCallback); + DIRECT_EXECUTOR, pullAtomCallback); statsManager.setPullAtomCallback( FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), pullAtomCallback); + DIRECT_EXECUTOR, pullAtomCallback); } /** StatsPullAtomCallback for pulling BatteryUsageStats data. */ diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java index 5d0fefc75a28..d5343a9777a7 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java @@ -59,6 +59,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.BatteryManager; import android.os.Bundle; import android.os.BundleMerger; import android.os.Handler; @@ -1074,6 +1075,16 @@ class BroadcastQueueModernImpl extends BroadcastQueue { queue.lastProcessState = app.mState.getCurProcState(); if (receiver instanceof BroadcastFilter) { notifyScheduleRegisteredReceiver(app, r, (BroadcastFilter) receiver); + // STOPSHIP(b/298884211): Remove this logging + if (Intent.ACTION_BATTERY_CHANGED.equals(receiverIntent.getAction())) { + int level = receiverIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); + if (level < 0) { + Slog.wtf(TAG, "Dispatching unexpected broadcast: " + receiverIntent + + " to " + receiver + + "; callingUid: " + r.callingUid + + ", callingPid: " + r.callingPid); + } + } thread.scheduleRegisteredReceiver( ((BroadcastFilter) receiver).receiverList.receiver, receiverIntent, r.resultCode, r.resultData, r.resultExtras, diff --git a/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java b/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java index f6859d1f027e..caafb421a147 100644 --- a/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java +++ b/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java @@ -27,6 +27,8 @@ import static android.app.ActivityManager.FOREGROUND_SERVICE_API_TYPE_PHONE_CALL import static android.app.ActivityManager.FOREGROUND_SERVICE_API_TYPE_USB; import static android.os.Process.INVALID_UID; +import static com.android.internal.util.FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA; + import android.annotation.IntDef; import android.app.ActivityManager; import android.app.ActivityManager.ForegroundServiceApiType; @@ -218,6 +220,24 @@ public class ForegroundServiceTypeLoggerModule { final ArrayList<Long> timestampsFound = new ArrayList<>(); for (int i = 0, size = apiTypes.size(); i < size; i++) { final int apiType = apiTypes.get(i); + + // remove the FGS record from the stack + final ArrayMap<ComponentName, ServiceRecord> runningFgsOfType = + uidState.mRunningFgs.get(apiType); + if (runningFgsOfType == null) { + Slog.w(TAG, "Could not find appropriate running FGS for FGS stop for UID " + uid + + " in package " + record.packageName); + continue; + } + + runningFgsOfType.remove(record.getComponentName()); + if (runningFgsOfType.size() == 0) { + // there's no more FGS running for this type, just get rid of it + uidState.mRunningFgs.remove(apiType); + // but we need to keep track of the timestamp in case an API stops + uidState.mLastFgsTimeStamp.put(apiType, System.currentTimeMillis()); + } + final int apiTypeIndex = uidState.mOpenWithFgsCount.indexOfKey(apiType); if (apiTypeIndex < 0) { Slog.w(TAG, "Logger should be tracking FGS types correctly for UID " + uid @@ -236,22 +256,6 @@ public class ForegroundServiceTypeLoggerModule { // remove the last API close call uidState.mApiClosedCalls.remove(apiType); } - // remove the FGS record from the stack - final ArrayMap<ComponentName, ServiceRecord> runningFgsOfType = - uidState.mRunningFgs.get(apiType); - if (runningFgsOfType == null) { - Slog.w(TAG, "Could not find appropriate running FGS for FGS stop for UID " + uid - + " in package " + record.packageName); - continue; - } - - runningFgsOfType.remove(record.getComponentName()); - if (runningFgsOfType.size() == 0) { - // there's no more FGS running for this type, just get rid of it - uidState.mRunningFgs.remove(apiType); - // but we need to keep track of the timestamp in case an API stops - uidState.mLastFgsTimeStamp.put(apiType, System.currentTimeMillis()); - } } if (!apisFound.isEmpty()) { // time to log the call @@ -381,9 +385,14 @@ public class ForegroundServiceTypeLoggerModule { // initialize if we don't contain uidState.mOpenedWithoutFgsCount.put(apiType, 0); } - if (uidState.mOpenedWithoutFgsCount.get(apiType) != 0) { + int apiOpenWithoutFgsCount = uidState.mOpenedWithoutFgsCount.get(apiType); + if (apiOpenWithoutFgsCount != 0) { + apiOpenWithoutFgsCount -= 1; + if (apiOpenWithoutFgsCount == 0) { + uidState.mApiOpenCalls.remove(apiType); + } uidState.mOpenedWithoutFgsCount - .put(apiType, uidState.mOpenedWithoutFgsCount.get(apiType) - 1); + .put(apiType, apiOpenWithoutFgsCount); return System.currentTimeMillis(); } // This is a part of a valid active FGS @@ -520,7 +529,10 @@ public class ForegroundServiceTypeLoggerModule { r.mAllowWIUByBindings, r.mAllowStartForegroundNoBinding, r.mAllowStartInBindService, - r.mAllowStartByBindings); + r.mAllowStartByBindings, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false + ); } /** @@ -578,7 +590,10 @@ public class ForegroundServiceTypeLoggerModule { 0, 0, 0, - 0); + 0, + FOREGROUND_SERVICE_STATE_CHANGED__FGS_START_API__FGSSTARTAPI_NA, + false + ); } /** diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 459c6ff3504a..9a4ff54be795 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -2513,9 +2513,7 @@ public class OomAdjuster { } } - if (schedGroup < SCHED_GROUP_TOP_APP - && cr.hasFlag(Context.BIND_SCHEDULE_LIKE_TOP_APP) - && clientIsSystem) { + if (cr.hasFlag(Context.BIND_SCHEDULE_LIKE_TOP_APP) && clientIsSystem) { schedGroup = SCHED_GROUP_TOP_APP; scheduleLikeTopApp = true; } diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 80d14a21cc7e..0c9cb3bd00f8 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -25,6 +25,7 @@ import static com.android.internal.R.styleable.GameModeConfig_allowGameDownscali import static com.android.internal.R.styleable.GameModeConfig_allowGameFpsOverride; import static com.android.internal.R.styleable.GameModeConfig_supportsBatteryGameMode; import static com.android.internal.R.styleable.GameModeConfig_supportsPerformanceGameMode; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; import android.Manifest; import android.annotation.NonNull; @@ -2092,17 +2093,17 @@ public final class GameManagerService extends IGameManagerService.Stub { statsManager.setPullAtomCallback( FrameworkStatsLog.GAME_MODE_INFO, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); statsManager.setPullAtomCallback( FrameworkStatsLog.GAME_MODE_CONFIGURATION, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); statsManager.setPullAtomCallback( FrameworkStatsLog.GAME_MODE_LISTENER, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); } diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index bf3f63c1ed30..d2737e81c55f 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -539,6 +539,62 @@ public class AudioDeviceBroker { } } } + + // check playback or record activity after 6 seconds for UIDs + private static final int CHECK_CLIENT_STATE_DELAY_MS = 6000; + + /*package */ + void postCheckCommunicationRouteClientState(int uid, boolean wasActive, int delay) { + CommunicationRouteClient client = getCommunicationRouteClientForUid(uid); + if (client != null) { + sendMsgForCheckClientState(MSG_CHECK_COMMUNICATION_ROUTE_CLIENT_STATE, + SENDMSG_REPLACE, + uid, + wasActive ? 1 : 0, + client, + delay); + } + } + + @GuardedBy("mDeviceStateLock") + void onCheckCommunicationRouteClientState(int uid, boolean wasActive) { + CommunicationRouteClient client = getCommunicationRouteClientForUid(uid); + if (client == null) { + return; + } + updateCommunicationRouteClientState(client, wasActive); + } + + @GuardedBy("mDeviceStateLock") + /*package*/ void updateCommunicationRouteClientState( + CommunicationRouteClient client, boolean wasActive) { + boolean wasBtScoRequested = isBluetoothScoRequested(); + client.setPlaybackActive(mAudioService.isPlaybackActiveForUid(client.getUid())); + client.setRecordingActive(mAudioService.isRecordingActiveForUid(client.getUid())); + if (wasActive != client.isActive()) { + postUpdateCommunicationRouteClient( + wasBtScoRequested, "updateCommunicationRouteClientState"); + } + } + + @GuardedBy("mDeviceStateLock") + /*package*/ void setForceCommunicationClientStateAndDelayedCheck( + CommunicationRouteClient client, + boolean forcePlaybackActive, + boolean forceRecordingActive) { + if (client == null) { + return; + } + if (forcePlaybackActive) { + client.setPlaybackActive(true); + } + if (forceRecordingActive) { + client.setRecordingActive(true); + } + postCheckCommunicationRouteClientState( + client.getUid(), client.isActive(), CHECK_CLIENT_STATE_DELAY_MS); + } + /* package */ static List<AudioDeviceInfo> getAvailableCommunicationDevices() { ArrayList<AudioDeviceInfo> commDevices = new ArrayList<>(); AudioDeviceInfo[] allDevices = @@ -1901,6 +1957,12 @@ public class AudioDeviceBroker { case MSG_PERSIST_AUDIO_DEVICE_SETTINGS: onPersistAudioDeviceSettings(); break; + + case MSG_CHECK_COMMUNICATION_ROUTE_CLIENT_STATE: { + synchronized (mDeviceStateLock) { + onCheckCommunicationRouteClientState(msg.arg1, msg.arg2 == 1); + } + } break; default: Log.wtf(TAG, "Invalid message " + msg.what); } @@ -1982,6 +2044,8 @@ public class AudioDeviceBroker { private static final int MSG_L_RECEIVED_BT_EVENT = 55; + private static final int MSG_CHECK_COMMUNICATION_ROUTE_CLIENT_STATE = 56; + private static boolean isMessageHandledUnderWakelock(int msgId) { switch(msgId) { case MSG_L_SET_WIRED_DEVICE_CONNECTION_STATE: @@ -2095,6 +2159,23 @@ public class AudioDeviceBroker { } } + private void removeMsgForCheckClientState(int uid) { + CommunicationRouteClient crc = getCommunicationRouteClientForUid(uid); + if (crc != null) { + mBrokerHandler.removeEqualMessages(MSG_CHECK_COMMUNICATION_ROUTE_CLIENT_STATE, crc); + } + } + + private void sendMsgForCheckClientState(int msg, int existingMsgPolicy, + int arg1, int arg2, Object obj, int delay) { + if ((existingMsgPolicy == SENDMSG_REPLACE) && (obj != null)) { + mBrokerHandler.removeEqualMessages(msg, obj); + } + + long time = SystemClock.uptimeMillis() + delay; + mBrokerHandler.sendMessageAtTime(mBrokerHandler.obtainMessage(msg, arg1, arg2, obj), time); + } + /** List of messages for which music is muted while processing is pending */ private static final Set<Integer> MESSAGES_MUTE_MUSIC; static { @@ -2367,6 +2448,7 @@ public class AudioDeviceBroker { if (unregister) { cl.unregisterDeathRecipient(); } + removeMsgForCheckClientState(cl.getUid()); mCommunicationRouteClients.remove(cl); return cl; } @@ -2383,6 +2465,13 @@ public class AudioDeviceBroker { new CommunicationRouteClient(cb, uid, device, isPrivileged); if (client.registerDeathRecipient()) { mCommunicationRouteClients.add(0, client); + if (!client.isActive()) { + // initialize the inactive client's state as active and check it after 6 seconds + setForceCommunicationClientStateAndDelayedCheck( + client, + !mAudioService.isPlaybackActiveForUid(client.getUid()), + !mAudioService.isRecordingActiveForUid(client.getUid())); + } return client; } return null; @@ -2439,16 +2528,16 @@ public class AudioDeviceBroker { List<AudioRecordingConfiguration> recordConfigs) { synchronized (mSetModeLock) { synchronized (mDeviceStateLock) { - final boolean wasBtScoRequested = isBluetoothScoRequested(); - boolean updateCommunicationRoute = false; for (CommunicationRouteClient crc : mCommunicationRouteClients) { boolean wasActive = crc.isActive(); + boolean updateClientState = false; if (playbackConfigs != null) { crc.setPlaybackActive(false); for (AudioPlaybackConfiguration config : playbackConfigs) { if (config.getClientUid() == crc.getUid() && config.isActive()) { crc.setPlaybackActive(true); + updateClientState = true; break; } } @@ -2459,18 +2548,23 @@ public class AudioDeviceBroker { if (config.getClientUid() == crc.getUid() && !config.isClientSilenced()) { crc.setRecordingActive(true); + updateClientState = true; break; } } } - if (wasActive != crc.isActive()) { - updateCommunicationRoute = true; + if (updateClientState) { + removeMsgForCheckClientState(crc.getUid()); + updateCommunicationRouteClientState(crc, wasActive); + } else { + if (wasActive) { + setForceCommunicationClientStateAndDelayedCheck( + crc, + playbackConfigs != null /* forcePlaybackActive */, + recordConfigs != null /* forceRecordingActive */); + } } } - if (updateCommunicationRoute) { - postUpdateCommunicationRouteClient( - wasBtScoRequested, "updateCommunicationRouteClientsActivity"); - } } } } diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 60af280614e2..e08fdd65ad94 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -1437,6 +1437,7 @@ public class AudioDeviceInventory { } }); new MediaMetrics.Item(mMetricsId + "disconnectA2dp") + .set(MediaMetrics.Property.EVENT, "disconnectA2dp") .record(); if (toRemove.size() > 0) { final int delay = checkSendBecomingNoisyIntentInt( @@ -1459,6 +1460,7 @@ public class AudioDeviceInventory { } }); new MediaMetrics.Item(mMetricsId + "disconnectA2dpSink") + .set(MediaMetrics.Property.EVENT, "disconnectA2dpSink") .record(); toRemove.stream().forEach(deviceAddress -> makeA2dpSrcUnavailable(deviceAddress)); } @@ -1474,6 +1476,7 @@ public class AudioDeviceInventory { } }); new MediaMetrics.Item(mMetricsId + "disconnectHearingAid") + .set(MediaMetrics.Property.EVENT, "disconnectHearingAid") .record(); if (toRemove.size() > 0) { final int delay = checkSendBecomingNoisyIntentInt( @@ -1531,6 +1534,7 @@ public class AudioDeviceInventory { } }); new MediaMetrics.Item(mMetricsId + "disconnectLeAudio") + .set(MediaMetrics.Property.EVENT, "disconnectLeAudio") .record(); if (toRemove.size() > 0) { final int delay = checkSendBecomingNoisyIntentInt(device, diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java index 5ebc1c055b50..81365bfbf2a6 100644 --- a/services/core/java/com/android/server/audio/SoundDoseHelper.java +++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java @@ -334,9 +334,8 @@ public class SoundDoseHelper { SAFE_MEDIA_VOLUME_UNINITIALIZED); mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES, SAFE_MEDIA_VOLUME_UNINITIALIZED); - // TODO(b/278265907): enable A2DP when we can distinguish A2DP headsets - // mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, - // SAFE_MEDIA_VOLUME_UNINITIALIZED); + mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, + SAFE_MEDIA_VOLUME_UNINITIALIZED); } float getOutputRs2UpperBound() { @@ -720,7 +719,9 @@ public class SoundDoseHelper { /*package*/ void initSafeMediaVolumeIndex() { for (int i = 0; i < mSafeMediaVolumeDevices.size(); ++i) { int deviceType = mSafeMediaVolumeDevices.keyAt(i); - mSafeMediaVolumeDevices.put(deviceType, getSafeDeviceMediaVolumeIndex(deviceType)); + if (mSafeMediaVolumeDevices.valueAt(i) == SAFE_MEDIA_VOLUME_UNINITIALIZED) { + mSafeMediaVolumeDevices.put(deviceType, getSafeDeviceMediaVolumeIndex(deviceType)); + } } } @@ -744,7 +745,7 @@ public class SoundDoseHelper { } /*package*/ boolean safeDevicesContains(int device) { - return mSafeMediaVolumeDevices.indexOfKey(device) >= 0; + return mSafeMediaVolumeDevices.get(device, SAFE_MEDIA_VOLUME_UNINITIALIZED) >= 0; } /*package*/ void invalidatPendingVolumeCommand() { @@ -1015,6 +1016,7 @@ public class SoundDoseHelper { initCsd(); synchronized (mSafeMediaVolumeStateLock) { + initSafeMediaVolumeIndex(); updateSafeMediaVolume_l(caller); } } @@ -1066,11 +1068,18 @@ public class SoundDoseHelper { } private int getSafeDeviceMediaVolumeIndex(int deviceType) { - // legacy implementation uses mSafeMediaVolumeIndex for wired HS/HP - // instead of computing it from the volume curves - if ((deviceType == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE - || deviceType == AudioSystem.DEVICE_OUT_WIRED_HEADSET) && !mEnableCsd.get()) { - return mSafeMediaVolumeIndex; + if (!mEnableCsd.get()) { + // legacy hearing safety only for wired and USB HS/HP + if (deviceType == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE + || deviceType == AudioSystem.DEVICE_OUT_WIRED_HEADSET) { + // legacy hearing safety uses mSafeMediaVolumeIndex for wired HS/HP + // instead of computing it from the volume curves + return mSafeMediaVolumeIndex; + } + + if (deviceType != AudioSystem.DEVICE_OUT_USB_HEADSET) { + return SAFE_MEDIA_VOLUME_UNINITIALIZED; + } } // determine UI volume index corresponding to the wanted safe gain in dBFS diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index 2ae3118d7bfa..b9ccbfbf55e7 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -275,7 +275,8 @@ public final class AuthSession implements IBinder.DeathRecipient { } sensor.goToStateWaitingForCookie(requireConfirmation, mToken, mOperationId, mUserId, mSensorReceiver, mOpPackageName, mRequestId, cookie, - mPromptInfo.isAllowBackgroundAuthentication()); + mPromptInfo.isAllowBackgroundAuthentication(), + mPromptInfo.isForLegacyFingerprintManager()); } } @@ -747,7 +748,7 @@ public final class AuthSession implements IBinder.DeathRecipient { Slog.v(TAG, "Confirmed! Modality: " + statsModality() + ", User: " + mUserId + ", IsCrypto: " + isCrypto() - + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT + + ", Client: " + getStatsClient() + ", RequireConfirmation: " + mPreAuthInfo.confirmationRequested + ", State: " + FrameworkStatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED + ", Latency: " + latency @@ -758,7 +759,7 @@ public final class AuthSession implements IBinder.DeathRecipient { mOperationContext, statsModality(), BiometricsProtoEnums.ACTION_UNKNOWN, - BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT, + getStatsClient(), mDebugEnabled, latency, FrameworkStatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED, @@ -784,7 +785,7 @@ public final class AuthSession implements IBinder.DeathRecipient { + ", User: " + mUserId + ", IsCrypto: " + isCrypto() + ", Action: " + BiometricsProtoEnums.ACTION_AUTHENTICATE - + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT + + ", Client: " + getStatsClient() + ", Reason: " + reason + ", Error: " + error + ", Latency: " + latency @@ -796,7 +797,7 @@ public final class AuthSession implements IBinder.DeathRecipient { mOperationContext, statsModality(), BiometricsProtoEnums.ACTION_AUTHENTICATE, - BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT, + getStatsClient(), mDebugEnabled, latency, error, @@ -998,6 +999,12 @@ public final class AuthSession implements IBinder.DeathRecipient { } } + private int getStatsClient() { + return mPromptInfo.isForLegacyFingerprintManager() + ? BiometricsProtoEnums.CLIENT_FINGERPRINT_MANAGER + : BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT; + } + @Override public String toString() { return "State: " + mState diff --git a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java index 64691e0b062b..b2b6ee65761e 100644 --- a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java +++ b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java @@ -57,6 +57,7 @@ public class AuthenticationStatsCollector { @NonNull private final FaceManager mFaceManager; @NonNull private final FingerprintManager mFingerprintManager; + private final boolean mEnabled; private final float mThreshold; private final int mModality; private boolean mPersisterInitialized = false; @@ -83,6 +84,7 @@ public class AuthenticationStatsCollector { public AuthenticationStatsCollector(@NonNull Context context, int modality, @NonNull BiometricNotification biometricNotification) { mContext = context; + mEnabled = context.getResources().getBoolean(R.bool.config_biometricFrrNotificationEnabled); mThreshold = context.getResources() .getFraction(R.fraction.config_biometricNotificationFrrThreshold, 1, 1); mUserAuthenticationStatsMap = new HashMap<>(); @@ -116,6 +118,11 @@ public class AuthenticationStatsCollector { /** Update total authentication and rejected attempts. */ public void authenticate(int userId, boolean authenticated) { + // Don't collect data if the feature is disabled. + if (!mEnabled) { + return; + } + // Don't collect data for single-modality devices or user has both biometrics enrolled. if (isSingleModalityDevice() || (hasEnrolledFace(userId) && hasEnrolledFingerprint(userId))) { diff --git a/services/core/java/com/android/server/biometrics/BiometricSensor.java b/services/core/java/com/android/server/biometrics/BiometricSensor.java index 937e3f8f8668..42dd36a5c35a 100644 --- a/services/core/java/com/android/server/biometrics/BiometricSensor.java +++ b/services/core/java/com/android/server/biometrics/BiometricSensor.java @@ -106,12 +106,13 @@ public abstract class BiometricSensor { void goToStateWaitingForCookie(boolean requireConfirmation, IBinder token, long sessionId, int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName, - long requestId, int cookie, boolean allowBackgroundAuthentication) + long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager) throws RemoteException { mCookie = cookie; impl.prepareForAuthentication(requireConfirmation, token, sessionId, userId, sensorReceiver, opPackageName, requestId, mCookie, - allowBackgroundAuthentication); + allowBackgroundAuthentication, isForLegacyFingerprintManager); mSensorState = STATE_WAITING_FOR_COOKIE; } 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 6ac163121d8c..78c95ad4576b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -283,7 +283,11 @@ public abstract class AuthenticationClient<T, O extends AuthenticateOptions> } try { - listener.onAuthenticationFailed(getSensorId()); + if (listener != null) { + listener.onAuthenticationFailed(getSensorId()); + } else { + Slog.e(TAG, "Received failed auth, but client was not listening"); + } } catch (RemoteException e) { Slog.e(TAG, "Unable to notify listener", e); mCallback.onClientFinished(this, false); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceAuthenticator.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceAuthenticator.java index fb64bcc3abc1..22110037890f 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceAuthenticator.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceAuthenticator.java @@ -62,7 +62,8 @@ public final class FaceAuthenticator extends IBiometricAuthenticator.Stub { @Override public void prepareForAuthentication(boolean requireConfirmation, IBinder token, long operationId, int userId, IBiometricSensorReceiver sensorReceiver, - String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication) + String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager) throws RemoteException { mFaceService.prepareForAuthentication(requireConfirmation, token, operationId, sensorReceiver, new FaceAuthenticateOptions.Builder() diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticator.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticator.java index d47a57ad6742..b6fa0c126cd6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticator.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticator.java @@ -62,7 +62,8 @@ public final class FingerprintAuthenticator extends IBiometricAuthenticator.Stub @Override public void prepareForAuthentication(boolean requireConfirmation, IBinder token, long operationId, int userId, IBiometricSensorReceiver sensorReceiver, - String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication) + String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager) throws RemoteException { mFingerprintService.prepareForAuthentication(token, operationId, sensorReceiver, new FingerprintAuthenticateOptions.Builder() @@ -70,7 +71,7 @@ public final class FingerprintAuthenticator extends IBiometricAuthenticator.Stub .setUserId(userId) .setOpPackageName(opPackageName) .build(), - requestId, cookie, allowBackgroundAuthentication); + requestId, cookie, allowBackgroundAuthentication, isForLegacyFingerprintManager); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java index 7cc6940f4b9d..5ce0c8b384ef 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java @@ -464,7 +464,8 @@ public class FingerprintService extends SystemService { public void prepareForAuthentication(IBinder token, long operationId, IBiometricSensorReceiver sensorReceiver, @NonNull FingerprintAuthenticateOptions options, - long requestId, int cookie, boolean allowBackgroundAuthentication) { + long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager) { super.prepareForAuthentication_enforcePermission(); final ServiceProvider provider = mRegistry.getProviderForSensor(options.getSensorId()); @@ -473,10 +474,13 @@ public class FingerprintService extends SystemService { return; } + final int statsClient = + isForLegacyFingerprintManager ? BiometricsProtoEnums.CLIENT_FINGERPRINT_MANAGER + : BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT; final boolean restricted = true; // BiometricPrompt is always restricted provider.scheduleAuthenticate(token, operationId, cookie, new ClientMonitorCallbackConverter(sensorReceiver), options, requestId, - restricted, BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT, + restricted, statsClient, allowBackgroundAuthentication); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java index 51a938558e57..4502e5d0c4b6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java @@ -128,7 +128,11 @@ class FingerprintDetectClient extends AcquisitionClient<AidlSession> implements vibrateSuccess(); try { - getListener().onDetected(getSensorId(), getTargetUserId(), mIsStrongBiometric); + if (getListener() != null) { + getListener().onDetected(getSensorId(), getTargetUserId(), mIsStrongBiometric); + } else { + Slog.e(TAG, "Listener is null!"); + } mCallback.onClientFinished(this, true /* success */); } catch (RemoteException e) { Slog.e(TAG, "Remote exception when sending onDetected", e); diff --git a/services/core/java/com/android/server/biometrics/sensors/iris/IrisAuthenticator.java b/services/core/java/com/android/server/biometrics/sensors/iris/IrisAuthenticator.java index 5c0c3626037a..01d1e378a735 100644 --- a/services/core/java/com/android/server/biometrics/sensors/iris/IrisAuthenticator.java +++ b/services/core/java/com/android/server/biometrics/sensors/iris/IrisAuthenticator.java @@ -59,7 +59,8 @@ public final class IrisAuthenticator extends IBiometricAuthenticator.Stub { @Override public void prepareForAuthentication(boolean requireConfirmation, IBinder token, long sessionId, int userId, IBiometricSensorReceiver sensorReceiver, - String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication) + String opPackageName, long requestId, int cookie, boolean allowBackgroundAuthentication, + boolean isForLegacyFingerprintManager) throws RemoteException { } diff --git a/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java b/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java index adea13fcc13c..24c7b87132d0 100644 --- a/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java +++ b/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java @@ -323,10 +323,15 @@ final class ConversionUtils { static ProgramIdentifier identifierToHalProgramIdentifier(ProgramSelector.Identifier id) { ProgramIdentifier hwId = new ProgramIdentifier(); hwId.type = id.getType(); - if (hwId.type == ProgramSelector.IDENTIFIER_TYPE_DAB_DMB_SID_EXT) { + if (id.getType() == ProgramSelector.IDENTIFIER_TYPE_DAB_DMB_SID_EXT) { hwId.type = IdentifierType.DAB_SID_EXT; } - hwId.value = id.getValue(); + long value = id.getValue(); + if (id.getType() == ProgramSelector.IDENTIFIER_TYPE_DAB_SID_EXT) { + hwId.value = (value & 0xFFFF) | ((value >>> 16) << 32); + } else { + hwId.value = value; + } return hwId; } @@ -609,6 +614,9 @@ final class ConversionUtils { || isNewIdentifierInU(info.getPhysicallyTunedTo())) { return false; } + if (info.getRelatedContent() == null) { + return true; + } Iterator<ProgramSelector.Identifier> relatedContentIt = info.getRelatedContent().iterator(); while (relatedContentIt.hasNext()) { if (isNewIdentifierInU(relatedContentIt.next())) { diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index 46cd496bdcd3..46d56ba5fea8 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -401,6 +401,12 @@ final class ColorFade { } } + void stop() { + if (mEglContext != null && mEglDisplay != null) { + EGL14.eglDestroyContext(mEglDisplay, mEglContext); + } + } + /** * Draws an animation frame showing the color fade activated at the * specified level. diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 53921d4d83b5..6466b440b3a0 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -116,6 +116,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.DeviceConfigInterface; import android.provider.Settings; +import android.sysprop.DisplayProperties; import android.text.TextUtils; import android.util.ArraySet; import android.util.EventLog; @@ -485,6 +486,9 @@ public final class DisplayManagerService extends SystemService { private boolean mBootCompleted = false; + // If we would like to keep a particular eye on a package, we can set the package name. + private boolean mExtraDisplayEventLogging; + private final BroadcastReceiver mIdleModeReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -565,6 +569,8 @@ public final class DisplayManagerService extends SystemService { mOverlayProperties = SurfaceControl.getOverlaySupport(); mSystemReady = false; mConfigParameterProvider = new DeviceConfigParameterProvider(DeviceConfigInterface.REAL); + final String name = DisplayProperties.debug_vri_package().orElse(null); + mExtraDisplayEventLogging = !TextUtils.isEmpty(name); } public void setupSchedulerPolicies() { @@ -2874,9 +2880,10 @@ public final class DisplayManagerService extends SystemService { // Delivers display event notifications to callbacks. private void deliverDisplayEvent(int displayId, ArraySet<Integer> uids, @DisplayEvent int event) { - if (DEBUG) { + if (DEBUG || mExtraDisplayEventLogging) { Slog.d(TAG, "Delivering display event: displayId=" - + displayId + ", event=" + event); + + displayId + ", event=" + event + + (uids != null ? ", uids=" + uids : "")); } // Grab the lock and copy the callbacks. diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 59b887171506..e8a954ac8fc6 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -3519,7 +3519,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - return new DisplayPowerState(blanker, colorFade, displayId, displayState); + return new DisplayPowerState(blanker, colorFade, displayId, displayState, + new Handler(/*async=*/ true)); } DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps, diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 4db8777ba605..7558c6ab53c2 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java @@ -324,8 +324,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal // Must only be accessed on the handler thread. private DisplayPowerState mPowerState; - - // The currently active screen on unblocker. This field is non-null whenever // we are waiting for a callback to release it and unblock the screen. private ScreenOnUnblocker mPendingScreenOnUnblocker; @@ -2884,7 +2882,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal DisplayPowerState getDisplayPowerState(DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - return new DisplayPowerState(blanker, colorFade, displayId, displayState); + return new DisplayPowerState(blanker, colorFade, displayId, displayState, + new Handler(/*async=*/ true)); } DualRampAnimator<DisplayPowerState> getDualRampAnimator(DisplayPowerState dps, diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index 2c257a17af91..85c6a6de860f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -74,8 +74,9 @@ final class DisplayPowerState { private volatile boolean mStopped; DisplayPowerState( - DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState) { - mHandler = new Handler(true /*async*/); + DisplayBlanker blanker, ColorFade colorFade, int displayId, int displayState, + Handler handler) { + mHandler = handler; mChoreographer = Choreographer.getInstance(); mBlanker = blanker; mColorFade = colorFade; @@ -317,6 +318,7 @@ final class DisplayPowerState { mStopped = true; mPhotonicModulator.interrupt(); dismissColorFade(); + stopColorFade(); mCleanListener = null; mHandler.removeCallbacksAndMessages(null); } @@ -376,6 +378,11 @@ final class DisplayPowerState { } } + // Clears up color fade resources. + private void stopColorFade() { + if (mColorFade != null) mColorFade.stop(); + } + private final Runnable mScreenUpdateRunnable = new Runnable() { @Override public void run() { diff --git a/services/core/java/com/android/server/display/RampAnimator.java b/services/core/java/com/android/server/display/RampAnimator.java index 52b92c4c7ca6..378cdba09520 100644 --- a/services/core/java/com/android/server/display/RampAnimator.java +++ b/services/core/java/com/android/server/display/RampAnimator.java @@ -31,7 +31,12 @@ class RampAnimator<T> { private final FloatProperty<T> mProperty; private float mCurrentValue; - private float mTargetValue; + + // target in HLG space + private float mTargetHlgValue; + + // target in linear space + private float mTargetLinearValue; private float mRate; private float mAnimationIncreaseMaxTimeSecs; private float mAnimationDecreaseMaxTimeSecs; @@ -78,7 +83,8 @@ class RampAnimator<T> { if (mFirstTime || target != mCurrentValue) { mFirstTime = false; mRate = 0; - mTargetValue = target; + mTargetHlgValue = target; + mTargetLinearValue = targetLinear; mCurrentValue = target; setPropertyValue(target); mAnimating = false; @@ -105,13 +111,14 @@ class RampAnimator<T> { // Otherwise, continue at the previous rate. if (!mAnimating || rate > mRate - || (target <= mCurrentValue && mCurrentValue <= mTargetValue) - || (mTargetValue <= mCurrentValue && mCurrentValue <= target)) { + || (target <= mCurrentValue && mCurrentValue <= mTargetHlgValue) + || (mTargetHlgValue <= mCurrentValue && mCurrentValue <= target)) { mRate = rate; } - final boolean changed = (mTargetValue != target); - mTargetValue = target; + final boolean changed = (mTargetHlgValue != target); + mTargetHlgValue = target; + mTargetLinearValue = targetLinear; // Start animating. if (!mAnimating && target != mCurrentValue) { @@ -135,7 +142,11 @@ class RampAnimator<T> { * into linear space. */ private void setPropertyValue(float val) { - final float linearVal = BrightnessUtils.convertGammaToLinear(val); + // To avoid linearVal inconsistency when converting to HLG and back to linear space + // used original target linear value for final animation step + float linearVal = + val == mTargetHlgValue ? mTargetLinearValue : BrightnessUtils.convertGammaToLinear( + val); mProperty.setValue(mObject, linearVal); } @@ -150,13 +161,13 @@ class RampAnimator<T> { final float scale = ValueAnimator.getDurationScale(); if (scale == 0) { // Animation off. - mAnimatedValue = mTargetValue; + mAnimatedValue = mTargetHlgValue; } else { final float amount = timeDelta * mRate / scale; - if (mTargetValue > mCurrentValue) { - mAnimatedValue = Math.min(mAnimatedValue + amount, mTargetValue); + if (mTargetHlgValue > mCurrentValue) { + mAnimatedValue = Math.min(mAnimatedValue + amount, mTargetHlgValue); } else { - mAnimatedValue = Math.max(mAnimatedValue - amount, mTargetValue); + mAnimatedValue = Math.max(mAnimatedValue - amount, mTargetHlgValue); } } final float oldCurrentValue = mCurrentValue; @@ -164,7 +175,7 @@ class RampAnimator<T> { if (oldCurrentValue != mCurrentValue) { setPropertyValue(mCurrentValue); } - if (mTargetValue == mCurrentValue) { + if (mTargetHlgValue == mCurrentValue) { mAnimating = false; } } diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java index 9f480b6f5e21..d76568f17667 100644 --- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java +++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java @@ -161,6 +161,8 @@ public class VirtualDisplayAdapter extends DisplayAdapter { int width, int height, int densityDpi) { VirtualDisplayDevice device = mVirtualDisplayDevices.get(appToken); if (device != null) { + Slog.v(TAG, "Resize VirtualDisplay " + device.mName + " to " + width + + " " + height); device.resizeLocked(width, height, densityDpi); } } @@ -177,6 +179,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter { public void setVirtualDisplaySurfaceLocked(IBinder appToken, Surface surface) { VirtualDisplayDevice device = mVirtualDisplayDevices.get(appToken); if (device != null) { + Slog.v(TAG, "Update surface for VirtualDisplay " + device.mName); device.setSurfaceLocked(surface); } } @@ -191,6 +194,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter { public DisplayDevice releaseVirtualDisplayLocked(IBinder appToken) { VirtualDisplayDevice device = mVirtualDisplayDevices.remove(appToken); if (device != null) { + Slog.v(TAG, "Release VirtualDisplay " + device.mName); device.destroyLocked(true); appToken.unlinkToDeath(device, 0); } diff --git a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java index aa99dab8f007..7b613874e25e 100644 --- a/services/core/java/com/android/server/inputmethod/HandwritingModeController.java +++ b/services/core/java/com/android/server/inputmethod/HandwritingModeController.java @@ -235,6 +235,7 @@ final class HandwritingModeController { @Nullable HandwritingSession startHandwritingSession( int requestId, int imePid, int imeUid, IBinder focusedWindowToken) { + clearPendingHandwritingDelegation(); if (mHandwritingSurface == null) { Slog.e(TAG, "Cannot start handwriting session: Handwriting was not initialized."); return null; diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index aff20eea9aa3..a1d28da5f65e 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -119,7 +119,6 @@ import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; -import android.view.IWindowManager; import android.view.InputChannel; import android.view.InputDevice; import android.view.MotionEvent; @@ -127,7 +126,6 @@ import android.view.WindowManager; import android.view.WindowManager.DisplayImePolicy; import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams.SoftInputModeFlags; -import android.view.WindowManagerGlobal; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.ImeTracker; import android.view.inputmethod.InputBinding; @@ -3073,9 +3071,13 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub ConcurrentUtils.waitForFutureNoInterrupt(mImeDrawsImeNavBarResLazyInitFuture, "Waiting for the lazy init of mImeDrawsImeNavBarRes"); } + // Whether the current display has a navigation bar. When this is false (e.g. emulator), + // the IME should not draw the IME navigation bar. + final boolean hasNavigationBar = mWindowManagerInternal + .hasNavigationBar(mCurTokenDisplayId != INVALID_DISPLAY + ? mCurTokenDisplayId : DEFAULT_DISPLAY); final boolean canImeDrawsImeNavBar = - mImeDrawsImeNavBarRes != null && mImeDrawsImeNavBarRes.get() - && hasNavigationBarOnCurrentDisplay(); + mImeDrawsImeNavBarRes != null && mImeDrawsImeNavBarRes.get() && hasNavigationBar; final boolean shouldShowImeSwitcherWhenImeIsShown = shouldShowImeSwitcherLocked( InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE); return (canImeDrawsImeNavBar ? InputMethodNavButtonFlags.IME_DRAWS_IME_NAV_BAR : 0) @@ -3083,21 +3085,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub ? InputMethodNavButtonFlags.SHOW_IME_SWITCHER_WHEN_IME_IS_SHOWN : 0); } - /** - * Whether the current display has a navigation bar. When this is {@code false} (e.g. emulator), - * the IME should <em>not</em> draw the IME navigation bar. - */ - @GuardedBy("ImfLock.class") - private boolean hasNavigationBarOnCurrentDisplay() { - final IWindowManager wm = WindowManagerGlobal.getWindowManagerService(); - try { - return wm.hasNavigationBar(mCurTokenDisplayId != INVALID_DISPLAY - ? mCurTokenDisplayId : DEFAULT_DISPLAY); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - @GuardedBy("ImfLock.class") private boolean shouldShowImeSwitcherLocked(int visibility) { if (!mShowOngoingImeSwitcherForPhones) return false; @@ -3453,13 +3440,19 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub @BinderThread @Override public void startStylusHandwriting(IInputMethodClient client) { + startStylusHandwriting(client, false /* usesDelegation */); + } + + private void startStylusHandwriting(IInputMethodClient client, boolean usesDelegation) { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "IMMS.startStylusHandwriting"); try { ImeTracing.getInstance().triggerManagerServiceDump( "InputMethodManagerService#startStylusHandwriting"); int uid = Binder.getCallingUid(); synchronized (ImfLock.class) { - mHwController.clearPendingHandwritingDelegation(); + if (!usesDelegation) { + mHwController.clearPendingHandwritingDelegation(); + } if (!canInteractWithImeLocked(uid, client, "startStylusHandwriting", null /* statsToken */)) { return; @@ -3541,7 +3534,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub return false; } - startStylusHandwriting(client); + startStylusHandwriting(client, true /* usesDelegation */); return true; } diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java index 24dbce49eace..390a3b2457cb 100644 --- a/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java +++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java @@ -194,8 +194,12 @@ public class RecoverableKeyStoreManager { mApplicationKeyStorage = applicationKeyStorage; mTestCertHelper = testOnlyInsecureCertificateHelper; mCleanupManager = cleanupManager; - // Clears data for removed users. - mCleanupManager.verifyKnownUsers(); + try { + // Clears data for removed users. + mCleanupManager.verifyKnownUsers(); + } catch (Exception e) { + Log.e(TAG, "Failed to verify known users", e); + } try { mRecoverableKeyGenerator = RecoverableKeyGenerator.newInstance(mDatabase); } catch (NoSuchAlgorithmException e) { diff --git a/services/core/java/com/android/server/media/LegacyBluetoothRouteController.java b/services/core/java/com/android/server/media/LegacyBluetoothRouteController.java index e31a7fc5d5ff..198040378dc6 100644 --- a/services/core/java/com/android/server/media/LegacyBluetoothRouteController.java +++ b/services/core/java/com/android/server/media/LegacyBluetoothRouteController.java @@ -508,7 +508,11 @@ class LegacyBluetoothRouteController implements BluetoothRouteController { case BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED: clearActiveRoutesWithType(MediaRoute2Info.TYPE_BLUETOOTH_A2DP); if (device != null) { - addActiveRoute(mBluetoothRoutes.get(device.getAddress())); + if (DEBUG) { + Log.d(TAG, "Setting active a2dp devices. device=" + device); + } + + addActiveDevices(device); } notifyBluetoothRoutesUpdated(); break; diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java index 802a7f2954af..dfd317c58e47 100644 --- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java +++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java @@ -956,6 +956,7 @@ public final class MediaProjectionManagerService extends SystemService if (callback == null) { throw new IllegalArgumentException("callback must not be null"); } + Slog.v(TAG, "Start the token instance " + this); // Cache result of calling into ActivityManagerService outside of the lock, to prevent // deadlock with WindowManagerService. final boolean hasFGS = mActivityManagerInternal.hasRunningForegroundService( @@ -975,9 +976,6 @@ public final class MediaProjectionManagerService extends SystemService throw new SecurityException("Media projections require a foreground service" + " of type ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION"); } - - mCallback = callback; - registerCallback(mCallback); try { mToken = callback.asBinder(); mDeathEater = () -> { @@ -1022,6 +1020,11 @@ public final class MediaProjectionManagerService extends SystemService } } startProjectionLocked(this); + + // Register new callbacks after stop has been dispatched to previous session. + mCallback = callback; + registerCallback(mCallback); + // Mark this token as used when the app gets the MediaProjection instance. mCountStarts++; } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index c24e729cbff5..e633ba6886d0 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -2632,7 +2632,7 @@ public class NotificationManagerService extends SystemService { mStatsManager.setPullAtomCallback( DND_MODE_RULE, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + ConcurrentUtils.DIRECT_EXECUTOR, mPullAtomCallback ); } diff --git a/services/core/java/com/android/server/notification/NotificationRecordLogger.java b/services/core/java/com/android/server/notification/NotificationRecordLogger.java index b015a72a653e..d2e980b7e355 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLogger.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLogger.java @@ -39,6 +39,7 @@ import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.internal.util.FrameworkStatsLog; +import java.time.Duration; import java.util.ArrayList; import java.util.Objects; @@ -497,6 +498,7 @@ interface NotificationRecordLogger { final boolean is_non_dismissible; final int fsi_state; final boolean is_locked; + final int age_in_minutes; @DurationMillisLong long post_duration_millis; // Not final; calculated at the end. NotificationReported(NotificationRecordPair p, @@ -541,6 +543,9 @@ interface NotificationRecordLogger { hasFullScreenIntent, hasFsiRequestedButDeniedFlag, eventType); this.is_locked = p.r.isLocked(); + + this.age_in_minutes = NotificationRecordLogger.getAgeInMinutes( + p.r.getSbn().getPostTime(), p.r.getSbn().getNotification().when); } } @@ -601,4 +606,13 @@ interface NotificationRecordLogger { } return FrameworkStatsLog.NOTIFICATION_REPORTED__FSI_STATE__NO_FSI; } + + /** + * @param postTimeMs time (in {@link System#currentTimeMillis} time) the notification was posted + * @param whenMs A timestamp related to this notification, in milliseconds since the epoch. + * @return difference in duration as an integer in minutes + */ + static int getAgeInMinutes(long postTimeMs, long whenMs) { + return (int) Duration.ofMillis(postTimeMs - whenMs).toMinutes(); + } } diff --git a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java index 9da0e98c1775..fc0a7764963e 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java @@ -77,7 +77,8 @@ class NotificationRecordLoggerImpl implements NotificationRecordLogger { notificationReported.is_non_dismissible, notificationReported.post_duration_millis, notificationReported.fsi_state, - notificationReported.is_locked); + notificationReported.is_locked, + notificationReported.age_in_minutes); } @Override diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index cab90d24ca39..ca0c1f98fe0d 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -23,6 +23,7 @@ import static android.os.UserManager.DISALLOW_USER_SWITCH; import static android.os.UserManager.SYSTEM_USER_MODE_EMULATION_PROPERTY; import static android.os.UserManager.USER_OPERATION_ERROR_UNKNOWN; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; import static com.android.server.pm.UserJourneyLogger.ERROR_CODE_ABORTED; import static com.android.server.pm.UserJourneyLogger.ERROR_CODE_UNSPECIFIED; import static com.android.server.pm.UserJourneyLogger.ERROR_CODE_USER_ALREADY_AN_ADMIN; @@ -2665,7 +2666,8 @@ public class UserManagerService extends IUserManager.Stub { } } - private void setUserRestrictionInner(int userId, @NonNull String key, boolean value) { + @VisibleForTesting + void setUserRestrictionInner(int userId, @NonNull String key, boolean value) { if (!UserRestrictionsUtils.isValidRestriction(key)) { Slog.e(LOG_TAG, "Setting invalid restriction " + key); return; @@ -4273,11 +4275,11 @@ public class UserManagerService extends IUserManager.Stub { UserRestrictionsUtils.writeRestrictions(serializer, mDevicePolicyUserRestrictions.getRestrictions(UserHandle.USER_ALL), - TAG_DEVICE_POLICY_RESTRICTIONS); + TAG_DEVICE_POLICY_GLOBAL_RESTRICTIONS); UserRestrictionsUtils.writeRestrictions(serializer, mDevicePolicyUserRestrictions.getRestrictions(userInfo.id), - TAG_DEVICE_POLICY_RESTRICTIONS); + TAG_DEVICE_POLICY_LOCAL_RESTRICTIONS); } if (userData.account != null) { @@ -5233,12 +5235,12 @@ public class UserManagerService extends IUserManager.Stub { statsManager.setPullAtomCallback( FrameworkStatsLog.USER_INFO, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); statsManager.setPullAtomCallback( FrameworkStatsLog.MULTI_USER_INFO, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index ca647929c271..d1a4e6008c2a 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4559,7 +4559,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_STYLUS_BUTTON_SECONDARY: case KeyEvent.KEYCODE_STYLUS_BUTTON_TERTIARY: case KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL: { - if (down && mStylusButtonsEnabled) { + if (mStylusButtonsEnabled) { sendSystemKeyToStatusBarAsync(event); } result &= ~ACTION_PASS_TO_USER; diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index 1a91d252c431..f425ba32ced0 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -16,6 +16,8 @@ package com.android.server.power.hint; +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; + import android.annotation.NonNull; import android.app.ActivityManager; import android.app.ActivityManagerInternal; @@ -37,7 +39,6 @@ import android.util.StatsEvent; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.os.BackgroundThread; import com.android.internal.util.DumpUtils; import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.Preconditions; @@ -142,7 +143,7 @@ public final class HintManagerService extends SystemService { statsManager.setPullAtomCallback( FrameworkStatsLog.ADPF_SYSTEM_COMPONENT_INFO, null, // use default PullAtomMetadata values - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, this::onPullAtom); } diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 9128974fa9d3..79b2836e237d 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -1599,7 +1599,7 @@ public class StatsPullAtomService extends SystemService { mStatsManager.setPullAtomCallback( tagId, metadata, - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, mStatsCallbackImpl ); } @@ -1612,7 +1612,7 @@ public class StatsPullAtomService extends SystemService { mStatsManager.setPullAtomCallback( tagId, metadata, - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, mStatsCallbackImpl ); } @@ -1625,7 +1625,7 @@ public class StatsPullAtomService extends SystemService { mStatsManager.setPullAtomCallback( tagId, metadata, - BackgroundThread.getExecutor(), + DIRECT_EXECUTOR, mStatsCallbackImpl ); } diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java index 01fdc8800c0e..7862f58374a3 100644 --- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java +++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java @@ -41,6 +41,7 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.AppGlobals; @@ -62,6 +63,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; @@ -1304,6 +1306,46 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub implements return false; } + /** + * Check if the targetPkg can be granted permission to access uri by + * the callingUid using the given modeFlags. See {@link #checkGrantUriPermissionUnlocked}. + * + * @param callingUid The uid of the grantor app that has permissions to the uri. + * @param targetPkg The package name of the granted app that needs permissions to the uri. + * @param uri The uri for which permissions should be granted. + * @param modeFlags The modes to grant. See {@link Intent#FLAG_GRANT_READ_URI_PERMISSION}, etc. + * @param userId The userId in which the uri is to be resolved. + * @return uid of the target or -1 if permission grant not required. Returns -1 if the caller + * does not hold INTERACT_ACROSS_USERS_FULL + * @throws SecurityException if the grant is not allowed. + */ + @Override + @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) + public int checkGrantUriPermission_ignoreNonSystem(int callingUid, String targetPkg, Uri uri, + int modeFlags, int userId) { + if (!isCallerIsSystemOrPrivileged()) { + return Process.INVALID_UID; + } + final long origId = Binder.clearCallingIdentity(); + try { + return checkGrantUriPermissionUnlocked(callingUid, targetPkg, uri, modeFlags, + userId); + } finally { + Binder.restoreCallingIdentity(origId); + } + } + + private boolean isCallerIsSystemOrPrivileged() { + final int uid = Binder.getCallingUid(); + if (uid == Process.SYSTEM_UID || uid == Process.ROOT_UID) { + return true; + } + return ActivityManager.checkComponentPermission( + android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, + uid, /* owningUid = */-1, /* exported = */ true) + == PackageManager.PERMISSION_GRANTED; + } + @Override public ArrayList<UriPermission> providePersistentUriGrants() { final ArrayList<UriPermission> result = new ArrayList<>(); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 309a9c0e0372..6601467e2224 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -321,9 +321,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (DEBUG) { Slog.d(TAG, "publish system wallpaper changed!"); } - if (localSync != null) { - localSync.complete(); - } notifyWallpaperChanged(wallpaper); } }; @@ -331,7 +328,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub // If this was the system wallpaper, rebind... bindWallpaperComponentLocked(mImageWallpaper, true, false, wallpaper, callback); - notifyColorsWhich |= FLAG_SYSTEM; + notifyColorsWhich |= wallpaper.mWhich; } if (lockWallpaperChanged) { @@ -345,9 +342,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (DEBUG) { Slog.d(TAG, "publish lock wallpaper changed!"); } - if (localSync != null) { - localSync.complete(); - } notifyWallpaperChanged(wallpaper); } }; @@ -372,9 +366,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } saveSettingsLocked(wallpaper.userId); - // Notify the client immediately if only lockscreen wallpaper changed. - if (lockWallpaperChanged && !sysWallpaperChanged) { - notifyWallpaperChanged(wallpaper); + if ((sysWallpaperChanged || lockWallpaperChanged) && localSync != null) { + localSync.complete(); } } @@ -1006,12 +999,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub return; } - if (!mWallpaper.wallpaperUpdating - && mWallpaper.userId == mCurrentUserId) { + if (!mWallpaper.wallpaperUpdating && mWallpaper.userId == mCurrentUserId) { Slog.w(TAG, "Wallpaper reconnect timed out for " + mWallpaper.wallpaperComponent + ", reverting to built-in wallpaper!"); - clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, - null); + int which = mIsLockscreenLiveWallpaperEnabled ? mWallpaper.mWhich : FLAG_SYSTEM; + clearWallpaperLocked(true, which, mWallpaper.userId, null); } } }; @@ -1191,7 +1183,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } else { // Timeout Slog.w(TAG, "Reverting to built-in wallpaper!"); - clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, null); + clearWallpaperLocked(true, mWallpaper.mWhich, mWallpaper.userId, null); final String flattened = wpService.flattenToString(); EventLog.writeEvent(EventLogTags.WP_WALLPAPER_CRASHED, flattened.substring(0, Math.min(flattened.length(), @@ -1220,7 +1212,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub && mWallpaper.lastDiedTime + MIN_WALLPAPER_CRASH_TIME > SystemClock.uptimeMillis()) { Slog.w(TAG, "Reverting to built-in wallpaper!"); - clearWallpaperLocked(true, FLAG_SYSTEM, mWallpaper.userId, null); + clearWallpaperLocked(true, mWallpaper.mWhich, mWallpaper.userId, null); } else { mWallpaper.lastDiedTime = SystemClock.uptimeMillis(); tryToRebind(); @@ -1383,7 +1375,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub lockWp.connection.mWallpaper = lockWp; mOriginalSystem.mWhich = FLAG_LOCK; updateEngineFlags(mOriginalSystem); - notifyWallpaperColorsChanged(lockWp, FLAG_LOCK); } else { // Failed rename, use current system wp for both if (DEBUG) { @@ -1403,7 +1394,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub updateEngineFlags(mOriginalSystem); mLockWallpaperMap.put(mNewWallpaper.userId, mOriginalSystem); mLastLockWallpaper = mOriginalSystem; - notifyWallpaperColorsChanged(mOriginalSystem, FLAG_LOCK); } } else if (mNewWallpaper.mWhich == FLAG_LOCK) { // New wp is lock only, so old system+lock is now system only @@ -1417,10 +1407,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } } } - - synchronized (mLock) { - saveSettingsLocked(mNewWallpaper.userId); - } + saveSettingsLocked(mNewWallpaper.userId); if (DEBUG) { Slog.v(TAG, "--- wallpaper changed --"); @@ -1439,8 +1426,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (mCurrentUserId != getChangingUserId()) { return; } - WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId); - if (wallpaper != null) { + for (WallpaperData wallpaper: getWallpapers()) { final ComponentName wpService = wallpaper.wallpaperComponent; if (wpService != null && wpService.getPackageName().equals(packageName)) { if (DEBUG_LIVE) { @@ -1452,7 +1438,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub wallpaper, null)) { Slog.w(TAG, "Wallpaper " + wpService + " no longer available; reverting to default"); - clearWallpaperLocked(false, FLAG_SYSTEM, wallpaper.userId, null); + int which = mIsLockscreenLiveWallpaperEnabled + ? wallpaper.mWhich : FLAG_SYSTEM; + clearWallpaperLocked(false, which, wallpaper.userId, null); } } } @@ -1465,13 +1453,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (mCurrentUserId != getChangingUserId()) { return; } - WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId); - if (wallpaper != null) { - if (wallpaper.wallpaperComponent == null - || !wallpaper.wallpaperComponent.getPackageName().equals(packageName)) { - return; + for (WallpaperData wallpaper: getWallpapers()) { + if (wallpaper.wallpaperComponent != null + && wallpaper.wallpaperComponent.getPackageName().equals(packageName)) { + doPackagesChangedLocked(true, wallpaper); } - doPackagesChangedLocked(true, wallpaper); } } } @@ -1482,8 +1468,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (mCurrentUserId != getChangingUserId()) { return; } - WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId); - if (wallpaper != null) { + for (WallpaperData wallpaper: getWallpapers()) { if (wallpaper.wallpaperComponent != null && wallpaper.wallpaperComponent.getPackageName().equals(packageName)) { if (DEBUG_LIVE) { @@ -1507,8 +1492,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (mCurrentUserId != getChangingUserId()) { return false; } - WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId); - if (wallpaper != null) { + for (WallpaperData wallpaper: getWallpapers()) { boolean res = doPackagesChangedLocked(doit, wallpaper); changed |= res; } @@ -1522,8 +1506,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (mCurrentUserId != getChangingUserId()) { return; } - WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId); - if (wallpaper != null) { + for (WallpaperData wallpaper: getWallpapers()) { doPackagesChangedLocked(true, wallpaper); } } @@ -1531,6 +1514,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub boolean doPackagesChangedLocked(boolean doit, WallpaperData wallpaper) { boolean changed = false; + int which = mIsLockscreenLiveWallpaperEnabled ? wallpaper.mWhich : FLAG_SYSTEM; if (wallpaper.wallpaperComponent != null) { int change = isPackageDisappearing(wallpaper.wallpaperComponent .getPackageName()); @@ -1540,7 +1524,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (doit) { Slog.w(TAG, "Wallpaper uninstalled, removing: " + wallpaper.wallpaperComponent); - clearWallpaperLocked(false, FLAG_SYSTEM, wallpaper.userId, null); + clearWallpaperLocked(false, which, wallpaper.userId, null); } } } @@ -1561,7 +1545,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } catch (NameNotFoundException e) { Slog.w(TAG, "Wallpaper component gone, removing: " + wallpaper.wallpaperComponent); - clearWallpaperLocked(false, FLAG_SYSTEM, wallpaper.userId, null); + clearWallpaperLocked(false, which, wallpaper.userId, null); } } if (wallpaper.nextWallpaperComponent != null @@ -1676,7 +1660,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (DEBUG) { Slog.i(TAG, "Unable to regenerate crop; resetting"); } - clearWallpaperLocked(false, FLAG_SYSTEM, UserHandle.USER_SYSTEM, null); + int which = isLockscreenLiveWallpaperEnabled() ? wallpaper.mWhich : FLAG_SYSTEM; + clearWallpaperLocked(false, which, UserHandle.USER_SYSTEM, null); } } else { if (DEBUG) { @@ -1956,12 +1941,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub WallpaperData wallpaper, IRemoteCallback reply, ServiceInfo serviceInfo) { if (serviceInfo == null) { - if (wallpaper.mWhich == (FLAG_LOCK | FLAG_SYSTEM)) { - clearWallpaperLocked(false, FLAG_SYSTEM, wallpaper.userId, null); - clearWallpaperLocked(false, FLAG_LOCK, wallpaper.userId, reply); - } else { - clearWallpaperLocked(false, wallpaper.mWhich, wallpaper.userId, reply); - } + clearWallpaperLocked(false, wallpaper.mWhich, wallpaper.userId, reply); return; } Slog.w(TAG, "Wallpaper isn't direct boot aware; using fallback until unlocked"); @@ -1982,7 +1962,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub @Override public void clearWallpaper(String callingPackage, int which, int userId) { - if (DEBUG) Slog.v(TAG, "clearWallpaper"); + if (DEBUG) Slog.v(TAG, "clearWallpaper: " + which); checkPermission(android.Manifest.permission.SET_WALLPAPER); if (!isWallpaperSupported(callingPackage) || !isSetWallpaperAllowed(callingPackage)) { return; @@ -1993,7 +1973,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub WallpaperData data = null; synchronized (mLock) { if (mIsLockscreenLiveWallpaperEnabled) { - clearWallpaperLocked(callingPackage, false, which, userId); + boolean fromForeground = isFromForegroundApp(callingPackage); + clearWallpaperLocked(false, which, userId, fromForeground, null); } else { clearWallpaperLocked(false, which, userId, null); } @@ -2013,8 +1994,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } } - private void clearWallpaperLocked(String callingPackage, boolean defaultFailed, - int which, int userId) { + private void clearWallpaperLocked(boolean defaultFailed, + int which, int userId, boolean fromForeground, IRemoteCallback reply) { // Might need to bring it in the first time to establish our rewrite if (!mWallpaperMap.contains(userId)) { @@ -2053,8 +2034,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub finalWhich = which; } - boolean success = withCleanCallingIdentity(() -> setWallpaperComponent( - component, callingPackage, finalWhich, userId)); + // except for the lock case (for which we keep the system wallpaper as-is), force rebind + boolean force = which != FLAG_LOCK; + boolean success = withCleanCallingIdentity(() -> setWallpaperComponentInternal( + component, finalWhich, userId, force, fromForeground, reply)); if (success) return; } catch (IllegalArgumentException e1) { e = e1; @@ -2066,11 +2049,24 @@ public class WallpaperManagerService extends IWallpaperManager.Stub // wallpaper. Slog.e(TAG, "Default wallpaper component not found!", e); withCleanCallingIdentity(() -> clearWallpaperComponentLocked(wallpaper)); + if (reply != null) { + try { + reply.sendResult(null); + } catch (RemoteException e1) { + Slog.w(TAG, "Failed to notify callback after wallpaper clear", e1); + } + } } - // TODO(b/266818039) remove this version of the method + // TODO(b/266818039) remove private void clearWallpaperLocked(boolean defaultFailed, int which, int userId, IRemoteCallback reply) { + + if (mIsLockscreenLiveWallpaperEnabled) { + clearWallpaperLocked(defaultFailed, which, userId, false, reply); + return; + } + if (which != FLAG_SYSTEM && which != FLAG_LOCK) { throw new IllegalArgumentException("Must specify exactly one kind of wallpaper to clear"); } @@ -2787,6 +2783,18 @@ public class WallpaperManagerService extends IWallpaperManager.Stub : new WallpaperData[0]; } + // TODO(b/266818039) remove + private WallpaperData[] getWallpapers() { + WallpaperData systemWallpaper = mWallpaperMap.get(mCurrentUserId); + WallpaperData lockWallpaper = mLockWallpaperMap.get(mCurrentUserId); + boolean systemValid = systemWallpaper != null; + boolean lockValid = lockWallpaper != null && !isLockscreenLiveWallpaperEnabled(); + return systemValid && lockValid ? new WallpaperData[]{systemWallpaper, lockWallpaper} + : systemValid ? new WallpaperData[]{systemWallpaper} + : lockValid ? new WallpaperData[]{lockWallpaper} + : new WallpaperData[0]; + } + private IWallpaperEngine getEngine(int which, int userId, int displayId) { WallpaperData wallpaperData = findWallpaperAtDisplay(userId, displayId); if (wallpaperData == null) return null; @@ -3244,15 +3252,16 @@ public class WallpaperManagerService extends IWallpaperManager.Stub boolean setWallpaperComponent(ComponentName name, String callingPackage, @SetWallpaperFlags int which, int userId) { if (mIsLockscreenLiveWallpaperEnabled) { - return setWallpaperComponentInternal(name, callingPackage, which, userId); + boolean fromForeground = isFromForegroundApp(callingPackage); + return setWallpaperComponentInternal(name, which, userId, false, fromForeground, null); } else { setWallpaperComponentInternalLegacy(name, callingPackage, which, userId); return true; } } - private boolean setWallpaperComponentInternal(ComponentName name, String callingPackage, - @SetWallpaperFlags int which, int userIdIn) { + private boolean setWallpaperComponentInternal(ComponentName name, @SetWallpaperFlags int which, + int userIdIn, boolean force, boolean fromForeground, IRemoteCallback reply) { if (DEBUG) { Slog.v(TAG, "Setting new live wallpaper: which=" + which + ", component: " + name); } @@ -3266,7 +3275,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub final WallpaperData newWallpaper; synchronized (mLock) { - Slog.v(TAG, "setWallpaperComponent name=" + name); + Slog.v(TAG, "setWallpaperComponent name=" + name + ", which = " + which); final WallpaperData originalSystemWallpaper = mWallpaperMap.get(userId); if (originalSystemWallpaper == null) { throw new IllegalStateException("Wallpaper not yet initialized for user " + userId); @@ -3289,30 +3298,21 @@ public class WallpaperManagerService extends IWallpaperManager.Stub newWallpaper.imageWallpaperPending = false; newWallpaper.mWhich = which; newWallpaper.mSystemWasBoth = systemIsBoth; - newWallpaper.fromForegroundApp = isFromForegroundApp(callingPackage); + newWallpaper.fromForegroundApp = fromForeground; final WallpaperDestinationChangeHandler liveSync = new WallpaperDestinationChangeHandler( newWallpaper); boolean same = changingToSame(name, newWallpaper); - IRemoteCallback.Stub callback = new IRemoteCallback.Stub() { - @Override - public void sendResult(Bundle data) throws RemoteException { - if (DEBUG) { - Slog.d(TAG, "publish system wallpaper changed!"); - } - liveSync.complete(); - } - }; /* * If we have a shared system+lock wallpaper, and we reapply the same wallpaper * to system only, force rebind: the current wallpaper will be migrated to lock * and a new engine with the same wallpaper will be applied to system. */ - boolean forceRebind = same && systemIsBoth && which == FLAG_SYSTEM; + boolean forceRebind = force || (same && systemIsBoth && which == FLAG_SYSTEM); bindSuccess = bindWallpaperComponentLocked(name, /* force */ - forceRebind, /* fromUser */ true, newWallpaper, callback); + forceRebind, /* fromUser */ true, newWallpaper, reply); if (bindSuccess) { if (!same) { newWallpaper.primaryColors = null; @@ -3356,6 +3356,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } mLockWallpaperMap.remove(newWallpaper.userId); } + if (liveSync != null) liveSync.complete(); } } finally { Binder.restoreCallingIdentity(ident); @@ -3381,7 +3382,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub WallpaperData wallpaper; synchronized (mLock) { - Slog.v(TAG, "setWallpaperComponent name=" + name + ", which=" + which); + Slog.v(TAG, "setWallpaperComponentLegacy name=" + name + ", which=" + which); wallpaper = mWallpaperMap.get(userId); if (wallpaper == null) { throw new IllegalStateException("Wallpaper not yet initialized for user " + userId); @@ -3474,6 +3475,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // Has the component changed? if (!force && changingToSame(componentName, wallpaper)) { + try { + if (reply != null) reply.sendResult(null); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to send callback", e); + } return true; } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index d231cf300806..ca3a84752fc4 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -9854,7 +9854,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A ProtoLog.i(WM_DEBUG_STATES, "Moving to %s Relaunching %s callers=%s" , (andResume ? "RESUMED" : "PAUSED"), this, Debug.getCallers(6)); forceNewConfig = false; - startRelaunching(); final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(pendingResults, pendingNewIntents, configChangeFlags, new MergedConfiguration(getProcessGlobalConfiguration(), @@ -9871,11 +9870,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A transaction.addCallback(callbackItem); transaction.setLifecycleStateRequest(lifecycleItem); mAtmService.getLifecycleManager().scheduleTransaction(transaction); + startRelaunching(); // Note: don't need to call pauseIfSleepingLocked() here, because the caller will only // request resume if this activity is currently resumed, which implies we aren't // sleeping. } catch (RemoteException e) { - ProtoLog.i(WM_DEBUG_STATES, "Relaunch failed %s", e); + Slog.w(TAG, "Failed to relaunch " + this + ": " + e); } if (andResume) { diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 0a332a3683c5..d7489f2c7b91 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static android.Manifest.permission.BIND_VOICE_INTERACTION; import static android.Manifest.permission.CHANGE_CONFIGURATION; +import static android.Manifest.permission.CONTROL_KEYGUARD; import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS; import static android.Manifest.permission.DETECT_SCREEN_CAPTURE; import static android.Manifest.permission.INTERACT_ACROSS_USERS; @@ -3539,6 +3540,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public void keyguardGoingAway(int flags) { + mAmInternal.enforceCallingPermission(CONTROL_KEYGUARD, "unlock keyguard"); enforceNotIsolatedCaller("keyguardGoingAway"); final long token = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/wm/AsyncRotationController.java b/services/core/java/com/android/server/wm/AsyncRotationController.java index 0a2bbd467ab3..4b463c7e1756 100644 --- a/services/core/java/com/android/server/wm/AsyncRotationController.java +++ b/services/core/java/com/android/server/wm/AsyncRotationController.java @@ -459,7 +459,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume // insets should keep original position before the start transaction is applied. return mTransitionOp != OP_LEGACY && (mTransitionOp == OP_APP_SWITCH || TransitionController.SYNC_METHOD == BLASTSyncEngine.METHOD_BLAST) - && !mIsStartTransactionCommitted && isTargetToken(w.mToken); + && !mIsStartTransactionCommitted && canBeAsync(w.mToken) && isTargetToken(w.mToken); } /** diff --git a/services/core/java/com/android/server/wm/ContentRecorder.java b/services/core/java/com/android/server/wm/ContentRecorder.java index f0e4149a9159..b499dad53326 100644 --- a/services/core/java/com/android/server/wm/ContentRecorder.java +++ b/services/core/java/com/android/server/wm/ContentRecorder.java @@ -83,6 +83,11 @@ final class ContentRecorder implements WindowContainerListener { @Nullable private Rect mLastRecordedBounds = null; /** + * The last size of the surface mirrored out to. + */ + @Nullable private Point mLastConsumingSurfaceSize = new Point(0, 0); + + /** * The last configuration orientation. */ @Configuration.Orientation @@ -141,46 +146,64 @@ final class ContentRecorder implements WindowContainerListener { */ void onConfigurationChanged(@Configuration.Orientation int lastOrientation) { // Update surface for MediaProjection, if this DisplayContent is being used for recording. - if (isCurrentlyRecording() && mLastRecordedBounds != null) { - // Recording has already begun, but update recording since the display is now on. - if (mRecordedWindowContainer == null) { + if (!isCurrentlyRecording() || mLastRecordedBounds == null) { + return; + } + + // Recording has already begun, but update recording since the display is now on. + if (mRecordedWindowContainer == null) { + ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, + "Content Recording: Unexpectedly null window container; unable to update " + + "recording for display %d", + mDisplayContent.getDisplayId()); + return; + } + + // TODO(b/297514518) Do not start capture if the app is in PIP, the bounds are + // inaccurate. + if (mContentRecordingSession.getContentToRecord() == RECORD_CONTENT_TASK) { + final Task capturedTask = mRecordedWindowContainer.asTask(); + if (capturedTask.inPinnedWindowingMode()) { ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Unexpectedly null window container; unable to update " - + "recording for display %d", + "Content Recording: Display %d was already recording, but " + + "pause capture since the task is in PIP", mDisplayContent.getDisplayId()); + pauseRecording(); return; } + } - ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Display %d was already recording, so apply " - + "transformations if necessary", - mDisplayContent.getDisplayId()); - // Retrieve the size of the region to record, and continue with the update - // if the bounds or orientation has changed. - final Rect recordedContentBounds = mRecordedWindowContainer.getBounds(); - @Configuration.Orientation int recordedContentOrientation = - mRecordedWindowContainer.getConfiguration().orientation; - if (!mLastRecordedBounds.equals(recordedContentBounds) - || lastOrientation != recordedContentOrientation) { - Point surfaceSize = fetchSurfaceSizeIfPresent(); - if (surfaceSize != null) { - ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Going ahead with updating recording for display " - + "%d to new bounds %s and/or orientation %d.", - mDisplayContent.getDisplayId(), recordedContentBounds, - recordedContentOrientation); - updateMirroredSurface(mRecordedWindowContainer.getSyncTransaction(), - recordedContentBounds, surfaceSize); - } else { - // If the surface removed, do nothing. We will handle this via onDisplayChanged - // (the display will be off if the surface is removed). - ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Unable to update recording for display %d to new " - + "bounds %s and/or orientation %d, since the surface is not " - + "available.", - mDisplayContent.getDisplayId(), recordedContentBounds, - recordedContentOrientation); - } + ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, + "Content Recording: Display %d was already recording, so apply " + + "transformations if necessary", + mDisplayContent.getDisplayId()); + // Retrieve the size of the region to record, and continue with the update + // if the bounds or orientation has changed. + final Rect recordedContentBounds = mRecordedWindowContainer.getBounds(); + @Configuration.Orientation int recordedContentOrientation = + mRecordedWindowContainer.getConfiguration().orientation; + final Point surfaceSize = fetchSurfaceSizeIfPresent(); + if (!mLastRecordedBounds.equals(recordedContentBounds) + || lastOrientation != recordedContentOrientation + || !mLastConsumingSurfaceSize.equals(surfaceSize)) { + if (surfaceSize != null) { + ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, + "Content Recording: Going ahead with updating recording for display " + + "%d to new bounds %s and/or orientation %d and/or surface " + + "size %s", + mDisplayContent.getDisplayId(), recordedContentBounds, + recordedContentOrientation, surfaceSize); + updateMirroredSurface(mRecordedWindowContainer.getSyncTransaction(), + recordedContentBounds, surfaceSize); + } else { + // If the surface removed, do nothing. We will handle this via onDisplayChanged + // (the display will be off if the surface is removed). + ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, + "Content Recording: Unable to update recording for display %d to new " + + "bounds %s and/or orientation %d and/or surface size %s, " + + "since the surface is not available.", + mDisplayContent.getDisplayId(), recordedContentBounds, + recordedContentOrientation, surfaceSize); } } } @@ -292,6 +315,17 @@ final class ContentRecorder implements WindowContainerListener { return; } + // TODO(b/297514518) Do not start capture if the app is in PIP, the bounds are inaccurate. + if (mContentRecordingSession.getContentToRecord() == RECORD_CONTENT_TASK) { + if (mRecordedWindowContainer.asTask().inPinnedWindowingMode()) { + ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, + "Content Recording: Display %d should start recording, but " + + "don't yet since the task is in PIP", + mDisplayContent.getDisplayId()); + return; + } + } + final Point surfaceSize = fetchSurfaceSizeIfPresent(); if (surfaceSize == null) { ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, @@ -305,9 +339,6 @@ final class ContentRecorder implements WindowContainerListener { + "state %d", mDisplayContent.getDisplayId(), mDisplayContent.getDisplayInfo().state); - // TODO(b/274790702): Do not start recording if waiting for consent - for now, - // go ahead. - // Create a mirrored hierarchy for the SurfaceControl of the DisplayArea to capture. mRecordedSurface = SurfaceControl.mirrorSurface( mRecordedWindowContainer.getSurfaceControl()); @@ -476,10 +507,13 @@ final class ContentRecorder implements WindowContainerListener { } ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Apply transformations of shift %d x %d, scale %f, crop %d x " - + "%d for display %d", + "Content Recording: Apply transformations of shift %d x %d, scale %f, crop (aka " + + "recorded content size) %d x %d for display %d; display has size %d x " + + "%d; surface has size %d x %d", shiftedX, shiftedY, scale, recordedContentBounds.width(), - recordedContentBounds.height(), mDisplayContent.getDisplayId()); + recordedContentBounds.height(), mDisplayContent.getDisplayId(), + mDisplayContent.getConfiguration().screenWidthDp, + mDisplayContent.getConfiguration().screenHeightDp, surfaceSize.x, surfaceSize.y); transaction // Crop the area to capture to exclude the 'extra' wallpaper that is used @@ -493,6 +527,8 @@ final class ContentRecorder implements WindowContainerListener { // the content will no longer be centered in the output surface. .setPosition(mRecordedSurface, shiftedX /* x */, shiftedY /* y */); mLastRecordedBounds = new Rect(recordedContentBounds); + mLastConsumingSurfaceSize.x = surfaceSize.x; + mLastConsumingSurfaceSize.y = surfaceSize.y; // Request to notify the client about the resize. mMediaProjectionManager.notifyActiveProjectionCapturedContentResized( mLastRecordedBounds.width(), mLastRecordedBounds.height()); @@ -501,6 +537,7 @@ final class ContentRecorder implements WindowContainerListener { /** * Returns a non-null {@link Point} if the surface is present, or null otherwise */ + @Nullable private Point fetchSurfaceSizeIfPresent() { // Retrieve the default size of the surface the app provided to // MediaProjection#createVirtualDisplay. Note the app is the consumer of the surface, diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 4a4039559de9..47e90ceaca79 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -6061,8 +6061,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mOffTokenAcquirer.release(mDisplayId); } ProtoLog.v(WM_DEBUG_CONTENT_RECORDING, - "Content Recording: Display %d state is now (%d), so update recording?", - mDisplayId, displayState); + "Content Recording: Display %d state was (%d), is now (%d), so update " + + "recording?", + mDisplayId, lastDisplayState, displayState); if (lastDisplayState != displayState) { // If state is on due to surface being added, then start recording. // If state is off due to surface being removed, then stop recording. @@ -6525,14 +6526,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } /** - * @return whether AOD is showing on this display - */ - boolean isAodShowing() { - return mRootWindowContainer.mTaskSupervisor - .getKeyguardController().isAodShowing(mDisplayId); - } - - /** * @return whether this display maintains its own focus and touch mode. */ boolean hasOwnFocus() { diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 119055ae6770..4a740f4fdd2f 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1677,18 +1677,6 @@ public class DisplayPolicy { } private boolean shouldBeHiddenByKeyguard(WindowState win, WindowState imeTarget) { - // If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered - // hidden because it's in the process of hiding, but it's still being shown on screen. - // In that case, we want to continue hiding the IME until the windows have completed - // drawing. This way, we know that the IME can be safely shown since the other windows are - // now shown. - final boolean hideIme = win.mIsImWindow - && (mDisplayContent.isAodShowing() - || (mDisplayContent.isDefaultDisplay && !mWindowManagerDrawComplete)); - if (hideIme) { - return true; - } - if (!mDisplayContent.isDefaultDisplay || !isKeyguardShowing()) { return false; } diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 03f025b1f0f4..d0d7f493b969 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -75,6 +75,18 @@ class InsetsPolicy { /** Used to show system bars permanently. This will affect the layout. */ private final InsetsControlTarget mPermanentControlTarget; + /** + * Used to override the visibility of {@link Type#statusBars()} when dispatching insets to + * clients. + */ + private InsetsControlTarget mFakeStatusControlTarget; + + /** + * Used to override the visibility of {@link Type#navigationBars()} when dispatching insets to + * clients. + */ + private InsetsControlTarget mFakeNavControlTarget; + private WindowState mFocusedWin; private final BarWindow mStatusBar = new BarWindow(StatusBarManager.WINDOW_STATUS_BAR); private final BarWindow mNavBar = new BarWindow(StatusBarManager.WINDOW_NAVIGATION_BAR); @@ -101,25 +113,25 @@ class InsetsPolicy { abortTransient(); } mFocusedWin = focusedWin; + final WindowState notificationShade = mPolicy.getNotificationShade(); + final WindowState topApp = mPolicy.getTopFullscreenOpaqueWindow(); final InsetsControlTarget statusControlTarget = getStatusControlTarget(focusedWin, false /* fake */); + mFakeStatusControlTarget = statusControlTarget == mTransientControlTarget + ? getStatusControlTarget(focusedWin, true /* fake */) + : statusControlTarget == notificationShade + ? getStatusControlTarget(topApp, true /* fake */) + : null; final InsetsControlTarget navControlTarget = getNavControlTarget(focusedWin, false /* fake */); - final WindowState notificationShade = mPolicy.getNotificationShade(); - final WindowState topApp = mPolicy.getTopFullscreenOpaqueWindow(); + mFakeNavControlTarget = navControlTarget == mTransientControlTarget + ? getNavControlTarget(focusedWin, true /* fake */) + : navControlTarget == notificationShade + ? getNavControlTarget(topApp, true /* fake */) + : null; mStateController.onBarControlTargetChanged( - statusControlTarget, - statusControlTarget == mTransientControlTarget - ? getStatusControlTarget(focusedWin, true /* fake */) - : statusControlTarget == notificationShade - ? getStatusControlTarget(topApp, true /* fake */) - : null, - navControlTarget, - navControlTarget == mTransientControlTarget - ? getNavControlTarget(focusedWin, true /* fake */) - : navControlTarget == notificationShade - ? getNavControlTarget(topApp, true /* fake */) - : null); + statusControlTarget, mFakeStatusControlTarget, + navControlTarget, mFakeNavControlTarget); mStatusBar.updateVisibility(statusControlTarget, Type.statusBars()); mNavBar.updateVisibility(navControlTarget, Type.navigationBars()); } @@ -204,7 +216,7 @@ class InsetsPolicy { boolean includesTransient) { InsetsState state; if (!includesTransient) { - state = adjustVisibilityForTransientTypes(originalState); + state = adjustVisibilityForFakeControllingSources(originalState); } else { state = originalState; } @@ -319,21 +331,37 @@ class InsetsPolicy { return state; } - private InsetsState adjustVisibilityForTransientTypes(InsetsState originalState) { + private InsetsState adjustVisibilityForFakeControllingSources(InsetsState originalState) { + if (mFakeStatusControlTarget == null && mFakeNavControlTarget == null) { + return originalState; + } InsetsState state = originalState; for (int i = state.sourceSize() - 1; i >= 0; i--) { final InsetsSource source = state.sourceAt(i); - if (isTransient(source.getType()) && source.isVisible()) { - if (state == originalState) { - // The source will be modified, create a non-deep copy to store the new one. - state = new InsetsState(originalState); - } - // Replace the source with a copy in invisible state. - final InsetsSource outSource = new InsetsSource(source); - outSource.setVisible(false); - state.addSource(outSource); - } + state = adjustVisibilityForFakeControllingSource(state, Type.statusBars(), source, + mFakeStatusControlTarget); + state = adjustVisibilityForFakeControllingSource(state, Type.navigationBars(), source, + mFakeNavControlTarget); + } + return state; + } + + private static InsetsState adjustVisibilityForFakeControllingSource(InsetsState originalState, + @InsetsType int type, InsetsSource source, InsetsControlTarget target) { + if (source.getType() != type || target == null) { + return originalState; } + final boolean isRequestedVisible = target.isRequestedVisible(type); + if (source.isVisible() == isRequestedVisible) { + return originalState; + } + // The source will be modified, create a non-deep copy to store the new one. + final InsetsState state = new InsetsState(originalState); + + // Replace the source with a copy with the overridden visibility. + final InsetsSource outSource = new InsetsSource(source); + outSource.setVisible(isRequestedVisible); + state.addSource(outSource); return state; } diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index 01786becda61..735cbc4e4287 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -33,6 +33,7 @@ import static android.content.pm.ActivityInfo.OVERRIDE_RESPECT_REQUESTED_ORIENTA import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR; import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT; import static android.content.pm.ActivityInfo.OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; @@ -661,6 +662,10 @@ final class LetterboxUiController { @ScreenOrientation int overrideOrientationIfNeeded(@ScreenOrientation int candidate) { if (shouldApplyUserFullscreenOverride()) { + Slog.v(TAG, "Requested orientation " + screenOrientationToString(candidate) + " for " + + mActivityRecord + " is overridden to " + + screenOrientationToString(SCREEN_ORIENTATION_USER) + + " by user aspect ratio settings."); return SCREEN_ORIENTATION_USER; } @@ -668,6 +673,15 @@ final class LetterboxUiController { // orientation. candidate = mActivityRecord.mWmService.mapOrientationRequest(candidate); + if (shouldApplyUserMinAspectRatioOverride() && (!isFixedOrientation(candidate) + || candidate == SCREEN_ORIENTATION_LOCKED)) { + Slog.v(TAG, "Requested orientation " + screenOrientationToString(candidate) + " for " + + mActivityRecord + " is overridden to " + + screenOrientationToString(SCREEN_ORIENTATION_PORTRAIT) + + " by user aspect ratio settings."); + return SCREEN_ORIENTATION_PORTRAIT; + } + if (FALSE.equals(mBooleanPropertyAllowOrientationOverride)) { return candidate; } @@ -1126,11 +1140,25 @@ final class LetterboxUiController { return computeAspectRatio(bounds); } + /** + * Whether we should enable users to resize the current app. + */ + boolean shouldEnableUserAspectRatioSettings() { + // We use mBooleanPropertyAllowUserAspectRatioOverride to allow apps to opt-out which has + // effect only if explicitly false. If mBooleanPropertyAllowUserAspectRatioOverride is null, + // the current app doesn't opt-out so the first part of the predicate is true. + return !FALSE.equals(mBooleanPropertyAllowUserAspectRatioOverride) + && mLetterboxConfiguration.isUserAppAspectRatioSettingsEnabled() + && mActivityRecord.mDisplayContent != null + && mActivityRecord.mDisplayContent.getIgnoreOrientationRequest(); + } + + /** + * Whether we should apply the user aspect ratio override to the min aspect ratio for the + * current app. + */ boolean shouldApplyUserMinAspectRatioOverride() { - if (FALSE.equals(mBooleanPropertyAllowUserAspectRatioOverride) - || !mLetterboxConfiguration.isUserAppAspectRatioSettingsEnabled() - || mActivityRecord.mDisplayContent == null - || !mActivityRecord.mDisplayContent.getIgnoreOrientationRequest()) { + if (!shouldEnableUserAspectRatioSettings()) { return false; } diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java index be9058840492..ee05e355e8ef 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimation.java +++ b/services/core/java/com/android/server/wm/RecentsAnimation.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.app.ActivityManager.PROCESS_STATE_CACHED_ACTIVITY; import static android.app.ActivityManager.START_TASK_TO_FRONT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; @@ -117,6 +118,11 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan return; } if (targetActivity.attachedToProcess()) { + if (targetActivity.app.getCurrentProcState() >= PROCESS_STATE_CACHED_ACTIVITY) { + Slog.v(TAG, "Skip preload recents for cached proc " + targetActivity.app); + // The process may be frozen that cannot receive binder call. + return; + } // The activity may be relaunched if it cannot handle the current configuration // changes. The activity will be paused state if it is relaunched, otherwise it // keeps the original stopped state. diff --git a/services/core/java/com/android/server/wm/SafeActivityOptions.java b/services/core/java/com/android/server/wm/SafeActivityOptions.java index c914fa10687f..c8635335a445 100644 --- a/services/core/java/com/android/server/wm/SafeActivityOptions.java +++ b/services/core/java/com/android/server/wm/SafeActivityOptions.java @@ -148,7 +148,8 @@ public class SafeActivityOptions { .setPendingIntentBackgroundActivityStartMode( options.getPendingIntentBackgroundActivityStartMode()) .setPendingIntentCreatorBackgroundActivityStartMode( - options.getPendingIntentCreatorBackgroundActivityStartMode()); + options.getPendingIntentCreatorBackgroundActivityStartMode()) + .setRemoteTransition(options.getRemoteTransition()); } /** diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index d9881c7c46c5..2bc701000398 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -108,7 +108,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { private final ArraySet<WindowSurfaceController> mAlertWindowSurfaces = new ArraySet<>(); private final DragDropController mDragDropController; final boolean mCanAddInternalSystemWindow; - final boolean mCanForceShowingInsets; + boolean mCanForceShowingInsets; private final boolean mCanStartTasksFromRecents; final boolean mCanCreateSystemApplicationOverlay; diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 9f2aff28cb11..60b6a8879ecf 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -3476,9 +3476,9 @@ class Task extends TaskFragment { } } // User Aspect Ratio Settings is enabled if the app is not in SCM - info.topActivityEligibleForUserAspectRatioButton = - mWmService.mLetterboxConfiguration.isUserAppAspectRatioSettingsEnabled() - && top != null && !info.topActivityInSizeCompat; + info.topActivityEligibleForUserAspectRatioButton = top != null + && !info.topActivityInSizeCompat + && top.mLetterboxUiController.shouldEnableUserAspectRatioSettings(); info.topActivityBoundsLetterboxed = top != null && top.areBoundsLetterboxed(); } diff --git a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java index a27cc3ad9973..ea722b61be6f 100644 --- a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java @@ -184,14 +184,31 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr } void dispose() { + boolean wasVisible = false; for (int i = mOrganizedTaskFragments.size() - 1; i >= 0; i--) { + final TaskFragment taskFragment = mOrganizedTaskFragments.get(i); + if (taskFragment.isVisibleRequested()) { + wasVisible = true; + } // Cleanup the TaskFragmentOrganizer from all TaskFragments it organized before // removing the windows to prevent it from adding any additional TaskFragment // pending event. - final TaskFragment taskFragment = mOrganizedTaskFragments.get(i); taskFragment.onTaskFragmentOrganizerRemoved(); } + final TransitionController transitionController = mAtmService.getTransitionController(); + if (wasVisible && transitionController.isShellTransitionsEnabled() + && !transitionController.isCollecting()) { + final Task task = mOrganizedTaskFragments.get(0).getTask(); + final boolean containsNonEmbeddedActivity = + task != null && task.getActivity(a -> !a.isEmbedded()) != null; + transitionController.requestStartTransition( + transitionController.createTransition(WindowManager.TRANSIT_CLOSE), + // The task will be removed if all its activities are embedded, then the + // task is the trigger. + containsNonEmbeddedActivity ? null : task, + null /* remoteTransition */, null /* displayChange */); + } // Defer to avoid unnecessary layout when there are multiple TaskFragments removal. mAtmService.deferWindowLayout(); try { diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java index 75458302586d..034299659dd5 100644 --- a/services/core/java/com/android/server/wm/TransitionController.java +++ b/services/core/java/com/android/server/wm/TransitionController.java @@ -1147,7 +1147,7 @@ class TransitionController { Transition.asyncTraceBegin("animating", 0x41bfaf1 /* hashcode of TAG */); } else if (!animatingState && mAnimatingState) { t.setEarlyWakeupEnd(); - mAtm.mWindowManager.requestTraversal(); + mAtm.mWindowManager.scheduleAnimationLocked(); mSnapshotController.setPause(false); mAnimatingState = false; Transition.asyncTraceEnd(0x41bfaf1 /* hashcode of TAG */); diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index 805e7ffe7d76..9f1bccb9a27a 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -954,4 +954,11 @@ public abstract class WindowManagerInternal { /** Returns the SurfaceControl accessibility services should use for accessibility overlays. */ public abstract SurfaceControl getA11yOverlayLayer(int displayId); + + /** + * Device has a software navigation bar (separate from the status bar) on specific display. + * + * @param displayId the id of display to check if there is a software navigation bar. + */ + public abstract boolean hasNavigationBar(int displayId); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index b20be551c114..e6a341fe37e7 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -8380,6 +8380,11 @@ public class WindowManagerService extends IWindowManager.Stub } @Override + public boolean hasNavigationBar(int displayId) { + return WindowManagerService.this.hasNavigationBar(displayId); + } + + @Override public void setInputMethodTargetChangeListener(@NonNull ImeTargetChangeListener listener) { synchronized (mGlobalLock) { mImeTargetChangeListener = listener; diff --git a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java index bfe055354b9c..74a0bafd3a4c 100644 --- a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java +++ b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java @@ -1279,6 +1279,7 @@ public class WindowManagerShellCommand extends ShellCommand { mLetterboxConfiguration.resetLetterboxBackgroundWallpaperBlurRadiusPx(); mLetterboxConfiguration.resetLetterboxBackgroundWallpaperDarkScrimAlpha(); mLetterboxConfiguration.resetLetterboxHorizontalPositionMultiplier(); + mLetterboxConfiguration.resetLetterboxVerticalPositionMultiplier(); mLetterboxConfiguration.resetIsHorizontalReachabilityEnabled(); mLetterboxConfiguration.resetIsVerticalReachabilityEnabled(); mLetterboxConfiguration.resetEnabledAutomaticReachabilityInBookMode(); diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java index d8c684fb8c1e..49792746fbc3 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java @@ -96,6 +96,9 @@ public final class CredentialManagerService private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER = "enable_credential_manager"; + private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_DESC_API = + "enable_credential_description_api"; + private final Context mContext; /** Cache of system service list per user id. */ @@ -321,7 +324,14 @@ public final class CredentialManagerService } public static boolean isCredentialDescriptionApiEnabled() { - return true; + final long origId = Binder.clearCallingIdentity(); + try { + return DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_DESC_API, + false); + } finally { + Binder.restoreCallingIdentity(origId); + } } @SuppressWarnings("GuardedBy") // ErrorProne requires initiateProviderSessionForRequestLocked @@ -954,7 +964,7 @@ public final class CredentialManagerService Slog.i(TAG, "registerCredentialDescription with callingPackage: " + callingPackage); if (!isCredentialDescriptionApiEnabled()) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Feature not supported"); } enforceCallingPackage(callingPackage, Binder.getCallingUid()); @@ -974,7 +984,7 @@ public final class CredentialManagerService if (!isCredentialDescriptionApiEnabled()) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Feature not supported"); } enforceCallingPackage(callingPackage, Binder.getCallingUid()); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java index 9c1d765fe0f9..016e85b075a4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java @@ -624,6 +624,27 @@ final class DevicePolicyEngine { } /** + * Retrieves the global policy set by the admin for the provided {@code policyDefinition} and + * if one was set, otherwise returns {@code null}. + */ + @Nullable + <V> V getGlobalPolicySetByAdmin( + @NonNull PolicyDefinition<V> policyDefinition, + @NonNull EnforcingAdmin enforcingAdmin) { + Objects.requireNonNull(policyDefinition); + Objects.requireNonNull(enforcingAdmin); + + synchronized (mLock) { + if (!hasGlobalPolicyLocked(policyDefinition)) { + return null; + } + PolicyValue<V> value = getGlobalPolicyStateLocked(policyDefinition) + .getPoliciesSetByAdmins().get(enforcingAdmin); + return value == null ? null : value.getValue(); + } + } + + /** * Retrieves the values set for the provided {@code policyDefinition} by each admin. */ @NonNull @@ -1451,11 +1472,10 @@ final class DevicePolicyEngine { synchronized (mLock) { clear(); new DevicePoliciesReaderWriter().readFromFileLocked(); - reapplyAllPoliciesLocked(); } } - private <V> void reapplyAllPoliciesLocked() { + <V> void reapplyAllPoliciesLocked() { for (PolicyKey policy : mGlobalPolicies.keySet()) { PolicyState<?> policyState = mGlobalPolicies.get(policy); // Policy definition and value will always be of the same type diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 9515b7958355..6885a89c507e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2144,9 +2144,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mUserManagerInternal.addUserLifecycleListener(new UserLifecycleListener()); mDeviceManagementResourcesProvider.load(); - if (isPermissionCheckFlagEnabled() || isPolicyEngineForFinanceFlagEnabled()) { - mDevicePolicyEngine.load(); - } + mDevicePolicyEngine.load(); mContactSystemRoleHolders = fetchOemSystemHolders(/* roleResIds...= */ com.android.internal.R.string.config_defaultSms, @@ -3380,6 +3378,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mOwners.systemReady(); applyManagedSubscriptionsPolicyIfRequired(); break; + case SystemService.PHASE_SYSTEM_SERVICES_READY: + synchronized (getLockObject()) { + mDevicePolicyEngine.reapplyAllPoliciesLocked(); + } + break; case SystemService.PHASE_ACTIVITY_MANAGER_READY: synchronized (getLockObject()) { migrateToProfileOnOrganizationOwnedDeviceIfCompLocked(); @@ -9329,16 +9332,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } int affectedUserId = parent ? getProfileParentId(userHandle) : userHandle; - if (isPolicyEngineForFinanceFlagEnabled()) { PolicyDefinition<Boolean> policy = PolicyDefinition.getPolicyDefinitionForUserRestriction( UserManager.DISALLOW_CAMERA); if (who != null) { EnforcingAdmin admin = getEnforcingAdminForCaller(who, callerPackageName); - return Boolean.TRUE.equals( - mDevicePolicyEngine.getLocalPolicySetByAdmin( - policy, admin, affectedUserId)); + Boolean value = null; + if (isDeviceOwner(caller)) { + value = mDevicePolicyEngine.getGlobalPolicySetByAdmin(policy, admin); + } else { + value = mDevicePolicyEngine.getLocalPolicySetByAdmin( + policy, admin, affectedUserId); + } + return Boolean.TRUE.equals(value); } else { return Boolean.TRUE.equals( mDevicePolicyEngine.getResolvedPolicy(policy, affectedUserId)); @@ -16562,6 +16569,83 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } /** + * @param restriction The restriction enforced by admin. It could be any user restriction or + * policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA}, + * {@link DevicePolicyManager#POLICY_DISABLE_SCREEN_CAPTURE} and {@link + * DevicePolicyManager#POLICY_SUSPEND_PACKAGES}. + */ + private Set<android.app.admin.EnforcingAdmin> getEnforcingAdminsForRestrictionInternal( + int userId, @NonNull String restriction) { + Objects.requireNonNull(restriction); + Set<android.app.admin.EnforcingAdmin> admins = new HashSet<>(); + // For POLICY_SUSPEND_PACKAGES return PO or DO to keep the behavior same as + // before the bug fix for b/192245204. + if (DevicePolicyManager.POLICY_SUSPEND_PACKAGES.equals( + restriction)) { + ComponentName profileOwner = mOwners.getProfileOwnerComponent(userId); + if (profileOwner != null) { + EnforcingAdmin admin = EnforcingAdmin.createEnterpriseEnforcingAdmin( + profileOwner, userId); + admins.add(admin.getParcelableAdmin()); + return admins; + } + final Pair<Integer, ComponentName> deviceOwner = + mOwners.getDeviceOwnerUserIdAndComponent(); + if (deviceOwner != null && deviceOwner.first == userId) { + EnforcingAdmin admin = EnforcingAdmin.createEnterpriseEnforcingAdmin( + deviceOwner.second, deviceOwner.first); + admins.add(admin.getParcelableAdmin()); + return admins; + } + } else { + long ident = mInjector.binderClearCallingIdentity(); + try { + PolicyDefinition<Boolean> policyDefinition = getPolicyDefinitionForRestriction( + restriction); + Boolean value = mDevicePolicyEngine.getResolvedPolicy(policyDefinition, userId); + if (value != null && value) { + Map<EnforcingAdmin, PolicyValue<Boolean>> globalPolicies = + mDevicePolicyEngine.getGlobalPoliciesSetByAdmins(policyDefinition); + for (EnforcingAdmin admin : globalPolicies.keySet()) { + if (globalPolicies.get(admin) != null + && Boolean.TRUE.equals(globalPolicies.get(admin).getValue())) { + admins.add(admin.getParcelableAdmin()); + } + } + + Map<EnforcingAdmin, PolicyValue<Boolean>> localPolicies = + mDevicePolicyEngine.getLocalPoliciesSetByAdmins( + policyDefinition, userId); + for (EnforcingAdmin admin : localPolicies.keySet()) { + if (localPolicies.get(admin) != null + && Boolean.TRUE.equals(localPolicies.get(admin).getValue())) { + admins.add(admin.getParcelableAdmin()); + } + } + return admins; + } + } finally { + mInjector.binderRestoreCallingIdentity(ident); + } + } + return admins; + } + + private static PolicyDefinition<Boolean> getPolicyDefinitionForRestriction( + @NonNull String restriction) { + Objects.requireNonNull(restriction); + if (DevicePolicyManager.POLICY_DISABLE_CAMERA.equals(restriction)) { + return PolicyDefinition.getPolicyDefinitionForUserRestriction( + UserManager.DISALLOW_CAMERA); + } else if (DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE.equals(restriction)) { + return PolicyDefinition.SCREEN_CAPTURE_DISABLED; + } else { + return PolicyDefinition.getPolicyDefinitionForUserRestriction(restriction); + } + } + + + /** * Excludes restrictions imposed by UserManager. */ private List<UserManager.EnforcingUser> getDevicePolicySources( @@ -16599,6 +16683,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return getEnforcingAdminAndUserDetailsInternal(userId, restriction); } + @Override + public List<android.app.admin.EnforcingAdmin> getEnforcingAdminsForRestriction( + int userId, String restriction) { + Preconditions.checkCallAuthorization(isSystemUid(getCallerIdentity())); + return new ArrayList<>(getEnforcingAdminsForRestrictionInternal(userId, restriction)); + } + /** * @param restriction The restriction enforced by admin. It could be any user restriction or * policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA} and diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/EnforcingAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/EnforcingAdmin.java index 5243d14af1ab..006642235615 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/EnforcingAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/EnforcingAdmin.java @@ -228,7 +228,8 @@ final class EnforcingAdmin { return new android.app.admin.EnforcingAdmin( mPackageName, authority, - UserHandle.of(mUserId)); + UserHandle.of(mUserId), + mComponentName); } /** diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java index c39bb56e7ba1..9d309e9a9433 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java @@ -1104,6 +1104,21 @@ public final class DisplayPowerController2Test { verify(mDisplayWhiteBalanceControllerMock, times(1)).setStrongModeEnabled(true); } + @Test + public void testPowerStateStopsOnDpcStop() { + // Set up + DisplayPowerRequest dpr = new DisplayPowerRequest(); + mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); + advanceTime(1); + + // Stop dpc + mHolder.dpc.stop(); + advanceTime(1); + + // Ensure dps has stopped + verify(mHolder.displayPowerState, times(1)).stop(); + } + /** * Creates a mock and registers it to {@link LocalServices}. */ diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java index 0544376959ee..b9969ceb6ec0 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java @@ -1106,6 +1106,21 @@ public final class DisplayPowerControllerTest { verify(mDisplayWhiteBalanceControllerMock, times(1)).setStrongModeEnabled(true); } + @Test + public void testPowerStateStopsOnDpcStop() { + // Set up + DisplayPowerRequest dpr = new DisplayPowerRequest(); + mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false); + advanceTime(1); + + // Stop dpc + mHolder.dpc.stop(); + advanceTime(1); + + // Ensure dps has stopped + verify(mHolder.displayPowerState, times(1)).stop(); + } + /** * Creates a mock and registers it to {@link LocalServices}. */ diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java new file mode 100644 index 000000000000..167a412d3860 --- /dev/null +++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerStateTest.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.display; + +import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; + +import static org.mockito.Mockito.times; + +import android.os.Handler; +import android.os.test.TestLooper; +import android.view.Display; + +import androidx.test.filters.SmallTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + + +@SmallTest +public class DisplayPowerStateTest { + private static final int DISPLAY_ID = 123; + + private DisplayPowerState mDisplayPowerState; + private TestLooper mTestLooper; + @Mock + private DisplayBlanker mDisplayBlankerMock; + @Mock + private ColorFade mColorFadeMock; + + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + + @Before + public void setUp() { + mTestLooper = new TestLooper(); + mDisplayPowerState = new DisplayPowerState( + mDisplayBlankerMock, mColorFadeMock, DISPLAY_ID, Display.STATE_ON, + new Handler(mTestLooper.getLooper())); + } + + @Test + public void testColorFadeStopsOnDpsStop() { + mDisplayPowerState.stop(); + verify(mColorFadeMock, times(1)).stop(); + } +} diff --git a/services/tests/displayservicetests/src/com/android/server/display/RampAnimatorTest.java b/services/tests/displayservicetests/src/com/android/server/display/RampAnimatorTest.java new file mode 100644 index 000000000000..2820da7c49c1 --- /dev/null +++ b/services/tests/displayservicetests/src/com/android/server/display/RampAnimatorTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.display; + +import static org.junit.Assert.assertEquals; + +import android.util.FloatProperty; + +import androidx.test.filters.SmallTest; + +import org.junit.Before; +import org.junit.Test; + +@SmallTest +public class RampAnimatorTest { + + private RampAnimator<TestObject> mRampAnimator; + + private final TestObject mTestObject = new TestObject(); + + private final FloatProperty<TestObject> mTestProperty = new FloatProperty<>("mValue") { + @Override + public void setValue(TestObject object, float value) { + object.mValue = value; + } + + @Override + public Float get(TestObject object) { + return object.mValue; + } + }; + + @Before + public void setUp() { + mRampAnimator = new RampAnimator<>(mTestObject, mTestProperty); + } + + @Test + public void testInitialValueUsedInLastAnimationStep() { + mRampAnimator.setAnimationTarget(0.67f, 0.1f); + + assertEquals(0.67f, mTestObject.mValue, 0); + } + + private static class TestObject { + private float mValue; + } +} diff --git a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java index 9545a8a4544b..3d7ae349628e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java @@ -1862,6 +1862,13 @@ public class MockingOomAdjusterTests { assertProcStates(app2, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ, SCHED_GROUP_DEFAULT); assertBfsl(app2); + + bindService(client2, app1, null, 0, mock(IBinder.class)); + bindService(app1, client2, null, 0, mock(IBinder.class)); + client2.mServices.setHasForegroundServices(false, 0, /* hasNoneType=*/false); + updateOomAdj(app1, client1, client2); + assertProcStates(app1, PROCESS_STATE_IMPORTANT_FOREGROUND, VISIBLE_APP_ADJ, + SCHED_GROUP_TOP_APP); } @SuppressWarnings("GuardedBy") diff --git a/services/tests/servicestests/src/com/android/server/am/FgsLoggerTest.java b/services/tests/servicestests/src/com/android/server/am/FgsLoggerTest.java index f5005fdf1459..38bb3dea6ee3 100644 --- a/services/tests/servicestests/src/com/android/server/am/FgsLoggerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/FgsLoggerTest.java @@ -152,6 +152,50 @@ public class FgsLoggerTest { } @Test + public void testApiStartStopFgs() throws InterruptedException { + ServiceRecord record = ServiceRecord.newEmptyInstanceForTest(null); + record.foregroundServiceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; + + mFgsLogger.logForegroundServiceApiEventBegin(FOREGROUND_SERVICE_API_TYPE_CAMERA, + 1, 1, "aPackageHasNoName"); + Thread.sleep(2000); + + resetAndVerifyZeroInteractions(); + + mFgsLogger.logForegroundServiceApiEventEnd(FOREGROUND_SERVICE_API_TYPE_CAMERA, 1, 1); + + resetAndVerifyZeroInteractions(); + + mFgsLogger.logForegroundServiceStart(1, 1, record); + + resetAndVerifyZeroInteractions(); + } + + @Test + public void testFgsStartStopApiStartStop() throws InterruptedException { + ServiceRecord record = ServiceRecord.newEmptyInstanceForTest(null); + record.foregroundServiceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; + + mFgsLogger.logForegroundServiceStart(1, 1, record); + + resetAndVerifyZeroInteractions(); + + mFgsLogger.logForegroundServiceStop(1, record); + + resetAndVerifyZeroInteractions(); + + mFgsLogger.logForegroundServiceApiEventBegin(FOREGROUND_SERVICE_API_TYPE_CAMERA, + 1, 1, "aPackageHasNoName"); + Thread.sleep(2000); + + resetAndVerifyZeroInteractions(); + + mFgsLogger.logForegroundServiceApiEventEnd(FOREGROUND_SERVICE_API_TYPE_CAMERA, 1, 1); + + resetAndVerifyZeroInteractions(); + } + + @Test public void testMultipleStartStopApis() throws InterruptedException { ServiceRecord record = ServiceRecord.newEmptyInstanceForTest(null); record.foregroundServiceType = ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA; diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java index 769be177ce03..0f3daec263e0 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java @@ -182,7 +182,8 @@ public class AuthSessionTest { eq(TEST_PACKAGE), eq(TEST_REQUEST_ID), eq(sensor.getCookie()), - anyBoolean() /* allowBackgroundAuthentication */); + anyBoolean() /* allowBackgroundAuthentication */, + anyBoolean() /* isForLegacyFingerprintManager */); } final int cookie1 = session.mPreAuthInfo.eligibleSensors.get(0).getCookie(); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java index fa6e7f60c1b0..ba77390d5e3f 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java @@ -87,6 +87,8 @@ public class AuthenticationStatsCollectorTest { public void setUp() { when(mContext.getResources()).thenReturn(mResources); + when(mResources.getBoolean(eq(R.bool.config_biometricFrrNotificationEnabled))) + .thenReturn(true); when(mResources.getFraction(eq(R.fraction.config_biometricNotificationFrrThreshold), anyInt(), anyInt())).thenReturn(FRR_THRESHOLD); @@ -109,7 +111,6 @@ public class AuthenticationStatsCollectorTest { 0 /* modality */, mBiometricNotification); } - @Test public void authenticate_authenticationSucceeded_mapShouldBeUpdated() { // Assert that the user doesn't exist in the map initially. @@ -341,4 +342,32 @@ public class AuthenticationStatsCollectorTest { // Assert that notification count has been updated. assertThat(authenticationStats.getEnrollmentNotifications()).isEqualTo(1); } + + @Test + public void authenticate_featureDisabled_mapMustNotBeUpdated() { + // Disable the feature. + when(mResources.getBoolean(eq(R.bool.config_biometricFrrNotificationEnabled))) + .thenReturn(false); + AuthenticationStatsCollector authenticationStatsCollector = + new AuthenticationStatsCollector(mContext, 0 /* modality */, + mBiometricNotification); + + authenticationStatsCollector.setAuthenticationStatsForUser(USER_ID_1, + new AuthenticationStats(USER_ID_1, 500 /* totalAttempts */, + 400 /* rejectedAttempts */, 0 /* enrollmentNotifications */, + 0 /* modality */)); + + authenticationStatsCollector.authenticate(USER_ID_1, false /* authenticated */); + + // Assert that no notification should be sent. + verify(mBiometricNotification, never()).sendFaceEnrollNotification(any()); + verify(mBiometricNotification, never()).sendFpEnrollNotification(any()); + // Assert that data hasn't been updated. + AuthenticationStats authenticationStats = authenticationStatsCollector + .getAuthenticationStatsForUser(USER_ID_1); + assertThat(authenticationStats.getTotalAttempts()).isEqualTo(500); + assertThat(authenticationStats.getRejectedAttempts()).isEqualTo(400); + assertThat(authenticationStats.getEnrollmentNotifications()).isEqualTo(0); + assertThat(authenticationStats.getFrr()).isWithin(0f).of(0.8f); + } } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java index e79ac0986dc8..0230d77e8e14 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java @@ -598,7 +598,8 @@ public class BiometricServiceTest { anyString() /* opPackageName */, eq(TEST_REQUEST_ID), cookieCaptor.capture() /* cookie */, - anyBoolean() /* allowBackgroundAuthentication */); + anyBoolean() /* allowBackgroundAuthentication */, + anyBoolean() /* isForLegacyFingerprintManager */); // onReadyForAuthentication, mAuthSession state OK mBiometricService.mImpl.onReadyForAuthentication(TEST_REQUEST_ID, cookieCaptor.getValue()); diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java index 046b01c831b5..9e5a0479ea70 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java @@ -36,6 +36,7 @@ import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.content.ComponentName; +import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.common.AuthenticateReason; import android.hardware.biometrics.common.ICancellationSignal; import android.hardware.biometrics.common.OperationContext; @@ -109,6 +110,8 @@ public class FaceAuthenticationClientTest { private ICancellationSignal mCancellationSignal; @Mock private AuthSessionCoordinator mAuthSessionCoordinator; + @Mock + private BiometricManager mBiometricManager; @Captor private ArgumentCaptor<OperationContextExt> mOperationContextCaptor; @Captor @@ -119,6 +122,7 @@ public class FaceAuthenticationClientTest { @Before public void setup() { + mContext.addMockSystemService(BiometricManager.class, mBiometricManager); when(mBiometricContext.updateContext(any(), anyBoolean())).thenAnswer( i -> i.getArgument(0)); when(mBiometricContext.getAuthSessionCoordinator()).thenReturn(mAuthSessionCoordinator); @@ -212,11 +216,44 @@ public class FaceAuthenticationClientTest { .onError(anyInt(), anyInt(), eq(BIOMETRIC_ERROR_CANCELED), anyInt()); } + @Test + public void testOnAuthenticatedFalseWhenListenerIsNull() throws RemoteException { + final FaceAuthenticationClient client = createClientWithNullListener(); + client.start(mCallback); + client.onAuthenticated(new Face("friendly", 1 /* faceId */, 2 /* deviceId */), + false /* authenticated */, new ArrayList<>()); + + verify(mCallback).onClientFinished(client, true); + } + + @Test + public void testOnAuthenticatedTrueWhenListenerIsNull() throws RemoteException { + final FaceAuthenticationClient client = createClientWithNullListener(); + client.start(mCallback); + client.onAuthenticated(new Face("friendly", 1 /* faceId */, 2 /* deviceId */), + true /* authenticated */, new ArrayList<>()); + + verify(mCallback).onClientFinished(client, true); + } + private FaceAuthenticationClient createClient() throws RemoteException { - return createClient(2 /* version */); + return createClient(2 /* version */, mClientMonitorCallbackConverter, + false /* allowBackgroundAuthentication */); + } + + private FaceAuthenticationClient createClientWithNullListener() throws RemoteException { + return createClient(2 /* version */, null /* listener */, + true /* allowBackgroundAuthentication */); } private FaceAuthenticationClient createClient(int version) throws RemoteException { + return createClient(version, mClientMonitorCallbackConverter, + false /* allowBackgroundAuthentication */); + } + + private FaceAuthenticationClient createClient(int version, + ClientMonitorCallbackConverter listener, + boolean allowBackgroundAuthentication) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); final AidlSession aidl = new AidlSession(version, mHal, USER_ID, mHalSessionCallback); @@ -229,11 +266,11 @@ public class FaceAuthenticationClientTest { FaceAuthenticateOptions.AUTHENTICATE_REASON_ASSISTANT_VISIBLE) .build(); return new FaceAuthenticationClient(mContext, () -> aidl, mToken, - 2 /* requestId */, mClientMonitorCallbackConverter, OP_ID, + 2 /* requestId */, listener, OP_ID, false /* restricted */, options, 4 /* cookie */, false /* requireConfirmation */, mBiometricLogger, mBiometricContext, true /* isStrongBiometric */, - mUsageStats, null /* mLockoutCache */, false /* allowBackgroundAuthentication */, + mUsageStats, null /* mLockoutCache */, allowBackgroundAuthentication, null /* sensorPrivacyManager */, 0 /* biometricStrength */) { @Override protected ActivityTaskManager getActivityTaskManager() { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java index 46af90537c03..8a11e31014d5 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java @@ -392,7 +392,6 @@ public class FingerprintAuthenticationClientTest { final ActivityManager.RunningTaskInfo topTask = new ActivityManager.RunningTaskInfo(); topTask.topActivity = new ComponentName("other", "thing"); when(mActivityTaskManager.getTasks(anyInt())).thenReturn(List.of(topTask)); - when(mHal.authenticateWithContext(anyLong(), any())).thenReturn(mCancellationSignal); final FingerprintAuthenticationClient client = createClientWithoutBackgroundAuth(); client.start(mCallback); @@ -406,21 +405,50 @@ public class FingerprintAuthenticationClientTest { .onError(anyInt(), anyInt(), eq(BIOMETRIC_ERROR_CANCELED), anyInt()); } + @Test + public void testOnAuthenticatedFalseWhenListenerIsNull() throws RemoteException { + final FingerprintAuthenticationClient client = createClientWithNullListener(); + client.start(mCallback); + client.onAuthenticated(new Fingerprint("friendly", 1 /* fingerId */, + 2 /* deviceId */), false /* authenticated */, new ArrayList<>()); + + verify(mCallback, never()).onClientFinished(eq(client), anyBoolean()); + } + + @Test + public void testOnAuthenticatedTrueWhenListenerIsNull() throws RemoteException { + final FingerprintAuthenticationClient client = createClientWithNullListener(); + client.start(mCallback); + client.onAuthenticated(new Fingerprint("friendly", 1 /* fingerId */, + 2 /* deviceId */), true /* authenticated */, new ArrayList<>()); + + verify(mCallback).onClientFinished(client, true); + } + private FingerprintAuthenticationClient createClient() throws RemoteException { - return createClient(100 /* version */, true /* allowBackgroundAuthentication */); + return createClient(100 /* version */, true /* allowBackgroundAuthentication */, + mClientMonitorCallbackConverter); } private FingerprintAuthenticationClient createClientWithoutBackgroundAuth() throws RemoteException { - return createClient(100 /* version */, false /* allowBackgroundAuthentication */); + return createClient(100 /* version */, false /* allowBackgroundAuthentication */, + mClientMonitorCallbackConverter); } private FingerprintAuthenticationClient createClient(int version) throws RemoteException { - return createClient(version, true /* allowBackgroundAuthentication */); + return createClient(version, true /* allowBackgroundAuthentication */, + mClientMonitorCallbackConverter); + } + + private FingerprintAuthenticationClient createClientWithNullListener() throws RemoteException { + return createClient(100 /* version */, true /* allowBackgroundAuthentication */, + null /* listener */); } private FingerprintAuthenticationClient createClient(int version, - boolean allowBackgroundAuthentication) throws RemoteException { + boolean allowBackgroundAuthentication, ClientMonitorCallbackConverter listener) + throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); final AidlSession aidl = new AidlSession(version, mHal, USER_ID, mHalSessionCallback); @@ -430,7 +458,7 @@ public class FingerprintAuthenticationClientTest { .setSensorId(9) .build(); return new FingerprintAuthenticationClient(mContext, () -> aidl, mToken, - REQUEST_ID, mClientMonitorCallbackConverter, OP_ID, + REQUEST_ID, listener, OP_ID, false /* restricted */, options, 4 /* cookie */, false /* requireConfirmation */, mBiometricLogger, mBiometricContext, diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java index 20d5f93a2c07..78d3a9dd9f9e 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClientTest.java @@ -19,6 +19,7 @@ package com.android.server.biometrics.sensors.fingerprint.aidl; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; @@ -147,6 +148,24 @@ public class FingerprintDetectClientTest { verify(mBiometricContext).unsubscribe(same(mOperationContextCaptor.getValue())); } + @Test + public void testWhenListenerIsNull() { + final AidlSession aidl = new AidlSession(0, mHal, USER_ID, mHalSessionCallback); + final FingerprintDetectClient client = new FingerprintDetectClient(mContext, () -> aidl, + mToken, 6 /* requestId */, null /* listener */, + new FingerprintAuthenticateOptions.Builder() + .setUserId(2) + .setSensorId(1) + .setOpPackageName("a-test") + .build(), + mBiometricLogger, mBiometricContext, + mUdfpsOverlayController, true /* isStrongBiometric */); + client.start(mCallback); + client.onInteractionDetected(); + + verify(mCallback).onClientFinished(eq(client), anyBoolean()); + } + private FingerprintDetectClient createClient() throws RemoteException { return createClient(200 /* version */); } diff --git a/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java index ddd1221e4c91..d85768dd7588 100644 --- a/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java @@ -79,6 +79,9 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * Tests for the {@link MediaProjectionManagerService} class. * @@ -202,6 +205,29 @@ public class MediaProjectionManagerServiceTest { } @Test + public void testCreateProjection_priorProjectionGrant() throws + NameNotFoundException, InterruptedException { + // Create a first projection. + MediaProjectionManagerService.MediaProjection projection = startProjectionPreconditions(); + FakeIMediaProjectionCallback callback1 = new FakeIMediaProjectionCallback(); + projection.start(callback1); + + // Create a second projection. + MediaProjectionManagerService.MediaProjection secondProjection = + startProjectionPreconditions(); + FakeIMediaProjectionCallback callback2 = new FakeIMediaProjectionCallback(); + secondProjection.start(callback2); + + // Check that the first projection get stopped, but not the second projection. + final int timeout = 5; + boolean stoppedCallback1 = callback1.mLatch.await(timeout, TimeUnit.SECONDS); + boolean stoppedCallback2 = callback2.mLatch.await(timeout, TimeUnit.SECONDS); + + assertThat(stoppedCallback1).isTrue(); + assertThat(stoppedCallback2).isFalse(); + } + + @Test public void testCreateProjection_attemptReuse_noPriorProjectionGrant() throws NameNotFoundException { // Create a first projection. @@ -785,8 +811,10 @@ public class MediaProjectionManagerServiceTest { } private static class FakeIMediaProjectionCallback extends IMediaProjectionCallback.Stub { + CountDownLatch mLatch = new CountDownLatch(1); @Override public void onStop() throws RemoteException { + mLatch.countDown(); } @Override diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java index 2273fcd22b38..9f75cf8d552e 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java @@ -113,6 +113,42 @@ public class UserManagerServiceUserInfoTest { assertUserInfoEquals(data.info, read.info, /* parcelCopy= */ false); } + /** Tests that device policy restrictions are written/read properly. */ + @Test + public void testWriteReadDevicePolicyUserRestrictions() throws Exception { + final String globalRestriction = UserManager.DISALLOW_FACTORY_RESET; + final String localRestriction = UserManager.DISALLOW_CONFIG_DATE_TIME; + + UserData data = new UserData(); + data.info = createUser(100, FLAG_FULL, "A type"); + + mUserManagerService.putUserInfo(data.info); + + // Set a global and user restriction so they get written out to the user file. + setUserRestrictions(data.info.id, globalRestriction, localRestriction, true); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream out = new DataOutputStream(baos); + mUserManagerService.writeUserLP(data, out); + byte[] bytes = baos.toByteArray(); + + // Clear the restrictions to see if they are properly read in from the user file. + setUserRestrictions(data.info.id, globalRestriction, localRestriction, false); + + mUserManagerService.readUserLP(data.info.id, new ByteArrayInputStream(bytes)); + assertTrue(mUserManagerService.hasUserRestrictionOnAnyUser(globalRestriction)); + assertTrue(mUserManagerService.hasUserRestrictionOnAnyUser(localRestriction)); + } + + /** Sets a global and local restriction and verifies they were set properly **/ + private void setUserRestrictions(int id, String global, String local, boolean enabled) { + mUserManagerService.setUserRestrictionInner(UserHandle.USER_ALL, global, enabled); + assertEquals(mUserManagerService.hasUserRestrictionOnAnyUser(global), enabled); + + mUserManagerService.setUserRestrictionInner(id, local, enabled); + assertEquals(mUserManagerService.hasUserRestrictionOnAnyUser(local), enabled); + } + @Test public void testParcelUnparcelUserInfo() throws Exception { UserInfo info = createUser(); diff --git a/services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java b/services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java index 1ba14623f04e..a2dc5d8cd4cc 100644 --- a/services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java +++ b/services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsHistoryTest.java @@ -37,7 +37,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.os.BatteryStatsHistory; import com.android.internal.os.BatteryStatsHistoryIterator; -import com.android.internal.os.Clock; import org.junit.Before; import org.junit.Test; @@ -64,8 +63,9 @@ public class BatteryStatsHistoryTest { private final Parcel mHistoryBuffer = Parcel.obtain(); private File mSystemDir; private File mHistoryDir; - private final Clock mClock = new MockClock(); + private final MockClock mClock = new MockClock(); private BatteryStatsHistory mHistory; + private BatteryStats.HistoryPrinter mHistoryPrinter; @Mock private BatteryStatsHistory.TraceDelegate mTracer; @Mock @@ -89,6 +89,8 @@ public class BatteryStatsHistoryTest { when(mStepDetailsCalculator.getHistoryStepDetails()) .thenReturn(new BatteryStats.HistoryStepDetails()); + + mHistoryPrinter = new BatteryStats.HistoryPrinter(); } @Test @@ -366,11 +368,95 @@ public class BatteryStatsHistoryTest { assertThat(checkin).contains("XC,10321,400,500,600"); } + @Test + public void largeTagPool() { + // Keep the preserved part of history short - we only need to capture the very tail of + // history. + mHistory = new BatteryStatsHistory(mHistoryBuffer, mSystemDir, 1, 6000, + mStepDetailsCalculator, mClock, mTracer); + + mHistory.forceRecordAllHistory(); + + mClock.realtime = 2_000_000; + mClock.uptime = 1_000_000; + // More than 32k strings + final int tagCount = 0x7FFF + 20; + for (int tag = 0; tag < tagCount;) { + mClock.realtime += 10; + mClock.uptime += 10; + mHistory.recordEvent(mClock.realtime, mClock.uptime, HistoryItem.EVENT_ALARM_START, + "a" + (tag++), 42); + + mHistory.setBatteryState(true, BatteryManager.BATTERY_STATUS_CHARGING, tag % 50, 0); + mClock.realtime += 10; + mClock.uptime += 10; + mHistory.recordWakelockStartEvent(mClock.realtime, mClock.uptime, "w" + tag, 42); + mClock.realtime += 10; + mClock.uptime += 10; + mHistory.recordWakelockStopEvent(mClock.realtime, mClock.uptime, "w" + tag, 42); + tag++; + + mHistory.recordWakeupEvent(mClock.realtime, mClock.uptime, "wr" + (tag++)); + } + + int eventTagsPooled = 0; + int eventTagsUnpooled = 0; + int wakelockTagsPooled = 0; + int wakelockTagsUnpooled = 0; + int wakeReasonTagsPooled = 0; + int wakeReasonTagsUnpooled = 0; + for (BatteryStatsHistoryIterator iterator = mHistory.iterate(); iterator.hasNext(); ) { + HistoryItem item = iterator.next(); + if (item.cmd != HistoryItem.CMD_UPDATE) { + continue; + } + String checkinDump = toString(item, true); + if (item.eventCode == HistoryItem.EVENT_ALARM_START) { + if (item.eventTag.poolIdx != BatteryStats.HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { + eventTagsPooled++; + assertThat(checkinDump).contains("+Eal=" + item.eventTag.poolIdx); + } else { + eventTagsUnpooled++; + assertThat(checkinDump).contains("+Eal=42:\"" + item.eventTag.string + "\""); + } + } + + if (item.wakelockTag != null) { + if (item.wakelockTag.poolIdx != BatteryStats.HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { + wakelockTagsPooled++; + assertThat(checkinDump).contains("w=" + item.wakelockTag.poolIdx); + } else { + wakelockTagsUnpooled++; + assertThat(checkinDump).contains("w=42:\"" + item.wakelockTag.string + "\""); + } + } + + if (item.wakeReasonTag != null) { + if (item.wakeReasonTag.poolIdx + != BatteryStats.HistoryTag.HISTORY_TAG_POOL_OVERFLOW) { + wakeReasonTagsPooled++; + assertThat(checkinDump).contains("wr=" + item.wakeReasonTag.poolIdx); + } else { + wakeReasonTagsUnpooled++; + assertThat(checkinDump).contains("wr=0:\"" + item.wakeReasonTag.string + "\""); + } + } + } + + // Self-check - ensure that we have all cases represented in the test + assertThat(eventTagsPooled).isGreaterThan(0); + assertThat(eventTagsUnpooled).isGreaterThan(0); + assertThat(wakelockTagsPooled).isGreaterThan(0); + assertThat(wakelockTagsUnpooled).isGreaterThan(0); + assertThat(wakeReasonTagsPooled).isGreaterThan(0); + assertThat(wakeReasonTagsUnpooled).isGreaterThan(0); + } + private String toString(BatteryStats.HistoryItem item, boolean checkin) { BatteryStats.HistoryPrinter printer = new BatteryStats.HistoryPrinter(); StringWriter writer = new StringWriter(); PrintWriter pw = new PrintWriter(writer); - printer.printNextItem(pw, item, 0, checkin, /* verbose */ true); + mHistoryPrinter.printNextItem(pw, item, 0, checkin, /* verbose */ false); pw.flush(); return writer.toString(); } diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java index f158ce14549f..9d2b34cc6ba5 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java @@ -84,6 +84,7 @@ import android.view.Display; import android.view.InputDevice; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import com.android.internal.app.IBatteryStats; import com.android.internal.util.FrameworkStatsLog; @@ -813,6 +814,7 @@ public class VibratorManagerServiceTest { eq(AudioAttributes.USAGE_UNKNOWN), anyInt(), anyString()); } + @FlakyTest @Test public void vibrate_withOngoingRepeatingVibration_ignoresEffect() throws Exception { mockVibrators(1); @@ -899,6 +901,7 @@ public class VibratorManagerServiceTest { cancelVibrate(service); // Clean up repeating effect. } + @FlakyTest @Test public void vibrate_withNewSameImportanceVibrationButOngoingIsRepeating_ignoreNewVibration() throws Exception { @@ -952,6 +955,7 @@ public class VibratorManagerServiceTest { cancelVibrate(service); // Clean up repeating effect. } + @FlakyTest @Test public void vibrate_withNewUnknownUsageVibrationAndNotRepeating_ignoreNewVibration() throws Exception { @@ -1687,6 +1691,7 @@ public class VibratorManagerServiceTest { cancelVibrate(service); // Clean up long effect. } + @FlakyTest @Test public void onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration() throws Exception { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java index b522cab0801b..5147a08b5216 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java @@ -28,6 +28,7 @@ import static com.android.server.notification.NotificationRecordLogger.Notificat import static com.android.server.notification.NotificationRecordLogger.NotificationCancelledEvent.NOTIFICATION_CANCEL_USER_OTHER; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_POSTED; import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_UPDATED; +import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -48,6 +49,8 @@ import com.android.internal.util.FrameworkStatsLog; import org.junit.Test; import org.junit.runner.RunWith; +import java.time.Duration; + @SmallTest @RunWith(AndroidJUnit4.class) @@ -230,4 +233,12 @@ public class NotificationRecordLoggerTest extends UiServiceTestCase { NotificationRecordLogger.NotificationCancelledEvent.fromCancelReason( REASON_CANCEL, DISMISSAL_OTHER)); } + + @Test + public void testGetAgeInMinutes() { + long postTimeMs = Duration.ofMinutes(5).toMillis(); + long whenMs = Duration.ofMinutes(2).toMillis(); + int age = NotificationRecordLogger.getAgeInMinutes(postTimeMs, whenMs); + assertThat(age).isEqualTo(3); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java index 4290f4b9ee80..f5866406f635 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java @@ -242,26 +242,27 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { displayInfo.copyFrom(mDisplayInfo); displayInfo.type = Display.TYPE_VIRTUAL; DisplayContent virtualDisplay = createNewDisplay(displayInfo); + final KeyguardController keyguardController = mSupervisor.getKeyguardController(); // Make sure we're starting out with 2 unlocked displays assertEquals(2, mRootWindowContainer.getChildCount()); mRootWindowContainer.forAllDisplays(displayContent -> { assertFalse(displayContent.isKeyguardLocked()); - assertFalse(displayContent.isAodShowing()); + assertFalse(keyguardController.isAodShowing(displayContent.mDisplayId)); }); // Check that setLockScreenShown locks both displays mAtm.setLockScreenShown(true, true); mRootWindowContainer.forAllDisplays(displayContent -> { assertTrue(displayContent.isKeyguardLocked()); - assertTrue(displayContent.isAodShowing()); + assertTrue(keyguardController.isAodShowing(displayContent.mDisplayId)); }); // Check setLockScreenShown unlocking both displays mAtm.setLockScreenShown(false, false); mRootWindowContainer.forAllDisplays(displayContent -> { assertFalse(displayContent.isKeyguardLocked()); - assertFalse(displayContent.isAodShowing()); + assertFalse(keyguardController.isAodShowing(displayContent.mDisplayId)); }); } @@ -275,25 +276,26 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { displayInfo.displayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1; displayInfo.flags = Display.FLAG_OWN_DISPLAY_GROUP | Display.FLAG_ALWAYS_UNLOCKED; DisplayContent newDisplay = createNewDisplay(displayInfo); + final KeyguardController keyguardController = mSupervisor.getKeyguardController(); // Make sure we're starting out with 2 unlocked displays assertEquals(2, mRootWindowContainer.getChildCount()); mRootWindowContainer.forAllDisplays(displayContent -> { assertFalse(displayContent.isKeyguardLocked()); - assertFalse(displayContent.isAodShowing()); + assertFalse(keyguardController.isAodShowing(displayContent.mDisplayId)); }); // setLockScreenShown should only lock the default display, not the virtual one mAtm.setLockScreenShown(true, true); assertTrue(mDefaultDisplay.isKeyguardLocked()); - assertTrue(mDefaultDisplay.isAodShowing()); + assertTrue(keyguardController.isAodShowing(mDefaultDisplay.mDisplayId)); DisplayContent virtualDisplay = mRootWindowContainer.getDisplayContent( newDisplay.getDisplayId()); assertNotEquals(Display.DEFAULT_DISPLAY, virtualDisplay.getDisplayId()); assertFalse(virtualDisplay.isKeyguardLocked()); - assertFalse(virtualDisplay.isAodShowing()); + assertFalse(keyguardController.isAodShowing(virtualDisplay.mDisplayId)); } /* diff --git a/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java b/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java index aa2b93506f8e..e1b11f6c963f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ContentRecorderTests.java @@ -16,6 +16,9 @@ package com.android.server.wm; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; @@ -300,6 +303,30 @@ public class ContentRecorderTests extends WindowTestsBase { anyFloat(), anyFloat()); } + /** + * Test that resizing the output surface results in resizing the mirrored content to fit. + */ + @Test + public void testOnConfigurationChanged_resizeSurface() { + mContentRecorder.setContentRecordingSession(mDisplaySession); + mContentRecorder.updateRecording(); + + // Resize the output surface. + final Point newSurfaceSize = new Point(Math.round(sSurfaceSize.x / 2f), + Math.round(sSurfaceSize.y * 2)); + doReturn(newSurfaceSize).when(mWm.mDisplayManagerInternal).getDisplaySurfaceDefaultSize( + anyInt()); + mContentRecorder.onConfigurationChanged( + mVirtualDisplayContent.getConfiguration().orientation); + + // No resize is issued, only the initial transformations when we started recording. + verify(mTransaction, atLeast(2)).setPosition(eq(mRecordedSurface), anyFloat(), + anyFloat()); + verify(mTransaction, atLeast(2)).setMatrix(eq(mRecordedSurface), anyFloat(), anyFloat(), + anyFloat(), anyFloat()); + + } + @Test public void testOnTaskOrientationConfigurationChanged_resizesSurface() { mContentRecorder.setContentRecordingSession(mTaskSession); @@ -360,6 +387,39 @@ public class ContentRecorderTests extends WindowTestsBase { } @Test + public void testTaskWindowingModeChanged_pip_stopsRecording() { + // WHEN a recording is ongoing. + mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + mContentRecorder.setContentRecordingSession(mTaskSession); + mContentRecorder.updateRecording(); + assertThat(mContentRecorder.isCurrentlyRecording()).isTrue(); + + // WHEN a configuration change arrives, and the task is now pinned. + mTask.setWindowingMode(WINDOWING_MODE_PINNED); + Configuration configuration = mTask.getConfiguration(); + mTask.onConfigurationChanged(configuration); + + // THEN recording is paused. + assertThat(mContentRecorder.isCurrentlyRecording()).isFalse(); + } + + @Test + public void testTaskWindowingModeChanged_fullscreen_startsRecording() { + // WHEN a recording is ongoing. + mTask.setWindowingMode(WINDOWING_MODE_PINNED); + mContentRecorder.setContentRecordingSession(mTaskSession); + mContentRecorder.updateRecording(); + assertThat(mContentRecorder.isCurrentlyRecording()).isFalse(); + + // WHEN the task is now fullscreen. + mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + mContentRecorder.updateRecording(); + + // THEN recording is started. + assertThat(mContentRecorder.isCurrentlyRecording()).isTrue(); + } + + @Test public void testStartRecording_notifiesCallback_taskSession() { // WHEN a recording is ongoing. mContentRecorder.setContentRecordingSession(mTaskSession); @@ -384,6 +444,45 @@ public class ContentRecorderTests extends WindowTestsBase { } @Test + public void testStartRecording_taskInPIP_recordingNotStarted() { + // GIVEN a task is in PIP. + mContentRecorder.setContentRecordingSession(mTaskSession); + mTask.setWindowingMode(WINDOWING_MODE_PINNED); + + // WHEN a recording tries to start. + mContentRecorder.updateRecording(); + + // THEN recording does not start. + assertThat(mContentRecorder.isCurrentlyRecording()).isFalse(); + } + + @Test + public void testStartRecording_taskInSplit_recordingStarted() { + // GIVEN a task is in PIP. + mContentRecorder.setContentRecordingSession(mTaskSession); + mTask.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); + + // WHEN a recording tries to start. + mContentRecorder.updateRecording(); + + // THEN recording does not start. + assertThat(mContentRecorder.isCurrentlyRecording()).isTrue(); + } + + @Test + public void testStartRecording_taskInFullscreen_recordingStarted() { + // GIVEN a task is in PIP. + mContentRecorder.setContentRecordingSession(mTaskSession); + mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + + // WHEN a recording tries to start. + mContentRecorder.updateRecording(); + + // THEN recording does not start. + assertThat(mContentRecorder.isCurrentlyRecording()).isTrue(); + } + + @Test public void testOnVisibleRequestedChanged_notifiesCallback() { // WHEN a recording is ongoing. mContentRecorder.setContentRecordingSession(mTaskSession); diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java index 411712e6b577..ffa1ed926766 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java @@ -327,6 +327,7 @@ public class InsetsPolicyTest extends WindowTestsBase { addNavigationBar().getControllableInsetProvider().getSource(); statusBarSource.setVisible(false); navBarSource.setVisible(false); + mAppWindow.setRequestedVisibleTypes(0, navigationBars() | statusBars()); mAppWindow.mAboveInsetsState.addSource(navBarSource); mAppWindow.mAboveInsetsState.addSource(statusBarSource); final InsetsPolicy policy = mDisplayContent.getInsetsPolicy(); @@ -387,6 +388,50 @@ public class InsetsPolicyTest extends WindowTestsBase { assertFalse(policy.isTransient(navigationBars())); } + @Test + public void testFakeControlTarget_overrideVisibilityReceivedByWindows() { + final WindowState statusBar = addStatusBar(); + final InsetsSourceProvider statusBarProvider = statusBar.getControllableInsetProvider(); + statusBar.mSession.mCanForceShowingInsets = true; + statusBar.setHasSurface(true); + statusBarProvider.setServerVisible(true); + + final InsetsSource statusBarSource = statusBarProvider.getSource(); + final int statusBarId = statusBarSource.getId(); + assertTrue(statusBarSource.isVisible()); + + final WindowState app1 = addWindow(TYPE_APPLICATION, "app1"); + app1.mAboveInsetsState.addSource(statusBarSource); + assertTrue(app1.getInsetsState().peekSource(statusBarId).isVisible()); + + final WindowState app2 = addWindow(TYPE_APPLICATION, "app2"); + app2.mAboveInsetsState.addSource(statusBarSource); + assertTrue(app2.getInsetsState().peekSource(statusBarId).isVisible()); + + app2.setRequestedVisibleTypes(0, navigationBars() | statusBars()); + mDisplayContent.getInsetsPolicy().updateBarControlTarget(app2); + waitUntilWindowAnimatorIdle(); + + // app2 is the real control target now. It can override the visibility of all sources that + // it controls. + assertFalse(statusBarSource.isVisible()); + assertFalse(app1.getInsetsState().peekSource(statusBarId).isVisible()); + assertFalse(app2.getInsetsState().peekSource(statusBarId).isVisible()); + + statusBar.mAttrs.forciblyShownTypes = statusBars(); + mDisplayContent.getDisplayPolicy().applyPostLayoutPolicyLw( + statusBar, statusBar.mAttrs, null, null); + mDisplayContent.getInsetsPolicy().updateBarControlTarget(app2); + waitUntilWindowAnimatorIdle(); + + // app2 is the fake control target now. It can only override the visibility of sources + // received by windows, but not the raw source. + assertTrue(statusBarSource.isVisible()); + assertFalse(app1.getInsetsState().peekSource(statusBarId).isVisible()); + assertFalse(app2.getInsetsState().peekSource(statusBarId).isVisible()); + + } + private WindowState addNavigationBar() { final Binder owner = new Binder(); final WindowState win = createWindow(null, TYPE_NAVIGATION_BAR, "navBar"); diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java index 114796d17ef1..2085d6140f68 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java @@ -367,9 +367,11 @@ public class InsetsStateControllerTest extends WindowTestsBase { doReturn(rotatedState).when(app.mToken).getFixedRotationTransformInsetsState(); assertTrue(rotatedState.isSourceOrDefaultVisible(ID_STATUS_BAR, statusBars())); - provider.getSource().setVisible(false); + app.setRequestedVisibleTypes(0, statusBars()); + mDisplayContent.getInsetsPolicy().updateBarControlTarget(app); mDisplayContent.getInsetsPolicy().showTransient(statusBars(), true /* isGestureOnSystemBar */); + waitUntilWindowAnimatorIdle(); assertTrue(mDisplayContent.getInsetsPolicy().isTransient(statusBars())); assertFalse(app.getInsetsState().isSourceOrDefaultVisible(ID_STATUS_BAR, statusBars())); diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java index 2ad9fa0e5b13..5f92fd5f12e7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxUiControllerTest.java @@ -32,6 +32,7 @@ import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_ import static android.content.pm.ActivityInfo.OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT; import static android.content.pm.ActivityInfo.OVERRIDE_USE_DISPLAY_LANDSCAPE_NATURAL_ORIENTATION; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; +import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LOCKED; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; @@ -811,6 +812,31 @@ public class LetterboxUiControllerTest extends WindowTestsBase { /* candidate */ SCREEN_ORIENTATION_PORTRAIT), SCREEN_ORIENTATION_PORTRAIT); } + @Test + public void testOverrideOrientationIfNeeded_userAspectRatioApplied_unspecifiedOverridden() { + spyOn(mController); + doReturn(true).when(mController).shouldApplyUserMinAspectRatioOverride(); + + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_PORTRAIT); + + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_LOCKED), SCREEN_ORIENTATION_PORTRAIT); + + // unchanged if orientation is specified + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_LANDSCAPE), SCREEN_ORIENTATION_LANDSCAPE); + } + + @Test + public void testOverrideOrientationIfNeeded_userAspectRatioNotApplied_returnsUnchanged() { + spyOn(mController); + doReturn(false).when(mController).shouldApplyUserMinAspectRatioOverride(); + + assertEquals(mController.overrideOrientationIfNeeded( + /* candidate */ SCREEN_ORIENTATION_UNSPECIFIED), SCREEN_ORIENTATION_UNSPECIFIED); + } + // shouldApplyUser...Override @Test public void testShouldApplyUserFullscreenOverride_trueProperty_returnsFalse() throws Exception { @@ -862,6 +888,39 @@ public class LetterboxUiControllerTest extends WindowTestsBase { } @Test + public void testShouldEnableUserAspectRatioSettings_falseProperty_returnsFalse() + throws Exception { + prepareActivityThatShouldApplyUserMinAspectRatioOverride(); + mockThatProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, /* value */ false); + + mController = new LetterboxUiController(mWm, mActivity); + + assertFalse(mController.shouldEnableUserAspectRatioSettings()); + } + + @Test + public void testShouldEnableUserAspectRatioSettings_trueProperty_returnsTrue() + throws Exception { + prepareActivityThatShouldApplyUserMinAspectRatioOverride(); + mockThatProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, /* value */ true); + + mController = new LetterboxUiController(mWm, mActivity); + + assertTrue(mController.shouldEnableUserAspectRatioSettings()); + } + + @Test + public void testShouldEnableUserAspectRatioSettings_noIgnoreOrientaion_returnsFalse() + throws Exception { + prepareActivityForShouldApplyUserMinAspectRatioOverride(/* orientationRequest */ false); + mockThatProperty(PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE, /* value */ true); + + mController = new LetterboxUiController(mWm, mActivity); + + assertFalse(mController.shouldEnableUserAspectRatioSettings()); + } + + @Test public void testShouldApplyUserMinAspectRatioOverride_falseProperty_returnsFalse() throws Exception { prepareActivityThatShouldApplyUserMinAspectRatioOverride(); @@ -898,13 +957,26 @@ public class LetterboxUiControllerTest extends WindowTestsBase { assertTrue(mController.shouldApplyUserMinAspectRatioOverride()); } - private void prepareActivityThatShouldApplyUserMinAspectRatioOverride() { + @Test + public void testShouldApplyUserMinAspectRatioOverride_noIgnoreOrientationreturnsFalse() { + prepareActivityForShouldApplyUserMinAspectRatioOverride(/* orientationRequest */ false); + + assertFalse(mController.shouldApplyUserMinAspectRatioOverride()); + } + + private void prepareActivityForShouldApplyUserMinAspectRatioOverride( + boolean orientationRequest) { spyOn(mController); - doReturn(true).when(mLetterboxConfiguration).isUserAppAspectRatioSettingsEnabled(); + doReturn(orientationRequest).when( + mLetterboxConfiguration).isUserAppAspectRatioSettingsEnabled(); mDisplayContent.setIgnoreOrientationRequest(true); doReturn(USER_MIN_ASPECT_RATIO_3_2).when(mController).getUserMinAspectRatioOverrideCode(); } + private void prepareActivityThatShouldApplyUserMinAspectRatioOverride() { + prepareActivityForShouldApplyUserMinAspectRatioOverride(/* orientationRequest */ true); + } + private void prepareActivityThatShouldApplyUserFullscreenOverride() { spyOn(mController); doReturn(true).when(mLetterboxConfiguration).isUserAppAspectRatioFullscreenEnabled(); diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java index de3a526573f8..491d5b56c8e2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.app.ActivityManager.PROCESS_STATE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; @@ -148,8 +149,9 @@ public class RecentsAnimationTest extends WindowTestsBase { anyInt() /* startFlags */, any() /* profilerInfo */); // Assume its process is alive because the caller should be the recents service. - mSystemServicesTestRule.addProcess(aInfo.packageName, aInfo.processName, 12345 /* pid */, - aInfo.applicationInfo.uid); + final WindowProcessController proc = mSystemServicesTestRule.addProcess(aInfo.packageName, + aInfo.processName, 12345 /* pid */, aInfo.applicationInfo.uid); + proc.setCurrentProcState(PROCESS_STATE_HOME); Intent recentsIntent = new Intent().setComponent(mRecentsComponent); // Null animation indicates to preload. diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index f332b6988da0..09b56f450955 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -571,26 +571,28 @@ public class TaskTests extends WindowTestsBase { final Task task = rootTask.getBottomMostTask(); final ActivityRecord root = task.getTopNonFinishingActivity(); spyOn(mWm.mLetterboxConfiguration); - - // When device config flag is disabled the button is not enabled - doReturn(false).when(mWm.mLetterboxConfiguration) - .isUserAppAspectRatioSettingsEnabled(); - doReturn(false).when(mWm.mLetterboxConfiguration) - .isTranslucentLetterboxingEnabled(); - assertFalse(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton); - - // The flag is enabled - doReturn(true).when(mWm.mLetterboxConfiguration) - .isUserAppAspectRatioSettingsEnabled(); spyOn(root); - doReturn(task).when(root).getOrganizedTask(); - // When the flag is enabled and the top activity is not in size compat mode. + spyOn(root.mLetterboxUiController); + + doReturn(true).when(root.mLetterboxUiController) + .shouldEnableUserAspectRatioSettings(); doReturn(false).when(root).inSizeCompatMode(); + doReturn(task).when(root).getOrganizedTask(); + + // The button should be eligible to be displayed assertTrue(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton); + // When shouldApplyUserMinAspectRatioOverride is disable the button is not enabled + doReturn(false).when(root.mLetterboxUiController) + .shouldEnableUserAspectRatioSettings(); + assertFalse(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton); + doReturn(true).when(root.mLetterboxUiController) + .shouldEnableUserAspectRatioSettings(); + // When in size compat mode the button is not enabled doReturn(true).when(root).inSizeCompatMode(); assertFalse(task.getTaskInfo().topActivityEligibleForUserAspectRatioButton); + doReturn(false).when(root).inSizeCompatMode(); } /** diff --git a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java index 9015563f439e..24114988d6ba 100644 --- a/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java +++ b/services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java @@ -63,6 +63,12 @@ public final class TextToSpeechManagerService extends public void createSession(String engine, ITextToSpeechSessionCallback sessionCallback) { synchronized (mLock) { + if (engine == null) { + runSessionCallbackMethod( + () -> sessionCallback.onError("Engine cannot be null")); + return; + } + TextToSpeechManagerPerUserService perUserService = getServiceForUserLocked( UserHandle.getCallingUserId()); if (perUserService != null) { diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java index 361b1c06a6b5..7005e4d7ac3c 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java +++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java @@ -22,6 +22,7 @@ import android.app.usage.UsageEvents; import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.os.Build; +import android.os.SystemClock; import android.os.SystemProperties; import android.util.ArrayMap; import android.util.ArraySet; @@ -1557,6 +1558,13 @@ public class UsageStatsDatabase { } } + void deleteDataFor(String pkg) { + // reuse the existing prune method to delete data for the specified package. + // we'll use the current timestamp so that all events before now get pruned. + prunePackagesDataOnUpgrade( + new HashMap<>(Collections.singletonMap(pkg, SystemClock.elapsedRealtime()))); + } + IntervalStats readIntervalStatsForFile(int interval, long fileName) { synchronized (mLock) { final IntervalStats stats = new IntervalStats(); diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index cf236ddb100d..d89a626e0fc6 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -2043,6 +2043,12 @@ public class UsageStatsService extends SystemService implements mAppStandby.clearLastUsedTimestampsForTest(packageName, userId); } + void deletePackageData(@NonNull String packageName, @UserIdInt int userId) { + synchronized (mLock) { + mUserState.get(userId).deleteDataFor(packageName); + } + } + private final class BinderService extends IUsageStatsManager.Stub { private boolean hasPermission(String callingPackage) { diff --git a/services/usage/java/com/android/server/usage/UsageStatsShellCommand.java b/services/usage/java/com/android/server/usage/UsageStatsShellCommand.java index 772b22a2b179..4cb31f9488ca 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsShellCommand.java +++ b/services/usage/java/com/android/server/usage/UsageStatsShellCommand.java @@ -38,6 +38,8 @@ class UsageStatsShellCommand extends ShellCommand { switch (cmd) { case "clear-last-used-timestamps": return runClearLastUsedTimestamps(); + case "delete-package-data": + return deletePackageData(); default: return handleDefaultCommands(cmd); } @@ -51,14 +53,38 @@ class UsageStatsShellCommand extends ShellCommand { pw.println(" Print this help text."); pw.println(); pw.println("clear-last-used-timestamps PACKAGE_NAME [-u | --user USER_ID]"); - pw.println(" Clears any existing usage data for the given package."); + pw.println(" Clears the last used timestamps for the given package."); + pw.println(); + pw.println("delete-package-data PACKAGE_NAME [-u | --user USER_ID]"); + pw.println(" Deletes all the usage stats for the given package."); pw.println(); } @SuppressLint("AndroidFrameworkRequiresPermission") private int runClearLastUsedTimestamps() { final String packageName = getNextArgRequired(); + final int userId = getUserId(); + if (userId == -1) { + return -1; + } + + mService.clearLastUsedTimestamps(packageName, userId); + return 0; + } + + @SuppressLint("AndroidFrameworkRequiresPermission") + private int deletePackageData() { + final String packageName = getNextArgRequired(); + final int userId = getUserId(); + if (userId == -1) { + return -1; + } + + mService.deletePackageData(packageName, userId); + return 0; + } + private int getUserId() { int userId = UserHandle.USER_CURRENT; String opt; while ((opt = getNextOption()) != null) { @@ -72,8 +98,6 @@ class UsageStatsShellCommand extends ShellCommand { if (userId == UserHandle.USER_CURRENT) { userId = ActivityManager.getCurrentUser(); } - - mService.clearLastUsedTimestamps(packageName, userId); - return 0; + return userId; } } diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java index 92032086dc24..a6d22066cd1e 100644 --- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java @@ -974,6 +974,10 @@ class UserUsageStatsService { mDatabase.dumpMappings(ipw); } + void deleteDataFor(String pkg) { + mDatabase.deleteDataFor(pkg); + } + void dumpFile(IndentingPrintWriter ipw, String[] args) { if (args == null || args.length == 0) { // dump all files for every interval for specified user diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index 3d78a1dd8943..0a70a5f9b947 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -27,9 +27,9 @@ import static com.android.internal.util.FrameworkStatsLog.HOTWORD_DETECTOR_KEYPH import static com.android.internal.util.FrameworkStatsLog.HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED__RESULT__KEYPHRASE_TRIGGER; import static com.android.internal.util.FrameworkStatsLog.HOTWORD_DETECTOR_KEYPHRASE_TRIGGERED__RESULT__SERVICE_CRASH; -import android.app.AppOpsManager; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.AppOpsManager; import android.compat.annotation.ChangeId; import android.compat.annotation.Disabled; import android.content.ComponentName; @@ -50,6 +50,7 @@ import android.os.PersistableBundle; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SharedMemory; +import android.os.SystemProperties; import android.provider.DeviceConfig; import android.service.voice.HotwordDetectionService; import android.service.voice.HotwordDetectionServiceFailure; @@ -114,6 +115,9 @@ final class HotwordDetectionConnection { private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour private static final int MAX_ISOLATED_PROCESS_NUMBER = 10; + private static final boolean SYSPROP_VISUAL_QUERY_SERVICE_ENABLED = + SystemProperties.getBoolean("ro.hotword.visual_query_service_enabled", false); + /** * Indicates the {@link HotwordDetectionService} is created. */ @@ -680,7 +684,8 @@ final class HotwordDetectionConnection { mIntent = intent; mDetectionServiceType = detectionServiceType; int flags = bindInstantServiceAllowed ? Context.BIND_ALLOW_INSTANT : 0; - if (mVisualQueryDetectionComponentName != null + if (SYSPROP_VISUAL_QUERY_SERVICE_ENABLED + && mVisualQueryDetectionComponentName != null && mHotwordDetectionComponentName != null) { flags |= Context.BIND_SHARED_ISOLATED_PROCESS; } diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java index 471acc118572..6ba77da1d972 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java @@ -57,6 +57,7 @@ import android.os.RemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SharedMemory; +import android.os.SystemProperties; import android.os.UserHandle; import android.service.voice.HotwordDetector; import android.service.voice.IMicrophoneHotwordDetectionVoiceInteractionCallback; @@ -96,6 +97,8 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne /** The delay time for retrying to request DirectActions. */ private static final long REQUEST_DIRECT_ACTIONS_RETRY_TIME_MS = 200; + private static final boolean SYSPROP_VISUAL_QUERY_SERVICE_ENABLED = + SystemProperties.getBoolean("ro.hotword.visual_query_service_enabled", false); final boolean mValid; @@ -715,7 +718,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne } else { verifyDetectorForVisualQueryDetectionLocked(sharedMemory); } - if (!verifyProcessSharingLocked()) { + if (SYSPROP_VISUAL_QUERY_SERVICE_ENABLED && !verifyProcessSharingLocked()) { Slog.w(TAG, "Sandboxed detection service not in shared isolated process"); throw new IllegalStateException("VisualQueryDetectionService or HotworDetectionService " + "not in a shared isolated process. Please make sure to set " @@ -914,6 +917,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne if (hotwordInfo == null || visualQueryInfo == null) { return true; } + // Enforce shared isolated option is used when VisualQueryDetectionservice is enabled return (hotwordInfo.flags & ServiceInfo.FLAG_ALLOW_SHARED_ISOLATED_PROCESS) != 0 && (visualQueryInfo.flags & ServiceInfo.FLAG_ALLOW_SHARED_ISOLATED_PROCESS) != 0; } diff --git a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java index 3870dfd17d50..4f99f14e4dc1 100644 --- a/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java +++ b/services/wallpapereffectsgeneration/java/com/android/server/wallpapereffectsgeneration/WallpaperEffectsGenerationPerUserService.java @@ -95,21 +95,29 @@ public class WallpaperEffectsGenerationPerUserService extends String newTaskId = cinematicEffectRequest.getTaskId(); // Previous request is still being processed. if (mCinematicEffectListenerWrapper != null) { + CinematicEffectResponse cinematicEffectResponse; if (mCinematicEffectListenerWrapper.mTaskId.equals(newTaskId)) { - invokeCinematicListenerAndCleanup( - new CinematicEffectResponse.Builder( - CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_PENDING, newTaskId) - .build() - ); + cinematicEffectResponse = new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_PENDING, newTaskId) + .build(); } else { - invokeCinematicListenerAndCleanup( - new CinematicEffectResponse.Builder( - CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS, - newTaskId).build() - ); + cinematicEffectResponse = new CinematicEffectResponse.Builder( + CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS, + newTaskId) + .build(); + } + try { + cinematicEffectListener.onCinematicEffectGenerated(cinematicEffectResponse); + return; + } catch (RemoteException e) { + if (isDebug()) { + Slog.w(TAG, "RemoteException invoking cinematic effect listener for task[" + + mCinematicEffectListenerWrapper.mTaskId + "]"); + } + return; } - return; } + RemoteWallpaperEffectsGenerationService remoteService = ensureRemoteServiceLocked(); if (remoteService != null) { remoteService.executeOnResolvedService( diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 60d640c71d3a..fbb2eb99a1ba 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -10182,7 +10182,7 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000); sDefaults.putInt(KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT, 0); sDefaults.putBoolean(KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL, false); - sDefaults.putBoolean(KEY_RATCHET_NR_ADVANCED_BANDWIDTH_IF_RRC_IDLE_BOOL, true); + sDefaults.putBoolean(KEY_RATCHET_NR_ADVANCED_BANDWIDTH_IF_RRC_IDLE_BOOL, false); sDefaults.putIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY, new int[]{CARRIER_NR_AVAILABILITY_NSA, CARRIER_NR_AVAILABILITY_SA}); sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true); diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java index d41c0197addc..bc41829f16d2 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -23,9 +23,11 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.res.Resources; import android.net.wifi.sharedconnectivity.service.ISharedConnectivityCallback; @@ -35,6 +37,7 @@ import android.os.Binder; import android.os.IBinder; import android.os.IInterface; import android.os.RemoteException; +import android.os.UserManager; import android.text.TextUtils; import android.util.Log; @@ -67,7 +70,7 @@ import java.util.concurrent.Executor; @SystemApi public class SharedConnectivityManager { private static final String TAG = SharedConnectivityManager.class.getSimpleName(); - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final class SharedConnectivityCallbackProxy extends ISharedConnectivityCallback.Stub { @@ -172,6 +175,7 @@ public class SharedConnectivityManager { private final String mServicePackageName; private final String mIntentAction; private ServiceConnection mServiceConnection; + private UserManager mUserManager; /** * Creates a new instance of {@link SharedConnectivityManager}. @@ -217,12 +221,14 @@ public class SharedConnectivityManager { mContext = context; mServicePackageName = servicePackageName; mIntentAction = serviceIntentAction; + mUserManager = context.getSystemService(UserManager.class); } private void bind() { mServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { + if (DEBUG) Log.i(TAG, "onServiceConnected"); mService = ISharedConnectivityService.Stub.asInterface(service); synchronized (mProxyDataLock) { if (!mCallbackProxyCache.isEmpty()) { @@ -253,9 +259,45 @@ public class SharedConnectivityManager { } }; - mContext.bindService( + boolean result = mContext.bindService( new Intent().setPackage(mServicePackageName).setAction(mIntentAction), mServiceConnection, Context.BIND_AUTO_CREATE); + if (!result) { + if (DEBUG) Log.i(TAG, "bindService failed"); + mServiceConnection = null; + if (mUserManager != null && !mUserManager.isUserUnlocked()) { // In direct boot mode + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); + mContext.registerReceiver(mBroadcastReceiver, intentFilter); + } else { + synchronized (mProxyDataLock) { + if (!mCallbackProxyCache.isEmpty()) { + mCallbackProxyCache.keySet().forEach( + callback -> callback.onRegisterCallbackFailed( + new IllegalStateException( + "Failed to bind after user unlock"))); + mCallbackProxyCache.clear(); + } + } + } + } + } + + private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + context.unregisterReceiver(mBroadcastReceiver); + bind(); + } + }; + + /** + * @hide + */ + @TestApi + @NonNull + public BroadcastReceiver getBroadcastReceiver() { + return mBroadcastReceiver; } private void registerCallbackInternal(SharedConnectivityClientCallback callback, @@ -357,6 +399,13 @@ public class SharedConnectivityManager { return false; } + // Try to unregister the broadcast receiver to guard against memory leaks. + try { + mContext.unregisterReceiver(mBroadcastReceiver); + } catch (IllegalArgumentException e) { + // This is fine, it means the receiver was never registered or was already unregistered. + } + if (mService == null) { boolean shouldUnbind; synchronized (mProxyDataLock) { |