diff options
276 files changed, 4040 insertions, 2041 deletions
diff --git a/Android.bp b/Android.bp index 7c2d6eb9301e..ec7740437c2d 100644 --- a/Android.bp +++ b/Android.bp @@ -701,7 +701,6 @@ filegroup { "core/java/com/android/internal/util/TrafficStatsConstants.java", "core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/TokenBucket.java", - "core/java/android/net/shared/*.java", ], } @@ -709,7 +708,6 @@ filegroup { name: "framework-services-net-module-wifi-shared-srcs", srcs: [ "core/java/android/net/DhcpResults.java", - "core/java/android/net/shared/InetAddressUtils.java", "core/java/android/net/util/IpUtils.java", "core/java/android/util/LocalLog.java", ], @@ -726,7 +724,6 @@ filegroup { "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/TrafficStatsConstants.java", - "core/java/android/net/shared/Inet4AddressUtils.java", ], } @@ -1163,7 +1160,6 @@ java_library { srcs: [ "core/java/android/content/pm/BaseParceledListSlice.java", "core/java/android/content/pm/ParceledListSlice.java", - "core/java/android/net/shared/Inet4AddressUtils.java", "core/java/android/os/HandlerExecutor.java", "core/java/com/android/internal/util/AsyncChannel.java", "core/java/com/android/internal/util/AsyncService.java", diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java b/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java index 1193ae9cf990..4d29045fa631 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java @@ -358,7 +358,11 @@ class BlobMetadata { throw e.rethrowAsIOException(); } try { - return createRevocableFd(fd, callingPackage); + if (BlobStoreConfig.shouldUseRevocableFdForReads()) { + return createRevocableFd(fd, callingPackage); + } else { + return new ParcelFileDescriptor(fd); + } } catch (IOException e) { IoUtils.closeQuietly(fd); throw e; diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java index 08ee24460722..d780d5dab14d 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java @@ -122,6 +122,15 @@ class BlobStoreConfig { public static long COMMIT_COOL_OFF_DURATION_MS = DEFAULT_COMMIT_COOL_OFF_DURATION_MS; + /** + * Denotes whether to use RevocableFileDescriptor when apps try to read session/blob data. + */ + public static final String KEY_USE_REVOCABLE_FD_FOR_READS = + "use_revocable_fd_for_reads"; + public static final boolean DEFAULT_USE_REVOCABLE_FD_FOR_READS = true; + public static boolean USE_REVOCABLE_FD_FOR_READS = + DEFAULT_USE_REVOCABLE_FD_FOR_READS; + static void refresh(Properties properties) { if (!NAMESPACE_BLOBSTORE.equals(properties.getNamespace())) { return; @@ -151,6 +160,10 @@ class BlobStoreConfig { COMMIT_COOL_OFF_DURATION_MS = properties.getLong(key, DEFAULT_COMMIT_COOL_OFF_DURATION_MS); break; + case KEY_USE_REVOCABLE_FD_FOR_READS: + USE_REVOCABLE_FD_FOR_READS = properties.getBoolean(key, + DEFAULT_USE_REVOCABLE_FD_FOR_READS); + break; default: Slog.wtf(TAG, "Unknown key in device config properties: " + key); } @@ -178,6 +191,8 @@ class BlobStoreConfig { fout.println(String.format(dumpFormat, KEY_COMMIT_COOL_OFF_DURATION_MS, TimeUtils.formatDuration(COMMIT_COOL_OFF_DURATION_MS), TimeUtils.formatDuration(DEFAULT_COMMIT_COOL_OFF_DURATION_MS))); + fout.println(String.format(dumpFormat, KEY_USE_REVOCABLE_FD_FOR_READS, + USE_REVOCABLE_FD_FOR_READS, DEFAULT_USE_REVOCABLE_FD_FOR_READS)); } } @@ -242,6 +257,13 @@ class BlobStoreConfig { < System.currentTimeMillis(); } + /** + * Return whether to use RevocableFileDescriptor when apps try to read session/blob data. + */ + public static boolean shouldUseRevocableFdForReads() { + return DeviceConfigProperties.USE_REVOCABLE_FD_FOR_READS; + } + @Nullable public static File prepareBlobFile(long sessionId) { final File blobsDir = prepareBlobsDir(); diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java index 00983058841c..baafff53d072 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java @@ -268,6 +268,13 @@ class BlobStoreSession extends IBlobStoreSession.Stub { throw new IllegalStateException("Not allowed to read in state: " + stateToString(mState)); } + if (!BlobStoreConfig.shouldUseRevocableFdForReads()) { + try { + return new ParcelFileDescriptor(openReadInternal()); + } catch (IOException e) { + throw ExceptionUtils.wrap(e); + } + } } FileDescriptor fd = null; @@ -283,7 +290,6 @@ class BlobStoreSession extends IBlobStoreSession.Stub { trackRevocableFdLocked(revocableFd); return revocableFd.getRevocableFileDescriptor(); } - } catch (IOException e) { IoUtils.closeQuietly(fd); throw ExceptionUtils.wrap(e); diff --git a/cmds/statsd/src/external/StatsPuller.cpp b/cmds/statsd/src/external/StatsPuller.cpp index 9df4d1f8ce24..bb5d0a6bab58 100644 --- a/cmds/statsd/src/external/StatsPuller.cpp +++ b/cmds/statsd/src/external/StatsPuller.cpp @@ -44,7 +44,8 @@ StatsPuller::StatsPuller(const int tagId, const int64_t coolDownNs, const int64_ bool StatsPuller::Pull(const int64_t eventTimeNs, std::vector<std::shared_ptr<LogEvent>>* data) { lock_guard<std::mutex> lock(mLock); - int64_t elapsedTimeNs = getElapsedRealtimeNs(); + const int64_t elapsedTimeNs = getElapsedRealtimeNs(); + const int64_t systemUptimeMillis = getSystemUptimeMillis(); StatsdStats::getInstance().notePull(mTagId); const bool shouldUseCache = (mLastEventTimeNs == eventTimeNs) || (elapsedTimeNs - mLastPullTimeNs < mCoolDownNs); @@ -67,16 +68,18 @@ bool StatsPuller::Pull(const int64_t eventTimeNs, std::vector<std::shared_ptr<Lo if (!mHasGoodData) { return mHasGoodData; } - const int64_t pullDurationNs = getElapsedRealtimeNs() - elapsedTimeNs; - StatsdStats::getInstance().notePullTime(mTagId, pullDurationNs); - const bool pullTimeOut = pullDurationNs > mPullTimeoutNs; + const int64_t pullElapsedDurationNs = getElapsedRealtimeNs() - elapsedTimeNs; + const int64_t pullSystemUptimeDurationMillis = getSystemUptimeMillis() - systemUptimeMillis; + StatsdStats::getInstance().notePullTime(mTagId, pullElapsedDurationNs); + const bool pullTimeOut = pullElapsedDurationNs > mPullTimeoutNs; if (pullTimeOut) { // Something went wrong. Discard the data. mCachedData.clear(); mHasGoodData = false; - StatsdStats::getInstance().notePullTimeout(mTagId); + StatsdStats::getInstance().notePullTimeout( + mTagId, pullSystemUptimeDurationMillis, NanoToMillis(pullElapsedDurationNs)); ALOGW("Pull for atom %d exceeds timeout %lld nano seconds.", mTagId, - (long long)pullDurationNs); + (long long)pullElapsedDurationNs); return mHasGoodData; } diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp index c027fffd20a0..6e89038f4152 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.cpp +++ b/cmds/statsd/src/guardrail/StatsdStats.cpp @@ -38,6 +38,7 @@ using android::util::ProtoOutputStream; using std::lock_guard; using std::shared_ptr; using std::string; +using std::to_string; using std::vector; const int FIELD_ID_BEGIN_TIME = 1; @@ -436,9 +437,18 @@ void StatsdStats::notePullDataError(int pullAtomId) { mPulledAtomStats[pullAtomId].dataError++; } -void StatsdStats::notePullTimeout(int pullAtomId) { +void StatsdStats::notePullTimeout(int pullAtomId, + int64_t pullUptimeMillis, + int64_t pullElapsedMillis) { lock_guard<std::mutex> lock(mLock); - mPulledAtomStats[pullAtomId].pullTimeout++; + PulledAtomStats& pulledAtomStats = mPulledAtomStats[pullAtomId]; + pulledAtomStats.pullTimeout++; + + if (pulledAtomStats.pullTimeoutMetadata.size() == kMaxTimestampCount) { + pulledAtomStats.pullTimeoutMetadata.pop_front(); + } + + pulledAtomStats.pullTimeoutMetadata.emplace_back(pullUptimeMillis, pullElapsedMillis); } void StatsdStats::notePullExceedMaxDelay(int pullAtomId) { @@ -630,6 +640,7 @@ void StatsdStats::resetInternalLocked() { pullStats.second.unregisteredCount = 0; pullStats.second.atomErrorCount = 0; pullStats.second.binderCallFailCount = 0; + pullStats.second.pullTimeoutMetadata.clear(); } mAtomMetricStats.clear(); mActivationBroadcastGuardrailStats.clear(); @@ -786,6 +797,20 @@ void StatsdStats::dumpStats(int out) const { pair.second.pullUidProviderNotFound, pair.second.pullerNotFound, pair.second.registeredCount, pair.second.unregisteredCount, pair.second.atomErrorCount); + if (pair.second.pullTimeoutMetadata.size() > 0) { + string uptimeMillis = "(pull timeout system uptime millis) "; + string pullTimeoutMillis = "(pull timeout elapsed time millis) "; + for (const auto& stats : pair.second.pullTimeoutMetadata) { + uptimeMillis.append(to_string(stats.pullTimeoutUptimeMillis)).append(",");; + pullTimeoutMillis.append(to_string(stats.pullTimeoutElapsedMillis)).append(","); + } + uptimeMillis.pop_back(); + uptimeMillis.push_back('\n'); + pullTimeoutMillis.pop_back(); + pullTimeoutMillis.push_back('\n'); + dprintf(out, "%s", uptimeMillis.c_str()); + dprintf(out, "%s", pullTimeoutMillis.c_str()); + } } if (mAnomalyAlarmRegisteredStats > 0) { diff --git a/cmds/statsd/src/guardrail/StatsdStats.h b/cmds/statsd/src/guardrail/StatsdStats.h index 9d46dcea1896..005048446fc3 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.h +++ b/cmds/statsd/src/guardrail/StatsdStats.h @@ -352,7 +352,7 @@ public: /* * Records pull exceeds timeout for the puller. */ - void notePullTimeout(int pullAtomId); + void notePullTimeout(int pullAtomId, int64_t pullUptimeMillis, int64_t pullElapsedMillis); /* * Records pull exceeds max delay for a metric. @@ -498,6 +498,14 @@ public: */ void dumpStats(int outFd) const; + typedef struct PullTimeoutMetadata { + int64_t pullTimeoutUptimeMillis; + int64_t pullTimeoutElapsedMillis; + PullTimeoutMetadata(int64_t uptimeMillis, int64_t elapsedMillis) : + pullTimeoutUptimeMillis(uptimeMillis), + pullTimeoutElapsedMillis(elapsedMillis) {/* do nothing */} + } PullTimeoutMetadata; + typedef struct { long totalPull = 0; long totalPullFromCache = 0; @@ -519,6 +527,7 @@ public: long unregisteredCount = 0; int32_t atomErrorCount = 0; long binderCallFailCount = 0; + std::list<PullTimeoutMetadata> pullTimeoutMetadata; } PulledAtomStats; typedef struct { diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index 6bfa26761b2f..ddd2725c9cb9 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -467,6 +467,11 @@ message StatsdStatsReport { optional int64 binder_call_failed = 19; optional int64 failed_uid_provider_not_found = 20; optional int64 puller_not_found = 21; + message PullTimeoutMetadata { + optional int64 pull_timeout_uptime_millis = 1; + optional int64 pull_timeout_elapsed_millis = 2; + } + repeated PullTimeoutMetadata pull_atom_metadata = 22; } repeated PulledAtomStats pulled_atom_stats = 10; diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp index bafdfcba59b2..423bae8bc0a4 100644 --- a/cmds/statsd/src/stats_log_util.cpp +++ b/cmds/statsd/src/stats_log_util.cpp @@ -81,6 +81,9 @@ const int FIELD_ID_ATOM_ERROR_COUNT = 18; const int FIELD_ID_BINDER_CALL_FAIL_COUNT = 19; const int FIELD_ID_PULL_UID_PROVIDER_NOT_FOUND = 20; const int FIELD_ID_PULLER_NOT_FOUND = 21; +const int FIELD_ID_PULL_TIMEOUT_METADATA = 22; +const int FIELD_ID_PULL_TIMEOUT_METADATA_UPTIME_MILLIS = 1; +const int FIELD_ID_PULL_TIMEOUT_METADATA_ELAPSED_MILLIS = 2; // for AtomMetricStats proto const int FIELD_ID_ATOM_METRIC_STATS = 17; @@ -497,6 +500,16 @@ void writePullerStatsToStream(const std::pair<int, StatsdStats::PulledAtomStats> (long long)pair.second.pullUidProviderNotFound); protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_PULLER_NOT_FOUND, (long long)pair.second.pullerNotFound); + for (const auto& pullTimeoutMetadata : pair.second.pullTimeoutMetadata) { + uint64_t timeoutMetadataToken = protoOutput->start(FIELD_TYPE_MESSAGE | + FIELD_ID_PULL_TIMEOUT_METADATA | + FIELD_COUNT_REPEATED); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_PULL_TIMEOUT_METADATA_UPTIME_MILLIS, + pullTimeoutMetadata.pullTimeoutUptimeMillis); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_PULL_TIMEOUT_METADATA_ELAPSED_MILLIS, + pullTimeoutMetadata.pullTimeoutElapsedMillis); + protoOutput->end(timeoutMetadataToken); + } protoOutput->end(token); } @@ -542,6 +555,10 @@ int64_t getElapsedRealtimeMillis() { return ::android::elapsedRealtime(); } +int64_t getSystemUptimeMillis() { + return ::android::uptimeMillis(); +} + int64_t getWallClockNs() { return time(nullptr) * NS_PER_SEC; } diff --git a/cmds/statsd/src/stats_log_util.h b/cmds/statsd/src/stats_log_util.h index 20d93b5a5365..eb65dc6979c5 100644 --- a/cmds/statsd/src/stats_log_util.h +++ b/cmds/statsd/src/stats_log_util.h @@ -61,6 +61,9 @@ int64_t getElapsedRealtimeMillis(); // Gets the elapsed timestamp in seconds. int64_t getElapsedRealtimeSec(); +// Gets the system uptime in millis. +int64_t getSystemUptimeMillis(); + // Gets the wall clock timestamp in ns. int64_t getWallClockNs(); diff --git a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp index 5cc10cd9840c..428c46f8a0d2 100644 --- a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp +++ b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp @@ -306,6 +306,8 @@ TEST(StatsdStatsTest, TestPullAtomStats) { stats.notePullUidProviderNotFound(util::DISK_SPACE); stats.notePullerNotFound(util::DISK_SPACE); stats.notePullerNotFound(util::DISK_SPACE); + stats.notePullTimeout(util::DISK_SPACE, 3000L, 6000L); + stats.notePullTimeout(util::DISK_SPACE, 4000L, 7000L); vector<uint8_t> output; stats.dumpStats(&output, false); @@ -328,6 +330,13 @@ TEST(StatsdStatsTest, TestPullAtomStats) { EXPECT_EQ(1L, report.pulled_atom_stats(0).binder_call_failed()); EXPECT_EQ(1L, report.pulled_atom_stats(0).failed_uid_provider_not_found()); EXPECT_EQ(2L, report.pulled_atom_stats(0).puller_not_found()); + ASSERT_EQ(2, report.pulled_atom_stats(0).pull_atom_metadata_size()); + EXPECT_EQ(3000L, report.pulled_atom_stats(0).pull_atom_metadata(0).pull_timeout_uptime_millis()); + EXPECT_EQ(4000L, report.pulled_atom_stats(0).pull_atom_metadata(1).pull_timeout_uptime_millis()); + EXPECT_EQ(6000L, report.pulled_atom_stats(0).pull_atom_metadata(0) + .pull_timeout_elapsed_millis()); + EXPECT_EQ(7000L, report.pulled_atom_stats(0).pull_atom_metadata(1) + .pull_timeout_elapsed_millis()); } TEST(StatsdStatsTest, TestAtomMetricsStats) { diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java index c7a2a1e11c9e..f3f00e50715b 100644 --- a/core/java/android/app/TaskInfo.java +++ b/core/java/android/app/TaskInfo.java @@ -16,8 +16,6 @@ package android.app; -import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; - import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; @@ -170,6 +168,14 @@ public class TaskInfo { @Nullable public ActivityInfo topActivityInfo; + /** + * Whether this task is resizable. Unlike {@link #resizeMode} (which is what the top activity + * supports), this is what the system actually uses for resizability based on other policy and + * developer options. + * @hide + */ + public boolean isResizeable; + TaskInfo() { // Do nothing } @@ -193,11 +199,6 @@ public class TaskInfo { } /** @hide */ - public boolean isResizable() { - return resizeMode != RESIZE_MODE_UNRESIZEABLE; - } - - /** @hide */ @NonNull @TestApi public WindowContainerToken getToken() { @@ -245,6 +246,7 @@ public class TaskInfo { topActivityInfo = source.readInt() != 0 ? ActivityInfo.CREATOR.createFromParcel(source) : null; + isResizeable = source.readBoolean(); } /** @@ -294,6 +296,7 @@ public class TaskInfo { dest.writeInt(1); topActivityInfo.writeToParcel(dest, flags); } + dest.writeBoolean(isResizeable); } @Override @@ -308,6 +311,7 @@ public class TaskInfo { + " lastActiveTime=" + lastActiveTime + " supportsSplitScreenMultiWindow=" + supportsSplitScreenMultiWindow + " resizeMode=" + resizeMode + + " isResizeable=" + isResizeable + " token=" + token + " topActivityType=" + topActivityType + " pictureInPictureParams=" + pictureInPictureParams diff --git a/core/java/android/app/admin/DevicePolicyCache.java b/core/java/android/app/admin/DevicePolicyCache.java index 4d9970c2c144..15ff531b445d 100644 --- a/core/java/android/app/admin/DevicePolicyCache.java +++ b/core/java/android/app/admin/DevicePolicyCache.java @@ -41,7 +41,8 @@ public abstract class DevicePolicyCache { /** * See {@link DevicePolicyManager#getScreenCaptureDisabled} */ - public abstract boolean getScreenCaptureDisabled(@UserIdInt int userHandle); + public abstract boolean isScreenCaptureAllowed(@UserIdInt int userHandle, + boolean ownerCanAddInternalSystemWindow); /** * Caches {@link DevicePolicyManager#getPasswordQuality(android.content.ComponentName)} of the @@ -56,8 +57,9 @@ public abstract class DevicePolicyCache { private static final EmptyDevicePolicyCache INSTANCE = new EmptyDevicePolicyCache(); @Override - public boolean getScreenCaptureDisabled(int userHandle) { - return false; + public boolean isScreenCaptureAllowed(int userHandle, + boolean ownerCanAddInternalSystemWindow) { + return true; } @Override diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index be3cfeff729e..ededd0d2ea30 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -6445,7 +6445,7 @@ public class Intent implements Parcelable, Cloneable { public static final int FLAG_ACTIVITY_RETAIN_IN_RECENTS = 0x00002000; /** - * This flag is only used in split-screen multi-window mode. The new activity will be displayed + * This flag is only used for split-screen multi-window mode. The new activity will be displayed * adjacent to the one launching it. This can only be used in conjunction with * {@link #FLAG_ACTIVITY_NEW_TASK}. Also, setting {@link #FLAG_ACTIVITY_MULTIPLE_TASK} is * required if you want a new instance of an existing activity to be created. diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index 6d49add65c5b..bfc7f37aaf8d 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -1072,7 +1072,7 @@ public class CameraDeviceImpl extends CameraDevice * @param lastFrameNumber last frame number returned from binder. * @param repeatingRequestTypes the repeating requests' types. */ - private void checkEarlyTriggerSequenceComplete( + private void checkEarlyTriggerSequenceCompleteLocked( final int requestId, final long lastFrameNumber, final int[] repeatingRequestTypes) { // lastFrameNumber being equal to NO_FRAMES_CAPTURED means that the request @@ -1212,7 +1212,7 @@ public class CameraDeviceImpl extends CameraDevice if (repeating) { if (mRepeatingRequestId != REQUEST_ID_NONE) { - checkEarlyTriggerSequenceComplete(mRepeatingRequestId, + checkEarlyTriggerSequenceCompleteLocked(mRepeatingRequestId, requestInfo.getLastFrameNumber(), mRepeatingRequestTypes); } @@ -1269,7 +1269,7 @@ public class CameraDeviceImpl extends CameraDevice return; } - checkEarlyTriggerSequenceComplete(requestId, lastFrameNumber, requestTypes); + checkEarlyTriggerSequenceCompleteLocked(requestId, lastFrameNumber, requestTypes); } } } @@ -1302,7 +1302,7 @@ public class CameraDeviceImpl extends CameraDevice long lastFrameNumber = mRemoteDevice.flush(); if (mRepeatingRequestId != REQUEST_ID_NONE) { - checkEarlyTriggerSequenceComplete(mRepeatingRequestId, lastFrameNumber, + checkEarlyTriggerSequenceCompleteLocked(mRepeatingRequestId, lastFrameNumber, mRepeatingRequestTypes); mRepeatingRequestId = REQUEST_ID_NONE; mRepeatingRequestTypes = null; @@ -1442,78 +1442,137 @@ public class CameraDeviceImpl extends CameraDevice long completedFrameNumber = mFrameNumberTracker.getCompletedFrameNumber(); long completedReprocessFrameNumber = mFrameNumberTracker.getCompletedReprocessFrameNumber(); long completedZslStillFrameNumber = mFrameNumberTracker.getCompletedZslStillFrameNumber(); - boolean isReprocess = false; + Iterator<RequestLastFrameNumbersHolder> iter = mRequestLastFrameNumbersList.iterator(); while (iter.hasNext()) { final RequestLastFrameNumbersHolder requestLastFrameNumbers = iter.next(); - boolean sequenceCompleted = false; final int requestId = requestLastFrameNumbers.getRequestId(); final CaptureCallbackHolder holder; - synchronized(mInterfaceLock) { - if (mRemoteDevice == null) { - Log.w(TAG, "Camera closed while checking sequences"); - return; + if (mRemoteDevice == null) { + Log.w(TAG, "Camera closed while checking sequences"); + return; + } + if (!requestLastFrameNumbers.isSequenceCompleted()) { + long lastRegularFrameNumber = + requestLastFrameNumbers.getLastRegularFrameNumber(); + long lastReprocessFrameNumber = + requestLastFrameNumbers.getLastReprocessFrameNumber(); + long lastZslStillFrameNumber = + requestLastFrameNumbers.getLastZslStillFrameNumber(); + if (lastRegularFrameNumber <= completedFrameNumber + && lastReprocessFrameNumber <= completedReprocessFrameNumber + && lastZslStillFrameNumber <= completedZslStillFrameNumber) { + if (DEBUG) { + Log.v(TAG, String.format( + "Mark requestId %d as completed, because lastRegularFrame %d " + + "is <= %d, lastReprocessFrame %d is <= %d, " + + "lastZslStillFrame %d is <= %d", requestId, + lastRegularFrameNumber, completedFrameNumber, + lastReprocessFrameNumber, completedReprocessFrameNumber, + lastZslStillFrameNumber, completedZslStillFrameNumber)); + } + requestLastFrameNumbers.markSequenceCompleted(); } + // Call onCaptureSequenceCompleted int index = mCaptureCallbackMap.indexOfKey(requestId); holder = (index >= 0) ? mCaptureCallbackMap.valueAt(index) : null; - if (holder != null) { - long lastRegularFrameNumber = - requestLastFrameNumbers.getLastRegularFrameNumber(); - long lastReprocessFrameNumber = - requestLastFrameNumbers.getLastReprocessFrameNumber(); - long lastZslStillFrameNumber = - requestLastFrameNumbers.getLastZslStillFrameNumber(); - // check if it's okay to remove request from mCaptureCallbackMap - if (lastRegularFrameNumber <= completedFrameNumber - && lastReprocessFrameNumber <= completedReprocessFrameNumber - && lastZslStillFrameNumber <= completedZslStillFrameNumber) { - sequenceCompleted = true; - mCaptureCallbackMap.removeAt(index); - if (DEBUG) { - Log.v(TAG, String.format( - "Remove holder for requestId %d, because lastRegularFrame %d " - + "is <= %d, lastReprocessFrame %d is <= %d, " - + "lastZslStillFrame %d is <= %d", requestId, - lastRegularFrameNumber, completedFrameNumber, - lastReprocessFrameNumber, completedReprocessFrameNumber, - lastZslStillFrameNumber, completedZslStillFrameNumber)); + if (holder != null && requestLastFrameNumbers.isSequenceCompleted()) { + Runnable resultDispatch = new Runnable() { + @Override + public void run() { + if (!CameraDeviceImpl.this.isClosed()){ + if (DEBUG) { + Log.d(TAG, String.format( + "fire sequence complete for request %d", + requestId)); + } + + holder.getCallback().onCaptureSequenceCompleted( + CameraDeviceImpl.this, + requestId, + requestLastFrameNumbers.getLastFrameNumber()); + } } + }; + final long ident = Binder.clearCallingIdentity(); + try { + holder.getExecutor().execute(resultDispatch); + } finally { + Binder.restoreCallingIdentity(ident); } } } - // If no callback is registered for this requestId or sequence completed, remove it - // from the frame number->request pair because it's not needed anymore. - if (holder == null || sequenceCompleted) { + if (requestLastFrameNumbers.isSequenceCompleted() && + requestLastFrameNumbers.isInflightCompleted()) { + int index = mCaptureCallbackMap.indexOfKey(requestId); + if (index >= 0) { + mCaptureCallbackMap.removeAt(index); + } + if (DEBUG) { + Log.v(TAG, String.format( + "Remove holder for requestId %d", requestId)); + } iter.remove(); } + } + } - // Call onCaptureSequenceCompleted - if (sequenceCompleted) { - Runnable resultDispatch = new Runnable() { - @Override - public void run() { - if (!CameraDeviceImpl.this.isClosed()){ - if (DEBUG) { - Log.d(TAG, String.format( - "fire sequence complete for request %d", - requestId)); - } + private void removeCompletedCallbackHolderLocked(long lastCompletedRegularFrameNumber, + long lastCompletedReprocessFrameNumber, long lastCompletedZslStillFrameNumber) { + if (DEBUG) { + Log.v(TAG, String.format("remove completed callback holders for " + + "lastCompletedRegularFrameNumber %d, " + + "lastCompletedReprocessFrameNumber %d, " + + "lastCompletedZslStillFrameNumber %d", + lastCompletedRegularFrameNumber, + lastCompletedReprocessFrameNumber, + lastCompletedZslStillFrameNumber)); + } - holder.getCallback().onCaptureSequenceCompleted( - CameraDeviceImpl.this, - requestId, - requestLastFrameNumbers.getLastFrameNumber()); - } + Iterator<RequestLastFrameNumbersHolder> iter = mRequestLastFrameNumbersList.iterator(); + while (iter.hasNext()) { + final RequestLastFrameNumbersHolder requestLastFrameNumbers = iter.next(); + final int requestId = requestLastFrameNumbers.getRequestId(); + final CaptureCallbackHolder holder; + if (mRemoteDevice == null) { + Log.w(TAG, "Camera closed while removing completed callback holders"); + return; + } + + long lastRegularFrameNumber = + requestLastFrameNumbers.getLastRegularFrameNumber(); + long lastReprocessFrameNumber = + requestLastFrameNumbers.getLastReprocessFrameNumber(); + long lastZslStillFrameNumber = + requestLastFrameNumbers.getLastZslStillFrameNumber(); + + if (lastRegularFrameNumber <= lastCompletedRegularFrameNumber + && lastReprocessFrameNumber <= lastCompletedReprocessFrameNumber + && lastZslStillFrameNumber <= lastCompletedZslStillFrameNumber) { + + if (requestLastFrameNumbers.isSequenceCompleted()) { + int index = mCaptureCallbackMap.indexOfKey(requestId); + if (index >= 0) { + mCaptureCallbackMap.removeAt(index); } - }; - final long ident = Binder.clearCallingIdentity(); - try { - holder.getExecutor().execute(resultDispatch); - } finally { - Binder.restoreCallingIdentity(ident); + if (DEBUG) { + Log.v(TAG, String.format( + "Remove holder for requestId %d, because lastRegularFrame %d " + + "is <= %d, lastReprocessFrame %d is <= %d, " + + "lastZslStillFrame %d is <= %d", requestId, + lastRegularFrameNumber, lastCompletedRegularFrameNumber, + lastReprocessFrameNumber, lastCompletedReprocessFrameNumber, + lastZslStillFrameNumber, lastCompletedZslStillFrameNumber)); + } + iter.remove(); + } else { + if (DEBUG) { + Log.v(TAG, "Sequence not yet completed for request id " + requestId); + } + requestLastFrameNumbers.markInflightCompleted(); } } } @@ -1702,6 +1761,12 @@ public class CameraDeviceImpl extends CameraDevice return; } + // Remove all capture callbacks now that device has gone to IDLE state. + removeCompletedCallbackHolderLocked( + Long.MAX_VALUE, /*lastCompletedRegularFrameNumber*/ + Long.MAX_VALUE, /*lastCompletedReprocessFrameNumber*/ + Long.MAX_VALUE /*lastCompletedZslStillFrameNumber*/); + if (!CameraDeviceImpl.this.mIdle) { final long ident = Binder.clearCallingIdentity(); try { @@ -1747,7 +1812,7 @@ public class CameraDeviceImpl extends CameraDevice return; } - checkEarlyTriggerSequenceComplete(mRepeatingRequestId, lastFrameNumber, + checkEarlyTriggerSequenceCompleteLocked(mRepeatingRequestId, lastFrameNumber, mRepeatingRequestTypes); // Check if there is already a new repeating request if (mRepeatingRequestId == repeatingRequestId) { @@ -1766,9 +1831,18 @@ public class CameraDeviceImpl extends CameraDevice public void onCaptureStarted(final CaptureResultExtras resultExtras, final long timestamp) { int requestId = resultExtras.getRequestId(); final long frameNumber = resultExtras.getFrameNumber(); + final long lastCompletedRegularFrameNumber = + resultExtras.getLastCompletedRegularFrameNumber(); + final long lastCompletedReprocessFrameNumber = + resultExtras.getLastCompletedReprocessFrameNumber(); + final long lastCompletedZslFrameNumber = + resultExtras.getLastCompletedZslFrameNumber(); if (DEBUG) { - Log.d(TAG, "Capture started for id " + requestId + " frame number " + frameNumber); + Log.d(TAG, "Capture started for id " + requestId + " frame number " + frameNumber + + ": completedRegularFrameNumber " + lastCompletedRegularFrameNumber + + ", completedReprocessFrameNUmber " + lastCompletedReprocessFrameNumber + + ", completedZslFrameNumber " + lastCompletedZslFrameNumber); } final CaptureCallbackHolder holder; @@ -1784,6 +1858,12 @@ public class CameraDeviceImpl extends CameraDevice return; } + // Check if it's okay to remove completed callbacks from mCaptureCallbackMap. + // A callback is completed if the corresponding inflight request has been removed + // from the inflight queue in cameraservice. + removeCompletedCallbackHolderLocked(lastCompletedRegularFrameNumber, + lastCompletedReprocessFrameNumber, lastCompletedZslFrameNumber); + // Get the callback for this frame ID, if there is one holder = CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId); diff --git a/core/java/android/hardware/camera2/impl/CameraOfflineSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraOfflineSessionImpl.java index 1d9d644c9306..413caf5e22e0 100644 --- a/core/java/android/hardware/camera2/impl/CameraOfflineSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraOfflineSessionImpl.java @@ -182,6 +182,12 @@ public class CameraOfflineSessionImpl extends CameraOfflineSession return; } + // Remove all capture callbacks now that device has gone to IDLE state. + removeCompletedCallbackHolderLocked( + Long.MAX_VALUE, /*lastCompletedRegularFrameNumber*/ + Long.MAX_VALUE, /*lastCompletedReprocessFrameNumber*/ + Long.MAX_VALUE /*lastCompletedZslStillFrameNumber*/); + Runnable idleDispatch = new Runnable() { @Override public void run() { @@ -204,10 +210,22 @@ public class CameraOfflineSessionImpl extends CameraOfflineSession public void onCaptureStarted(final CaptureResultExtras resultExtras, final long timestamp) { int requestId = resultExtras.getRequestId(); final long frameNumber = resultExtras.getFrameNumber(); + final long lastCompletedRegularFrameNumber = + resultExtras.getLastCompletedRegularFrameNumber(); + final long lastCompletedReprocessFrameNumber = + resultExtras.getLastCompletedReprocessFrameNumber(); + final long lastCompletedZslFrameNumber = + resultExtras.getLastCompletedZslFrameNumber(); final CaptureCallbackHolder holder; synchronized(mInterfaceLock) { + // Check if it's okay to remove completed callbacks from mCaptureCallbackMap. + // A callback is completed if the corresponding inflight request has been removed + // from the inflight queue in cameraservice. + removeCompletedCallbackHolderLocked(lastCompletedRegularFrameNumber, + lastCompletedReprocessFrameNumber, lastCompletedZslFrameNumber); + // Get the callback for this frame ID, if there is one holder = CameraOfflineSessionImpl.this.mCaptureCallbackMap.get(requestId); @@ -601,6 +619,61 @@ public class CameraOfflineSessionImpl extends CameraOfflineSession } } + private void removeCompletedCallbackHolderLocked(long lastCompletedRegularFrameNumber, + long lastCompletedReprocessFrameNumber, long lastCompletedZslStillFrameNumber) { + if (DEBUG) { + Log.v(TAG, String.format("remove completed callback holders for " + + "lastCompletedRegularFrameNumber %d, " + + "lastCompletedReprocessFrameNumber %d, " + + "lastCompletedZslStillFrameNumber %d", + lastCompletedRegularFrameNumber, + lastCompletedReprocessFrameNumber, + lastCompletedZslStillFrameNumber)); + } + + boolean isReprocess = false; + Iterator<RequestLastFrameNumbersHolder> iter = + mOfflineRequestLastFrameNumbersList.iterator(); + while (iter.hasNext()) { + final RequestLastFrameNumbersHolder requestLastFrameNumbers = iter.next(); + final int requestId = requestLastFrameNumbers.getRequestId(); + final CaptureCallbackHolder holder; + + int index = mCaptureCallbackMap.indexOfKey(requestId); + holder = (index >= 0) ? + mCaptureCallbackMap.valueAt(index) : null; + if (holder != null) { + long lastRegularFrameNumber = + requestLastFrameNumbers.getLastRegularFrameNumber(); + long lastReprocessFrameNumber = + requestLastFrameNumbers.getLastReprocessFrameNumber(); + long lastZslStillFrameNumber = + requestLastFrameNumbers.getLastZslStillFrameNumber(); + if (lastRegularFrameNumber <= lastCompletedRegularFrameNumber + && lastReprocessFrameNumber <= lastCompletedReprocessFrameNumber + && lastZslStillFrameNumber <= lastCompletedZslStillFrameNumber) { + if (requestLastFrameNumbers.isSequenceCompleted()) { + mCaptureCallbackMap.removeAt(index); + if (DEBUG) { + Log.v(TAG, String.format( + "Remove holder for requestId %d, because lastRegularFrame %d " + + "is <= %d, lastReprocessFrame %d is <= %d, " + + "lastZslStillFrame %d is <= %d", requestId, + lastRegularFrameNumber, lastCompletedRegularFrameNumber, + lastReprocessFrameNumber, lastCompletedReprocessFrameNumber, + lastZslStillFrameNumber, lastCompletedZslStillFrameNumber)); + } + + iter.remove(); + } else { + Log.e(TAG, "Sequence not yet completed for request id " + requestId); + continue; + } + } + } + } + } + public void notifyFailedSwitch() { synchronized(mInterfaceLock) { Runnable switchFailDispatch = new Runnable() { diff --git a/core/java/android/hardware/camera2/impl/CaptureResultExtras.java b/core/java/android/hardware/camera2/impl/CaptureResultExtras.java index 1ff5bd562f2e..5d9da73fd5c0 100644 --- a/core/java/android/hardware/camera2/impl/CaptureResultExtras.java +++ b/core/java/android/hardware/camera2/impl/CaptureResultExtras.java @@ -30,6 +30,9 @@ public class CaptureResultExtras implements Parcelable { private int partialResultCount; private int errorStreamId; private String errorPhysicalCameraId; + private long lastCompletedRegularFrameNumber; + private long lastCompletedReprocessFrameNumber; + private long lastCompletedZslFrameNumber; public static final @android.annotation.NonNull Parcelable.Creator<CaptureResultExtras> CREATOR = new Parcelable.Creator<CaptureResultExtras>() { @@ -51,7 +54,9 @@ public class CaptureResultExtras implements Parcelable { public CaptureResultExtras(int requestId, int subsequenceId, int afTriggerId, int precaptureTriggerId, long frameNumber, int partialResultCount, int errorStreamId, - String errorPhysicalCameraId) { + String errorPhysicalCameraId, long lastCompletedRegularFrameNumber, + long lastCompletedReprocessFrameNumber, + long lastCompletedZslFrameNumber) { this.requestId = requestId; this.subsequenceId = subsequenceId; this.afTriggerId = afTriggerId; @@ -60,6 +65,9 @@ public class CaptureResultExtras implements Parcelable { this.partialResultCount = partialResultCount; this.errorStreamId = errorStreamId; this.errorPhysicalCameraId = errorPhysicalCameraId; + this.lastCompletedRegularFrameNumber = lastCompletedRegularFrameNumber; + this.lastCompletedReprocessFrameNumber = lastCompletedReprocessFrameNumber; + this.lastCompletedZslFrameNumber = lastCompletedZslFrameNumber; } @Override @@ -82,6 +90,9 @@ public class CaptureResultExtras implements Parcelable { } else { dest.writeBoolean(false); } + dest.writeLong(lastCompletedRegularFrameNumber); + dest.writeLong(lastCompletedReprocessFrameNumber); + dest.writeLong(lastCompletedZslFrameNumber); } public void readFromParcel(Parcel in) { @@ -96,6 +107,9 @@ public class CaptureResultExtras implements Parcelable { if (errorPhysicalCameraIdPresent) { errorPhysicalCameraId = in.readString(); } + lastCompletedRegularFrameNumber = in.readLong(); + lastCompletedReprocessFrameNumber = in.readLong(); + lastCompletedZslFrameNumber = in.readLong(); } public String getErrorPhysicalCameraId() { @@ -129,4 +143,16 @@ public class CaptureResultExtras implements Parcelable { public int getErrorStreamId() { return errorStreamId; } + + public long getLastCompletedRegularFrameNumber() { + return lastCompletedRegularFrameNumber; + } + + public long getLastCompletedReprocessFrameNumber() { + return lastCompletedReprocessFrameNumber; + } + + public long getLastCompletedZslFrameNumber() { + return lastCompletedZslFrameNumber; + } } diff --git a/core/java/android/hardware/camera2/impl/RequestLastFrameNumbersHolder.java b/core/java/android/hardware/camera2/impl/RequestLastFrameNumbersHolder.java index bd1df9e1ac7d..0ee4ebc1aa87 100644 --- a/core/java/android/hardware/camera2/impl/RequestLastFrameNumbersHolder.java +++ b/core/java/android/hardware/camera2/impl/RequestLastFrameNumbersHolder.java @@ -38,6 +38,10 @@ public class RequestLastFrameNumbersHolder { // The last ZSL still capture frame number for this request ID. It's // CaptureCallback.NO_FRAMES_CAPTURED if the request ID has no zsl request. private final long mLastZslStillFrameNumber; + // Whether the sequence is completed. (only consider capture result) + private boolean mSequenceCompleted; + // Whether the inflight request is completed. (consider result, buffers, and notifies) + private boolean mInflightCompleted; /** * Create a request-last-frame-numbers holder with a list of requests, request ID, and @@ -89,6 +93,8 @@ public class RequestLastFrameNumbersHolder { mLastReprocessFrameNumber = lastReprocessFrameNumber; mLastZslStillFrameNumber = lastZslStillFrameNumber; mRequestId = requestInfo.getRequestId(); + mSequenceCompleted = false; + mInflightCompleted = false; } /** @@ -137,6 +143,8 @@ public class RequestLastFrameNumbersHolder { mLastZslStillFrameNumber = lastZslStillFrameNumber; mLastReprocessFrameNumber = CameraCaptureSession.CaptureCallback.NO_FRAMES_CAPTURED; mRequestId = requestId; + mSequenceCompleted = false; + mInflightCompleted = false; } /** @@ -177,5 +185,34 @@ public class RequestLastFrameNumbersHolder { public int getRequestId() { return mRequestId; } + + /** + * Return whether the capture sequence is completed. + */ + public boolean isSequenceCompleted() { + return mSequenceCompleted; + } + + /** + * Mark the capture sequence as completed. + */ + public void markSequenceCompleted() { + mSequenceCompleted = true; + } + + /** + * Return whether the inflight capture is completed. + */ + public boolean isInflightCompleted() { + return mInflightCompleted; + } + + /** + * Mark the inflight capture as completed. + */ + public void markInflightCompleted() { + mInflightCompleted = true; + } + } diff --git a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java index fbc9ac3229c3..fdd578c419d8 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java +++ b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java @@ -109,11 +109,12 @@ public class LegacyCameraDevice implements AutoCloseable { } if (holder == null) { return new CaptureResultExtras(ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE, - ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE, null); + ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE, null, + ILLEGAL_VALUE, ILLEGAL_VALUE, ILLEGAL_VALUE); } return new CaptureResultExtras(holder.getRequestId(), holder.getSubsequeceId(), /*afTriggerId*/0, /*precaptureTriggerId*/0, holder.getFrameNumber(), - /*partialResultCount*/1, errorStreamId, null); + /*partialResultCount*/1, errorStreamId, null, holder.getFrameNumber(), -1, -1); } /** diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java index 5ab035496a43..1ef4f1741e3a 100644 --- a/core/java/android/net/DhcpResults.java +++ b/core/java/android/net/DhcpResults.java @@ -18,12 +18,13 @@ package android.net; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.net.shared.InetAddressUtils; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; import android.util.Log; +import com.android.net.module.util.InetAddressUtils; + import java.net.Inet4Address; import java.net.InetAddress; import java.util.ArrayList; diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 0b92b95128d3..97a7ecc3fb15 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -21,13 +21,14 @@ import static android.system.OsConstants.AF_INET6; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; -import android.net.shared.Inet4AddressUtils; import android.os.Build; import android.system.ErrnoException; import android.system.Os; import android.util.Log; import android.util.Pair; +import com.android.net.module.util.Inet4AddressUtils; + import java.io.FileDescriptor; import java.math.BigInteger; import java.net.Inet4Address; diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index f24a9bd53039..a973455baa04 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -21,11 +21,11 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.net.shared.InetAddressUtils; import android.os.Parcel; import android.os.Parcelable; import com.android.internal.util.Preconditions; +import com.android.net.module.util.InetAddressUtils; import java.net.InetAddress; import java.util.ArrayList; diff --git a/core/java/android/net/shared/Inet4AddressUtils.java b/core/java/android/net/shared/Inet4AddressUtils.java deleted file mode 100644 index bec0c84fa689..000000000000 --- a/core/java/android/net/shared/Inet4AddressUtils.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) 2019 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.net.shared; - -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.UnknownHostException; - -/** - * Collection of utilities to work with IPv4 addresses. - * @hide - */ -public class Inet4AddressUtils { - - /** - * Convert a IPv4 address from an integer to an InetAddress (0x04030201 -> 1.2.3.4) - * - * <p>This method uses the higher-order int bytes as the lower-order IPv4 address bytes, - * which is an unusual convention. Consider {@link #intToInet4AddressHTH(int)} instead. - * @param hostAddress an int coding for an IPv4 address, where higher-order int byte is - * lower-order IPv4 address byte - */ - public static Inet4Address intToInet4AddressHTL(int hostAddress) { - return intToInet4AddressHTH(Integer.reverseBytes(hostAddress)); - } - - /** - * Convert a IPv4 address from an integer to an InetAddress (0x01020304 -> 1.2.3.4) - * @param hostAddress an int coding for an IPv4 address - */ - public static Inet4Address intToInet4AddressHTH(int hostAddress) { - byte[] addressBytes = { (byte) (0xff & (hostAddress >> 24)), - (byte) (0xff & (hostAddress >> 16)), - (byte) (0xff & (hostAddress >> 8)), - (byte) (0xff & hostAddress) }; - - try { - return (Inet4Address) InetAddress.getByAddress(addressBytes); - } catch (UnknownHostException e) { - throw new AssertionError(); - } - } - - /** - * Convert an IPv4 address from an InetAddress to an integer (1.2.3.4 -> 0x01020304) - * - * <p>This conversion can help order IP addresses: considering the ordering - * 192.0.2.1 < 192.0.2.2 < ..., resulting ints will follow that ordering if read as unsigned - * integers with {@link Integer#toUnsignedLong}. - * @param inetAddr is an InetAddress corresponding to the IPv4 address - * @return the IP address as integer - */ - public static int inet4AddressToIntHTH(Inet4Address inetAddr) - throws IllegalArgumentException { - byte [] addr = inetAddr.getAddress(); - return ((addr[0] & 0xff) << 24) | ((addr[1] & 0xff) << 16) - | ((addr[2] & 0xff) << 8) | (addr[3] & 0xff); - } - - /** - * Convert a IPv4 address from an InetAddress to an integer (1.2.3.4 -> 0x04030201) - * - * <p>This method stores the higher-order IPv4 address bytes in the lower-order int bytes, - * which is an unusual convention. Consider {@link #inet4AddressToIntHTH(Inet4Address)} instead. - * @param inetAddr is an InetAddress corresponding to the IPv4 address - * @return the IP address as integer - */ - public static int inet4AddressToIntHTL(Inet4Address inetAddr) { - return Integer.reverseBytes(inet4AddressToIntHTH(inetAddr)); - } - - /** - * Convert a network prefix length to an IPv4 netmask integer (prefixLength 17 -> 0xffff8000) - * @return the IPv4 netmask as an integer - */ - public static int prefixLengthToV4NetmaskIntHTH(int prefixLength) - throws IllegalArgumentException { - if (prefixLength < 0 || prefixLength > 32) { - throw new IllegalArgumentException("Invalid prefix length (0 <= prefix <= 32)"); - } - // (int)a << b is equivalent to a << (b & 0x1f): can't shift by 32 (-1 << 32 == -1) - return prefixLength == 0 ? 0 : 0xffffffff << (32 - prefixLength); - } - - /** - * Convert a network prefix length to an IPv4 netmask integer (prefixLength 17 -> 0x0080ffff). - * - * <p>This method stores the higher-order IPv4 address bytes in the lower-order int bytes, - * which is an unusual convention. Consider {@link #prefixLengthToV4NetmaskIntHTH(int)} instead. - * @return the IPv4 netmask as an integer - */ - public static int prefixLengthToV4NetmaskIntHTL(int prefixLength) - throws IllegalArgumentException { - return Integer.reverseBytes(prefixLengthToV4NetmaskIntHTH(prefixLength)); - } - - /** - * Convert an IPv4 netmask to a prefix length, checking that the netmask is contiguous. - * @param netmask as a {@code Inet4Address}. - * @return the network prefix length - * @throws IllegalArgumentException the specified netmask was not contiguous. - * @hide - */ - public static int netmaskToPrefixLength(Inet4Address netmask) { - // inetAddressToInt returns an int in *network* byte order. - int i = inet4AddressToIntHTH(netmask); - int prefixLength = Integer.bitCount(i); - int trailingZeros = Integer.numberOfTrailingZeros(i); - if (trailingZeros != 32 - prefixLength) { - throw new IllegalArgumentException("Non-contiguous netmask: " + Integer.toHexString(i)); - } - return prefixLength; - } - - /** - * Returns the implicit netmask of an IPv4 address, as was the custom before 1993. - */ - public static int getImplicitNetmask(Inet4Address address) { - int firstByte = address.getAddress()[0] & 0xff; // Convert to an unsigned value. - if (firstByte < 128) { - return 8; - } else if (firstByte < 192) { - return 16; - } else if (firstByte < 224) { - return 24; - } else { - return 32; // Will likely not end well for other reasons. - } - } - - /** - * Get the broadcast address for a given prefix. - * - * <p>For example 192.168.0.1/24 -> 192.168.0.255 - */ - public static Inet4Address getBroadcastAddress(Inet4Address addr, int prefixLength) - throws IllegalArgumentException { - final int intBroadcastAddr = inet4AddressToIntHTH(addr) - | ~prefixLengthToV4NetmaskIntHTH(prefixLength); - return intToInet4AddressHTH(intBroadcastAddr); - } - - /** - * Get a prefix mask as Inet4Address for a given prefix length. - * - * <p>For example 20 -> 255.255.240.0 - */ - public static Inet4Address getPrefixMaskAsInet4Address(int prefixLength) - throws IllegalArgumentException { - return intToInet4AddressHTH(prefixLengthToV4NetmaskIntHTH(prefixLength)); - } -} diff --git a/core/java/android/net/shared/InetAddressUtils.java b/core/java/android/net/shared/InetAddressUtils.java deleted file mode 100644 index c9ee3a7cce4b..000000000000 --- a/core/java/android/net/shared/InetAddressUtils.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2012 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.net.shared; - -import android.os.Parcel; - -import java.net.InetAddress; -import java.net.UnknownHostException; - -/** - * Collection of utilities to interact with {@link InetAddress} - * @hide - */ -public class InetAddressUtils { - - /** - * Writes an InetAddress to a parcel. The address may be null. This is likely faster than - * calling writeSerializable. - * @hide - */ - public static void parcelInetAddress(Parcel parcel, InetAddress address, int flags) { - byte[] addressArray = (address != null) ? address.getAddress() : null; - parcel.writeByteArray(addressArray); - } - - /** - * Reads an InetAddress from a parcel. Returns null if the address that was written was null - * or if the data is invalid. - * @hide - */ - public static InetAddress unparcelInetAddress(Parcel in) { - byte[] addressArray = in.createByteArray(); - if (addressArray == null) { - return null; - } - try { - return InetAddress.getByAddress(addressArray); - } catch (UnknownHostException e) { - return null; - } - } - - private InetAddressUtils() {} -} diff --git a/core/java/android/os/CarrierAssociatedAppEntry.aidl b/core/java/android/os/CarrierAssociatedAppEntry.aidl new file mode 100644 index 000000000000..a9b1055ee174 --- /dev/null +++ b/core/java/android/os/CarrierAssociatedAppEntry.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2020 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.os; + +parcelable CarrierAssociatedAppEntry; diff --git a/core/java/android/os/CarrierAssociatedAppEntry.java b/core/java/android/os/CarrierAssociatedAppEntry.java new file mode 100644 index 000000000000..13f6eb63e29c --- /dev/null +++ b/core/java/android/os/CarrierAssociatedAppEntry.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2020 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.os; + +/** + * Represents a carrier app entry for use with {@link SystemConfigService}. + * + * @hide + */ +public final class CarrierAssociatedAppEntry implements Parcelable { + + /** + * For carrier-associated app entries that don't specify the addedInSdk XML + * attribute. + */ + public static final int SDK_UNSPECIFIED = -1; + + public final String packageName; + /** May be {@link #SDK_UNSPECIFIED}. */ + public final int addedInSdk; + + public CarrierAssociatedAppEntry(String packageName, int addedInSdk) { + this.packageName = packageName; + this.addedInSdk = addedInSdk; + } + + public CarrierAssociatedAppEntry(Parcel in) { + packageName = in.readString(); + addedInSdk = in.readInt(); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(packageName); + dest.writeInt(addedInSdk); + } + + public static final Parcelable.Creator<CarrierAssociatedAppEntry> CREATOR = + new Parcelable.Creator<CarrierAssociatedAppEntry>() { + @Override + public CarrierAssociatedAppEntry createFromParcel(Parcel source) { + return new CarrierAssociatedAppEntry(source); + } + + @Override + public CarrierAssociatedAppEntry[] newArray(int size) { + return new CarrierAssociatedAppEntry[size]; + } + }; +} diff --git a/core/java/android/os/ISystemConfig.aidl b/core/java/android/os/ISystemConfig.aidl index d3b029854112..52f0ce1f054f 100644 --- a/core/java/android/os/ISystemConfig.aidl +++ b/core/java/android/os/ISystemConfig.aidl @@ -30,4 +30,9 @@ interface ISystemConfig { * @see SystemConfigManager#getDisabledUntilUsedPreinstalledCarrierAssociatedApps */ Map getDisabledUntilUsedPreinstalledCarrierAssociatedApps(); + + /** + * @see SystemConfigManager#getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries + */ + Map getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries(); } diff --git a/core/java/android/os/SystemConfigManager.java b/core/java/android/os/SystemConfigManager.java index 3a9ce2fa85f1..12a1ffaf69c1 100644 --- a/core/java/android/os/SystemConfigManager.java +++ b/core/java/android/os/SystemConfigManager.java @@ -88,4 +88,29 @@ public class SystemConfigManager { return Collections.emptyMap(); } } + + /** + * Returns a map that describes helper apps associated with carrier apps that, like the apps + * returned by {@link #getDisabledUntilUsedPreinstalledCarrierApps()}, should be disabled until + * the correct SIM is inserted into the device. + * + * <p>TODO(b/159069037) expose this and get rid of the other method that omits SDK version. + * + * @return A map with keys corresponding to package names returned by + * {@link #getDisabledUntilUsedPreinstalledCarrierApps()} and values as lists of package + * names of helper apps and the SDK versions when they were first added. + * + * @hide + */ + @RequiresPermission(Manifest.permission.READ_CARRIER_APP_INFO) + public @NonNull Map<String, List<CarrierAssociatedAppEntry>> + getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries() { + try { + return (Map<String, List<CarrierAssociatedAppEntry>>) + mInterface.getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries(); + } catch (RemoteException e) { + Log.e(TAG, "Caught remote exception", e); + return Collections.emptyMap(); + } + } } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cd2467f9157d..1fafbd3bbed1 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8521,14 +8521,15 @@ public final class Settings { public static final int VR_DISPLAY_MODE_OFF = 1; /** - * Whether CarrierAppUtils#disableCarrierAppsUntilPrivileged has been executed at least - * once. + * The latest SDK version that CarrierAppUtils#disableCarrierAppsUntilPrivileged has been + * executed for. * * <p>This is used to ensure that we only take one pass which will disable apps that are not * privileged (if any). From then on, we only want to enable apps (when a matching SIM is * inserted), to avoid disabling an app that the user might actively be using. * - * <p>Will be set to 1 once executed. + * <p>Will be set to {@link android.os.Build.VERSION#SDK_INT} once executed. Note that older + * SDK versions prior to R set 1 for this value. * * @hide */ diff --git a/core/java/android/service/autofill/augmented/FillWindow.java b/core/java/android/service/autofill/augmented/FillWindow.java index 077df6cf16ef..8e866466e8df 100644 --- a/core/java/android/service/autofill/augmented/FillWindow.java +++ b/core/java/android/service/autofill/augmented/FillWindow.java @@ -208,12 +208,18 @@ public final class FillWindow implements AutoCloseable { if (sDebug) Log.d(TAG, "handleShow()"); synchronized (mLock) { if (mWm != null && mFillView != null) { - p.flags |= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; - if (!mShowing) { - mWm.addView(mFillView, p); - mShowing = true; - } else { - mWm.updateViewLayout(mFillView, p); + try { + p.flags |= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; + if (!mShowing) { + mWm.addView(mFillView, p); + mShowing = true; + } else { + mWm.updateViewLayout(mFillView, p); + } + } catch (WindowManager.BadTokenException e) { + if (sDebug) Log.d(TAG, "Filed with token " + p.token + " gone."); + } catch (IllegalStateException e) { + if (sDebug) Log.d(TAG, "Exception showing window."); } } } @@ -223,8 +229,12 @@ public final class FillWindow implements AutoCloseable { if (sDebug) Log.d(TAG, "handleHide()"); synchronized (mLock) { if (mWm != null && mFillView != null && mShowing) { - mWm.removeView(mFillView); - mShowing = false; + try { + mWm.removeView(mFillView); + mShowing = false; + } catch (IllegalStateException e) { + if (sDebug) Log.d(TAG, "Exception hiding window."); + } } } } diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 8acf5fa8bdfe..537498c44d5e 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -67,7 +67,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "true"); DEFAULT_FLAGS.put("settings_tether_all_in_one", "false"); - DEFAULT_FLAGS.put("settings_contextual_home2", "true"); } /** diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index b4dae566ce2a..dd48d554f296 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -606,12 +606,14 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private void updateState(InsetsState newState) { mState.setDisplayFrame(newState.getDisplayFrame()); - for (int i = newState.getSourcesCount() - 1; i >= 0; i--) { - InsetsSource source = newState.sourceAt(i); + for (int i = 0; i < InsetsState.SIZE; i++) { + InsetsSource source = newState.peekSource(i); + if (source == null) continue;; getSourceConsumer(source.getType()).updateSource(source); } - for (int i = mState.getSourcesCount() - 1; i >= 0; i--) { - InsetsSource source = mState.sourceAt(i); + for (int i = 0; i < InsetsState.SIZE; i++) { + InsetsSource source = mState.peekSource(i); + if (source == null) continue; if (newState.peekSource(source.getType()) == null) { mState.removeSource(source.getType()); } @@ -707,7 +709,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation if (hideTypes[0] != 0) { applyAnimation(hideTypes[0], false /* show */, false /* fromIme */); } - if (hasControl && mRequestedState.getSourcesCount() > 0) { + if (hasControl && mRequestedState.hasSources()) { // We might have changed our requested visibilities while we don't have the control, // so we need to update our requested state once we have control. Otherwise, our // requested state at the server side might be incorrect. diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index 17620fa3bb4b..9bf2e01a6bd1 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -50,6 +50,7 @@ import com.android.internal.annotations.VisibleForTesting; import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; import java.util.Objects; import java.util.StringJoiner; @@ -117,6 +118,7 @@ public class InsetsState implements Parcelable { public static final int ITYPE_EXTRA_NAVIGATION_BAR = 15; static final int LAST_TYPE = ITYPE_EXTRA_NAVIGATION_BAR; + public static final int SIZE = LAST_TYPE + 1; // Derived types @@ -140,7 +142,7 @@ public class InsetsState implements Parcelable { static final int ISIDE_FLOATING = 4; static final int ISIDE_UNKNOWN = 5; - private final ArrayMap<Integer, InsetsSource> mSources = new ArrayMap<>(); + private InsetsSource[] mSources = new InsetsSource[SIZE]; /** * The frame of the display these sources are relative to. @@ -177,7 +179,7 @@ public class InsetsState implements Parcelable { final Rect relativeFrame = new Rect(frame); final Rect relativeFrameMax = new Rect(frame); for (int type = FIRST_TYPE; type <= LAST_TYPE; type++) { - InsetsSource source = mSources.get(type); + InsetsSource source = mSources[type]; if (source == null) { int index = indexOf(toPublicType(type)); if (typeInsetsMap[index] == null) { @@ -227,7 +229,7 @@ public class InsetsState implements Parcelable { public Rect calculateVisibleInsets(Rect frame, @SoftInputModeFlags int softInputMode) { Insets insets = Insets.NONE; for (int type = FIRST_TYPE; type <= LAST_TYPE; type++) { - InsetsSource source = mSources.get(type); + InsetsSource source = mSources[type]; if (source == null) { continue; } @@ -256,7 +258,7 @@ public class InsetsState implements Parcelable { public int calculateUncontrollableInsetsFromFrame(Rect frame) { int blocked = 0; for (int type = FIRST_TYPE; type <= LAST_TYPE; type++) { - InsetsSource source = mSources.get(type); + InsetsSource source = mSources[type]; if (source == null) { continue; } @@ -350,11 +352,26 @@ public class InsetsState implements Parcelable { } public InsetsSource getSource(@InternalInsetsType int type) { - return mSources.computeIfAbsent(type, InsetsSource::new); + InsetsSource source = mSources[type]; + if (source != null) { + return source; + } + source = new InsetsSource(type); + mSources[type] = source; + return source; } public @Nullable InsetsSource peekSource(@InternalInsetsType int type) { - return mSources.get(type); + return mSources[type]; + } + + public boolean hasSources() { + for (int i = 0; i < SIZE; i++) { + if (mSources[i] != null) { + return true; + } + } + return false; } /** @@ -366,7 +383,7 @@ public class InsetsState implements Parcelable { * doesn't exist. */ public boolean getSourceOrDefaultVisibility(@InternalInsetsType int type) { - final InsetsSource source = mSources.get(type); + final InsetsSource source = mSources[type]; return source != null ? source.isVisible() : getDefaultVisibility(type); } @@ -385,7 +402,7 @@ public class InsetsState implements Parcelable { * @param type The {@link InternalInsetsType} of the source to remove */ public void removeSource(@InternalInsetsType int type) { - mSources.remove(type); + mSources[type] = null; } /** @@ -395,7 +412,7 @@ public class InsetsState implements Parcelable { * @param visible {@code true} for visible */ public void setSourceVisible(@InternalInsetsType int type, boolean visible) { - InsetsSource source = mSources.get(type); + InsetsSource source = mSources[type]; if (source != null) { source.setVisible(visible); } @@ -407,27 +424,21 @@ public class InsetsState implements Parcelable { public void set(InsetsState other, boolean copySources) { mDisplayFrame.set(other.mDisplayFrame); - mSources.clear(); if (copySources) { - for (int i = 0; i < other.mSources.size(); i++) { - InsetsSource source = other.mSources.valueAt(i); - mSources.put(source.getType(), new InsetsSource(source)); + for (int i = 0; i < SIZE; i++) { + InsetsSource source = other.mSources[i]; + if (source == null) continue; + mSources[i] = new InsetsSource(source); } } else { - mSources.putAll(other.mSources); + for (int i = 0; i < SIZE; i++) { + mSources[i] = other.mSources[i]; + } } } public void addSource(InsetsSource source) { - mSources.put(source.getType(), source); - } - - public int getSourcesCount() { - return mSources.size(); - } - - public InsetsSource sourceAt(int index) { - return mSources.valueAt(index); + mSources[source.getType()] = source; } public static @InternalInsetsType ArraySet<Integer> toInternalType(@InsetsType int types) { @@ -508,8 +519,10 @@ public class InsetsState implements Parcelable { public void dump(String prefix, PrintWriter pw) { pw.println(prefix + "InsetsState"); - for (int i = mSources.size() - 1; i >= 0; i--) { - mSources.valueAt(i).dump(prefix + " ", pw); + for (int i = 0; i < SIZE; i++) { + InsetsSource source = mSources[i]; + if (source == null) continue; + source.dump(prefix + " ", pw); } } @@ -578,26 +591,16 @@ public class InsetsState implements Parcelable { if (!mDisplayFrame.equals(state.mDisplayFrame)) { return false; } - int size = mSources.size(); - int otherSize = state.mSources.size(); - if (excludingCaptionInsets) { - if (mSources.get(ITYPE_CAPTION_BAR) != null) { - size--; - } - if (state.mSources.get(ITYPE_CAPTION_BAR) != null) { - otherSize--; - } - } - if (size != otherSize) { - return false; - } - for (int i = mSources.size() - 1; i >= 0; i--) { - InsetsSource source = mSources.valueAt(i); + for (int i = 0; i < SIZE; i++) { if (excludingCaptionInsets) { - if (source.getType() == ITYPE_CAPTION_BAR) continue; + if (i == ITYPE_CAPTION_BAR) continue; + } + InsetsSource source = mSources[i]; + InsetsSource otherSource = state.mSources[i]; + if (source == null && otherSource == null) { + continue; } - InsetsSource otherSource = state.mSources.get(source.getType()); - if (otherSource == null) { + if (source != null && otherSource == null || source == null && otherSource != null) { return false; } if (!otherSource.equals(source, excludeInvisibleImeFrames)) { @@ -609,7 +612,7 @@ public class InsetsState implements Parcelable { @Override public int hashCode() { - return Objects.hash(mDisplayFrame, mSources); + return Objects.hash(mDisplayFrame, Arrays.hashCode(mSources)); } public InsetsState(Parcel in) { @@ -624,10 +627,7 @@ public class InsetsState implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeParcelable(mDisplayFrame, flags); - dest.writeInt(mSources.size()); - for (int i = 0; i < mSources.size(); i++) { - dest.writeParcelable(mSources.valueAt(i), flags); - } + dest.writeParcelableArray(mSources, 0); } public static final @android.annotation.NonNull Creator<InsetsState> CREATOR = new Creator<InsetsState>() { @@ -642,19 +642,15 @@ public class InsetsState implements Parcelable { }; public void readFromParcel(Parcel in) { - mSources.clear(); mDisplayFrame.set(in.readParcelable(null /* loader */)); - final int size = in.readInt(); - for (int i = 0; i < size; i++) { - final InsetsSource source = in.readParcelable(null /* loader */); - mSources.put(source.getType(), source); - } + mSources = in.readParcelableArray(null, InsetsSource.class); } @Override public String toString() { StringJoiner joiner = new StringJoiner(", "); - for (InsetsSource source : mSources.values()) { + for (int i = 0; i < SIZE; i++) { + InsetsSource source = mSources[i]; if (source != null) { joiner.add(source.toString()); } diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index aac92709a177..3b3836582b16 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -49,6 +49,7 @@ import android.os.Build; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; +import android.os.Trace; import android.util.ArrayMap; import android.util.Log; import android.util.SparseIntArray; @@ -439,7 +440,9 @@ public final class SurfaceControl implements Parcelable { release(); } if (nativeObject != 0) { + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "closeGuard"); mCloseGuard.open("release"); + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); } mNativeObject = nativeObject; mNativeHandle = mNativeObject != 0 ? nativeGetHandle(nativeObject) : 0; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 8b5d033072fb..2743654695e0 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -22,6 +22,7 @@ import static android.view.InputDevice.SOURCE_CLASS_NONE; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; import static android.view.InsetsState.LAST_TYPE; +import static android.view.InsetsState.SIZE; import static android.view.View.PFLAG_DRAW_ANIMATION; import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN; import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; @@ -564,7 +565,7 @@ public final class ViewRootImpl implements ViewParent, new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT); boolean mPendingAlwaysConsumeSystemBars; private final InsetsState mTempInsets = new InsetsState(); - private final InsetsSourceControl[] mTempControls = new InsetsSourceControl[LAST_TYPE + 1]; + private final InsetsSourceControl[] mTempControls = new InsetsSourceControl[SIZE]; final ViewTreeObserver.InternalInsetsInfo mLastGivenInsets = new ViewTreeObserver.InternalInsetsInfo(); diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index 6eb71f747be6..c43beea98c7e 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -52,6 +52,7 @@ import android.view.contentcapture.ViewNode.ViewStructureImpl; import com.android.internal.os.IResultReceiver; import java.io.PrintWriter; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -146,7 +147,44 @@ public final class MainContentCaptureSession extends ContentCaptureSession { * Binder object used to update the session state. */ @NonNull - private final IResultReceiver.Stub mSessionStateReceiver; + private final SessionStateReceiver mSessionStateReceiver; + + private static class SessionStateReceiver extends IResultReceiver.Stub { + private final WeakReference<MainContentCaptureSession> mMainSession; + + SessionStateReceiver(MainContentCaptureSession session) { + mMainSession = new WeakReference<>(session); + } + + @Override + public void send(int resultCode, Bundle resultData) { + final MainContentCaptureSession mainSession = mMainSession.get(); + if (mainSession == null) { + Log.w(TAG, "received result after mina session released"); + return; + } + final IBinder binder; + if (resultData != null) { + // Change in content capture enabled. + final boolean hasEnabled = resultData.getBoolean(EXTRA_ENABLED_STATE); + if (hasEnabled) { + final boolean disabled = (resultCode == RESULT_CODE_FALSE); + mainSession.mDisabled.set(disabled); + return; + } + binder = resultData.getBinder(EXTRA_BINDER); + if (binder == null) { + Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result"); + mainSession.mHandler.post(() -> mainSession.resetSession( + STATE_DISABLED | STATE_INTERNAL_ERROR)); + return; + } + } else { + binder = null; + } + mainSession.mHandler.post(() -> mainSession.onSessionStarted(resultCode, binder)); + } + } protected MainContentCaptureSession(@NonNull Context context, @NonNull ContentCaptureManager manager, @NonNull Handler handler, @@ -159,32 +197,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { final int logHistorySize = mManager.mOptions.logHistorySize; mFlushHistory = logHistorySize > 0 ? new LocalLog(logHistorySize) : null; - mSessionStateReceiver = new IResultReceiver.Stub() { - @Override - public void send(int resultCode, Bundle resultData) { - final IBinder binder; - if (resultData != null) { - // Change in content capture enabled. - final boolean hasEnabled = resultData.getBoolean(EXTRA_ENABLED_STATE); - if (hasEnabled) { - final boolean disabled = (resultCode == RESULT_CODE_FALSE); - mDisabled.set(disabled); - return; - } - binder = resultData.getBinder(EXTRA_BINDER); - if (binder == null) { - Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result"); - mHandler.post(() -> resetSession( - STATE_DISABLED | STATE_INTERNAL_ERROR)); - return; - } - } else { - binder = null; - } - mHandler.post(() -> onSessionStarted(resultCode, binder)); - } - }; - + mSessionStateReceiver = new SessionStateReceiver(this); } @Override @@ -543,6 +556,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession { Log.e(TAG, "Error destroying system-service session " + mId + " for " + getDebugState() + ": " + e); } + + if (mDirectServiceInterface != null) { + mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0); + } + mDirectServiceInterface = null; } // TODO(b/122454205): once we support multiple sessions, we might need to move some of these diff --git a/core/java/android/widget/ToastPresenter.java b/core/java/android/widget/ToastPresenter.java index 2679c69be4f6..fb5d55dd2141 100644 --- a/core/java/android/widget/ToastPresenter.java +++ b/core/java/android/widget/ToastPresenter.java @@ -27,7 +27,6 @@ import android.content.res.Resources; import android.graphics.PixelFormat; import android.os.IBinder; import android.os.RemoteException; -import android.os.UserHandle; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; @@ -90,7 +89,7 @@ public class ToastPresenter { // context to it. This is problematic for multi-user because callers can pass a context // created via Context.createContextAsUser(). mAccessibilityManager = new AccessibilityManager(context, accessibilityManager, - UserHandle.getCallingUserId()); + context.getUserId()); mParams = createLayoutParams(); } diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java index 04a186c3207e..094fb1e2f23c 100644 --- a/core/java/com/android/internal/app/ResolverListAdapter.java +++ b/core/java/com/android/internal/app/ResolverListAdapter.java @@ -689,17 +689,17 @@ public class ResolverListAdapter extends BaseAdapter { } public void bindLabel(CharSequence label, CharSequence subLabel, boolean showSubLabel) { - if (!TextUtils.equals(text.getText(), label)) { - text.setText(label); - } + text.setText(label); if (TextUtils.equals(label, subLabel)) { - subLabel = ""; + subLabel = null; } - if (showSubLabel || !TextUtils.equals(text2.getText(), subLabel)) { + text2.setText(subLabel); + if (showSubLabel || subLabel != null) { text2.setVisibility(View.VISIBLE); - text2.setText(subLabel); + } else { + text2.setVisibility(View.GONE); } itemView.setContentDescription(null); diff --git a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java index 575a5320bbd3..527286cf000e 100644 --- a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java +++ b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java @@ -104,17 +104,18 @@ public class DividerSnapAlgorithm { public DividerSnapAlgorithm(Resources res, int displayWidth, int displayHeight, int dividerSize, boolean isHorizontalDivision, Rect insets) { this(res, displayWidth, displayHeight, dividerSize, isHorizontalDivision, insets, - DOCKED_INVALID, false); + DOCKED_INVALID, false /* minimized */, true /* resizable */); } public DividerSnapAlgorithm(Resources res, int displayWidth, int displayHeight, int dividerSize, boolean isHorizontalDivision, Rect insets, int dockSide) { this(res, displayWidth, displayHeight, dividerSize, isHorizontalDivision, insets, - dockSide, false); + dockSide, false /* minimized */, true /* resizable */); } public DividerSnapAlgorithm(Resources res, int displayWidth, int displayHeight, int dividerSize, - boolean isHorizontalDivision, Rect insets, int dockSide, boolean isMinimizedMode) { + boolean isHorizontalDivision, Rect insets, int dockSide, boolean isMinimizedMode, + boolean isHomeResizable) { mMinFlingVelocityPxPerSecond = MIN_FLING_VELOCITY_DP_PER_SECOND * res.getDisplayMetrics().density; mMinDismissVelocityPxPerSecond = @@ -132,8 +133,8 @@ public class DividerSnapAlgorithm { com.android.internal.R.fraction.docked_stack_divider_fixed_ratio, 1, 1); mMinimalSizeResizableTask = res.getDimensionPixelSize( com.android.internal.R.dimen.default_minimal_size_resizable_task); - mTaskHeightInMinimizedMode = res.getDimensionPixelSize( - com.android.internal.R.dimen.task_height_of_minimized_mode); + mTaskHeightInMinimizedMode = isHomeResizable ? res.getDimensionPixelSize( + com.android.internal.R.dimen.task_height_of_minimized_mode) : 0; calculateTargets(isHorizontalDivision, dockSide); mFirstSplitTarget = mTargets.get(1); mLastSplitTarget = mTargets.get(mTargets.size() - 2); diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index d9ca9c2f87f5..ea390cd71e31 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -24,6 +24,7 @@ import android.content.ComponentName; import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Build; +import android.os.CarrierAssociatedAppEntry; import android.os.Environment; import android.os.FileUtils; import android.os.Process; @@ -198,8 +199,8 @@ public class SystemConfig { // These are the packages of carrier-associated apps which should be disabled until used until // a SIM is inserted which grants carrier privileges to that carrier app. - final ArrayMap<String, List<String>> mDisabledUntilUsedPreinstalledCarrierAssociatedApps = - new ArrayMap<>(); + final ArrayMap<String, List<CarrierAssociatedAppEntry>> + mDisabledUntilUsedPreinstalledCarrierAssociatedApps = new ArrayMap<>(); final ArrayMap<String, ArraySet<String>> mPrivAppPermissions = new ArrayMap<>(); final ArrayMap<String, ArraySet<String>> mPrivAppDenyPermissions = new ArrayMap<>(); @@ -331,7 +332,8 @@ public class SystemConfig { return mDisabledUntilUsedPreinstalledCarrierApps; } - public ArrayMap<String, List<String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps() { + public ArrayMap<String, List<CarrierAssociatedAppEntry>> + getDisabledUntilUsedPreinstalledCarrierAssociatedApps() { return mDisabledUntilUsedPreinstalledCarrierAssociatedApps; } @@ -954,7 +956,23 @@ public class SystemConfig { + "> without package or carrierAppPackage in " + permFile + " at " + parser.getPositionDescription()); } else { - List<String> associatedPkgs = + // APKs added to system images via OTA should specify the addedInSdk + // attribute, otherwise they may be enabled-by-default in too many + // cases. See CarrierAppUtils for more info. + int addedInSdk = CarrierAssociatedAppEntry.SDK_UNSPECIFIED; + String addedInSdkStr = parser.getAttributeValue(null, "addedInSdk"); + if (!TextUtils.isEmpty(addedInSdkStr)) { + try { + addedInSdk = Integer.parseInt(addedInSdkStr); + } catch (NumberFormatException e) { + Slog.w(TAG, "<" + name + "> addedInSdk not an integer in " + + permFile + " at " + + parser.getPositionDescription()); + XmlUtils.skipCurrentTag(parser); + break; + } + } + List<CarrierAssociatedAppEntry> associatedPkgs = mDisabledUntilUsedPreinstalledCarrierAssociatedApps.get( carrierPkgname); if (associatedPkgs == null) { @@ -962,7 +980,8 @@ public class SystemConfig { mDisabledUntilUsedPreinstalledCarrierAssociatedApps.put( carrierPkgname, associatedPkgs); } - associatedPkgs.add(pkgname); + associatedPkgs.add( + new CarrierAssociatedAppEntry(pkgname, addedInSdk)); } } else { logNotAllowedInPartition(name, permFile, parser); diff --git a/core/res/res/drawable-car-night/car_dialog_button_background.xml b/core/res/res/drawable-car-night/car_dialog_button_background.xml new file mode 100644 index 000000000000..138cb38b0d87 --- /dev/null +++ b/core/res/res/drawable-car-night/car_dialog_button_background.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 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. + --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true"> + <ripple android:color="#2371cd"> + <item android:id="@android:id/mask"> + <color android:color="@*android:color/car_white_1000"/> + </item> + </ripple> + </item> + <item> + <ripple android:color="?android:attr/colorControlHighlight"> + <item android:id="@android:id/mask"> + <color android:color="@*android:color/car_white_1000"/> + </item> + </ripple> + </item> +</selector> diff --git a/core/res/res/drawable-car/car_dialog_button_background.xml b/core/res/res/drawable-car/car_dialog_button_background.xml index 67506cbc12bc..a7d40bcd759a 100644 --- a/core/res/res/drawable-car/car_dialog_button_background.xml +++ b/core/res/res/drawable-car/car_dialog_button_background.xml @@ -14,9 +14,19 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight"> - <item android:id="@android:id/mask"> - <color android:color="@*android:color/car_white_1000" /> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true"> + <ripple android:color="#4b9eff"> + <item android:id="@android:id/mask"> + <color android:color="@*android:color/car_white_1000"/> + </item> + </ripple> </item> -</ripple> + <item> + <ripple android:color="?android:attr/colorControlHighlight"> + <item android:id="@android:id/mask"> + <color android:color="@*android:color/car_white_1000"/> + </item> + </ripple> + </item> +</selector> diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 9d0fe11be46b..88b614dc7eef 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -483,14 +483,14 @@ public class KeyStore { mBinder.asBinder().linkToDeath(promise, 0); int errorCode = mBinder.addRngEntropy(promise, data, flags); if (errorCode == NO_ERROR) { - return promise.getFuture().get().getErrorCode() == NO_ERROR; + return interruptedPreservingGet(promise.getFuture()).getErrorCode() == NO_ERROR; } else { return false; } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return false; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "AddRngEntropy completed with exception", e); return false; } finally { @@ -548,7 +548,7 @@ public class KeyStore { private int generateKeyInternal(String alias, KeymasterArguments args, byte[] entropy, int uid, int flags, KeyCharacteristics outCharacteristics) - throws RemoteException, ExecutionException, InterruptedException { + throws RemoteException, ExecutionException { KeyCharacteristicsPromise promise = new KeyCharacteristicsPromise(); int error = NO_ERROR; KeyCharacteristicsCallbackResult result = null; @@ -559,7 +559,7 @@ public class KeyStore { Log.e(TAG, "generateKeyInternal failed on request " + error); return error; } - result = promise.getFuture().get(); + result = interruptedPreservingGet(promise.getFuture()); } finally { mBinder.asBinder().unlinkToDeath(promise, 0); } @@ -592,7 +592,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "generateKey completed with exception", e); return SYSTEM_ERROR; } @@ -614,7 +614,7 @@ public class KeyStore { int error = mBinder.getKeyCharacteristics(promise, alias, clientId, appId, uid); if (error != NO_ERROR) return error; - KeyCharacteristicsCallbackResult result = promise.getFuture().get(); + KeyCharacteristicsCallbackResult result = interruptedPreservingGet(promise.getFuture()); error = result.getKeystoreResponse().getErrorCode(); if (error != NO_ERROR) return error; @@ -625,7 +625,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "GetKeyCharacteristics completed with exception", e); return SYSTEM_ERROR; } finally { @@ -640,14 +640,14 @@ public class KeyStore { private int importKeyInternal(String alias, KeymasterArguments args, int format, byte[] keyData, int uid, int flags, KeyCharacteristics outCharacteristics) - throws RemoteException, ExecutionException, InterruptedException { + throws RemoteException, ExecutionException { KeyCharacteristicsPromise promise = new KeyCharacteristicsPromise(); mBinder.asBinder().linkToDeath(promise, 0); try { int error = mBinder.importKey(promise, alias, args, format, keyData, uid, flags); if (error != NO_ERROR) return error; - KeyCharacteristicsCallbackResult result = promise.getFuture().get(); + KeyCharacteristicsCallbackResult result = interruptedPreservingGet(promise.getFuture()); error = result.getKeystoreResponse().getErrorCode(); if (error != NO_ERROR) return error; @@ -675,7 +675,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "ImportKey completed with exception", e); return SYSTEM_ERROR; } @@ -747,7 +747,7 @@ public class KeyStore { String wrappingKeyAlias, byte[] maskingKey, KeymasterArguments args, long rootSid, long fingerprintSid, KeyCharacteristics outCharacteristics) - throws RemoteException, ExecutionException, InterruptedException { + throws RemoteException, ExecutionException { KeyCharacteristicsPromise promise = new KeyCharacteristicsPromise(); mBinder.asBinder().linkToDeath(promise, 0); try { @@ -755,7 +755,7 @@ public class KeyStore { wrappingKeyAlias, maskingKey, args, rootSid, fingerprintSid); if (error != NO_ERROR) return error; - KeyCharacteristicsCallbackResult result = promise.getFuture().get(); + KeyCharacteristicsCallbackResult result = interruptedPreservingGet(promise.getFuture()); error = result.getKeystoreResponse().getErrorCode(); if (error != NO_ERROR) return error; @@ -786,7 +786,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "ImportWrappedKey completed with exception", e); return SYSTEM_ERROR; } @@ -818,14 +818,14 @@ public class KeyStore { appId = appId != null ? appId : new KeymasterBlob(new byte[0]); int error = mBinder.exportKey(promise, alias, format, clientId, appId, uid); if (error == NO_ERROR) { - return promise.getFuture().get(); + return interruptedPreservingGet(promise.getFuture()); } else { return new ExportResult(error); } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return null; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "ExportKey completed with exception", e); return null; } finally { @@ -864,14 +864,14 @@ public class KeyStore { int errorCode = mBinder.begin(promise, getToken(), alias, purpose, pruneable, args, entropy, uid); if (errorCode == NO_ERROR) { - return promise.getFuture().get(); + return interruptedPreservingGet(promise.getFuture()); } else { return new OperationResult(errorCode); } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return null; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "Begin completed with exception", e); return null; } finally { @@ -894,14 +894,14 @@ public class KeyStore { input = input != null ? input : new byte[0]; int errorCode = mBinder.update(promise, token, arguments, input); if (errorCode == NO_ERROR) { - return promise.getFuture().get(); + return interruptedPreservingGet(promise.getFuture()); } else { return new OperationResult(errorCode); } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return null; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "Update completed with exception", e); return null; } finally { @@ -930,14 +930,14 @@ public class KeyStore { signature = signature != null ? signature : new byte[0]; int errorCode = mBinder.finish(promise, token, arguments, input, signature, entropy); if (errorCode == NO_ERROR) { - return promise.getFuture().get(); + return interruptedPreservingGet(promise.getFuture()); } else { return new OperationResult(errorCode); } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return null; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "Finish completed with exception", e); return null; } finally { @@ -972,14 +972,14 @@ public class KeyStore { mBinder.asBinder().linkToDeath(promise, 0); int errorCode = mBinder.abort(promise, token); if (errorCode == NO_ERROR) { - return promise.getFuture().get().getErrorCode(); + return interruptedPreservingGet(promise.getFuture()).getErrorCode(); } else { return errorCode; } } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "Abort completed with exception", e); return SYSTEM_ERROR; } finally { @@ -1135,7 +1135,7 @@ public class KeyStore { } int error = mBinder.attestKey(promise, alias, params); if (error != NO_ERROR) return error; - KeyAttestationCallbackResult result = promise.getFuture().get(); + KeyAttestationCallbackResult result = interruptedPreservingGet(promise.getFuture()); error = result.getKeystoreResponse().getErrorCode(); if (error == NO_ERROR) { outChain.shallowCopyFrom(result.getCertificateChain()); @@ -1144,7 +1144,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "AttestKey completed with exception", e); return SYSTEM_ERROR; } finally { @@ -1164,7 +1164,7 @@ public class KeyStore { } int error = mBinder.attestDeviceIds(promise, params); if (error != NO_ERROR) return error; - KeyAttestationCallbackResult result = promise.getFuture().get(); + KeyAttestationCallbackResult result = interruptedPreservingGet(promise.getFuture()); error = result.getKeystoreResponse().getErrorCode(); if (error == NO_ERROR) { outChain.shallowCopyFrom(result.getCertificateChain()); @@ -1173,7 +1173,7 @@ public class KeyStore { } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return SYSTEM_ERROR; - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { Log.e(TAG, "AttestDevicdeIds completed with exception", e); return SYSTEM_ERROR; } finally { @@ -1387,4 +1387,20 @@ public class KeyStore { int errorCode) { return getInvalidKeyException(keystoreKeyAlias, uid, getKeyStoreException(errorCode)); } + + private static <R> R interruptedPreservingGet(CompletableFuture<R> future) + throws ExecutionException { + boolean wasInterrupted = false; + while (true) { + try { + R result = future.get(); + if (wasInterrupted) { + Thread.currentThread().interrupt(); + } + return result; + } catch (InterruptedException e) { + wasInterrupted = true; + } + } + } } diff --git a/media/java/android/media/MediaRoute2ProviderService.java b/media/java/android/media/MediaRoute2ProviderService.java index e199cf49db9a..93fe06ac99aa 100644 --- a/media/java/android/media/MediaRoute2ProviderService.java +++ b/media/java/android/media/MediaRoute2ProviderService.java @@ -71,6 +71,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public abstract class MediaRoute2ProviderService extends Service { private static final String TAG = "MR2ProviderService"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); /** * The {@link Intent} action that must be declared as handled by the service. @@ -238,6 +239,11 @@ public abstract class MediaRoute2ProviderService extends Service { @NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); + if (DEBUG) { + Log.d(TAG, "notifySessionCreated: Creating a session. requestId=" + requestId + + ", sessionInfo=" + sessionInfo); + } + if (requestId != REQUEST_ID_NONE && !removeRequestId(requestId)) { Log.w(TAG, "notifySessionCreated: The requestId doesn't exist. requestId=" + requestId); return; @@ -269,6 +275,10 @@ public abstract class MediaRoute2ProviderService extends Service { public final void notifySessionUpdated(@NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); + if (DEBUG) { + Log.d(TAG, "notifySessionUpdated: Updating session id=" + sessionInfo); + } + String sessionId = sessionInfo.getId(); synchronized (mSessionLock) { if (mSessionInfo.containsKey(sessionId)) { @@ -299,6 +309,10 @@ public abstract class MediaRoute2ProviderService extends Service { if (TextUtils.isEmpty(sessionId)) { throw new IllegalArgumentException("sessionId must not be empty"); } + if (DEBUG) { + Log.d(TAG, "notifySessionReleased: Releasing session id=" + sessionId); + } + RoutingSessionInfo sessionInfo; synchronized (mSessionLock) { sessionInfo = mSessionInfo.remove(sessionId); diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index 470c52a964c5..6fe48a4ef7e0 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -378,6 +378,7 @@ public final class MediaRouter2 { */ public void transferTo(@NonNull MediaRoute2Info route) { Objects.requireNonNull(route, "route must not be null"); + Log.v(TAG, "Transferring to route: " + route); transfer(getCurrentController(), route); } diff --git a/media/java/android/media/MediaRouter2Manager.java b/media/java/android/media/MediaRouter2Manager.java index 5a7c87e0235d..773263865135 100644 --- a/media/java/android/media/MediaRouter2Manager.java +++ b/media/java/android/media/MediaRouter2Manager.java @@ -321,6 +321,8 @@ public final class MediaRouter2Manager { Objects.requireNonNull(packageName, "packageName must not be null"); Objects.requireNonNull(route, "route must not be null"); + Log.v(TAG, "Selecting route. packageName= " + packageName + ", route=" + route); + List<RoutingSessionInfo> sessionInfos = getRoutingSessions(packageName); RoutingSessionInfo targetSession = sessionInfos.get(sessionInfos.size() - 1); transfer(targetSession, route); diff --git a/media/java/android/media/tv/tuner/filter/MediaEvent.java b/media/java/android/media/tv/tuner/filter/MediaEvent.java index af63070027a2..57a04fd70a0b 100644 --- a/media/java/android/media/tv/tuner/filter/MediaEvent.java +++ b/media/java/android/media/tv/tuner/filter/MediaEvent.java @@ -29,6 +29,7 @@ import android.media.MediaCodec.LinearBlock; @SystemApi public class MediaEvent extends FilterEvent { private long mNativeContext; + private boolean mReleased = false; private final Object mLock = new Object(); private native Long nativeGetAudioHandle(); @@ -181,7 +182,21 @@ public class MediaEvent extends FilterEvent { */ @Override protected void finalize() { - nativeFinalize(); - mNativeContext = 0; + release(); + } + + /** + * Releases the MediaEvent object. + * @hide + */ + public void release() { + synchronized (mLock) { + if (mReleased) { + return; + } + nativeFinalize(); + mNativeContext = 0; + mReleased = true; + } } } diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 7e721406a300..e8f18a59049e 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -314,8 +314,9 @@ MediaEvent::~MediaEvent() { if (mIonHandle != NULL) { delete mIonHandle; } - if (mC2Buffer != NULL) { - mC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this); + std::shared_ptr<C2Buffer> pC2Buffer = mC2Buffer.lock(); + if (pC2Buffer != NULL) { + pC2Buffer->unregisterOnDestroyNotify(&DestroyCallback, this); } } @@ -340,15 +341,17 @@ jobject MediaEvent::getLinearBlock() { JNIEnv *env = AndroidRuntime::getJNIEnv(); std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock}; context->mBlock = block; - mC2Buffer = context->toC2Buffer(0, mDataLength); + std::shared_ptr<C2Buffer> pC2Buffer = context->toC2Buffer(0, mDataLength); + context->mBuffer = pC2Buffer; + mC2Buffer = pC2Buffer; if (mAvHandle->numInts > 0) { // use first int in the native_handle as the index int index = mAvHandle->data[mAvHandle->numFds]; std::shared_ptr<C2Param> c2param = std::make_shared<C2DataIdInfo>(index, mDataId); std::shared_ptr<C2Info> info(std::static_pointer_cast<C2Info>(c2param)); - mC2Buffer->setInfo(info); + pC2Buffer->setInfo(info); } - mC2Buffer->registerOnDestroyNotify(&DestroyCallback, this); + pC2Buffer->registerOnDestroyNotify(&DestroyCallback, this); jobject linearBlock = env->NewObject( env->FindClass("android/media/MediaCodec$LinearBlock"), diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h index c469a3ad8b76..83e9db796363 100644 --- a/media/jni/android_media_tv_Tuner.h +++ b/media/jni/android_media_tv_Tuner.h @@ -130,7 +130,7 @@ struct MediaEvent : public RefBase { jweak mMediaEventObj; jweak mLinearBlockObj; C2HandleIon* mIonHandle; - std::shared_ptr<C2Buffer> mC2Buffer; + std::weak_ptr<C2Buffer> mC2Buffer; }; struct Filter : public RefBase { diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index 05a2e92ca080..f3730f2756d2 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -84,6 +84,7 @@ ?audio/sp-midi smf ?audio/x-matroska mka ?audio/x-pn-realaudio ra +?audio/x-mpeg mp3 ?image/bmp bmp ?image/heic heic diff --git a/packages/CarSystemUI/res/xml/overlayable.xml b/packages/CarSystemUI/res/xml/overlayable.xml deleted file mode 100644 index 2b6e66e28b5f..000000000000 --- a/packages/CarSystemUI/res/xml/overlayable.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2020 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <overlayable name="SystemBarsLayouts"> - <policy type="product|signature"> - <item type="layout" name="car_navigation_bar" /> - </policy> - </overlayable> -</resources>
\ No newline at end of file diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index 0def17e1c21a..cc3b2aa33695 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -90,7 +90,7 @@ <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Use for contact sharing"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text messages"</string> - <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM Access"</string> + <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM access"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"HD audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="2477639096903834374">"HD audio"</string> <string name="bluetooth_profile_hearing_aid" msgid="58154575573984914">"Hearing Aids"</string> diff --git a/packages/SettingsLib/res/values-en-rCA/strings.xml b/packages/SettingsLib/res/values-en-rCA/strings.xml index 0def17e1c21a..cc3b2aa33695 100644 --- a/packages/SettingsLib/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/res/values-en-rCA/strings.xml @@ -90,7 +90,7 @@ <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Use for contact sharing"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text messages"</string> - <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM Access"</string> + <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM access"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"HD audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="2477639096903834374">"HD audio"</string> <string name="bluetooth_profile_hearing_aid" msgid="58154575573984914">"Hearing Aids"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index 0def17e1c21a..cc3b2aa33695 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -90,7 +90,7 @@ <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Use for contact sharing"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text messages"</string> - <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM Access"</string> + <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM access"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"HD audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="2477639096903834374">"HD audio"</string> <string name="bluetooth_profile_hearing_aid" msgid="58154575573984914">"Hearing Aids"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index 0def17e1c21a..cc3b2aa33695 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -90,7 +90,7 @@ <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Use for contact sharing"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"Text messages"</string> - <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM Access"</string> + <string name="bluetooth_profile_sap" msgid="8304170950447934386">"SIM access"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"HD audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="2477639096903834374">"HD audio"</string> <string name="bluetooth_profile_hearing_aid" msgid="58154575573984914">"Hearing Aids"</string> diff --git a/packages/SettingsLib/res/values-kk/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml index 1ee06b8353c9..279aca0731f7 100644 --- a/packages/SettingsLib/res/values-kk/strings.xml +++ b/packages/SettingsLib/res/values-kk/strings.xml @@ -545,7 +545,7 @@ <string name="profile_info_settings_title" msgid="105699672534365099">"Профильдік ақпарат"</string> <string name="user_need_lock_message" msgid="4311424336209509301">"Шектелген профайл жасақтауға дейін қолданбалар мен жеке деректерді қорғау үшін экран бекітпесін тағайындау қажет."</string> <string name="user_set_lock_button" msgid="1427128184982594856">"Бекітпе тағайындау"</string> - <string name="user_switch_to_user" msgid="6975428297154968543">"<xliff:g id="USER_NAME">%s</xliff:g> атты пайдаланушыға ауысу"</string> + <string name="user_switch_to_user" msgid="6975428297154968543">"<xliff:g id="USER_NAME">%s</xliff:g> пайдаланушысына ауысу"</string> <string name="guest_new_guest" msgid="3482026122932643557">"Қонақты енгізу"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Қонақты өшіру"</string> <string name="guest_nickname" msgid="6332276931583337261">"Қонақ"</string> diff --git a/packages/SoundPicker/AndroidManifest.xml b/packages/SoundPicker/AndroidManifest.xml index 9d0818230a02..73d99a55efdd 100644 --- a/packages/SoundPicker/AndroidManifest.xml +++ b/packages/SoundPicker/AndroidManifest.xml @@ -11,6 +11,7 @@ <application android:allowBackup="false" + android:label="@string/app_label" android:supportsRtl="true"> <receiver android:name="RingtoneReceiver"> <intent-filter> diff --git a/packages/SoundPicker/res/values/strings.xml b/packages/SoundPicker/res/values/strings.xml index 56ed5fd5d58e..04a2c2bb83c3 100644 --- a/packages/SoundPicker/res/values/strings.xml +++ b/packages/SoundPicker/res/values/strings.xml @@ -37,4 +37,7 @@ <string name="unable_to_add_ringtone">Unable to add custom ringtone</string> <!-- Text for the Toast displayed when deleting a custom ringtone fails. --> <string name="unable_to_delete_ringtone">Unable to delete custom ringtone</string> + + <!-- Text for the name of the app. [CHAR LIMIT=12] --> + <string name="app_label">Sounds</string> </resources> diff --git a/packages/SystemUI/res-product/values-mn/strings.xml b/packages/SystemUI/res-product/values-mn/strings.xml index 6a0f668986f8..0b47eb06da30 100644 --- a/packages/SystemUI/res-product/values-mn/strings.xml +++ b/packages/SystemUI/res-product/values-mn/strings.xml @@ -21,7 +21,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="dock_alignment_slow_charging" product="default" msgid="6997633396534416792">"Илүү хурдан цэнэглэхийн тулд утсыг дахин байрлуулна уу"</string> <string name="dock_alignment_not_charging" product="default" msgid="3980752926226749808">"Утасгүйгээр цэнэглэхийн тулд утсыг дахин байрлуулна уу"</string> - <string name="inattentive_sleep_warning_message" product="tv" msgid="6844464574089665063">"Android TВ төхөөрөмж удахгүй унтрах тул асаалттай хэвээр байлгахын тулд товчлуурыг дарна уу."</string> + <string name="inattentive_sleep_warning_message" product="tv" msgid="6844464574089665063">"Android TV төхөөрөмж удахгүй унтрах тул асаалттай хэвээр байлгахын тулд товчлуурыг дарна уу."</string> <string name="inattentive_sleep_warning_message" product="default" msgid="5693904520452332224">"Төхөөрөмж удахгүй унтрах тул асаалттай хэвээр байлгахын тулд дарна уу."</string> <string name="keyguard_missing_sim_message" product="tablet" msgid="5018086454277963787">"Таблетад SIM карт алга байна."</string> <string name="keyguard_missing_sim_message" product="default" msgid="7053347843877341391">"Утсанд SIM карт алга байна."</string> diff --git a/packages/SystemUI/res/drawable/bubble_stack_user_education_bg_rtl.xml b/packages/SystemUI/res/drawable/bubble_stack_user_education_bg_rtl.xml new file mode 100644 index 000000000000..c7baba14b5e5 --- /dev/null +++ b/packages/SystemUI/res/drawable/bubble_stack_user_education_bg_rtl.xml @@ -0,0 +1,22 @@ +<!-- + ~ Copyright (C) 2020 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="?android:attr/colorAccent"/> + <corners + android:bottomLeftRadius="360dp" + android:topLeftRadius="360dp" /> +</shape> diff --git a/packages/SystemUI/res/layout/bubbles_manage_button_education.xml b/packages/SystemUI/res/layout/bubbles_manage_button_education.xml index 0f561cb933e6..87dd58e4f0ed 100644 --- a/packages/SystemUI/res/layout/bubbles_manage_button_education.xml +++ b/packages/SystemUI/res/layout/bubbles_manage_button_education.xml @@ -31,7 +31,6 @@ android:layout_marginEnd="24dp" android:orientation="vertical" android:background="@drawable/bubble_stack_user_education_bg" - android:alpha="0.9" > <TextView @@ -61,6 +60,7 @@ <LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content" + android:id="@+id/button_layout" android:orientation="horizontal" > <com.android.systemui.statusbar.AlphaOptimizedButton @@ -73,7 +73,6 @@ android:clickable="false" android:text="@string/manage_bubbles_text" android:textColor="?attr/wallpaperTextColor" - android:alpha="0.89" /> <com.android.systemui.statusbar.AlphaOptimizedButton @@ -88,4 +87,4 @@ /> </LinearLayout> </LinearLayout> -</com.android.systemui.bubbles.BubbleManageEducationView>
\ No newline at end of file +</com.android.systemui.bubbles.BubbleManageEducationView> diff --git a/packages/SystemUI/res/layout/global_actions_power_dialog.xml b/packages/SystemUI/res/layout/global_actions_power_dialog.xml new file mode 100644 index 000000000000..ff3f0fb74cd5 --- /dev/null +++ b/packages/SystemUI/res/layout/global_actions_power_dialog.xml @@ -0,0 +1,24 @@ +<!-- + ~ Copyright (C) 2020 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. + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:divider="@drawable/controls_list_divider" + android:showDividers="middle" +/> + diff --git a/packages/SystemUI/res/layout/global_actions_power_item.xml b/packages/SystemUI/res/layout/global_actions_power_item.xml new file mode 100644 index 000000000000..0d060b63486f --- /dev/null +++ b/packages/SystemUI/res/layout/global_actions_power_item.xml @@ -0,0 +1,45 @@ +<!-- + ~ Copyright (C) 2020 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. + --> +<com.android.systemui.globalactions.GlobalActionsItem + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/global_actions_power_dialog_item_width" + android:layout_height="@dimen/global_actions_power_dialog_item_height" + android:gravity="bottom|center_horizontal" + android:orientation="vertical" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:stateListAnimator="@anim/control_state_list_animator"> + <ImageView + android:id="@*android:id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginBottom="45dp" + android:scaleType="centerInside" + android:tint="@color/control_primary_text" /> + <TextView + android:id="@*android:id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:marqueeRepeatLimit="marquee_forever" + android:ellipsize="marquee" + android:layout_marginBottom="16dp" + android:maxLines="1" + android:textSize="16sp" + android:gravity="center" + android:textColor="@color/control_primary_text" + android:textAppearance="?android:attr/textAppearanceSmall" /> +</com.android.systemui.globalactions.GlobalActionsItem> + diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 48b25b0773e4..1443d18c2b9b 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -1013,10 +1013,10 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Stelselnavigasie is opgedateer. Gaan na Instellings toe om veranderinge te maak."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gaan na Instellings toe om stelselnavigasie op te dateer"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Bystandmodus"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"Gesprek is op prioriteit gestel"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"Gesprek is as prioriteit gestel"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioriteitgesprekke sal:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Wys boaan gespreksafdeling"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Wys profielprent op slotskerm"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Boaan gespreksafdeling wys"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Profielprent op slotskerm wys"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Verskyn as \'n swewende borrel bo-oor programme"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Onderbreek Moenie Steur Nie"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Het dit"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hou en sleep om kontroles te herrangskik"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle kontroles is verwyder"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Veranderinge is nie gestoor nie"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Die lys met alle kontroles kon nie gelaai word nie."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontroles kon nie gelaai word nie. Gaan die <xliff:g id="APP">%s</xliff:g>-program na om seker te maak dat die programinstellings nie verander het nie."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Versoenbare kontroles is nie beskikbaar nie"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Ander"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Voeg by toestelkontroles"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Voeg by"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 9a75c1c0879c..8fbad2cfc1a2 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"መቆጣጠሪያዎችን ዳግም ለማስተካከል ይያዙ እና ይጎትቱ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ሁሉም መቆጣጠሪያዎች ተወግደዋል"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ለውጦች አልተቀመጡም"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"የሁሉም መቆጣጠሪያዎች ዝርዝር ሊጫን አልተቻለም።"</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index bfa21071d815..c4d86e74b361 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -1069,7 +1069,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"اضغط مع الاستمرار واسحب لإعادة ترتيب عناصر التحكّم."</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"تمت إزالة كل عناصر التحكّم."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"لم يتم حفظ التغييرات."</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"تعذّر تحميل قائمة كل عناصر التحكّم."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index ca21ff674595..7bacd0d2f8d1 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"নিয়ন্ত্ৰণসমূহ পুনৰ সজাবলৈ ধৰি ৰাখক আৰু টানি আনি এৰক"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"সকলো নিয়ন্ত্ৰণ আঁতৰোৱা হৈছে"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"সালসলনিসমূহ ছেভ নহ’ল"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"নিয়ন্ত্ৰণসমূহৰ সম্পূর্ণ সূচীখন ল’ড কৰিব পৰা নগ’ল।"</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 3a7c98ca34cf..cb7ec9eccc82 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -1002,8 +1002,8 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Yuxarıya sağa köçürün"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Aşağıya sola köçürün"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Aşağıya sağa köçürün"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Qabarcığı ləğv edin"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Söhbətdən gələn bildirişi göstərməyin"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Yumrucuğu ləğv edin"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Söhbəti yumrucuqda göstərmə"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Yumrucuqlardan istifadə edərək söhbət edin"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Yeni söhbətlər üzən nişanlar və ya yumrucuqlar kimi görünür. Yumrucuğu açmaq üçün toxunun. Hərəkət etdirmək üçün sürüşdürün."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Yumrucuqları istənilən vaxt idarə edin"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Nizamlayıcıları yenidən tənzimləmək üçün tutub sürüşdürün"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Bütün nizamlayıcılar silindi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Dəyişikliklər yadda saxlanmadı"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Bütün nizamlayıcıların siyahısı yüklənmədi."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Digər"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Cihaz idarəetmələrinə əlavə edin"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Əlavə edin"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index cdface92a34c..5959e2600d19 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -1007,7 +1007,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Premesti gore desno"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Premesti dole levo"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Premesti dole desno"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Odbacivanje oblačića"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Odbaci oblačić"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Ne koristi oblačiće za konverzaciju"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Ćaskajte u oblačićima"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Nove konverzacije se prikazuju kao plutajuće ikone ili oblačići. Dodirnite da biste otvorili oblačić. Prevucite da biste ga premestili."</string> @@ -1019,9 +1019,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Idite u Podešavanja da biste ažurirali navigaciju sistema"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravnosti"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konverzacija je podešena na prioritetnu"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritetne konverzacije će:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazuje se u vrhu odeljka za konverzacije"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazuje sliku profila na zaključanom ekranu"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritetne konverzacije:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"se prikazuju u vrhu odeljka za konverzacije"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"prikazuju sliku profila na zaključanom ekranu"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Prikazuju se plutajući oblačići preko aplikacija"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ometa podešavanje Ne uznemiravaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Važi"</string> @@ -1051,7 +1051,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Zadržite i prevucite da biste promenili raspored kontrola"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve kontrole su uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promene nisu sačuvane"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Učitavanje liste svih kontrola nije uspelo."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Učitavanje kontrola nije uspelo. Pogledajte aplikaciju <xliff:g id="APP">%s</xliff:g> da biste se uverili da se podešavanja aplikacije nisu promenila."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole nisu dostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Dodajte u kontrole uređaja"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Dodaj"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 32ec1841ea3e..2c84b066bb11 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -419,7 +419,7 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="1791389609409211628">"Ліміт <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="7957253810481086455">"Папярэджанне: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="2754212289804324685">"Працоўны профіль"</string> - <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Начны рэжым"</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_until_sunrise" msgid="4063448287758262485">"Да ўсходу сонца"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Уключыць у <xliff:g id="TIME">%s</xliff:g>"</string> @@ -1024,7 +1024,7 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Перайдзіце ў Налады, каб абнавіць параметры навігацыі ў сістэме"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Рэжым чакання"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Размова пазначана як прыярытэтная"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Прыярытэтныя размовы будуць:"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Прыярытэтныя размовы:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Паказваюцца ўверсе раздзела размоў"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Паказваюць відарыс профілю на экране блакіроўкі"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Паказваюцца як рухомыя апавяшчэнні паверх праграм"</string> @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Каб змяніць парадак элементаў кіравання, утрымлівайце і перацягвайце іх"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Усе элементы кіравання выдалены"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Змяненні не захаваны"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Не ўдалося загрузіць спіс усіх сродкаў кіравання."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index a2a2671b3f70..06306a39ff5a 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -1002,7 +1002,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Преместване горе вдясно"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Преместване долу вляво"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Преместване долу вдясно"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Балонче: Отхвърляне"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Отхвърляне на балончетата"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Без балончета за разговора"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Чат с балончета"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Новите разговори се показват като плаващи икони, или балончета. Докоснете балонче, за да го отворите, или го плъзнете, за да го преместите."</string> @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Режим на готовност"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Разговорът е зададен като приоритетен"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Приоритетните разговори ще:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Показване върху секцията с разговори"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Показване на снимката на потр. профил на закл. екран"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"се показват върху секцията с разговори;"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"показват снимката на потребителския профил на заключения екран."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Показва се като плаващо балонче върху приложенията"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Прекъсване на режима „Не безпокойте“"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Разбрах"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Задръжте и плъзнете, за да пренаредите контролите"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Всички контроли са премахнати"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промените не са запазени"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Списъкът с всички контроли не бе зареден."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 7a9fecad5f9d..33b733cf2b61 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -994,7 +994,7 @@ <string name="bubbles_settings_button_description" msgid="7324245408859877545">"<xliff:g id="APP_NAME">%1$s</xliff:g> বাবলের জন্য সেটিংস"</string> <string name="bubble_overflow_button_content_description" msgid="5523744621434300510">"ওভারফ্লো"</string> <string name="bubble_accessibility_action_add_back" msgid="6217995665917123890">"স্ট্যাকে আবার যোগ করুন"</string> - <string name="manage_bubbles_text" msgid="6856830436329494850">"ম্যানেজ করা"</string> + <string name="manage_bubbles_text" msgid="6856830436329494850">"ম্যানেজ করুন"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="APP_NAME">%2$s</xliff:g> অ্যাপ থেকে <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="APP_NAME">%2$s</xliff:g> অ্যাপ এবং আরও <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>টি থেকে <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"সরান"</string> @@ -1007,7 +1007,7 @@ <string name="bubbles_user_education_title" msgid="5547017089271445797">"বাবল ব্যবহার করে চ্যাট করুন"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"নতুন কথোপকথন ভেসে থাকা আইকন বা বাবল হিসেবে দেখানো হয়। বাবল খুলতে ট্যাপ করুন। সেটি সরাতে ধরে টেনে আনুন।"</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"যেকোনও সময় বাবল নিয়ন্ত্রণ করুন"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"এই অ্যাপ থেকে বাবল বন্ধ করতে ম্যানেজ করুন বিকল্প ট্যাপ করুন"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"এই অ্যাপ থেকে বাবল বন্ধ করতে \'ম্যানেজ করুন\' বিকল্প ট্যাপ করুন"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"বুঝেছি"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> সেটিংস"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"সিস্টেম নেভিগেশন আপডেট হয়েছে। পরিবর্তন করার জন্য সেটিংসে যান।"</string> @@ -1015,7 +1015,7 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"স্ট্যান্ডবাই"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"কথোপকথনকে \'গুরুত্বপূর্ণ\' হিসেবে সেট করা হয়েছে"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"গুরুত্বপূর্ণ কথোপকথন:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"কথোপকথনের বিভাগের উপরে দেখান"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"কথোপকথন বিভাগের একদম উপরে দেখুন"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"লক স্ক্রিনে প্রোফাইল ছবি দেখান"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"অ্যাপের উপরে একটি ভাসমান বুদবুদ হিসেবে দেখা যাবে"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"বিরক্ত করবে না মোডে ব্যাঘাত ঘটাতে পারে"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"কন্ট্রোলগুলিকে আবার সাজানোর জন্য ধরে রেখে টেনে আনুন"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"সমস্ত কন্ট্রোল সরানো হয়েছে"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"পরিবর্তন সেভ করা হয়নি"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"সব কন্ট্রোলের তালিকা লোড করা যায়নি।"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"কন্ট্রোল লোড করা যায়নি। অ্যাপ সেটিংসে কোনও পরিবর্তন করা হয়েছে কিনা তা ভাল করে দেখে নিতে <xliff:g id="APP">%s</xliff:g> অ্যাপ চেক করুন।"</string> + <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> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 49fae626fa5a..930f50b74f1a 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -57,12 +57,12 @@ <string name="label_view" msgid="6815442985276363364">"Prikaži"</string> <string name="always_use_device" msgid="210535878779644679">"Uvijek otvori aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> kada se poveže <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="1977225429341838444">"Uvijek otvori aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> kada se poveže <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> - <string name="usb_debugging_title" msgid="8274884945238642726">"Omogućiti otklanjanje grešaka putem uređaja spojenog na USB?"</string> + <string name="usb_debugging_title" msgid="8274884945238642726">"Omogućiti otklanjanje grešaka putem USB-a?"</string> <string name="usb_debugging_message" msgid="5794616114463921773">"RSA otisak prsta za otključavanje računara je: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="4003121804294739548">"Uvijek dozvoli sa ovog računara"</string> <string name="usb_debugging_allow" msgid="1722643858015321328">"Dozvoli"</string> - <string name="usb_debugging_secondary_user_title" msgid="7843050591380107998">"Otklanjanje grešaka putem uređaja spojenog na USB nije dozvoljeno"</string> - <string name="usb_debugging_secondary_user_message" msgid="3740347841470403244">"Korisnik koji je trenutno prijavljen na ovaj uređaj ne može uključiti opciju za otklanjanje grešaka koristeći USB. Da koristite tu funkciju, prebacite se na primarnog korisnika."</string> + <string name="usb_debugging_secondary_user_title" msgid="7843050591380107998">"Otklanjanje grešaka putem USB-a nije dozvoljeno"</string> + <string name="usb_debugging_secondary_user_message" msgid="3740347841470403244">"Korisnik koji je trenutno prijavljen na ovaj uređaj ne može uključiti opciju za otklanjanje grešaka putem USB-a. Da koristite tu funkciju, prebacite se na primarnog korisnika."</string> <string name="wifi_debugging_title" msgid="7300007687492186076">"Dozvoliti bežično otklanjanje grešaka na ovoj mreži?"</string> <string name="wifi_debugging_message" msgid="5461204211731802995">"Naziv mreže (SSID)\n<xliff:g id="SSID_0">%1$s</xliff:g>\n\nAdresa WiFi mreže (BSSID)\n<xliff:g id="BSSID_1">%2$s</xliff:g>"</string> <string name="wifi_debugging_always" msgid="2968383799517975155">"Uvijek dozvoli na ovoj mreži"</string> @@ -1013,7 +1013,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Nemoj prikazivati razgovor u oblačićima"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chatajte koristeći oblačiće"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Novi razgovori se prikazuju kao plutajuće ikone ili oblačići. Dodirnite da otvorite oblačić. Prevucite da ga premjestite."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Upravljajte oblačićima u svakom momentu"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Upravljajte oblačićima u svakom trenutku"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dodirnite Upravljaj da isključite oblačiće iz ove aplikacije"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Razumijem"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Postavke aplikacije <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1022,8 +1022,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Razgovor je postavljen kao prioritetan"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritetni razgovori će:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazuje se na vrhu odjeljka za razgovor"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazuje sliku profila na zaključanom ekranu"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Biti prikazani na vrhu odjeljka za razgovor"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazivati sliku profila na zaključanom ekranu"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Izgleda kao plutajući oblačić iznad aplikacija"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prekida način rada Ne ometaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Razumijem"</string> @@ -1053,7 +1053,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Držite i prevucite da preuredite kontrole"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve kontrole su uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promjene nisu sačuvane"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Učitavanje liste svih kontrola nije uspjelo."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Učitavanje kontrola nije uspjelo. Provjerite aplikaciju <xliff:g id="APP">%s</xliff:g> da se uvjerite da postavke aplikacije nisu izmijenjene."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole su nedostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Dodajte u kontrole uređaja"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Dodaj"</string> @@ -1075,7 +1076,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Greška, ponovni pokušaj…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Nije pronađeno"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Kontrola nije dostupna"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Pristup uređaju <xliff:g id="DEVICE">%1$s</xliff:g> nije uspio. Provjerite aplikaciju <xliff:g id="APPLICATION">%2$s</xliff:g> da se uvjerite da je kontrola i dalje dostupna i da se postavke aplikacije nisu promijenile."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Pristupanje uređaju <xliff:g id="DEVICE">%1$s</xliff:g> nije uspjelo. Provjerite aplikaciju <xliff:g id="APPLICATION">%2$s</xliff:g> da se uvjerite da je kontrola i dalje dostupna i da se postavke aplikacije nisu promijenile."</string> <string name="controls_open_app" msgid="483650971094300141">"Otvori aplikaciju"</string> <string name="controls_error_generic" msgid="352500456918362905">"Nije moguće učitati status"</string> <string name="controls_error_failed" msgid="960228639198558525">"Greška, pokušajte ponovo"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 5cc0853a6e18..53e2b867cfe6 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"La conversa s\'ha definit com a prioritària"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Les converses prioritàries:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Mostra a la part superior de la secció de converses"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostra la foto de perfil a la pantalla de bloqueig"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Es mostraran a la part superior de la secció de converses"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostraran la foto de perfil a la pantalla de bloqueig"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Es mostra com a bombolla flotant en primer pla"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromp el mode No molestis"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entesos"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Mantén premut i arrossega per reorganitzar els controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"S\'han suprimit tots els controls"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Els canvis no s\'han desat"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"No s\'ha pogut carregar la llista completa de controls."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altres"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Afegeix als controls de dispositius"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Afegeix"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index a071793af881..51ed8c36080a 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -1019,7 +1019,7 @@ <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Nastavení bublin můžete kdykoli upravit"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bubliny pro tuto aplikaci můžete vypnout klepnutím na Spravovat"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Rozumím"</string> - <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> – nastavení"</string> + <string name="bubbles_app_settings" msgid="5779443644062348657">"Nastavení <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systémová navigace byla aktualizována. Chcete-li provést změny, přejděte do Nastavení."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Přejděte do Nastavení a aktualizujte systémovou navigaci"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostní režim"</string> @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Ovládací prvky můžete uspořádat podržením a přetažením"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Všechny ovládací prvky byly odstraněny"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Změny nebyly uloženy"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Načtení seznamu všech ovládacích prvků se nezdařilo."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Jiné"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Přidání ovládání zařízení"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Přidat"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index f1bbbff3d7b6..da3bbaa4b957 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -1002,7 +1002,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Flyt op til højre"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Flyt ned til venstre"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Flyt ned til højre"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Afvis bobbel"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Afvis boble"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Vis ikke samtaler i bobler"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chat ved hjælp af bobler"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Nye samtaler vises som svævende ikoner eller bobler. Tryk for at åbne boblen. Træk for at flytte den."</string> @@ -1013,10 +1013,10 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemnavigationen blev opdateret. Gå til Indstillinger for at foretage ændringer."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Indstillinger for at opdatere systemnavigationen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Standby"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er angivet som prioritet"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er angivet som prioriteret"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Følgende gælder for prioriterede samtaler:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Vis i toppen af samtalesektionen"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Vis profilbillede på låseskærm"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Vises øverst i samtalesektionen"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Viser profilbillede på låseskærm"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Vis som en boble oven på apps"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Afbryd Forstyr ikke"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1041,11 +1041,12 @@ <string name="accessibility_control_change_unfavorite" msgid="6997408061750740327">"fjern fra favoritter"</string> <string name="accessibility_control_move" msgid="8980344493796647792">"Flyt til position <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="controls_favorite_default_title" msgid="967742178688938137">"Betjeningselementer"</string> - <string name="controls_favorite_subtitle" msgid="6604402232298443956">"Vælg, hvilke indstillinger der skal være i menuen for afbryderknappen"</string> + <string name="controls_favorite_subtitle" msgid="6604402232298443956">"Vælg de indstillinger, der skal vises i menuen for afbryderknappen"</string> <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Flyt rundt på styringselementer ved at holde dem nede og trække"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle styringselementerne blev fjernet"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ændringerne blev ikke gemt"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Listen over styringselementer kunne ikke indlæses."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Betjeningselementerne kunne ikke indlæses. Tjek <xliff:g id="APP">%s</xliff:g>-appen for at sørge for, at dine appindstillinger ikke er blevet ændret."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible betjeningselementer er ikke tilgængelige"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Andre"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Føj til enhedsstyring"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Tilføj"</string> @@ -1067,7 +1068,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Fejl. Prøver igen…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Ikke fundet"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Styringselement ikke tilgængeligt"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Der kunne ikke skaffes adgang til <xliff:g id="DEVICE">%1$s</xliff:g>. Tjek <xliff:g id="APPLICATION">%2$s</xliff:g>-appen for at sikre at styringselementet stadig er tilgængeligt, og at appens indstillinger ikke er blevet ændret."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Der kunne ikke skaffes adgang til <xliff:g id="DEVICE">%1$s</xliff:g>. Tjek <xliff:g id="APPLICATION">%2$s</xliff:g>-appen for at sikre, at styringselementet stadig er tilgængeligt, og at appens indstillinger ikke er blevet ændret."</string> <string name="controls_open_app" msgid="483650971094300141">"Åbn app"</string> <string name="controls_error_generic" msgid="352500456918362905">"Statussen kan ikke indlæses"</string> <string name="controls_error_failed" msgid="960228639198558525">"Der opstod en fejl. Prøv igen"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 3397cd615138..5a44c238e46c 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"Alle löschen"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Verwalten"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Verlauf"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"Neu"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"Lautlos"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"Benachrichtigungen"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"Unterhaltungen"</string> @@ -1046,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Zum Verschieben von Steuerelementen halten und ziehen"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle Steuerelemente entfernt"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Änderungen nicht gespeichert"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Fehler beim Laden der Liste mit Steuerelementen."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Steuerelemente konnten nicht geladen werden. Prüfe in der <xliff:g id="APP">%s</xliff:g> App, ob die Einstellungen möglicherweise geändert wurden."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible Steuerelemente nicht verfügbar"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Andere"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Zur Gerätesteuerung hinzufügen"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Hinzufügen"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index f24f7457b0c6..313eaaadd48a 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -1014,7 +1014,7 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Μεταβείτε στις Ρυθμίσεις για να ενημερώσετε την πλοήγηση συστήματος"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Κατάσταση αναμονής"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Ορίστηκε ως συζήτηση προτεραιότητας"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Οι συζητήσεις προτεραιότητας θα:"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Οι συζητήσεις προτεραιότητας θα έχουν τα εξής χαρακτηριστικά:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Εμφάνιση στο επάνω μέρος της ενότητας συνομιλιών"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Εμφάνιση εικόνας προφίλ στην οθόνη κλειδώματος"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Κινούμενο συννεφάκι στο επάνω μέρος των εφαρμογών"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Κρατήστε και σύρετε για αναδιάταξη των στοιχείων ελέγχου"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Όλα τα στοιχεία ελέγχου καταργήθηκαν"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Οι αλλαγές δεν αποθηκεύτηκαν"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Ανεπιτυχής φόρτωση λίστας όλων των στοιχ. ελέγχου."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index ac20c8477d47..a94d8d383275 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold and drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"The list of all controls could not be loaded."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Add to device controls"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 233664e5fbc7..3dcf7fcedb46 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold and drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"The list of all controls could not be loaded."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Add to device controls"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index ac20c8477d47..a94d8d383275 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold and drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"The list of all controls could not be loaded."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Add to device controls"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index ac20c8477d47..a94d8d383275 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold and drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"The list of all controls could not be loaded."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Add to device controls"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index f37742d62062..a8c0aa125802 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold & drag to rearrange controls"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"All controls removed"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Changes not saved"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"The list of all controls could not be loaded."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Controls could not be loaded. Check the <xliff:g id="APP">%s</xliff:g> app to make sure that the app settings haven’t changed."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Compatible controls unavailable"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Other"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Add to device controls"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Add"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index b4bba8f3145b..f09b0fce7a01 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -1006,7 +1006,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"No mostrar la conversación en burbujas"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chat con burbujas"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Las conversaciones nuevas aparecen como elementos flotantes o burbujas. Presiona para abrir la burbuja. Arrástrala para moverla."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controla las burbujas en todo momento"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controla las burbujas"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Presiona Administrar para desactivar las burbujas de esta app"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Entendido"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Configuración de <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"En espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Se estableció la conversación como prioritaria"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Las conversaciones prioritarias harán lo siguiente:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Se muestran en la parte superior de conversaciones"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Muestran una foto de perfil en pantalla de bloqueo"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Mostrarse en la parte superior de conversaciones"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrar una foto de perfil en pantalla de bloqueo"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Aparecen como burbujas flotantes encima de apps"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Suspender No interrumpir"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entendido"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Mantén presionado y arrastra un control para reubicarlo"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Se quitaron todos los controles"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"No se guardaron los cambios"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"No se cargó la lista completa de controles."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Otros"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Agregar a controles de dispositivos"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Agregar"</string> @@ -1066,7 +1069,7 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Inactivo. Verifica la app"</string> <string name="controls_error_retryable" msgid="864025882878378470">"Hubo un error. Reintentando…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"No se encontró"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"El control no está disponible."</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"El control no está disponible"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"No se pudo acceder a <xliff:g id="DEVICE">%1$s</xliff:g>. Revisa la app de <xliff:g id="APPLICATION">%2$s</xliff:g> para asegurarte de que el control siga estando disponible y de que no haya cambiado la configuración de la app."</string> <string name="controls_open_app" msgid="483650971094300141">"Abrir app"</string> <string name="controls_error_generic" msgid="352500456918362905">"No se pudo cargar el estado"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 6ffed58c3df8..889b7d071c37 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -1003,10 +1003,10 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Mover abajo a la izquierda."</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Mover abajo a la derecha"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"Cerrar burbuja"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"No mostrar conversación en burbujas"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"No mostrar conversación en burbuja"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chatea con burbujas"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Las conversaciones nuevas aparecen como iconos flotantes llamadas \"burbujas\". Toca para abrir la burbuja. Arrastra para moverla."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controla las burbujas en cualquier momento"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controla las burbujas"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toca Gestionar para desactivar las burbujas de esta aplicación"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Entendido"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Ajustes de <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Mantén pulsado y arrastra un control para reubicarlo"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos los controles quitados"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"No se han guardado los cambios"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"No se ha podido cargar la lista de los controles."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Otros"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Añadir a control de dispositivos"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Añadir"</string> @@ -1066,11 +1069,11 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Inactivo, comprobar aplicación"</string> <string name="controls_error_retryable" msgid="864025882878378470">"Error; reintentando…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"No se ha encontrado"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"El control no está disponible"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"No se ha podido acceder a <xliff:g id="DEVICE">%1$s</xliff:g>. Comprueba que el control siga disponible en la aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> y que no se haya modificado su configuración."</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"Control no disponible"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"No se ha podido acceder a <xliff:g id="DEVICE">%1$s</xliff:g>. Comprueba que el control siga disponible en la aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> y que no se haya cambiado su configuración."</string> <string name="controls_open_app" msgid="483650971094300141">"Abrir aplicación"</string> <string name="controls_error_generic" msgid="352500456918362905">"No se ha podido cargar el estado"</string> - <string name="controls_error_failed" msgid="960228639198558525">"Se ha producido un error. Vuelve a intentarlo."</string> + <string name="controls_error_failed" msgid="960228639198558525">"Error: Vuelve a intentarlo"</string> <string name="controls_in_progress" msgid="4421080500238215939">"En curso"</string> <string name="controls_added_tooltip" msgid="4842812921719153085">"Mantén pulsado el botón de encendido para ver los controles nuevos"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Añadir controles"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 258bf5a581d0..0b3fc9d72bc6 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -1007,7 +1007,7 @@ <string name="bubbles_user_education_title" msgid="5547017089271445797">"Vestelge mullide abil"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Uued vestlused kuvatakse hõljuvate ikoonidena ehk mullidena. Puudutage mulli avamiseks. Lohistage mulli, et seda liigutada."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Juhtige mulle igal ajal"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Selle rakenduse puhul mullide väljalülitamiseks puudutage valikut Haldamine"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Selle rakenduse puhul mullide väljalülitamiseks puudutage valikut Halda"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Selge"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Rakenduse <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> seaded"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Süsteemis navigeerimine on värskendatud. Muutmiseks avage jaotis Seaded."</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Juhtelementide ümberpaigutamiseks hoidke neid all ja lohistage"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Kõik juhtelemendid eemaldati"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Muudatusi ei salvestatud"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Kõikide juhtelementide loendit ei saanud laadida."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Juhtelemente ei õnnestunud laadida. Kontrollige rakendust <xliff:g id="APP">%s</xliff:g> ja veenduge, et rakenduse seaded poleks muutunud."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Ühilduvaid juhtelemente pole saadaval"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Muu"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Seadmete juhtimisvidinate hulka lisamine"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Lisa"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index cb6f7967d3e8..e30552bbc776 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Egonean"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Lehentasunezko gisa ezarritako elkarrizketa"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Hau gertatuko da lehentasunezko elkarrizketekin:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Erakutsi elkarrizketen atalaren goialdean"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Erakutsi profileko argazkia pantaila blokeatuan"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Elkarrizketen atalaren goialdean erakutsiko dira."</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Profileko argazkia pantaila blokeatuan erakutsiko da."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Burbuila gainerakor gisa agertuko da aplikazioen gainean"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Eten ez molestatzeko modua"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ados"</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"Lupa-leihoa"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Lupa-leihoaren aukerak"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Gailuak kontrolatzeko widgetak"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Gehitu kontrolatzeko aukerak konektatutako gailuetan"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Gehitu konektatutako gailuak kontrolatzeko widgetak"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Konfiguratu gailuak kontrolatzeko widgetak"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Kontrol-aukerak atzitzeko, eduki sakatuta etengailua"</string> <string name="controls_providers_title" msgid="6879775889857085056">"Aukeratu aplikazio bat kontrolatzeko aukerak gehitzeko"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Kontrolatzeko aukerak antolatzeko, eduki itzazu sakatuta, eta arrastatu"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Kendu dira kontrolatzeko aukera guztiak"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ez dira gorde aldaketak"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Ezin izan da kargatu kontrol guztien zerrenda."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Beste bat"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Gehitu gailuak kontrolatzeko widgetetan"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Gehitu"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index ae98244cf415..985b94354bc7 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"برای تغییر دادن ترتیب کنترلها، آنها را نگه دارید و بکشید"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"همه کنترلها برداشته شدهاند"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"تغییرات ذخیره نشد"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"فهرست همه کنترلها را نمیتوان بارگیری کرد."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 05a88f4cc6ee..26bb615085cb 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -1007,7 +1007,7 @@ <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chattaile kuplien avulla"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Uudet keskustelut näkyvät kelluvina kuvakkeina tai kuplina. Avaa kupla napauttamalla. Siirrä sitä vetämällä."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Muuta kuplien asetuksia milloin tahansa"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Valitse Hallinnoi, jos haluat poistaa kuplat käytöstä tästä sovelluksesta"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Valitse Ylläpidä, jos haluat poistaa kuplat käytöstä tästä sovelluksesta"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Selvä"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>: asetukset"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Järjestelmän navigointitapa vaihdettu. Voit muuttaa sitä asetuksista."</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"Suurennusikkuna"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Suurennusikkunan ohjaimet"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Laitteiden hallinta"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Lisää säätimiä yhdistettyihin laitteisiisi"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Lisää ohjaimia yhdistettyjä laitteita varten"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Laitteiden hallinnan käyttöönotto"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Voit käyttää säätimiä painamalla virtapainiketta"</string> <string name="controls_providers_title" msgid="6879775889857085056">"Valitse sovellus lisätäksesi säätimiä"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Järjestele säätimiä koskettamalla pitkään ja vetämällä"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Kaikki säätimet poistettu"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Muutoksia ei tallennettu"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Kaikkien säätimien luetteloa ei voitu ladata."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Säätimiä ei voitu ladata. Avaa <xliff:g id="APP">%s</xliff:g> ja tarkista, että sovelluksen asetukset eivät ole muuttuneet."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Yhteensopivat säätimet eivät käytettävissä"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Muu"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Lisää laitteiden hallintaan"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Lisää"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index e7ef0824539f..185a972354bc 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -1006,7 +1006,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Ne pas afficher les conversations dans des bulles"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Clavarder en utilisant des bulles"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Les nouvelles conversations s\'affichent sous forme d\'icônes flottantes (de bulles). Touchez une bulle pour l\'ouvrir. Faites-la glisser pour la déplacer."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Gérer les paramètres des bulles"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Paramètres des bulles"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Toucher Gérer pour désactiver les bulles de cette application"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Paramètres <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1014,9 +1014,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Accédez au menu Paramètres pour mettre à jour la navigation système"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Veille"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"La conversation a été définie comme prioritaire"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Les conversations prioritaires :"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Afficher dans le haut de la section des conversations"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Afficher la photo de profil sur l\'écran verrouillé"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Pour les conversations prioritaires :"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"afficher dans le haut de la section des conversations"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"afficher la photo de profil sur l\'écran verrouillé"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Sous forme de bulle flottante, par-dessus les applis"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompre le mode Ne pas déranger"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Maintenez le doigt sur l\'écran, puis glissez-le pour réorganiser les commandes"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Toutes les commandes ont été supprimées"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modifications non enregistrées"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Impossible de charger la liste des commandes."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Autre"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Ajouter aux commandes des appareils"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Ajouter"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index c7d88720a9df..d66621c7a7db 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -1003,7 +1003,7 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Déplacer en bas à gauche"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Déplacer en bas à droite"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"Fermer la bulle"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Ne pas afficher la conversations dans des bulles"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Ne pas afficher la conversation dans une bulle"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chatter en utilisant des bulles"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Les nouvelles conversations s\'affichent sous forme d\'icônes flottantes ou bulles. Appuyez sur la bulle pour l\'ouvrir. Faites-la glisser pour la déplacer."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Contrôler les paramètres des bulles"</string> @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Mode Veille imminent"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversation définie comme prioritaire"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Les conversations prioritaires :"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"En haut de la liste des conversations"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Photo de profil sur l\'écran de verrouillage"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"S\'affichent en haut de la liste des conversations"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Affichent la photo de profil sur l\'écran de verrouillage"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Sous forme d\'info-bulle au-dessus des applications"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompre Ne pas déranger"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Appuyez et faites glisser pour réorganiser les commandes"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Toutes les commandes ont été supprimées"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Les modifications n\'ont pas été enregistrées"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Impossible de charger toutes les commandes."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Impossible de charger les commandes. Vérifiez l\'application <xliff:g id="APP">%s</xliff:g> pour vous assurer que les paramètres de l\'application n\'ont pas changé."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Commandes compatibles indisponibles"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Autre"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Ajouter aux commandes de contrôle des appareils"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Ajouter"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 93524f8492d8..426b413d2573 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -1006,7 +1006,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Non mostrar a conversa como burbulla"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chatear usando burbullas"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"As conversas novas aparecen como iconas flotantes ou burbullas. Toca para abrir a burbulla e arrastra para movela."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controlar as burbullas en calquera momento"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controla as burbullas"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Para desactivar as burbullas nesta aplicación, toca Xestionar"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Entendido"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Configuración de <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"A conversa definiuse como prioritaria"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"As conversas prioritarias farán o seguinte:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Mostrar na parte superior da sección de conversas"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrar imaxe do perfil na pantalla de bloqueo"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Mostraranse na parte superior da sección de conversas"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrarán a imaxe do perfil na pantalla de bloqueo"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Mostrar como burbulla flotante sobre outras apps"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromper modo Non molestar"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Entendido"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Para reorganizar os controis, mantenos premidos e arrástraos"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Quitáronse todos os controis"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Non se gardaron os cambios"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Non se puido cargar a lista de todos os controis."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outra"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Engadir ao control de dispositivos"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Engadir"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 473f6de00c89..c7f4ff2e1666 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"નિયંત્રણોને ફરીથી ગોઠવવા માટે તેમને હોલ્ડ કરીને ખેંચો"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"બધા નિયંત્રણો કાઢી નાખ્યા"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ફેરફારો સાચવ્યા નથી"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"બધા નિયંત્રણોની સૂચિ લોડ કરી શકાઈ નથી."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"નિયંત્રણો લોડ કરી શકાયા નથી. ઍપના સેટિંગ બદલાયા નથી તેની ખાતરી કરવા માટે <xliff:g id="APP">%s</xliff:g> ઍપ ચેક કરો."</string> + <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> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 00389073626b..47d29d461bc6 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -1015,7 +1015,7 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"सिस्टम नेविगेशन अपडेट हो गया. बदलाव करने के लिए \'सेटिंग\' पर जाएं."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"सिस्टम नेविगेशन अपडेट करने के लिए \'सेटिंग\' में जाएं"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्टैंडबाई"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"बातचीत को अहम बातचीत के तौर पर सेट किया गया है"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"बातचीत को \'अहम बातचीत\' के तौर पर सेट किया गया है"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"अहम बातचीत यहां दिखेगी:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"बातचीत सेक्शन में सबसे ऊपर दिखाएं"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो दिखाएं"</string> @@ -1047,7 +1047,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"कंट्रोल का क्रम फिर से बदलने के लिए उन्हें दबाकर रखें और खींचें"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"सभी कंट्रोल हटा दिए गए"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"बदलाव सेव नहीं किए गए"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"सभी कंट्रोल की सूची लोड नहीं हो सकी."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> @@ -1067,7 +1070,7 @@ <string name="controls_media_resume" msgid="1933520684481586053">"फिर से शुरू करें"</string> <string name="controls_error_timeout" msgid="794197289772728958">"काम नहीं कर रहा, ऐप जांचें"</string> <string name="controls_error_retryable" msgid="864025882878378470">"कोई गड़बड़ी हुई, फिर से कोशिश की जा रही है…"</string> - <string name="controls_error_removed" msgid="6675638069846014366">"कंट्रोल मौजूद नहीं है"</string> + <string name="controls_error_removed" msgid="6675638069846014366">"कंट्रोल नहीं है"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"कंट्रोल मौजूद नहीं है"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> को ऐक्सेस नहीं किया जा सका. <xliff:g id="APPLICATION">%2$s</xliff:g> ऐप्लिकेशन देखें, ताकि यह पक्का किया जा सके कि कंट्रोल अब भी मौजूद है और सेटिंग में कोई बदलाव नहीं हुआ है."</string> <string name="controls_open_app" msgid="483650971094300141">"ऐप्लिकेशन खोलें"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index b0e6b51e8f6a..058b5536b11b 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -1019,9 +1019,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Navigaciju sustavom možete ažurirati u Postavkama"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje mirovanja"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Razgovor postavljen na prioritetan"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritetni razgovori će sljedeće:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazuje se pri vrhu odjeljka razgovora"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazuje profilnu sliku na zaključanom zaslonu"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritetni razgovori:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazuju se pri vrhu odjeljka razgovora"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazuju profilnu sliku na zaključanom zaslonu"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Prikazuje se kao lebdeći oblačić iznad aplikacija"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prekida Ne uznemiravaj"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Shvaćam"</string> @@ -1051,7 +1051,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Zadržite i povucite da biste promijenili raspored kontrola"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Sve su kontrole uklonjene"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Promjene nisu spremljene"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Popis svih kontrola nije se učitao."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrole se ne mogu učitati. U aplikaciji <xliff:g id="APP">%s</xliff:g> provjerite da se postavke aplikacije nisu promijenile."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatibilne kontrole nisu dostupne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Dodavanje kontrolama uređaja"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Dodaj"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 64e7011a63a9..257a75f90bab 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Tartsa lenyomva, és húzza a vezérlők átrendezéséhez"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Minden vezérlő eltávolítva"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"A rendszer nem mentette a módosításokat"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Nem sikerült betölteni az összes vezérlő listáját."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Más"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Hozzáadás az eszközvezérlőkhöz"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Hozzáadás"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index a337cc22390b..52eee93f5d7b 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Պահեք և քաշեք՝ կառավարման տարրերը վերադասավորելու համար"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Կառավարման բոլոր տարրերը հեռացվեցին"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Փոփոխությունները չեն պահվել"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Չհաջողվեց բեռնել բոլոր կառավարների ցանկը։"</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 72fac719f1f1..eab4c2b316e5 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -1013,7 +1013,7 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigasi sistem diupdate. Untuk melakukan perubahan, buka Setelan."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Buka Setelan untuk mengupdate navigasi sistem"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Siaga"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"Percakapan disetel ke prioritas"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"Percakapan ditetapkan jadi prioritas"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Percakapan prioritas akan:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Muncul di atas bagian percakapan"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Menampilkan gambar profil di layar kunci"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Tahan & tarik untuk mengatur ulang kontrol"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Semua kontrol dihapus"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Perubahan tidak disimpan"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Daftar semua kontrol tidak dapat dimuat."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrol tidak dapat dimuat. Periksa aplikasi <xliff:g id="APP">%s</xliff:g> untuk memastikan setelan aplikasi tidak berubah."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kontrol yang kompatibel tidak tersedia"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Lainnya"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Tambahkan ke kontrol perangkat"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Tambahkan"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index a3119ce21498..a0d768ce464a 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -1015,7 +1015,7 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Biðstaða"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtal sett í forgang"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Forgangssamtöl munu:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Sýna yfir samtalshluta"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Birtast efst í samtalshluta"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Sýna prófílmynd á lásskjá"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Birta sem fljótandi blöðru yfir forritum"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Stöðva „Ónáðið ekki“"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Haltu og dragðu til að endurraða stýringum"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Allar stýringar fjarlægðar"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Breytingar ekki vistaðar"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Ekki tókst að hlaða lista yfir allar stýringar."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Annað"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Bæta við tækjastjórnun"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Bæta við"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index b90ae3e5834a..4ed2336697b7 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -1003,10 +1003,10 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Sposta in basso a sinistra"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Sposta in basso a destra"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"Ignora bolla"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Non utilizzare bolle per la conversazione"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Non mettere la conversazione nella bolla"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Chatta utilizzando le bolle"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Le nuove conversazioni vengono visualizzate come icone mobili o bolle. Tocca per aprire la bolla. Trascinala per spostarla."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controlla le bolle in qualsiasi momento"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Controlla le bolle quando vuoi"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Tocca Gestisci per disattivare le bolle dall\'app"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Impostazioni <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1016,7 +1016,7 @@ <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversazione impostata come prioritaria"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Le conversazioni prioritarie:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Appaiono in cima alla sezione delle conversazioni"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrano immagine profilo in schermata di blocco"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrano l\'immagine del profilo sulla schermata di blocco"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Vengono mostrate come bolle mobili sopra le app"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompono la modalità Non disturbare"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Tieni premuto e trascina per riordinare i controlli"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Tutti i controlli sono stati rimossi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modifiche non salvate"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Impossibile caricare l\'elenco di tutti i controlli."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Impossibile caricare i controlli. Verifica nell\'app <xliff:g id="APP">%s</xliff:g> che le relative impostazioni non siano cambiate."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Controlli compatibili non disponibili"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altro"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Aggiungi al controllo dei dispositivi"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Aggiungi"</string> @@ -1070,7 +1071,7 @@ <string name="controls_error_removed_message" msgid="2885911717034750542">"Impossibile accedere a: <xliff:g id="DEVICE">%1$s</xliff:g>. Verifica nell\'app <xliff:g id="APPLICATION">%2$s</xliff:g> che il controllo sia ancora disponibile e che le impostazioni dell\'app non siano cambiate."</string> <string name="controls_open_app" msgid="483650971094300141">"Apri app"</string> <string name="controls_error_generic" msgid="352500456918362905">"Impossibile caricare lo stato"</string> - <string name="controls_error_failed" msgid="960228639198558525">"Errore. Riprova"</string> + <string name="controls_error_failed" msgid="960228639198558525">"Errore, riprova"</string> <string name="controls_in_progress" msgid="4421080500238215939">"In corso"</string> <string name="controls_added_tooltip" msgid="4842812921719153085">"Tieni premuto il tasto di accensione per visualizzare i nuovi controlli"</string> <string name="controls_menu_add" msgid="4447246119229920050">"Aggiungi controlli"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 9d2d0cc973aa..30d4eb4f51de 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"יש ללחוץ לחיצה ארוכה ולגרור כדי לארגן מחדש את הפקדים"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"כל הפקדים הוסרו"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"השינויים לא נשמרו"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"לא ניתן היה לטעון את הרשימה של כל הפקדים."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 4f6c7858379c..1b68da178165 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -1002,19 +1002,19 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"右上に移動"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"左下に移動"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"右下に移動"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"ふきだしを閉じる"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"バブルを閉じる"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"会話をバブルで表示しない"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"チャットでバブルを使う"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"新しい会話はフローティング アイコン（バブル）として表示されます。タップするとバブルが開きます。ドラッグしてバブルを移動できます。"</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"いつでもバブルを管理"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"このアプリからのバブルをオフにするには、[管理] をタップしてください"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"このアプリからのバブルを OFF にするには、[管理] をタップしてください"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> の設定"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"システム ナビゲーションを更新しました。変更するには [設定] に移動してください。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"システム ナビゲーションを更新するには [設定] に移動してください"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"スタンバイ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"優先度を高く設定された会話"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"優先度の高い会話では、次のようになります。"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"優先度の高い会話は、次のように表示されます。"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"会話セクションの一番上にバブルで表示"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"ロック画面にプロフィール写真を表示"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"他のアプリに重ねてフローティング バブルとして表示"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"コントロールを並べ替えるには長押ししてドラッグします"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"すべてのコントロールを削除しました"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"変更が保存されていません"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"全コントロールの一覧を読み込めませんでした。"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"コントロールを読み込めませんでした。<xliff:g id="APP">%s</xliff:g> アプリで、アプリの設定が変更されていないことをご確認ください。"</string> + <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> @@ -1067,7 +1068,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"エラー。再試行しています…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"見つかりませんでした"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"コントロールを使用できません"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"「<xliff:g id="DEVICE">%1$s</xliff:g>」にアクセスできませんでした<xliff:g id="APPLICATION">%2$s</xliff:g> アプリで、コントロールが使用可能な状態でアプリの設定が変更されていないことをご確認ください。"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"「<xliff:g id="DEVICE">%1$s</xliff:g>」にアクセスできませんでした。<xliff:g id="APPLICATION">%2$s</xliff:g> アプリで、コントロールが使用可能な状態でアプリの設定が変更されていないことをご確認ください。"</string> <string name="controls_open_app" msgid="483650971094300141">"アプリを開く"</string> <string name="controls_error_generic" msgid="352500456918362905">"ステータスを読み込めません"</string> <string name="controls_error_failed" msgid="960228639198558525">"エラー: もう一度お試しください"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index aeee416750ed..e1b9245d725b 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"მართვის საშუალებების გადაწყობა შეგიძლიათ მათი ჩავლებით გადატანით"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"მართვის ყველა საშუალება ამოიშალა"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ცვლილებები არ შენახულა"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"მართვის ყველა საშუალების სია ვერ ჩაიტვირთა."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 356526ce9a1d..e6f30ed18f1b 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -1002,7 +1002,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Жоғары оң жаққа жылжыту"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Төменгі сол жаққа жылжыту"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Төменгі оң жаққа жылжыту"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Қалқымалы анықтаманы жабу"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Қалқымалы хабарды жабу"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Әңгіменің қалқыма хабары көрсетілмесін"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Қалқыма хабарлар арқылы сөйлесу"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Жаңа әңгімелер қалқыма белгішелер немесе хабарлар түрінде көрсетіледі. Қалқыма хабарды ашу үшін түртіңіз. Жылжыту үшін сүйреңіз."</string> @@ -1014,8 +1014,8 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Жүйе навигациясын жаңарту үшін \"Параметрлер\" бөліміне өтіңіз."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Күту режимі"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Әңгіме маңызды деп белгіленді"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Маңызды әңгімелердің әрекеті:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Сөйлесу бөлімінің жоғарғы жағында көрсетіледі."</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Маңызды әңгімелер:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Әңгімелер бөлімінің жоғарғы жағында көрсетіледі."</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Профиль суреті құлыптаулы экранда көрсетіледі."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Қолданбалар терезесінің бергі жағынан қалқыма хабарлар түрінде көрсетіледі."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\"Мазаламау\" режимінде көрсетіледі."</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"Ұлғайту терезесі"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Ұлғайту терезесінің басқару элементтері"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Құрылғы басқару виджеттері"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Жалғанған құрылғыларға басқару элементтерін енгізу"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Жалғанған құрылғылар үшін басқару виджеттерін қосу"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Құрылғы басқару виджеттерін реттеу"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Басқару элементтерін шығару үшін қуат түймесін басып тұрыңыз."</string> <string name="controls_providers_title" msgid="6879775889857085056">"Басқару элементтері енгізілетін қолданбаны таңдаңыз"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Басқару элементтерінің ретін өзгерту үшін оларды басып тұрып сүйреңіз."</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Барлық басқару элементтері өшірілді."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өзгерістер сақталмады."</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Барлық басқару элементі тізімі жүктелмеді."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Басқару элементтері жүктелмеді. Қолданба параметрлерінің өзгермегенін тексеру үшін <xliff:g id="APP">%s</xliff:g> қолданбасын қараңыз."</string> + <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> @@ -1066,8 +1067,8 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Өшірулі. Қолданба тексеріңіз."</string> <string name="controls_error_retryable" msgid="864025882878378470">"Қате, әрекет қайталануда…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Табылмады"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"Басқару элементтері қолжетімді емес"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> ашылмады. Басқару элементтерінің әлі қолжетімді екенін және қолданба параметрлерінің өзгермегенін тексеру үшін <xliff:g id="APPLICATION">%2$s</xliff:g> қолданбасын қараңыз."</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"Басқару виджеті қолжетімсіз"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> ашылмады. Басқару виджетінің әлі қолжетімді екенін және қолданба параметрлерінің өзгермегенін тексеру үшін <xliff:g id="APPLICATION">%2$s</xliff:g> қолданбасын қараңыз."</string> <string name="controls_open_app" msgid="483650971094300141">"Қолданбаны ашу"</string> <string name="controls_error_generic" msgid="352500456918362905">"Күйді жүктеу мүмкін емес."</string> <string name="controls_error_failed" msgid="960228639198558525">"Қате шықты. Қайталап көріңіз."</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index b0f90e2b2869..687508ea53d8 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ចុចឱ្យជាប់ រួចអូសដើម្បីរៀបចំផ្ទាំងគ្រប់គ្រងឡើងវិញ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"បានដកផ្ទាំងគ្រប់គ្រងទាំងអស់ហើយ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"មិនបានរក្សាទុកការផ្លាស់ប្ដូរទេ"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"មិនអាចផ្ទុកបញ្ជីនៃការគ្រប់គ្រងទាំងអស់បានទេ។"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"មិនអាចផ្ទុកការគ្រប់គ្រងបានទេ។ សូមពិនិត្យមើលកម្មវិធី <xliff:g id="APP">%s</xliff:g> ដើម្បីធ្វើឱ្យប្រាកដថាការកំណត់កម្មវិធីមិនបានផ្លាស់ប្ដូរ។"</string> + <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> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index ed5342554913..7659b4594ce2 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ನಿರ್ವಹಿಸಿ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ಇತಿಹಾಸ"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"ಹೊಸತು"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ನಿಶ್ಶಬ್ದ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ಅಧಿಸೂಚನೆಗಳು"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ಸಂಭಾಷಣೆಗಳು"</string> @@ -1046,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ನಿಯಂತ್ರಣಗಳನ್ನು ಮರುಹೊಂದಿಸಲು ಹೋಲ್ಡ್ ಮಾಡಿ ಮತ್ತು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ಎಲ್ಲಾ ನಿಯಂತ್ರಣಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲಾಗಿಲ್ಲ"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"ಎಲ್ಲಾ ನಿಯಂತ್ರಣಗಳ ಪಟ್ಟಿಯನ್ನು ಲೋಡ್ ಮಾಡಲು ಆಗಲಿಲ್ಲ."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index a27f4f723a0c..cb74d86184f3 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -1003,7 +1003,7 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"왼쪽 하단으로 이동"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"오른쪽 하단으로 이동"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"대화창 닫기"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"대화를 대화창으로 표시하지 않음"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"대화를 대화창으로 표시하지 않기"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"대화창으로 채팅하기"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"새로운 대화가 플로팅 아이콘인 대화창으로 표시됩니다. 대화창을 열려면 탭하세요. 드래그하여 이동할 수 있습니다."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"언제든지 대화창을 제어하세요"</string> @@ -1014,7 +1014,7 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"설정으로 이동하여 시스템 탐색을 업데이트하세요."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"대기"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"대화가 우선순위 대화로 설정됨"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"우선순위 대화에서 다음과 같은 동작을 합니다."</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"우선순위 대화는 다음과 같이 표시됩니다."</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"대화 섹션의 상단에 표시"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"잠금 화면에서 프로필 사진 표시"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"앱 상단에서 플로팅 대화창으로 표시"</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"확대 창"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"확대 창 컨트롤"</string> <string name="quick_controls_title" msgid="6839108006171302273">"기기 컨트롤"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"연결된 기기의 컨트롤을 추가합니다."</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"연결된 기기의 컨트롤을 추가하세요."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"기기 컨트롤 설정"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"전원 버튼을 길게 눌러 컨트롤에 액세스하세요."</string> <string name="controls_providers_title" msgid="6879775889857085056">"컨트롤을 추가할 앱을 선택하세요"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"길게 누르고 드래그하여 컨트롤 재정렬"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"모든 컨트롤 삭제됨"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"변경사항이 저장되지 않음"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"전체 컨트롤 목록을 로드할 수 없습니다."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"컨트롤을 로드할 수 없습니다. <xliff:g id="APP">%s</xliff:g> 앱에서 설정이 변경되지 않았는지 확인하세요."</string> + <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> @@ -1067,7 +1068,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"오류 발생, 다시 시도 중…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"찾을 수 없음"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"컨트롤을 사용할 수 없음"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g>에 액세스할 수 없습니다. <xliff:g id="APPLICATION">%2$s</xliff:g> 앱에서 컨트롤을 계속 사용할 수 있는지와 앱 설정이 변경되지 않았는지 확인하세요."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g>에 액세스할 수 없습니다. <xliff:g id="APPLICATION">%2$s</xliff:g> 앱에서 컨트롤을 계속 사용할 수 있는지, 앱 설정이 변경되지는 않았는지 확인하세요."</string> <string name="controls_open_app" msgid="483650971094300141">"앱 열기"</string> <string name="controls_error_generic" msgid="352500456918362905">"통계를 로드할 수 없음"</string> <string name="controls_error_failed" msgid="960228639198558525">"오류. 다시 시도하세요."</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 74f43e870da7..839bb503c70f 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -1003,11 +1003,11 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Төмөнкү сол жакка жылдыруу"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Төмөнкү оң жакка жылдырыңыз"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"Калкып чыкма билдирмени жабуу"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Жазышуу калкып чыкма билдирмеде көрүнбөсүн"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Жазышууда калкып чыкма билдирмелер көрүнбөсүн"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Калкып чыкма билдирмелер аркылуу маектешүү"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Жаңы жазышуулар калкыма сүрөтчөлөр же калкып чыкма билдирмелер түрүндө көрүнөт. Калкып чыкма билдирмелерди ачуу үчүн таптап коюңуз. Жылдыруу үчүн сүйрөңүз."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Калкып чыкма билдирмелерди каалаган убакта көзөмөлдөңүз"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Бул колдонмодогу калкып чыкма билдирмелерди өчүрүү үчүн \"Башкарууну\" басыңыз"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Бул колдонмодогу калкып чыкма билдирмелерди өчүрүү үчүн, \"Башкарууну\" басыңыз"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Түшүндүм"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> жөндөөлөрү"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Тутум чабыттоосу жаңырды. Өзгөртүү үчүн, Жөндөөлөргө өтүңүз."</string> @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Көшүү режими"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Жазышуу маанилүү болуп коюлду"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Маанилүү жазышуулардын төмөнкүдөй артыкчылыктары бар:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Жазышуу бөлүмүнүн үстүндө көрсөтүү"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Профилдин сүрөтүн кулпуланган экранда көрсөтүү"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Жазышуулар тизмесинин үстүндө көрүнөт"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Профилдин сүрөтү кулпуланган экранда көрүнөт"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Калкым чыкма билдирме катары көрсөтүү"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"\"Тынчымды алба\" режими үзгүлтүккө учурайт"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Түшүндүм"</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"Чоңойтуу терезеси"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Чоңойтуу терезесин башкаруу каражаттары"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Түзмөктү башкаруу элементтери"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Байланышкан түзмөктөрүңүздү башкаруу элементтерин кошуңуз"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Байланышкан түзмөктөрүңүздү башкаруу элементтерин кошосуз"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Түзмөктү башкаруу элементтерин жөндөө"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Көзөмөлдөргө өтүү үчүн, күйгүзүү/өчүрүү баскычын басып туруңуз"</string> <string name="controls_providers_title" msgid="6879775889857085056">"Башкаруу элементтери кошула турган колдонмону тандаңыз"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Башкаруу элементтеринин иретин өзгөртүү үчүн, кармап туруп, сүйрөңүз"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Бардык башкаруу элементтери өчүрүлдү"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өзгөртүүлөр сакталган жок"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Бардык көзөмөлдөрдүн тизмеси жүктөлгөн жок."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> @@ -1066,8 +1069,8 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Жигерсиз. Колдонмону текшериңиз"</string> <string name="controls_error_retryable" msgid="864025882878378470">"Ката, дагы аракет жасалууда…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Табылган жок"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"Көзөмөл жеткиликтүү эмес"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> түзмөгүнө кирүү мүмкүнчүлүгү жок. <xliff:g id="APPLICATION">%2$s</xliff:g> колдонмосуна өтүп, көзөмөл жеткиликтүү экенин жана колдонмонун жөндөөлөрү өзгөрбөгөнүн текшериңиз."</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"Башкара албайсыз"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> түзмөгүн пайдалана албайсыз. Аны <xliff:g id="APPLICATION">%2$s</xliff:g> колдонмосунан башкарууга мүмкүн же мүмкүн эместигин, ошондой эле колдонмонун жөндөөлөрүнүн өзгөрүлбөгөнүн текшериңиз."</string> <string name="controls_open_app" msgid="483650971094300141">"Колдонмону ачуу"</string> <string name="controls_error_generic" msgid="352500456918362905">"Абалы жүктөлгөн жок"</string> <string name="controls_error_failed" msgid="960228639198558525">"Ката, кайталап көрүңүз"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 0fe47aab6e7c..8d44a9cf7997 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -1002,7 +1002,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"ຍ້າຍຂວາເທິງ"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"ຍ້າຍຊ້າຍລຸ່ມ"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"ຍ້າຍຂວາລຸ່ມ"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"ປິດ bubble ໄວ້"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"ປິດຟອງໄວ້"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"ຢ່າໃຊ້ຟອງໃນການສົນທະນາ"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"ສົນທະນາໂດຍໃຊ້ຟອງ"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"ການສົນທະນາໃໝ່ຈະປາກົດເປັນໄອຄອນ ຫຼື ຟອງແບບລອຍ. ແຕະເພື່ອເປີດຟອງ. ລາກເພື່ອຍ້າຍມັນ."</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ກົດຄ້າງໄວ້ເພື່ອຈັດຮຽງການຄວບຄຸມຄືນໃໝ່"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ລຶບການຄວບຄຸມທັງໝົດອອກແລ້ວ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ບໍ່ໄດ້ບັນທຶກການປ່ຽນແປງໄວ້"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"ບໍ່ສາມາດໂຫຼດລາຍຊື່ການຄວບຄຸມທັງໝົດໄດ້."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"ບໍ່ສາມາດໂຫຼດການຄວບຄຸມໄດ້. ກວດສອບແອັບ <xliff:g id="APP">%s</xliff:g> ເພື່ອໃຫ້ແນ່ໃຈວ່າຍັງບໍ່ມີການປ່ຽນແປງການຕັ້ງຄ່າແອັບເທື່ອ."</string> + <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> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 59cab5795f13..7988dc4d741e 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Norėdami pertvarkyti valdiklius, vilkite laikydami nuspaudę"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Visi valdikliai pašalinti"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Pakeitimai neišsaugoti"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Nepavyko įkelti visų valdiklių sąrašo."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Kita"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Pridėjimas prie įrenginio valdiklių"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Pridėti"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index bc157026e745..2bffca24b31b 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -1011,7 +1011,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Nerādīt sarunu burbuļos"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Tērzēšana, izmantojot burbuļus"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Jaunas sarunas tiek rādītas kā peldošas ikonas vai burbuļi. Pieskarieties, lai atvērtu burbuli. Velciet, lai to pārvietotu."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Pārvaldīt burbuļus jebkurā laikā"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Allaž pārvaldīt burbuļus"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Pieskarieties pogai “Pārvaldīt”, lai izslēgtu burbuļus no šīs lietotnes."</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Labi"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Lietotnes <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> iestatījumi"</string> @@ -1051,7 +1051,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Lai pārkārtotu vadīklas, turiet un velciet tās"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Visas vadīklas ir noņemtas"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Izmaiņas nav saglabātas."</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Nevarēja ielādēt sarakstu ar visām vadīklām."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Cita"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Pievienošana ierīču vadīklām"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Pievienot"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 09e7ff17714f..561380cdf91a 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -994,7 +994,7 @@ <string name="bubbles_settings_button_description" msgid="7324245408859877545">"Поставки за балончињата за <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubble_overflow_button_content_description" msgid="5523744621434300510">"Прелевање"</string> <string name="bubble_accessibility_action_add_back" msgid="6217995665917123890">"Додајте назад во stack"</string> - <string name="manage_bubbles_text" msgid="6856830436329494850">"Управување"</string> + <string name="manage_bubbles_text" msgid="6856830436329494850">"Управувајте"</string> <string name="bubble_content_description_single" msgid="5175160674436546329">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> од <xliff:g id="APP_NAME">%2$s</xliff:g>"</string> <string name="bubble_content_description_stack" msgid="7907610717462651870">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> од <xliff:g id="APP_NAME">%2$s</xliff:g> и уште <xliff:g id="BUBBLE_COUNT">%3$d</xliff:g>"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Премести"</string> @@ -1014,9 +1014,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Одете во „Поставки“ за да ја ажурирате навигацијата на системот"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Подготвеност"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Разговорот е поставен како приоритетен"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Приорететните разговори ќе:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Се прикажува најгоре во делот со разговори"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Се прикажува профилна слика на заклучен екран"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Приоритетните разговори:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"ќе се прикажуваат најгоре во делот со разговори;"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"ќе прикажуваат профилна слика на заклучен екран."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Се појавува како лебдечко балонче врз апликациите"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Прекинува „Не вознемирувај“"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Сфатив"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Задржете и влечете за да ги преуредите контролите"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Сите контроли се отстранети"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промените не се зачувани"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Не можеше да се вчита списокот со сите контроли."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Контролите не можеше да се вчитаат. Проверете ја апликацијата <xliff:g id="APP">%s</xliff:g> за да се уверите дека поставките за апликацијата не се променети."</string> + <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> @@ -1067,8 +1068,8 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Грешка, повторен обид…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Не е најдено"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Контролата не е достапна"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Не може да се пристапи до <xliff:g id="DEVICE">%1$s</xliff:g>. Проверете ја апликацијата <xliff:g id="APPLICATION">%2$s</xliff:g> за да се осигурите дека контролата е сè уште достапна и дека поставките за апликацијата не се сменети."</string> - <string name="controls_open_app" msgid="483650971094300141">"Отвори ја апликација"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Не може да се пристапи до <xliff:g id="DEVICE">%1$s</xliff:g>. Проверете ја апликацијата <xliff:g id="APPLICATION">%2$s</xliff:g> за да се уверите дека контролата е сѐ уште достапна и дека поставките за апликацијата не се сменети."</string> + <string name="controls_open_app" msgid="483650971094300141">"Отвори апликација"</string> <string name="controls_error_generic" msgid="352500456918362905">"Не може да се вчита статусот"</string> <string name="controls_error_failed" msgid="960228639198558525">"Грешка, обидете се повторно"</string> <string name="controls_in_progress" msgid="4421080500238215939">"Во тек"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index e4d4ba407732..bf4f902f3bd6 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"എല്ലാം മായ്ക്കുക"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"മാനേജ് ചെയ്യുക"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ചരിത്രം"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"പുതിയത്"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"നിശബ്ദം"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"അറിയിപ്പുകൾ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"സംഭാഷണങ്ങൾ"</string> @@ -1009,7 +1008,7 @@ <string name="bubbles_user_education_description" msgid="1160281719576715211">"പുതിയ സംഭാഷണങ്ങൾ ഫ്ലോട്ടിംഗ് ഐക്കണുകളോ ബബിളുകളോ ആയി ദൃശ്യമാവുന്നു. ബബിൾ തുറക്കാൻ ടാപ്പ് ചെയ്യൂ. ഇത് നീക്കാൻ വലിച്ചിടുക."</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"ബബിളുകൾ ഏതുസമയത്തും നിയന്ത്രിക്കുക"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"ഈ ആപ്പിൽ നിന്നുള്ള ബബിളുകൾ ഓഫാക്കാൻ മാനേജ് ചെയ്യുക ടാപ്പ് ചെയ്യുക"</string> - <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"ലഭിച്ചു"</string> + <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"മനസ്സിലായി"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> ക്രമീകരണം"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"സിസ്റ്റം നാവിഗേഷൻ അപ്ഡേറ്റ് ചെയ്തു. മാറ്റങ്ങൾ വരുത്താൻ ക്രമീകരണത്തിലേക്ക് പോവുക."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"സിസ്റ്റം നാവിഗേഷൻ അപ്ഡേറ്റ് ചെയ്യാൻ ക്രമീകരണത്തിലേക്ക് പോവുക"</string> @@ -1026,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"മാഗ്നിഫിക്കേഷൻ വിൻഡോ"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"മാഗ്നിഫിക്കേഷൻ വിൻഡോ നിയന്ത്രണങ്ങൾ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ഉപകരണ നിയന്ത്രണങ്ങൾ"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"നിങ്ങളുടെ കണക്റ്റ് ചെയ്ത ഉപകരണങ്ങൾക്ക് നിയന്ത്രണങ്ങൾ ചേർക്കുക"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"കണക്റ്റ് ചെയ്ത ഉപകരണങ്ങൾക്ക് നിയന്ത്രണങ്ങൾ ചേർക്കുക"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ഉപകരണ നിയന്ത്രണങ്ങൾ സജ്ജീകരിക്കുക"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"നിങ്ങളുടെ നിയന്ത്രണങ്ങൾ ആക്സസ് ചെയ്യാൻ പവർ ബട്ടണിൽ പിടിക്കുക"</string> <string name="controls_providers_title" msgid="6879775889857085056">"നിയന്ത്രണങ്ങൾ ചേർക്കാൻ ആപ്പ് തിരഞ്ഞെടുക്കുക"</string> @@ -1046,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"നിയന്ത്രണങ്ങൾ പുനഃക്രമീകരിക്കാൻ അമർത്തിപ്പിടിച്ച് വലിച്ചിടുക"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"എല്ലാ നിയന്ത്രണങ്ങളും നീക്കം ചെയ്തു"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"മാറ്റങ്ങൾ സംരക്ഷിച്ചിട്ടില്ല"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"എല്ലാ നിയന്ത്രണങ്ങളുടെയും ലിസ്റ്റ് ലോഡ് ചെയ്യാനായില്ല."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 4ab58f089e24..0420ffa03969 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Хяналтуудыг дахин засварлахын тулд дараад чирнэ үү"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Бүх хяналтыг хассан"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Өөрчлөлтийг хадгалаагүй"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Бүх хяналтын жагсаалтыг ачаалж чадсангүй."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Хяналтыг ачаалж чадсангүй. Аппын тохиргоог өөрчлөөгүй эсэхийг нягтлахын тулд <xliff:g id="APP">%s</xliff:g> аппыг шалгана уу."</string> + <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> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index d49f46d840b2..c080211b9cc5 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"सर्व साफ करा"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"व्यवस्थापित करा"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"इतिहास"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"नवीन"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"सायलंट"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचना"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"संभाषणे"</string> @@ -1046,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"नियंत्रणांची पुनर्रचना करण्यासाठी धरून ठेवा आणि ड्रॅग करा"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"सर्व नियंत्रणे काढून टाकली आहेत"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"बदल सेव्ह केले गेले नाहीत"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"सर्व नियंत्रणांची सूची लोड करता आली नाही."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"नियंत्रणे लोड करता अली नाहीत. ॲपची सेटिंग्ज बदलली नसल्याची खात्री करण्यासाठी <xliff:g id="APP">%s</xliff:g> ॲप तपासा."</string> + <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> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index be17eade57a1..8514403f95e4 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Tunggu sedia"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Perbualan ditetapkan kepada keutamaan"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Perbualan keutamaan akan:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Tunjukkan di atas bahagian perbualan"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Tunjukkan gambar profil pada skrin kunci"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Muncul di atas bahagian perbualan"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Memaparkan gambar profil pada skrin kunci"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Dipaparkan sebagai gelembung terapung di atas apl"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ganggu ciri Jangan Ganggu"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Tahan & seret untuk mengatur semula kawalan"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Semua kawalan dialih keluar"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Perubahan tidak disimpan"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Senarai semua kawalan tidak dapat dimuatkan."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kawalan tidak dapat dimuatkan. Semak apl <xliff:g id="APP">%s</xliff:g> untuk memastikan bahawa tetapan apl tidak berubah."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kawalan serasi tidak tersedia"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Lain-lain"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Tambahkan pada kawalan peranti"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Tambah"</string> @@ -1065,7 +1066,7 @@ <string name="controls_media_resume" msgid="1933520684481586053">"Sambung semula"</string> <string name="controls_error_timeout" msgid="794197289772728958">"Tidak aktif, semak apl"</string> <string name="controls_error_retryable" msgid="864025882878378470">"Ralat, mencuba semula…"</string> - <string name="controls_error_removed" msgid="6675638069846014366">"Tidak ditemui"</string> + <string name="controls_error_removed" msgid="6675638069846014366">"Tidak ditemukan"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Kawalan tidak tersedia"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"Tidak dapat mengakses <xliff:g id="DEVICE">%1$s</xliff:g>. Periksa apl <xliff:g id="APPLICATION">%2$s</xliff:g> untuk memastikan kawalan masih tersedia dan tetapan apl tidak berubah."</string> <string name="controls_open_app" msgid="483650971094300141">"Buka apl"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index eaf4157ff4e1..32c72ef51c6e 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ထိန်းချုပ်မှုများ ပြန်စီစဉ်ရန် ဖိပြီးဆွဲပါ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ထိန်းချုပ်မှုအားလုံး ဖယ်ရှားလိုက်သည်"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"အပြောင်းအလဲများကို သိမ်းမထားပါ"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"ထိန်းချုပ်မှုအားလုံး၏ စာရင်းကို ဖွင့်၍မရပါ။"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"ထိန်းချုပ်မှုများကို ဖွင့်၍မရပါ။ အက်ပ်ဆက်တင်များ ပြောင်းမထားကြောင်း သေချာစေရန် <xliff:g id="APP">%s</xliff:g> အက်ပ်ကို စစ်ဆေးပါ။"</string> + <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> @@ -1066,7 +1067,7 @@ <string name="controls_error_timeout" msgid="794197289772728958">"ရပ်နေသည်၊ အက်ပ်ကို စစ်ဆေးပါ"</string> <string name="controls_error_retryable" msgid="864025882878378470">"မှားသွားသည်၊ ပြန်စမ်းနေသည်…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"မတွေ့ပါ"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"ထိန်းချုပ်၍ မရတော့ပါ"</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"ထိန်းချုပ်မှု မရနိုင်ပါ"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> အသုံးပြု၍ မရပါ။ ထိန်းချုပ်၍ ရသေးကြောင်းနှင့် အက်ပ်ဆက်တင်များ ပြောင်းမထားကြောင်း သေချာစေရန် <xliff:g id="APPLICATION">%2$s</xliff:g> အက်ပ်ကို စစ်ဆေးပါ။"</string> <string name="controls_open_app" msgid="483650971094300141">"အက်ပ်ဖွင့်ရန်"</string> <string name="controls_error_generic" msgid="352500456918362905">"အခြေအနေကို ဖွင့်၍မရပါ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index aee2dd288262..8a134ee4a7a5 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -1013,10 +1013,10 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Systemnavigeringen er oppdatert. For å gjøre endringer, gå til Innstillinger."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Gå til Innstillinger for å oppdatere systemnavigeringen"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Ventemodus"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er satt som prioritert"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"Samtalen er prioritert"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Dette skjer med prioriterte samtaler:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Vis øverst i samtaledelen"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Vis profilbildet på låseskjermen"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"De vises øverst i samtaledelen."</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Profilbildet vises på låseskjermen."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Vises som en svevende boble over apper"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Overstyr «Ikke forstyrr»"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Greit"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Hold og dra for å flytte kontroller"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle kontroller er fjernet"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Endringene er ikke lagret"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Listen over alle kontroller kunne ikke lastes inn."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kunne ikke laste inn kontrollene. Sjekk <xliff:g id="APP">%s</xliff:g>-appen for å sjekke at appinnstillingene ikke er endret."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Kompatible kontroller er ikke tilgjengelige"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Annet"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Legg til i enhetsstyring"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Legg til"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index fda85ccb542c..0091d5ee4f55 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"सबै हटाउनुहोस्"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"व्यवस्थित गर्नुहोस्"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"इतिहास"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"नयाँ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"मौन"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"सूचनाहरू"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"वार्तालापहरू"</string> @@ -1008,16 +1007,16 @@ <string name="bubbles_user_education_title" msgid="5547017089271445797">"बबलहरू प्रयोग गरी कुराकानी गर्नुहोस्"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"नयाँ वार्तालापहरू तैरने आइकन वा बबलका रूपमा देखिन्छन्। बबल खोल्न ट्याप गर्नुहोस्। बबल सार्न सो बबललाई ड्र्याग गर्नुहोस्।"</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"जुनसुकै बेला बबलहरू नियन्त्रण गर्नुहोस्"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"यो अनुप्रयोगबाट आएका बबलहरू निष्क्रिय पार्न व्यवस्थापन गर्नुहोस् नामक बटनमा ट्याप गर्नुहोस्"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"यो एपबाट आएका बबलहरू अफ गर्न \"व्यवस्थापन गर्नुहोस्\" बटनमा ट्याप गर्नुहोस्"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"बुझेँ"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> का सेटिङहरू"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"प्रणालीको नेभिगेसन अद्यावधिक गरियो। परिवर्तन गर्न सेटिङमा जानुहोस्।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"प्रणालीको नेभिगेसन अद्यावधिक गर्न सेटिङमा जानुहोस्"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"स्ट्यान्डबाई"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"वार्तालापको प्राथमिकता निर्धारण गरी महत्त्वपूर्ण बनाइयो"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"महत्वपूर्ण वार्तालापहरू यहाँ देखिने छन्:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"वार्तालाप खण्डको सिरानमा देखाइयोस्"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"लक स्क्रिनमा प्रोफाइल तस्बिर देखाइयोस्"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"वार्तालापको प्राथमिकता निर्धारण गरी \"महत्त्वपूर्ण\" बनाइयो"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"महत्वपूर्ण वार्तालापहरू:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"वार्तालाप खण्डको सिरानमा देखिने छन्"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"लक स्क्रिनमा प्रोफाइल तस्बिर देखाउने छन्"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"एपहरूमाथि तैरिने बबलका रूपमा देखाइयोस्"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"बाधा नपुऱ्याउनुहोस् मोडलाई बेवास्ता गरियोस्"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"बुझेँ"</string> @@ -1046,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"नियन्त्रणहरूको क्रम मिलाउन तिनलाई थिचेर ड्र्याग गर्नुहोस्"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"सबै नियन्त्रणहरू हटाइए"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"परिवर्तनहरू सुरक्षित गरिएका छैनन्"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"सबै नियन्त्रणहरूको सूची लोड गर्न सकिएन।"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"नियन्त्रण सुविधाहरू लोड गर्न सकिएन। <xliff:g id="APP">%s</xliff:g> एपका सेटिङ परिवर्तन गरिएका छैनन् भन्ने कुरा सुनिश्चित गर्न यो एप जाँच्नुहोस्।"</string> + <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> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 87f072b9e7dd..23d2d1cf75c8 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -1014,7 +1014,7 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Ga naar Instellingen om de systeemnavigatie te updaten"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stand-by"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Gesprek ingesteld als prioriteit"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Bij prioriteitsgesprekken gebeurt het volgende:"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioriteitsgesprekken:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Worden bovenaan het gespreksgedeelte weergegeven"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Tonen profielafbeelding op vergrendelscherm"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Worden als zwevende ballon weergegeven vóór apps"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Houd vast en sleep om de bedieningselementen opnieuw in te delen"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alle bedieningselementen verwijderd"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Wijzigingen zijn niet opgeslagen"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Kan lijst met alle bedieningselementen niet laden."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Bedieningselementen kunnen niet worden geladen. Check de <xliff:g id="APP">%s</xliff:g>-app om na te gaan of de app-instellingen niet zijn gewijzigd."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Geen geschikte bedieningselementen beschikbaar."</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Overig"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Toevoegen aan apparaatbediening"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Toevoegen"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 426bd2ec1ada..6fa9699192c7 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -510,8 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ସମସ୍ତ ଖାଲି କରନ୍ତୁ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ପରିଚାଳନା କରନ୍ତୁ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ଇତିହାସ"</string> - <!-- no translation found for notification_section_header_incoming (850925217908095197) --> - <skip /> + <string name="notification_section_header_incoming" msgid="850925217908095197">"ନୂଆ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ନୀରବ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> @@ -1014,8 +1013,8 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ଅପ୍ଡେଟ୍ ହୋଇଛି। ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ।"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ସିଷ୍ଟମ୍ ନାଭିଗେସନ୍ ଅପ୍ଡେଟ୍ କରିବା ପାଇଁ ସେଟିଂସ୍କୁ ଯାଆନ୍ତୁ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ଷ୍ଟାଣ୍ଡବାଏ"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"ବାର୍ତ୍ତାଳାପ ପ୍ରାଥମିକରେ ସେଟ୍ କରାଯାଇଛି"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ପ୍ରାଥମିକ ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ:"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"ବାର୍ତ୍ତାଳାପ ପ୍ରାଥମିକତାରେ ସେଟ୍ କରାଯାଇଛି"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"ବାର୍ତ୍ତାଳାପ ବିଭାଗର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"ଲକ୍ ସ୍କ୍ରିନରେ ପ୍ରୋଫାଇଲ୍ ଛବି ଦେଖାନ୍ତୁ"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"ଆପଗୁଡ଼ିକ ଉପରେ ଫ୍ଲୋଟିଂ ବବଲ୍ ପରି ଦେଖାଯିବ"</string> @@ -1026,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ୱିଣ୍ଡୋ"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ୱିଣ୍ଡୋ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ"</string> <string name="quick_controls_title" msgid="6839108006171302273">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"ଆପଣଙ୍କ ସଂଯୁକ୍ତ ଥିବା ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣ ଯୋଗ କରନ୍ତୁ"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"ଆପଣଙ୍କ ସଂଯୁକ୍ତ ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ନିୟନ୍ତ୍ରଣ ଯୋଗ କରନ୍ତୁ"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"ଡିଭାଇସ୍ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"ଆପଣଙ୍କ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ପାୱାର ବଟନକୁ ଧରି ରଖନ୍ତୁ"</string> <string name="controls_providers_title" msgid="6879775889857085056">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଯୋଗ କରିବାକୁ ଆପ୍ ବାଛନ୍ତୁ"</string> @@ -1046,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ପୁଣି ସଜାଇବାକୁ ସେଗୁଡ଼ିକୁ ଧରି ଟାଣନ୍ତୁ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ସମସ୍ତ ନିୟନ୍ତ୍ରଣ କାଢ଼ି ଦିଆଯାଇଛି"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ପରିବର୍ତ୍ତନଗୁଡ଼ିକ ସେଭ୍ କରାଯାଇନାହିଁ"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"ସବୁ ନିୟନ୍ତ୍ରଣର ତାଲିକା ଲୋଡ୍ କରିପାରିଲା ନାହିଁ।"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକୁ ଲୋଡ୍ କରାଯାଇପାରିଲା ନାହିଁ। ଆପ୍ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ ହୋଇନାହିଁ ବୋଲି ନିଶ୍ଚିତ କରିବାକୁ <xliff:g id="APP">%s</xliff:g> ଆପ୍ ଯାଞ୍ଚ କରନ୍ତୁ।"</string> + <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> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index ccafc49614bb..9a93749d3e54 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -510,7 +510,7 @@ <string name="clear_all_notifications_text" msgid="348312370303046130">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"ਇਤਿਹਾਸ"</string> - <string name="notification_section_header_incoming" msgid="850925217908095197">"ਨਵਾਂ"</string> + <string name="notification_section_header_incoming" msgid="850925217908095197">"ਨਵੀਆਂ"</string> <string name="notification_section_header_gentle" msgid="6804099527336337197">"ਸ਼ਾਂਤ"</string> <string name="notification_section_header_alerting" msgid="5581175033680477651">"ਸੂਚਨਾਵਾਂ"</string> <string name="notification_section_header_conversations" msgid="821834744538345661">"ਗੱਲਾਂਬਾਤਾਂ"</string> @@ -1014,7 +1014,7 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"ਸਟੈਂਡਬਾਈ"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"ਗੱਲਬਾਤ ਨੂੰ ਤਰਜੀਹੀ ਗੱਲਬਾਤ ਵਜੋਂ ਸੈੱਟ ਕੀਤਾ ਗਿਆ"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਇਹ ਹੋਣਗੀਆਂ:"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਨਾਲ ਇਹ ਵਿਹਾਰ ਹੋਵੇਗਾ:"</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"ਗੱਲਬਾਤ ਸੈਕਸ਼ਨ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਦਿਖਾਓ"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"ਐਪਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਫਲੋਟਿੰਗ ਬਬਲ ਵਜੋਂ ਦਿਸਦੀਆਂ ਹਨ"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"ਕੰਟਰੋਲਾਂ ਨੂੰ ਮੁੜ-ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ ਫੜ੍ਹ ਕੇ ਘਸੀਟੋ"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"ਸਾਰੇ ਕੰਟਰੋਲ ਹਟਾਏ ਗਏ"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ਤਬਦੀਲੀਆਂ ਨੂੰ ਰੱਖਿਅਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"ਸਾਰੇ ਕੰਟਰੋਲਾਂ ਦੀ ਸੂਚੀ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"ਕੰਟਰੋਲਾਂ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਇਹ ਪੱਕਾ ਕਰਨ ਲਈ <xliff:g id="APP">%s</xliff:g> ਐਪ ਦੀ ਜਾਂਚ ਕਰੋ ਕਿ ਐਪ ਸੈਟਿੰਗਾਂ ਨਹੀਂ ਬਦਲੀਆਂ ਹਨ।"</string> + <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> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index cf63b1122da7..45dbcba43eec 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -1057,7 +1057,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Przytrzymaj i przeciągnij, aby przestawić elementy sterujące"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Usunięto wszystkie elementy sterujące"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Zmiany nie zostały zapisane"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Nie udało się wczytać listy elementów sterujących."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Nie udało się wczytać elementów sterujących. Sprawdź aplikację <xliff:g id="APP">%s</xliff:g>, aby upewnić się, że jej ustawienia się nie zmieniły."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Zgodne elementy sterujące niedostępne"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Inne"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Dodaj do sterowania urządzeniami"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Dodaj"</string> @@ -1079,7 +1080,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Błąd, próbuję jeszcze raz…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Nie znaleziono"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Element jest niedostępny"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Nie udało się połączyć z urządzeniem: <xliff:g id="DEVICE">%1$s</xliff:g>. Sprawdź aplikację <xliff:g id="APPLICATION">%2$s</xliff:g>, aby upewnić się, że element sterujący jest wciąż dostępny i ustawienia aplikacji się nie zmieniły."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Nie udało się połączyć z urządzeniem <xliff:g id="DEVICE">%1$s</xliff:g>. Sprawdź aplikację <xliff:g id="APPLICATION">%2$s</xliff:g>, aby upewnić się, że element sterujący jest wciąż dostępny i ustawienia aplikacji się nie zmieniły."</string> <string name="controls_open_app" msgid="483650971094300141">"Otwórz aplikację"</string> <string name="controls_error_generic" msgid="352500456918362905">"Nie udało się wczytać stanu"</string> <string name="controls_error_failed" msgid="960228639198558525">"Błąd, spróbuj ponownie"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 9b3976eaffb8..cd436ddd3cf4 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Em espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"A conversa foi definida como prioritária"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"As conversas prioritárias:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecer na parte superior da seção de conversa"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrar foto do perfil na tela de bloqueio"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecem na parte superior da seção de conversa"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostram a foto do perfil na tela de bloqueio"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Aparecer como balões flutuantes sobre outros apps"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromper o \"Não perturbe\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ok"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Toque no controle, mantenha-o pressionado e arraste para reorganizar as posições."</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controles foram removidos"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"As mudanças não foram salvas"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Não foi possível carregar a lista de controles."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Adicionar aos controles do dispositivo"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Adicionar"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 55b5af121f37..8339d6a88012 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -104,7 +104,7 @@ <string name="screenrecord_taps_label" msgid="1595690528298857649">"Mostrar toques no ecrã"</string> <string name="screenrecord_stop_text" msgid="6549288689506057686">"Toque para parar"</string> <string name="screenrecord_stop_label" msgid="72699670052087989">"Parar"</string> - <string name="screenrecord_pause_label" msgid="6004054907104549857">"Colocar em pausa"</string> + <string name="screenrecord_pause_label" msgid="6004054907104549857">"Pausar"</string> <string name="screenrecord_resume_label" msgid="4972223043729555575">"Retomar"</string> <string name="screenrecord_cancel_label" msgid="7850926573274483294">"Cancelar"</string> <string name="screenrecord_share_label" msgid="5025590804030086930">"Partilhar"</string> @@ -917,7 +917,7 @@ <string name="pip_notification_title" msgid="8661573026059630525">"A app <xliff:g id="NAME">%s</xliff:g> está no modo de ecrã no ecrã"</string> <string name="pip_notification_message" msgid="4991831338795022227">"Se não pretende que a app <xliff:g id="NAME">%s</xliff:g> utilize esta funcionalidade, toque para abrir as definições e desative-a."</string> <string name="pip_play" msgid="333995977693142810">"Reproduzir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Colocar em pausa"</string> + <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> <string name="pip_skip_to_next" msgid="3864212650579956062">"Mudar para o seguinte"</string> <string name="pip_skip_to_prev" msgid="3742589641443049237">"Mudar para o anterior"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telem. deslig. devido ao calor"</string> @@ -1014,9 +1014,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Aceda às Definições para atualizar a navegação no sistema."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Modo de espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Conversa definida como prioritária"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"As conversas com prioridade irão:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecem na parte superior da secção de conversas."</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostram a imagem do perfil no ecrã de bloqueio."</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"As conversas prioritárias irão:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecer na parte superior da secção de conversas."</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrar a imagem do perfil no ecrã de bloqueio."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Aparecem como balões flutuantes por cima de apps."</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interrompem o modo Não incomodar."</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Toque sem soltar e arraste para reorganizar os controlos."</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controlos foram removidos."</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Alterações não guardadas."</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Não foi possível carregar a lista dos controlos."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Adicione aos controlos de dispositivos"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Adicionar"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 9b3976eaffb8..cd436ddd3cf4 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Em espera"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"A conversa foi definida como prioritária"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"As conversas prioritárias:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecer na parte superior da seção de conversa"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostrar foto do perfil na tela de bloqueio"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Aparecem na parte superior da seção de conversa"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Mostram a foto do perfil na tela de bloqueio"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Aparecer como balões flutuantes sobre outros apps"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Interromper o \"Não perturbe\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Ok"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Toque no controle, mantenha-o pressionado e arraste para reorganizar as posições."</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Todos os controles foram removidos"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"As mudanças não foram salvas"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Não foi possível carregar a lista de controles."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Outro"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Adicionar aos controles do dispositivo"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Adicionar"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 0f0f598cebf4..2b154df82644 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -1051,7 +1051,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Țineți apăsat și trageți pentru a rearanja comenzile"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Au fost șterse toate comenzile"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Modificările nu au fost salvate"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Lista cu toate comenzile nu a putut fi încărcată."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Comenzile nu au putut fi încărcate. Accesați aplicația <xliff:g id="APP">%s</xliff:g> pentru a vă asigura că setările aplicației nu s-au schimbat."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Nu sunt disponibile comenzi compatibile"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Altul"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Adăugați la comenzile dispozitivelor"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Adăugați"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index d2bda6e4e259..2ad69d68ebe9 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -419,7 +419,7 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="1791389609409211628">"Ограничение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="7957253810481086455">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="2754212289804324685">"Рабочий профиль"</string> - <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Ночной режим"</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_until_sunrise" msgid="4063448287758262485">"До рассвета"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="3584738542293528235">"Включить в <xliff:g id="TIME">%s</xliff:g>"</string> @@ -1012,21 +1012,21 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Перенести в правый верхний угол"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Перенести в левый нижний угол"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Перенести в правый нижний угол"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Закрыть всплывающий чат"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Не показывать всплывающие чаты для разговоров"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Скрыть всплывающий чат"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Не показывать всплывающий чат для разговора"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Всплывающие чаты"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Новые разговоры будут появляться в виде плавающих значков, или всплывающих чатов. Чтобы открыть чат, нажмите на него, а чтобы переместить – перетащите."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Настройки всплывающих чатов"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Чтобы отключить всплывающие чаты от приложения, нажмите \"Настроить\"."</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Всплывающие чаты"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Чтобы отключить всплывающие чаты из этого приложения, нажмите \"Настроить\"."</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"ОК"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>: настройки"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Параметры навигации в системе обновлены. Чтобы изменить их, перейдите в настройки."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Чтобы обновить параметры навигации в системе, перейдите в настройки."</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Переход в режим ожидания"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Разговор помечен как важный"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Важные разговоры:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Показывать в верхней части списка разговоров"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Показывать фото профиля на заблокированном экране"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Преимущества:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Важные разговоры показываются в верхней части списка разговоров."</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Фото профиля показывается на заблокированном экране."</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Показывать как всплывающий чат над приложениями"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Показывать в режиме \"Не беспокоить\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"ОК"</string> @@ -1034,8 +1034,8 @@ <string name="magnification_overlay_title" msgid="6584179429612427958">"Наложение окна увеличения"</string> <string name="magnification_window_title" msgid="4863914360847258333">"Окно увеличения"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Настройки окна увеличения"</string> - <string name="quick_controls_title" msgid="6839108006171302273">"Виджеты управления устройствами"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Добавьте элементы управления для подключенных устройств"</string> + <string name="quick_controls_title" msgid="6839108006171302273">"Управление устройствами"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Добавьте виджеты для управления устройствами."</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"Настройте виджеты управления устройствами"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Чтобы перейти к элементам управления, удерживайте кнопку питания."</string> <string name="controls_providers_title" msgid="6879775889857085056">"Чтобы добавить элементы управления, выберите приложение"</string> @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Чтобы изменить порядок элементов управления, перетащите их"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Все элементы управления удалены"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Изменения не сохранены."</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Не удалось загрузить список элементов управления."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> @@ -1079,7 +1082,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Ошибка. Повторная попытка…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Не найдено."</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Управление недоступно"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Нет доступа к устройству (<xliff:g id="DEVICE">%1$s</xliff:g>). Проверьте, доступно ли управление в приложении \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" и не изменились ли настройки этого приложения."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Нет доступа к устройству \"<xliff:g id="DEVICE">%1$s</xliff:g>\". Проверьте, доступно ли управление в приложении \"<xliff:g id="APPLICATION">%2$s</xliff:g>\" и не изменились ли настройки этого приложения."</string> <string name="controls_open_app" msgid="483650971094300141">"Открыть приложение"</string> <string name="controls_error_generic" msgid="352500456918362905">"Не удалось загрузить статус."</string> <string name="controls_error_failed" msgid="960228639198558525">"Ошибка. Повторите попытку."</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index b9b95ac45f81..295e27e1b6f1 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"පාලන නැවත පිළියෙළ කිරීමට අල්ලාගෙන සිට අදින්න"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"සියලු පාලන ඉවත් කර ඇත"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"වෙනස් කිරීම් නොසුරැකිණි"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"සියලු පාලනවල ලැයිස්තුව පූරණය කළ නොහැකි විය."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"පාලන පූරණය කළ නොහැකි විය. යෙදුම් සැකසීම් වෙනස් වී නැති බව සහතික කර ගැනීමට <xliff:g id="APP">%s</xliff:g> යෙදුම පරීක්ෂා කරන්න."</string> + <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> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index c776f2e7a3f0..484c6694af9b 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -1016,17 +1016,17 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Nezobrazovať konverzáciu ako bublinu"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Čet pomocou bublín"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Nové konverzácie sa zobrazujú ako plávajúce ikony či bubliny. Bublinu otvoríte klepnutím. Premiestnite ju presunutím."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Ovládajte bubliny kedykoľvek"</string> - <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Klepnutím na Spravovať vypnite bubliny z tejto aplikácie"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Nastavenie bublín môžete kedykoľvek zmeniť"</string> + <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bubliny pre túto aplikáciu môžete vypnúť klepnutím na Spravovať"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Dobre"</string> - <string name="bubbles_app_settings" msgid="5779443644062348657">"Nastavenia upozornenia <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> + <string name="bubbles_app_settings" msgid="5779443644062348657">"Nastavenia aplikácie <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Navigácia v systéme bola aktualizovaná. Ak chcete vykonať zmeny, prejdite do Nastavení."</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Prejdite do Nastavení a aktualizujte navigáciu v systéme"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Pohotovostný režim"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konverzácia je nastavená ako prioritná"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Správanie prioritných konverzácií:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Zobrazovať hore v sekcii konverzácií"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Zobrazovať profilovú fotku na uzamknutej obrazovke"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prioritné konverzácie:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"sa zobrazujú navrchu sekcie konverzácií"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"zobrazujú profilovú fotku na uzamknutej obrazovke"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Zobrazovať ako plávajúce bubliny nad aplikáciami"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Prerušovať režim bez vyrušení"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Dobre"</string> @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Polohu každého ovládača môžete zmeniť jeho pridržaním a presunutím"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Všetky ovládače boli odstránené"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Zmeny neboli uložené"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Zoznam všetkých ovl. prvkov sa nepodarilo načítať."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Iné"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Pridanie do ovládania zariadení"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Pridať"</string> @@ -1078,8 +1081,8 @@ <string name="controls_error_timeout" msgid="794197289772728958">"Neaktívne, preverte aplikáciu"</string> <string name="controls_error_retryable" msgid="864025882878378470">"Chyba, skúša sa znova…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Nenájdené"</string> - <string name="controls_error_removed_title" msgid="1207794911208047818">"Ovládanie nie je k dispozícii"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"Nepodarilo sa získať prístup k zariadeniu <xliff:g id="DEVICE">%1$s</xliff:g>. V aplikácii <xliff:g id="APPLICATION">%2$s</xliff:g> skontrolujte, či je ovládanie stále k dispozícii a či sa nezmenili nastavenia."</string> + <string name="controls_error_removed_title" msgid="1207794911208047818">"Ovládač nie je k dispozícii"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"Nepodarilo sa získať prístup k zariadeniu <xliff:g id="DEVICE">%1$s</xliff:g>. V aplikácii <xliff:g id="APPLICATION">%2$s</xliff:g> skontrolujte, či je ovládač stále k dispozícii a či sa nezmenili nastavenia."</string> <string name="controls_open_app" msgid="483650971094300141">"Otvoriť aplikáciu"</string> <string name="controls_error_generic" msgid="352500456918362905">"Stav sa nepodarilo načítať"</string> <string name="controls_error_failed" msgid="960228639198558525">"Chyba, skúste to znova"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 326ae97cdec3..67f08dbc5fca 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -1016,7 +1016,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Pogovora ne prikaži v oblačku"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Klepet z oblački"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Novi pogovori so prikazani kot lebdeče ikone ali oblački. Če želite odpreti oblaček, se ga dotaknite. Če ga želite premakniti, ga povlecite."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Upravljanje oblačkov kadar koli"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Upravljanje oblačkov"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Dotaknite se »Upravljanje«, da izklopite oblačke iz te aplikacije"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"Razumem"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Nastavitve za <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1025,8 +1025,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Stanje pripravljenosti"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Pogovor je nastavljen kot prednosten"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Prednostni pogovori bodo:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazano na vrhu razdelka s pogovorom"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikaz profilne slike na zaklenjenem zaslonu"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Prikazani na vrhu razdelka s pogovorom"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Prikazali profilno sliko na zaklenjenem zaslonu"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Prikazano kot lebdeč oblaček čez druge aplikacije"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Preglasi način »ne moti«"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"V redu"</string> @@ -1057,7 +1057,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Držite in povlecite, da prerazporedite kontrolnike"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Vsi kontrolniki so bili odstranjeni"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Spremembe niso shranjene"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Seznama vseh kontrolnikov ni bilo mogoče naložiti."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Kontrolnikov ni bilo mogoče naložiti. Odprite aplikacijo <xliff:g id="APP">%s</xliff:g> in se prepričajte, da se njene nastavitve niso spremenile."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Združljivi kontrolniki niso na voljo"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Drugo"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Dodajanje med kontrolnike naprave"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Dodaj"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index d0d16c367b2c..bf1085887d70 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Në gatishmëri"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Biseda u caktua me përparësi"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Bisedat me përparësi do të:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Shfaq në krye të seksionit të bisedës"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Shfaq figurën e profilit në ekranin e kyçjes"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Shfaqen në krye të seksionit të bisedës"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Shfaqin fotografinë e profilit në ekranin e kyçjes"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Shfaq si flluskë pluskuese mbi aplikacione"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ndërprit \"Mos shqetëso\""</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"E kuptova"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Mbaje të shtypur dhe zvarrit për të risistemuar kontrollet"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Të gjitha kontrollet u hoqën"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ndryshimet nuk u ruajtën"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Lista e të gjitha kontrolleve nuk mund të ngarkohej."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Tjetër"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Shto te kontrollet e pajisjes"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Shto"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index f692e1cc20d9..ff2da873a8c4 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -1007,7 +1007,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Премести горе десно"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Премести доле лево"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Премести доле десно"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Одбацивање облачића"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Одбаци облачић"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Не користи облачиће за конверзацију"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Ћаскајте у облачићима"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Нове конверзације се приказују као плутајуће иконе или облачићи. Додирните да бисте отворили облачић. Превуците да бисте га преместили."</string> @@ -1019,9 +1019,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Идите у Подешавања да бисте ажурирали навигацију система"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Стање приправности"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Конверзација је подешена на приоритетну"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Приоритетне конверзације ће:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Приказује се у врху одељка за конверзације"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Приказује слику профила на закључаном екрану"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Приоритетне конверзације:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"се приказују у врху одељка за конверзације"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"приказују слику профила на закључаном екрану"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Приказују се плутајући облачићи преко апликација"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Омета подешавање Не узнемиравај"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Важи"</string> @@ -1051,7 +1051,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Задржите и превуците да бисте променили распоред контрола"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Све контроле су уклоњене"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Промене нису сачуване"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Учитавање листе свих контрола није успело."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Учитавање контрола није успело. Погледајте апликацију <xliff:g id="APP">%s</xliff:g> да бисте се уверили да се подешавања апликације нису променила."</string> + <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> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index f7d19ac3472d..25316d15a261 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Viloläge"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Konversationen har angetts som prioriterad"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Följande gäller för prioriterade konversationer:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Visa högst upp bland konversationerna"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Visa profilbild på låsskärmen"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"De visas högst upp bland konversationerna"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Profilbilden visas på låsskärmen"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Visa som en flytande bubbla ovanpå appar"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Avbryt Stör ej"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Ändra ordning på kontrollerna genom att trycka och dra"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Alla kontroller har tagits bort"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Ändringarna har inte sparats"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Listan med alla kontroller kunde inte läsas in."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Det gick inte att läsa in enhetsstyrning. Kontrollera att inställningarna inte har ändrats i <xliff:g id="APP">%s</xliff:g>-appen."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Ingen kompatibel enhetsstyrning tillgänglig"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Övrigt"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Lägg till i enhetsstyrning"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Lägg till"</string> @@ -1069,7 +1070,7 @@ <string name="controls_error_removed_title" msgid="1207794911208047818">"Styrning är inte tillgänglig"</string> <string name="controls_error_removed_message" msgid="2885911717034750542">"Det gick inte att komma åt <xliff:g id="DEVICE">%1$s</xliff:g>. Kontrollera att enheten fortfarande är tillgänglig för styrning och att appinställningarna inte har ändrats i <xliff:g id="APPLICATION">%2$s</xliff:g>-appen."</string> <string name="controls_open_app" msgid="483650971094300141">"Öppna appen"</string> - <string name="controls_error_generic" msgid="352500456918362905">"Ingen status lästes in"</string> + <string name="controls_error_generic" msgid="352500456918362905">"Status otillgänglig"</string> <string name="controls_error_failed" msgid="960228639198558525">"Fel, försök igen"</string> <string name="controls_in_progress" msgid="4421080500238215939">"Pågår"</string> <string name="controls_added_tooltip" msgid="4842812921719153085">"De nya snabbkontrollerna visas om du håller strömbrytaren nedtryckt"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 1a0b9ec653ae..f8bd10c3ab2b 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Hali tuli"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Mazungumzo yamepewa kipaumbele"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Mazungumzo yaliyopewa kipaumbele:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Onyesha kwenye sehemu ya juu ya mazungumzo"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Onyesha picha ya wasifu kwenye skrini iliyofungwa"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Huonyeshwa kwenye sehemu ya juu ya mazungumzo"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Huonyesha picha ya wasifu kwenye skrini iliyofungwa"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Yataonekana kama kiputo kinachoelea juu ya programu"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Katiza kipengele cha Usinisumbue"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"Nimeelewa"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Shikilia na uburute ili upange vidhibiti upya"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Umeondoa vidhibiti vyote"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Mabadiliko hayajahifadhiwa"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Imeshindwa kupakia orodha ya vidhibiti vyote."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Imeshindwa kupakia vidhibiti. Angalia programu ya <xliff:g id="APP">%s</xliff:g> ili uhakikishe kuwa mipangilio ya programu haijabadilika."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Vidhibiti vinavyooana havipatikani"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Nyingine"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Weka kwenye vidhibiti vya vifaa"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Weka"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 29a186f481cc..bf30ca956bc4 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"கட்டுப்பாடுகளை மறுவரிசைப்படுத்த அவற்றைப் பிடித்து இழுக்கவும்"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"கட்டுப்பாடுகள் அனைத்தும் அகற்றப்பட்டன"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"மாற்றங்கள் சேமிக்கப்படவில்லை"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"எல்லா கட்டுப்பாடுகளின் பட்டியலை ஏற்ற முடியவில்லை."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"கட்டுப்பாடுகளை ஏற்ற முடியவில்லை. ஆப்ஸ் அமைப்புகள் மாறவில்லை என்பதை உறுதிப்படுத்த <xliff:g id="APP">%s</xliff:g> ஆப்ஸைப் பார்க்கவும்."</string> + <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> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 4b56e157b34f..de57d2724ab3 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"నియంత్రణల క్రమం మార్చడానికి దేనినైనా పట్టుకుని, లాగి వదిలేయండి"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"అన్ని నియంత్రణలు తీసివేయబడ్డాయి"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"మార్పులు సేవ్ చేయబడలేదు"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"అన్ని నియంత్రణలు గల జాబితాను లోడ్ చేయలేకపోయాము."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"కంట్రోల్లను లోడ్ చేయడం సాధ్యపడలేదు. యాప్ సెట్టింగ్లు మారలేదని నిర్ధారించడానికి <xliff:g id="APP">%s</xliff:g> యాప్ను చెక్ చేయండి."</string> + <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> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index ba16febe18c3..b5563608e13b 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"แตะตัวควบคุมค้างไว้แล้วลากเพื่อจัดเรียงใหม่"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"นำตัวควบคุมทั้งหมดออกแล้ว"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"ยังไม่ได้บันทึกการเปลี่ยนแปลง"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"โหลดรายการตัวควบคุมทั้งหมดไม่ได้"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"โหลดตัวควบคุมไม่ได้ ตรวจสอบแอป <xliff:g id="APP">%s</xliff:g> ให้แน่ใจว่าการตั้งค่าของแอปไม่เปลี่ยนแปลง"</string> + <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> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index e25e52bdf4ab..45f728841b36 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -1015,8 +1015,8 @@ <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Naka-standby"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"Ginawang priyoridad ang pag-uusap"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"Ang mga priyoridad na pag-uusap ay:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Ipakita sa itaas ng seksyon ng pag-uusap"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Ipakita ang larawan sa profile sa lock screen"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"Lalabas sa itaas ng seksyon ng pag-uusap"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"Magpapakita ng larawan sa profile sa lock screen"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"Ipakitang floating bubble sa ibabaw ng mga app"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"Ihinto ang Huwag Istorbohin"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"OK"</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"Window ng Pag-magnify"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Mga Kontrol sa Pag-magnify ng Window"</string> <string name="quick_controls_title" msgid="6839108006171302273">"Mga kontrol ng device"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"Magdagdag ng mga kontrol para sa iyong mga nakakonektang device"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"Magdagdag ng kontrol para sa mga nakakonektang device"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"I-set up ang mga kontrol ng device"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"Pindutin nang matagal ang Power button para ma-access ang iyong mga kontrol"</string> <string name="controls_providers_title" msgid="6879775889857085056">"Pumili ng app para magdagdag ng mga kontrol"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"I-hold at i-drag para baguhin ang pagkakaayos ng mga kontrol"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Inalis ang lahat ng kontrol"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Hindi na-save ang mga pagbabago"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Hindi ma-load ang listahan ng lahat ng control."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Hindi ma-load ang mga kontrol. Tingnan ang app na <xliff:g id="APP">%s</xliff:g> para matiyak na hindi nabago ang mga setting ng app."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Hindi available ang mga compatible na kontrol"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Iba pa"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Idagdag sa mga kontrol ng device"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Idagdag"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 6c6b5bf47b3b..88869cd408f9 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Kontrolleri yeniden düzenlemek için basılı tutup sürükleyin"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Tüm kontroller kaldırıldı"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Değişiklikler kaydedilmedi"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Tüm kontrollerin listesi yüklenemedi."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Diğer"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Cihaz denetimlerine ekle"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Ekle"</string> @@ -1067,7 +1070,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"Hata, yeniden deneniyor…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"Bulunamadı"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"Kontrol kullanılamıyor"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> cihazına erişilemedi Kontrolün hâlâ kullanılabilir olduğundan ve uygulama ayarlarının değişmediğinden emin olmak için <xliff:g id="APPLICATION">%2$s</xliff:g> uygulamasını kontrol edin."</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> cihazına erişilemedi. Kontrolün kullanılabilir olduğundan ve uygulama ayarlarının değişmediğinden emin olmak için <xliff:g id="APPLICATION">%2$s</xliff:g> uygulamasını kontrol edin."</string> <string name="controls_open_app" msgid="483650971094300141">"Uygulama aç"</string> <string name="controls_error_generic" msgid="352500456918362905">"Durum yüklenemiyor"</string> <string name="controls_error_failed" msgid="960228639198558525">"Hata, yeniden deneyin"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index e192c120922f..a401e553a0da 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -1016,7 +1016,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Не показувати спливаючі чати для розмов"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Спливаючий чат"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Нові повідомлення чату з\'являються у вигляді спливаючих значків. Щоб відкрити чат, натисніть його, а щоб перемістити – перетягніть."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Налаштовуйте спливаючі чати будь-коли"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Контроль спливаючих чатів"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Натисніть \"Налаштувати\", щоб вимкнути спливаючі чати від цього додатка"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Налаштування параметра \"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>\""</string> @@ -1057,7 +1057,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Щоб змінити порядок елементів керування, перетягуйте їх"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Усі елементи керування вилучено"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Зміни не збережено"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Не вдалося завантажити список усіх елементів керування."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index d382f4237c47..d72bd92015a3 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -1003,7 +1003,7 @@ <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"نیچے بائیں جانب لے جائیں"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"نیچے دائیں جانب لے جائیں"</string> <string name="bubble_dismiss_text" msgid="1314082410868930066">"بلبلہ برخاست کریں"</string> - <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"بلبلہ گفتگو نہ کریں"</string> + <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"گفتگو بلبلہ نہ کریں"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"بلبلے کے ذریعے چیٹ کریں"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"نئی گفتگوئیں فلوٹنگ آئیکن یا بلبلے کے طور پر ظاہر ہوں گی۔ بلبلہ کھولنے کے لیے تھپتھپائیں۔ اسے منتقل کرنے کے لیے گھسیٹیں۔"</string> <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"کسی بھی وقت بلبلے کو کنٹرول کریں"</string> @@ -1014,9 +1014,9 @@ <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"سسٹم نیویگیشن اپ ڈیٹ کرنے کے لیے ترتیبات پر جائیں"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"اسٹینڈ بائی"</string> <string name="priority_onboarding_title" msgid="2893070698479227616">"گفتگو کو ترجیح پر سیٹ کیا گیا"</string> - <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ترجیحی گفتگوئیں یہ ہوگی:"</string> - <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"گفتگو کے سیکشن میں سب سے اوپر دکھائیں"</string> - <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"مقفل سکرین پر پروفائل کی تصویر دکھائیں"</string> + <string name="priority_onboarding_behavior" msgid="5342816047020432929">"ترجیحی گفتگوئیں:"</string> + <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"گفتگو سیکشن میں سب سے اوپر نظر آئیں گی"</string> + <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"مقفل سکرین پر پروفائل کی تصویر دکھائیں گی"</string> <string name="priority_onboarding_appear_as_bubble_text" msgid="4227039772250263122">"ایپس کے سب سے اوپر فلوٹنگ بلبلہ کے طور پر ظاہر ہوں"</string> <string name="priority_onboarding_ignores_dnd_text" msgid="2918952762719600529">"ڈسٹرب نہ کریں میں مداخلت کریں"</string> <string name="priority_onboarding_done_button_title" msgid="4569550984286506007">"سمجھ آ گئی"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"کنٹرولز کو دوبارہ ترتیب دینے کے ليے پکڑیں اور گھسیٹیں"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"سبھی کنٹرولز ہٹا دیے گئے"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"تبدیلیاں محفوظ نہیں ہوئیں"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"تمام کنٹرولز کی فہرست لوڈ نہیں کی جا سکی۔"</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> @@ -1067,7 +1070,7 @@ <string name="controls_error_retryable" msgid="864025882878378470">"خرابی، دوبارہ کوشش کی جا رہی ہے…"</string> <string name="controls_error_removed" msgid="6675638069846014366">"نہیں ملا"</string> <string name="controls_error_removed_title" msgid="1207794911208047818">"کنٹرول دستیاب نہیں ہے"</string> - <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> تک رسائی حاصل نہیں ہو سکی۔ اس بات کو یقینی بنانے کے لیے کہ کنٹرول ابھی بھی دستیاب ہے اور ایپ کی ترتیبات تبدیل نہیں ہوئی، تو <xliff:g id="APPLICATION">%2$s</xliff:g> ایپ چیک کریں۔"</string> + <string name="controls_error_removed_message" msgid="2885911717034750542">"<xliff:g id="DEVICE">%1$s</xliff:g> تک رسائی حاصل نہیں ہو سکی۔ اس بات کو یقینی بنانے کے لیے کہ کنٹرول ابھی بھی دستیاب ہے اور ایپ کی ترتیبات تبدیل نہیں ہوئی، تو <xliff:g id="APPLICATION">%2$s</xliff:g> ایپ چیک کریں۔"</string> <string name="controls_open_app" msgid="483650971094300141">"ایپ کھولیں"</string> <string name="controls_error_generic" msgid="352500456918362905">"صورتحال لوڈ نہیں ہو سکتی"</string> <string name="controls_error_failed" msgid="960228639198558525">"خرابی، دوبارہ کوشش کریں"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 3099270c0d80..4ada3a52302d 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -1002,11 +1002,11 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"Yuqori oʻngga surish"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"Quyi chapga surish"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"Quyi oʻngga surish"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"Pufakni yopish"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"Bulutchani yopish"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Suhbatlar bulutchalar shaklida chiqmasin"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Bulutchalar yordamida subhatlashish"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Yangi xabarlar qalqib chiquvchi belgilar yoki bulutchalar kabi chiqadi. Xabarni ochish uchun bildirishnoma ustiga bosing. Xabarni qayta joylash uchun bildirishnomani suring."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Bulutcha shaklidagi bildirishnomalarni sozlash"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Bulutchalardagi bildirishnomalar"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Bu ilova bulutchalarini faolsizlantirish uchun Boshqarish tugmasini bosing"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g> sozlamalari"</string> @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Boshqaruv elementlarini qayta tartiblash uchun ushlab torting"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Barcha boshqaruv elementlari olib tashlandi"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Oʻzgarishlar saqlanmadi"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Boshqaruv elementlarining barchasi yuklanmadi."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Boshqa"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Qurilma boshqaruv elementlariga kiritish"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Kiritish"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index cc6a8fd25826..4a592840ac6f 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -686,7 +686,7 @@ <string name="do_not_silence_block" msgid="4361847809775811849">"Không im lặng hoặc chặn"</string> <string name="tuner_full_importance_settings" msgid="1388025816553459059">"Điều khiển thông báo nguồn"</string> <string name="tuner_full_importance_settings_on" msgid="917981436602311547">"Bật"</string> - <string name="tuner_full_importance_settings_off" msgid="5580102038749680829">"Tắt"</string> + <string name="tuner_full_importance_settings_off" msgid="5580102038749680829">"Đang tắt"</string> <string name="power_notification_controls_description" msgid="1334963837572708952">"Với các kiểm soát thông báo nguồn, bạn có thể đặt cấp độ quan trọng từ 0 đến 5 cho các thông báo của ứng dụng. \n\n"<b>"Cấp 5"</b>" \n- Hiển thị ở đầu danh sách thông báo \n- Cho phép gián đoạn ở chế độ toàn màn hình \n- Luôn xem nhanh \n\n"<b>"Cấp 4"</b>" \n- Ngăn gián đoạn ở chế độ toàn màn hình \n- Luôn xem nhanh \n\n"<b>"Cấp 3"</b>" \n- Ngăn gián đoạn ở chế độ toàn màn hình \n- Không bao giờ xem nhanh \n\n"<b>"Cấp 2"</b>" \n- Ngăn gián đoạn ở chế độ toàn màn hình \n- Không bao giờ xem nhanh \n- Không bao giờ có âm báo và rung \n\n"<b>"Cấp 1"</b>" \n- Ngăn gián đoạn ở chế độ toàn màn hình \n- Không bao giờ xem nhanh \n- Không bao giờ có âm báo và rung \n- Ẩn khỏi màn hình khóa và thanh trạng thái \n- Hiển thị ở cuối danh sách thông báo \n\n"<b>"Cấp 0"</b>" \n- Chặn tất cả các thông báo từ ứng dụng"</string> <string name="notification_header_default_channel" msgid="225454696914642444">"Thông báo"</string> <string name="notification_channel_disabled" msgid="928065923928416337">"Bạn sẽ không thấy các thông báo này nữa"</string> @@ -1006,7 +1006,7 @@ <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"Dừng trò chuyện bằng bong bóng"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"Trò chuyện bằng bong bóng trò chuyện"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"Các cuộc trò chuyện mới sẽ xuất hiện dưới dạng biểu tượng nổi hoặc bong bóng trò chuyện. Nhấn để mở bong bóng trò chuyện. Kéo để di chuyển bong bóng trò chuyện."</string> - <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Kiểm soát tùy chọn cài đặt bong bóng trò chuyện bất mọi lúc"</string> + <string name="bubbles_user_education_manage_title" msgid="2848511858160342320">"Kiểm soát bong bóng bất cứ lúc nào"</string> <string name="bubbles_user_education_manage" msgid="1391639189507036423">"Nhấn vào nút Quản lý để tắt bong bóng trò chuyện từ ứng dụng này"</string> <string name="bubbles_user_education_got_it" msgid="8282812431953161143">"OK"</string> <string name="bubbles_app_settings" msgid="5779443644062348657">"Cài đặt <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Giữ và kéo để sắp xếp lại các tùy chọn điều khiển"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Đã xóa tất cả tùy chọn điều khiển"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Chưa lưu các thay đổi"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Không thể tải danh sách tất cả tùy chọn điều khiển."</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"Không tải được các chức năng điều khiển. Hãy kiểm tra ứng dụng <xliff:g id="APP">%s</xliff:g> để đảm bảo rằng thông tin cài đặt của ứng dụng chưa thay đổi."</string> + <string name="controls_favorite_load_none" msgid="7687593026725357775">"Không có các chức năng điều khiển tương thích"</string> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Khác"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Thêm vào mục điều khiển thiết bị"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Thêm"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 73fac041f446..2b500affd209 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"按住并拖动即可重新排列控件"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"已移除所有控件"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未保存更改"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"无法加载所有控件的列表。"</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <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> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 5f5c85fcc8ef..59867b7679ef 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -593,12 +593,12 @@ <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"停用"</string> <string name="accessibility_output_chooser" msgid="7807898688967194183">"切換輸出裝置"</string> <string name="screen_pinning_title" msgid="9058007390337841305">"已固定應用程式"</string> - <string name="screen_pinning_description" msgid="8699395373875667743">"畫面將會繼續顯示，直至您取消固定。按住 [返回] 和 [概覽] 即可取消固定。"</string> - <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"畫面將會繼續顯示，直至您取消固定為止。按住 [返回] 按鈕和主按鈕即可取消固定。"</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"畫面將會繼續顯示，直至您取消固定為止。向上滑動並按住即可取消固定。"</string> - <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"畫面將會繼續顯示，直至您取消固定。按住 [概覽] 即可取消固定。"</string> - <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"畫面將會繼續顯示，直至您取消固定為止。按住主按鈕即可取消固定。"</string> - <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"該應用程式可存取個人資料 (例如聯絡人和電郵內容)。"</string> + <string name="screen_pinning_description" msgid="8699395373875667743">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住「返回」和「概覽」按鈕即可取消固定。"</string> + <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住「返回」按鈕和主按鈕即可取消固定。"</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。向上滑動後按住即可取消固定。"</string> + <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住「概覽」按鈕即可取消固定。"</string> + <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"應用程式將會固定在螢幕上顯示，直至您取消固定為止。按住主按鈕即可取消固定。"</string> + <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"應用程式可能會存取個人資料 (例如通訊錄和電郵內容)。"</string> <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"固定的應用程式可開啟其他應用程式。"</string> <string name="screen_pinning_toast" msgid="8177286912533744328">"如要取消固定此應用程式，請按住「返回」按鈕和「概覽」按鈕"</string> <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"如要取消固定此應用程式，請按住「返回」按鈕和主按鈕"</string> @@ -1002,7 +1002,7 @@ <string name="bubble_accessibility_action_move_top_right" msgid="6916868852433483569">"移去右上角"</string> <string name="bubble_accessibility_action_move_bottom_left" msgid="6339015902495504715">"移去左下角"</string> <string name="bubble_accessibility_action_move_bottom_right" msgid="7471571700628346212">"移去右下角"</string> - <string name="bubble_dismiss_text" msgid="1314082410868930066">"關閉對話氣泡"</string> + <string name="bubble_dismiss_text" msgid="1314082410868930066">"關閉小視窗氣泡"</string> <string name="bubbles_dont_bubble_conversation" msgid="1033040343437428822">"不要透過小視窗顯示對話"</string> <string name="bubbles_user_education_title" msgid="5547017089271445797">"使用小視窗進行即時通訊"</string> <string name="bubbles_user_education_description" msgid="1160281719576715211">"新對話會以浮動圖示 (小視窗) 顯示。輕按即可開啟小視窗。拖曳即可移動小視窗。"</string> @@ -1025,7 +1025,7 @@ <string name="magnification_window_title" msgid="4863914360847258333">"放大視窗"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"放大視窗控制項"</string> <string name="quick_controls_title" msgid="6839108006171302273">"裝置控制"</string> - <string name="quick_controls_subtitle" msgid="1667408093326318053">"為已連接的裝置新增控制項"</string> + <string name="quick_controls_subtitle" msgid="1667408093326318053">"為連接的裝置新增控制選項"</string> <string name="quick_controls_setup_title" msgid="8901436655997849822">"設定裝置控制"</string> <string name="quick_controls_setup_subtitle" msgid="1681506617879773824">"按住「開關」按鈕便可存取控制項"</string> <string name="controls_providers_title" msgid="6879775889857085056">"選擇要新增控制項的應用程式"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"按住並拖曳便可重新排列控制項"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"已移除所有控制項"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未儲存變更"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"無法載入完整控制項清單。"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"無法載入控制項。請檢查 <xliff:g id="APP">%s</xliff:g> 應用程式，確定應用程式設定並無變更。"</string> + <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> @@ -1070,7 +1071,7 @@ <string name="controls_error_removed_message" msgid="2885911717034750542">"無法存取 <xliff:g id="DEVICE">%1$s</xliff:g>。請檢查 <xliff:g id="APPLICATION">%2$s</xliff:g> 應用程式，確定控制功能仍可使用，同時應用程式設定並無變更。"</string> <string name="controls_open_app" msgid="483650971094300141">"開啟應用程式"</string> <string name="controls_error_generic" msgid="352500456918362905">"無法載入狀態"</string> - <string name="controls_error_failed" msgid="960228639198558525">"發生錯誤，請再試一次"</string> + <string name="controls_error_failed" msgid="960228639198558525">"發生錯誤，請重試"</string> <string name="controls_in_progress" msgid="4421080500238215939">"進行中"</string> <string name="controls_added_tooltip" msgid="4842812921719153085">"按住「開關」按鈕以查看新控制項"</string> <string name="controls_menu_add" msgid="4447246119229920050">"新增控制項"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 9847871c2efc..01a8c5d2ec7b 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -1013,7 +1013,7 @@ <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"系統操作機制已更新。如要進行變更，請前往「設定」。"</string> <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"請前往「設定」更新系統操作機制"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"待機"</string> - <string name="priority_onboarding_title" msgid="2893070698479227616">"將對話設為優先"</string> + <string name="priority_onboarding_title" msgid="2893070698479227616">"對話已設為優先"</string> <string name="priority_onboarding_behavior" msgid="5342816047020432929">"優先對話會："</string> <string name="priority_onboarding_show_at_top_text" msgid="1678400241025513541">"顯示在對話部分的頂端"</string> <string name="priority_onboarding_show_avatar_text" msgid="5756291381124091508">"在螢幕鎖定畫面上顯示個人資料相片"</string> @@ -1045,7 +1045,8 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"按住並拖曳即可重新排列控制項"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"所有控制項都已移除"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"未儲存變更"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"無法載入完整的控制項清單。"</string> + <string name="controls_favorite_load_error" msgid="5126216176144877419">"無法載入控制項。請查看「<xliff:g id="APP">%s</xliff:g>」應用程式，確認應用程式設定沒有任何異動。"</string> + <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> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 9b76660e6cd3..4e68694fcb13 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -1045,7 +1045,10 @@ <string name="controls_favorite_rearrange" msgid="5616952398043063519">"Bamba futhi uhudule ukuze uphinde ulungise izilawuli"</string> <string name="controls_favorite_removed" msgid="5276978408529217272">"Zonke izilawuli zisusiwe"</string> <string name="controls_favorite_toast_no_changes" msgid="7094494210840877931">"Izinguquko azilondolozwanga"</string> - <string name="controls_favorite_load_error" msgid="2533215155804455348">"Uhlu lwazo zonke izilawuli alilayishekanga."</string> + <!-- no translation found for controls_favorite_load_error (5126216176144877419) --> + <skip /> + <!-- no translation found for controls_favorite_load_none (7687593026725357775) --> + <skip /> <string name="controls_favorite_other_zone_header" msgid="9089613266575525252">"Okunye"</string> <string name="controls_dialog_title" msgid="2343565267424406202">"Engeza kuzilawuli zezinsiza"</string> <string name="controls_dialog_ok" msgid="2770230012857881822">"Engeza"</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 9bcfdc43fbbf..c06b9161ad1f 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1058,6 +1058,10 @@ <!-- Shift quick access wallet down in Global Actions when Controls are unavailable --> <dimen name="global_actions_wallet_top_margin">40dp</dimen> + <!-- Shutdown and restart actions are larger in power options dialog --> + <dimen name="global_actions_power_dialog_item_height">190dp</dimen> + <dimen name="global_actions_power_dialog_item_width">255dp</dimen> + <!-- The maximum offset in either direction that elements are moved horizontally to prevent burn-in on AOD. --> <dimen name="burn_in_prevention_offset_x">8dp</dimen> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index d47ad7fcdfbd..8212d6159737 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -174,5 +174,8 @@ <item type="id" name="accessibility_action_controls_move_before" /> <item type="id" name="accessibility_action_controls_move_after" /> + + <!-- Accessibility actions for PIP --> + <item type="id" name="action_pip_resize" /> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 73568eab5eac..ebbf8f298944 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1091,11 +1091,11 @@ <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] --> <string name="keyguard_retry">Swipe up to try again</string> - <!-- Text on keyguard screen and in Quick Settings footer indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=60] --> - <string name="do_disclosure_generic">This device is managed by your organization</string> + <!-- Text on keyguard screen and in Quick Settings footer indicating that the user's device belongs to their organization. [CHAR LIMIT=60] --> + <string name="do_disclosure_generic">This device belongs to your organization</string> - <!-- Text on keyguard screen and in Quick Settings footer indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=40] --> - <string name="do_disclosure_with_name">This device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g></string> + <!-- Text on keyguard screen and in Quick Settings footer indicating that user's device belongs to their organization. [CHAR LIMIT=40] --> + <string name="do_disclosure_with_name">This device belongs to <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g></string> <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] --> <string name="phone_hint">Swipe from icon for phone</string> @@ -1288,29 +1288,29 @@ <!-- Footer vpn present text [CHAR LIMIT=50] --> <string name="branded_vpn_footer">Network may be monitored</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner that can monitor the network traffic [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_management_monitoring">Your organization manages this device and may monitor network traffic</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the organization can monitor network traffic on that device. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_management_monitoring">Your organization owns this device and may monitor network traffic</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner that can monitor the network traffic [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_named_management_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> manages this device and may monitor network traffic</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the organization can monitor network traffic on that device. The placeholder is the organization's name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_named_management_monitoring"><xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> owns this device and may monitor network traffic</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner and is connected to a VPN [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_management_named_vpn">Device is managed by your organization and connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the device is connected to a VPN. The placeholder is the VPN name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_management_named_vpn">This device belongs to your organization and is connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner and is connected to a VPN [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_named_management_named_vpn">Device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> and connected to <xliff:g id="vpn_app" example="Foo VPN App">%2$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the device is connected to a VPN. The first placeholder is the organization name, and the second placeholder is the VPN name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_named_management_named_vpn">This device belongs to <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> and is connected to <xliff:g id="vpn_app" example="Foo VPN App">%2$s</xliff:g></string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_management">Device is managed by your organization</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_management">This device belongs to your organization</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_named_management">Device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization. The placeholder is the organization's name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_named_management">This device belongs to <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g></string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner and is connected to two VPNs, one in the current user, one in the managed profile [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_management_vpns">Device is managed by your organization and connected to VPNs</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the device is connected to multiple VPNs. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_management_vpns">This device belongs to your organization and is connected to VPNs</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a device owner and is connected to two VPNs, one in the current user, one in the managed profile [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_named_management_vpns">Device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> and connected to VPNs</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the user's device belongs to their organization, and the device is connected to multiple VPNs. The placeholder is the organization's name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_named_management_vpns">This device belongs to <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g> and is connected to VPNs</string> <!-- Disclosure at the bottom of Quick Settings that indicates that the device has a managed profile which can be monitored by the profile owner [CHAR LIMIT=100] --> <string name="quick_settings_disclosure_managed_profile_monitoring">Your organization may monitor network traffic in your work profile</string> @@ -1321,17 +1321,17 @@ <!-- Disclosure at the bottom of Quick Settings that indicates that a certificate authorithy is installed on this device and the traffic might be monitored [CHAR LIMIT=100] --> <string name="quick_settings_disclosure_monitoring">Network may be monitored</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to two VPNs, one in the current user, one in the managed profile [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_vpns">Device connected to VPNs</string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to multiple VPNs. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_vpns">This device is connected to VPNs</string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN in the work profile [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_managed_profile_named_vpn">Work profile connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN in the work profile. The placeholder is the VPN name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_managed_profile_named_vpn">Your work profile is connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN in the personal profile (as opposed to the work profile) [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_personal_profile_named_vpn">Personal profile connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN in the personal profile (instead of the work profile). The placeholder is the VPN name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_personal_profile_named_vpn">Your personal profile is connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> - <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN [CHAR LIMIT=100] --> - <string name="quick_settings_disclosure_named_vpn">Device connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> + <!-- Disclosure at the bottom of Quick Settings that indicates that the device is connected to a VPN. The placeholder is the VPN name. [CHAR LIMIT=100] --> + <string name="quick_settings_disclosure_named_vpn">This device is connected to <xliff:g id="vpn_app" example="Foo VPN App">%1$s</xliff:g></string> <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] --> <string name="monitoring_title_device_owned">Device management</string> @@ -1361,11 +1361,11 @@ <!-- Monitoring dialog label for button opening a page with more information on the admin's abilities [CHAR LIMIT=30] --> <string name="monitoring_button_view_policies">View Policies</string> - <!-- Monitoring dialog: Description of the device owner by name. [CHAR LIMIT=NONE]--> - <string name="monitoring_description_named_management">Your device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin.</string> + <!-- Dialog that a user can access via Quick Settings. The dialog describes what the IT admin can monitor (and the changes they can make) on the user's device. [CHAR LIMIT=NONE]--> + <string name="monitoring_description_named_management">This device belongs to <xliff:g id="organization_name" example="Foo, Inc.">%1$s</xliff:g>.\n\nYour IT admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your IT admin.</string> - <!-- Monitoring dialog: Description of a device owner. [CHAR LIMIT=NONE]--> - <string name="monitoring_description_management">Your device is managed by your organization.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin.</string> + <!-- Dialog that a user can access via Quick Settings. The dialog describes what the IT admin can monitor (and the changes they can make) on the user's device. [CHAR LIMIT=NONE]--> + <string name="monitoring_description_management">This device belongs to your organization.\n\nYour IT admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your IT admin.</string> <!-- Monitoring dialog: Description of a CA Certificate. [CHAR LIMIT=NONE]--> <string name="monitoring_description_management_ca_certificate">Your organization installed a certificate authority on this device. Your secure network traffic may be monitored or modified.</string> @@ -2392,6 +2392,9 @@ <!-- Button to skip to the prev media on picture-in-picture (PIP) [CHAR LIMIT=30] --> <string name="pip_skip_to_prev">Skip to previous</string> + <!-- Accessibility action for resizing PIP [CHAR LIMIT=NONE] --> + <string name="accessibility_action_pip_resize">Resize</string> + <!-- Tuner string --> <string name="change_theme_reboot" translatable="false">Changing the theme requires a restart.</string> <!-- Tuner string --> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java index eca6ebf7f8e5..279a200949a5 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java @@ -18,12 +18,17 @@ package com.android.systemui.shared.recents.model; import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.content.res.Configuration.ORIENTATION_UNDEFINED; +import static android.graphics.Bitmap.Config.ARGB_8888; import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_UNDEFINED; import android.app.ActivityManager.TaskSnapshot; import android.graphics.Bitmap; +import android.graphics.Color; +import android.graphics.GraphicBuffer; import android.graphics.Rect; +import android.hardware.HardwareBuffer; +import android.util.Log; /** * Data for a single thumbnail. @@ -57,7 +62,15 @@ public class ThumbnailData { } public ThumbnailData(TaskSnapshot snapshot) { - thumbnail = Bitmap.wrapHardwareBuffer(snapshot.getSnapshot(), snapshot.getColorSpace()); + final GraphicBuffer buffer = snapshot.getSnapshot(); + if (buffer != null && (buffer.getUsage() & HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE) == 0) { + // TODO(b/157562905): Workaround for a crash when we get a snapshot without this state + Log.e("ThumbnailData", "Unexpected snapshot without USAGE_GPU_SAMPLED_IMAGE"); + thumbnail = Bitmap.createBitmap(buffer.getWidth(), buffer.getHeight(), ARGB_8888); + thumbnail.eraseColor(Color.BLACK); + } else { + thumbnail = Bitmap.wrapHardwareBuffer(buffer, snapshot.getColorSpace()); + } insets = new Rect(snapshot.getContentInsets()); orientation = snapshot.getOrientation(); rotation = snapshot.getRotation(); diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java index 82e665bdf5ac..2deeb1230f09 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java @@ -29,6 +29,8 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.util.Assert; +import java.util.Set; + import javax.inject.Inject; import javax.inject.Singleton; @@ -62,7 +64,7 @@ public class ForegroundServiceController { /** * @return true if this user has services missing notifications and therefore needs a - * disclosure notification. + * disclosure notification for running a foreground service. */ public boolean isDisclosureNeededForUser(int userId) { synchronized (mMutex) { @@ -74,26 +76,26 @@ public class ForegroundServiceController { /** * @return true if this user/pkg has a missing or custom layout notification and therefore needs - * a disclosure notification for system alert windows. + * a disclosure notification showing the user which appsOps the app is using. */ public boolean isSystemAlertWarningNeeded(int userId, String pkg) { synchronized (mMutex) { final ForegroundServicesUserState services = mUserServices.get(userId); if (services == null) return false; - return services.getStandardLayoutKey(pkg) == null; + return services.getStandardLayoutKeys(pkg) == null; } } /** - * Returns the key of the foreground service from this package using the standard template, - * if one exists. + * Returns the keys for notifications from this package using the standard template, + * if they exist. */ @Nullable - public String getStandardLayoutKey(int userId, String pkg) { + public ArraySet<String> getStandardLayoutKeys(int userId, String pkg) { synchronized (mMutex) { final ForegroundServicesUserState services = mUserServices.get(userId); if (services == null) return null; - return services.getStandardLayoutKey(pkg); + return services.getStandardLayoutKeys(pkg); } } @@ -140,25 +142,27 @@ public class ForegroundServiceController { } // TODO: (b/145659174) remove when moving to NewNotifPipeline. Replaced by - // ForegroundCoordinator - // Update appOp if there's an associated pending or visible notification: - final String foregroundKey = getStandardLayoutKey(userId, packageName); - if (foregroundKey != null) { - final NotificationEntry entry = mEntryManager.getPendingOrActiveNotif(foregroundKey); - if (entry != null - && uid == entry.getSbn().getUid() - && packageName.equals(entry.getSbn().getPackageName())) { - boolean changed; - synchronized (entry.mActiveAppOps) { - if (active) { - changed = entry.mActiveAppOps.add(appOpCode); - } else { - changed = entry.mActiveAppOps.remove(appOpCode); + // AppOpsCoordinator + // Update appOps if there are associated pending or visible notifications + final Set<String> notificationKeys = getStandardLayoutKeys(userId, packageName); + if (notificationKeys != null) { + boolean changed = false; + for (String key : notificationKeys) { + final NotificationEntry entry = mEntryManager.getPendingOrActiveNotif(key); + if (entry != null + && uid == entry.getSbn().getUid() + && packageName.equals(entry.getSbn().getPackageName())) { + synchronized (entry.mActiveAppOps) { + if (active) { + changed |= entry.mActiveAppOps.add(appOpCode); + } else { + changed |= entry.mActiveAppOps.remove(appOpCode); + } } } - if (changed) { - mEntryManager.updateNotifications("appOpChanged pkg=" + packageName); - } + } + if (changed) { + mEntryManager.updateNotifications("appOpChanged pkg=" + packageName); } } } diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java index 650b9a7f9c0c..bb445832da93 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java @@ -163,31 +163,31 @@ public class ForegroundServiceNotificationListener { userState.addImportantNotification(sbn.getPackageName(), sbn.getKey()); } - final Notification.Builder builder = - Notification.Builder.recoverBuilder( - mContext, sbn.getNotification()); - if (builder.usesStandardHeader()) { - userState.addStandardLayoutNotification( - sbn.getPackageName(), sbn.getKey()); - } + } + final Notification.Builder builder = + Notification.Builder.recoverBuilder( + mContext, sbn.getNotification()); + if (builder.usesStandardHeader()) { + userState.addStandardLayoutNotification( + sbn.getPackageName(), sbn.getKey()); } } - tagForeground(entry); + tagAppOps(entry); return true; }, true /* create if not found */); } // TODO: (b/145659174) remove when moving to NewNotifPipeline. Replaced by - // ForegroundCoordinator - private void tagForeground(NotificationEntry entry) { + // AppOpsCoordinator + private void tagAppOps(NotificationEntry entry) { final StatusBarNotification sbn = entry.getSbn(); ArraySet<Integer> activeOps = mForegroundServiceController.getAppOps( sbn.getUserId(), sbn.getPackageName()); - if (activeOps != null) { - synchronized (entry.mActiveAppOps) { - entry.mActiveAppOps.clear(); + synchronized (entry.mActiveAppOps) { + entry.mActiveAppOps.clear(); + if (activeOps != null) { entry.mActiveAppOps.addAll(activeOps); } } diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java b/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java index 2ef46dca317a..5c2950f1365d 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServicesUserState.java @@ -30,9 +30,11 @@ public class ForegroundServicesUserState { private String[] mRunning = null; private long mServiceStartTime = 0; - // package -> sufficiently important posted notification keys + + // package -> sufficiently important posted notification keys that signal an app is + // running a foreground service private ArrayMap<String, ArraySet<String>> mImportantNotifications = new ArrayMap<>(1); - // package -> standard layout posted notification keys + // package -> standard layout posted notification keys that can display appOps private ArrayMap<String, ArraySet<String>> mStandardLayoutNotifications = new ArrayMap<>(1); // package -> app ops @@ -110,6 +112,11 @@ public class ForegroundServicesUserState { return found; } + /** + * System disclosures for foreground services are required if an app has a foreground service + * running AND the app hasn't posted its own notification signalling it is running a + * foreground service + */ public boolean isDisclosureNeeded() { if (mRunning != null && System.currentTimeMillis() - mServiceStartTime @@ -129,12 +136,15 @@ public class ForegroundServicesUserState { return mAppOps.get(pkg); } - public String getStandardLayoutKey(String pkg) { + /** + * Gets the notifications with standard layouts associated with this package + */ + public ArraySet<String> getStandardLayoutKeys(String pkg) { final ArraySet<String> set = mStandardLayoutNotifications.get(pkg); if (set == null || set.size() == 0) { return null; } - return set.valueAt(0); + return set; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/ActionReceiver.kt b/packages/SystemUI/src/com/android/systemui/broadcast/ActionReceiver.kt new file mode 100644 index 000000000000..434b03d404dc --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/broadcast/ActionReceiver.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2020 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.broadcast + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.util.ArraySet +import com.android.systemui.Dumpable +import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger +import com.android.systemui.util.indentIfPossible +import java.io.FileDescriptor +import java.io.PrintWriter +import java.util.concurrent.Executor +import java.util.concurrent.atomic.AtomicInteger + +/** + * Receiver for a given action-userId pair to be used by [UserBroadcastDispatcher]. + * + * Each object of this class will take care of a single Action. It will register if it has at least + * one [BroadcastReceiver] added to it, and unregister when none are left. + * + * It will also re-register if filters with new categories are added. But this should not happen + * often. + * + * This class has no sync controls, so make sure to only make modifications from the background + * thread. + */ +class ActionReceiver( + private val action: String, + private val userId: Int, + private val registerAction: BroadcastReceiver.(IntentFilter) -> Unit, + private val unregisterAction: BroadcastReceiver.() -> Unit, + private val bgExecutor: Executor, + private val logger: BroadcastDispatcherLogger +) : BroadcastReceiver(), Dumpable { + + companion object { + val index = AtomicInteger(0) + } + + var registered = false + private set + private val receiverDatas = ArraySet<ReceiverData>() + private val activeCategories = ArraySet<String>() + + @Throws(IllegalArgumentException::class) + fun addReceiverData(receiverData: ReceiverData) { + if (!receiverData.filter.hasAction(action)) { + throw(IllegalArgumentException("Trying to attach to $action without correct action," + + "receiver: ${receiverData.receiver}")) + } + val addedCategories = activeCategories + .addAll(receiverData.filter.categoriesIterator()?.asSequence() ?: emptySequence()) + + if (receiverDatas.add(receiverData) && receiverDatas.size == 1) { + registerAction(createFilter()) + registered = true + } else if (addedCategories) { + unregisterAction() + registerAction(createFilter()) + } + } + + fun hasReceiver(receiver: BroadcastReceiver): Boolean { + return receiverDatas.any { it.receiver == receiver } + } + + private fun createFilter(): IntentFilter { + val filter = IntentFilter(action) + activeCategories.forEach(filter::addCategory) + return filter + } + + fun removeReceiver(receiver: BroadcastReceiver) { + if (receiverDatas.removeAll { it.receiver == receiver } && + receiverDatas.isEmpty() && registered) { + unregisterAction() + registered = false + activeCategories.clear() + } + } + + @Throws(IllegalStateException::class) + override fun onReceive(context: Context, intent: Intent) { + if (intent.action != action) { + throw(IllegalStateException("Received intent for ${intent.action} " + + "in receiver for $action}")) + } + val id = index.getAndIncrement() + logger.logBroadcastReceived(id, userId, intent) + // Immediately return control to ActivityManager + bgExecutor.execute { + receiverDatas.forEach { + if (it.filter.matchCategories(intent.categories) == null) { + it.executor.execute { + it.receiver.pendingResult = pendingResult + it.receiver.onReceive(context, intent) + logger.logBroadcastDispatched(id, action, it.receiver) + } + } + } + } + } + + override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) { + pw.indentIfPossible { + println("Registered: $registered") + println("Receivers:") + pw.indentIfPossible { + receiverDatas.forEach { + println(it.receiver) + } + } + println("Categories: ${activeCategories.joinToString(", ")}") + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt index 67c0c620f136..b9b849b8488e 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/BroadcastDispatcher.kt @@ -29,6 +29,7 @@ import android.os.UserHandle import android.text.TextUtils import android.util.SparseArray import com.android.internal.annotations.VisibleForTesting +import com.android.internal.util.IndentingPrintWriter import com.android.systemui.Dumpable import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger import com.android.systemui.dump.DumpManager @@ -65,6 +66,7 @@ private const val DEBUG = true open class BroadcastDispatcher constructor ( private val context: Context, private val bgLooper: Looper, + private val bgExecutor: Executor, private val dumpManager: DumpManager, private val logger: BroadcastDispatcherLogger ) : Dumpable, BroadcastReceiver() { @@ -173,15 +175,18 @@ open class BroadcastDispatcher constructor ( @VisibleForTesting protected open fun createUBRForUser(userId: Int) = - UserBroadcastDispatcher(context, userId, bgLooper, logger) + UserBroadcastDispatcher(context, userId, bgLooper, bgExecutor, logger) override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) { pw.println("Broadcast dispatcher:") - pw.println(" Current user: ${handler.currentUser}") + val ipw = IndentingPrintWriter(pw, " ") + ipw.increaseIndent() + ipw.println("Current user: ${handler.currentUser}") for (index in 0 until receiversByUser.size()) { - pw.println(" User ${receiversByUser.keyAt(index)}") - receiversByUser.valueAt(index).dump(fd, pw, args) + ipw.println("User ${receiversByUser.keyAt(index)}") + receiversByUser.valueAt(index).dump(fd, ipw, args) } + ipw.decreaseIndent() } private val handler = object : Handler(bgLooper) { diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt b/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt index 96f5a1f6fbe8..11da920d69ed 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt @@ -18,8 +18,6 @@ package com.android.systemui.broadcast import android.content.BroadcastReceiver import android.content.Context -import android.content.Intent -import android.content.IntentFilter import android.os.Handler import android.os.Looper import android.os.Message @@ -31,11 +29,10 @@ import androidx.annotation.VisibleForTesting import com.android.internal.util.Preconditions import com.android.systemui.Dumpable import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger +import com.android.systemui.util.indentIfPossible import java.io.FileDescriptor import java.io.PrintWriter -import java.lang.IllegalArgumentException -import java.lang.IllegalStateException -import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.Executor import java.util.concurrent.atomic.AtomicInteger private const val MSG_REGISTER_RECEIVER = 0 @@ -48,16 +45,14 @@ private const val DEBUG = false * * Created by [BroadcastDispatcher] as needed by users. The value of [userId] can be * [UserHandle.USER_ALL]. - * - * Each instance of this class will register itself exactly once with [Context]. Updates to the - * [IntentFilter] will be done in the background thread. */ -class UserBroadcastDispatcher( +open class UserBroadcastDispatcher( private val context: Context, private val userId: Int, private val bgLooper: Looper, + private val bgExecutor: Executor, private val logger: BroadcastDispatcherLogger -) : BroadcastReceiver(), Dumpable { +) : Dumpable { companion object { // Used only for debugging. If not debugging, this variable will not be accessed and all @@ -76,47 +71,16 @@ class UserBroadcastDispatcher( } } - private val registered = AtomicBoolean(false) - - internal fun isRegistered() = registered.get() - // Only modify in BG thread - private val actionsToReceivers = ArrayMap<String, MutableSet<ReceiverData>>() - private val receiverToReceiverData = ArrayMap<BroadcastReceiver, MutableSet<ReceiverData>>() + @VisibleForTesting + internal val actionsToActionsReceivers = ArrayMap<String, ActionReceiver>() + private val receiverToActions = ArrayMap<BroadcastReceiver, MutableSet<String>>() @VisibleForTesting internal fun isReceiverReferenceHeld(receiver: BroadcastReceiver): Boolean { - return receiverToReceiverData.contains(receiver) || - actionsToReceivers.any { - it.value.any { it.receiver == receiver } - } - } - - // Only call on BG thread as it reads from the maps - private fun createFilter(): IntentFilter { - Preconditions.checkState(bgHandler.looper.isCurrentThread, - "This method should only be called from BG thread") - val categories = mutableSetOf<String>() - receiverToReceiverData.values.flatten().forEach { - it.filter.categoriesIterator()?.asSequence()?.let { - categories.addAll(it) - } - } - val intentFilter = IntentFilter().apply { - // The keys of the arrayMap are of type String! so null check is needed - actionsToReceivers.keys.forEach { if (it != null) addAction(it) else Unit } - categories.forEach { addCategory(it) } - } - return intentFilter - } - - override fun onReceive(context: Context, intent: Intent) { - val id = index.getAndIncrement() - if (DEBUG) Log.w(TAG, "[$id] Received $intent") - logger.logBroadcastReceived(id, userId, intent) - bgHandler.post( - HandleBroadcastRunnable( - actionsToReceivers, context, intent, pendingResult, id, logger)) + return actionsToActionsReceivers.values.any { + it.hasReceiver(receiver) + } || (receiver in receiverToActions) } /** @@ -137,109 +101,57 @@ class UserBroadcastDispatcher( Preconditions.checkState(bgHandler.looper.isCurrentThread, "This method should only be called from BG thread") if (DEBUG) Log.w(TAG, "Register receiver: ${receiverData.receiver}") - receiverToReceiverData.getOrPut(receiverData.receiver, { ArraySet() }).add(receiverData) - var changed = false - // Index the BroadcastReceiver by all its actions, that way it's easier to dispatch given - // a received intent. + receiverToActions + .getOrPut(receiverData.receiver, { ArraySet() }) + .addAll(receiverData.filter.actionsIterator()?.asSequence() ?: emptySequence()) receiverData.filter.actionsIterator().forEach { - actionsToReceivers.getOrPut(it) { - changed = true - ArraySet() - }.add(receiverData) + actionsToActionsReceivers + .getOrPut(it, { createActionReceiver(it) }) + .addReceiverData(receiverData) } logger.logReceiverRegistered(userId, receiverData.receiver) - if (changed) { - createFilterAndRegisterReceiverBG() - } + } + + @VisibleForTesting + internal open fun createActionReceiver(action: String): ActionReceiver { + return ActionReceiver( + action, + userId, + { + context.registerReceiverAsUser(this, UserHandle.of(userId), it, null, bgHandler) + logger.logContextReceiverRegistered(userId, it) + }, + { + try { + context.unregisterReceiver(this) + logger.logContextReceiverUnregistered(userId, action) + } catch (e: IllegalArgumentException) { + Log.e(TAG, "Trying to unregister unregistered receiver for user $userId, " + + "action $action", + IllegalStateException(e)) + } + }, + bgExecutor, + logger + ) } private fun handleUnregisterReceiver(receiver: BroadcastReceiver) { Preconditions.checkState(bgHandler.looper.isCurrentThread, "This method should only be called from BG thread") if (DEBUG) Log.w(TAG, "Unregister receiver: $receiver") - val actions = receiverToReceiverData.getOrElse(receiver) { return } - .flatMap { it.filter.actionsIterator().asSequence().asIterable() }.toSet() - receiverToReceiverData.remove(receiver)?.clear() - var changed = false - actions.forEach { action -> - actionsToReceivers.get(action)?.removeIf { it.receiver == receiver } - if (actionsToReceivers.get(action)?.isEmpty() ?: false) { - changed = true - actionsToReceivers.remove(action) - } + receiverToActions.getOrDefault(receiver, mutableSetOf()).forEach { + actionsToActionsReceivers.get(it)?.removeReceiver(receiver) } + receiverToActions.remove(receiver) logger.logReceiverUnregistered(userId, receiver) - if (changed) { - createFilterAndRegisterReceiverBG() - } - } - - // Only call this from a BG thread - private fun createFilterAndRegisterReceiverBG() { - val intentFilter = createFilter() - bgHandler.post(RegisterReceiverRunnable(intentFilter)) } override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) { - pw.println(" Registered=${registered.get()}") - actionsToReceivers.forEach { (action, list) -> - pw.println(" $action:") - list.forEach { pw.println(" ${it.receiver}") } - } - } - - private class HandleBroadcastRunnable( - val actionsToReceivers: Map<String, Set<ReceiverData>>, - val context: Context, - val intent: Intent, - val pendingResult: PendingResult, - val index: Int, - val logger: BroadcastDispatcherLogger - ) : Runnable { - override fun run() { - if (DEBUG) Log.w(TAG, "[$index] Dispatching $intent") - actionsToReceivers.get(intent.action) - ?.filter { - it.filter.hasAction(intent.action) && - it.filter.matchCategories(intent.categories) == null } - ?.forEach { - it.executor.execute { - if (DEBUG) Log.w(TAG, - "[$index] Dispatching ${intent.action} to ${it.receiver}") - logger.logBroadcastDispatched(index, intent.action, it.receiver) - it.receiver.pendingResult = pendingResult - it.receiver.onReceive(context, intent) - } - } - } - } - - private inner class RegisterReceiverRunnable(val intentFilter: IntentFilter) : Runnable { - - /* - * Registers and unregisters the BroadcastReceiver - */ - override fun run() { - if (registered.get()) { - try { - context.unregisterReceiver(this@UserBroadcastDispatcher) - logger.logContextReceiverUnregistered(userId) - } catch (e: IllegalArgumentException) { - Log.e(TAG, "Trying to unregister unregistered receiver for user $userId", - IllegalStateException(e)) - } - registered.set(false) - } - // Short interval without receiver, this can be problematic - if (intentFilter.countActions() > 0 && !registered.get()) { - context.registerReceiverAsUser( - this@UserBroadcastDispatcher, - UserHandle.of(userId), - intentFilter, - null, - bgHandler) - registered.set(true) - logger.logContextReceiverRegistered(userId, intentFilter) + pw.indentIfPossible { + actionsToActionsReceivers.forEach { (action, actionReceiver) -> + println("$action:") + actionReceiver.dump(fd, pw, args) } } } diff --git a/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt b/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt index 123a8ae6307d..6ba88f4e69d7 100644 --- a/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/broadcast/logging/BroadcastDispatcherLogger.kt @@ -99,11 +99,12 @@ class BroadcastDispatcherLogger @Inject constructor( }) } - fun logContextReceiverUnregistered(user: Int) { + fun logContextReceiverUnregistered(user: Int, action: String) { log(INFO, { int1 = user + str1 = action }, { - "Receiver unregistered with Context for user $int1." + "Receiver unregistered with Context for user $int1, action $str1" }) } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java index 6377b4f0a9c5..a8bbdf6b68c9 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java @@ -77,6 +77,7 @@ class Bubble implements BubbleViewProvider { private BubbleViewInfoTask mInflationTask; private boolean mInflateSynchronously; private boolean mPendingIntentCanceled; + private boolean mIsImportantConversation; /** * Presentational info about the flyout. @@ -144,6 +145,7 @@ class Bubble implements BubbleViewProvider { mDesiredHeight = desiredHeight; mDesiredHeightResId = desiredHeightResId; mTitle = title; + mShowBubbleUpdateDot = false; } /** Used in tests when no UI is required. */ @@ -362,6 +364,8 @@ class Bubble implements BubbleViewProvider { mIntent = entry.getBubbleMetadata().getIntent(); mDeleteIntent = entry.getBubbleMetadata().getDeleteIntent(); } + mIsImportantConversation = + entry.getChannel() == null ? false : entry.getChannel().isImportantConversation(); } @Nullable @@ -432,6 +436,13 @@ class Bubble implements BubbleViewProvider { } /** + * Whether this notification conversation is important. + */ + boolean isImportantConversation() { + return mIsImportantConversation; + } + + /** * Sets whether this notification should be suppressed in the shade. */ void setSuppressNotification(boolean suppressNotification) { diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index c42920965ed3..8f2c2c834384 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -207,6 +207,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi */ private int mDensityDpi = Configuration.DENSITY_DPI_UNDEFINED; + /** Last known direction, used to detect layout direction changes @link #onConfigChanged}. */ + private int mLayoutDirection = View.LAYOUT_DIRECTION_UNDEFINED; + private boolean mInflateSynchronously; // TODO (b/145659174): allow for multiple callbacks to support the "shadow" new notif pipeline @@ -832,8 +835,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi mBubbleIconFactory = new BubbleIconFactory(mContext); mStackView.onDisplaySizeChanged(); } - - mStackView.onLayoutDirectionChanged(); + if (newConfig.getLayoutDirection() != mLayoutDirection) { + mLayoutDirection = newConfig.getLayoutDirection(); + mStackView.onLayoutDirectionChanged(mLayoutDirection); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java index 959130bbdd0f..8722ac9a36b5 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java @@ -120,6 +120,8 @@ public class BubbleExpandedView extends LinearLayout { private int mPointerWidth; private int mPointerHeight; private ShapeDrawable mPointerDrawable; + private int mExpandedViewPadding; + @Nullable private Bubble mBubble; @@ -345,11 +347,9 @@ public class BubbleExpandedView extends LinearLayout { return view.onApplyWindowInsets(insets); }); - final int expandedViewPadding = - res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding); - - setPadding( - expandedViewPadding, expandedViewPadding, expandedViewPadding, expandedViewPadding); + mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding); + setPadding(mExpandedViewPadding, mExpandedViewPadding, mExpandedViewPadding, + mExpandedViewPadding); setOnTouchListener((view, motionEvent) -> { if (!usingActivityView()) { return false; @@ -729,7 +729,7 @@ public class BubbleExpandedView extends LinearLayout { */ public void setPointerPosition(float x) { float halfPointerWidth = mPointerWidth / 2f; - float pointerLeft = x - halfPointerWidth; + float pointerLeft = x - halfPointerWidth - mExpandedViewPadding; mPointerView.setTranslationX(pointerLeft); mPointerView.setVisibility(VISIBLE); } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java index a799f2d739e5..40a93e1cdc47 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java @@ -23,6 +23,8 @@ import android.content.pm.LauncherApps; import android.content.pm.ShortcutInfo; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; @@ -76,15 +78,36 @@ public class BubbleIconFactory extends BaseIconFactory { * Returns a {@link BitmapInfo} for the app-badge that is shown on top of each bubble. This * will include the workprofile indicator on the badge if appropriate. */ - BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon) { + BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon, boolean isImportantConversation) { Bitmap userBadgedBitmap = createIconBitmap( userBadgedAppIcon, 1f, getBadgeSize()); - - Canvas c = new Canvas(); ShadowGenerator shadowGenerator = new ShadowGenerator(getBadgeSize()); - c.setBitmap(userBadgedBitmap); - shadowGenerator.recreateIcon(Bitmap.createBitmap(userBadgedBitmap), c); - return createIconBitmap(userBadgedBitmap); + if (!isImportantConversation) { + Canvas c = new Canvas(); + c.setBitmap(userBadgedBitmap); + shadowGenerator.recreateIcon(Bitmap.createBitmap(userBadgedBitmap), c); + return createIconBitmap(userBadgedBitmap); + } else { + float ringStrokeWidth = mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.importance_ring_stroke_width); + int importantConversationColor = mContext.getResources().getColor( + com.android.settingslib.R.color.important_conversation, null); + Bitmap badgeAndRing = Bitmap.createBitmap(userBadgedBitmap.getWidth(), + userBadgedBitmap.getHeight(), userBadgedBitmap.getConfig()); + Canvas c = new Canvas(badgeAndRing); + Rect dest = new Rect((int) ringStrokeWidth, (int) ringStrokeWidth, + c.getHeight() - (int) ringStrokeWidth, c.getWidth() - (int) ringStrokeWidth); + c.drawBitmap(userBadgedBitmap, null, dest, null); + Paint ringPaint = new Paint(); + ringPaint.setStyle(Paint.Style.STROKE); + ringPaint.setColor(importantConversationColor); + ringPaint.setAntiAlias(true); + ringPaint.setStrokeWidth(ringStrokeWidth); + c.drawCircle(c.getWidth() / 2, c.getHeight() / 2, c.getWidth() / 2 - ringStrokeWidth, + ringPaint); + shadowGenerator.recreateIcon(Bitmap.createBitmap(badgeAndRing), c); + return createIconBitmap(badgeAndRing); + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleManageEducationView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleManageEducationView.java index 47120124a55f..86244ba5248a 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleManageEducationView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleManageEducationView.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.util.AttributeSet; +import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -34,6 +35,8 @@ import com.android.systemui.R; public class BubbleManageEducationView extends LinearLayout { private View mManageView; + private TextView mTitleTextView; + private TextView mDescTextView; public BubbleManageEducationView(Context context) { this(context, null); @@ -57,6 +60,8 @@ public class BubbleManageEducationView extends LinearLayout { super.onFinishInflate(); mManageView = findViewById(R.id.manage_education_view); + mTitleTextView = findViewById(R.id.user_education_title); + mDescTextView = findViewById(R.id.user_education_description); final TypedArray ta = mContext.obtainStyledAttributes( new int[] {android.R.attr.colorAccent, @@ -66,8 +71,8 @@ public class BubbleManageEducationView extends LinearLayout { ta.recycle(); textColor = ContrastColorUtil.ensureTextContrast(textColor, bgColor, true); - ((TextView) findViewById(R.id.user_education_title)).setTextColor(textColor); - ((TextView) findViewById(R.id.user_education_description)).setTextColor(textColor); + mTitleTextView.setTextColor(textColor); + mDescTextView.setTextColor(textColor); } /** @@ -84,4 +89,18 @@ public class BubbleManageEducationView extends LinearLayout { public int getManageViewHeight() { return mManageView.getHeight(); } + + @Override + public void setLayoutDirection(int direction) { + super.setLayoutDirection(direction); + if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + mManageView.setBackgroundResource(R.drawable.bubble_stack_user_education_bg_rtl); + mTitleTextView.setGravity(Gravity.RIGHT); + mDescTextView.setGravity(Gravity.RIGHT); + } else { + mManageView.setBackgroundResource(R.drawable.bubble_stack_user_education_bg); + mTitleTextView.setGravity(Gravity.LEFT); + mDescTextView.setGravity(Gravity.LEFT); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java index b9437078a330..7408fb3de019 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflowActivity.java @@ -22,7 +22,6 @@ import static com.android.systemui.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME import android.app.Activity; import android.content.Context; -import android.content.pm.ShortcutInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; @@ -289,18 +288,10 @@ class BubbleOverflowAdapter extends RecyclerView.Adapter<BubbleOverflowAdapter.V } }); - // If the bubble was persisted, the entry is null but it should have shortcut info - ShortcutInfo info = b.getShortcutInfo(); - if (info == null) { - Log.d(TAG, "ShortcutInfo required to bubble but none found for " + b); - } else { - CharSequence label = info.getLabel(); - if (label == null) { - vh.textView.setText(b.getAppName()); - } else { - vh.textView.setText(label.toString()); - } - } + CharSequence label = b.getShortcutInfo() != null + ? b.getShortcutInfo().getLabel() + : b.getAppName(); + vh.textView.setText(label); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index 640475eb1be4..10bfcda90edb 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -51,7 +51,6 @@ import android.graphics.drawable.TransitionDrawable; import android.os.Bundle; import android.os.Handler; import android.provider.Settings; -import android.service.notification.StatusBarNotification; import android.util.Log; import android.view.Choreographer; import android.view.DisplayCutout; @@ -71,6 +70,7 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.animation.AccelerateDecelerateInterpolator; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.MainThread; @@ -1107,6 +1107,7 @@ public class BubbleStackView extends FrameLayout title.setTextColor(textColor); description.setTextColor(textColor); + updateUserEducationForLayoutDirection(); addView(mUserEducationView); } @@ -1123,7 +1124,7 @@ public class BubbleStackView extends FrameLayout false /* attachToRoot */); mManageEducationView.setVisibility(GONE); mManageEducationView.setElevation(mBubbleElevation); - + mManageEducationView.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE); addView(mManageEducationView); } } @@ -1205,13 +1206,17 @@ public class BubbleStackView extends FrameLayout } /** Tells the views with locale-dependent layout direction to resolve the new direction. */ - public void onLayoutDirectionChanged() { - mManageMenu.resolveLayoutDirection(); - mFlyout.resolveLayoutDirection(); - - if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { - mExpandedBubble.getExpandedView().resolveLayoutDirection(); + public void onLayoutDirectionChanged(int direction) { + mManageMenu.setLayoutDirection(direction); + mFlyout.setLayoutDirection(direction); + if (mUserEducationView != null) { + mUserEducationView.setLayoutDirection(direction); + updateUserEducationForLayoutDirection(); + } + if (mManageEducationView != null) { + mManageEducationView.setLayoutDirection(direction); } + updateExpandedViewDirection(direction); } /** Respond to the display size change by recalculating view size and location. */ @@ -1286,6 +1291,18 @@ public class BubbleStackView extends FrameLayout }); } + void updateExpandedViewDirection(int direction) { + final List<Bubble> bubbles = mBubbleData.getBubbles(); + if (bubbles.isEmpty()) { + return; + } + bubbles.forEach(bubble -> { + if (bubble.getExpandedView() != null) { + bubble.getExpandedView().setLayoutDirection(direction); + } + }); + } + void setupLocalMenu(AccessibilityNodeInfo info) { Resources res = mContext.getResources(); @@ -1633,6 +1650,8 @@ public class BubbleStackView extends FrameLayout if (mShouldShowUserEducation && mUserEducationView.getVisibility() != VISIBLE) { mUserEducationView.setAlpha(0); mUserEducationView.setVisibility(VISIBLE); + updateUserEducationForLayoutDirection(); + // Post so we have height of mUserEducationView mUserEducationView.post(() -> { final int viewHeight = mUserEducationView.getHeight(); @@ -1650,6 +1669,28 @@ public class BubbleStackView extends FrameLayout return false; } + private void updateUserEducationForLayoutDirection() { + if (mUserEducationView == null) { + return; + } + LinearLayout textLayout = mUserEducationView.findViewById(R.id.user_education_view); + TextView title = mUserEducationView.findViewById(R.id.user_education_title); + TextView description = mUserEducationView.findViewById(R.id.user_education_description); + boolean isLtr = + getResources().getConfiguration().getLayoutDirection() == LAYOUT_DIRECTION_LTR; + if (isLtr) { + mUserEducationView.setLayoutDirection(LAYOUT_DIRECTION_LTR); + textLayout.setBackgroundResource(R.drawable.bubble_stack_user_education_bg); + title.setGravity(Gravity.LEFT); + description.setGravity(Gravity.LEFT); + } else { + mUserEducationView.setLayoutDirection(LAYOUT_DIRECTION_RTL); + textLayout.setBackgroundResource(R.drawable.bubble_stack_user_education_bg_rtl); + title.setGravity(Gravity.RIGHT); + description.setGravity(Gravity.RIGHT); + } + } + /** * If necessary, hides the user education view for the bubble stack. * diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java index 3e4ff5262bbd..1929fc4e9dbf 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java @@ -176,7 +176,8 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask bubbleDrawable = appIcon; } - BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon); + BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon, + b.isImportantConversation()); info.badgedAppIcon = badgedIcon; info.badgedBubbleImage = iconFactory.getBubbleBitmap(bubbleDrawable, badgeBitmapInfo).icon; diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java index 3ef20444cb52..b378469c4c98 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java @@ -940,8 +940,12 @@ public class StackAnimationController extends /** Returns the default stack position, which is on the top left. */ public PointF getDefaultStartPosition() { - return new PointF( - getAllowableStackPositionRegion().left, + boolean isRtl = mLayout != null + && mLayout.getResources().getConfiguration().getLayoutDirection() + == View.LAYOUT_DIRECTION_RTL; + return new PointF(isRtl + ? getAllowableStackPositionRegion().right + : getAllowableStackPositionRegion().left, getAllowableStackPositionRegion().top + mStackStartingVerticalOffset); } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleVolatileRepository.kt b/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleVolatileRepository.kt index bdeb714b568c..894970f903ac 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleVolatileRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleVolatileRepository.kt @@ -60,7 +60,8 @@ class BubbleVolatileRepository @Inject constructor( // Verify the size of given bubbles is within capacity, otherwise trim down to capacity val bubblesInRange = bubbles.takeLast(capacity) // To ensure natural ordering of the bubbles, removes bubbles which already exist - val uniqueBubbles = bubblesInRange.filterNot { entities.remove(it) } + val uniqueBubbles = bubblesInRange.filterNot { b: BubbleEntity -> + entities.removeIf { e: BubbleEntity -> b.key == e.key } } val overflowCount = entities.size + bubblesInRange.size - capacity if (overflowCount > 0) { // Uncache ShortcutInfo of bubbles that will be removed due to capacity @@ -72,7 +73,9 @@ class BubbleVolatileRepository @Inject constructor( } @Synchronized - fun removeBubbles(bubbles: List<BubbleEntity>) = uncache(bubbles.filter { entities.remove(it) }) + fun removeBubbles(bubbles: List<BubbleEntity>) = + uncache(bubbles.filter { b: BubbleEntity -> + entities.removeIf { e: BubbleEntity -> b.key == e.key } }) private fun cache(bubbles: List<BubbleEntity>) { bubbles.groupBy { ShortcutKey(it.userId, it.packageName) }.forEach { (key, bubbles) -> diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleXmlHelper.kt b/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleXmlHelper.kt index 66fff3386ae1..bf163a230aff 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleXmlHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/bubbles/storage/BubbleXmlHelper.kt @@ -25,7 +25,11 @@ import java.io.InputStream import java.io.OutputStream import java.nio.charset.StandardCharsets +// TODO: handle version changes gracefully +private const val CURRENT_VERSION = 1 + private const val TAG_BUBBLES = "bs" +private const val ATTR_VERSION = "v" private const val TAG_BUBBLE = "bb" private const val ATTR_USER_ID = "uid" private const val ATTR_PACKAGE = "pkg" @@ -44,6 +48,7 @@ fun writeXml(stream: OutputStream, bubbles: List<BubbleEntity>) { serializer.setOutput(stream, StandardCharsets.UTF_8.name()) serializer.startDocument(null, true) serializer.startTag(null, TAG_BUBBLES) + serializer.attribute(null, ATTR_VERSION, CURRENT_VERSION.toString()) bubbles.forEach { b -> writeXmlEntry(serializer, b) } serializer.endTag(null, TAG_BUBBLES) serializer.endDocument() @@ -79,9 +84,12 @@ fun readXml(stream: InputStream): List<BubbleEntity> { val parser: XmlPullParser = Xml.newPullParser() parser.setInput(stream, StandardCharsets.UTF_8.name()) XmlUtils.beginDocument(parser, TAG_BUBBLES) - val outerDepth = parser.depth - while (XmlUtils.nextElementWithin(parser, outerDepth)) { - bubbles.add(readXmlEntry(parser) ?: continue) + val version = parser.getAttributeWithName(ATTR_VERSION)?.toInt() + if (version != null && version == CURRENT_VERSION) { + val outerDepth = parser.depth + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + bubbles.add(readXmlEntry(parser) ?: continue) + } } return bubbles } diff --git a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt index d4d4d2a7d8fe..eed55315e836 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt @@ -20,7 +20,7 @@ import android.content.ComponentName import android.service.controls.Control import android.service.controls.ControlsProviderService import android.service.controls.actions.ControlAction -import com.android.systemui.controls.UserAwareController +import com.android.systemui.util.UserAwareController import java.util.function.Consumer /** diff --git a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt index 45ba1e6012fe..496741b1cd6f 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt @@ -21,7 +21,7 @@ import android.service.controls.Control import android.service.controls.ControlsProviderService import android.service.controls.actions.ControlAction import com.android.systemui.controls.ControlStatus -import com.android.systemui.controls.UserAwareController +import com.android.systemui.util.UserAwareController import com.android.systemui.controls.management.ControlsFavoritingActivity import com.android.systemui.controls.ui.ControlsUiController import java.util.function.Consumer diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsListingController.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsListingController.kt index 647daccca8bd..b9f16665944f 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsListingController.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsListingController.kt @@ -18,7 +18,7 @@ package com.android.systemui.controls.management import android.content.ComponentName import com.android.systemui.controls.ControlsServiceInfo -import com.android.systemui.controls.UserAwareController +import com.android.systemui.util.UserAwareController import com.android.systemui.statusbar.policy.CallbackController /** @@ -26,7 +26,7 @@ import com.android.systemui.statusbar.policy.CallbackController */ interface ControlsListingController : CallbackController<ControlsListingController.ControlsListingCallback>, - UserAwareController { + UserAwareController { /** * @return the current list of services that satisfies the [ServiceListing]. diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt index 400d830e782e..4eb7527bff6e 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt @@ -128,6 +128,8 @@ class ControlViewHolder( val controlTemplate: ControlTemplate get() = cws.control?.let { it.controlTemplate } ?: ControlTemplate.NO_TEMPLATE + var userInteractionInProgress = false + init { val ld = layout.getBackground() as LayerDrawable ld.mutate() @@ -139,6 +141,11 @@ class ControlViewHolder( } fun bindData(cws: ControlWithState) { + // If an interaction is in progress, the update may visually interfere with the action the + // action the user wants to make. Don't apply the update, and instead assume a new update + // will coming from when the user interaction is complete. + if (userInteractionInProgress) return + this.cws = cws cancelUpdate?.run() diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt index 04881af6ed45..aa11df41a7b7 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt @@ -216,6 +216,7 @@ class ToggleRangeBehavior : Behavior { } fun beginUpdateRange() { + cvh.userInteractionInProgress = true cvh.setStatusTextSize(context.getResources() .getDimensionPixelSize(R.dimen.control_status_expanded).toFloat()) } @@ -296,6 +297,7 @@ class ToggleRangeBehavior : Behavior { cvh.setStatusText("$currentStatusText $currentRangeValue", /* immediately */ true) cvh.controlActionCoordinator.setValue(cvh, rangeTemplate.getTemplateId(), findNearestStep(levelToRangeValue(clipLayer.getLevel()))) + cvh.userInteractionInProgress = false } fun findNearestStep(value: Float): Float { diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java index 1f30305ab169..fedc9e31a4ec 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java @@ -61,6 +61,8 @@ import com.android.systemui.statusbar.policy.DataSaverController; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.util.leak.LeakDetector; +import java.util.concurrent.Executor; + import javax.inject.Named; import javax.inject.Singleton; @@ -188,11 +190,12 @@ public class DependencyProvider { public BroadcastDispatcher providesBroadcastDispatcher( Context context, @Background Looper backgroundLooper, + @Background Executor backgroundExecutor, DumpManager dumpManager, BroadcastDispatcherLogger logger ) { - BroadcastDispatcher bD = - new BroadcastDispatcher(context, backgroundLooper, dumpManager, logger); + BroadcastDispatcher bD = new BroadcastDispatcher(context, backgroundLooper, + backgroundExecutor, dumpManager, logger); bD.initialize(); return bD; } diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index b520717ee27f..c891bf6cb53c 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -1425,16 +1425,26 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, Log.w(TAG, "No power options action found at position: " + position); return null; } - int viewLayoutResource = com.android.systemui.R.layout.controls_more_item; + int viewLayoutResource = com.android.systemui.R.layout.global_actions_power_item; View view = convertView != null ? convertView : LayoutInflater.from(mContext).inflate(viewLayoutResource, parent, false); - TextView textView = (TextView) view; - if (action.getMessageResId() != 0) { - textView.setText(action.getMessageResId()); + view.setOnClickListener(v -> onClickItem(position)); + if (action instanceof LongPressAction) { + view.setOnLongClickListener(v -> onLongClickItem(position)); + } + ImageView icon = view.findViewById(R.id.icon); + TextView messageView = view.findViewById(R.id.message); + messageView.setSelected(true); // necessary for marquee to work + + icon.setImageDrawable(action.getIcon(mContext)); + icon.setScaleType(ScaleType.CENTER_CROP); + + if (action.getMessage() != null) { + messageView.setText(action.getMessage()); } else { - textView.setText(action.getMessage()); + messageView.setText(action.getMessageResId()); } - return textView; + return view; } private boolean onLongClickItem(int position) { @@ -1570,6 +1580,11 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, int getMessageResId(); /** + * Return the icon drawable for this action. + */ + Drawable getIcon(Context context); + + /** * Return the message associated with this action, or null if it doesn't have one. * @return */ @@ -1633,6 +1648,15 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, return mMessage; } + @Override + public Drawable getIcon(Context context) { + if (mIcon != null) { + return mIcon; + } else { + return context.getDrawable(mIconResId); + } + } + public View create( Context context, View convertView, ViewGroup parent, LayoutInflater inflater) { View v = inflater.inflate(com.android.systemui.R.layout.global_actions_grid_item_v2, @@ -1642,12 +1666,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, TextView messageView = v.findViewById(R.id.message); messageView.setSelected(true); // necessary for marquee to work - if (mIcon != null) { - icon.setImageDrawable(mIcon); - icon.setScaleType(ScaleType.CENTER_CROP); - } else if (mIconResId != 0) { - icon.setImageDrawable(context.getDrawable(mIconResId)); - } + icon.setImageDrawable(getIcon(context)); + icon.setScaleType(ScaleType.CENTER_CROP); + if (mMessage != null) { messageView.setText(mMessage); } else { @@ -1738,6 +1759,11 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, return isOn() ? mEnabledIconResId : mDisabledIconResid; } + @Override + public Drawable getIcon(Context context) { + return context.getDrawable(getIconResId()); + } + public View create(Context context, View convertView, ViewGroup parent, LayoutInflater inflater) { willCreate(); @@ -1904,6 +1930,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, return null; } + @Override + public Drawable getIcon(Context context) { + return null; + } + + public View create(Context context, View convertView, ViewGroup parent, LayoutInflater inflater) { View v = inflater.inflate(R.layout.global_actions_silent_mode, parent, false); @@ -2075,7 +2107,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, private final NotificationShadeDepthController mDepthController; private final SysUiState mSysUiState; private ListPopupWindow mOverflowPopup; - private ListPopupWindow mPowerOptionsPopup; + private Dialog mPowerOptionsDialog; private final Runnable mOnRotateCallback; private final boolean mControlsAvailable; @@ -2211,21 +2243,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, } } - private ListPopupWindow createPowerOptionsPopup() { - GlobalActionsPopupMenu popup = new GlobalActionsPopupMenu( - new ContextThemeWrapper( - mContext, - com.android.systemui.R.style.Control_ListPopupWindow - ), false /* isDropDownMode */); - popup.setOnItemClickListener( - (parent, view, position, id) -> mPowerOptionsAdapter.onClickItem(position)); - popup.setOnItemLongClickListener( - (parent, view, position, id) -> mPowerOptionsAdapter.onLongClickItem(position)); - popup.setAnchorView(mGlobalActionsLayout); - popup.setAdapter(mPowerOptionsAdapter); - return popup; - } - private ListPopupWindow createPowerOverflowPopup() { GlobalActionsPopupMenu popup = new GlobalActionsPopupMenu( new ContextThemeWrapper( @@ -2244,8 +2261,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, } public void showPowerOptionsMenu() { - mPowerOptionsPopup = createPowerOptionsPopup(); - mPowerOptionsPopup.show(); + mPowerOptionsDialog = GlobalActionsPowerDialog.create(mContext, mPowerOptionsAdapter); + mPowerOptionsDialog.show(); } private void showPowerOverflowMenu() { @@ -2479,11 +2496,11 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, } private void dismissPowerOptions(boolean immediate) { - if (mPowerOptionsPopup != null) { + if (mPowerOptionsDialog != null) { if (immediate) { - mPowerOptionsPopup.dismissImmediate(); + mPowerOptionsDialog.dismiss(); } else { - mPowerOptionsPopup.dismiss(); + mPowerOptionsDialog.dismiss(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java new file mode 100644 index 000000000000..9dec3ab859b1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2020 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.globalactions; + +import android.annotation.NonNull; +import android.app.Dialog; +import android.content.Context; +import android.content.res.Resources; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.ListAdapter; + +/** + * Creates a customized Dialog for displaying the Shut Down and Restart actions. + */ +public class GlobalActionsPowerDialog { + + /** + * Create a dialog for displaying Shut Down and Restart actions. + */ + public static Dialog create(@NonNull Context context, ListAdapter adapter) { + ViewGroup listView = (ViewGroup) LayoutInflater.from(context).inflate( + com.android.systemui.R.layout.global_actions_power_dialog, null); + + for (int i = 0; i < adapter.getCount(); i++) { + View action = adapter.getView(i, null, listView); + listView.addView(action); + } + + Resources res = context.getResources(); + + Dialog dialog = new Dialog(context); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(listView); + + Window window = dialog.getWindow(); + window.setType(WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY); + window.setTitle(""); // prevent Talkback from speaking first item name twice + window.setBackgroundDrawable(res.getDrawable( + com.android.systemui.R.drawable.control_background, context.getTheme())); + + return dialog; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index 2df0507a8864..d5c92f26e12b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -20,9 +20,8 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; -import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.Outline; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; @@ -33,6 +32,7 @@ import android.media.session.MediaSession; import android.media.session.PlaybackState; import android.util.Log; import android.view.View; +import android.view.ViewOutlineProvider; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -41,8 +41,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.constraintlayout.widget.ConstraintSet; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; import com.android.settingslib.Utils; import com.android.settingslib.media.MediaOutputSliceConstants; @@ -52,8 +50,6 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.util.animation.TransitionLayout; -import org.jetbrains.annotations.NotNull; - import java.util.List; import java.util.concurrent.Executor; @@ -87,6 +83,8 @@ public class MediaControlPanel { private int mBackgroundColor; private int mAlbumArtSize; private int mAlbumArtRadius; + // This will provide the corners for the album art. + private final ViewOutlineProvider mViewOutlineProvider; /** * Initialize a new control panel @@ -104,6 +102,13 @@ public class MediaControlPanel { mSeekBarViewModel = seekBarViewModel; mMediaViewController = mediaViewController; loadDimens(); + + mViewOutlineProvider = new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setRoundRect(0, 0, mAlbumArtSize, mAlbumArtSize, mAlbumArtRadius); + } + }; } public void onDestroy() { @@ -162,6 +167,11 @@ public class MediaControlPanel { public void attach(PlayerViewHolder vh) { mViewHolder = vh; TransitionLayout player = vh.getPlayer(); + + ImageView albumView = vh.getAlbumView(); + albumView.setOutlineProvider(mViewOutlineProvider); + albumView.setClipToOutline(true); + mSeekBarObserver = new SeekBarObserver(vh); mSeekBarViewModel.getProgress().observeForever(mSeekBarObserver); mSeekBarViewModel.attachTouchHandlers(vh.getSeekBar()); @@ -171,7 +181,7 @@ public class MediaControlPanel { /** * Bind this view based on the data given */ - public void bind(@NotNull MediaData data) { + public void bind(@NonNull MediaData data) { if (mViewHolder == null) { return; } @@ -202,11 +212,9 @@ public class MediaControlPanel { } ImageView albumView = mViewHolder.getAlbumView(); - // TODO: migrate this to a view with rounded corners instead of baking the rounding - // into the bitmap boolean hasArtwork = data.getArtwork() != null; if (hasArtwork) { - Drawable artwork = createRoundedBitmap(data.getArtwork()); + Drawable artwork = scaleDrawable(data.getArtwork()); albumView.setImageDrawable(artwork); } setVisibleAndAlpha(collapsedSet, R.id.album_art, hasArtwork); @@ -334,7 +342,7 @@ public class MediaControlPanel { } @UiThread - private Drawable createRoundedBitmap(Icon icon) { + private Drawable scaleDrawable(Icon icon) { if (icon == null) { return null; } @@ -355,14 +363,7 @@ public class MediaControlPanel { bounds.offset((int) -offsetX,(int) -offsetY); } drawable.setBounds(bounds); - Bitmap scaled = Bitmap.createBitmap(mAlbumArtSize, mAlbumArtSize, - Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(scaled); - drawable.draw(canvas); - RoundedBitmapDrawable artwork = RoundedBitmapDrawableFactory.create( - mContext.getResources(), scaled); - artwork.setCornerRadius(mAlbumArtRadius); - return artwork; + return drawable; } /** diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index 5300795189de..1ec285a8f561 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -38,18 +38,20 @@ import android.service.notification.StatusBarNotification import android.text.TextUtils import android.util.Log import com.android.internal.graphics.ColorUtils +import com.android.systemui.Dumpable import com.android.systemui.R import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main +import com.android.systemui.dump.DumpManager import com.android.systemui.statusbar.NotificationMediaManager import com.android.systemui.statusbar.notification.MediaNotificationProcessor -import com.android.systemui.statusbar.notification.NotificationEntryManager -import com.android.systemui.statusbar.notification.NotificationEntryManager.UNDEFINED_DISMISS_REASON import com.android.systemui.statusbar.notification.row.HybridGroupManager import com.android.systemui.util.Assert import com.android.systemui.util.Utils +import java.io.FileDescriptor import java.io.IOException +import java.io.PrintWriter import java.util.concurrent.Executor import javax.inject.Inject import javax.inject.Singleton @@ -85,20 +87,35 @@ fun isMediaNotification(sbn: StatusBarNotification): Boolean { * A class that facilitates management and loading of Media Data, ready for binding. */ @Singleton -class MediaDataManager @Inject constructor( +class MediaDataManager( private val context: Context, - private val mediaControllerFactory: MediaControllerFactory, - private val notificationEntryManager: NotificationEntryManager, @Background private val backgroundExecutor: Executor, @Main private val foregroundExecutor: Executor, - broadcastDispatcher: BroadcastDispatcher, + private val mediaControllerFactory: MediaControllerFactory, + private val broadcastDispatcher: BroadcastDispatcher, + dumpManager: DumpManager, mediaTimeoutListener: MediaTimeoutListener, - mediaResumeListener: MediaResumeListener -) { + mediaResumeListener: MediaResumeListener, + private val useMediaResumption: Boolean, + private val useQsMediaPlayer: Boolean +) : Dumpable { private val listeners: MutableSet<Listener> = mutableSetOf() private val mediaEntries: LinkedHashMap<String, MediaData> = LinkedHashMap() - private val useMediaResumption: Boolean = Utils.useMediaResumption(context) + + @Inject + constructor( + context: Context, + @Background backgroundExecutor: Executor, + @Main foregroundExecutor: Executor, + mediaControllerFactory: MediaControllerFactory, + dumpManager: DumpManager, + broadcastDispatcher: BroadcastDispatcher, + mediaTimeoutListener: MediaTimeoutListener, + mediaResumeListener: MediaResumeListener + ) : this(context, backgroundExecutor, foregroundExecutor, mediaControllerFactory, + broadcastDispatcher, dumpManager, mediaTimeoutListener, mediaResumeListener, + Utils.useMediaResumption(context), Utils.useQsMediaPlayer(context)) private val userChangeReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { @@ -128,6 +145,7 @@ class MediaDataManager @Inject constructor( } init { + dumpManager.registerDumpable(TAG, this) mediaTimeoutListener.timeoutCallback = { token: String, timedOut: Boolean -> setTimedOut(token, timedOut) } addListener(mediaTimeoutListener) @@ -159,8 +177,13 @@ class MediaDataManager @Inject constructor( context.registerReceiver(appChangeReceiver, uninstallFilter) } + fun destroy() { + context.unregisterReceiver(appChangeReceiver) + broadcastDispatcher.unregisterReceiver(userChangeReceiver) + } + fun onNotificationAdded(key: String, sbn: StatusBarNotification) { - if (Utils.useQsMediaPlayer(context) && isMediaNotification(sbn)) { + if (useQsMediaPlayer && isMediaNotification(sbn)) { Assert.isMainThread() val oldKey = findExistingEntry(key, sbn.packageName) if (oldKey == null) { @@ -253,18 +276,18 @@ class MediaDataManager @Inject constructor( */ fun removeListener(listener: Listener) = listeners.remove(listener) + /** + * Called whenever the player has been paused or stopped for a while. + * This will make the player not active anymore, hiding it from QQS and Keyguard. + * @see MediaData.active + */ private fun setTimedOut(token: String, timedOut: Boolean) { mediaEntries[token]?.let { - if (Utils.useMediaResumption(context)) { - if (it.active == !timedOut) { - return - } - it.active = !timedOut - onMediaDataLoaded(token, token, it) - } else if (timedOut) { - notificationEntryManager.removeNotification(it.notificationKey, null /* ranking */, - UNDEFINED_DISMISS_REASON) + if (it.active == !timedOut) { + return } + it.active = !timedOut + onMediaDataLoaded(token, token, it) } } @@ -293,10 +316,11 @@ class MediaDataManager @Inject constructor( } else { null } + val bgColor = artworkBitmap?.let { computeBackgroundColor(it) } ?: Color.DKGRAY val mediaAction = getResumeMediaAction(resumeAction) foregroundExecutor.execute { - onMediaDataLoaded(packageName, null, MediaData(true, Color.DKGRAY, appName, + onMediaDataLoaded(packageName, null, MediaData(true, bgColor, appName, null, desc.subtitle, desc.title, artworkIcon, listOf(mediaAction), listOf(0), packageName, token, appIntent, device = null, active = false, resumeAction = resumeAction)) @@ -319,7 +343,6 @@ class MediaDataManager @Inject constructor( // Foreground and Background colors computed from album art val notif: Notification = sbn.notification - var bgColor = Color.WHITE var artworkBitmap = metadata.getBitmap(MediaMetadata.METADATA_KEY_ART) if (artworkBitmap == null) { artworkBitmap = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) @@ -349,26 +372,8 @@ class MediaDataManager @Inject constructor( drawable.draw(canvas) } } - val p = MediaNotificationProcessor.generateArtworkPaletteBuilder(artworkBitmap) - .generate() - val swatch = MediaNotificationProcessor.findBackgroundSwatch(p) - bgColor = swatch.rgb - } - // Adapt background color, so it's always subdued and text is legible - val tmpHsl = floatArrayOf(0f, 0f, 0f) - ColorUtils.colorToHSL(bgColor, tmpHsl) - - val l = tmpHsl[2] - // Colors with very low luminosity can have any saturation. This means that changing the - // luminosity can make a black become red. Let's remove the saturation of very light or - // very dark colors to avoid this issue. - if (l < LUMINOSITY_THRESHOLD || l > 1f - LUMINOSITY_THRESHOLD) { - tmpHsl[1] = 0f } - tmpHsl[1] *= SATURATION_MULTIPLIER - tmpHsl[2] = DEFAULT_LUMINOSITY - - bgColor = ColorUtils.HSLToColor(tmpHsl) + val bgColor = computeBackgroundColor(artworkBitmap) // App name val builder = Notification.Builder.recoverBuilder(context, notif) @@ -480,6 +485,33 @@ class MediaDataManager @Inject constructor( } } + private fun computeBackgroundColor(artworkBitmap: Bitmap?): Int { + var color = Color.WHITE + if (artworkBitmap != null) { + // If we have art, get colors from that + val p = MediaNotificationProcessor.generateArtworkPaletteBuilder(artworkBitmap) + .generate() + val swatch = MediaNotificationProcessor.findBackgroundSwatch(p) + color = swatch.rgb + } + // Adapt background color, so it's always subdued and text is legible + val tmpHsl = floatArrayOf(0f, 0f, 0f) + ColorUtils.colorToHSL(color, tmpHsl) + + val l = tmpHsl[2] + // Colors with very low luminosity can have any saturation. This means that changing the + // luminosity can make a black become red. Let's remove the saturation of very light or + // very dark colors to avoid this issue. + if (l < LUMINOSITY_THRESHOLD || l > 1f - LUMINOSITY_THRESHOLD) { + tmpHsl[1] = 0f + } + tmpHsl[1] *= SATURATION_MULTIPLIER + tmpHsl[2] = DEFAULT_LUMINOSITY + + color = ColorUtils.HSLToColor(tmpHsl) + return color + } + private fun getResumeMediaAction(action: Runnable): MediaAction { return MediaAction( context.getDrawable(R.drawable.lb_ic_play), @@ -561,4 +593,12 @@ class MediaDataManager @Inject constructor( */ fun onMediaDataRemoved(key: String) {} } + + override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) { + pw.apply { + println("listeners: $listeners") + println("mediaEntries: $mediaEntries") + println("useMediaResumption: $useMediaResumption") + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index b86e1d0503d4..26fa29613dc4 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -193,6 +193,8 @@ class MediaHierarchyManager @Inject constructor( override fun onDozingChanged(isDozing: Boolean) { if (!isDozing) { dozeAnimationRunning = false + } else { + updateDesiredLocation() } } }) @@ -510,12 +512,19 @@ class MediaHierarchyManager @Inject constructor( (statusbarState == StatusBarState.KEYGUARD || statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) val allowedOnLockscreen = notifLockscreenUserManager.shouldShowLockscreenNotifications() - return when { + val location = when { qsExpansion > 0.0f && !onLockscreen -> LOCATION_QS qsExpansion > 0.4f && onLockscreen -> LOCATION_QS onLockscreen && allowedOnLockscreen -> LOCATION_LOCKSCREEN else -> LOCATION_QQS } + // When we're on lock screen and the player is not active, we should keep it in QS. + // Otherwise it will try to animate a transition that doesn't make sense. + if (location == LOCATION_LOCKSCREEN && getHost(location)?.visible != true && + !statusBarStateController.isDozing) { + return LOCATION_QS + } + return location } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java index f1eef4353d32..8b3f4cb196bf 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java @@ -15,6 +15,7 @@ */ package com.android.systemui.pip.phone; +import android.content.Context; import android.graphics.Rect; import android.graphics.Region; import android.os.Bundle; @@ -26,6 +27,10 @@ import android.view.accessibility.AccessibilityWindowInfo; import android.view.accessibility.IAccessibilityInteractionConnection; import android.view.accessibility.IAccessibilityInteractionConnectionCallback; +import com.android.systemui.R; +import com.android.systemui.pip.PipSnapAlgorithm; +import com.android.systemui.pip.PipTaskOrganizer; + import java.util.ArrayList; import java.util.List; @@ -43,16 +48,30 @@ public class PipAccessibilityInteractionConnection private static final long ACCESSIBILITY_NODE_ID = 1; private List<AccessibilityNodeInfo> mAccessibilityNodeInfoList; + private Context mContext; private Handler mHandler; private PipMotionHelper mMotionHelper; + private PipTaskOrganizer mTaskOrganizer; + private PipSnapAlgorithm mSnapAlgorithm; + private Runnable mUpdateMovementBoundCallback; private AccessibilityCallbacks mCallbacks; + private final Rect mNormalBounds = new Rect(); + private final Rect mExpandedBounds = new Rect(); + private final Rect mNormalMovementBounds = new Rect(); + private final Rect mExpandedMovementBounds = new Rect(); private Rect mTmpBounds = new Rect(); - public PipAccessibilityInteractionConnection(PipMotionHelper motionHelper, - AccessibilityCallbacks callbacks, Handler handler) { + public PipAccessibilityInteractionConnection(Context context, PipMotionHelper motionHelper, + PipTaskOrganizer taskOrganizer, PipSnapAlgorithm snapAlgorithm, + AccessibilityCallbacks callbacks, Runnable updateMovementBoundCallback, + Handler handler) { + mContext = context; mHandler = handler; mMotionHelper = motionHelper; + mTaskOrganizer = taskOrganizer; + mSnapAlgorithm = snapAlgorithm; + mUpdateMovementBoundCallback = updateMovementBoundCallback; mCallbacks = callbacks; } @@ -78,34 +97,46 @@ public class PipAccessibilityInteractionConnection // We only support one view. A request for anything else is invalid boolean result = false; if (accessibilityNodeId == AccessibilityNodeInfo.ROOT_NODE_ID) { - switch (action) { - case AccessibilityNodeInfo.ACTION_CLICK: - mHandler.post(() -> { - mCallbacks.onAccessibilityShowMenu(); - }); - result = true; - break; - case AccessibilityNodeInfo.ACTION_DISMISS: - mMotionHelper.dismissPip(); - result = true; - break; - case com.android.internal.R.id.accessibilityActionMoveWindow: - int newX = arguments.getInt( - AccessibilityNodeInfo.ACTION_ARGUMENT_MOVE_WINDOW_X); - int newY = arguments.getInt( - AccessibilityNodeInfo.ACTION_ARGUMENT_MOVE_WINDOW_Y); - Rect pipBounds = new Rect(); - pipBounds.set(mMotionHelper.getBounds()); - mTmpBounds.offsetTo(newX, newY); - mMotionHelper.movePip(mTmpBounds); - result = true; - break; - case AccessibilityNodeInfo.ACTION_EXPAND: - mMotionHelper.expandPipToFullscreen(); - result = true; - break; - default: - // Leave result as false + + // R constants are not final so this cannot be put in the switch-case. + if (action == R.id.action_pip_resize) { + if (mMotionHelper.getBounds().width() == mNormalBounds.width() + && mMotionHelper.getBounds().height() == mNormalBounds.height()) { + setToExpandedBounds(); + } else { + setToNormalBounds(); + } + result = true; + } else { + switch (action) { + case AccessibilityNodeInfo.ACTION_CLICK: + mHandler.post(() -> { + mCallbacks.onAccessibilityShowMenu(); + }); + result = true; + break; + case AccessibilityNodeInfo.ACTION_DISMISS: + mMotionHelper.dismissPip(); + result = true; + break; + case com.android.internal.R.id.accessibilityActionMoveWindow: + int newX = arguments.getInt( + AccessibilityNodeInfo.ACTION_ARGUMENT_MOVE_WINDOW_X); + int newY = arguments.getInt( + AccessibilityNodeInfo.ACTION_ARGUMENT_MOVE_WINDOW_Y); + Rect pipBounds = new Rect(); + pipBounds.set(mMotionHelper.getBounds()); + mTmpBounds.offsetTo(newX, newY); + mMotionHelper.movePip(mTmpBounds); + result = true; + break; + case AccessibilityNodeInfo.ACTION_EXPAND: + mMotionHelper.expandPipToFullscreen(); + result = true; + break; + default: + // Leave result as false + } } } try { @@ -115,6 +146,27 @@ public class PipAccessibilityInteractionConnection } } + private void setToExpandedBounds() { + float savedSnapFraction = mSnapAlgorithm.getSnapFraction( + new Rect(mTaskOrganizer.getLastReportedBounds()), mNormalMovementBounds); + mSnapAlgorithm.applySnapFraction(mExpandedBounds, mExpandedMovementBounds, + savedSnapFraction); + mTaskOrganizer.scheduleFinishResizePip(mExpandedBounds, (Rect bounds) -> { + mMotionHelper.synchronizePinnedStackBounds(); + mUpdateMovementBoundCallback.run(); + }); + } + + private void setToNormalBounds() { + float savedSnapFraction = mSnapAlgorithm.getSnapFraction( + new Rect(mTaskOrganizer.getLastReportedBounds()), mExpandedMovementBounds); + mSnapAlgorithm.applySnapFraction(mNormalBounds, mNormalMovementBounds, savedSnapFraction); + mTaskOrganizer.scheduleFinishResizePip(mNormalBounds, (Rect bounds) -> { + mMotionHelper.synchronizePinnedStackBounds(); + mUpdateMovementBoundCallback.run(); + }); + } + @Override public void findAccessibilityNodeInfosByViewId(long accessibilityNodeId, String viewId, Region interactiveRegion, int interactionId, @@ -175,7 +227,21 @@ public class PipAccessibilityInteractionConnection // Do nothing. } - public static AccessibilityNodeInfo obtainRootAccessibilityNodeInfo() { + /** + * Update the normal and expanded bounds so they can be used for Resize. + */ + void onMovementBoundsChanged(Rect normalBounds, Rect expandedBounds, Rect normalMovementBounds, + Rect expandedMovementBounds) { + mNormalBounds.set(normalBounds); + mExpandedBounds.set(expandedBounds); + mNormalMovementBounds.set(normalMovementBounds); + mExpandedMovementBounds.set(expandedMovementBounds); + } + + /** + * Update the Root node with PIP Accessibility action items. + */ + public static AccessibilityNodeInfo obtainRootAccessibilityNodeInfo(Context context) { AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain(); info.setSourceNodeId(AccessibilityNodeInfo.ROOT_NODE_ID, AccessibilityWindowInfo.PICTURE_IN_PICTURE_ACTION_REPLACER_WINDOW_ID); @@ -183,6 +249,8 @@ public class PipAccessibilityInteractionConnection info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_MOVE_WINDOW); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_EXPAND); + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.action_pip_resize, + context.getString(R.string.accessibility_action_pip_resize))); info.setImportantForAccessibility(true); info.setClickable(true); info.setVisibleToUser(true); @@ -193,7 +261,7 @@ public class PipAccessibilityInteractionConnection if (mAccessibilityNodeInfoList == null) { mAccessibilityNodeInfoList = new ArrayList<>(1); } - AccessibilityNodeInfo info = obtainRootAccessibilityNodeInfo(); + AccessibilityNodeInfo info = obtainRootAccessibilityNodeInfo(mContext); mAccessibilityNodeInfoList.clear(); mAccessibilityNodeInfoList.add(info); return mAccessibilityNodeInfoList; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java index 06c98d00cca7..26805050e841 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java @@ -206,6 +206,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, void synchronizePinnedStackBounds() { cancelAnimations(); mBounds.set(mPipTaskOrganizer.getLastReportedBounds()); + mTemporaryBounds.setEmpty(); if (mPipTaskOrganizer.isInPip()) { mFloatingContentCoordinator.onContentMoved(this); @@ -274,6 +275,11 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, final float destinationX = targetCenter.x - (desiredWidth / 2f); final float destinationY = targetCenter.y - (desiredHeight / 2f); + // If we're already in the dismiss target area, then there won't be a move to set the + // temporary bounds, so just initialize it to the current bounds + if (mTemporaryBounds.isEmpty()) { + mTemporaryBounds.set(mBounds); + } mTemporaryBoundsPhysicsAnimator .spring(FloatProperties.RECT_X, destinationX, velX, mSpringConfig) .spring(FloatProperties.RECT_Y, destinationY, velY, mSpringConfig) diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java index 2f9b29d13744..7996316397e2 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java @@ -82,6 +82,9 @@ public class PipTouchHandler { /** Duration of the dismiss scrim fading in/out. */ private static final int DISMISS_TRANSITION_DURATION_MS = 200; + /* The multiplier to apply scale the target size by when applying the magnetic field radius */ + private static final float MAGNETIC_FIELD_RADIUS_MULTIPLIER = 1.25f; + // Allow dragging the PIP to a location to close it private final boolean mEnableDismissDragToEdge; // Allow PIP to resize to a slightly bigger state upon touch @@ -124,7 +127,7 @@ public class PipTouchHandler { /** Default configuration to use for springing the dismiss target in/out. */ private final PhysicsAnimator.SpringConfig mTargetSpringConfig = new PhysicsAnimator.SpringConfig( - SpringForce.STIFFNESS_MEDIUM, SpringForce.DAMPING_RATIO_NO_BOUNCY); + SpringForce.STIFFNESS_LOW, SpringForce.DAMPING_RATIO_LOW_BOUNCY); // The current movement bounds private Rect mMovementBounds = new Rect(); @@ -250,8 +253,9 @@ public class PipTouchHandler { mPipBoundsHandler = pipBoundsHandler; mFloatingContentCoordinator = floatingContentCoordinator; - mConnection = new PipAccessibilityInteractionConnection(mMotionHelper, - this::onAccessibilityShowMenu, mHandler); + mConnection = new PipAccessibilityInteractionConnection(mContext, mMotionHelper, + pipTaskOrganizer, pipSnapAlgorithm, this::onAccessibilityShowMenu, + this::updateMovementBounds, mHandler); mTargetView = new DismissCircleView(context); mTargetViewContainer = new FrameLayout(context); @@ -324,11 +328,14 @@ public class PipTouchHandler { final int targetSize = res.getDimensionPixelSize(R.dimen.dismiss_circle_size); final FrameLayout.LayoutParams newParams = new FrameLayout.LayoutParams(targetSize, targetSize); - newParams.gravity = Gravity.CENTER; + newParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; + newParams.bottomMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.floating_dismiss_bottom_margin); mTargetView.setLayoutParams(newParams); - // Set the magnetic field radius equal to twice the size of the target. - mMagneticTarget.setMagneticFieldRadiusPx(targetSize * 2); + // Set the magnetic field radius equal to the target size from the center of the target + mMagneticTarget.setMagneticFieldRadiusPx( + (int) (targetSize * MAGNETIC_FIELD_RADIUS_MULTIPLIER)); } private boolean shouldShowResizeHandle() { @@ -467,9 +474,9 @@ public class PipTouchHandler { // touching the screen } else { final boolean isExpanded = mMenuState == MENU_STATE_FULL && willResizeMenu(); - final Rect toMovementBounds = isExpanded - ? new Rect(expandedMovementBounds) - : new Rect(normalMovementBounds); + final Rect toMovementBounds = new Rect(); + mSnapAlgorithm.getMovementBounds(curBounds, insetBounds, + toMovementBounds, mIsImeShowing ? mImeHeight : 0); final int prevBottom = mMovementBounds.bottom - mMovementBoundsExtraOffsets; final int toBottom = toMovementBounds.bottom < toMovementBounds.top ? toMovementBounds.bottom @@ -497,6 +504,8 @@ public class PipTouchHandler { mInsetBounds.set(insetBounds); updateMovementBounds(); mMovementBoundsExtraOffsets = extraOffset; + mConnection.onMovementBoundsChanged(mNormalBounds, mExpandedBounds, mNormalMovementBounds, + mExpandedMovementBounds); // If we have a deferred resize, apply it now if (mDeferResizeToNormalBoundsUntilRotation == displayRotation) { @@ -948,7 +957,6 @@ public class PipTouchHandler { } final PointF vel = touchState.getVelocity(); - final float velocity = PointF.length(vel.x, vel.y); if (touchState.isDragging()) { if (mMenuState != MENU_STATE_NONE) { @@ -1039,6 +1047,7 @@ public class PipTouchHandler { pw.println(innerPrefix + "mShelfHeight=" + mShelfHeight); pw.println(innerPrefix + "mSavedSnapFraction=" + mSavedSnapFraction); pw.println(innerPrefix + "mEnableDragToEdgeDismiss=" + mEnableDismissDragToEdge); + pw.println(innerPrefix + "mMovementBoundsExtraOffsets=" + mMovementBoundsExtraOffsets); mTouchState.dump(pw, innerPrefix); mMotionHelper.dump(pw, innerPrefix); } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java index 4be0c157de8e..132c04d381dd 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java @@ -31,7 +31,7 @@ import java.io.PrintWriter; * This keeps track of the touch state throughout the current touch gesture. */ public class PipTouchState { - private static final String TAG = "PipTouchHandler"; + private static final String TAG = "PipTouchState"; private static final boolean DEBUG = false; @VisibleForTesting diff --git a/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java b/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java index 2365e67fec2f..0a84f5ee1bb9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java +++ b/packages/SystemUI/src/com/android/systemui/qs/AutoAddTracker.java @@ -23,6 +23,7 @@ import static com.android.systemui.statusbar.phone.AutoTileManager.WORK; import android.content.Context; import android.database.ContentObserver; import android.os.Handler; +import android.os.UserHandle; import android.provider.Settings.Secure; import android.text.TextUtils; import android.util.ArraySet; @@ -30,6 +31,7 @@ import android.util.ArraySet; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.Prefs; import com.android.systemui.Prefs.Key; +import com.android.systemui.util.UserAwareController; import java.util.Arrays; import java.util.Collection; @@ -37,7 +39,7 @@ import java.util.Collections; import javax.inject.Inject; -public class AutoAddTracker { +public class AutoAddTracker implements UserAwareController { private static final String[][] CONVERT_PREFS = { {Key.QS_HOTSPOT_ADDED, HOTSPOT}, @@ -49,20 +51,39 @@ public class AutoAddTracker { private final ArraySet<String> mAutoAdded; private final Context mContext; + private int mUserId; - @Inject - public AutoAddTracker(Context context) { + public AutoAddTracker(Context context, int userId) { mContext = context; + mUserId = userId; mAutoAdded = new ArraySet<>(getAdded()); // TODO: remove migration code and shared preferences keys after P release - for (String[] convertPref : CONVERT_PREFS) { - if (Prefs.getBoolean(context, convertPref[0], false)) { - setTileAdded(convertPref[1]); - Prefs.remove(context, convertPref[0]); + if (mUserId == UserHandle.USER_SYSTEM) { + for (String[] convertPref : CONVERT_PREFS) { + if (Prefs.getBoolean(context, convertPref[0], false)) { + setTileAdded(convertPref[1]); + Prefs.remove(context, convertPref[0]); + } } } mContext.getContentResolver().registerContentObserver( - Secure.getUriFor(Secure.QS_AUTO_ADDED_TILES), false, mObserver); + Secure.getUriFor(Secure.QS_AUTO_ADDED_TILES), false, mObserver, + UserHandle.USER_ALL); + } + + @Override + public void changeUser(UserHandle newUser) { + if (newUser.getIdentifier() == mUserId) { + return; + } + mUserId = newUser.getIdentifier(); + mAutoAdded.clear(); + mAutoAdded.addAll(getAdded()); + } + + @Override + public int getCurrentUserId() { + return mUserId; } public boolean isAdded(String tile) { @@ -86,12 +107,13 @@ public class AutoAddTracker { } private void saveTiles() { - Secure.putString(mContext.getContentResolver(), Secure.QS_AUTO_ADDED_TILES, - TextUtils.join(",", mAutoAdded)); + Secure.putStringForUser(mContext.getContentResolver(), Secure.QS_AUTO_ADDED_TILES, + TextUtils.join(",", mAutoAdded), mUserId); } private Collection<String> getAdded() { - String current = Secure.getString(mContext.getContentResolver(), Secure.QS_AUTO_ADDED_TILES); + String current = Secure.getStringForUser(mContext.getContentResolver(), + Secure.QS_AUTO_ADDED_TILES, mUserId); if (current == null) { return Collections.emptyList(); } @@ -102,7 +124,27 @@ public class AutoAddTracker { protected final ContentObserver mObserver = new ContentObserver(new Handler()) { @Override public void onChange(boolean selfChange) { + mAutoAdded.clear(); mAutoAdded.addAll(getAdded()); } }; + + public static class Builder { + private final Context mContext; + private int mUserId; + + @Inject + public Builder(Context context) { + mContext = context; + } + + public Builder setUserId(int userId) { + mUserId = userId; + return this; + } + + public AutoAddTracker build() { + return new AutoAddTracker(mContext, mUserId); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 7bcaa7263cc4..51eca67e02f9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -148,14 +148,19 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic final String vpnName = mSecurityController.getPrimaryVpnName(); final String vpnNameWorkProfile = mSecurityController.getWorkProfileVpnName(); final CharSequence organizationName = mSecurityController.getDeviceOwnerOrganizationName(); - final CharSequence workProfileName = mSecurityController.getWorkProfileOrganizationName(); + final CharSequence workProfileOrganizationName = + mSecurityController.getWorkProfileOrganizationName(); + final boolean isProfileOwnerOfOrganizationOwnedDevice = + mSecurityController.isProfileOwnerOfOrganizationOwnedDevice(); // Update visibility of footer - mIsVisible = (isDeviceManaged && !isDemoDevice) || hasCACerts || hasCACertsInWorkProfile || - vpnName != null || vpnNameWorkProfile != null; + mIsVisible = (isDeviceManaged && !isDemoDevice) || hasCACerts || hasCACertsInWorkProfile + || vpnName != null || vpnNameWorkProfile != null + || isProfileOwnerOfOrganizationOwnedDevice; // Update the string mFooterTextContent = getFooterText(isDeviceManaged, hasWorkProfile, hasCACerts, hasCACertsInWorkProfile, isNetworkLoggingEnabled, vpnName, - vpnNameWorkProfile, organizationName, workProfileName); + vpnNameWorkProfile, organizationName, workProfileOrganizationName, + isProfileOwnerOfOrganizationOwnedDevice); // Update the icon int footerIconId = R.drawable.ic_info_outline; if (vpnName != null || vpnNameWorkProfile != null) { @@ -175,7 +180,8 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic protected CharSequence getFooterText(boolean isDeviceManaged, boolean hasWorkProfile, boolean hasCACerts, boolean hasCACertsInWorkProfile, boolean isNetworkLoggingEnabled, String vpnName, String vpnNameWorkProfile, CharSequence organizationName, - CharSequence workProfileName) { + CharSequence workProfileOrganizationName, + boolean isProfileOwnerOfOrganizationOwnedDevice) { if (isDeviceManaged || DEBUG_FORCE_VISIBLE) { if (hasCACerts || hasCACertsInWorkProfile || isNetworkLoggingEnabled) { if (organizationName == null) { @@ -211,13 +217,13 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic organizationName); } // end if(isDeviceManaged) if (hasCACertsInWorkProfile) { - if (workProfileName == null) { + if (workProfileOrganizationName == null) { return mContext.getString( R.string.quick_settings_disclosure_managed_profile_monitoring); } return mContext.getString( R.string.quick_settings_disclosure_named_managed_profile_monitoring, - workProfileName); + workProfileOrganizationName); } if (hasCACerts) { return mContext.getString(R.string.quick_settings_disclosure_monitoring); @@ -238,6 +244,13 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic return mContext.getString(R.string.quick_settings_disclosure_named_vpn, vpnName); } + if (isProfileOwnerOfOrganizationOwnedDevice) { + if (workProfileOrganizationName == null) { + return mContext.getString(R.string.quick_settings_disclosure_management); + } + return mContext.getString(R.string.quick_settings_disclosure_named_management, + workProfileOrganizationName); + } return null; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index 65d3572d04a3..858a7e2e30e0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -255,6 +255,9 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D int currentUser = ActivityManager.getCurrentUser(); if (currentUser != mCurrentUser) { mUserContext = mContext.createContextAsUser(UserHandle.of(currentUser), 0); + if (mAutoTiles != null) { + mAutoTiles.changeUser(UserHandle.of(currentUser)); + } } if (tileSpecs.equals(mTileSpecs) && currentUser == mCurrentUser) return; mTiles.entrySet().stream().filter(tile -> !tileSpecs.contains(tile.getKey())).forEach( diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index 8c1e1dd0cac7..f476ddd7c14a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -18,10 +18,8 @@ package com.android.systemui.screenshot; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; -import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; -import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.SCREENSHOT_SCROLLING_ENABLED; import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT; import android.animation.Animator; @@ -51,7 +49,6 @@ import android.graphics.Region; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.Icon; import android.graphics.drawable.InsetDrawable; import android.graphics.drawable.LayerDrawable; import android.media.MediaActionSound; @@ -62,7 +59,6 @@ import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; import android.os.UserHandle; -import android.provider.DeviceConfig; import android.provider.Settings; import android.util.DisplayMetrics; import android.util.Log; @@ -955,22 +951,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset }); mScreenshotPreview.setContentDescription(imageData.editAction.title); - if (DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI, SCREENSHOT_SCROLLING_ENABLED, false)) { - ScreenshotActionChip scrollChip = (ScreenshotActionChip) inflater.inflate( - R.layout.global_screenshot_action_chip, mActionsView, false); - Toast scrollNotImplemented = Toast.makeText( - mContext, "Not implemented", Toast.LENGTH_SHORT); - scrollChip.setText("Extend"); // TODO: add resource and translate - scrollChip.setIcon( - Icon.createWithResource(mContext, R.drawable.ic_arrow_downward), true); - scrollChip.setOnClickListener(v -> { - mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SCROLL_TAPPED); - scrollNotImplemented.show(); - }); - mActionsView.addView(scrollChip); - chips.add(scrollChip); - } - // remove the margin from the last chip so that it's correctly aligned with the end LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mActionsView.getChildAt(mActionsView.getChildCount() - 1).getLayoutParams(); diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index 21810c0e7cf5..03a0d930a3d9 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -127,7 +127,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, snap.calculateNonDismissingSnapTarget(position); sdl.resizeSplits(target.position, t); - if (isSplitActive()) { + if (isSplitActive() && mHomeStackResizable) { WindowManagerProxy.applyHomeTasksMinimized(sdl, mSplits.mSecondary.token, t); } if (mWindowManagerProxy.queueSyncTransactionIfWaiting(t)) { @@ -428,7 +428,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, } private void updateTouchable() { - mWindowManager.setTouchable((mHomeStackResizable || !mMinimized) && !mAdjustedForIme); + mWindowManager.setTouchable(!mAdjustedForIme); } /** @@ -523,7 +523,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, } void ensureMinimizedSplit() { - setHomeMinimized(true /* minimized */, mSplits.mSecondary.isResizable()); + setHomeMinimized(true /* minimized */, mHomeStackResizable); if (!isDividerVisible()) { // Wasn't in split-mode yet, so enter now. if (DEBUG) { diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java index aea87f2d1971..d782a3cadc19 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java @@ -126,16 +126,16 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor @Override public void onImeStartPositioning(int displayId, int hiddenTop, int shownTop, boolean imeShouldShow, SurfaceControl.Transaction t) { + mHiddenTop = hiddenTop; + mShownTop = shownTop; + mTargetShown = imeShouldShow; if (!isDividerVisible()) { return; } final boolean splitIsVisible = !getView().isHidden(); mSecondaryHasFocus = getSecondaryHasFocus(displayId); final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus - && !getLayout().mDisplayLayout.isLandscape(); - mHiddenTop = hiddenTop; - mShownTop = shownTop; - mTargetShown = imeShouldShow; + && !getLayout().mDisplayLayout.isLandscape() && !mSplits.mDivider.isMinimized(); if (mLastAdjustTop < 0) { mLastAdjustTop = imeShouldShow ? hiddenTop : shownTop; } else if (mLastAdjustTop != (imeShouldShow ? mShownTop : mHiddenTop)) { diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 2271f6de194f..42d8c959371f 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -320,8 +320,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, super.onAttachedToWindow(); // Save the current target if not minimized once attached to window - if (mHomeStackResizable && mDockSide != WindowManager.DOCKED_INVALID - && !mIsInMinimizeInteraction) { + if (mDockSide != WindowManager.DOCKED_INVALID && !mIsInMinimizeInteraction) { saveSnapTargetBeforeMinimized(mSnapTargetBeforeMinimized); } mFirstLayout = true; @@ -470,8 +469,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, } public DividerSnapAlgorithm getSnapAlgorithm() { - return mDockedStackMinimized - && mHomeStackResizable ? mSplitLayout.getMinimizedSnapAlgorithm() + return mDockedStackMinimized ? mSplitLayout.getMinimizedSnapAlgorithm(mHomeStackResizable) : mSplitLayout.getSnapAlgorithm(); } @@ -629,7 +627,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, } // Record last snap target the divider moved to - if (mHomeStackResizable && !mIsInMinimizeInteraction) { + if (!mIsInMinimizeInteraction) { // The last snapTarget position can be negative when the last divider position was // offscreen. In that case, save the middle (default) SnapTarget so calculating next // position isn't negative. @@ -774,7 +772,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, mSplitLayout.resizeSplits(midPos); Transaction t = mTiles.getTransaction(); if (mDockedStackMinimized) { - int position = mSplitLayout.getMinimizedSnapAlgorithm().getMiddleTarget().position; + int position = mSplitLayout.getMinimizedSnapAlgorithm(mHomeStackResizable) + .getMiddleTarget().position; calculateBoundsForPosition(position, mDockSide, mDockedRect); calculateBoundsForPosition(position, DockedDividerUtils.invertDockSide(mDockSide), mOtherRect); @@ -811,23 +810,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, updateDockSide(); if (!minimized) { resetBackground(); - } else if (!isHomeStackResizable) { - if (mDockSide == WindowManager.DOCKED_TOP) { - mBackground.setPivotY(0); - mBackground.setScaleY(MINIMIZE_DOCK_SCALE); - } else if (mDockSide == WindowManager.DOCKED_LEFT - || mDockSide == WindowManager.DOCKED_RIGHT) { - mBackground.setPivotX(mDockSide == WindowManager.DOCKED_LEFT - ? 0 - : mBackground.getWidth()); - mBackground.setScaleX(MINIMIZE_DOCK_SCALE); - } } mMinimizedShadow.setAlpha(minimized ? 1f : 0f); - if (!isHomeStackResizable) { - mHandle.setAlpha(minimized ? 0f : 1f); - mDockedStackMinimized = minimized; - } else if (mDockedStackMinimized != minimized) { + if (mDockedStackMinimized != minimized) { mDockedStackMinimized = minimized; if (mSplitLayout.mDisplayLayout.rotation() != mDefaultDisplay.getRotation()) { // Splitscreen to minimize is about to starts after rotating landscape to seascape, @@ -840,8 +825,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, // Relayout to recalculate the divider shadow when minimizing requestLayout(); mIsInMinimizeInteraction = true; - resizeStackSurfaces( - mSplitLayout.getMinimizedSnapAlgorithm().getMiddleTarget(), t); + resizeStackSurfaces(mSplitLayout.getMinimizedSnapAlgorithm(mHomeStackResizable) + .getMiddleTarget(), t); } else { resizeStackSurfaces(mSnapTargetBeforeMinimized, t); mIsInMinimizeInteraction = false; @@ -860,11 +845,11 @@ public class DividerView extends FrameLayout implements OnTouchListener, t.show(sc).apply(); mTiles.releaseTransaction(t); }); - if (isHomeStackResizable) { - SnapTarget miniMid = mSplitLayout.getMinimizedSnapAlgorithm().getMiddleTarget(); - if (mDockedStackMinimized) { - mDividerPositionY = mDividerPositionX = miniMid.position; - } + + SnapTarget miniMid = + mSplitLayout.getMinimizedSnapAlgorithm(isHomeStackResizable).getMiddleTarget(); + if (mDockedStackMinimized) { + mDividerPositionY = mDividerPositionX = miniMid.position; } } @@ -903,38 +888,15 @@ public class DividerView extends FrameLayout implements OnTouchListener, if (DEBUG) Slog.d(TAG, "setMinDock: " + mDockedStackMinimized + "->" + minimized); mHomeStackResizable = isHomeStackResizable; updateDockSide(); - if (!isHomeStackResizable) { - mMinimizedShadow.animate() - .alpha(minimized ? 1f : 0f) - .setInterpolator(Interpolators.ALPHA_IN) - .setDuration(animDuration) - .start(); - mHandle.animate() - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .setDuration(animDuration) - .alpha(minimized ? 0f : 1f) - .start(); - if (mDockSide == WindowManager.DOCKED_TOP) { - mBackground.setPivotY(0); - mBackground.animate() - .scaleY(minimized ? MINIMIZE_DOCK_SCALE : 1f); - } else if (mDockSide == WindowManager.DOCKED_LEFT - || mDockSide == WindowManager.DOCKED_RIGHT) { - mBackground.setPivotX(mDockSide == WindowManager.DOCKED_LEFT - ? 0 - : mBackground.getWidth()); - mBackground.animate() - .scaleX(minimized ? MINIMIZE_DOCK_SCALE : 1f); - } - mDockedStackMinimized = minimized; - } else if (mDockedStackMinimized != minimized) { + if (mDockedStackMinimized != minimized) { mIsInMinimizeInteraction = true; mDockedStackMinimized = minimized; stopDragging(minimized ? mSnapTargetBeforeMinimized.position : getCurrentPosition(), minimized - ? mSplitLayout.getMinimizedSnapAlgorithm().getMiddleTarget() + ? mSplitLayout.getMinimizedSnapAlgorithm(mHomeStackResizable) + .getMiddleTarget() : mSnapTargetBeforeMinimized, animDuration, Interpolators.FAST_OUT_SLOW_IN, 0); setAdjustedForIme(false, animDuration); @@ -1127,7 +1089,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, final boolean ownTransaction = transaction == null; final Transaction t = ownTransaction ? mTiles.getTransaction() : transaction; mLastResizeRect.set(mDockedRect); - if (mHomeStackResizable && mIsInMinimizeInteraction) { + if (mIsInMinimizeInteraction) { calculateBoundsForPosition(mSnapTargetBeforeMinimized.position, mDockSide, mDockedTaskRect); calculateBoundsForPosition(mSnapTargetBeforeMinimized.position, @@ -1138,8 +1100,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, mDockedTaskRect.offset(Math.max(position, -mDividerSize) - mDockedTaskRect.left + mDividerSize, 0); } - resizeSplitSurfaces(t, mDockedRect, mDockedTaskRect, mOtherRect, - mOtherTaskRect); + resizeSplitSurfaces(t, mDockedRect, mDockedTaskRect, mOtherRect, mOtherTaskRect); if (ownTransaction) { t.apply(); mTiles.releaseTransaction(t); @@ -1420,7 +1381,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, void onUndockingTask() { int dockSide = mSplitLayout.getPrimarySplitSide(); - if (inSplitMode() && (mHomeStackResizable || !mDockedStackMinimized)) { + if (inSplitMode()) { startDragging(false /* animate */, false /* touching */); SnapTarget target = dockSideTopLeft(dockSide) ? mSplitLayout.getSnapAlgorithm().getDismissEndTarget() diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java index 92f6b4a2d8c4..69095f7538c5 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitDisplayLayout.java @@ -16,8 +16,6 @@ package com.android.systemui.stackdivider; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.view.WindowManager.DOCKED_BOTTOM; @@ -113,11 +111,6 @@ public class SplitDisplayLayout { } } - boolean isMinimized() { - return mTiles.mSecondary.topActivityType == ACTIVITY_TYPE_HOME - || mTiles.mSecondary.topActivityType == ACTIVITY_TYPE_RECENTS; - } - DividerSnapAlgorithm getSnapAlgorithm() { if (mSnapAlgorithm == null) { updateResources(); @@ -129,14 +122,14 @@ public class SplitDisplayLayout { return mSnapAlgorithm; } - DividerSnapAlgorithm getMinimizedSnapAlgorithm() { + DividerSnapAlgorithm getMinimizedSnapAlgorithm(boolean homeStackResizable) { if (mMinimizedSnapAlgorithm == null) { updateResources(); boolean isHorizontalDivision = !mDisplayLayout.isLandscape(); mMinimizedSnapAlgorithm = new DividerSnapAlgorithm(mContext.getResources(), mDisplayLayout.width(), mDisplayLayout.height(), mDividerSize, isHorizontalDivision, mDisplayLayout.stableInsets(), getPrimarySplitSide(), - true /* isMinimized */); + true /* isMinimized */, homeStackResizable); } return mMinimizedSnapAlgorithm; } @@ -168,8 +161,9 @@ public class SplitDisplayLayout { mDisplayLayout.height(), mDividerSize); } - Rect calcMinimizedHomeStackBounds() { - DividerSnapAlgorithm.SnapTarget miniMid = getMinimizedSnapAlgorithm().getMiddleTarget(); + Rect calcResizableMinimizedHomeStackBounds() { + DividerSnapAlgorithm.SnapTarget miniMid = + getMinimizedSnapAlgorithm(true /* resizable */).getMiddleTarget(); Rect homeBounds = new Rect(); DockedDividerUtils.calculateBoundsForPosition(miniMid.position, DockedDividerUtils.invertDockSide(getPrimarySplitSide()), homeBounds, diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java index db324822994b..6751e8d6223d 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java @@ -165,8 +165,9 @@ class SplitScreenTaskOrganizer extends TaskOrganizer { Log.e(TAG, "Got handleTaskInfoChanged when not initialized: " + info); return; } - final boolean secondaryWasHomeOrRecents = mSecondary.topActivityType == ACTIVITY_TYPE_HOME - || mSecondary.topActivityType == ACTIVITY_TYPE_RECENTS; + final boolean secondaryImpliedMinimize = mSecondary.topActivityType == ACTIVITY_TYPE_HOME + || (mSecondary.topActivityType == ACTIVITY_TYPE_RECENTS + && mDivider.isHomeStackResizable()); final boolean primaryWasEmpty = mPrimary.topActivityType == ACTIVITY_TYPE_UNDEFINED; final boolean secondaryWasEmpty = mSecondary.topActivityType == ACTIVITY_TYPE_UNDEFINED; if (info.token.asBinder() == mPrimary.token.asBinder()) { @@ -176,13 +177,14 @@ class SplitScreenTaskOrganizer extends TaskOrganizer { } final boolean primaryIsEmpty = mPrimary.topActivityType == ACTIVITY_TYPE_UNDEFINED; final boolean secondaryIsEmpty = mSecondary.topActivityType == ACTIVITY_TYPE_UNDEFINED; - final boolean secondaryIsHomeOrRecents = mSecondary.topActivityType == ACTIVITY_TYPE_HOME - || mSecondary.topActivityType == ACTIVITY_TYPE_RECENTS; + final boolean secondaryImpliesMinimize = mSecondary.topActivityType == ACTIVITY_TYPE_HOME + || (mSecondary.topActivityType == ACTIVITY_TYPE_RECENTS + && mDivider.isHomeStackResizable()); if (DEBUG) { Log.d(TAG, "onTaskInfoChanged " + mPrimary + " " + mSecondary); } if (primaryIsEmpty == primaryWasEmpty && secondaryWasEmpty == secondaryIsEmpty - && secondaryWasHomeOrRecents == secondaryIsHomeOrRecents) { + && secondaryImpliedMinimize == secondaryImpliesMinimize) { // No relevant changes return; } @@ -211,7 +213,7 @@ class SplitScreenTaskOrganizer extends TaskOrganizer { } mDivider.startEnterSplit(); } - } else if (secondaryIsHomeOrRecents) { + } else if (secondaryImpliesMinimize) { // Both splits are populated but the secondary split has a home/recents stack on top, // so enter minimized mode. mDivider.ensureMinimizedSplit(); diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java index 853a22505542..410e3dd39a0b 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java @@ -19,6 +19,9 @@ package com.android.systemui.stackdivider; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; +import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.content.res.Configuration.ORIENTATION_UNDEFINED; import static android.view.Display.DEFAULT_DISPLAY; import android.annotation.NonNull; @@ -115,7 +118,7 @@ public class WindowManagerProxy { WindowOrganizer.applyTransaction(t); } - private static boolean getHomeAndRecentsTasks(List<WindowContainerToken> out, + private static boolean getHomeAndRecentsTasks(List<ActivityManager.RunningTaskInfo> out, WindowContainerToken parent) { boolean resizable = false; List<ActivityManager.RunningTaskInfo> rootTasks = parent == null @@ -123,9 +126,9 @@ public class WindowManagerProxy { : TaskOrganizer.getChildTasks(parent, HOME_AND_RECENTS); for (int i = 0, n = rootTasks.size(); i < n; ++i) { final ActivityManager.RunningTaskInfo ti = rootTasks.get(i); - out.add(ti.token); + out.add(ti); if (ti.topActivityType == ACTIVITY_TYPE_HOME) { - resizable = ti.isResizable(); + resizable = ti.isResizeable; } } return resizable; @@ -140,16 +143,37 @@ public class WindowManagerProxy { @NonNull WindowContainerTransaction wct) { // Resize the home/recents stacks to the larger minimized-state size final Rect homeBounds; - final ArrayList<WindowContainerToken> homeStacks = new ArrayList<>(); + final ArrayList<ActivityManager.RunningTaskInfo> homeStacks = new ArrayList<>(); boolean isHomeResizable = getHomeAndRecentsTasks(homeStacks, parent); if (isHomeResizable) { - homeBounds = layout.calcMinimizedHomeStackBounds(); + homeBounds = layout.calcResizableMinimizedHomeStackBounds(); } else { - homeBounds = new Rect(0, 0, layout.mDisplayLayout.width(), - layout.mDisplayLayout.height()); + // home is not resizable, so lock it to its inherent orientation size. + homeBounds = new Rect(0, 0, 0, 0); + for (int i = homeStacks.size() - 1; i >= 0; --i) { + if (homeStacks.get(i).topActivityType == ACTIVITY_TYPE_HOME) { + final int orient = homeStacks.get(i).configuration.orientation; + final boolean displayLandscape = layout.mDisplayLayout.isLandscape(); + final boolean isLandscape = orient == ORIENTATION_LANDSCAPE + || (orient == ORIENTATION_UNDEFINED && displayLandscape); + homeBounds.right = isLandscape == displayLandscape + ? layout.mDisplayLayout.width() : layout.mDisplayLayout.height(); + homeBounds.bottom = isLandscape == displayLandscape + ? layout.mDisplayLayout.height() : layout.mDisplayLayout.width(); + break; + } + } } for (int i = homeStacks.size() - 1; i >= 0; --i) { - wct.setBounds(homeStacks.get(i), homeBounds); + // For non-resizable homes, the minimized size is actually the fullscreen-size. As a + // result, we don't minimize for recents since it only shows half-size screenshots. + if (!isHomeResizable) { + if (homeStacks.get(i).topActivityType == ACTIVITY_TYPE_RECENTS) { + continue; + } + wct.setWindowingMode(homeStacks.get(i).token, WINDOWING_MODE_FULLSCREEN); + } + wct.setBounds(homeStacks.get(i).token, homeBounds); } layout.mTiles.mHomeBounds.set(homeBounds); return isHomeResizable; @@ -175,11 +199,13 @@ public class WindowManagerProxy { return false; } ActivityManager.RunningTaskInfo topHomeTask = null; - boolean homeIsTop = false; for (int i = rootTasks.size() - 1; i >= 0; --i) { final ActivityManager.RunningTaskInfo rootTask = rootTasks.get(i); - // Only move resizeable task to split secondary. WM will just ignore this anyways... - if (!rootTask.isResizable()) continue; + // Only move resizeable task to split secondary. However, we have an exception + // for non-resizable home because we will minimize to show it. + if (!rootTask.isResizeable && rootTask.topActivityType != ACTIVITY_TYPE_HOME) { + continue; + } // Only move fullscreen tasks to split secondary. if (rootTask.configuration.windowConfiguration.getWindowingMode() != WINDOWING_MODE_FULLSCREEN) { @@ -193,7 +219,7 @@ public class WindowManagerProxy { // Move the secondary split-forward. wct.reorder(tiles.mSecondary.token, true /* onTop */); boolean isHomeResizable = applyHomeTasksMinimized(layout, null /* parent */, wct); - if (isHomeResizable && topHomeTask != null) { + if (topHomeTask != null) { // Translate/update-crop of secondary out-of-band with sync transaction -- Until BALST // is enabled, this temporarily syncs the home surface position with offset until // sync transaction finishes. @@ -253,6 +279,7 @@ public class WindowManagerProxy { wct.reparent(ti.token, null /* parent */, true /* onTop */); if (isHomeOrRecentTask(ti)) { wct.setBounds(ti.token, null); + wct.setWindowingMode(ti.token, WINDOWING_MODE_UNDEFINED); if (i == 0) { homeOnTop = true; } @@ -293,8 +320,9 @@ public class WindowManagerProxy { final ActivityManager.RunningTaskInfo ti = secondaryChildren.get(i); if (isHomeOrRecentTask(ti)) { wct.reparent(ti.token, null /* parent */, true /* onTop */); - // reset bounds too + // reset bounds and mode too wct.setBounds(ti.token, null); + wct.setWindowingMode(ti.token, WINDOWING_MODE_UNDEFINED); } } for (int i = primaryChildren.size() - 1; i >= 0; --i) { @@ -304,6 +332,7 @@ public class WindowManagerProxy { } for (int i = freeHomeAndRecents.size() - 1; i >= 0; --i) { wct.setBounds(freeHomeAndRecents.get(i).token, null); + wct.setWindowingMode(freeHomeAndRecents.get(i).token, WINDOWING_MODE_UNDEFINED); } // Reset focusable to true wct.setFocusable(tiles.mPrimary.token, true /* focusable */); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ForegroundCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java index b5b756d6ed9b..4b244bb18975 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ForegroundCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java @@ -39,8 +39,8 @@ import javax.inject.Inject; import javax.inject.Singleton; /** - * Handles ForegroundService interactions with notifications. - * Tags notifications with appOps. + * Handles ForegroundService and AppOp interactions with notifications. + * Tags notifications with appOps * Lifetime extends notifications associated with an ongoing ForegroundService. * Filters out notifications that represent foreground services that are no longer running * @@ -48,12 +48,10 @@ import javax.inject.Singleton; * frameworks/base/packages/SystemUI/src/com/android/systemui/ForegroundServiceController * frameworks/base/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener * frameworks/base/packages/SystemUI/src/com/android/systemui/ForegroundServiceLifetimeExtender - * - * TODO: AppOps stuff should be spun off into its own coordinator */ @Singleton -public class ForegroundCoordinator implements Coordinator { - private static final String TAG = "ForegroundCoordinator"; +public class AppOpsCoordinator implements Coordinator { + private static final String TAG = "AppOpsCoordinator"; private final ForegroundServiceController mForegroundServiceController; private final AppOpsController mAppOpsController; @@ -62,7 +60,7 @@ public class ForegroundCoordinator implements Coordinator { private NotifPipeline mNotifPipeline; @Inject - public ForegroundCoordinator( + public AppOpsCoordinator( ForegroundServiceController foregroundServiceController, AppOpsController appOpsController, @Main DelayableExecutor mainExecutor) { @@ -89,18 +87,22 @@ public class ForegroundCoordinator implements Coordinator { } /** - * Filters out notifications that represent foreground services that are no longer running. + * Filters out notifications that represent foreground services that are no longer running or + * that already have an app notification with the appOps tagged to */ private final NotifFilter mNotifFilter = new NotifFilter(TAG) { @Override public boolean shouldFilterOut(NotificationEntry entry, long now) { StatusBarNotification sbn = entry.getSbn(); + + // Filters out system-posted disclosure notifications when unneeded if (mForegroundServiceController.isDisclosureNotification(sbn) && !mForegroundServiceController.isDisclosureNeededForUser( sbn.getUser().getIdentifier())) { return true; } + // Filters out system alert notifications when unneeded if (mForegroundServiceController.isSystemAlertNotification(sbn)) { final String[] apps = sbn.getNotification().extras.getStringArray( Notification.EXTRA_FOREGROUND_APPS); @@ -179,23 +181,24 @@ public class ForegroundCoordinator implements Coordinator { private NotifCollectionListener mNotifCollectionListener = new NotifCollectionListener() { @Override public void onEntryAdded(NotificationEntry entry) { - tagForeground(entry); + tagAppOps(entry); } @Override public void onEntryUpdated(NotificationEntry entry) { - tagForeground(entry); + tagAppOps(entry); } - private void tagForeground(NotificationEntry entry) { + private void tagAppOps(NotificationEntry entry) { final StatusBarNotification sbn = entry.getSbn(); // note: requires that the ForegroundServiceController is updating their appOps first ArraySet<Integer> activeOps = mForegroundServiceController.getAppOps( sbn.getUser().getIdentifier(), sbn.getPackageName()); + + entry.mActiveAppOps.clear(); if (activeOps != null) { - entry.mActiveAppOps.clear(); entry.mActiveAppOps.addAll(activeOps); } } @@ -218,24 +221,26 @@ public class ForegroundCoordinator implements Coordinator { int userId = UserHandle.getUserId(uid); - // Update appOp if there's an associated posted notification: - final String foregroundKey = mForegroundServiceController.getStandardLayoutKey(userId, - packageName); - if (foregroundKey != null) { - final NotificationEntry entry = findNotificationEntryWithKey(foregroundKey); - if (entry != null - && uid == entry.getSbn().getUid() - && packageName.equals(entry.getSbn().getPackageName())) { - boolean changed; - if (active) { - changed = entry.mActiveAppOps.add(code); - } else { - changed = entry.mActiveAppOps.remove(code); - } - if (changed) { - mNotifFilter.invalidateList(); + // Update appOps of the app's posted notifications with standard layouts + final ArraySet<String> notifKeys = + mForegroundServiceController.getStandardLayoutKeys(userId, packageName); + if (notifKeys != null) { + boolean changed = false; + for (int i = 0; i < notifKeys.size(); i++) { + final NotificationEntry entry = findNotificationEntryWithKey(notifKeys.valueAt(i)); + if (entry != null + && uid == entry.getSbn().getUid() + && packageName.equals(entry.getSbn().getPackageName())) { + if (active) { + changed |= entry.mActiveAppOps.add(code); + } else { + changed |= entry.mActiveAppOps.remove(code); + } } } + if (changed) { + mNotifFilter.invalidateList(); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java index ac4296439507..99e822c66a8f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java @@ -52,7 +52,7 @@ public class NotifCoordinators implements Dumpable { HideNotifsForOtherUsersCoordinator hideNotifsForOtherUsersCoordinator, KeyguardCoordinator keyguardCoordinator, RankingCoordinator rankingCoordinator, - ForegroundCoordinator foregroundCoordinator, + AppOpsCoordinator appOpsCoordinator, DeviceProvisionedCoordinator deviceProvisionedCoordinator, BubbleCoordinator bubbleCoordinator, HeadsUpCoordinator headsUpCoordinator, @@ -64,7 +64,7 @@ public class NotifCoordinators implements Dumpable { mCoordinators.add(hideNotifsForOtherUsersCoordinator); mCoordinators.add(keyguardCoordinator); mCoordinators.add(rankingCoordinator); - mCoordinators.add(foregroundCoordinator); + mCoordinators.add(appOpsCoordinator); mCoordinators.add(deviceProvisionedCoordinator); mCoordinators.add(bubbleCoordinator); if (featureFlags.isNewNotifPipelineRenderingEnabled()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java index fc8c8dbba7fd..825919f17661 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java @@ -19,6 +19,7 @@ import android.content.res.Resources; import android.hardware.display.ColorDisplayManager; import android.hardware.display.NightDisplayListener; import android.os.Handler; +import android.os.UserHandle; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -34,6 +35,7 @@ import com.android.systemui.statusbar.policy.DataSaverController; import com.android.systemui.statusbar.policy.DataSaverController.Listener; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.HotspotController.Callback; +import com.android.systemui.util.UserAwareController; import java.util.ArrayList; import java.util.Objects; @@ -43,7 +45,7 @@ import javax.inject.Inject; /** * Manages which tiles should be automatically added to QS. */ -public class AutoTileManager { +public class AutoTileManager implements UserAwareController { private static final String TAG = "AutoTileManager"; public static final String HOTSPOT = "hotspot"; @@ -52,7 +54,9 @@ public class AutoTileManager { public static final String WORK = "work"; public static final String NIGHT = "night"; public static final String CAST = "cast"; - public static final String SETTING_SEPARATOR = ":"; + static final String SETTING_SEPARATOR = ":"; + + private UserHandle mCurrentUser; private final Context mContext; private final QSTileHost mHost; @@ -66,43 +70,56 @@ public class AutoTileManager { private final ArrayList<AutoAddSetting> mAutoAddSettingList = new ArrayList<>(); @Inject - public AutoTileManager(Context context, AutoAddTracker autoAddTracker, QSTileHost host, + public AutoTileManager(Context context, AutoAddTracker.Builder autoAddTrackerBuilder, + QSTileHost host, @Background Handler handler, HotspotController hotspotController, DataSaverController dataSaverController, ManagedProfileController managedProfileController, NightDisplayListener nightDisplayListener, CastController castController) { - mAutoTracker = autoAddTracker; mContext = context; mHost = host; + mCurrentUser = mHost.getUserContext().getUser(); + mAutoTracker = autoAddTrackerBuilder.setUserId(mCurrentUser.getIdentifier()).build(); mHandler = handler; mHotspotController = hotspotController; mDataSaverController = dataSaverController; mManagedProfileController = managedProfileController; mNightDisplayListener = nightDisplayListener; mCastController = castController; + + populateSettingsList(); + startControllersAndSettingsListeners(); + } + + protected void startControllersAndSettingsListeners() { if (!mAutoTracker.isAdded(HOTSPOT)) { - hotspotController.addCallback(mHotspotCallback); + mHotspotController.addCallback(mHotspotCallback); } if (!mAutoTracker.isAdded(SAVER)) { - dataSaverController.addCallback(mDataSaverListener); + mDataSaverController.addCallback(mDataSaverListener); } if (!mAutoTracker.isAdded(WORK)) { - managedProfileController.addCallback(mProfileCallback); + mManagedProfileController.addCallback(mProfileCallback); } if (!mAutoTracker.isAdded(NIGHT) && ColorDisplayManager.isNightDisplayAvailable(mContext)) { - nightDisplayListener.setCallback(mNightDisplayCallback); + mNightDisplayListener.setCallback(mNightDisplayCallback); } if (!mAutoTracker.isAdded(CAST)) { - castController.addCallback(mCastCallback); + mCastController.addCallback(mCastCallback); + } + + int settingsN = mAutoAddSettingList.size(); + for (int i = 0; i < settingsN; i++) { + if (!mAutoTracker.isAdded(mAutoAddSettingList.get(i).mSpec)) { + mAutoAddSettingList.get(i).setListening(true); + } } - populateSettingsList(); } - public void destroy() { - mAutoTracker.destroy(); + protected void stopListening() { mHotspotController.removeCallback(mHotspotCallback); mDataSaverController.removeCallback(mDataSaverListener); mManagedProfileController.removeCallback(mProfileCallback); @@ -116,6 +133,11 @@ public class AutoTileManager { } } + public void destroy() { + stopListening(); + mAutoTracker.destroy(); + } + /** * Populates a list with the pairs setting:spec in the config resource. * <p> @@ -137,17 +159,39 @@ public class AutoTileManager { if (split.length == 2) { String setting = split[0]; String spec = split[1]; - if (!mAutoTracker.isAdded(spec)) { - AutoAddSetting s = new AutoAddSetting(mContext, mHandler, setting, spec); - mAutoAddSettingList.add(s); - s.setListening(true); - } + // Populate all the settings. As they may not have been added in other users + AutoAddSetting s = new AutoAddSetting(mContext, mHandler, setting, spec); + mAutoAddSettingList.add(s); } else { Log.w(TAG, "Malformed item in array: " + tile); } } } + @Override + public void changeUser(UserHandle newUser) { + if (!Thread.currentThread().equals(mHandler.getLooper().getThread())) { + mHandler.post(() -> changeUser(newUser)); + return; + } + if (newUser.getIdentifier() == mCurrentUser.getIdentifier()) { + return; + } + stopListening(); + mCurrentUser = newUser; + int settingsN = mAutoAddSettingList.size(); + for (int i = 0; i < settingsN; i++) { + mAutoAddSettingList.get(i).setUserId(newUser.getIdentifier()); + } + mAutoTracker.changeUser(newUser); + startControllersAndSettingsListeners(); + } + + @Override + public int getCurrentUserId() { + return mCurrentUser.getIdentifier(); + } + public void unmarkTileAsAutoAdded(String tabSpec) { mAutoTracker.setTileRemoved(tabSpec); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index a065b74bda99..06d35a36e3c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -38,6 +38,7 @@ import android.service.notification.ZenModeConfig; import android.telecom.TelecomManager; import android.text.format.DateFormat; import android.util.Log; +import android.view.View; import androidx.lifecycle.Observer; @@ -677,12 +678,18 @@ public class PhoneStatusBarPolicy } mIconController.setIcon(mSlotScreenRecord, resourceId, description); mIconController.setIconVisibility(mSlotScreenRecord, true); + // Set as assertive so talkback will announce the countdown + mIconController.setIconAccessibilityLiveRegion(mSlotScreenRecord, + View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE); } @Override public void onCountdownEnd() { if (DEBUG) Log.d(TAG, "screenrecord: hiding icon during countdown"); mHandler.post(() -> mIconController.setIconVisibility(mSlotScreenRecord, false)); + // Reset talkback priority + mIconController.setIconAccessibilityLiveRegion(mSlotScreenRecord, + View.ACCESSIBILITY_LIVE_REGION_NONE); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 75da5d123972..93df14f18fda 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -67,6 +67,15 @@ public interface StatusBarIconController { public void setSignalIcon(String slot, WifiIconState state); public void setMobileIcons(String slot, List<MobileIconState> states); public void setIconVisibility(String slot, boolean b); + + /** + * Sets the live region mode for the icon + * @see android.view.View#setAccessibilityLiveRegion(int) + * @param slot Icon slot to set region for + * @param accessibilityLiveRegion live region mode for the icon + */ + void setIconAccessibilityLiveRegion(String slot, int accessibilityLiveRegion); + /** * If you don't know what to pass for `tag`, either remove all icons for slot, or use * TAG_PRIMARY to refer to the first icon at a given slot. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java index bfcbceaef9af..d0e806769f14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java @@ -265,6 +265,22 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu handleSet(index, holder); } + @Override + public void setIconAccessibilityLiveRegion(String slotName, int accessibilityLiveRegion) { + Slot slot = getSlot(slotName); + if (!slot.hasIconsInSlot()) { + return; + } + + int slotIndex = getSlotIndex(slotName); + List<StatusBarIconHolder> iconsToUpdate = slot.getHolderListInViewOrder(); + for (StatusBarIconHolder holder : iconsToUpdate) { + int viewIndex = getViewIndex(slotIndex, holder.getTag()); + mIconGroups.forEach(l -> l.mGroup.getChildAt(viewIndex) + .setAccessibilityLiveRegion(accessibilityLiveRegion)); + } + } + public void removeIcon(String slot) { removeAllIconsForSlot(slot); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java index 1fb9b691d525..79d264ca4577 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java @@ -24,6 +24,8 @@ public interface SecurityController extends CallbackController<SecurityControlle boolean isDeviceManaged(); boolean hasProfileOwner(); boolean hasWorkProfile(); + /** Whether this device is organization-owned with a work profile **/ + boolean isProfileOwnerOfOrganizationOwnedDevice(); String getDeviceOwnerName(); String getProfileOwnerName(); CharSequence getDeviceOwnerOrganizationName(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index d29f4fcd0c26..309d4b04ebbf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -207,6 +207,11 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi } @Override + public boolean isProfileOwnerOfOrganizationOwnedDevice() { + return mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile(); + } + + @Override public String getWorkProfileVpnName() { final int profileId = getWorkProfileUserId(mVpnUserId); if (profileId == UserHandle.USER_NULL) return null; diff --git a/packages/SystemUI/src/com/android/systemui/util/ConvenienceExtensions.kt b/packages/SystemUI/src/com/android/systemui/util/ConvenienceExtensions.kt index 631ea9d61361..ff53a9ff3b0a 100644 --- a/packages/SystemUI/src/com/android/systemui/util/ConvenienceExtensions.kt +++ b/packages/SystemUI/src/com/android/systemui/util/ConvenienceExtensions.kt @@ -17,6 +17,8 @@ package com.android.systemui.util import android.view.ViewGroup +import com.android.internal.util.IndentingPrintWriter +import java.io.PrintWriter /** [Sequence] that yields all of the direct children of this [ViewGroup] */ val ViewGroup.children @@ -32,4 +34,15 @@ fun <T> Sequence<T>.takeUntil(pred: (T) -> Boolean): Sequence<T> = sequence { break } } +} + +/** + * If `this` is an [IndentingPrintWriter], it will process block inside an indentation level. + * + * If not, this will just process block. + */ +inline fun PrintWriter.indentIfPossible(block: PrintWriter.() -> Unit) { + if (this is IndentingPrintWriter) increaseIndent() + block() + if (this is IndentingPrintWriter) decreaseIndent() }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/controls/UserAwareController.kt b/packages/SystemUI/src/com/android/systemui/util/UserAwareController.kt index d2776d27ae62..693c2708b0f7 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/UserAwareController.kt +++ b/packages/SystemUI/src/com/android/systemui/util/UserAwareController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.controls +package com.android.systemui.util import android.os.UserHandle @@ -23,6 +23,8 @@ import android.os.UserHandle * changes. */ interface UserAwareController { + @JvmDefault fun changeUser(newUser: UserHandle) {} + val currentUserId: Int }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt b/packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt index 47b607fc6285..f441049feefb 100644 --- a/packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt +++ b/packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt @@ -241,7 +241,7 @@ abstract class MagnetizedObject<T : Any>( * to the target. If this velocity is reached, the object will be freed even if it wasn't moved * outside the magnetic field radius. */ - var flingUnstuckFromTargetMinVelocity = 1000f + var flingUnstuckFromTargetMinVelocity = 4000f /** * Sets the maximum X velocity above which the object will not stick to the target. Even if the @@ -414,9 +414,10 @@ abstract class MagnetizedObject<T : Any>( cancelAnimations() if (objectStuckToTarget) { - if (hypot(velX, velY) > flingUnstuckFromTargetMinVelocity) { - // If the object is stuck, but it was forcefully flung away from the target, - // tell the listener so the object can be animated out of the target. + if (-velY > flingUnstuckFromTargetMinVelocity) { + // If the object is stuck, but it was forcefully flung away from the target in + // the upward direction, tell the listener so the object can be animated out of + // the target. magnetListener.onUnstuckFromTarget( targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true) } else { diff --git a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java index 805254cda175..60f0cd9da5f2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java @@ -406,60 +406,76 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { } @Test - public void testStdLayoutBasic() { - final String PKG1 = "com.example.app0"; - - StatusBarNotification sbn_user1_app1 = makeMockFgSBN(USERID_ONE, PKG1, 0, true); - sbn_user1_app1.getNotification().flags = 0; - StatusBarNotification sbn_user1_app1_fg = makeMockFgSBN(USERID_ONE, PKG1, 1, true); - entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); // not fg - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - entryAdded(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // app1 has got it covered - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "otherpkg")); - // let's take out the non-fg notification and see what happens. - entryRemoved(sbn_user1_app1); - // still covered by sbn_user1_app1_fg - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anyPkg")); + public void testNoNotifsNorAppOps_noSystemAlertWarningRequired() { + // no notifications nor app op signals that this package/userId requires system alert + // warning + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, "any")); + } - // let's attempt to downgrade the notification from FLAG_FOREGROUND and see what we get - StatusBarNotification sbn_user1_app1_fg_sneaky = makeMockFgSBN(USERID_ONE, PKG1, 1, true); - sbn_user1_app1_fg_sneaky.getNotification().flags = 0; - entryUpdated(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); - // ok, ok, we'll put it back - sbn_user1_app1_fg_sneaky.getNotification().flags = Notification.FLAG_FOREGROUND_SERVICE; - entryUpdated(sbn_user1_app1_fg, NotificationManager.IMPORTANCE_MIN); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "whatever")); + @Test + public void testCustomLayouts_systemAlertWarningRequired() { + // GIVEN a notification with a custom layout + final String pkg = "com.example.app0"; + StatusBarNotification customLayoutNotif = makeMockSBN(USERID_ONE, pkg, 0, + false); + + // WHEN the custom layout entry is added + entryAdded(customLayoutNotif, NotificationManager.IMPORTANCE_MIN); + + // THEN a system alert warning is required since there aren't any notifications that can + // display the app ops + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, pkg)); + } - entryRemoved(sbn_user1_app1_fg_sneaky); - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "a")); - - // let's try a custom layout - sbn_user1_app1_fg_sneaky = makeMockFgSBN(USERID_ONE, PKG1, 1, false); - entryUpdated(sbn_user1_app1_fg_sneaky, NotificationManager.IMPORTANCE_MIN); - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); // should be required! - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "anything")); - // now let's test an upgrade (non fg to fg) - entryAdded(sbn_user1_app1, NotificationManager.IMPORTANCE_MIN); - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, "b")); - sbn_user1_app1.getNotification().flags |= Notification.FLAG_FOREGROUND_SERVICE; - entryUpdated(sbn_user1_app1, - NotificationManager.IMPORTANCE_MIN); // this is now a fg notification + @Test + public void testStandardLayoutExists_noSystemAlertWarningRequired() { + // GIVEN two notifications (one with a custom layout, the other with a standard layout) + final String pkg = "com.example.app0"; + StatusBarNotification customLayoutNotif = makeMockSBN(USERID_ONE, pkg, 0, + false); + StatusBarNotification standardLayoutNotif = makeMockSBN(USERID_ONE, pkg, 1, true); + + // WHEN the entries are added + entryAdded(customLayoutNotif, NotificationManager.IMPORTANCE_MIN); + entryAdded(standardLayoutNotif, NotificationManager.IMPORTANCE_MIN); + + // THEN no system alert warning is required, since there is at least one notification + // with a standard layout that can display the app ops on the notification + assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, pkg)); + } - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + @Test + public void testStandardLayoutRemoved_systemAlertWarningRequired() { + // GIVEN two notifications (one with a custom layout, the other with a standard layout) + final String pkg = "com.example.app0"; + StatusBarNotification customLayoutNotif = makeMockSBN(USERID_ONE, pkg, 0, + false); + StatusBarNotification standardLayoutNotif = makeMockSBN(USERID_ONE, pkg, 1, true); + + // WHEN the entries are added and then the standard layout notification is removed + entryAdded(customLayoutNotif, NotificationManager.IMPORTANCE_MIN); + entryAdded(standardLayoutNotif, NotificationManager.IMPORTANCE_MIN); + entryRemoved(standardLayoutNotif); + + // THEN a system alert warning is required since there aren't any notifications that can + // display the app ops + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, pkg)); + } - // remove it, make sure we're out of compliance again - entryRemoved(sbn_user1_app1); // was fg, should return true - entryRemoved(sbn_user1_app1); - assertFalse(mFsc.isSystemAlertWarningNeeded(USERID_TWO, PKG1)); - assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, PKG1)); + @Test + public void testStandardLayoutUpdatedToCustomLayout_systemAlertWarningRequired() { + // GIVEN a standard layout notification and then an updated version with a customLayout + final String pkg = "com.example.app0"; + StatusBarNotification standardLayoutNotif = makeMockSBN(USERID_ONE, pkg, 1, true); + StatusBarNotification updatedToCustomLayoutNotif = makeMockSBN(USERID_ONE, pkg, 1, false); + + // WHEN the entries is added and then updated to a custom layout + entryAdded(standardLayoutNotif, NotificationManager.IMPORTANCE_MIN); + entryUpdated(updatedToCustomLayoutNotif, NotificationManager.IMPORTANCE_MIN); + + // THEN a system alert warning is required since there aren't any notifications that can + // display the app ops + assertTrue(mFsc.isSystemAlertWarningNeeded(USERID_ONE, pkg)); } private StatusBarNotification makeMockSBN(int userId, String pkg, int id, String tag, @@ -483,6 +499,19 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { return sbn; } + private StatusBarNotification makeMockSBN(int uid, String pkg, int id, + boolean usesStdLayout) { + StatusBarNotification sbn = makeMockSBN(uid, pkg, id, "foo", 0); + if (usesStdLayout) { + sbn.getNotification().contentView = null; + sbn.getNotification().headsUpContentView = null; + sbn.getNotification().bigContentView = null; + } else { + sbn.getNotification().contentView = mock(RemoteViews.class); + } + return sbn; + } + private StatusBarNotification makeMockFgSBN(int uid, String pkg, int id, boolean usesStdLayout) { StatusBarNotification sbn = diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java index 713aef9e8a91..dd3a7858fd1f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java @@ -49,6 +49,7 @@ import org.junit.Rule; import java.io.FileInputStream; import java.io.IOException; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; import java.util.concurrent.Future; /** @@ -74,7 +75,8 @@ public abstract class SysuiTestCase { SystemUIFactory.createFromConfig(mContext); mDependency = new TestableDependency(mContext); mFakeBroadcastDispatcher = new FakeBroadcastDispatcher(mContext, mock(Looper.class), - mock(DumpManager.class), mock(BroadcastDispatcherLogger.class)); + mock(Executor.class), mock(DumpManager.class), + mock(BroadcastDispatcherLogger.class)); mRealInstrumentation = InstrumentationRegistry.getInstrumentation(); Instrumentation inst = spy(mRealInstrumentation); diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/ActionReceiverTest.kt b/packages/SystemUI/tests/src/com/android/systemui/broadcast/ActionReceiverTest.kt new file mode 100644 index 000000000000..e95eb4ef6509 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/broadcast/ActionReceiverTest.kt @@ -0,0 +1,256 @@ +/* + * Copyright (C) 2020 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.broadcast + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.UserHandle +import android.test.suitebuilder.annotation.SmallTest +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import com.android.systemui.SysuiTestCase +import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.eq +import com.android.systemui.util.time.FakeSystemClock +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentCaptor +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.anyString +import org.mockito.Captor +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.Mockito.mock +import org.mockito.Mockito.never +import org.mockito.Mockito.verify +import org.mockito.MockitoAnnotations +import java.lang.IllegalArgumentException +import java.lang.IllegalStateException +import java.util.concurrent.Executor + +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper +@SmallTest +class ActionReceiverTest : SysuiTestCase() { + + companion object { + private const val ACTION1 = "TEST_ACTION1" + private const val ACTION2 = "TEST_ACTION2" + private const val CATEGORY = "TEST_CATEGORY" + private val USER = UserHandle.of(0) + private fun <T : Any> sameNotNull(arg: T): T = Mockito.same(arg) ?: arg + + fun IntentFilter.matchesOther(it: IntentFilter): Boolean { + val actions = actionsIterator()?.asSequence()?.toSet() ?: emptySet() + val categories = categoriesIterator()?.asSequence()?.toSet() ?: emptySet() + return (it.actionsIterator()?.asSequence()?.toSet() ?: emptySet()) == actions && + (it.categoriesIterator()?.asSequence()?.toSet() ?: emptySet()) == categories && + it.countDataAuthorities() == 0 && + it.countDataPaths() == 0 && + it.countDataSchemes() == 0 && + it.countDataTypes() == 0 && + it.countMimeGroups() == 0 && + it.priority == 0 + } + } + + @Mock + private lateinit var registerFunction: BroadcastReceiver.(IntentFilter) -> Unit + @Mock + private lateinit var unregisterFunction: BroadcastReceiver.() -> Unit + @Mock + private lateinit var receiver1: BroadcastReceiver + @Mock + private lateinit var receiver2: BroadcastReceiver + @Mock + private lateinit var logger: BroadcastDispatcherLogger + @Captor + private lateinit var intentFilterCaptor: ArgumentCaptor<IntentFilter> + + private lateinit var executor: FakeExecutor + private lateinit var actionReceiver: ActionReceiver + private val directExecutor = Executor { it.run() } + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + executor = FakeExecutor(FakeSystemClock()) + + actionReceiver = ActionReceiver( + ACTION1, + USER.identifier, + registerFunction, + unregisterFunction, + executor, + logger + ) + } + + @Test + fun testStartsUnregistered() { + assertFalse(actionReceiver.registered) + verify(registerFunction, never()).invoke(sameNotNull(actionReceiver), + any(IntentFilter::class.java)) + } + + @Test + fun testRegistersOnFirstAdd() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData) + + assertTrue(actionReceiver.registered) + verify(registerFunction).invoke(sameNotNull(actionReceiver), capture(intentFilterCaptor)) + + assertTrue(IntentFilter(ACTION1).matchesOther(intentFilterCaptor.value)) + } + + @Test + fun testRegistersOnlyOnce() { + val receiverData1 = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + val receiverData2 = ReceiverData(receiver2, IntentFilter(ACTION1), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData1) + actionReceiver.addReceiverData(receiverData2) + + verify(registerFunction).invoke(sameNotNull(actionReceiver), any(IntentFilter::class.java)) + } + + @Test + fun testRemovingLastReceiverUnregisters() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData) + + actionReceiver.removeReceiver(receiver1) + + assertFalse(actionReceiver.registered) + verify(unregisterFunction).invoke(sameNotNull(actionReceiver)) + } + + @Test + fun testRemovingWhileOtherReceiversDoesntUnregister() { + val receiverData1 = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + val receiverData2 = ReceiverData(receiver2, IntentFilter(ACTION1), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData1) + actionReceiver.addReceiverData(receiverData2) + + actionReceiver.removeReceiver(receiver1) + + assertTrue(actionReceiver.registered) + verify(unregisterFunction, never()).invoke(any(BroadcastReceiver::class.java)) + } + + @Test + fun testReceiverHasCategories() { + val filter = IntentFilter(ACTION1) + filter.addCategory(CATEGORY) + + val receiverData = ReceiverData(receiver1, filter, directExecutor, USER) + + actionReceiver.addReceiverData(receiverData) + + verify(registerFunction).invoke(sameNotNull(actionReceiver), capture(intentFilterCaptor)) + assertTrue(intentFilterCaptor.value.hasCategory(CATEGORY)) + } + + @Test(expected = IllegalArgumentException::class) + fun testNotRegisteredWithWrongAction_throwsException() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION2), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData) + } + + @Test + fun testReceiverGetsBroadcast() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + actionReceiver.addReceiverData(receiverData) + + val intent = Intent(ACTION1) + + actionReceiver.onReceive(mContext, intent) + + executor.runAllReady() + + verify(receiver1).onReceive(any(Context::class.java), sameNotNull(intent)) + } + + @Test + fun testReceiverGetsPendingResult() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + actionReceiver.addReceiverData(receiverData) + + val intent = Intent(ACTION1) + val pendingResult = mock(BroadcastReceiver.PendingResult::class.java) + + actionReceiver.pendingResult = pendingResult + actionReceiver.onReceive(mContext, intent) + + executor.runAllReady() + verify(receiver1).pendingResult = pendingResult + } + + @Test + fun testBroadcastIsDispatchedInExecutor() { + val executor = FakeExecutor(FakeSystemClock()) + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), executor, USER) + actionReceiver.addReceiverData(receiverData) + + val intent = Intent(ACTION1) + actionReceiver.onReceive(mContext, intent) + + this.executor.runAllReady() + + verify(receiver1, never()).onReceive(mContext, intent) + + executor.runAllReady() + // Dispatched after executor is processed + verify(receiver1).onReceive(mContext, intent) + } + + @Test + fun testBroadcastReceivedDispatched_logger() { + val receiverData = ReceiverData(receiver1, IntentFilter(ACTION1), directExecutor, USER) + + actionReceiver.addReceiverData(receiverData) + + val intent = Intent(ACTION1) + actionReceiver.onReceive(mContext, intent) + verify(logger).logBroadcastReceived(anyInt(), eq(USER.identifier), eq(intent)) + + verify(logger, never()).logBroadcastDispatched(anyInt(), anyString(), + any(BroadcastReceiver::class.java)) + + executor.runAllReady() + + verify(logger).logBroadcastDispatched(anyInt(), eq(ACTION1), sameNotNull(receiver1)) + } + + @Test(expected = IllegalStateException::class) + fun testBroadcastWithWrongAction_throwsException() { + actionReceiver.onReceive(mContext, Intent(ACTION2)) + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/BroadcastDispatcherTest.kt b/packages/SystemUI/tests/src/com/android/systemui/broadcast/BroadcastDispatcherTest.kt index 4ed284ede634..22e9594ca420 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/broadcast/BroadcastDispatcherTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/broadcast/BroadcastDispatcherTest.kt @@ -98,6 +98,7 @@ class BroadcastDispatcherTest : SysuiTestCase() { broadcastDispatcher = TestBroadcastDispatcher( mockContext, testableLooper.looper, + mock(Executor::class.java), mock(DumpManager::class.java), logger, mapOf(0 to mockUBRUser0, 1 to mockUBRUser1)) @@ -246,10 +247,11 @@ class BroadcastDispatcherTest : SysuiTestCase() { private class TestBroadcastDispatcher( context: Context, bgLooper: Looper, + executor: Executor, dumpManager: DumpManager, logger: BroadcastDispatcherLogger, var mockUBRMap: Map<Int, UserBroadcastDispatcher> - ) : BroadcastDispatcher(context, bgLooper, dumpManager, logger) { + ) : BroadcastDispatcher(context, bgLooper, executor, dumpManager, logger) { override fun createUBRForUser(userId: Int): UserBroadcastDispatcher { return mockUBRMap.getOrDefault(userId, mock(UserBroadcastDispatcher::class.java)) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt b/packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt index 09a091689a23..949932da4d50 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt @@ -31,9 +31,10 @@ import java.util.concurrent.Executor class FakeBroadcastDispatcher( context: SysuiTestableContext, looper: Looper, + executor: Executor, dumpManager: DumpManager, logger: BroadcastDispatcherLogger -) : BroadcastDispatcher(context, looper, dumpManager, logger) { +) : BroadcastDispatcher(context, looper, executor, dumpManager, logger) { private val registeredReceivers = ArraySet<BroadcastReceiver>() diff --git a/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt b/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt index 443357694f4d..dfe143254788 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/broadcast/UserBroadcastDispatcherTest.kt @@ -18,7 +18,6 @@ package com.android.systemui.broadcast import android.content.BroadcastReceiver import android.content.Context -import android.content.Intent import android.content.IntentFilter import android.os.Handler import android.os.UserHandle @@ -29,26 +28,18 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock -import junit.framework.Assert.assertEquals import junit.framework.Assert.assertFalse -import junit.framework.Assert.assertTrue +import junit.framework.Assert.assertNotNull import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor -import org.mockito.ArgumentMatchers.any -import org.mockito.ArgumentMatchers.anyInt -import org.mockito.ArgumentMatchers.eq -import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito -import org.mockito.Mockito.anyString -import org.mockito.Mockito.atLeastOnce -import org.mockito.Mockito.never -import org.mockito.Mockito.reset -import org.mockito.Mockito.times +import org.mockito.Mockito.mock import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations +import java.util.concurrent.Executor @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper @@ -58,8 +49,6 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { companion object { private const val ACTION_1 = "com.android.systemui.tests.ACTION_1" private const val ACTION_2 = "com.android.systemui.tests.ACTION_2" - private const val CATEGORY_1 = "com.android.systemui.tests.CATEGORY_1" - private const val CATEGORY_2 = "com.android.systemui.tests.CATEGORY_2" private const val USER_ID = 0 private val USER_HANDLE = UserHandle.of(USER_ID) @@ -75,13 +64,8 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { @Mock private lateinit var mockContext: Context @Mock - private lateinit var mPendingResult: BroadcastReceiver.PendingResult - @Mock private lateinit var logger: BroadcastDispatcherLogger - @Captor - private lateinit var argumentCaptor: ArgumentCaptor<IntentFilter> - private lateinit var testableLooper: TestableLooper private lateinit var userBroadcastDispatcher: UserBroadcastDispatcher private lateinit var intentFilter: IntentFilter @@ -96,46 +80,25 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { handler = Handler(testableLooper.looper) fakeExecutor = FakeExecutor(FakeSystemClock()) - userBroadcastDispatcher = UserBroadcastDispatcher( - mockContext, USER_ID, testableLooper.looper, logger) - userBroadcastDispatcher.pendingResult = mPendingResult - } - - @Test - fun testNotRegisteredOnStart() { - testableLooper.processAllMessages() - verify(mockContext, never()).registerReceiver(any(), any()) - verify(mockContext, never()).registerReceiver(any(), any(), anyInt()) - verify(mockContext, never()).registerReceiver(any(), any(), anyString(), any()) - verify(mockContext, never()).registerReceiver(any(), any(), anyString(), any(), anyInt()) - verify(mockContext, never()).registerReceiverAsUser(any(), any(), any(), anyString(), any()) - } - - @Test - fun testNotRegisteredOnStart_logging() { - testableLooper.processAllMessages() - - verify(logger, never()).logContextReceiverRegistered(anyInt(), any()) + userBroadcastDispatcher = object : UserBroadcastDispatcher( + mockContext, USER_ID, testableLooper.looper, mock(Executor::class.java), logger) { + override fun createActionReceiver(action: String): ActionReceiver { + return mock(ActionReceiver::class.java) + } + } } @Test fun testSingleReceiverRegistered() { intentFilter = IntentFilter(ACTION_1) + val receiverData = ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) + userBroadcastDispatcher.registerReceiver(receiverData) testableLooper.processAllMessages() - assertTrue(userBroadcastDispatcher.isRegistered()) - verify(mockContext).registerReceiverAsUser( - any(), - eq(USER_HANDLE), - capture(argumentCaptor), - any(), - any()) - assertEquals(1, argumentCaptor.value.countActions()) - assertTrue(argumentCaptor.value.hasAction(ACTION_1)) - assertEquals(0, argumentCaptor.value.countCategories()) + val actionReceiver = userBroadcastDispatcher.getActionReceiver(ACTION_1) + assertNotNull(actionReceiver) + verify(actionReceiver)?.addReceiverData(receiverData) } @Test @@ -147,7 +110,6 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { testableLooper.processAllMessages() verify(logger).logReceiverRegistered(USER_HANDLE.identifier, broadcastReceiver) - verify(logger).logContextReceiverRegistered(eq(USER_HANDLE.identifier), any()) } @Test @@ -157,16 +119,13 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { userBroadcastDispatcher.registerReceiver( ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) testableLooper.processAllMessages() - reset(mockContext) - - assertTrue(userBroadcastDispatcher.isRegistered()) userBroadcastDispatcher.unregisterReceiver(broadcastReceiver) testableLooper.processAllMessages() - verify(mockContext, atLeastOnce()).unregisterReceiver(any()) - verify(mockContext, never()).registerReceiverAsUser(any(), any(), any(), any(), any()) - assertFalse(userBroadcastDispatcher.isRegistered()) + val actionReceiver = userBroadcastDispatcher.getActionReceiver(ACTION_1) + assertNotNull(actionReceiver) + verify(actionReceiver)?.removeReceiver(broadcastReceiver) } @Test @@ -181,139 +140,6 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { testableLooper.processAllMessages() verify(logger).logReceiverUnregistered(USER_HANDLE.identifier, broadcastReceiver) - verify(logger).logContextReceiverUnregistered(USER_HANDLE.identifier) - } - - @Test - fun testFilterHasAllActionsAndCategories_twoReceivers() { - intentFilter = IntentFilter(ACTION_1) - intentFilterOther = IntentFilter(ACTION_2).apply { - addCategory(CATEGORY_1) - addCategory(CATEGORY_2) - } - - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiverOther, intentFilterOther, fakeExecutor, USER_HANDLE)) - - testableLooper.processAllMessages() - assertTrue(userBroadcastDispatcher.isRegistered()) - - verify(mockContext, times(2)).registerReceiverAsUser( - any(), - eq(USER_HANDLE), - capture(argumentCaptor), - any(), - any()) - - val lastFilter = argumentCaptor.value - - assertTrue(lastFilter.hasAction(ACTION_1)) - assertTrue(lastFilter.hasAction(ACTION_2)) - assertTrue(lastFilter.hasCategory(CATEGORY_1)) - assertTrue(lastFilter.hasCategory(CATEGORY_1)) - } - - @Test - fun testDispatchToCorrectReceiver() { - intentFilter = IntentFilter(ACTION_1) - intentFilterOther = IntentFilter(ACTION_2) - - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiverOther, intentFilterOther, fakeExecutor, USER_HANDLE)) - - val intent = Intent(ACTION_2) - - userBroadcastDispatcher.onReceive(mockContext, intent) - testableLooper.processAllMessages() - fakeExecutor.runAllReady() - - verify(broadcastReceiver, never()).onReceive(any(), any()) - verify(broadcastReceiverOther).onReceive(mockContext, intent) - } - - @Test - fun testDispatch_logger() { - intentFilter = IntentFilter(ACTION_1) - intentFilterOther = IntentFilter(ACTION_2) - - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiverOther, intentFilterOther, fakeExecutor, USER_HANDLE)) - - val intent = Intent(ACTION_2) - - userBroadcastDispatcher.onReceive(mockContext, intent) - testableLooper.processAllMessages() - fakeExecutor.runAllReady() - - val captor = ArgumentCaptor.forClass(Int::class.java) - verify(logger) - .logBroadcastReceived(captor.capture(), eq(USER_HANDLE.identifier), eq(intent)) - verify(logger).logBroadcastDispatched(captor.value, ACTION_2, broadcastReceiverOther) - verify(logger, never()) - .logBroadcastDispatched(eq(captor.value), any(), eq(broadcastReceiver)) - } - - @Test - fun testDispatchToCorrectReceiver_differentFiltersSameReceiver() { - intentFilter = IntentFilter(ACTION_1) - intentFilterOther = IntentFilter(ACTION_2) - - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilterOther, fakeExecutor, USER_HANDLE)) - - val intent = Intent(ACTION_2) - - userBroadcastDispatcher.onReceive(mockContext, intent) - testableLooper.processAllMessages() - fakeExecutor.runAllReady() - - verify(broadcastReceiver).onReceive(mockContext, intent) - } - - @Test - fun testDispatchIntentWithoutCategories() { - intentFilter = IntentFilter(ACTION_1) - intentFilter.addCategory(CATEGORY_1) - intentFilterOther = IntentFilter(ACTION_1) - intentFilterOther.addCategory(CATEGORY_2) - - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiverOther, intentFilterOther, fakeExecutor, USER_HANDLE)) - - val intent = Intent(ACTION_1) - - userBroadcastDispatcher.onReceive(mockContext, intent) - testableLooper.processAllMessages() - fakeExecutor.runAllReady() - - verify(broadcastReceiver).onReceive(mockContext, intent) - verify(broadcastReceiverOther).onReceive(mockContext, intent) - } - - @Test - fun testPendingResult() { - intentFilter = IntentFilter(ACTION_1) - userBroadcastDispatcher.registerReceiver( - ReceiverData(broadcastReceiver, intentFilter, fakeExecutor, USER_HANDLE)) - - val intent = Intent(ACTION_1) - userBroadcastDispatcher.onReceive(mockContext, intent) - - testableLooper.processAllMessages() - fakeExecutor.runAllReady() - - verify(broadcastReceiver).onReceive(mockContext, intent) - verify(broadcastReceiver).pendingResult = mPendingResult } @Test @@ -333,4 +159,8 @@ class UserBroadcastDispatcherTest : SysuiTestCase() { assertFalse(userBroadcastDispatcher.isReceiverReferenceHeld(broadcastReceiver)) } + + private fun UserBroadcastDispatcher.getActionReceiver(action: String): ActionReceiver? { + return actionsToActionsReceivers.get(action) + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleVolatileRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleVolatileRepositoryTest.kt index 76c58339726c..7ea611c9c6a9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleVolatileRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleVolatileRepositoryTest.kt @@ -102,6 +102,19 @@ class BubbleVolatileRepositoryTest : SysuiTestCase() { eq(listOf("alice and bob")), eq(user10), eq(LauncherApps.FLAG_CACHE_BUBBLE_SHORTCUTS)) } + + @Test + fun testAddBubbleMatchesByKey() { + val bubble = BubbleEntity(0, "com.example.pkg", "shortcut-id", "key", 120, 0, "title") + repository.addBubbles(listOf(bubble)) + assertEquals(bubble, repository.bubbles.get(0)) + + // Same key as first bubble but different entry + val bubbleModified = BubbleEntity(0, "com.example.pkg", "shortcut-id", "key", 120, 0, + "different title") + repository.addBubbles(listOf(bubbleModified)) + assertEquals(bubbleModified, repository.bubbles.get(0)) + } } private const val PKG_MESSENGER = "com.example.messenger" diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleXmlHelperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleXmlHelperTest.kt index 81687c7fbe1a..8cf4534ecdce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleXmlHelperTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/storage/BubbleXmlHelperTest.kt @@ -55,7 +55,7 @@ class BubbleXmlHelperTest : SysuiTestCase() { fun testReadXml() { val src = """ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> -<bs> +<bs v="1"> <bb uid="0" pkg="com.example.messenger" sid="shortcut-1" key="k1" h="120" hid="0" /> <bb uid="10" pkg="com.example.chat" sid="alice and bob" key="k2" h="0" hid="16537428" t="title" /> <bb uid="0" pkg="com.example.messenger" sid="shortcut-2" key="k3" h="120" hid="0" /> @@ -64,4 +64,19 @@ class BubbleXmlHelperTest : SysuiTestCase() { val actual = readXml(ByteArrayInputStream(src.toByteArray(Charsets.UTF_8))) assertEquals("failed parsing bubbles from xml\n$src", bubbles, actual) } + + // TODO: We should handle upgrades gracefully but this is v1 + @Test + fun testUpgradeDropsPreviousData() { + val src = """ +<?xml version='1.0' encoding='utf-8' standalone='yes' ?> +<bs> +<bb uid="0" pkg="com.example.messenger" sid="shortcut-1" key="k1" h="120" hid="0" /> +<bb uid="10" pkg="com.example.chat" sid="alice and bob" key="k2" h="0" hid="16537428" t="title" /> +<bb uid="0" pkg="com.example.messenger" sid="shortcut-2" key="k3" h="120" hid="0" /> +</bs> + """.trimIndent() + val actual = readXml(ByteArrayInputStream(src.toByteArray(Charsets.UTF_8))) + assertEquals("failed parsing bubbles from xml\n$src", emptyList<BubbleEntity>(), actual) + } }
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt new file mode 100644 index 000000000000..54520be8a03f --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt @@ -0,0 +1,126 @@ +package com.android.systemui.media + +import android.app.Notification +import android.service.notification.StatusBarNotification +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper.RunWithLooper +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.dump.DumpManager +import com.google.common.truth.Truth.assertThat +import org.junit.After +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 +import org.mockito.Mockito.mock +import org.mockito.Mockito.verify +import org.mockito.junit.MockitoJUnit +import java.util.concurrent.Executor +import org.mockito.Mockito.`when` as whenever + +private const val KEY = "KEY" +private const val PACKAGE_NAME = "com.android.systemui" + +private fun <T> eq(value: T): T = Mockito.eq(value) ?: value +private fun <T> anyObject(): T { + return Mockito.anyObject<T>() +} + +@SmallTest +@RunWithLooper(setAsMainLooper = true) +@RunWith(AndroidTestingRunner::class) +class MediaDataManagerTest : SysuiTestCase() { + + @Mock lateinit var mediaControllerFactory: MediaControllerFactory + @Mock lateinit var backgroundExecutor: Executor + @Mock lateinit var foregroundExecutor: Executor + @Mock lateinit var dumpManager: DumpManager + @Mock lateinit var broadcastDispatcher: BroadcastDispatcher + @Mock lateinit var mediaTimeoutListener: MediaTimeoutListener + @Mock lateinit var mediaResumeListener: MediaResumeListener + @JvmField @Rule val mockito = MockitoJUnit.rule() + lateinit var mediaDataManager: MediaDataManager + lateinit var mediaNotification: StatusBarNotification + + @Before + fun setup() { + mediaDataManager = MediaDataManager(context, backgroundExecutor, foregroundExecutor, + mediaControllerFactory, broadcastDispatcher, dumpManager, + mediaTimeoutListener, mediaResumeListener, useMediaResumption = true, + useQsMediaPlayer = true) + val sbn = mock(StatusBarNotification::class.java) + val notification = mock(Notification::class.java) + whenever(notification.hasMediaSession()).thenReturn(true) + whenever(notification.notificationStyle).thenReturn(Notification.MediaStyle::class.java) + whenever(sbn.notification).thenReturn(notification) + whenever(sbn.packageName).thenReturn(PACKAGE_NAME) + mediaNotification = sbn + } + + @After + fun tearDown() { + mediaDataManager.destroy() + } + + @Test + fun testHasActiveMedia() { + assertThat(mediaDataManager.hasActiveMedia()).isFalse() + val data = mock(MediaData::class.java) + + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + mediaDataManager.onMediaDataLoaded(KEY, oldKey = null, data = data) + assertThat(mediaDataManager.hasActiveMedia()).isFalse() + + whenever(data.active).thenReturn(true) + assertThat(mediaDataManager.hasActiveMedia()).isTrue() + } + + @Test + fun testLoadsMetadataOnBackground() { + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + verify(backgroundExecutor).execute(anyObject()) + } + + @Test + fun testOnMetaDataLoaded_callsListener() { + val listener = mock(MediaDataManager.Listener::class.java) + mediaDataManager.addListener(listener) + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + mediaDataManager.onMediaDataLoaded(KEY, oldKey = null, data = mock(MediaData::class.java)) + verify(listener).onMediaDataLoaded(eq(KEY), eq(null), anyObject()) + } + + @Test + fun testHasAnyMedia_whenAddingMedia() { + assertThat(mediaDataManager.hasAnyMedia()).isFalse() + val data = mock(MediaData::class.java) + + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + mediaDataManager.onMediaDataLoaded(KEY, oldKey = null, data = data) + assertThat(mediaDataManager.hasAnyMedia()).isTrue() + } + + @Test + fun testOnNotificationRemoved_doesntHaveMedia() { + val data = mock(MediaData::class.java) + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + mediaDataManager.onMediaDataLoaded(KEY, oldKey = null, data = data) + mediaDataManager.onNotificationRemoved(KEY) + assertThat(mediaDataManager.hasAnyMedia()).isFalse() + } + + @Test + fun testOnNotificationRemoved_callsListener() { + val listener = mock(MediaDataManager.Listener::class.java) + mediaDataManager.addListener(listener) + mediaDataManager.onNotificationAdded(KEY, mediaNotification) + mediaDataManager.onMediaDataLoaded(KEY, oldKey = null, data = mock(MediaData::class.java)) + mediaDataManager.onNotificationRemoved(KEY) + + verify(listener).onMediaDataRemoved(eq(KEY)) + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/AutoAddTrackerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/AutoAddTrackerTest.java index 0ae9461d38b1..61f5a7bdd3b7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/AutoAddTrackerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/AutoAddTrackerTest.java @@ -21,6 +21,7 @@ import static com.android.systemui.statusbar.phone.AutoTileManager.WORK; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import android.os.UserHandle; import android.provider.Settings.Secure; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; @@ -40,6 +41,8 @@ import org.junit.runner.RunWith; @SmallTest public class AutoAddTrackerTest extends SysuiTestCase { + private static final int USER = 0; + private AutoAddTracker mAutoTracker; @Before @@ -51,7 +54,7 @@ public class AutoAddTrackerTest extends SysuiTestCase { public void testMigration() { Prefs.putBoolean(mContext, Key.QS_DATA_SAVER_ADDED, true); Prefs.putBoolean(mContext, Key.QS_WORK_ADDED, true); - mAutoTracker = new AutoAddTracker(mContext); + mAutoTracker = new AutoAddTracker(mContext, USER); assertTrue(mAutoTracker.isAdded(SAVER)); assertTrue(mAutoTracker.isAdded(WORK)); @@ -68,7 +71,7 @@ public class AutoAddTrackerTest extends SysuiTestCase { @Test public void testChangeFromBackup() { - mAutoTracker = new AutoAddTracker(mContext); + mAutoTracker = new AutoAddTracker(mContext, USER); assertFalse(mAutoTracker.isAdded(SAVER)); @@ -82,7 +85,7 @@ public class AutoAddTrackerTest extends SysuiTestCase { @Test public void testSetAdded() { - mAutoTracker = new AutoAddTracker(mContext); + mAutoTracker = new AutoAddTracker(mContext, USER); assertFalse(mAutoTracker.isAdded(SAVER)); mAutoTracker.setTileAdded(SAVER); @@ -94,16 +97,35 @@ public class AutoAddTrackerTest extends SysuiTestCase { @Test public void testPersist() { - mAutoTracker = new AutoAddTracker(mContext); + mAutoTracker = new AutoAddTracker(mContext, USER); assertFalse(mAutoTracker.isAdded(SAVER)); mAutoTracker.setTileAdded(SAVER); mAutoTracker.destroy(); - mAutoTracker = new AutoAddTracker(mContext); + mAutoTracker = new AutoAddTracker(mContext, USER); assertTrue(mAutoTracker.isAdded(SAVER)); mAutoTracker.destroy(); } + + @Test + public void testIndependentUsers() { + mAutoTracker = new AutoAddTracker(mContext, USER); + mAutoTracker.setTileAdded(SAVER); + + mAutoTracker = new AutoAddTracker(mContext, USER + 1); + assertFalse(mAutoTracker.isAdded(SAVER)); + } + + @Test + public void testChangeUser() { + mAutoTracker = new AutoAddTracker(mContext, USER); + mAutoTracker.setTileAdded(SAVER); + + mAutoTracker = new AutoAddTracker(mContext, USER + 1); + mAutoTracker.changeUser(UserHandle.of(USER)); + assertTrue(mAutoTracker.isAdded(SAVER)); + } }
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java index e58a3a6bf5d7..ea5449b4448e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java @@ -96,6 +96,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { @Test public void testUnmanaged() { when(mSecurityController.isDeviceManaged()).thenReturn(false); + when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(false); mFooter.refreshState(); TestableLooper.get(this).processAllMessages(); @@ -317,6 +318,33 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testProfileOwnerOfOrganizationOwnedDeviceNoName() { + when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(true); + + mFooter.refreshState(); + TestableLooper.get(this).processAllMessages(); + + assertEquals(mContext.getString( + R.string.quick_settings_disclosure_management), + mFooterText.getText()); + } + + @Test + public void testProfileOwnerOfOrganizationOwnedDeviceWithName() { + when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(true); + when(mSecurityController.getWorkProfileOrganizationName()) + .thenReturn(MANAGING_ORGANIZATION); + + mFooter.refreshState(); + TestableLooper.get(this).processAllMessages(); + + assertEquals(mContext.getString( + R.string.quick_settings_disclosure_named_management, + MANAGING_ORGANIZATION), + mFooterText.getText()); + } + + @Test public void testVpnEnabled() { when(mSecurityController.isVpnEnabled()).thenReturn(true); when(mSecurityController.getPrimaryVpnName()).thenReturn(VPN_PACKAGE); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ForegroundCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java index 407e1e671f86..314b19140e7a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ForegroundCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java @@ -43,6 +43,7 @@ import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; +import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -51,7 +52,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -60,7 +60,7 @@ import java.util.List; @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper -public class ForegroundCoordinatorTest extends SysuiTestCase { +public class AppOpsCoordinatorTest extends SysuiTestCase { private static final String TEST_PKG = "test_pkg"; private static final int NOTIF_USER_ID = 0; @@ -68,12 +68,11 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { @Mock private AppOpsController mAppOpsController; @Mock private NotifPipeline mNotifPipeline; - @Captor private ArgumentCaptor<AppOpsController.Callback> mAppOpsCaptor; - private NotificationEntry mEntry; private Notification mNotification; - private ForegroundCoordinator mForegroundCoordinator; + private AppOpsCoordinator mAppOpsCoordinator; private NotifFilter mForegroundFilter; + private NotifCollectionListener mNotifCollectionListener; private AppOpsController.Callback mAppOpsCallback; private NotifLifetimeExtender mForegroundNotifLifetimeExtender; @@ -85,8 +84,8 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); allowTestableLooperAsMainThread(); - mForegroundCoordinator = - new ForegroundCoordinator( + mAppOpsCoordinator = + new AppOpsCoordinator( mForegroundServiceController, mAppOpsController, mExecutor); @@ -97,19 +96,32 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { .setNotification(mNotification) .build(); + mAppOpsCoordinator.attach(mNotifPipeline); + + // capture filter ArgumentCaptor<NotifFilter> filterCaptor = ArgumentCaptor.forClass(NotifFilter.class); + verify(mNotifPipeline, times(1)).addPreGroupFilter(filterCaptor.capture()); + mForegroundFilter = filterCaptor.getValue(); + + // capture lifetime extender ArgumentCaptor<NotifLifetimeExtender> lifetimeExtenderCaptor = ArgumentCaptor.forClass(NotifLifetimeExtender.class); - - mForegroundCoordinator.attach(mNotifPipeline); - verify(mNotifPipeline, times(1)).addPreGroupFilter(filterCaptor.capture()); verify(mNotifPipeline, times(1)).addNotificationLifetimeExtender( lifetimeExtenderCaptor.capture()); - verify(mAppOpsController).addCallback(any(int[].class), mAppOpsCaptor.capture()); - - mForegroundFilter = filterCaptor.getValue(); mForegroundNotifLifetimeExtender = lifetimeExtenderCaptor.getValue(); - mAppOpsCallback = mAppOpsCaptor.getValue(); + + // capture notifCollectionListener + ArgumentCaptor<NotifCollectionListener> notifCollectionCaptor = + ArgumentCaptor.forClass(NotifCollectionListener.class); + verify(mNotifPipeline, times(1)).addCollectionListener( + notifCollectionCaptor.capture()); + mNotifCollectionListener = notifCollectionCaptor.getValue(); + + // capture app ops callback + ArgumentCaptor<AppOpsController.Callback> appOpsCaptor = + ArgumentCaptor.forClass(AppOpsController.Callback.class); + verify(mAppOpsController).addCallback(any(int[].class), appOpsCaptor.capture()); + mAppOpsCallback = appOpsCaptor.getValue(); } @Test @@ -199,15 +211,14 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { .setNotification(mNotification) .build(); - // THEN don't extend the lifetime because the extended time exceeds - // ForegroundCoordinator.MIN_FGS_TIME_MS + // THEN don't extend the lifetime because the extended time exceeds MIN_FGS_TIME_MS assertFalse(mForegroundNotifLifetimeExtender .shouldExtendLifetime(mEntry, NotificationListenerService.REASON_CLICK)); } @Test - public void testAppOpsAreApplied() { - // GIVEN Three current notifications, two with the same key but from different users + public void testAppOpsUpdateOnlyAppliedToRelevantNotificationWithStandardLayout() { + // GIVEN three current notifications, two with the same key but from different users NotificationEntry entry1 = new NotificationEntryBuilder() .setUser(new UserHandle(NOTIF_USER_ID)) .setPkg(TEST_PKG) @@ -218,16 +229,16 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { .setPkg(TEST_PKG) .setId(2) .build(); - NotificationEntry entry2Other = new NotificationEntryBuilder() + NotificationEntry entry3_diffUser = new NotificationEntryBuilder() .setUser(new UserHandle(NOTIF_USER_ID + 1)) .setPkg(TEST_PKG) .setId(2) .build(); - when(mNotifPipeline.getAllNotifs()).thenReturn(List.of(entry1, entry2, entry2Other)); + when(mNotifPipeline.getAllNotifs()).thenReturn(List.of(entry1, entry2, entry3_diffUser)); - // GIVEN that entry2 is currently associated with a foreground service - when(mForegroundServiceController.getStandardLayoutKey(0, TEST_PKG)) - .thenReturn(entry2.getKey()); + // GIVEN that only entry2 has a standard layout + when(mForegroundServiceController.getStandardLayoutKeys(NOTIF_USER_ID, TEST_PKG)) + .thenReturn(new ArraySet<>(List.of(entry2.getKey()))); // WHEN a new app ops code comes in mAppOpsCallback.onActiveStateChanged(47, NOTIF_USER_ID, TEST_PKG, true); @@ -242,7 +253,46 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { entry2.mActiveAppOps); assertEquals( new ArraySet<>(), - entry2Other.mActiveAppOps); + entry3_diffUser.mActiveAppOps); + } + + @Test + public void testAppOpsUpdateAppliedToAllNotificationsWithStandardLayouts() { + // GIVEN three notifications with standard layouts + NotificationEntry entry1 = new NotificationEntryBuilder() + .setUser(new UserHandle(NOTIF_USER_ID)) + .setPkg(TEST_PKG) + .setId(1) + .build(); + NotificationEntry entry2 = new NotificationEntryBuilder() + .setUser(new UserHandle(NOTIF_USER_ID)) + .setPkg(TEST_PKG) + .setId(2) + .build(); + NotificationEntry entry3 = new NotificationEntryBuilder() + .setUser(new UserHandle(NOTIF_USER_ID)) + .setPkg(TEST_PKG) + .setId(3) + .build(); + when(mNotifPipeline.getAllNotifs()).thenReturn(List.of(entry1, entry2, entry3)); + when(mForegroundServiceController.getStandardLayoutKeys(NOTIF_USER_ID, TEST_PKG)) + .thenReturn(new ArraySet<>(List.of(entry1.getKey(), entry2.getKey(), + entry3.getKey()))); + + // WHEN a new app ops code comes in + mAppOpsCallback.onActiveStateChanged(47, NOTIF_USER_ID, TEST_PKG, true); + mExecutor.runAllReady(); + + // THEN all entries get updated + assertEquals( + new ArraySet<>(List.of(47)), + entry1.mActiveAppOps); + assertEquals( + new ArraySet<>(List.of(47)), + entry2.mActiveAppOps); + assertEquals( + new ArraySet<>(List.of(47)), + entry3.mActiveAppOps); } @Test @@ -254,8 +304,8 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { .setId(2) .build(); when(mNotifPipeline.getAllNotifs()).thenReturn(List.of(entry)); - when(mForegroundServiceController.getStandardLayoutKey(0, TEST_PKG)) - .thenReturn(entry.getKey()); + when(mForegroundServiceController.getStandardLayoutKeys(0, TEST_PKG)) + .thenReturn(new ArraySet<>(List.of(entry.getKey()))); // GIVEN that the notification's app ops are already [47, 33] mAppOpsCallback.onActiveStateChanged(47, NOTIF_USER_ID, TEST_PKG, true); @@ -274,4 +324,25 @@ public class ForegroundCoordinatorTest extends SysuiTestCase { new ArraySet<>(List.of(33)), entry.mActiveAppOps); } + + @Test + public void testNullAppOps() { + // GIVEN one notification with app ops + NotificationEntry entry = new NotificationEntryBuilder() + .setUser(new UserHandle(NOTIF_USER_ID)) + .setPkg(TEST_PKG) + .setId(2) + .build(); + entry.mActiveAppOps.clear(); + entry.mActiveAppOps.addAll(List.of(47, 33)); + + // WHEN the notification is updated and the foreground service controller returns null for + // this notification + when(mForegroundServiceController.getAppOps(entry.getSbn().getUser().getIdentifier(), + entry.getSbn().getPackageName())).thenReturn(null); + mNotifCollectionListener.onEntryUpdated(entry); + + // THEN the entry's active app ops is updated to empty + assertTrue(entry.mActiveAppOps.isEmpty()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java index 05cdd802167a..0a959d11d7db 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java @@ -16,18 +16,34 @@ package com.android.systemui.statusbar.phone; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.isNotNull; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ComponentName; +import android.content.ContentResolver; +import android.content.Context; +import android.content.ContextWrapper; import android.hardware.display.ColorDisplayManager; import android.hardware.display.NightDisplayListener; import android.os.Handler; +import android.os.UserHandle; import android.provider.Settings; import android.testing.AndroidTestingRunner; +import android.testing.TestableContentResolver; +import android.testing.TestableContext; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -38,14 +54,18 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.qs.AutoAddTracker; import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.SecureSetting; +import com.android.systemui.statusbar.phone.AutoTileManagerTest.MyContextWrapper; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.CastController.CastDevice; import com.android.systemui.statusbar.policy.DataSaverController; import com.android.systemui.statusbar.policy.HotspotController; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -64,9 +84,18 @@ public class AutoTileManagerTest extends SysuiTestCase { private static final String TEST_CUSTOM_SPEC = "custom(" + TEST_COMPONENT + ")"; private static final String SEPARATOR = AutoTileManager.SETTING_SEPARATOR; + private static final int USER = 0; + @Mock private QSTileHost mQsTileHost; @Mock private AutoAddTracker mAutoAddTracker; @Mock private CastController mCastController; + @Mock private HotspotController mHotspotController; + @Mock private DataSaverController mDataSaverController; + @Mock private ManagedProfileController mManagedProfileController; + @Mock private NightDisplayListener mNightDisplayListener; + @Mock(answer = Answers.RETURNS_SELF) + private AutoAddTracker.Builder mAutoAddTrackerBuilder; + @Mock private Context mUserContext; private AutoTileManager mAutoTileManager; @@ -82,20 +111,114 @@ public class AutoTileManagerTest extends SysuiTestCase { } ); - mAutoTileManager = createAutoTileManager(); + when(mAutoAddTrackerBuilder.build()).thenReturn(mAutoAddTracker); + when(mQsTileHost.getUserContext()).thenReturn(mUserContext); + when(mUserContext.getUser()).thenReturn(UserHandle.of(USER)); + + mAutoTileManager = createAutoTileManager(new + MyContextWrapper(mContext)); + } + + @After + public void tearDown() { + mAutoTileManager.destroy(); } - private AutoTileManager createAutoTileManager() { - return new AutoTileManager(mContext, mAutoAddTracker, mQsTileHost, + private AutoTileManager createAutoTileManager(Context context) { + return new AutoTileManager(context, mAutoAddTrackerBuilder, mQsTileHost, Handler.createAsync(TestableLooper.get(this).getLooper()), - mock(HotspotController.class), - mock(DataSaverController.class), - mock(ManagedProfileController.class), - mock(NightDisplayListener.class), + mHotspotController, + mDataSaverController, + mManagedProfileController, + mNightDisplayListener, mCastController); } @Test + public void testChangeUserCallbacksStoppedAndStarted() throws Exception { + TestableLooper.get(this).runWithLooper(() -> + mAutoTileManager.changeUser(UserHandle.of(USER + 1)) + ); + + InOrder inOrderHotspot = inOrder(mHotspotController); + inOrderHotspot.verify(mHotspotController).removeCallback(any()); + inOrderHotspot.verify(mHotspotController).addCallback(any()); + + InOrder inOrderDataSaver = inOrder(mDataSaverController); + inOrderDataSaver.verify(mDataSaverController).removeCallback(any()); + inOrderDataSaver.verify(mDataSaverController).addCallback(any()); + + InOrder inOrderManagedProfile = inOrder(mManagedProfileController); + inOrderManagedProfile.verify(mManagedProfileController).removeCallback(any()); + inOrderManagedProfile.verify(mManagedProfileController).addCallback(any()); + + if (ColorDisplayManager.isNightDisplayAvailable(mContext)) { + InOrder inOrderNightDisplay = inOrder(mNightDisplayListener); + inOrderNightDisplay.verify(mNightDisplayListener).setCallback(isNull()); + inOrderNightDisplay.verify(mNightDisplayListener).setCallback(isNotNull()); + } + + InOrder inOrderCast = inOrder(mCastController); + inOrderCast.verify(mCastController).removeCallback(any()); + inOrderCast.verify(mCastController).addCallback(any()); + + SecureSetting setting = mAutoTileManager.getSecureSettingForKey(TEST_SETTING); + assertEquals(USER + 1, setting.getCurrentUser()); + assertTrue(setting.isListening()); + } + + @Test + public void testChangeUserSomeCallbacksNotAdded() throws Exception { + when(mAutoAddTracker.isAdded("hotspot")).thenReturn(true); + when(mAutoAddTracker.isAdded("work")).thenReturn(true); + when(mAutoAddTracker.isAdded("cast")).thenReturn(true); + when(mAutoAddTracker.isAdded(TEST_SPEC)).thenReturn(true); + + TestableLooper.get(this).runWithLooper(() -> + mAutoTileManager.changeUser(UserHandle.of(USER + 1)) + ); + + verify(mAutoAddTracker).changeUser(UserHandle.of(USER + 1)); + + InOrder inOrderHotspot = inOrder(mHotspotController); + inOrderHotspot.verify(mHotspotController).removeCallback(any()); + inOrderHotspot.verify(mHotspotController, never()).addCallback(any()); + + InOrder inOrderDataSaver = inOrder(mDataSaverController); + inOrderDataSaver.verify(mDataSaverController).removeCallback(any()); + inOrderDataSaver.verify(mDataSaverController).addCallback(any()); + + InOrder inOrderManagedProfile = inOrder(mManagedProfileController); + inOrderManagedProfile.verify(mManagedProfileController).removeCallback(any()); + inOrderManagedProfile.verify(mManagedProfileController, never()).addCallback(any()); + + if (ColorDisplayManager.isNightDisplayAvailable(mContext)) { + InOrder inOrderNightDisplay = inOrder(mNightDisplayListener); + inOrderNightDisplay.verify(mNightDisplayListener).setCallback(isNull()); + inOrderNightDisplay.verify(mNightDisplayListener).setCallback(isNotNull()); + } + + InOrder inOrderCast = inOrder(mCastController); + inOrderCast.verify(mCastController).removeCallback(any()); + inOrderCast.verify(mCastController, never()).addCallback(any()); + + SecureSetting setting = mAutoTileManager.getSecureSettingForKey(TEST_SETTING); + assertEquals(USER + 1, setting.getCurrentUser()); + assertFalse(setting.isListening()); + } + + @Test + public void testGetCurrentUserId() throws Exception { + assertEquals(USER, mAutoTileManager.getCurrentUserId()); + + TestableLooper.get(this).runWithLooper(() -> + mAutoTileManager.changeUser(UserHandle.of(USER + 100)) + ); + + assertEquals(USER + 100, mAutoTileManager.getCurrentUserId()); + } + + @Test public void nightTileAdded_whenActivated() { if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) { return; @@ -213,14 +336,14 @@ public class AutoTileManagerTest extends SysuiTestCase { public void testEmptyArray_doesNotCrash() { mContext.getOrCreateTestableResources().addOverride( R.array.config_quickSettingsAutoAdd, new String[0]); - createAutoTileManager(); + createAutoTileManager(mContext).destroy(); } @Test public void testMissingConfig_doesNotCrash() { mContext.getOrCreateTestableResources().addOverride( R.array.config_quickSettingsAutoAdd, null); - createAutoTileManager(); + createAutoTileManager(mContext).destroy(); } // Will only notify if it's listening @@ -231,4 +354,22 @@ public class AutoTileManagerTest extends SysuiTestCase { s.onChange(false); } } + + class MyContextWrapper extends ContextWrapper { + + private TestableContentResolver mSpiedTCR; + + MyContextWrapper(TestableContext context) { + super(context); + mSpiedTCR = spy(context.getContentResolver()); + doNothing().when(mSpiedTCR).registerContentObserver(any(), anyBoolean(), any(), + anyInt()); + doNothing().when(mSpiedTCR).unregisterContentObserver(any()); + } + + @Override + public ContentResolver getContentResolver() { + return mSpiedTCR; + } + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java index fee5e32398c4..e8911a2f5d4e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java @@ -41,6 +41,11 @@ public class FakeSecurityController extends BaseLeakChecker<SecurityControllerCa } @Override + public boolean isProfileOwnerOfOrganizationOwnedDevice() { + return false; + } + + @Override public String getDeviceOwnerName() { return null; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java index 8e34685cceec..2e874a6c2140 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeStatusBarIconController.java @@ -21,6 +21,7 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarIconController.IconManager; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; + import java.util.List; public class FakeStatusBarIconController extends BaseLeakChecker<IconManager> @@ -75,4 +76,8 @@ public class FakeStatusBarIconController extends BaseLeakChecker<IconManager> public void removeAllIconsForSlot(String slot) { } + @Override + public void setIconAccessibilityLiveRegion(String slot, int mode) { + } + } diff --git a/packages/Tethering/OWNERS b/packages/Tethering/OWNERS new file mode 100644 index 000000000000..5b42d490411e --- /dev/null +++ b/packages/Tethering/OWNERS @@ -0,0 +1,2 @@ +include platform/packages/modules/NetworkStack/:/OWNERS +markchien@google.com diff --git a/packages/Tethering/jarjar-rules.txt b/packages/Tethering/jarjar-rules.txt index 8f072e4cd217..2d3108a0bff1 100644 --- a/packages/Tethering/jarjar-rules.txt +++ b/packages/Tethering/jarjar-rules.txt @@ -1,17 +1,8 @@ # These must be kept in sync with the framework-tethering-shared-srcs filegroup. -# If there are files in that filegroup that do not appear here, the classes in the +# Classes from the framework-tethering-shared-srcs filegroup. +# If there are files in that filegroup that are not covered below, the classes in the # module will be overwritten by the ones in the framework. -# Don't jar-jar the entire package because tethering still use some internal classes -# (like TrafficStatsConstants in com.android.internal.util) -# TODO: simply these when tethering is built as system_current. -rule com.android.internal.util.BitUtils* com.android.networkstack.tethering.util.BitUtils@1 -rule com.android.internal.util.IndentingPrintWriter.java* com.android.networkstack.tethering.util.IndentingPrintWriter.java@1 -rule com.android.internal.util.IState.java* com.android.networkstack.tethering.util.IState.java@1 -rule com.android.internal.util.MessageUtils* com.android.networkstack.tethering.util.MessageUtils@1 -rule com.android.internal.util.State* com.android.networkstack.tethering.util.State@1 -rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.util.StateMachine@1 -rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1 - +rule com.android.internal.util.** com.android.networkstack.tethering.util.@1 rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1 rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1 diff --git a/packages/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java b/packages/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java index 4710a30b2998..aaaec17bf922 100644 --- a/packages/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java +++ b/packages/Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java @@ -16,7 +16,7 @@ package android.net.dhcp; -import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH; +import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH; import android.net.LinkAddress; import android.util.ArraySet; diff --git a/packages/Tethering/src/android/net/ip/IpServer.java b/packages/Tethering/src/android/net/ip/IpServer.java index 1671dda4bd57..35c156304c77 100644 --- a/packages/Tethering/src/android/net/ip/IpServer.java +++ b/packages/Tethering/src/android/net/ip/IpServer.java @@ -19,13 +19,14 @@ package android.net.ip; import static android.net.RouteInfo.RTN_UNICAST; import static android.net.TetheringManager.TetheringRequest.checkStaticAddressConfiguration; import static android.net.dhcp.IDhcpServer.STATUS_SUCCESS; -import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; import static android.net.util.NetworkConstants.RFC7421_PREFIX_LENGTH; import static android.net.util.NetworkConstants.asByte; import static android.net.util.PrefixUtils.asIpPrefix; import static android.net.util.TetheringMessageBase.BASE_IPSERVER; import static android.system.OsConstants.RT_SCOPE_UNIVERSE; +import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH; + import android.net.INetd; import android.net.INetworkStackStatusCallback; import android.net.IpPrefix; @@ -615,8 +616,9 @@ public class IpServer extends StateMachine { final Boolean setIfaceUp; if (mInterfaceType == TetheringManager.TETHERING_WIFI - || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P) { - // The WiFi stack has ownership of the interface up/down state. + || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P + || mInterfaceType == TetheringManager.TETHERING_ETHERNET) { + // The WiFi and Ethernet stack has ownership of the interface up/down state. // It is unclear whether the Bluetooth or USB stacks will manage their own // state. setIfaceUp = null; @@ -1321,6 +1323,7 @@ public class IpServer extends StateMachine { class UnavailableState extends State { @Override public void enter() { + mIpNeighborMonitor.stop(); mLastError = TetheringManager.TETHER_ERROR_NO_ERROR; sendInterfaceState(STATE_UNAVAILABLE); } diff --git a/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index 4f8860539158..30a9d2252ea6 100644 --- a/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java @@ -36,7 +36,8 @@ import static android.net.netlink.NetlinkConstants.RTM_NEWNEIGH; import static android.net.netlink.StructNdMsg.NUD_FAILED; import static android.net.netlink.StructNdMsg.NUD_REACHABLE; import static android.net.netlink.StructNdMsg.NUD_STALE; -import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; + +import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -859,6 +860,7 @@ public class IpServerTest { verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA)); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB)); + verify(mIpNeighborMonitor).stop(); resetNetdAndBpfCoordinator(); } diff --git a/packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java b/packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java index 526199226a6e..64538c7d97c1 100644 --- a/packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java +++ b/packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java @@ -40,7 +40,6 @@ import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_FAILED; import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_STARTED; import static android.net.TetheringManager.TETHER_HARDWARE_OFFLOAD_STOPPED; import static android.net.dhcp.IDhcpServer.STATUS_SUCCESS; -import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; import static android.net.wifi.WifiManager.EXTRA_WIFI_AP_INTERFACE_NAME; import static android.net.wifi.WifiManager.EXTRA_WIFI_AP_MODE; import static android.net.wifi.WifiManager.EXTRA_WIFI_AP_STATE; @@ -49,6 +48,7 @@ import static android.net.wifi.WifiManager.IFACE_IP_MODE_TETHERED; import static android.net.wifi.WifiManager.WIFI_AP_STATE_ENABLED; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; +import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH; import static com.android.networkstack.tethering.TetheringNotificationUpdater.DOWNSTREAM_NONE; import static com.android.networkstack.tethering.UpstreamNetworkMonitor.EVENT_ON_CAPABILITIES; diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 961dc159009c..6859c5835c80 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -222,6 +222,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind try { Set<Association> associations = readAllAssociations(userId); + if (associations == null) { + continue; + } for (Association a : associations) { try { int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId); diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index 4a4b7dd7cc29..ea94ad0b3c20 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -953,7 +953,7 @@ public final class ContentCaptureManagerService extends } @Override - public void accept(@NonNull IDataShareReadAdapter serviceAdapter) throws RemoteException { + public void accept(@NonNull IDataShareReadAdapter serviceAdapter) { Slog.i(TAG, "Data share request accepted by Content Capture service"); logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ACCEPT_DATA_SHARE_REQUEST); @@ -961,8 +961,8 @@ public final class ContentCaptureManagerService extends if (clientPipe == null) { logServiceEvent( CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL); - mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); - serviceAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); + sendErrorSignal(mClientAdapter, serviceAdapter, + ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); return; } @@ -975,8 +975,8 @@ public final class ContentCaptureManagerService extends CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL); bestEffortCloseFileDescriptors(sourceIn, sinkIn); - mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); - serviceAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); + sendErrorSignal(mClientAdapter, serviceAdapter, + ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); return; } @@ -985,8 +985,26 @@ public final class ContentCaptureManagerService extends mParentService.mPackagesWithShareRequests.add(mDataShareRequest.getPackageName()); - mClientAdapter.write(sourceIn); - serviceAdapter.start(sinkOut); + try { + mClientAdapter.write(sourceIn); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to call write() the client operation", e); + sendErrorSignal(mClientAdapter, serviceAdapter, + ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); + logServiceEvent( + CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_CLIENT_PIPE_FAIL); + return; + } + try { + serviceAdapter.start(sinkOut); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to call start() the service operation", e); + sendErrorSignal(mClientAdapter, serviceAdapter, + ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); + logServiceEvent( + CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__DATA_SHARE_ERROR_SERVICE_PIPE_FAIL); + return; + } // File descriptors received by remote apps will be copies of the current one. Close // the ones that belong to the system server, so there's only 1 open left for the @@ -1061,11 +1079,20 @@ public final class ContentCaptureManagerService extends } @Override - public void reject() throws RemoteException { + public void reject() { Slog.i(TAG, "Data share request rejected by Content Capture service"); logServiceEvent(CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__REJECT_DATA_SHARE_REQUEST); - mClientAdapter.rejected(); + try { + mClientAdapter.rejected(); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to call rejected() the client operation", e); + try { + mClientAdapter.error(ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN); + } catch (RemoteException e2) { + Slog.w(TAG, "Failed to call error() the client operation", e2); + } + } } private void enforceDataSharingTtl(ParcelFileDescriptor sourceIn, diff --git a/services/core/java/android/os/UserManagerInternal.java b/services/core/java/android/os/UserManagerInternal.java index 94f5741fe828..fbe8c04bd59c 100644 --- a/services/core/java/android/os/UserManagerInternal.java +++ b/services/core/java/android/os/UserManagerInternal.java @@ -27,6 +27,7 @@ import com.android.server.pm.RestrictionsSet; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.List; /** * @hide Only for use within the system server. @@ -219,6 +220,13 @@ public abstract class UserManagerInternal { public abstract int[] getUserIds(); /** + * Internal implementation of getUsers does not check permissions. + * This improves performance for calls from inside system server which already have permissions + * checked. + */ + public abstract @NonNull List<UserInfo> getUsers(boolean excludeDying); + + /** * Checks if the {@code callingUserId} and {@code targetUserId} are same or in same group * and that the {@code callingUserId} is not a profile and {@code targetUserId} is enabled. * diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 2c977437b8c7..b46bebbd03d5 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -1141,8 +1141,6 @@ class StorageManagerService extends IStorageManager.Stub Slog.wtf(TAG, e); } - onKeyguardStateChanged(false); - mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget(); } @@ -1154,6 +1152,8 @@ class StorageManagerService extends IStorageManager.Stub mPmInternal.migrateLegacyObbData(); } + onKeyguardStateChanged(false); + // Record user as started so newly mounted volumes kick off events // correctly, then synthesize events for any already-mounted volumes. synchronized (mLock) { @@ -2259,8 +2259,15 @@ class StorageManagerService extends IStorageManager.Stub enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); final VolumeInfo vol = findVolumeByIdOrThrow(volId); + final String fsUuid = vol.fsUuid; try { mVold.format(vol.id, "auto"); + + // After a successful format above, we should forget about any + // records for the old partition, since it'll never appear again + if (!TextUtils.isEmpty(fsUuid)) { + forgetVolume(fsUuid); + } } catch (Exception e) { Slog.wtf(TAG, e); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3e6a17325f5c..20adfa5438cb 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1671,12 +1671,6 @@ public class ActivityManagerService extends IActivityManager.Stub */ @Nullable ContentCaptureManagerInternal mContentCaptureService; - /** - * Set of {@link ProcessRecord} that have either {@link ProcessRecord#hasTopUi()} or - * {@link ProcessRecord#runningRemoteAnimation} set to {@code true}. - */ - final ArraySet<ProcessRecord> mTopUiOrRunningRemoteAnimApps = new ArraySet<>(); - final class UiHandler extends Handler { public UiHandler() { super(com.android.server.UiThread.get().getLooper(), null, true); @@ -14708,7 +14702,6 @@ public class ActivityManagerService extends IActivityManager.Stub mProcessesToGc.remove(app); mPendingPssProcesses.remove(app); - mTopUiOrRunningRemoteAnimApps.remove(app); ProcessList.abortNextPssTime(app.procStateMemTracker); // Dismiss any open dialogs. @@ -18509,22 +18502,6 @@ public class ActivityManagerService extends IActivityManager.Stub return proc; } - /** - * @return {@code true} if {@link #mTopUiOrRunningRemoteAnimApps} set contains {@code app} or when there are no apps - * in this list, an false otherwise. - */ - boolean containsTopUiOrRunningRemoteAnimOrEmptyLocked(ProcessRecord app) { - return mTopUiOrRunningRemoteAnimApps.isEmpty() || mTopUiOrRunningRemoteAnimApps.contains(app); - } - - void addTopUiOrRunningRemoteAnim(ProcessRecord app) { - mTopUiOrRunningRemoteAnimApps.add(app); - } - - void removeTopUiOrRunningRemoteAnim(ProcessRecord app) { - mTopUiOrRunningRemoteAnimApps.remove(app); - } - @Override public boolean dumpHeap(String process, int userId, boolean managed, boolean mallocInfo, boolean runGc, String path, ParcelFileDescriptor fd, RemoteCallback finishCallback) { diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 58b0a157e2c2..da5f48962130 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -1151,17 +1151,8 @@ public final class OomAdjuster { // is currently showing UI. app.systemNoUi = true; if (app == topApp) { - // If specific system app has set ProcessRecord.mHasTopUi or is running a remote - // animation (ProcessRecord.runningRemoteAnimation), this will prevent topApp - // to use SCHED_GROUP_TOP_APP to ensure process with mHasTopUi will have exclusive - // access to configured cores. - if (mService.containsTopUiOrRunningRemoteAnimOrEmptyLocked(app)) { - app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_TOP_APP); - } else { - app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_DEFAULT); - } app.systemNoUi = false; - + app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_TOP_APP); app.adjType = "pers-top-activity"; } else if (app.hasTopUi()) { // sched group/proc state adjustment is below @@ -1202,20 +1193,10 @@ public final class OomAdjuster { boolean foregroundActivities = false; if (PROCESS_STATE_CUR_TOP == PROCESS_STATE_TOP && app == topApp) { - - // If specific system app has set ProcessRecord.mHasTopUi or is running a remote - // animation (ProcessRecord.runningRemoteAnimation), this will prevent topApp - // to use SCHED_GROUP_TOP_APP to ensure process with mHasTopUi will have exclusive - // access to configured cores. - if (mService.containsTopUiOrRunningRemoteAnimOrEmptyLocked(app)) { - adj = ProcessList.FOREGROUND_APP_ADJ; - schedGroup = ProcessList.SCHED_GROUP_TOP_APP; - app.adjType = "top-activity"; - } else { - adj = ProcessList.FOREGROUND_APP_ADJ; - schedGroup = ProcessList.SCHED_GROUP_DEFAULT; - app.adjType = "top-activity-behind-topui"; - } + // The last app on the list is the foreground app. + adj = ProcessList.FOREGROUND_APP_ADJ; + schedGroup = ProcessList.SCHED_GROUP_TOP_APP; + app.adjType = "top-activity"; foregroundActivities = true; procState = PROCESS_STATE_CUR_TOP; if (DEBUG_OOM_ADJ_REASON || logUid == appUid) { diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index 4c75ab21d6f2..c5152c081e70 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -1268,7 +1268,6 @@ class ProcessRecord implements WindowProcessListener { void setHasTopUi(boolean hasTopUi) { mHasTopUi = hasTopUi; mWindowProcessController.setHasTopUi(hasTopUi); - updateTopUiOrRunningRemoteAnim(); } boolean hasTopUi() { @@ -1519,19 +1518,10 @@ class ProcessRecord implements WindowProcessListener { Slog.i(TAG, "Setting runningRemoteAnimation=" + runningRemoteAnimation + " for pid=" + pid); } - updateTopUiOrRunningRemoteAnim(); mService.updateOomAdjLocked(this, true, OomAdjuster.OOM_ADJ_REASON_UI_VISIBILITY); } } - void updateTopUiOrRunningRemoteAnim() { - if (runningRemoteAnimation || hasTopUi()) { - mService.addTopUiOrRunningRemoteAnim(this); - } else { - mService.removeTopUiOrRunningRemoteAnim(this); - } - } - public long getInputDispatchingTimeout() { return mWindowProcessController.getInputDispatchingTimeout(); } diff --git a/services/core/java/com/android/server/gpu/GpuService.java b/services/core/java/com/android/server/gpu/GpuService.java index 955f17781540..8a3c963f4805 100644 --- a/services/core/java/com/android/server/gpu/GpuService.java +++ b/services/core/java/com/android/server/gpu/GpuService.java @@ -39,6 +39,7 @@ import android.os.UserHandle; import android.provider.DeviceConfig; import android.provider.DeviceConfig.Properties; import android.provider.Settings; +import android.text.TextUtils; import android.util.Base64; import android.util.Slog; @@ -62,15 +63,19 @@ public class GpuService extends SystemService { public static final String TAG = "GpuService"; public static final boolean DEBUG = false; - private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0"; + private static final String PROD_DRIVER_PROPERTY = "ro.gfx.driver.0"; + private static final String DEV_DRIVER_PROPERTY = "ro.gfx.driver.1"; private static final String GAME_DRIVER_WHITELIST_FILENAME = "whitelist.txt"; private static final int BASE64_FLAGS = Base64.NO_PADDING | Base64.NO_WRAP; private final Context mContext; - private final String mDriverPackageName; + private final String mProdDriverPackageName; + private final String mDevDriverPackageName; private final PackageManager mPackageManager; private final Object mLock = new Object(); private final Object mDeviceConfigLock = new Object(); + private final boolean mHasProdDriver; + private final boolean mHasDevDriver; private ContentResolver mContentResolver; private long mGameDriverVersionCode; private SettingsObserver mSettingsObserver; @@ -82,10 +87,13 @@ public class GpuService extends SystemService { super(context); mContext = context; - mDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER); + mProdDriverPackageName = SystemProperties.get(PROD_DRIVER_PROPERTY); mGameDriverVersionCode = -1; + mDevDriverPackageName = SystemProperties.get(DEV_DRIVER_PROPERTY); mPackageManager = context.getPackageManager(); - if (mDriverPackageName != null && !mDriverPackageName.isEmpty()) { + mHasProdDriver = !TextUtils.isEmpty(mProdDriverPackageName); + mHasDevDriver = !TextUtils.isEmpty(mDevDriverPackageName); + if (mHasDevDriver || mHasProdDriver) { final IntentFilter packageFilter = new IntentFilter(); packageFilter.addAction(ACTION_PACKAGE_ADDED); packageFilter.addAction(ACTION_PACKAGE_CHANGED); @@ -104,7 +112,7 @@ public class GpuService extends SystemService { public void onBootPhase(int phase) { if (phase == PHASE_BOOT_COMPLETED) { mContentResolver = mContext.getContentResolver(); - if (mDriverPackageName == null || mDriverPackageName.isEmpty()) { + if (!mHasProdDriver && !mHasDevDriver) { return; } mSettingsObserver = new SettingsObserver(); @@ -112,6 +120,7 @@ public class GpuService extends SystemService { fetchGameDriverPackageProperties(); processBlacklists(); setBlacklist(); + fetchDeveloperDriverPackageProperties(); } } @@ -166,18 +175,22 @@ public class GpuService extends SystemService { return; } final String packageName = data.getSchemeSpecificPart(); - if (!packageName.equals(mDriverPackageName)) { + final boolean isProdDriver = packageName.equals(mProdDriverPackageName); + final boolean isDevDriver = packageName.equals(mDevDriverPackageName); + if (!isProdDriver && !isDevDriver) { return; } - final boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false); - switch (intent.getAction()) { case ACTION_PACKAGE_ADDED: case ACTION_PACKAGE_CHANGED: case ACTION_PACKAGE_REMOVED: - fetchGameDriverPackageProperties(); - setBlacklist(); + if (isProdDriver) { + fetchGameDriverPackageProperties(); + setBlacklist(); + } else if (isDevDriver) { + fetchDeveloperDriverPackageProperties(); + } break; default: // do nothing @@ -208,11 +221,11 @@ public class GpuService extends SystemService { private void fetchGameDriverPackageProperties() { final ApplicationInfo driverInfo; try { - driverInfo = mPackageManager.getApplicationInfo(mDriverPackageName, + driverInfo = mPackageManager.getApplicationInfo(mProdDriverPackageName, PackageManager.MATCH_SYSTEM_ONLY); } catch (PackageManager.NameNotFoundException e) { if (DEBUG) { - Slog.e(TAG, "driver package '" + mDriverPackageName + "' not installed"); + Slog.e(TAG, "driver package '" + mProdDriverPackageName + "' not installed"); } return; } @@ -232,14 +245,14 @@ public class GpuService extends SystemService { mGameDriverVersionCode = driverInfo.longVersionCode; try { - final Context driverContext = mContext.createPackageContext(mDriverPackageName, + final Context driverContext = mContext.createPackageContext(mProdDriverPackageName, Context.CONTEXT_RESTRICTED); assetToSettingsGlobal(mContext, driverContext, GAME_DRIVER_WHITELIST_FILENAME, Settings.Global.GAME_DRIVER_WHITELIST, ","); } catch (PackageManager.NameNotFoundException e) { if (DEBUG) { - Slog.w(TAG, "driver package '" + mDriverPackageName + "' not installed"); + Slog.w(TAG, "driver package '" + mProdDriverPackageName + "' not installed"); } } } @@ -291,4 +304,40 @@ public class GpuService extends SystemService { } } } + + private void fetchDeveloperDriverPackageProperties() { + final ApplicationInfo driverInfo; + try { + driverInfo = mPackageManager.getApplicationInfo(mDevDriverPackageName, + PackageManager.MATCH_SYSTEM_ONLY); + } catch (PackageManager.NameNotFoundException e) { + if (DEBUG) { + Slog.e(TAG, "driver package '" + mDevDriverPackageName + "' not installed"); + } + return; + } + + // O drivers are restricted to the sphal linker namespace, so don't try to use + // packages unless they declare they're compatible with that restriction. + if (driverInfo.targetSdkVersion < Build.VERSION_CODES.O) { + if (DEBUG) { + Slog.w(TAG, "Driver package is not known to be compatible with O"); + } + return; + } + + setUpdatableDriverPath(driverInfo); + } + + private void setUpdatableDriverPath(ApplicationInfo ai) { + if (ai.primaryCpuAbi == null) { + nSetUpdatableDriverPath(""); + return; + } + final StringBuilder sb = new StringBuilder(); + sb.append(ai.sourceDir).append("!/lib/"); + nSetUpdatableDriverPath(sb.toString()); + } + + private static native void nSetUpdatableDriverPath(String driverPath); } diff --git a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java index e17cca423822..3fb713bc01a5 100644 --- a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java +++ b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java @@ -17,9 +17,8 @@ package com.android.server.location.gnss; import android.content.Context; +import android.database.Cursor; import android.net.ConnectivityManager; -import android.net.LinkAddress; -import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkInfo; @@ -27,26 +26,25 @@ import android.net.NetworkRequest; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; -import android.telephony.PhoneStateListener; -import android.telephony.PreciseCallState; +import android.provider.Telephony.Carriers; +import android.telephony.ServiceState; +import android.telephony.TelephonyManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; +import android.telephony.PreciseCallState; +import android.telephony.PhoneStateListener; import android.util.Log; import com.android.internal.location.GpsNetInitiatedHandler; -import java.net.Inet4Address; -import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; +import java.util.Map; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Map; - +import java.util.Iterator; /** * Handles network connection requests and network state change updates for AGPS data download. @@ -387,10 +385,10 @@ class GnssNetworkConnectivityHandler { private ConnectivityManager.NetworkCallback createSuplConnectivityCallback() { return new ConnectivityManager.NetworkCallback() { @Override - public void onLinkPropertiesChanged(Network network, LinkProperties linkProperties) { + public void onAvailable(Network network) { if (DEBUG) Log.d(TAG, "SUPL network connection available."); // Specific to a change to a SUPL enabled network becoming ready - handleSuplConnectionAvailable(network, linkProperties); + handleSuplConnectionAvailable(network); } @Override @@ -498,7 +496,7 @@ class GnssNetworkConnectivityHandler { return networkAttributes; } - private void handleSuplConnectionAvailable(Network network, LinkProperties linkProperties) { + private void handleSuplConnectionAvailable(Network network) { // TODO: The synchronous method ConnectivityManager.getNetworkInfo() should not be called // inside the asynchronous ConnectivityManager.NetworkCallback methods. NetworkInfo info = mConnMgr.getNetworkInfo(network); @@ -530,7 +528,7 @@ class GnssNetworkConnectivityHandler { setRouting(); } - int apnIpType = getLinkIpType(linkProperties); + int apnIpType = getApnIpType(apn); if (DEBUG) { String message = String.format( "native_agps_data_conn_open: mAgpsApn=%s, mApnIpType=%s", @@ -706,32 +704,74 @@ class GnssNetworkConnectivityHandler { } } - private int getLinkIpType(LinkProperties linkProperties) { + private int getApnIpType(String apn) { ensureInHandlerThread(); - boolean isIPv4 = false; - boolean isIPv6 = false; - - List<LinkAddress> linkAddresses = linkProperties.getLinkAddresses(); - for (LinkAddress linkAddress : linkAddresses) { - InetAddress inetAddress = linkAddress.getAddress(); - if (inetAddress instanceof Inet4Address) { - isIPv4 = true; - } else if (inetAddress instanceof Inet6Address) { - isIPv6 = true; + if (apn == null) { + return APN_INVALID; + } + TelephonyManager phone = (TelephonyManager) + mContext.getSystemService(Context.TELEPHONY_SERVICE); + // During an emergency call with an active sub id, get the Telephony Manager specific + // to the active sub to get the correct value from getServiceState and getNetworkType + if (mNiHandler.getInEmergency() && mActiveSubId >= 0) { + TelephonyManager subIdTelManager = + phone.createForSubscriptionId(mActiveSubId); + if (subIdTelManager != null) { + phone = subIdTelManager; } - if (DEBUG) Log.d(TAG, "LinkAddress : " + inetAddress.toString()); } - - if (isIPv4 && isIPv6) { - return APN_IPV4V6; + ServiceState serviceState = phone.getServiceState(); + String projection = null; + String selection = null; + + // Carrier configuration may override framework roaming state, we need to use the actual + // modem roaming state instead of the framework roaming state. + if (serviceState != null && serviceState.getDataRoamingFromRegistration()) { + projection = Carriers.ROAMING_PROTOCOL; + } else { + projection = Carriers.PROTOCOL; + } + // No SIM case for emergency + if (TelephonyManager.NETWORK_TYPE_UNKNOWN == phone.getNetworkType() + && AGPS_TYPE_EIMS == mAGpsType) { + selection = String.format( + "type like '%%emergency%%' and apn = '%s' and carrier_enabled = 1", apn); + } else { + selection = String.format("current = 1 and apn = '%s' and carrier_enabled = 1", apn); + } + try (Cursor cursor = mContext.getContentResolver().query( + Carriers.CONTENT_URI, + new String[]{projection}, + selection, + null, + Carriers.DEFAULT_SORT_ORDER)) { + if (null != cursor && cursor.moveToFirst()) { + return translateToApnIpType(cursor.getString(0), apn); + } else { + Log.e(TAG, "No entry found in query for APN: " + apn); + } + } catch (Exception e) { + Log.e(TAG, "Error encountered on APN query for: " + apn, e); } - if (isIPv4) { + + return APN_IPV4V6; + } + + private int translateToApnIpType(String ipProtocol, String apn) { + if ("IP".equals(ipProtocol)) { return APN_IPV4; } - if (isIPv6) { + if ("IPV6".equals(ipProtocol)) { return APN_IPV6; } - return APN_INVALID; + if ("IPV4V6".equals(ipProtocol)) { + return APN_IPV4V6; + } + + // we hit the default case so the ipProtocol is not recognized + String message = String.format("Unknown IP Protocol: %s, for APN: %s", ipProtocol, apn); + Log.e(TAG, message); + return APN_IPV4V6; } // AGPS support diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 96250411f984..242132c8e5ff 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -2572,6 +2572,9 @@ public class MediaSessionService extends SystemService implements Monitor { } } else { if (mKeyType == KEY_TYPE_VOLUME) { + if (isFirstLongPressKeyEvent(keyEvent)) { + dispatchVolumeKeyLongPressLocked(mTrackingFirstDownKeyEvent); + } dispatchVolumeKeyLongPressLocked(keyEvent); } else if (isFirstLongPressKeyEvent(keyEvent) && isVoiceKey(keyEvent.getKeyCode())) { diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java index bd39caa86338..e01f36513c5c 100644 --- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java +++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java @@ -45,6 +45,7 @@ import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; import android.text.TextUtils; +import android.util.Log; import android.util.Slog; import com.android.internal.R; @@ -58,8 +59,7 @@ import java.util.Objects; // TODO: check thread safety. We may need to use lock to protect variables. class SystemMediaRoute2Provider extends MediaRoute2Provider { private static final String TAG = "MR2SystemProvider"; - // TODO(b/156996903): Revert it when releasing the framework. - private static final boolean DEBUG = true; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); static final String DEFAULT_ROUTE_ID = "DEFAULT_ROUTE"; static final String DEVICE_ROUTE_ID = "DEVICE_ROUTE"; diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 920312261710..8a7702efcba8 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -817,7 +817,7 @@ public class AppsFilter { } } - if (!setting.pkg.getProtectedBroadcasts().isEmpty()) { + if (setting.pkg != null && !setting.pkg.getProtectedBroadcasts().isEmpty()) { final String removingPackageName = setting.pkg.getPackageName(); final Set<String> protectedBroadcasts = mProtectedBroadcasts; mProtectedBroadcasts = collectProtectedBroadcasts(settings, removingPackageName); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 5125c491cf2b..dc7ed34fb0be 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2988,7 +2988,7 @@ public class PackageManagerService extends IPackageManager.Stub t.traceEnd(); t.traceBegin("read user settings"); - mFirstBoot = !mSettings.readLPw(mUserManager.getUsers(false)); + mFirstBoot = !mSettings.readLPw(mInjector.getUserManagerInternal().getUsers(false)); t.traceEnd(); // Clean up orphaned packages for which the code path doesn't exist @@ -3431,7 +3431,7 @@ public class PackageManagerService extends IPackageManager.Stub // boot, then we need to initialize the default preferred apps across // all defined users. if (!mOnlyCore && (mPromoteSystemApps || mFirstBoot)) { - for (UserInfo user : mUserManager.getUsers(true)) { + for (UserInfo user : mInjector.getUserManagerInternal().getUsers(true)) { mSettings.applyDefaultPreferredAppsLPw(user.id); primeDomainVerificationsLPw(user.id); } @@ -22143,7 +22143,7 @@ public class PackageManagerService extends IPackageManager.Stub } for (String packageName : apkList) { setSystemAppHiddenUntilInstalled(packageName, true); - for (UserInfo user : mUserManager.getUsers(false)) { + for (UserInfo user : mInjector.getUserManagerInternal().getUsers(false)) { setSystemAppInstallState(packageName, false, user.id); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index 1fce07b0cbf1..03f4708c09c4 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -595,8 +595,8 @@ public class PackageManagerServiceUtils { /** Returns true to force apk verification if the package is considered privileged. */ static boolean isApkVerificationForced(@Nullable PackageSetting ps) { - return ps != null && ps.isPrivileged() && ( - isApkVerityEnabled() || isLegacyApkVerityEnabled()); + // TODO(b/154310064): re-enable. + return false; } /** diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 2a6997cba4bb..27924a68ff48 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -751,13 +751,19 @@ public class UserManagerService extends IUserManager.Stub { } public @NonNull List<UserInfo> getUsers(boolean excludeDying) { - return getUsers(/*excludePartial= */ true, excludeDying, /* excludePreCreated= */ true); + return getUsers(/*excludePartial= */ true, excludeDying, /* excludePreCreated= */ + true); } @Override public @NonNull List<UserInfo> getUsers(boolean excludePartial, boolean excludeDying, boolean excludePreCreated) { checkManageOrCreateUsersPermission("query users"); + return getUsersInternal(excludePartial, excludeDying, excludePreCreated); + } + + private @NonNull List<UserInfo> getUsersInternal(boolean excludePartial, boolean excludeDying, + boolean excludePreCreated) { synchronized (mUsersLock) { ArrayList<UserInfo> users = new ArrayList<UserInfo>(mUsers.size()); final int userSize = mUsers.size(); @@ -3291,11 +3297,13 @@ public class UserManagerService extends IUserManager.Stub { final TimingsTraceAndSlog t = new TimingsTraceAndSlog(); t.traceBegin("createUser-" + flags); final long sessionId = logUserCreateJourneyBegin(nextProbableUserId, userType, flags); + UserInfo newUser = null; try { - return createUserInternalUncheckedNoTracing(name, userType, flags, parentId, - preCreate, disallowedPackages, t); + newUser = createUserInternalUncheckedNoTracing(name, userType, flags, parentId, + preCreate, disallowedPackages, t); + return newUser; } finally { - logUserCreateJourneyFinish(sessionId, nextProbableUserId); + logUserCreateJourneyFinish(sessionId, nextProbableUserId, newUser != null); t.traceEnd(); } } @@ -3314,10 +3322,11 @@ public class UserManagerService extends IUserManager.Stub { return sessionId; } - private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId) { + private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId, boolean finish) { FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId, FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER, - FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH); + finish ? FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH + : FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__NONE); } private UserInfo createUserInternalUncheckedNoTracing(@Nullable String name, @@ -5042,6 +5051,12 @@ public class UserManagerService extends IUserManager.Stub { } @Override + public @NonNull List<UserInfo> getUsers(boolean excludeDying) { + return UserManagerService.this.getUsersInternal(/*excludePartial= */ true, + excludeDying, /* excludePreCreated= */ true); + } + + @Override public boolean isUserUnlockingOrUnlocked(@UserIdInt int userId) { int state; synchronized (mUserStates) { diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java index 8b6e9a46ca91..2e5c0f460c7a 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java @@ -510,7 +510,8 @@ public class BatterySaverController implements BatterySaverPolicyListener { if (getPowerSaveModeChangedListenerPackage().isPresent()) { intent = new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED) .setPackage(getPowerSaveModeChangedListenerPackage().get()) - .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); + .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND + | Intent.FLAG_RECEIVER_FOREGROUND); mContext.sendBroadcastAsUser(intent, UserHandle.ALL); } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 304860c2588f..319fd18faca5 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2208,7 +2208,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } boolean isResizeable() { - return ActivityInfo.isResizeableMode(info.resizeMode) || info.supportsPictureInPicture(); + return mAtmService.mForceResizableActivities + || ActivityInfo.isResizeableMode(info.resizeMode) + || info.supportsPictureInPicture(); } /** @return whether this activity is non-resizeable or forced to be resizeable */ @@ -4341,9 +4343,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * screenshot. */ boolean shouldUseAppThemeSnapshot() { - return mDisablePreviewScreenshots || forAllWindows(w -> { - return mWmService.isSecureLocked(w); - }, true /* topToBottom */); + return mDisablePreviewScreenshots || forAllWindows(WindowState::isSecureLocked, + true /* topToBottom */); } /** diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index 1f9e8609c2ad..407b9fcbca74 100644 --- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java @@ -73,6 +73,7 @@ import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_ import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE; import static com.android.server.wm.RootWindowContainer.TAG_STATES; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; +import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS; import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_PINNED_TASK; import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE; import static com.android.server.wm.Task.LOCK_TASK_AUTH_LAUNCHABLE_PRIV; @@ -1809,7 +1810,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { for (int i = mStoppingActivities.size() - 1; i >= 0; --i) { final ActivityRecord s = mStoppingActivities.get(i); final boolean animating = s.isAnimating(TRANSITION | PARENTS, - ANIMATION_TYPE_APP_TRANSITION); + ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS); if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + s.nowVisible + " animating=" + animating + " finishing=" + s.finishing); if (!animating || mService.mShuttingDown) { diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 6dd1ea934497..b695f5ad1a17 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3824,7 +3824,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } userId = activity.mUserId; } - return !DevicePolicyCache.getInstance().getScreenCaptureDisabled(userId); + return DevicePolicyCache.getInstance().isScreenCaptureAllowed(userId, false); } @Override diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index efcb558fef66..6305fda4924c 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -16,17 +16,19 @@ package com.android.server.wm; -import android.view.SurfaceControl; +import android.util.ArrayMap; +import android.util.ArraySet; -import java.util.HashMap; +import java.util.Set; /** - * Utility class for collecting and merging transactions from various sources asynchronously. + * Utility class for collecting WindowContainers that will merge transactions. * For example to use to synchronously resize all the children of a window container * 1. Open a new sync set, and pass the listener that will be invoked * int id startSyncSet(TransactionReadyListener) * the returned ID will be eventually passed to the TransactionReadyListener in combination - * with the prepared transaction. You also use it to refer to the operation in future steps. + * with a set of WindowContainers that are ready, meaning onTransactionReady was called for + * those WindowContainers. You also use it to refer to the operation in future steps. * 2. Ask each child to participate: * addToSyncSet(int id, WindowContainer wc) * if the child thinks it will be affected by a configuration change (a.k.a. has a visible @@ -38,35 +40,37 @@ import java.util.HashMap; * setReady(int id) * 5. If there were no sub windows anywhere in the hierarchy to wait on, then * transactionReady is immediately invoked, otherwise all the windows are poked - * to redraw and to deliver a buffer to WMS#finishDrawing. - * Once all this drawing is complete the combined transaction of all the buffers - * and pending transaction hierarchy changes will be delivered to the TransactionReadyListener + * to redraw and to deliver a buffer to {@link WindowState#finishDrawing}. + * Once all this drawing is complete the WindowContainer that's ready will be added to the + * set of ready WindowContainers. When the final onTransactionReady is called, it will merge + * the transactions of the all the WindowContainers and will be delivered to the + * TransactionReadyListener */ class BLASTSyncEngine { private static final String TAG = "BLASTSyncEngine"; interface TransactionReadyListener { - void onTransactionReady(int mSyncId, SurfaceControl.Transaction mergedTransaction); + void onTransactionReady(int mSyncId, Set<WindowContainer> windowContainersReady); }; // Holds state associated with a single synchronous set of operations. class SyncState implements TransactionReadyListener { int mSyncId; - SurfaceControl.Transaction mMergedTransaction; int mRemainingTransactions; TransactionReadyListener mListener; boolean mReady = false; + Set<WindowContainer> mWindowContainersReady = new ArraySet<>(); private void tryFinish() { if (mRemainingTransactions == 0 && mReady) { - mListener.onTransactionReady(mSyncId, mMergedTransaction); + mListener.onTransactionReady(mSyncId, mWindowContainersReady); mPendingSyncs.remove(mSyncId); } } - public void onTransactionReady(int mSyncId, SurfaceControl.Transaction mergedTransaction) { + public void onTransactionReady(int mSyncId, Set<WindowContainer> windowContainersReady) { mRemainingTransactions--; - mMergedTransaction.merge(mergedTransaction); + mWindowContainersReady.addAll(windowContainersReady); tryFinish(); } @@ -86,14 +90,13 @@ class BLASTSyncEngine { SyncState(TransactionReadyListener l, int id) { mListener = l; mSyncId = id; - mMergedTransaction = new SurfaceControl.Transaction(); mRemainingTransactions = 0; } }; - int mNextSyncId = 0; + private int mNextSyncId = 0; - final HashMap<Integer, SyncState> mPendingSyncs = new HashMap(); + private final ArrayMap<Integer, SyncState> mPendingSyncs = new ArrayMap<>(); BLASTSyncEngine() { } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index c24c1e466133..5e3688029bec 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -3782,7 +3782,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } boolean hasSecureWindowOnScreen() { - final WindowState win = getWindow(w -> w.isOnScreen() && mWmService.isSecureLocked(w)); + final WindowState win = getWindow(w -> w.isOnScreen() && w.isSecureLocked()); return win != null; } @@ -5664,10 +5664,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo * Return {@code true} if there is an ongoing animation to the "Recents" activity and this * activity as a fixed orientation so shouldn't be rotated. */ - boolean isFixedOrientationRecentsAnimating() { + boolean isTopFixedOrientationRecentsAnimating() { return mAnimatingRecents != null && mAnimatingRecents.getRequestedConfigurationOrientation() - != ORIENTATION_UNDEFINED; + != ORIENTATION_UNDEFINED && !hasTopFixedRotationLaunchingApp(); } @Override diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index f093fd34bcc0..37ecee8e3db3 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -432,7 +432,7 @@ public class DisplayRotation { } if (mDisplayContent.mFixedRotationTransitionListener - .isFixedOrientationRecentsAnimating()) { + .isTopFixedOrientationRecentsAnimating()) { // During the recents animation, the closing app might still be considered on top. // In order to ignore its requested orientation to avoid a sensor led rotation (e.g // user rotating the device while the recents animation is running), we ignore diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 3d7873ad2f7c..56c46d2b6422 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -111,15 +111,20 @@ class InsetsPolicy { abortTransient(); } mFocusedWin = focusedWin; - mStateController.onBarControlTargetChanged(getStatusControlTarget(focusedWin), - getFakeStatusControlTarget(focusedWin), - getNavControlTarget(focusedWin), - getFakeNavControlTarget(focusedWin)); + boolean forceShowsSystemBarsForWindowingMode = forceShowsSystemBarsForWindowingMode(); + InsetsControlTarget statusControlTarget = getStatusControlTarget(focusedWin, + forceShowsSystemBarsForWindowingMode); + InsetsControlTarget navControlTarget = getNavControlTarget(focusedWin, + forceShowsSystemBarsForWindowingMode); + mStateController.onBarControlTargetChanged(statusControlTarget, + getFakeControlTarget(focusedWin, statusControlTarget), + navControlTarget, + getFakeControlTarget(focusedWin, navControlTarget)); if (ViewRootImpl.sNewInsetsMode != ViewRootImpl.NEW_INSETS_MODE_FULL) { return; } - mStatusBar.updateVisibility(getStatusControlTarget(focusedWin), ITYPE_STATUS_BAR); - mNavBar.updateVisibility(getNavControlTarget(focusedWin), ITYPE_NAVIGATION_BAR); + mStatusBar.updateVisibility(statusControlTarget, ITYPE_STATUS_BAR); + mNavBar.updateVisibility(navControlTarget, ITYPE_NAVIGATION_BAR); mPolicy.updateHideNavInputEventReceiver(); } @@ -237,16 +242,13 @@ class InsetsPolicy { updateBarControlTarget(mFocusedWin); } - private @Nullable InsetsControlTarget getFakeStatusControlTarget( - @Nullable WindowState focused) { - return getStatusControlTarget(focused) == mDummyControlTarget ? focused : null; + private @Nullable InsetsControlTarget getFakeControlTarget(@Nullable WindowState focused, + InsetsControlTarget realControlTarget) { + return realControlTarget == mDummyControlTarget ? focused : null; } - private @Nullable InsetsControlTarget getFakeNavControlTarget(@Nullable WindowState focused) { - return getNavControlTarget(focused) == mDummyControlTarget ? focused : null; - } - - private @Nullable InsetsControlTarget getStatusControlTarget(@Nullable WindowState focusedWin) { + private @Nullable InsetsControlTarget getStatusControlTarget(@Nullable WindowState focusedWin, + boolean forceShowsSystemBarsForWindowingMode) { if (mShowingTransientTypes.indexOf(ITYPE_STATUS_BAR) != -1) { return mDummyControlTarget; } @@ -254,7 +256,7 @@ class InsetsPolicy { // Notification shade has control anyways, no reason to force anything. return focusedWin; } - if (forceShowsSystemBarsForWindowingMode()) { + if (forceShowsSystemBarsForWindowingMode) { // Status bar is forcibly shown for the windowing mode which is a steady state. // We don't want the client to control the status bar, and we will dispatch the real // visibility of status bar to the client. @@ -274,7 +276,8 @@ class InsetsPolicy { return focusedWin; } - private @Nullable InsetsControlTarget getNavControlTarget(@Nullable WindowState focusedWin) { + private @Nullable InsetsControlTarget getNavControlTarget(@Nullable WindowState focusedWin, + boolean forceShowsSystemBarsForWindowingMode) { if (mShowingTransientTypes.indexOf(ITYPE_NAVIGATION_BAR) != -1) { return mDummyControlTarget; } @@ -282,7 +285,7 @@ class InsetsPolicy { // Notification shade has control anyways, no reason to force anything. return focusedWin; } - if (forceShowsSystemBarsForWindowingMode()) { + if (forceShowsSystemBarsForWindowingMode) { // Navigation bar is forcibly shown for the windowing mode which is a steady state. // We don't want the client to control the navigation bar, and we will dispatch the real // visibility of navigation bar to the client. diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index bf9a78489167..e80d5937eb1f 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -254,8 +254,9 @@ class InsetsStateController { void onInsetsModified(InsetsControlTarget windowState, InsetsState state) { boolean changed = false; - for (int i = state.getSourcesCount() - 1; i >= 0; i--) { - final InsetsSource source = state.sourceAt(i); + for (int i = 0; i < InsetsState.SIZE; i++) { + final InsetsSource source = state.peekSource(i); + if (source == null) continue; final InsetsSourceProvider provider = mProviders.get(source.getType()); if (provider == null) { continue; diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 583663c5455f..45a36e562aac 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -662,10 +662,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } } - void setSecureSurfaceState(int userId, boolean disabled) { + void setSecureSurfaceState(int userId) { forAllWindows((w) -> { if (w.mHasSurface && userId == w.mShowUserId) { - w.mWinAnimator.setSecureLocked(disabled); + w.mWinAnimator.setSecureLocked(w.isSecureLocked()); } }, true /* traverseTopToBottom */); } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 6670dbfea282..3acc5ee5ca3f 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -939,14 +939,15 @@ class Task extends WindowContainer<WindowContainer> { /** Sets the original intent, _without_ updating the calling uid or package. */ private void setIntent(Intent _intent, ActivityInfo info) { + final boolean isLeaf = isLeafTask(); if (intent == null) { mNeverRelinquishIdentity = (info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0; - } else if (mNeverRelinquishIdentity) { + } else if (mNeverRelinquishIdentity && isLeaf) { return; } - affinity = isLeafTask() ? info.taskAffinity : null; + affinity = isLeaf ? info.taskAffinity : null; if (intent == null) { // If this task already has an intent associated with it, don't set the root // affinity -- we don't want it changing after initially set, but the initially @@ -3587,6 +3588,7 @@ class Task extends WindowContainer<WindowContainer> { final Task top = getTopMostTask(); info.resizeMode = top != null ? top.mResizeMode : mResizeMode; info.topActivityType = top.getActivityType(); + info.isResizeable = isResizeable(); ActivityRecord rootActivity = top.getRootActivity(); if (rootActivity == null || rootActivity.pictureInPictureArgs.empty()) { @@ -3684,20 +3686,6 @@ class Task extends WindowContainer<WindowContainer> { final int otherWindowingMode = other.getWindowingMode(); if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) { - // In this case the home stack isn't resizeable even though we are in split-screen - // mode. We still want the primary splitscreen stack to be visible as there will be - // a slight hint of it in the status bar area above the non-resizeable home - // activity. In addition, if the fullscreen assistant is over primary splitscreen - // stack, the stack should still be visible in the background as long as the recents - // animation is running. - final int activityType = other.getActivityType(); - if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) { - if (activityType == ACTIVITY_TYPE_HOME - || (activityType == ACTIVITY_TYPE_ASSISTANT - && mWmService.getRecentsAnimationController() != null)) { - break; - } - } if (other.isTranslucent(starting)) { // Can be visible behind a translucent fullscreen stack. gotTranslucentFullscreen = true; diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 07e309e1126a..46761dc81117 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -571,14 +571,16 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Apps and their containers are not allowed to specify an orientation while using // root tasks...except for the home stack if it is not resizable and currently // visible (top of) its root task. - if (mRootHomeTask != null && mRootHomeTask.isVisible()) { - final Task topMost = mRootHomeTask.getTopMostTask(); - final boolean resizable = topMost != null && topMost.isResizeable(); - if (!(resizable && mRootHomeTask.matchParentBounds())) { - final int orientation = mRootHomeTask.getOrientation(); - if (orientation != SCREEN_ORIENTATION_UNSET) { - return orientation; - } + if (mRootHomeTask != null && mRootHomeTask.isVisible() + && !mRootHomeTask.isResizeable()) { + // Manually nest one-level because because getOrientation() checks fillsParent() + // which checks that requestedOverrideBounds() is empty. However, in this case, + // it is not empty because it's been overridden to maintain the fullscreen size + // within a smaller split-root. + final Task topHomeTask = mRootHomeTask.getTopMostTask(); + final int orientation = topHomeTask.getOrientation(); + if (orientation != SCREEN_ORIENTATION_UNSET) { + return orientation; } } return SCREEN_ORIENTATION_UNSPECIFIED; diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 1da1d116b938..574f37b87443 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -455,7 +455,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { task.fillTaskInfo(mTmpTaskInfo); boolean changed = lastInfo == null || mTmpTaskInfo.topActivityType != lastInfo.topActivityType - || mTmpTaskInfo.isResizable() != lastInfo.isResizable() + || mTmpTaskInfo.isResizeable != lastInfo.isResizeable || mTmpTaskInfo.pictureInPictureParams != lastInfo.pictureInPictureParams || !TaskDescription.equals(mTmpTaskInfo.taskDescription, lastInfo.taskDescription); if (!changed) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index dd08f4208eca..3a1619ba11a1 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -93,6 +93,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Comparator; import java.util.LinkedList; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; @@ -179,6 +180,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * Applied as part of the animation pass in "prepareSurfaces". */ protected final SurfaceAnimator mSurfaceAnimator; + private boolean mAnyParentAnimating; + final SurfaceFreezer mSurfaceFreezer; protected final WindowManagerService mWmService; @@ -2460,21 +2463,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< */ @Nullable WindowContainer getAnimatingContainer(int flags, int typesToCheck) { - int animationType = mSurfaceAnimator.getAnimationType(); - if (mSurfaceAnimator.isAnimating() && (animationType & typesToCheck) > 0) { - return this; - } - if ((flags & TRANSITION) != 0 && isWaitingForTransitionStart()) { + if (isSelfAnimating(flags, typesToCheck)) { return this; } if ((flags & PARENTS) != 0) { - final WindowContainer parent = getParent(); - if (parent != null) { - final WindowContainer wc = parent.getAnimatingContainer( - flags & ~CHILDREN, typesToCheck); - if (wc != null) { - return wc; + WindowContainer parent = getParent(); + while (parent != null) { + if (parent.isSelfAnimating(flags, typesToCheck)) { + return parent; } + parent = parent.getParent(); } } if ((flags & CHILDREN) != 0) { @@ -2490,6 +2488,21 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } /** + * Internal method only to be used during {@link #getAnimatingContainer(int, int)}.DO NOT CALL + * FROM OUTSIDE. + */ + protected boolean isSelfAnimating(int flags, int typesToCheck) { + if (mSurfaceAnimator.isAnimating() + && (mSurfaceAnimator.getAnimationType() & typesToCheck) > 0) { + return true; + } + if ((flags & TRANSITION) != 0 && isWaitingForTransitionStart()) { + return true; + } + return false; + } + + /** * @deprecated Use {@link #getAnimatingContainer(int, int)} instead. */ @Nullable @@ -2673,11 +2686,13 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } @Override - public void onTransactionReady(int mSyncId, SurfaceControl.Transaction mergedTransaction) { - mergedTransaction.merge(mBLASTSyncTransaction); - mUsingBLASTSyncTransaction = false; + public void onTransactionReady(int mSyncId, Set<WindowContainer> windowContainersReady) { + if (mWaitingListener == null) { + return; + } - mWaitingListener.onTransactionReady(mWaitingSyncId, mergedTransaction); + windowContainersReady.add(this); + mWaitingListener.onTransactionReady(mWaitingSyncId, windowContainersReady); mWaitingListener = null; mWaitingSyncId = -1; @@ -2728,4 +2743,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< boolean useBLASTSync() { return mUsingBLASTSyncTransaction; } + + void mergeBlastSyncTransaction(Transaction t) { + t.merge(mBLASTSyncTransaction); + mUsingBLASTSyncTransaction = false; + } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 4718b59f3bfe..27864393d23e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -139,7 +139,6 @@ import android.app.IActivityManager; import android.app.IActivityTaskManager; import android.app.IAssistDataReceiver; import android.app.WindowConfiguration; -import android.app.admin.DevicePolicyCache; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -1882,16 +1881,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - boolean isSecureLocked(WindowState w) { - if ((w.mAttrs.flags&WindowManager.LayoutParams.FLAG_SECURE) != 0) { - return true; - } - if (DevicePolicyCache.getInstance().getScreenCaptureDisabled(w.mShowUserId)) { - return true; - } - return false; - } - /** * Set whether screen capture is disabled for all windows of a specific user from * the device policy cache. @@ -1905,8 +1894,7 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mGlobalLock) { // Update secure surface for all windows belonging to this user. - mRoot.setSecureSurfaceState(userId, - DevicePolicyCache.getInstance().getScreenCaptureDisabled(userId)); + mRoot.setSecureSurfaceState(userId); } } @@ -2256,7 +2244,7 @@ public class WindowManagerService extends IWindowManager.Stub && (win.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0; wallpaperMayMove |= (flagChanges & FLAG_SHOW_WALLPAPER) != 0; if ((flagChanges & FLAG_SECURE) != 0 && winAnimator.mSurfaceController != null) { - winAnimator.mSurfaceController.setSecure(isSecureLocked(win)); + winAnimator.mSurfaceController.setSecure(win.isSecureLocked()); } win.mRelayoutCalled = true; @@ -2878,15 +2866,13 @@ public class WindowManagerService extends IWindowManager.Stub aspectRatio); } - public void getStackBounds(int windowingMode, int activityType, Rect bounds) { - synchronized (mGlobalLock) { - final ActivityStack stack = mRoot.getStack(windowingMode, activityType); - if (stack != null) { - stack.getBounds(bounds); - return; - } - bounds.setEmpty(); + void getStackBounds(int windowingMode, int activityType, Rect bounds) { + final ActivityStack stack = mRoot.getStack(windowingMode, activityType); + if (stack != null) { + stack.getBounds(bounds); + return; } + bounds.setEmpty(); } /** diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index a3faa86758cd..fbc5afadac6b 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -44,6 +44,7 @@ import android.window.IWindowOrganizerController; import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.function.pooled.PooledConsumer; import com.android.internal.util.function.pooled.PooledLambda; @@ -51,6 +52,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; /** * Server side implementation for the interface for organizing windows @@ -142,7 +144,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub // operations so we don't end up splitting effects between the WM // pending transaction and the BLASTSync transaction. if (syncId >= 0) { - mBLASTSyncEngine.addToSyncSet(syncId, wc); + addToSyncSet(syncId, wc); } int containerEffect = applyWindowContainerChange(wc, entry.getValue()); @@ -164,7 +166,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub continue; } if (syncId >= 0) { - mBLASTSyncEngine.addToSyncSet(syncId, wc); + addToSyncSet(syncId, wc); } effects |= sanitizeAndApplyHierarchyOp(wc, hop); } @@ -396,21 +398,33 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub return mDisplayAreaOrganizerController; } + @VisibleForTesting int startSyncWithOrganizer(IWindowContainerTransactionCallback callback) { int id = mBLASTSyncEngine.startSyncSet(this); mTransactionCallbacksByPendingSyncId.put(id, callback); return id; } + @VisibleForTesting void setSyncReady(int id) { mBLASTSyncEngine.setReady(id); } + @VisibleForTesting + void addToSyncSet(int syncId, WindowContainer wc) { + mBLASTSyncEngine.addToSyncSet(syncId, wc); + } + @Override - public void onTransactionReady(int mSyncId, SurfaceControl.Transaction mergedTransaction) { + public void onTransactionReady(int mSyncId, Set<WindowContainer> windowContainersReady) { final IWindowContainerTransactionCallback callback = mTransactionCallbacksByPendingSyncId.get(mSyncId); + SurfaceControl.Transaction mergedTransaction = new SurfaceControl.Transaction(); + for (WindowContainer container : windowContainersReady) { + container.mergeBlastSyncTransaction(mergedTransaction); + } + try { callback.onTransactionReady(mSyncId, mergedTransaction); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 5fc519c86f11..26a1fea1732b 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -176,6 +176,7 @@ import static com.android.server.wm.WindowStateProto.WINDOW_FRAMES; import android.annotation.CallSuper; import android.annotation.Nullable; import android.app.AppOpsManager; +import android.app.admin.DevicePolicyCache; import android.content.Context; import android.content.res.Configuration; import android.graphics.Matrix; @@ -241,8 +242,10 @@ import com.android.server.wm.utils.WmDisplayCutout; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Set; import java.util.function.Predicate; /** A window in the window manager. */ @@ -655,6 +658,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP private static final StringBuilder sTmpSB = new StringBuilder(); /** + * Whether the next surfacePlacement call should notify that the blast sync is ready. + * This is set to true when {@link #finishDrawing(Transaction)} is called so + * {@link #onTransactionReady(int, Set)} is called after the next surfacePlacement. This allows + * Transactions to get flushed into the syncTransaction before notifying {@link BLASTSyncEngine} + * that this WindowState is ready. + */ + private boolean mNotifyBlastOnSurfacePlacement; + + /** * Compares two window sub-layers and returns -1 if the first is lesser than the second in terms * of z-order and 1 otherwise. */ @@ -705,6 +717,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP static final int BLAST_TIMEOUT_DURATION = 5000; /* milliseconds */ + private final WindowProcessController mWpcForDisplayConfigChanges; + /** * @return The insets state as requested by the client, i.e. the dispatched insets state * for which the visibilities are overridden with what the client requested. @@ -719,8 +733,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP void updateRequestedInsetsState(InsetsState state) { // Only update the sources the client is actually controlling. - for (int i = state.getSourcesCount() - 1; i >= 0; i--) { - final InsetsSource source = state.sourceAt(i); + for (int i = 0; i < InsetsState.SIZE; i++) { + final InsetsSource source = state.peekSource(i); + if (source == null) continue; mRequestedInsetsState.addSource(source); } } @@ -872,6 +887,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mSubLayer = 0; mInputWindowHandle = null; mWinAnimator = null; + mWpcForDisplayConfigChanges = null; return; } mDeathRecipient = deathRecipient; @@ -927,6 +943,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP ProtoLog.v(WM_DEBUG_ADD_REMOVE, "Adding %s to %s", this, parentWindow); parentWindow.addChild(this, sWindowSubLayerComparator); } + + // System process or invalid process cannot register to display config change. + mWpcForDisplayConfigChanges = (s.mPid == MY_PID || s.mPid < 0) + ? null + : service.mAtmService.getProcessController(s.mPid, s.mUid); } void attach() { @@ -1744,6 +1765,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP && mActivityRecord.getActivityType() == ACTIVITY_TYPE_DREAM; } + boolean isSecureLocked() { + if ((mAttrs.flags & WindowManager.LayoutParams.FLAG_SECURE) != 0) { + return true; + } + return !DevicePolicyCache.getInstance().isScreenCaptureAllowed(mShowUserId, + mOwnerCanAddInternalSystemWindow); + } + /** * Whether this window's drawn state might affect the drawn states of the app token. * @@ -3505,13 +3534,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP /** @return {@code true} if the process registered to a display as a config listener. */ private boolean registeredForDisplayConfigChanges() { final WindowState parentWindow = getParentWindow(); - final Session session = parentWindow != null ? parentWindow.mSession : mSession; - // System process or invalid process cannot register to display config change. - if (session.mPid == MY_PID || session.mPid < 0) return false; - WindowProcessController app = - mWmService.mAtmService.getProcessController(session.mPid, session.mUid); - if (app == null || !app.registeredForDisplayConfigChanges()) return false; - return true; + final WindowProcessController wpc = parentWindow != null + ? parentWindow.mWpcForDisplayConfigChanges + : mWpcForDisplayConfigChanges; + return wpc != null && wpc.registeredForDisplayConfigChanges(); } void reportResized() { @@ -5094,13 +5120,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mWindowFrames.updateLastInsetValues(); } - @Nullable @Override - WindowContainer<WindowState> getAnimatingContainer(int flags, int typesToCheck) { + protected boolean isSelfAnimating(int flags, int typesToCheck) { if (mControllableInsetProvider != null) { - return null; + return false; } - return super.getAnimatingContainer(flags, typesToCheck); + return super.isSelfAnimating(flags, typesToCheck); } void startAnimation(Animation anim) { @@ -5290,10 +5315,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return mWillReplaceWindow; } - private void applyDims(Dimmer dimmer) { + private void applyDims() { if (!mAnimatingExit && mAppDied) { mIsDimming = true; - dimmer.dimAbove(getSyncTransaction(), this, DEFAULT_DIM_AMOUNT_DEAD_WINDOW); + getDimmer().dimAbove(getSyncTransaction(), this, DEFAULT_DIM_AMOUNT_DEAD_WINDOW); } else if ((mAttrs.flags & FLAG_DIM_BEHIND) != 0 && isVisibleNow() && !mHidden) { // Only show a dim behind when the following is satisfied: // 1. The window has the flag FLAG_DIM_BEHIND @@ -5301,7 +5326,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // 3. The WS is considered visible according to the isVisible() method // 4. The WS is not hidden. mIsDimming = true; - dimmer.dimBelow(getSyncTransaction(), this, mAttrs.dimAmount); + getDimmer().dimBelow(getSyncTransaction(), this, mAttrs.dimAmount); } } @@ -5325,16 +5350,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override void prepareSurfaces() { - final Dimmer dimmer = getDimmer(); mIsDimming = false; - if (dimmer != null) { - applyDims(dimmer); - } + applyDims(); updateSurfacePosition(); // Send information to SufaceFlinger about the priority of the current window. updateFrameRateSelectionPriorityIfNeeded(); mWinAnimator.prepareSurfaceLocked(true); + notifyBlastSyncTransaction(); super.prepareSurfaces(); } @@ -5826,6 +5849,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mBLASTSyncTransaction.merge(postDrawTransaction); } + mNotifyBlastOnSurfacePlacement = true; + return mWinAnimator.finishDrawingLocked(null); + } + + @VisibleForTesting + void notifyBlastSyncTransaction() { + if (!mNotifyBlastOnSurfacePlacement || mWaitingListener == null) { + mNotifyBlastOnSurfacePlacement = false; + return; + } + // If localSyncId is >0 then we are syncing with children and will // invoke transaction ready from our own #transactionReady callback // we just need to signal our side of the sync (setReady). But if we @@ -5833,15 +5867,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // be invoked and we need to invoke it ourself. if (mLocalSyncId >= 0) { mBLASTSyncEngine.setReady(mLocalSyncId); - return mWinAnimator.finishDrawingLocked(null); + return; } - mWaitingListener.onTransactionReady(mWaitingSyncId, mBLASTSyncTransaction); - mUsingBLASTSyncTransaction = false; + mWaitingListener.onTransactionReady(mWaitingSyncId, Collections.singleton(this)); mWaitingSyncId = 0; mWaitingListener = null; - return mWinAnimator.finishDrawingLocked(null); + mNotifyBlastOnSurfacePlacement = false; } private boolean requestResizeForBlastSync() { diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 8115ac8c6bef..508d2d477067 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -476,7 +476,7 @@ class WindowStateAnimator { int flags = SurfaceControl.HIDDEN; final WindowManager.LayoutParams attrs = w.mAttrs; - if (mService.isSecureLocked(w)) { + if (w.isSecureLocked()) { flags |= SurfaceControl.SECURE; } diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 4c3f73d2d129..925ad0f57f19 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -29,6 +29,7 @@ cc_library_static { "com_android_server_connectivity_Vpn.cpp", "com_android_server_ConsumerIrService.cpp", "com_android_server_devicepolicy_CryptoTestHelper.cpp", + "com_android_server_gpu_GpuService.cpp", "com_android_server_HardwarePropertiesManagerService.cpp", "com_android_server_hdmi_HdmiCecController.cpp", "com_android_server_input_InputManagerService.cpp", @@ -98,6 +99,7 @@ cc_defaults { "libcutils", "libcrypto", "liblog", + "libgraphicsenv", "libhardware", "libhardware_legacy", "libhidlbase", diff --git a/services/core/jni/com_android_server_gpu_GpuService.cpp b/services/core/jni/com_android_server_gpu_GpuService.cpp new file mode 100644 index 000000000000..2359e808d6f6 --- /dev/null +++ b/services/core/jni/com_android_server_gpu_GpuService.cpp @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2020 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. + */ + +#define LOG_TAG "GpuService-JNI" + +#include <binder/IServiceManager.h> +#include <graphicsenv/IGpuService.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/scoped_utf_chars.h> + +namespace { + +static android::sp<android::IGpuService> getGpuService() { + static const android::sp<android::IBinder> binder = + android::defaultServiceManager()->checkService(android::String16("gpu")); + if (!binder) { + ALOGE("Failed to get gpu service"); + return nullptr; + } + + return interface_cast<android::IGpuService>(binder); +} + +void setUpdatableDriverPath_native(JNIEnv* env, jobject clazz, jstring jDriverPath) { + if (jDriverPath == nullptr) { + return; + } + const android::sp<android::IGpuService> gpuService = getGpuService(); + if (!gpuService) { + return; + } + ScopedUtfChars driverPath(env, jDriverPath); + gpuService->setUpdatableDriverPath(driverPath.c_str()); +} + +static const JNINativeMethod gGpuServiceMethods[] = { + /* name, signature, funcPtr */ + {"nSetUpdatableDriverPath", "(Ljava/lang/String;)V", + reinterpret_cast<void*>(setUpdatableDriverPath_native)}, +}; + +const char* const kGpuServiceName = "com/android/server/gpu/GpuService"; + +} // anonymous namespace + +namespace android { + +int register_android_server_GpuService(JNIEnv* env) { + return jniRegisterNativeMethods(env, kGpuServiceName, gGpuServiceMethods, + NELEM(gGpuServiceMethods)); +} + +} /* namespace android */ diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index b988bd45d786..e5d2a83479e0 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -63,6 +63,7 @@ int register_com_android_server_soundtrigger_middleware_ExternalCaptureStateTrac int register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(JNIEnv* env); int register_android_server_stats_pull_StatsPullAtomService(JNIEnv* env); int register_android_server_AdbDebuggingManager(JNIEnv* env); +int register_android_server_GpuService(JNIEnv* env); }; using namespace android; @@ -119,5 +120,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_com_android_server_pm_PackageManagerShellCommandDataLoader(env); register_android_server_stats_pull_StatsPullAtomService(env); register_android_server_AdbDebuggingManager(env); + register_android_server_GpuService(env); return JNI_VERSION_1_4; } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java index f3a693550b38..d616ed30772a 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java @@ -51,15 +51,15 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { } @Override - public boolean getScreenCaptureDisabled(int userHandle) { + public boolean isScreenCaptureAllowed(int userHandle, boolean ownerCanAddInternalSystemWindow) { synchronized (mLock) { - return mScreenCaptureDisabled.get(userHandle); + return !mScreenCaptureDisabled.get(userHandle) || ownerCanAddInternalSystemWindow; } } - public void setScreenCaptureDisabled(int userHandle, boolean disabled) { + public void setScreenCaptureAllowed(int userHandle, boolean allowed) { synchronized (mLock) { - mScreenCaptureDisabled.put(userHandle, disabled); + mScreenCaptureDisabled.put(userHandle, !allowed); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 401649a2e522..c6b93d6ca4f4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -7990,7 +7990,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } private void updateScreenCaptureDisabled(int userHandle, boolean disabled) { - mPolicyCache.setScreenCaptureDisabled(userHandle, disabled); + mPolicyCache.setScreenCaptureAllowed(userHandle, !disabled); mHandler.post(() -> { try { mInjector.getIWindowManager().refreshScreenCaptureDisabled(userHandle); diff --git a/services/java/com/android/server/SystemConfigService.java b/services/java/com/android/server/SystemConfigService.java index e8ab10124ef8..1801f3bca30e 100644 --- a/services/java/com/android/server/SystemConfigService.java +++ b/services/java/com/android/server/SystemConfigService.java @@ -15,6 +15,9 @@ */ package com.android.server; +import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toMap; + import android.Manifest; import android.content.Context; import android.os.ISystemConfig; @@ -46,6 +49,19 @@ public class SystemConfigService extends SystemService { "getDisabledUntilUsedPreInstalledCarrierAssociatedApps requires" + " READ_CARRIER_APP_INFO"); return SystemConfig.getInstance() + .getDisabledUntilUsedPreinstalledCarrierAssociatedApps().entrySet().stream() + .collect(toMap( + Map.Entry::getKey, + e -> e.getValue().stream().map(app -> app.packageName) + .collect(toList()))); + } + + @Override + public Map getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries() { + mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_CARRIER_APP_INFO, + "getDisabledUntilUsedPreInstalledCarrierAssociatedAppEntries requires" + + " READ_CARRIER_APP_INFO"); + return SystemConfig.getInstance() .getDisabledUntilUsedPreinstalledCarrierAssociatedApps(); } }; diff --git a/services/net/java/android/net/ip/IpClientCallbacks.java b/services/net/java/android/net/ip/IpClientCallbacks.java index b172c4be7b0d..b17fcaa132a1 100644 --- a/services/net/java/android/net/ip/IpClientCallbacks.java +++ b/services/net/java/android/net/ip/IpClientCallbacks.java @@ -68,12 +68,13 @@ public class IpClientCallbacks { */ public void onNewDhcpResults(DhcpResultsParcelable dhcpResults) { // In general callbacks would not use a parcelable directly (DhcpResultsParcelable), and - // would use a wrapper instead. But there are already two classes in the tree for DHCP - // information: DhcpInfo and DhcpResults, and each of them do not expose an appropriate API - // (they are bags of mutable fields and can't be changed because they are public API and - // @UnsupportedAppUsage). Adding a third class would cost more than the gain considering - // that the only client of this callback is WiFi, which will end up converting the results - // to DhcpInfo anyway. + // would use a wrapper instead, because of the lack of safety of stable parcelables. But + // there are already two classes in the tree for DHCP information: DhcpInfo and DhcpResults, + // and neither of them exposes an appropriate API (they are bags of mutable fields and can't + // be changed because they are public API and @UnsupportedAppUsage, being no better than the + // stable parcelable). Adding a third class would cost more than the gain considering that + // the only client of this callback is WiFi, which will end up converting the results to + // DhcpInfo anyway. } /** 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 cdafd32cbbb5..fde40aa77a0e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java @@ -63,7 +63,6 @@ import static com.android.server.am.ProcessList.VISIBLE_APP_ADJ; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.AdditionalAnswers.answer; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyLong; @@ -171,7 +170,6 @@ public class MockingOomAdjusterTests { mock(OomAdjProfiler.class)); doReturn(new ActivityManagerService.ProcessChangeItem()).when(sService) .enqueueProcessChangeItemLocked(anyInt(), anyInt()); - doReturn(true).when(sService).containsTopUiOrRunningRemoteAnimOrEmptyLocked(any()); sService.mOomAdjuster = new OomAdjuster(sService, sService.mProcessList, mock(ActiveUids.class)); sService.mOomAdjuster.mAdjSeq = 10000; @@ -268,21 +266,6 @@ public class MockingOomAdjusterTests { @SuppressWarnings("GuardedBy") @Test - public void testUpdateOomAdj_DoOne_TopApp_PreemptedByTopUi() { - ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID, - MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true)); - doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState(); - doReturn(app).when(sService).getTopAppLocked(); - doReturn(false).when(sService).containsTopUiOrRunningRemoteAnimOrEmptyLocked(eq(app)); - sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE; - sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE); - doReturn(null).when(sService).getTopAppLocked(); - - assertProcStates(app, PROCESS_STATE_TOP, FOREGROUND_APP_ADJ, SCHED_GROUP_DEFAULT); - } - - @SuppressWarnings("GuardedBy") - @Test public void testUpdateOomAdj_DoOne_RunningInstrumentation() { ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID, MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true)); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 8cf850736cb2..545901e550c1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -1236,18 +1236,28 @@ public class DisplayContentTests extends WindowTestsBase { public void testRecentsNotRotatingWithFixedRotation() { final DisplayRotation displayRotation = mDisplayContent.getDisplayRotation(); doCallRealMethod().when(displayRotation).updateRotationUnchecked(anyBoolean()); - doCallRealMethod().when(displayRotation).updateOrientation(anyInt(), anyBoolean()); + // Skip freezing so the unrelated conditions in updateRotationUnchecked won't disturb. + doNothing().when(mWm).startFreezingDisplay(anyInt(), anyInt(), any(), anyInt()); final ActivityRecord recentsActivity = createActivityRecord(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS); recentsActivity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT); + // Do not rotate if the recents animation is animating on top. mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); displayRotation.setRotation((displayRotation.getRotation() + 1) % 4); assertFalse(displayRotation.updateRotationUnchecked(false)); + // Rotation can be updated if the recents animation is finished. mDisplayContent.mFixedRotationTransitionListener.onFinishRecentsAnimation(false); assertTrue(displayRotation.updateRotationUnchecked(false)); + + // Rotation can be updated if the recents animation is animating but it is not on top, e.g. + // switching activities in different orientations by quickstep gesture. + mDisplayContent.mFixedRotationTransitionListener.onStartRecentsAnimation(recentsActivity); + mDisplayContent.setFixedRotationLaunchingAppUnchecked(mAppWindow.mActivityRecord); + displayRotation.setRotation((displayRotation.getRotation() + 1) % 4); + assertTrue(displayRotation.updateRotationUnchecked(false)); } @Test 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 2af98d85b1ca..976ac2323989 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java @@ -87,10 +87,7 @@ public class InsetsStateControllerTest extends WindowTestsBase { .setWindow(statusBar, null, null); statusBar.setControllableInsetProvider(getController().getSourceProvider(ITYPE_STATUS_BAR)); final InsetsState state = getController().getInsetsForDispatch(statusBar); - for (int i = state.getSourcesCount() - 1; i >= 0; i--) { - final InsetsSource source = state.sourceAt(i); - assertNotEquals(ITYPE_STATUS_BAR, source.getType()); - } + assertNull(state.peekSource(ITYPE_STATUS_BAR)); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java index 71dabc56719b..7ce0c1edfb4c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -67,6 +67,7 @@ import android.util.Rational; import android.view.Display; import android.view.SurfaceControl; import android.window.ITaskOrganizer; +import android.window.IWindowContainerTransactionCallback; import android.window.WindowContainerTransaction; import androidx.test.filters.SmallTest; @@ -728,7 +729,7 @@ public class WindowOrganizerTests extends WindowTestsBase { // We should be rejected from the second sync since we are already // in one. assertEquals(false, bse.addToSyncSet(id2, task)); - w.finishDrawing(null); + finishAndNotifyDrawing(w); assertEquals(true, bse.addToSyncSet(id2, task)); bse.setReady(id2); } @@ -752,7 +753,7 @@ public class WindowOrganizerTests extends WindowTestsBase { // Since we have a window we have to wait for it to draw to finish sync. verify(transactionListener, never()) .onTransactionReady(anyInt(), any()); - w.finishDrawing(null); + finishAndNotifyDrawing(w); verify(transactionListener) .onTransactionReady(anyInt(), any()); } @@ -820,14 +821,14 @@ public class WindowOrganizerTests extends WindowTestsBase { int id = bse.startSyncSet(transactionListener); assertEquals(true, bse.addToSyncSet(id, task)); bse.setReady(id); - w.finishDrawing(null); + finishAndNotifyDrawing(w); // Since we have a child window we still shouldn't be done. verify(transactionListener, never()) .onTransactionReady(anyInt(), any()); reset(transactionListener); - child.finishDrawing(null); + finishAndNotifyDrawing(child); // Ah finally! Done verify(transactionListener) .onTransactionReady(anyInt(), any()); @@ -979,4 +980,42 @@ public class WindowOrganizerTests extends WindowTestsBase { new IRequestFinishCallback.Default()); verify(organizer, times(1)).onBackPressedOnTaskRoot(any()); } + + @Test + public void testBLASTCallbackWithMultipleWindows() throws Exception { + final ActivityStack stackController = createStack(); + final Task task = createTask(stackController); + final ITaskOrganizer organizer = registerMockOrganizer(); + final WindowState w1 = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window 1"); + final WindowState w2 = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window 2"); + makeWindowVisible(w1); + makeWindowVisible(w2); + + IWindowContainerTransactionCallback mockCallback = + mock(IWindowContainerTransactionCallback.class); + int id = mWm.mAtmService.mWindowOrganizerController.startSyncWithOrganizer(mockCallback); + + mWm.mAtmService.mWindowOrganizerController.addToSyncSet(id, task); + mWm.mAtmService.mWindowOrganizerController.setSyncReady(id); + + // Since we have a window we have to wait for it to draw to finish sync. + verify(mockCallback, never()).onTransactionReady(anyInt(), any()); + assertTrue(w1.useBLASTSync()); + assertTrue(w2.useBLASTSync()); + finishAndNotifyDrawing(w1); + + // Even though one Window finished drawing, both windows should still be using blast sync + assertTrue(w1.useBLASTSync()); + assertTrue(w2.useBLASTSync()); + + finishAndNotifyDrawing(w2); + verify(mockCallback).onTransactionReady(anyInt(), any()); + assertFalse(w1.useBLASTSync()); + assertFalse(w2.useBLASTSync()); + } + + private void finishAndNotifyDrawing(WindowState ws) { + ws.finishDrawing(null); + ws.notifyBlastSyncTransaction(); + } } diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java index 4606fb4b631c..e57b03098758 100644 --- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java @@ -21,6 +21,8 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.Build; +import android.os.CarrierAssociatedAppEntry; import android.os.SystemConfigManager; import android.os.UserHandle; import android.permission.PermissionManager; @@ -79,8 +81,8 @@ public final class CarrierAppUtils { SystemConfigManager config = context.getSystemService(SystemConfigManager.class); Set<String> systemCarrierAppsDisabledUntilUsed = config.getDisabledUntilUsedPreinstalledCarrierApps(); - Map<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed = - config.getDisabledUntilUsedPreinstalledCarrierAssociatedApps(); + Map<String, List<CarrierAssociatedAppEntry>> systemCarrierAssociatedAppsDisabledUntilUsed = + config.getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries(); ContentResolver contentResolver = getContentResolverForUser(context, userId); disableCarrierAppsUntilPrivileged(callingPackage, telephonyManager, contentResolver, userId, systemCarrierAppsDisabledUntilUsed, @@ -107,8 +109,8 @@ public final class CarrierAppUtils { Set<String> systemCarrierAppsDisabledUntilUsed = config.getDisabledUntilUsedPreinstalledCarrierApps(); - Map<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed = - config.getDisabledUntilUsedPreinstalledCarrierAssociatedApps(); + Map<String, List<CarrierAssociatedAppEntry>> systemCarrierAssociatedAppsDisabledUntilUsed = + config.getDisabledUntilUsedPreinstalledCarrierAssociatedAppEntries(); ContentResolver contentResolver = getContentResolverForUser(context, userId); disableCarrierAppsUntilPrivileged(callingPackage, null /* telephonyManager */, contentResolver, userId, systemCarrierAppsDisabledUntilUsed, @@ -138,8 +140,8 @@ public final class CarrierAppUtils { public static void disableCarrierAppsUntilPrivileged(String callingPackage, @Nullable TelephonyManager telephonyManager, ContentResolver contentResolver, int userId, Set<String> systemCarrierAppsDisabledUntilUsed, - Map<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed, - Context context) { + Map<String, List<CarrierAssociatedAppEntry>> + systemCarrierAssociatedAppsDisabledUntilUsed, Context context) { PackageManager packageManager = context.getPackageManager(); PermissionManager permissionManager = (PermissionManager) context.getSystemService(Context.PERMISSION_SERVICE); @@ -149,12 +151,17 @@ public final class CarrierAppUtils { return; } - Map<String, List<ApplicationInfo>> associatedApps = getDefaultCarrierAssociatedAppsHelper( + Map<String, List<AssociatedAppInfo>> associatedApps = getDefaultCarrierAssociatedAppsHelper( userId, systemCarrierAssociatedAppsDisabledUntilUsed, context); List<String> enabledCarrierPackages = new ArrayList<>(); - boolean hasRunOnce = Settings.Secure.getInt(contentResolver, - Settings.Secure.CARRIER_APPS_HANDLED, 0) == 1; + int carrierAppsHandledSdk = + Settings.Secure.getInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 0); + if (DEBUG) { + Log.i(TAG, "Last execution SDK: " + carrierAppsHandledSdk); + } + boolean hasRunEver = carrierAppsHandledSdk != 0; // SDKs < R used to just set 1 here + boolean hasRunForSdk = carrierAppsHandledSdk == Build.VERSION.SDK_INT; try { for (ApplicationInfo ai : candidates) { @@ -166,10 +173,10 @@ public final class CarrierAppUtils { // add hiddenUntilInstalled flag for carrier apps and associated apps packageManager.setSystemAppState( packageName, PackageManager.SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN); - List<ApplicationInfo> associatedAppList = associatedApps.get(packageName); + List<AssociatedAppInfo> associatedAppList = associatedApps.get(packageName); if (associatedAppList != null) { - for (ApplicationInfo associatedApp : associatedAppList) { - packageManager.setSystemAppState(associatedApp.packageName, + for (AssociatedAppInfo associatedApp : associatedAppList) { + packageManager.setSystemAppState(associatedApp.appInfo.packageName, PackageManager.SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN); } } @@ -184,7 +191,7 @@ public final class CarrierAppUtils { || enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED || (ai.flags & ApplicationInfo.FLAG_INSTALLED) == 0) { - Log.i(TAG, "Update state(" + packageName + "): ENABLED for user " + Log.i(TAG, "Update state (" + packageName + "): ENABLED for user " + userId); context.createContextAsUser(UserHandle.of(userId), 0) .getPackageManager() @@ -200,28 +207,37 @@ public final class CarrierAppUtils { // Also enable any associated apps for this carrier app. if (associatedAppList != null) { - for (ApplicationInfo associatedApp : associatedAppList) { + for (AssociatedAppInfo associatedApp : associatedAppList) { int associatedAppEnabledSetting = context .createContextAsUser(UserHandle.of(userId), 0) .getPackageManager() - .getApplicationEnabledSetting(associatedApp.packageName); + .getApplicationEnabledSetting( + associatedApp.appInfo.packageName); + boolean associatedAppInstalled = (associatedApp.appInfo.flags + & ApplicationInfo.FLAG_INSTALLED) != 0; + if (DEBUG) { + Log.i(TAG, "(hasPrivileges) associated app " + + associatedApp.appInfo.packageName + ", enabled = " + + associatedAppEnabledSetting + ", installed = " + + associatedAppInstalled); + } if (associatedAppEnabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT || associatedAppEnabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED - || (associatedApp.flags - & ApplicationInfo.FLAG_INSTALLED) == 0) { - Log.i(TAG, "Update associated state(" + associatedApp.packageName - + "): ENABLED for user " + userId); + || !associatedAppInstalled) { + Log.i(TAG, "Update associated state (" + + associatedApp.appInfo.packageName + "): ENABLED for user " + + userId); context.createContextAsUser(UserHandle.of(userId), 0) .getPackageManager() - .setSystemAppState(associatedApp.packageName, + .setSystemAppState(associatedApp.appInfo.packageName, PackageManager.SYSTEM_APP_STATE_INSTALLED); context.createPackageContextAsUser( callingPackage, 0, UserHandle.of(userId)) .getPackageManager() .setApplicationEnabledSetting( - associatedApp.packageName, + associatedApp.appInfo.packageName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); } @@ -236,7 +252,7 @@ public final class CarrierAppUtils { if (!isUpdatedSystemApp(ai) && enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT && (ai.flags & ApplicationInfo.FLAG_INSTALLED) != 0) { - Log.i(TAG, "Update state(" + packageName + Log.i(TAG, "Update state (" + packageName + "): DISABLED_UNTIL_USED for user " + userId); context.createContextAsUser(UserHandle.of(userId), 0) .getPackageManager() @@ -244,37 +260,56 @@ public final class CarrierAppUtils { packageName, PackageManager.SYSTEM_APP_STATE_UNINSTALLED); } - // Also disable any associated apps for this carrier app if this is the first - // run. We avoid doing this a second time because it is brittle to rely on the - // distinction between "default" and "enabled". - if (!hasRunOnce) { - if (associatedAppList != null) { - for (ApplicationInfo associatedApp : associatedAppList) { - int associatedAppEnabledSetting = context - .createContextAsUser(UserHandle.of(userId), 0) + // Associated apps are more brittle, because we can't rely on the distinction + // between "default" and "enabled". To account for this, we have two cases: + // 1. We've never run before, so we're fine to disable all associated apps. + // 2. We've run before, but not on this SDK version, so we will only operate on + // apps with addedInSdk in the range (lastHandledSdk, currentSdk]. + // Otherwise, don't touch the associated apps. + if (associatedAppList != null) { + for (AssociatedAppInfo associatedApp : associatedAppList) { + boolean allowDisable = !hasRunEver || (!hasRunForSdk + && associatedApp.addedInSdk + != CarrierAssociatedAppEntry.SDK_UNSPECIFIED + && associatedApp.addedInSdk > carrierAppsHandledSdk + && associatedApp.addedInSdk <= Build.VERSION.SDK_INT); + int associatedAppEnabledSetting = context + .createContextAsUser(UserHandle.of(userId), 0) + .getPackageManager() + .getApplicationEnabledSetting( + associatedApp.appInfo.packageName); + boolean associatedAppInstalled = (associatedApp.appInfo.flags + & ApplicationInfo.FLAG_INSTALLED) != 0; + if (DEBUG) { + Log.i(TAG, "(!hasPrivileges) associated app " + + associatedApp.appInfo.packageName + ", allowDisable = " + + allowDisable + ", addedInSdk = " + + associatedApp.addedInSdk + ", enabled = " + + associatedAppEnabledSetting + ", installed = " + + associatedAppInstalled); + } + if (allowDisable + && associatedAppEnabledSetting + == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT + && associatedAppInstalled) { + Log.i(TAG, + "Update associated state (" + + associatedApp.appInfo.packageName + + "): DISABLED_UNTIL_USED for user " + userId); + context.createContextAsUser(UserHandle.of(userId), 0) .getPackageManager() - .getApplicationEnabledSetting(associatedApp.packageName); - if (associatedAppEnabledSetting - == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT - && (associatedApp.flags - & ApplicationInfo.FLAG_INSTALLED) != 0) { - Log.i(TAG, - "Update associated state(" + associatedApp.packageName - + "): DISABLED_UNTIL_USED for user " + userId); - context.createContextAsUser(UserHandle.of(userId), 0) - .getPackageManager() - .setSystemAppState(associatedApp.packageName, - PackageManager.SYSTEM_APP_STATE_UNINSTALLED); - } + .setSystemAppState(associatedApp.appInfo.packageName, + PackageManager.SYSTEM_APP_STATE_UNINSTALLED); } } } } } - // Mark the execution so we do not disable apps again. - if (!hasRunOnce) { - Settings.Secure.putInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 1); + // Mark the execution so we do not disable apps again on this SDK version. + if (!hasRunEver || !hasRunForSdk) { + Settings.Secure.putInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, + Build.VERSION.SDK_INT); } if (!enabledCarrierPackages.isEmpty()) { @@ -360,28 +395,28 @@ public final class CarrierAppUtils { return apps; } - private static Map<String, List<ApplicationInfo>> getDefaultCarrierAssociatedAppsHelper( - int userId, Map<String, List<String>> systemCarrierAssociatedAppsDisabledUntilUsed, - Context context) { + private static Map<String, List<AssociatedAppInfo>> getDefaultCarrierAssociatedAppsHelper( + int userId, Map<String, List<CarrierAssociatedAppEntry>> + systemCarrierAssociatedAppsDisabledUntilUsed, Context context) { int size = systemCarrierAssociatedAppsDisabledUntilUsed.size(); - Map<String, List<ApplicationInfo>> associatedApps = new ArrayMap<>(size); - for (Map.Entry<String, List<String>> entry + Map<String, List<AssociatedAppInfo>> associatedApps = new ArrayMap<>(size); + for (Map.Entry<String, List<CarrierAssociatedAppEntry>> entry : systemCarrierAssociatedAppsDisabledUntilUsed.entrySet()) { String carrierAppPackage = entry.getKey(); - List<String> associatedAppPackages = entry.getValue(); + List<CarrierAssociatedAppEntry> associatedAppPackages = entry.getValue(); for (int j = 0; j < associatedAppPackages.size(); j++) { + CarrierAssociatedAppEntry associatedApp = associatedAppPackages.get(j); ApplicationInfo ai = - getApplicationInfoIfSystemApp( - userId, associatedAppPackages.get(j), context); + getApplicationInfoIfSystemApp(userId, associatedApp.packageName, context); // Only update enabled state for the app on /system. Once it has been updated we // shouldn't touch it. if (ai != null && !isUpdatedSystemApp(ai)) { - List<ApplicationInfo> appList = associatedApps.get(carrierAppPackage); + List<AssociatedAppInfo> appList = associatedApps.get(carrierAppPackage); if (appList == null) { appList = new ArrayList<>(); associatedApps.put(carrierAppPackage, appList); } - appList.add(ai); + appList.add(new AssociatedAppInfo(ai, associatedApp.addedInSdk)); } } } @@ -406,4 +441,15 @@ public final class CarrierAppUtils { } return null; } + + private static final class AssociatedAppInfo { + public final ApplicationInfo appInfo; + // Might be CarrierAssociatedAppEntry.SDK_UNSPECIFIED. + public final int addedInSdk; + + AssociatedAppInfo(ApplicationInfo appInfo, int addedInSdk) { + this.appInfo = appInfo; + this.addedInSdk = addedInSdk; + } + } } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 53aad2351a32..3d455d51dd7f 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1385,6 +1385,14 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; /** + * To override wifi calling's carrier name string using ef_pnn from sim card when SPN in empty. + * + * @hide + */ + public static final String KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL = + "wfc_carrier_name_override_by_pnn_bool"; + + /** * Override the SPN Display Condition 2 integer bits (lsb). B2, B1 is the last two bits of the * spn display condition coding. * @@ -4008,6 +4016,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false); sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false); sDefaults.putString(KEY_CARRIER_NAME_STRING, ""); + sDefaults.putBoolean(KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL, false); sDefaults.putInt(KEY_SPN_DISPLAY_CONDITION_OVERRIDE_INT, -1); sDefaults.putStringArray(KEY_SPDI_OVERRIDE_STRING_ARRAY, null); sDefaults.putStringArray(KEY_PNN_OVERRIDE_STRING_ARRAY, null); diff --git a/tests/net/common/java/android/net/DhcpInfoTest.java b/tests/net/common/java/android/net/DhcpInfoTest.java index bd5533f33910..4d45ad72a9b8 100644 --- a/tests/net/common/java/android/net/DhcpInfoTest.java +++ b/tests/net/common/java/android/net/DhcpInfoTest.java @@ -16,8 +16,7 @@ package android.net; -import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTL; - +import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTL; import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip; diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index f0555e6ec93e..e253ae25659e 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -114,7 +114,6 @@ rule fi.iki.elonen.** com.android.wifi.x.@0 ## used by both framework-wifi and service-wifi ## rule android.content.pm.BaseParceledListSlice* com.android.wifi.x.@0 rule android.content.pm.ParceledListSlice* com.android.wifi.x.@0 -rule android.net.shared.Inet4AddressUtils* com.android.wifi.x.@0 rule android.net.util.MacAddressUtils* com.android.wifi.x.@0 rule android.net.util.nsd.DnsSdTxtRecord* com.android.wifi.x.@0 rule android.os.HandlerExecutor* com.android.wifi.x.@0 @@ -123,3 +122,5 @@ rule com.android.internal.util.AsyncChannel* com.android.wifi.x.@0 rule com.android.internal.util.AsyncService* com.android.wifi.x.@0 rule com.android.internal.util.Preconditions* com.android.wifi.x.@0 rule com.android.internal.util.Protocol* com.android.wifi.x.@0 + +rule com.android.net.module.util.** com.android.wifi.x.@0 diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index b841921355e9..53883674e058 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -22,12 +22,13 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.NetworkInfo.DetailedState; -import android.net.shared.Inet4AddressUtils; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import com.android.net.module.util.Inet4AddressUtils; + import java.net.Inet4Address; import java.net.InetAddress; import java.net.UnknownHostException; |