diff options
822 files changed, 14007 insertions, 10467 deletions
diff --git a/Android.bp b/Android.bp index b620634b485e..e19fe640d32b 100644 --- a/Android.bp +++ b/Android.bp @@ -627,6 +627,9 @@ java_library { // Additional dependencies needed to build the ike API classes. "ike-internals", ], + plugins: [ + "intdef-annotation-processor", + ], libs: ["icing-java-proto-lite"], apex_available: ["//apex_available:platform"], visibility: [ @@ -887,6 +890,7 @@ java_library { exclude_srcs: [ "core/proto/android/privacy.proto", "core/proto/android/section.proto", + "core/proto/android/typedef.proto", ], sdk_version: "9", srcs: [ @@ -912,6 +916,7 @@ java_library { exclude_srcs: [ "core/proto/android/privacy.proto", "core/proto/android/section.proto", + "core/proto/android/typedef.proto", ], sdk_version: "core_current", // Protos have lots of MissingOverride and similar. diff --git a/Android.mk b/Android.mk index d8532489a786..46529eb64657 100644 --- a/Android.mk +++ b/Android.mk @@ -32,10 +32,6 @@ ifneq ($(ANDROID_BUILD_EMBEDDED),true) # ============================================================ include $(CLEAR_VARS) -# This is used by ide.mk as the list of source files that are -# always included. -INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) - # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to # $(OUT_DOCS)/offline-sdk. diff --git a/StubLibraries.bp b/StubLibraries.bp index decbb85efb7c..2bd5aee0cd24 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -239,11 +239,6 @@ droidstubs { // namely @SystemApi(client=MODULE_LIBRARIES) APIs. ///////////////////////////////////////////////////////////////////// -// TODO(b/146727827) remove the *-api module when we can teach metalava -// about the relationship among the API surfaces. Currently, these modules are only to generate -// the API signature files and ensure that the APIs evolve in a backwards compatible manner. -// They however are NOT used for building the API stub. - droidstubs { name: "module-lib-api", defaults: ["metalava-full-api-stubs-default"], @@ -280,7 +275,7 @@ droidstubs { name: "module-lib-api-stubs-docs-non-updatable", defaults: ["metalava-non-updatable-api-stubs-default"], arg_files: ["core/res/AndroidManifest.xml"], - args: metalava_framework_docs_args + module_libs, + args: metalava_framework_docs_args + priv_apps + module_libs, check_api: { current: { api_file: "non-updatable-api/module-lib-current.txt", @@ -293,17 +288,6 @@ droidstubs { }, } -// The following droidstub module generates source files for the API stub library for -// modules. Note that it not only includes its own APIs but also other APIs that have -// narrower scope (all @SystemApis, not just the ones with 'client=MODULE_LIBRARIES'). - -droidstubs { - name: "module-lib-api-stubs-docs", - defaults: ["metalava-non-updatable-api-stubs-default"], - arg_files: ["core/res/AndroidManifest.xml"], - args: metalava_framework_docs_args + priv_apps + module_libs, -} - ///////////////////////////////////////////////////////////////////// // android_*_stubs_current modules are the stubs libraries compiled // from *-api-stubs-docs @@ -399,7 +383,7 @@ java_library_static { java_library_static { name: "android_module_lib_stubs_current", - srcs: [ ":module-lib-api-stubs-docs" ], + srcs: [ ":module-lib-api-stubs-docs-non-updatable" ], defaults: ["android_defaults_stubs_current"], libs: ["sdk_system_29_android"], } 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 0b760a621d22..9850b5d254d8 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java @@ -61,6 +61,7 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.XmlUtils; import com.android.server.blob.BlobStoreManagerService.DumpArgs; @@ -496,14 +497,8 @@ class BlobMetadata { final byte[] leaseesBytes = proto.getBytes(); // Construct the StatsEvent to represent this Blob - return StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mBlobId) - .writeLong(getSize()) - .writeLong(mBlobHandle.getExpiryTimeMillis()) - .writeByteArray(committersBytes) - .writeByteArray(leaseesBytes) - .build(); + return FrameworkStatsLog.buildStatsEvent(atomTag, mBlobId, getSize(), + mBlobHandle.getExpiryTimeMillis(), committersBytes, leaseesBytes); } } diff --git a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java index 2a4081ae16f8..398ccb69fbe8 100644 --- a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java +++ b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java @@ -7,7 +7,6 @@ import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManager.StandbyBuckets; import android.app.usage.UsageStatsManager.SystemForcedReasons; import android.content.Context; -import android.os.Looper; import android.util.IndentingPrintWriter; import java.io.PrintWriter; @@ -21,13 +20,12 @@ public interface AppStandbyInternal { * TODO AppStandbyController should probably be a binder service, and then we shouldn't need * this method. */ - static AppStandbyInternal newAppStandbyController(ClassLoader loader, Context context, - Looper looper) { + static AppStandbyInternal newAppStandbyController(ClassLoader loader, Context context) { try { final Class<?> clazz = Class.forName("com.android.server.usage.AppStandbyController", true, loader); - final Constructor<?> ctor = clazz.getConstructor(Context.class, Looper.class); - return (AppStandbyInternal) ctor.newInstance(context, looper); + final Constructor<?> ctor = clazz.getConstructor(Context.class); + return (AppStandbyInternal) ctor.newInstance(context); } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) { throw new RuntimeException("Unable to instantiate AppStandbyController!", e); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java index 361ebe55ccd8..227b8276abe1 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java @@ -18,28 +18,20 @@ package com.android.server.job.controllers; import static com.android.server.job.JobSchedulerService.sElapsedRealtimeClock; -import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AlarmManager; import android.app.AlarmManager.OnAlarmListener; -import android.content.ContentResolver; import android.content.Context; -import android.database.ContentObserver; -import android.net.Uri; -import android.os.Handler; import android.os.Process; import android.os.UserHandle; import android.os.WorkSource; -import android.provider.Settings; import android.util.IndentingPrintWriter; -import android.util.KeyValueListParser; import android.util.Log; import android.util.Slog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.job.ConstantsProto; import com.android.server.job.JobSchedulerService; import com.android.server.job.StateControllerProto; @@ -63,9 +55,6 @@ public final class TimeController extends StateController { /** Delay alarm tag for logging purposes */ private final String DELAY_TAG = "*job.delay*"; - private final Handler mHandler; - private final TcConstants mTcConstants; - private long mNextJobExpiredElapsedMillis; private long mNextDelayExpiredElapsedMillis; @@ -81,14 +70,6 @@ public final class TimeController extends StateController { mNextJobExpiredElapsedMillis = Long.MAX_VALUE; mNextDelayExpiredElapsedMillis = Long.MAX_VALUE; mChainedAttributionEnabled = mService.isChainedAttributionEnabled(); - - mHandler = new Handler(mContext.getMainLooper()); - mTcConstants = new TcConstants(mHandler); - } - - @Override - public void onSystemServicesReady() { - mTcConstants.start(mContext.getContentResolver()); } /** @@ -372,8 +353,7 @@ public final class TimeController extends StateController { /** * Set an alarm with the {@link android.app.AlarmManager} for the next time at which a job's * delay will expire. - * This alarm <b>will not</b> wake up the phone if - * {@link TcConstants#USE_NON_WAKEUP_ALARM_FOR_DELAY} is true. + * This alarm <b>will not</b> wake up the phone. */ private void setDelayExpiredAlarmLocked(long alarmTimeElapsedMillis, WorkSource ws) { alarmTimeElapsedMillis = maybeAdjustAlarmTime(alarmTimeElapsedMillis); @@ -381,10 +361,7 @@ public final class TimeController extends StateController { return; } mNextDelayExpiredElapsedMillis = alarmTimeElapsedMillis; - final int alarmType = - mTcConstants.USE_NON_WAKEUP_ALARM_FOR_DELAY - ? AlarmManager.ELAPSED_REALTIME : AlarmManager.ELAPSED_REALTIME_WAKEUP; - updateAlarmWithListenerLocked(DELAY_TAG, alarmType, + updateAlarmWithListenerLocked(DELAY_TAG, AlarmManager.ELAPSED_REALTIME, mNextDelayExpiredListener, mNextDelayExpiredElapsedMillis, ws); } @@ -443,80 +420,6 @@ public final class TimeController extends StateController { } }; - @VisibleForTesting - class TcConstants extends ContentObserver { - private ContentResolver mResolver; - private final KeyValueListParser mParser = new KeyValueListParser(','); - - private static final String KEY_USE_NON_WAKEUP_ALARM_FOR_DELAY = - "use_non_wakeup_delay_alarm"; - - private static final boolean DEFAULT_USE_NON_WAKEUP_ALARM_FOR_DELAY = true; - - /** - * Whether or not TimeController should skip setting wakeup alarms for jobs that aren't - * ready now. - */ - public boolean USE_NON_WAKEUP_ALARM_FOR_DELAY = DEFAULT_USE_NON_WAKEUP_ALARM_FOR_DELAY; - - /** - * Creates a content observer. - * - * @param handler The handler to run {@link #onChange} on, or null if none. - */ - TcConstants(Handler handler) { - super(handler); - } - - private void start(ContentResolver resolver) { - mResolver = resolver; - mResolver.registerContentObserver(Settings.Global.getUriFor( - Settings.Global.JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS), false, this); - onChange(true, null); - } - - @Override - public void onChange(boolean selfChange, Uri uri) { - final String constants = Settings.Global.getString( - mResolver, Settings.Global.JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS); - - try { - mParser.setString(constants); - } catch (Exception e) { - // Failed to parse the settings string, log this and move on with defaults. - Slog.e(TAG, "Bad jobscheduler time controller settings", e); - } - - USE_NON_WAKEUP_ALARM_FOR_DELAY = mParser.getBoolean( - KEY_USE_NON_WAKEUP_ALARM_FOR_DELAY, DEFAULT_USE_NON_WAKEUP_ALARM_FOR_DELAY); - // Intentionally not calling checkExpiredDelaysAndResetAlarm() here. There's no need to - // iterate through the entire list again for this constant change. The next delay alarm - // that is set will make use of the new constant value. - } - - private void dump(IndentingPrintWriter pw) { - pw.println(); - pw.println("TimeController:"); - pw.increaseIndent(); - pw.print(KEY_USE_NON_WAKEUP_ALARM_FOR_DELAY, - USE_NON_WAKEUP_ALARM_FOR_DELAY).println(); - pw.decreaseIndent(); - } - - private void dump(ProtoOutputStream proto) { - final long tcToken = proto.start(ConstantsProto.TIME_CONTROLLER); - proto.write(ConstantsProto.TimeController.USE_NON_WAKEUP_ALARM_FOR_DELAY, - USE_NON_WAKEUP_ALARM_FOR_DELAY); - proto.end(tcToken); - } - } - - @VisibleForTesting - @NonNull - TcConstants getTcConstants() { - return mTcConstants; - } - @Override public void dumpControllerStateLocked(IndentingPrintWriter pw, Predicate<JobStatus> predicate) { @@ -591,14 +494,4 @@ public final class TimeController extends StateController { proto.end(mToken); proto.end(token); } - - @Override - public void dumpConstants(IndentingPrintWriter pw) { - mTcConstants.dump(pw); - } - - @Override - public void dumpConstants(ProtoOutputStream proto) { - mTcConstants.dump(proto); - } } diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java index 5059e09796f8..f40f244e69e5 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -110,6 +110,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; import com.android.internal.util.ArrayUtils; import com.android.internal.util.ConcurrentUtils; +import com.android.server.JobSchedulerBackgroundThread; import com.android.server.LocalServices; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.usage.AppIdleHistory.AppUsageHistory; @@ -418,8 +419,8 @@ public class AppStandbyController implements AppStandbyInternal { } } - public AppStandbyController(Context context, Looper looper) { - this(new Injector(context, looper)); + public AppStandbyController(Context context) { + this(new Injector(context, JobSchedulerBackgroundThread.get().getLooper())); } AppStandbyController(Injector injector) { @@ -487,7 +488,7 @@ public class AppStandbyController implements AppStandbyInternal { mSystemServicesReady = true; // Offload to handler thread to avoid boot time impact. - mHandler.post(mInjector::updatePowerWhitelistCache); + mHandler.post(AppStandbyController.this::updatePowerWhitelistCache); boolean userFileExists; synchronized (mAppIdleLock) { @@ -1715,6 +1716,14 @@ public class AppStandbyController implements AppStandbyInternal { } } + private void updatePowerWhitelistCache() { + if (mInjector.getBootPhase() < PHASE_SYSTEM_SERVICES_READY) { + return; + } + mInjector.updatePowerWhitelistCache(); + postCheckIdleStates(UserHandle.USER_ALL); + } + private class PackageReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { @@ -2028,10 +2037,7 @@ public class AppStandbyController implements AppStandbyInternal { } } - private void updatePowerWhitelistCache() { - if (mBootPhase < PHASE_SYSTEM_SERVICES_READY) { - return; - } + void updatePowerWhitelistCache() { try { // Don't call out to DeviceIdleController with the lock held. final String[] whitelistedPkgs = @@ -2231,7 +2237,7 @@ public class AppStandbyController implements AppStandbyInternal { break; case PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED: if (mSystemServicesReady) { - mHandler.post(mInjector::updatePowerWhitelistCache); + mHandler.post(AppStandbyController.this::updatePowerWhitelistCache); } break; } diff --git a/apex/statsd/framework/test/Android.bp b/apex/statsd/framework/test/Android.bp index b113d595b57c..5cc5647bc760 100644 --- a/apex/statsd/framework/test/Android.bp +++ b/apex/statsd/framework/test/Android.bp @@ -14,12 +14,8 @@ android_test { name: "FrameworkStatsdTest", - platform_apis: true, - srcs: [ - // TODO(b/147705194): Use framework-statsd as a lib dependency instead. - ":framework-statsd-sources", - "**/*.java", - ], + sdk_version: "module_current", + srcs: [ "**/*.java" ], manifest: "AndroidManifest.xml", static_libs: [ "androidx.test.rules", @@ -28,9 +24,10 @@ android_test { libs: [ "android.test.runner.stubs", "android.test.base.stubs", + "framework-statsd.impl", ], test_suites: [ "device-tests", "mts", ], -}
\ No newline at end of file +} diff --git a/api/current.txt b/api/current.txt index 651cda564ee9..7119902b07d3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27905,6 +27905,7 @@ package android.media.audiofx { field public static final java.util.UUID EFFECT_TYPE_DYNAMICS_PROCESSING; field public static final java.util.UUID EFFECT_TYPE_ENV_REVERB; field public static final java.util.UUID EFFECT_TYPE_EQUALIZER; + field @NonNull public static final java.util.UUID EFFECT_TYPE_HAPTIC_GENERATOR; field public static final java.util.UUID EFFECT_TYPE_LOUDNESS_ENHANCER; field public static final java.util.UUID EFFECT_TYPE_NS; field public static final java.util.UUID EFFECT_TYPE_PRESET_REVERB; @@ -28257,6 +28258,13 @@ package android.media.audiofx { field public short numBands; } + public class HapticGenerator extends android.media.audiofx.AudioEffect implements java.lang.AutoCloseable { + method public void close(); + method @NonNull public static android.media.audiofx.HapticGenerator create(int); + method public static boolean isAvailable(); + method public int setEnabled(boolean); + } + public class LoudnessEnhancer extends android.media.audiofx.AudioEffect { ctor public LoudnessEnhancer(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException; method public float getTargetGain() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException; diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index 1803be384389..360e44ff055c 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -1,4 +1,12 @@ // Signature format: 2.0 +package android.app { + + public class AppOpsManager { + field public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage"; + } + +} + package android.content.rollback { public class RollbackManagerFrameworkInitializer { diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp index 878cef94b674..e21a6b288fb3 100644 --- a/cmds/idmap2/Android.bp +++ b/cmds/idmap2/Android.bp @@ -181,7 +181,6 @@ cc_binary { "idmap2/Dump.cpp", "idmap2/Lookup.cpp", "idmap2/Main.cpp", - "idmap2/Scan.cpp", ], target: { android: { diff --git a/cmds/idmap2/idmap2/Commands.h b/cmds/idmap2/idmap2/Commands.h index 69eea8d262d2..4099671066a2 100644 --- a/cmds/idmap2/idmap2/Commands.h +++ b/cmds/idmap2/idmap2/Commands.h @@ -26,6 +26,5 @@ android::idmap2::Result<android::idmap2::Unit> Create(const std::vector<std::str android::idmap2::Result<android::idmap2::Unit> CreateMultiple(const std::vector<std::string>& args); android::idmap2::Result<android::idmap2::Unit> Dump(const std::vector<std::string>& args); android::idmap2::Result<android::idmap2::Unit> Lookup(const std::vector<std::string>& args); -android::idmap2::Result<android::idmap2::Unit> Scan(const std::vector<std::string>& args); #endif // IDMAP2_IDMAP2_COMMANDS_H_ diff --git a/cmds/idmap2/idmap2/Main.cpp b/cmds/idmap2/idmap2/Main.cpp index fb093f0f22a4..aa6d0e76698f 100644 --- a/cmds/idmap2/idmap2/Main.cpp +++ b/cmds/idmap2/idmap2/Main.cpp @@ -53,8 +53,10 @@ void PrintUsage(const NameToFunctionMap& commands, std::ostream& out) { int main(int argc, char** argv) { SYSTRACE << "main"; const NameToFunctionMap commands = { - {"create", Create}, {"create-multiple", CreateMultiple}, {"dump", Dump}, {"lookup", Lookup}, - {"scan", Scan}, + {"create", Create}, + {"create-multiple", CreateMultiple}, + {"dump", Dump}, + {"lookup", Lookup}, }; if (argc <= 1) { PrintUsage(commands, std::cerr); diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp deleted file mode 100644 index 36250450cc74..000000000000 --- a/cmds/idmap2/idmap2/Scan.cpp +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (C) 2018 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. - */ - -#include <dirent.h> - -#include <fstream> -#include <memory> -#include <ostream> -#include <set> -#include <string> -#include <utility> -#include <vector> - -#include "Commands.h" -#include "android-base/properties.h" -#include "idmap2/CommandLineOptions.h" -#include "idmap2/CommandUtils.h" -#include "idmap2/FileUtils.h" -#include "idmap2/Idmap.h" -#include "idmap2/Policies.h" -#include "idmap2/PolicyUtils.h" -#include "idmap2/ResourceUtils.h" -#include "idmap2/Result.h" -#include "idmap2/SysTrace.h" -#include "idmap2/XmlParser.h" - -using android::idmap2::CommandLineOptions; -using android::idmap2::Error; -using android::idmap2::Idmap; -using android::idmap2::Result; -using android::idmap2::Unit; -using android::idmap2::policy::kPolicyOdm; -using android::idmap2::policy::kPolicyOem; -using android::idmap2::policy::kPolicyProduct; -using android::idmap2::policy::kPolicyPublic; -using android::idmap2::policy::kPolicySystem; -using android::idmap2::policy::kPolicyVendor; -using android::idmap2::utils::ExtractOverlayManifestInfo; -using android::idmap2::utils::FindFiles; -using android::idmap2::utils::OverlayManifestInfo; -using android::idmap2::utils::PoliciesToBitmaskResult; - -using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask; - -namespace { - -struct InputOverlay { - bool operator<(InputOverlay const& rhs) const { - return priority < rhs.priority || (priority == rhs.priority && apk_path < rhs.apk_path); - } - - std::string apk_path; // NOLINT(misc-non-private-member-variables-in-classes) - std::string idmap_path; // NOLINT(misc-non-private-member-variables-in-classes) - int priority; // NOLINT(misc-non-private-member-variables-in-classes) - std::vector<std::string> policies; // NOLINT(misc-non-private-member-variables-in-classes) - bool ignore_overlayable; // NOLINT(misc-non-private-member-variables-in-classes) -}; - -bool VendorIsQOrLater() { - constexpr int kQSdkVersion = 29; - constexpr int kBase = 10; - std::string version_prop = android::base::GetProperty("ro.vndk.version", "29"); - int version = strtol(version_prop.data(), nullptr, kBase); - - // If the string cannot be parsed, it is a development sdk codename. - return version >= kQSdkVersion || version == 0; -} - -Result<std::unique_ptr<std::vector<std::string>>> FindApkFiles(const std::vector<std::string>& dirs, - bool recursive) { - SYSTRACE << "FindApkFiles " << dirs << " " << recursive; - const auto predicate = [](unsigned char type, const std::string& path) -> bool { - static constexpr size_t kExtLen = 4; // strlen(".apk") - return type == DT_REG && path.size() > kExtLen && - path.compare(path.size() - kExtLen, kExtLen, ".apk") == 0; - }; - // pass apk paths through a set to filter out duplicates - std::set<std::string> paths; - for (const auto& dir : dirs) { - const auto apk_paths = FindFiles(dir, recursive, predicate); - if (!apk_paths) { - return Error("failed to open directory %s", dir.c_str()); - } - paths.insert(apk_paths->cbegin(), apk_paths->cend()); - } - return std::make_unique<std::vector<std::string>>(paths.cbegin(), paths.cend()); -} - -std::vector<std::string> PoliciesForPath(const std::string& apk_path) { - // clang-format off - static const std::vector<std::pair<std::string, std::string>> values = { - {"/odm/", kPolicyOdm}, - {"/oem/", kPolicyOem}, - {"/product/", kPolicyProduct}, - {"/system/", kPolicySystem}, - {"/system_ext/", kPolicySystem}, - {"/vendor/", kPolicyVendor}, - }; - // clang-format on - - std::vector<std::string> fulfilled_policies = {kPolicyPublic}; - for (auto const& pair : values) { - if (apk_path.compare(0, pair.first.size(), pair.first) == 0) { - fulfilled_policies.emplace_back(pair.second); - break; - } - } - - return fulfilled_policies; -} - -} // namespace - -Result<Unit> Scan(const std::vector<std::string>& args) { - SYSTRACE << "Scan " << args; - std::vector<std::string> input_directories; - std::string target_package_name; - std::string target_apk_path; - std::string output_directory; - std::vector<std::string> override_policies; - bool recursive = false; - - const CommandLineOptions opts = - CommandLineOptions("idmap2 scan") - .MandatoryOption("--input-directory", "directory containing overlay apks to scan", - &input_directories) - .OptionalFlag("--recursive", "also scan subfolders of overlay-directory", &recursive) - .MandatoryOption("--target-package-name", "package name of target package", - &target_package_name) - .MandatoryOption("--target-apk-path", "path to target apk", &target_apk_path) - .MandatoryOption("--output-directory", - "directory in which to write artifacts (idmap files and overlays.list)", - &output_directory) - .OptionalOption( - "--override-policy", - "input: an overlayable policy this overlay fulfills " - "(if none or supplied, the overlays will not have their policies overriden", - &override_policies); - const auto opts_ok = opts.Parse(args); - if (!opts_ok) { - return opts_ok.GetError(); - } - - const auto apk_paths = FindApkFiles(input_directories, recursive); - if (!apk_paths) { - return Error(apk_paths.GetError(), "failed to find apk files"); - } - - std::vector<InputOverlay> interesting_apks; - for (const std::string& path : **apk_paths) { - Result<OverlayManifestInfo> overlay_info = - ExtractOverlayManifestInfo(path, /* assert_overlay */ false); - if (!overlay_info) { - return overlay_info.GetError(); - } - - if (!overlay_info->is_static) { - continue; - } - - if (overlay_info->target_package.empty() || - overlay_info->target_package != target_package_name) { - continue; - } - - if (overlay_info->priority < 0) { - continue; - } - - // Note that conditional property enablement/exclusion only applies if - // the attribute is present. In its absence, all overlays are presumed enabled. - if (!overlay_info->requiredSystemPropertyName.empty() && - !overlay_info->requiredSystemPropertyValue.empty()) { - // if property set & equal to value, then include overlay - otherwise skip - if (android::base::GetProperty(overlay_info->requiredSystemPropertyName, "") != - overlay_info->requiredSystemPropertyValue) { - continue; - } - } - - std::vector<std::string> fulfilled_policies; - if (!override_policies.empty()) { - fulfilled_policies = override_policies; - } else { - fulfilled_policies = PoliciesForPath(path); - } - - bool ignore_overlayable = false; - if (std::find(fulfilled_policies.begin(), fulfilled_policies.end(), kPolicyVendor) != - fulfilled_policies.end() && - !VendorIsQOrLater()) { - // If the overlay is on a pre-Q vendor partition, do not enforce overlayable - // restrictions on this overlay because the pre-Q platform has no understanding of - // overlayable. - ignore_overlayable = true; - } - - std::string idmap_path = Idmap::CanonicalIdmapPathFor(output_directory, path); - - // Sort the static overlays in ascending priority order - InputOverlay input{path, idmap_path, overlay_info->priority, fulfilled_policies, - ignore_overlayable}; - interesting_apks.insert( - std::lower_bound(interesting_apks.begin(), interesting_apks.end(), input), input); - } - - std::stringstream stream; - for (const auto& overlay : interesting_apks) { - const auto policy_bitmask = PoliciesToBitmaskResult(overlay.policies); - if (!policy_bitmask) { - LOG(WARNING) << "failed to create idmap for overlay apk path \"" << overlay.apk_path - << "\": " << policy_bitmask.GetErrorMessage(); - continue; - } - - if (!Verify(overlay.idmap_path, target_apk_path, overlay.apk_path, *policy_bitmask, - !overlay.ignore_overlayable)) { - std::vector<std::string> create_args = {"--target-apk-path", target_apk_path, - "--overlay-apk-path", overlay.apk_path, - "--idmap-path", overlay.idmap_path}; - if (overlay.ignore_overlayable) { - create_args.emplace_back("--ignore-overlayable"); - } - - for (const std::string& policy : overlay.policies) { - create_args.emplace_back("--policy"); - create_args.emplace_back(policy); - } - - const auto create_ok = Create(create_args); - if (!create_ok) { - LOG(WARNING) << "failed to create idmap for overlay apk path \"" << overlay.apk_path - << "\": " << create_ok.GetError().GetMessage(); - continue; - } - } - - stream << overlay.idmap_path << std::endl; - } - - std::cout << stream.str(); - - return Unit{}; -} diff --git a/cmds/idmap2/include/idmap2/FileUtils.h b/cmds/idmap2/include/idmap2/FileUtils.h index 3f03236d5e1a..c4e0e1fd8ef0 100644 --- a/cmds/idmap2/include/idmap2/FileUtils.h +++ b/cmds/idmap2/include/idmap2/FileUtils.h @@ -17,27 +17,13 @@ #ifndef IDMAP2_INCLUDE_IDMAP2_FILEUTILS_H_ #define IDMAP2_INCLUDE_IDMAP2_FILEUTILS_H_ -#include <sys/types.h> - -#include <functional> -#include <memory> #include <string> -#include <vector> namespace android::idmap2::utils { constexpr const char* kIdmapCacheDir = "/data/resource-cache"; constexpr const mode_t kIdmapFilePermissionMask = 0133; // u=rw,g=r,o=r -typedef std::function<bool(unsigned char type /* DT_* from dirent.h */, const std::string& path)> - FindFilesPredicate; -std::unique_ptr<std::vector<std::string>> FindFiles(const std::string& root, bool recurse, - const FindFilesPredicate& predicate); - -std::unique_ptr<std::string> ReadFile(int fd); - -std::unique_ptr<std::string> ReadFile(const std::string& path); - bool UidHasWriteAccessToPath(uid_t uid, const std::string& path); } // namespace android::idmap2::utils diff --git a/cmds/idmap2/libidmap2/FileUtils.cpp b/cmds/idmap2/libidmap2/FileUtils.cpp index 3e8e32989a09..3af1f70ebe39 100644 --- a/cmds/idmap2/libidmap2/FileUtils.cpp +++ b/cmds/idmap2/libidmap2/FileUtils.cpp @@ -16,19 +16,7 @@ #include "idmap2/FileUtils.h" -#include <dirent.h> -#include <sys/types.h> -#include <unistd.h> - -#include <cerrno> -#include <climits> -#include <cstdlib> -#include <cstring> -#include <fstream> -#include <memory> #include <string> -#include <utility> -#include <vector> #include "android-base/file.h" #include "android-base/macros.h" @@ -37,54 +25,6 @@ namespace android::idmap2::utils { -std::unique_ptr<std::vector<std::string>> FindFiles(const std::string& root, bool recurse, - const FindFilesPredicate& predicate) { - DIR* dir = opendir(root.c_str()); - if (dir == nullptr) { - return nullptr; - } - std::unique_ptr<std::vector<std::string>> vector(new std::vector<std::string>()); - struct dirent* dirent; - while ((dirent = readdir(dir)) != nullptr) { - const std::string path = root + "/" + dirent->d_name; - if (predicate(dirent->d_type, path)) { - vector->push_back(path); - } - if (recurse && dirent->d_type == DT_DIR && strcmp(dirent->d_name, ".") != 0 && - strcmp(dirent->d_name, "..") != 0) { - auto sub_vector = FindFiles(path, recurse, predicate); - if (!sub_vector) { - closedir(dir); - return nullptr; - } - vector->insert(vector->end(), sub_vector->begin(), sub_vector->end()); - } - } - closedir(dir); - - return vector; -} - -std::unique_ptr<std::string> ReadFile(const std::string& path) { - std::unique_ptr<std::string> str(new std::string()); - std::ifstream fin(path); - str->append({std::istreambuf_iterator<char>(fin), std::istreambuf_iterator<char>()}); - fin.close(); - return str; -} - -std::unique_ptr<std::string> ReadFile(int fd) { - static constexpr const size_t kBufSize = 1024; - - std::unique_ptr<std::string> str(new std::string()); - char buf[kBufSize]; - ssize_t r; - while ((r = read(fd, buf, sizeof(buf))) > 0) { - str->append(buf, r); - } - return r == 0 ? std::move(str) : nullptr; -} - #ifdef __ANDROID__ bool UidHasWriteAccessToPath(uid_t uid, const std::string& path) { // resolve symlinks and relative paths; the directories must exist diff --git a/cmds/idmap2/tests/FileUtilsTests.cpp b/cmds/idmap2/tests/FileUtilsTests.cpp index 8af4037be954..5750ca1f49c5 100644 --- a/cmds/idmap2/tests/FileUtilsTests.cpp +++ b/cmds/idmap2/tests/FileUtilsTests.cpp @@ -14,73 +14,16 @@ * limitations under the License. */ -#include <dirent.h> -#include <fcntl.h> - -#include <set> #include <string> #include "TestHelpers.h" -#include "android-base/macros.h" #include "android-base/stringprintf.h" -#include "gmock/gmock.h" #include "gtest/gtest.h" #include "idmap2/FileUtils.h" #include "private/android_filesystem_config.h" -using ::testing::NotNull; - namespace android::idmap2::utils { -TEST(FileUtilsTests, FindFilesFindEverythingNonRecursive) { - const auto& root = GetTestDataPath(); - auto v = utils::FindFiles(root, false, - [](unsigned char type ATTRIBUTE_UNUSED, - const std::string& path ATTRIBUTE_UNUSED) -> bool { return true; }); - ASSERT_THAT(v, NotNull()); - ASSERT_EQ(v->size(), 7U); - ASSERT_EQ(std::set<std::string>(v->begin(), v->end()), std::set<std::string>({ - root + "/.", - root + "/..", - root + "/overlay", - root + "/target", - root + "/signature-overlay", - root + "/system-overlay", - root + "/system-overlay-invalid", - })); -} - -TEST(FileUtilsTests, FindFilesFindApkFilesRecursive) { - const auto& root = GetTestDataPath(); - auto v = utils::FindFiles(root, true, [](unsigned char type, const std::string& path) -> bool { - return type == DT_REG && path.size() > 4 && path.compare(path.size() - 4, 4, ".apk") == 0; - }); - ASSERT_THAT(v, NotNull()); - ASSERT_EQ(v->size(), 11U); - ASSERT_EQ(std::set<std::string>(v->begin(), v->end()), - std::set<std::string>( - {root + "/target/target.apk", root + "/target/target-no-overlayable.apk", - root + "/overlay/overlay.apk", root + "/overlay/overlay-no-name.apk", - root + "/overlay/overlay-no-name-static.apk", root + "/overlay/overlay-shared.apk", - root + "/overlay/overlay-static-1.apk", root + "/overlay/overlay-static-2.apk", - root + "/signature-overlay/signature-overlay.apk", - root + "/system-overlay/system-overlay.apk", - root + "/system-overlay-invalid/system-overlay-invalid.apk"})); -} - -TEST(FileUtilsTests, ReadFile) { - int pipefd[2]; - ASSERT_EQ(pipe2(pipefd, O_CLOEXEC), 0); - - ASSERT_EQ(write(pipefd[1], "foobar", 6), 6); - close(pipefd[1]); - - auto data = ReadFile(pipefd[0]); - ASSERT_THAT(data, NotNull()); - ASSERT_EQ(*data, "foobar"); - close(pipefd[0]); -} - #ifdef __ANDROID__ TEST(FileUtilsTests, UidHasWriteAccessToPath) { constexpr const char* tmp_path = "/data/local/tmp/test@idmap"; diff --git a/cmds/idmap2/tests/Idmap2BinaryTests.cpp b/cmds/idmap2/tests/Idmap2BinaryTests.cpp index d896cf9c11ba..61751b33dcba 100644 --- a/cmds/idmap2/tests/Idmap2BinaryTests.cpp +++ b/cmds/idmap2/tests/Idmap2BinaryTests.cpp @@ -159,131 +159,6 @@ TEST_F(Idmap2BinaryTests, Dump) { unlink(GetIdmapPath().c_str()); } -TEST_F(Idmap2BinaryTests, Scan) { - SKIP_TEST_IF_CANT_EXEC_IDMAP2; - - const std::string overlay_static_no_name_apk_path = - GetTestDataPath() + "/overlay/overlay-no-name-static.apk"; - const std::string overlay_static_1_apk_path = GetTestDataPath() + "/overlay/overlay-static-1.apk"; - const std::string overlay_static_2_apk_path = GetTestDataPath() + "/overlay/overlay-static-2.apk"; - const std::string idmap_static_no_name_path = - Idmap::CanonicalIdmapPathFor(GetTempDirPath(), overlay_static_no_name_apk_path); - const std::string idmap_static_1_path = - Idmap::CanonicalIdmapPathFor(GetTempDirPath(), overlay_static_1_apk_path); - const std::string idmap_static_2_path = - Idmap::CanonicalIdmapPathFor(GetTempDirPath(), overlay_static_2_apk_path); - - // single input directory, recursive - // clang-format off - auto result = ExecuteBinary({"idmap2", - "scan", - "--input-directory", GetTestDataPath(), - "--recursive", - "--target-package-name", "test.target", - "--target-apk-path", GetTargetApkPath(), - "--output-directory", GetTempDirPath(), - "--override-policy", "public"}); - // clang-format on - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, EXIT_SUCCESS) << result->stderr; - std::stringstream expected; - expected << idmap_static_no_name_path << std::endl; - expected << idmap_static_1_path << std::endl; - expected << idmap_static_2_path << std::endl; - ASSERT_EQ(result->stdout, expected.str()); - - auto idmap_static_no_name_raw_string = utils::ReadFile(idmap_static_no_name_path); - auto idmap_static_no_name_raw_stream = std::istringstream(*idmap_static_no_name_raw_string); - auto idmap_static_no_name = Idmap::FromBinaryStream(idmap_static_no_name_raw_stream); - ASSERT_TRUE(idmap_static_no_name); - ASSERT_IDMAP(**idmap_static_no_name, GetTargetApkPath(), overlay_static_no_name_apk_path); - - auto idmap_static_1_raw_string = utils::ReadFile(idmap_static_1_path); - auto idmap_static_1_raw_stream = std::istringstream(*idmap_static_1_raw_string); - auto idmap_static_1 = Idmap::FromBinaryStream(idmap_static_1_raw_stream); - ASSERT_TRUE(idmap_static_1); - ASSERT_IDMAP(**idmap_static_1, GetTargetApkPath(), overlay_static_1_apk_path); - - auto idmap_static_2_raw_string = utils::ReadFile(idmap_static_2_path); - auto idmap_static_2_raw_stream = std::istringstream(*idmap_static_2_raw_string); - auto idmap_static_2 = Idmap::FromBinaryStream(idmap_static_2_raw_stream); - ASSERT_TRUE(idmap_static_2); - ASSERT_IDMAP(**idmap_static_2, GetTargetApkPath(), overlay_static_2_apk_path); - - unlink(idmap_static_no_name_path.c_str()); - unlink(idmap_static_2_path.c_str()); - unlink(idmap_static_1_path.c_str()); - - // multiple input directories, non-recursive - // clang-format off - result = ExecuteBinary({"idmap2", - "scan", - "--input-directory", GetTestDataPath() + "/target", - "--input-directory", GetTestDataPath() + "/overlay", - "--target-package-name", "test.target", - "--target-apk-path", GetTargetApkPath(), - "--output-directory", GetTempDirPath(), - "--override-policy", "public"}); - // clang-format on - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, EXIT_SUCCESS) << result->stderr; - ASSERT_EQ(result->stdout, expected.str()); - unlink(idmap_static_no_name_path.c_str()); - unlink(idmap_static_2_path.c_str()); - unlink(idmap_static_1_path.c_str()); - - // the same input directory given twice, but no duplicate entries - // clang-format off - result = ExecuteBinary({"idmap2", - "scan", - "--input-directory", GetTestDataPath(), - "--input-directory", GetTestDataPath(), - "--recursive", - "--target-package-name", "test.target", - "--target-apk-path", GetTargetApkPath(), - "--output-directory", GetTempDirPath(), - "--override-policy", "public"}); - // clang-format on - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, EXIT_SUCCESS) << result->stderr; - ASSERT_EQ(result->stdout, expected.str()); - unlink(idmap_static_no_name_path.c_str()); - unlink(idmap_static_2_path.c_str()); - unlink(idmap_static_1_path.c_str()); - - // no APKs in input-directory: ok, but no output - // clang-format off - result = ExecuteBinary({"idmap2", - "scan", - "--input-directory", GetTempDirPath(), - "--target-package-name", "test.target", - "--target-apk-path", GetTargetApkPath(), - "--output-directory", GetTempDirPath(), - "--override-policy", "public"}); - // clang-format on - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, EXIT_SUCCESS) << result->stderr; - ASSERT_EQ(result->stdout, ""); - - // the signature idmap failing to generate should not cause scanning to fail - // clang-format off - result = ExecuteBinary({"idmap2", - "scan", - "--input-directory", GetTestDataPath(), - "--recursive", - "--target-package-name", "test.target", - "--target-apk-path", GetTargetApkPath(), - "--output-directory", GetTempDirPath(), - "--override-policy", "public"}); - // clang-format on - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, EXIT_SUCCESS) << result->stderr; - ASSERT_EQ(result->stdout, expected.str()); - unlink(idmap_static_no_name_path.c_str()); - unlink(idmap_static_2_path.c_str()); - unlink(idmap_static_1_path.c_str()); -} - TEST_F(Idmap2BinaryTests, Lookup) { SKIP_TEST_IF_CANT_EXEC_IDMAP2; diff --git a/cmds/idmap2/valgrind.sh b/cmds/idmap2/valgrind.sh index b4ebab0c7ffe..84daeecdb21e 100755 --- a/cmds/idmap2/valgrind.sh +++ b/cmds/idmap2/valgrind.sh @@ -53,7 +53,5 @@ valgrind="valgrind --error-exitcode=1 -q --track-origins=yes --leak-check=full" _eval "idmap2 create" "$valgrind idmap2 create --policy public --target-apk-path $target_path --overlay-apk-path $overlay_path --idmap-path $idmap_path" _eval "idmap2 dump" "$valgrind idmap2 dump --idmap-path $idmap_path" _eval "idmap2 lookup" "$valgrind idmap2 lookup --idmap-path $idmap_path --config '' --resid test.target:string/str1" -_eval "idmap2 scan" "$valgrind idmap2 scan --input-directory ${prefix}/tests/data/overlay --recursive --target-package-name test.target --target-apk-path $target_path --output-directory /tmp --override-policy public" -_eval "idmap2 verify" "$valgrind idmap2 verify --idmap-path $idmap_path" _eval "idmap2_tests" "$valgrind $ANDROID_HOST_OUT/nativetest64/idmap2_tests/idmap2_tests" exit $errors diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 02c0d933b3cd..e70eac88c769 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -583,9 +583,10 @@ message Atom { SupportedRadioAccessFamily supported_radio_access_family = 10079 [(module) = "telephony"]; SettingSnapshot setting_snapshot = 10080 [(module) = "framework"]; BlobInfo blob_info = 10081 [(module) = "framework"]; - DataUsageBytesTransfer data_usage_bytes_transfer = 10082 [(module) = "framework"]; + DataUsageBytesTransfer data_usage_bytes_transfer = + 10082 [(module) = "framework", (truncate_timestamp) = true]; BytesTransferByTagAndMetered bytes_transfer_by_tag_and_metered = - 10083 [(module) = "framework"]; + 10083 [(module) = "framework", (truncate_timestamp) = true]; DNDModeProto dnd_mode_rule = 10084 [(module) = "framework"]; GeneralExternalStorageAccessStats general_external_storage_access_stats = 10085 [(module) = "mediaprovider"]; @@ -5191,6 +5192,12 @@ message DataUsageBytesTransfer { // record is combined across opportunistic data subscriptions. // See {@link SubscriptionManager#setOpportunistic}. optional DataSubscriptionState opportunistic_data_sub = 10; + + // Indicate whether NR is connected, server side could use this with RAT type to determine if + // the record is for 5G NSA (Non Stand Alone) mode, where the primary cell is still LTE and + // network allocates a secondary 5G cell so telephony reports RAT = LTE along with NR state as + // connected. + optional bool is_nr_connected = 11; } /** diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp index 5987a723a421..9b684f1248c5 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp +++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp @@ -733,6 +733,11 @@ bool getDoubleOrLong(const LogEvent& event, const Matcher& matcher, Value& ret) return false; } +bool ValueMetricProducer::multipleBucketsSkipped(const int64_t numBucketsForward) { + // Skip buckets if this is a pulled metric or a pushed metric that is diffed. + return numBucketsForward > 1 && (mIsPulled || mUseDiff); +} + void ValueMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const MetricDimensionKey& eventKey, const ConditionKey& conditionKey, bool condition, const LogEvent& event, @@ -910,8 +915,9 @@ void ValueMetricProducer::onMatchedLogEventInternalLocked( interval.sampleSize += 1; } - // Only trigger the tracker if all intervals are correct - if (useAnomalyDetection) { + // Only trigger the tracker if all intervals are correct and we have not skipped the bucket due + // to MULTIPLE_BUCKETS_SKIPPED. + if (useAnomalyDetection && !multipleBucketsSkipped(calcBucketsForwardCount(eventTimeNs))) { // TODO: propgate proper values down stream when anomaly support doubles long wholeBucketVal = intervals[0].value.long_value; auto prev = mCurrentFullBucket.find(eventKey); @@ -961,9 +967,7 @@ void ValueMetricProducer::flushCurrentBucketLocked(const int64_t& eventTimeNs, int64_t bucketEndTime = fullBucketEndTimeNs; int64_t numBucketsForward = calcBucketsForwardCount(eventTimeNs); - // Skip buckets if this is a pulled metric or a pushed metric that is diffed. - if (numBucketsForward > 1 && (mIsPulled || mUseDiff)) { - + if (multipleBucketsSkipped(numBucketsForward)) { VLOG("Skipping forward %lld buckets", (long long)numBucketsForward); StatsdStats::getInstance().noteSkippedForwardBuckets(mMetricId); // Something went wrong. Maybe the device was sleeping for a long time. It is better diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.h b/cmds/statsd/src/metrics/ValueMetricProducer.h index b359af745c91..e72002e88533 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.h +++ b/cmds/statsd/src/metrics/ValueMetricProducer.h @@ -219,6 +219,8 @@ private: void pullAndMatchEventsLocked(const int64_t timestampNs); + bool multipleBucketsSkipped(const int64_t numBucketsForward); + void accumulateEvents(const std::vector<std::shared_ptr<LogEvent>>& allData, int64_t originalPullTimeNs, int64_t eventElapsedTimeNs); diff --git a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp index 97757afaf226..98892507e78d 100644 --- a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp @@ -1081,6 +1081,49 @@ TEST(ValueMetricProducerTest, TestAnomalyDetection) { std::ceil(1.0 * event6.GetElapsedTimestampNs() / NS_PER_SEC + refPeriodSec)); } +TEST(ValueMetricProducerTest, TestAnomalyDetectionMultipleBucketsSkipped) { + sp<AlarmMonitor> alarmMonitor; + Alert alert; + alert.set_id(101); + alert.set_metric_id(metricId); + alert.set_trigger_if_sum_gt(100); + alert.set_num_buckets(1); + const int32_t refPeriodSec = 3; + alert.set_refractory_period_secs(refPeriodSec); + + ValueMetric metric = ValueMetricProducerTestHelper::createMetricWithCondition(); + + sp<MockStatsPullerManager> pullerManager = new StrictMock<MockStatsPullerManager>(); + EXPECT_CALL(*pullerManager, Pull(tagId, kConfigKey, _, _)) + .WillOnce(Invoke([](int tagId, const ConfigKey&, const int64_t eventTimeNs, + vector<std::shared_ptr<LogEvent>>* data) { + EXPECT_EQ(eventTimeNs, bucketStartTimeNs + 1); // Condition change to true time. + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucketStartTimeNs + 1, 0)); + return true; + })) + .WillOnce(Invoke([](int tagId, const ConfigKey&, const int64_t eventTimeNs, + vector<std::shared_ptr<LogEvent>>* data) { + EXPECT_EQ(eventTimeNs, + bucket3StartTimeNs + 100); // Condition changed to false time. + data->clear(); + data->push_back(CreateRepeatedValueLogEvent(tagId, bucket3StartTimeNs + 100, 120)); + return true; + })); + sp<ValueMetricProducer> valueProducer = + ValueMetricProducerTestHelper::createValueProducerWithCondition(pullerManager, metric, + ConditionState::kFalse); + sp<AnomalyTracker> anomalyTracker = valueProducer->addAnomalyTracker(alert, alarmMonitor); + + valueProducer->onConditionChanged(true, bucketStartTimeNs + 1); + + // multiple buckets should be skipped here. + valueProducer->onConditionChanged(false, bucket3StartTimeNs + 100); + + // No alert is fired when multiple buckets are skipped. + EXPECT_EQ(anomalyTracker->getRefractoryPeriodEndsSec(DEFAULT_METRIC_DIMENSION_KEY), 0U); +} + // Test value metric no condition, the pull on bucket boundary come in time and too late TEST(ValueMetricProducerTest, TestBucketBoundaryNoCondition) { ValueMetric metric = ValueMetricProducerTestHelper::createMetric(); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 3ca5f0deba1b..b40dd0053846 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1461,8 +1461,12 @@ public class AppOpsManager { /** * AppOp granted to apps that we are started via {@code am instrument -e --no-isolated-storage} * + * <p>MediaProvider is the only component (outside of system server) that should care about this + * app op, hence {@code SystemApi.Client.MODULE_LIBRARIES}. + * * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage"; /** {@link #sAppOpsToNote} not initialized yet for this op */ diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index ca759e9fc6fa..dedd8705ef55 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -2687,7 +2687,7 @@ public class ApplicationPackageManager extends PackageManager { public void addPreferredActivity(IntentFilter filter, int match, ComponentName[] set, ComponentName activity) { try { - mPM.addPreferredActivity(filter, match, set, activity, getUserId()); + mPM.addPreferredActivity(filter, match, set, activity, getUserId(), false); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2697,7 +2697,7 @@ public class ApplicationPackageManager extends PackageManager { public void addPreferredActivityAsUser(IntentFilter filter, int match, ComponentName[] set, ComponentName activity, int userId) { try { - mPM.addPreferredActivity(filter, match, set, activity, userId); + mPM.addPreferredActivity(filter, match, set, activity, userId, false); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2734,6 +2734,16 @@ public class ApplicationPackageManager extends PackageManager { } @Override + public void addUniquePreferredActivity(@NonNull IntentFilter filter, int match, + @Nullable ComponentName[] set, @NonNull ComponentName activity) { + try { + mPM.addPreferredActivity(filter, match, set, activity, getUserId(), true); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @Override public int getPreferredActivities(List<IntentFilter> outFilters, List<ComponentName> outActivities, String packageName) { try { diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index 4b0d2f86ad34..bca6f39e1ded 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -175,14 +175,33 @@ import java.util.concurrent.atomic.AtomicLong; * * Caching can be disabled completely by initializing {@code sEnabled} to false and rebuilding. * + * To test a binder cache, create one or more tests that exercise the binder method. This + * should be done twice: once with production code and once with a special image that sets + * {@code DEBUG} and {@code VERIFY} true. In the latter case, verify that no cache + * inconsistencies are reported. If a cache inconsistency is reported, however, it might be a + * false positive. This happens if the server side data can be read and written non-atomically + * with respect to cache invalidation. + * * @param <Query> The class used to index cache entries: must be hashable and comparable * @param <Result> The class holding cache entries; use a boxed primitive if possible * * {@hide} */ public abstract class PropertyInvalidatedCache<Query, Result> { - private static final long NONCE_UNSET = 0; - private static final long NONCE_DISABLED = -1; + /** + * Reserved nonce values. The code is written assuming that these + * values are contiguous. + */ + private static final int NONCE_UNSET = 0; + private static final int NONCE_DISABLED = 1; + private static final int NONCE_CORKED = 2; + private static final int NONCE_RESERVED = NONCE_CORKED + 1; + + /** + * The names of the nonces + */ + private static final String[] sNonceName = + new String[]{ "unset", "disabled", "corked" }; private static final String TAG = "PropertyInvalidatedCache"; private static final boolean DEBUG = false; @@ -195,11 +214,28 @@ public abstract class PropertyInvalidatedCache<Query, Result> { @GuardedBy("mLock") private long mMisses = 0; + @GuardedBy("mLock") + private long mMissDisabled[] = new long[]{ 0, 0, 0 }; + + @GuardedBy("mLock") + private long mMissOverflow = 0; + + @GuardedBy("mLock") + private long mHighWaterMark = 0; + // Most invalidation is done in a static context, so the counters need to be accessible. @GuardedBy("sCorkLock") private static final HashMap<String, Long> sInvalidates = new HashMap<>(); /** + * Record the number of invalidate or cork calls that were nops because + * the cache was already corked. This is static because invalidation is + * done in a static context. + */ + @GuardedBy("sCorkLock") + private static final HashMap<String, Long> sCorkedInvalidates = new HashMap<>(); + + /** * If sEnabled is false then all cache operations are stubbed out. Set * it to false inside test processes. */ @@ -271,7 +307,15 @@ public abstract class PropertyInvalidatedCache<Query, Result> { true /* LRU access order */) { @Override protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > maxEntries; + final int size = size(); + if (size > mHighWaterMark) { + mHighWaterMark = size; + } + if (size > maxEntries) { + mMissOverflow++; + return true; + } + return false; } }; synchronized (sCorkLock) { @@ -363,14 +407,21 @@ public abstract class PropertyInvalidatedCache<Query, Result> { // Let access to mDisabled race: it's atomic anyway. long currentNonce = (!isDisabledLocal()) ? getCurrentNonce() : NONCE_DISABLED; for (;;) { - if (currentNonce == NONCE_DISABLED || currentNonce == NONCE_UNSET) { + if (currentNonce == NONCE_DISABLED || currentNonce == NONCE_UNSET || + currentNonce == NONCE_CORKED) { + if (!mDisabled) { + // Do not bother collecting statistics if the cache is + // locally disabled. + synchronized (mLock) { + mMissDisabled[(int) currentNonce]++; + } + } + if (DEBUG) { if (!mDisabled) { Log.d(TAG, String.format( "cache %s %s for %s", - cacheName(), - currentNonce == NONCE_DISABLED ? "disabled" : "unset", - queryToString(query))); + cacheName(), sNonceName[(int) currentNonce], queryToString(query))); } } return recompute(query); @@ -383,10 +434,10 @@ public abstract class PropertyInvalidatedCache<Query, Result> { if (cachedResult != null) mHits++; } else { if (DEBUG) { - Log.d(TAG, - String.format("clearing cache %s because nonce changed [%s] -> [%s]", - cacheName(), - mLastSeenNonce, currentNonce)); + Log.d(TAG, String.format( + "clearing cache %s of %d entries because nonce changed [%s] -> [%s]", + cacheName(), mCache.size(), + mLastSeenNonce, currentNonce)); } mCache.clear(); mLastSeenNonce = currentNonce; @@ -517,6 +568,8 @@ public abstract class PropertyInvalidatedCache<Query, Result> { if (DEBUG) { Log.d(TAG, "ignoring invalidation due to cork: " + name); } + final long count = sCorkedInvalidates.getOrDefault(name, (long) 0); + sCorkedInvalidates.put(name, count + 1); return; } invalidateCacheLocked(name); @@ -538,7 +591,7 @@ public abstract class PropertyInvalidatedCache<Query, Result> { long newValue; do { newValue = NoPreloadHolder.next(); - } while (newValue == NONCE_UNSET || newValue == NONCE_DISABLED); + } while (newValue >= 0 && newValue < NONCE_RESERVED); final String newValueString = Long.toString(newValue); if (DEBUG) { Log.d(TAG, @@ -567,13 +620,21 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * @param name Name of the cache-key property to cork */ public static void corkInvalidations(@NonNull String name) { + if (!sEnabled) { + if (DEBUG) { + Log.w(TAG, String.format( + "cache cork %s suppressed", name)); + } + return; + } + synchronized (sCorkLock) { int numberCorks = sCorks.getOrDefault(name, 0); if (DEBUG) { Log.d(TAG, String.format("corking %s: numberCorks=%s", name, numberCorks)); } - // If we're the first ones to cork this cache, set the cache to the unset state so + // If we're the first ones to cork this cache, set the cache to the corked state so // existing caches talk directly to their services while we've corked updates. // Make sure we don't clobber a disabled cache value. @@ -584,8 +645,11 @@ public abstract class PropertyInvalidatedCache<Query, Result> { if (numberCorks == 0) { final long nonce = SystemProperties.getLong(name, NONCE_UNSET); if (nonce != NONCE_UNSET && nonce != NONCE_DISABLED) { - SystemProperties.set(name, Long.toString(NONCE_UNSET)); + SystemProperties.set(name, Long.toString(NONCE_CORKED)); } + } else { + final long count = sCorkedInvalidates.getOrDefault(name, (long) 0); + sCorkedInvalidates.put(name, count + 1); } sCorks.put(name, numberCorks + 1); if (DEBUG) { @@ -602,6 +666,14 @@ public abstract class PropertyInvalidatedCache<Query, Result> { * @param name Name of the cache-key property to uncork */ public static void uncorkInvalidations(@NonNull String name) { + if (!sEnabled) { + if (DEBUG) { + Log.w(TAG, String.format( + "cache uncork %s suppressed", name)); + } + return; + } + synchronized (sCorkLock) { int numberCorks = sCorks.getOrDefault(name, 0); if (DEBUG) { @@ -729,8 +801,9 @@ public abstract class PropertyInvalidatedCache<Query, Result> { boolean nonceChanged = (getCurrentNonce() != mLastSeenNonce); if (!nonceChanged && !debugCompareQueryResults(proposedResult, resultToCompare)) { Log.e(TAG, String.format( - "cache %s inconsistent for %s", - cacheName(), queryToString(query))); + "cache %s inconsistent for %s is %s should be %s", + cacheName(), queryToString(query), + proposedResult, resultToCompare)); } // Always return the "true" result in verification mode. return resultToCompare; @@ -784,18 +857,23 @@ public abstract class PropertyInvalidatedCache<Query, Result> { private void dumpContents(PrintWriter pw, String[] args) { long invalidateCount; - + long corkedInvalidates; synchronized (sCorkLock) { invalidateCount = sInvalidates.getOrDefault(mPropertyName, (long) 0); + corkedInvalidates = sCorkedInvalidates.getOrDefault(mPropertyName, (long) 0); } synchronized (mLock) { pw.println(String.format(" Cache Property Name: %s", cacheName())); - pw.println(String.format(" Hits: %d, Misses: %d, Invalidates: %d", - mHits, mMisses, invalidateCount)); + pw.println(String.format(" Hits: %d, Misses: %d, Invalidates: %d, Overflows: %d", + mHits, mMisses, invalidateCount, mMissOverflow)); + pw.println(String.format(" Miss-corked: %d, Miss-unset: %d, Miss-other: %d," + + " CorkedInvalidates: %d", + mMissDisabled[NONCE_CORKED], mMissDisabled[NONCE_UNSET], + mMissDisabled[NONCE_DISABLED], corkedInvalidates)); pw.println(String.format(" Last Observed Nonce: %d", mLastSeenNonce)); - pw.println(String.format(" Current Size: %d, Max Size: %d", - mCache.entrySet().size(), mMaxEntries)); + pw.println(String.format(" Current Size: %d, Max Size: %d, HW Mark: %d", + mCache.size(), mMaxEntries, mHighWaterMark)); pw.println(String.format(" Enabled: %s", mDisabled ? "false" : "true")); Set<Map.Entry<Query, Result>> cacheEntries = mCache.entrySet(); diff --git a/core/java/android/app/QueuedWork.java b/core/java/android/app/QueuedWork.java index 82cc2c4daa0b..a1fcf53a2c37 100644 --- a/core/java/android/app/QueuedWork.java +++ b/core/java/android/app/QueuedWork.java @@ -80,7 +80,7 @@ public class QueuedWork { /** Work queued via {@link #queue} */ @GuardedBy("sLock") - private static final LinkedList<Runnable> sWork = new LinkedList<>(); + private static LinkedList<Runnable> sWork = new LinkedList<>(); /** If new work can be delayed or not */ @GuardedBy("sLock") @@ -252,8 +252,8 @@ public class QueuedWork { LinkedList<Runnable> work; synchronized (sLock) { - work = (LinkedList<Runnable>) sWork.clone(); - sWork.clear(); + work = sWork; + sWork = new LinkedList<>(); // Remove all msg-s as all work will be processed now getHandler().removeMessages(QueuedWorkHandler.MSG_RUN); diff --git a/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl b/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl index d8675f39d452..6e93af6a053b 100644 --- a/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl +++ b/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl @@ -41,6 +41,7 @@ interface ITimeZoneDetectorService { TimeZoneConfiguration getConfiguration(); boolean updateConfiguration(in TimeZoneConfiguration configuration); void addConfigurationListener(ITimeZoneConfigurationListener listener); + void removeConfigurationListener(ITimeZoneConfigurationListener listener); boolean suggestManualTimeZone(in ManualTimeZoneSuggestion timeZoneSuggestion); void suggestTelephonyTimeZone(in TelephonyTimeZoneSuggestion timeZoneSuggestion); diff --git a/core/java/android/app/timezonedetector/TimeZoneDetector.java b/core/java/android/app/timezonedetector/TimeZoneDetector.java index 621ef526aacf..7885613bfb59 100644 --- a/core/java/android/app/timezonedetector/TimeZoneDetector.java +++ b/core/java/android/app/timezonedetector/TimeZoneDetector.java @@ -74,11 +74,26 @@ public interface TimeZoneDetector { boolean updateConfiguration(@NonNull TimeZoneConfiguration configuration); /** + * An interface that can be used to listen for changes to the time zone detector configuration. + */ + interface TimeZoneConfigurationListener { + /** Called when the configuration changes. There are no guarantees about the thread used. */ + void onChange(@NonNull TimeZoneConfiguration configuration); + } + + /** * Registers a listener that will be informed when the configuration changes. The complete * configuration is passed to the listener, not just the properties that have changed. */ @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) - void addConfigurationListener(@NonNull ITimeZoneConfigurationListener listener); + void addConfigurationListener(@NonNull TimeZoneConfigurationListener listener); + + /** + * Removes a listener previously passed to + * {@link #addConfigurationListener(ITimeZoneConfigurationListener)} + */ + @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) + void removeConfigurationListener(@NonNull TimeZoneConfigurationListener listener); /** * A shared utility method to create a {@link ManualTimeZoneSuggestion}. diff --git a/core/java/android/app/timezonedetector/TimeZoneDetectorImpl.java b/core/java/android/app/timezonedetector/TimeZoneDetectorImpl.java index 978cb218fbba..6bd365fad6f6 100644 --- a/core/java/android/app/timezonedetector/TimeZoneDetectorImpl.java +++ b/core/java/android/app/timezonedetector/TimeZoneDetectorImpl.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceManager.ServiceNotFoundException; +import android.util.ArraySet; import android.util.Log; /** @@ -34,13 +35,16 @@ public final class TimeZoneDetectorImpl implements TimeZoneDetector { private final ITimeZoneDetectorService mITimeZoneDetectorService; + private ITimeZoneConfigurationListener mConfigurationReceiver; + private ArraySet<TimeZoneConfigurationListener> mConfigurationListeners; + public TimeZoneDetectorImpl() throws ServiceNotFoundException { mITimeZoneDetectorService = ITimeZoneDetectorService.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.TIME_ZONE_DETECTOR_SERVICE)); } @Override - @NonNull + @NonNull public TimeZoneCapabilities getCapabilities() { if (DEBUG) { Log.d(TAG, "getCapabilities called"); @@ -78,14 +82,70 @@ public final class TimeZoneDetectorImpl implements TimeZoneDetector { } @Override - public void addConfigurationListener(@NonNull ITimeZoneConfigurationListener listener) { + public void addConfigurationListener(@NonNull TimeZoneConfigurationListener listener) { if (DEBUG) { Log.d(TAG, "addConfigurationListener called: " + listener); } - try { - mITimeZoneDetectorService.addConfigurationListener(listener); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + synchronized (this) { + if (mConfigurationListeners.contains(listener)) { + return; + } + if (mConfigurationReceiver == null) { + ITimeZoneConfigurationListener iListener = + new ITimeZoneConfigurationListener.Stub() { + @Override + public void onChange(@NonNull TimeZoneConfiguration configuration) { + notifyConfigurationListeners(configuration); + } + }; + mConfigurationReceiver = iListener; + } + if (mConfigurationListeners == null) { + mConfigurationListeners = new ArraySet<>(); + } + + boolean wasEmpty = mConfigurationListeners.isEmpty(); + mConfigurationListeners.add(listener); + if (wasEmpty) { + try { + mITimeZoneDetectorService.addConfigurationListener(mConfigurationReceiver); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + } + + private void notifyConfigurationListeners(@NonNull TimeZoneConfiguration configuration) { + ArraySet<TimeZoneConfigurationListener> configurationListeners; + synchronized (this) { + configurationListeners = new ArraySet<>(mConfigurationListeners); + } + int size = configurationListeners.size(); + for (int i = 0; i < size; i++) { + configurationListeners.valueAt(i).onChange(configuration); + } + } + + @Override + public void removeConfigurationListener(@NonNull TimeZoneConfigurationListener listener) { + if (DEBUG) { + Log.d(TAG, "removeConfigurationListener called: " + listener); + } + + synchronized (this) { + if (mConfigurationListeners == null) { + return; + } + boolean wasEmpty = mConfigurationListeners.isEmpty(); + mConfigurationListeners.remove(listener); + if (mConfigurationListeners.isEmpty() && !wasEmpty) { + try { + mITimeZoneDetectorService.removeConfigurationListener(mConfigurationReceiver); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index f257326904fd..6a8dd81051eb 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -261,7 +261,7 @@ interface IPackageManager { in IntentFilter filter, int match, in ComponentName activity); void addPreferredActivity(in IntentFilter filter, int match, - in ComponentName[] set, in ComponentName activity, int userId); + in ComponentName[] set, in ComponentName activity, int userId, boolean removeExisting); @UnsupportedAppUsage void replacePreferredActivity(in IntentFilter filter, int match, diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 9c7dc9610522..42a610700051 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6763,6 +6763,17 @@ public abstract class PackageManager { public abstract void clearPackagePreferredActivities(@NonNull String packageName); /** + * Same as {@link #addPreferredActivity(IntentFilter, int, ComponentName[], ComponentName)}, + * but removes all existing entries that match this filter. + * @hide + */ + public void addUniquePreferredActivity(@NonNull IntentFilter filter, int match, + @Nullable ComponentName[] set, @NonNull ComponentName activity) { + throw new UnsupportedOperationException( + "addUniquePreferredActivity not implemented in subclass"); + } + + /** * Retrieve all preferred activities, previously added with * {@link #addPreferredActivity}, that are * currently registered with the system. diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 15a184f0e5ef..62c7b85fa62d 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -1573,7 +1573,6 @@ public final class AssetManager implements AutoCloseable { private static native long nativeAssetGetLength(long assetPtr); private static native long nativeAssetGetRemainingLength(long assetPtr); - private static native String[] nativeCreateIdmapsForStaticOverlaysTargetingAndroid(); private static native @Nullable Map nativeGetOverlayableMap(long ptr, @NonNull String packageName); private static native @Nullable String nativeGetOverlayablesToString(long ptr, diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 6a9e0aa047d1..9480d369065d 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -45,7 +45,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; -import android.app.UiModeManager; import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; import android.content.LocaleProto; @@ -928,7 +927,13 @@ public final class Configuration implements Parcelable, Comparable<Configuration fontScale = o.fontScale; mcc = o.mcc; mnc = o.mnc; - locale = o.locale == null ? null : (Locale) o.locale.clone(); + if (o.locale == null) { + locale = null; + } else if (!o.locale.equals(locale)) { + // Only clone a new Locale instance if we need to: the clone() is + // both CPU and GC intensive. + locale = (Locale) o.locale.clone(); + } o.fixUpLocaleList(); mLocaleList = o.mLocaleList; userSetLocale = o.userSetLocale; @@ -1624,7 +1629,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration if ((mask & ActivityInfo.CONFIG_LOCALE) != 0) { mLocaleList = delta.mLocaleList; if (!mLocaleList.isEmpty()) { - locale = (Locale) delta.locale.clone(); + if (!delta.locale.equals(locale)) { + // Don't churn a new Locale clone unless we're actually changing it + locale = (Locale) delta.locale.clone(); + } } } if ((mask & ActivityInfo.CONFIG_LAYOUT_DIRECTION) != 0) { diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java index efe71f15007c..885d137dd2fe 100644 --- a/core/java/android/hardware/face/FaceManager.java +++ b/core/java/android/hardware/face/FaceManager.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2018 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -47,6 +47,7 @@ import android.view.Surface; import com.android.internal.R; import com.android.internal.os.SomeArgs; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -70,11 +71,13 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan private static final int MSG_GET_FEATURE_COMPLETED = 106; private static final int MSG_SET_FEATURE_COMPLETED = 107; private static final int MSG_CHALLENGE_GENERATED = 108; + private static final int MSG_FACE_DETECTED = 109; private final IFaceService mService; private final Context mContext; private IBinder mToken = new Binder(); private AuthenticationCallback mAuthenticationCallback; + private FaceDetectionCallback mFaceDetectionCallback; private EnrollmentCallback mEnrollmentCallback; private RemovalCallback mRemovalCallback; private SetFeatureCallback mSetFeatureCallback; @@ -103,6 +106,12 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } @Override // binder call + public void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric) { + mHandler.obtainMessage(MSG_FACE_DETECTED, sensorId, userId, isStrongBiometric) + .sendToTarget(); + } + + @Override // binder call public void onAuthenticationFailed() { mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget(); } @@ -251,6 +260,34 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } /** + * Uses the face hardware to detect for the presence of a face, without giving details about + * accept/reject/lockout. + * @hide + */ + @RequiresPermission(USE_BIOMETRIC_INTERNAL) + public void detectFace(@NonNull CancellationSignal cancel, + @NonNull FaceDetectionCallback callback, int userId) { + if (mService == null) { + return; + } + + if (cancel.isCanceled()) { + Slog.w(TAG, "Detection already cancelled"); + return; + } else { + cancel.setOnCancelListener(new OnFaceDetectionCancelListener()); + } + + mFaceDetectionCallback = callback; + + try { + mService.detectFace(mToken, userId, mServiceReceiver, mContext.getOpPackageName()); + } catch (RemoteException e) { + Slog.w(TAG, "Remote exception when requesting finger detect", e); + } + } + + /** * Defaults to {@link FaceManager#enroll(int, byte[], CancellationSignal, EnrollmentCallback, * int[], Surface)} with {@code surface} set to null. * @@ -581,6 +618,24 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } /** + * Get statically configured sensor properties. + * @hide + */ + @RequiresPermission(USE_BIOMETRIC_INTERNAL) + @NonNull + public List<FaceSensorProperties> getSensorProperties() { + try { + if (mService == null || !mService.isHardwareDetected(mContext.getOpPackageName())) { + return new ArrayList<>(); + } + return mService.getSensorProperties(mContext.getOpPackageName()); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + return new ArrayList<>(); + } + + /** * @hide */ @RequiresPermission(USE_BIOMETRIC_INTERNAL) @@ -639,6 +694,18 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } } + private void cancelFaceDetect() { + if (mService == null) { + return; + } + + try { + mService.cancelFaceDetect(mToken, mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + /** * @hide */ @@ -896,6 +963,13 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } /** + * @hide + */ + public interface FaceDetectionCallback { + void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric); + } + + /** * Callback structure provided to {@link FaceManager#enroll(long, * EnrollmentCallback, CancellationSignal, int). Users of {@link #FaceAuthenticationManager()} * must provide an implementation of this to {@link FaceManager#enroll(long, @@ -1026,6 +1100,13 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } } + private class OnFaceDetectionCancelListener implements OnCancelListener { + @Override + public void onCancel() { + cancelFaceDetect(); + } + } + private class MyHandler extends Handler { private MyHandler(Context context) { super(context.getMainLooper()); @@ -1072,6 +1153,10 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan case MSG_CHALLENGE_GENERATED: sendChallengeGenerated((long) msg.obj /* challenge */); break; + case MSG_FACE_DETECTED: + sendFaceDetected(msg.arg1 /* sensorId */, msg.arg2 /* userId */, + (boolean) msg.obj /* isStrongBiometric */); + break; default: Slog.w(TAG, "Unknown message: " + msg.what); } @@ -1100,6 +1185,14 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan mGenerateChallengeCallback.onGenerateChallengeResult(challenge); } + private void sendFaceDetected(int sensorId, int userId, boolean isStrongBiometric) { + if (mFaceDetectionCallback == null) { + Slog.e(TAG, "sendFaceDetected, callback null"); + return; + } + mFaceDetectionCallback.onFaceDetected(sensorId, userId, isStrongBiometric); + } + private void sendRemovedResult(Face face, int remaining) { if (mRemovalCallback == null) { return; diff --git a/core/java/android/hardware/face/FaceSensorProperties.aidl b/core/java/android/hardware/face/FaceSensorProperties.aidl new file mode 100644 index 000000000000..d83ee4b17fa7 --- /dev/null +++ b/core/java/android/hardware/face/FaceSensorProperties.aidl @@ -0,0 +1,18 @@ +/* + * 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.hardware.face; + +parcelable FaceSensorProperties;
\ No newline at end of file diff --git a/core/java/android/hardware/face/FaceSensorProperties.java b/core/java/android/hardware/face/FaceSensorProperties.java new file mode 100644 index 000000000000..e3b2fbb6c614 --- /dev/null +++ b/core/java/android/hardware/face/FaceSensorProperties.java @@ -0,0 +1,67 @@ +/* + * 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.hardware.face; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Container for face sensor properties. + * @hide + */ +public class FaceSensorProperties implements Parcelable { + + public final int sensorId; + public final boolean supportsFaceDetection; + + /** + * Initializes SensorProperties with specified values + */ + public FaceSensorProperties(int sensorId, boolean supportsFaceDetection) { + this.sensorId = sensorId; + this.supportsFaceDetection = supportsFaceDetection; + } + + protected FaceSensorProperties(Parcel in) { + sensorId = in.readInt(); + supportsFaceDetection = in.readBoolean(); + } + + public static final Creator<FaceSensorProperties> CREATOR = + new Creator<FaceSensorProperties>() { + @Override + public FaceSensorProperties createFromParcel(Parcel in) { + return new FaceSensorProperties(in); + } + + @Override + public FaceSensorProperties[] newArray(int size) { + return new FaceSensorProperties[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(sensorId); + dest.writeBoolean(supportsFaceDetection); + } +} diff --git a/core/java/android/hardware/face/IFaceService.aidl b/core/java/android/hardware/face/IFaceService.aidl index 2f8c97f8022d..a9097d401349 100644 --- a/core/java/android/hardware/face/IFaceService.aidl +++ b/core/java/android/hardware/face/IFaceService.aidl @@ -19,6 +19,7 @@ import android.hardware.biometrics.IBiometricSensorReceiver; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.face.IFaceServiceReceiver; import android.hardware.face.Face; +import android.hardware.face.FaceSensorProperties; import android.view.Surface; /** @@ -27,10 +28,17 @@ import android.view.Surface; * @hide */ interface IFaceService { + // Retrieve static sensor properties for all face sensors + List<FaceSensorProperties> getSensorProperties(String opPackageName); + // Authenticate the given sessionId with a face void authenticate(IBinder token, long operationId, int userid, IFaceServiceReceiver receiver, String opPackageName); + // Uses the face hardware to detect for the presence of a face, without giving details + // about accept/reject/lockout. + void detectFace(IBinder token, int userId, IFaceServiceReceiver receiver, String opPackageName); + // This method prepares the service to start authenticating, but doesn't start authentication. // This is protected by the MANAGE_BIOMETRIC signatuer permission. This method should only be // called from BiometricService. The additional uid, pid, userId arguments should be determined @@ -46,6 +54,9 @@ interface IFaceService { // Cancel authentication for the given sessionId void cancelAuthentication(IBinder token, String opPackageName); + // Cancel face detection + void cancelFaceDetect(IBinder token, String opPackageName); + // Same as above, with extra arguments. void cancelAuthenticationFromService(IBinder token, String opPackageName, int callingUid, int callingPid, int callingUserId); diff --git a/core/java/android/hardware/face/IFaceServiceReceiver.aidl b/core/java/android/hardware/face/IFaceServiceReceiver.aidl index 844657e7453f..2600b7def03a 100644 --- a/core/java/android/hardware/face/IFaceServiceReceiver.aidl +++ b/core/java/android/hardware/face/IFaceServiceReceiver.aidl @@ -25,6 +25,7 @@ oneway interface IFaceServiceReceiver { void onEnrollResult(in Face face, int remaining); void onAcquired(int acquiredInfo, int vendorCode); void onAuthenticationSucceeded(in Face face, int userId, boolean isStrongBiometric); + void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric); void onAuthenticationFailed(); void onError(int error, int vendorCode); void onRemoved(in Face face, int remaining); diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 7b1048ed1de5..e384da7574ad 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2014 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -50,6 +50,7 @@ import android.util.Slog; import android.view.Surface; import java.security.Signature; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -66,6 +67,7 @@ import javax.crypto.Mac; * it's much more realistic to have a system-provided authentication dialog since the method may * vary by vendor/device. */ +@SuppressWarnings("deprecation") @Deprecated @SystemService(Context.FINGERPRINT_SERVICE) @RequiresFeature(PackageManager.FEATURE_FINGERPRINT) @@ -80,11 +82,13 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing private static final int MSG_ERROR = 104; private static final int MSG_REMOVED = 105; private static final int MSG_CHALLENGE_GENERATED = 106; + private static final int MSG_FINGERPRINT_DETECTED = 107; private IFingerprintService mService; private Context mContext; private IBinder mToken = new Binder(); private AuthenticationCallback mAuthenticationCallback; + private FingerprintDetectionCallback mFingerprintDetectionCallback; private EnrollmentCallback mEnrollmentCallback; private RemovalCallback mRemovalCallback; private GenerateChallengeCallback mGenerateChallengeCallback; @@ -112,6 +116,13 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } } + private class OnFingerprintDetectionCancelListener implements OnCancelListener { + @Override + public void onCancel() { + cancelFingerprintDetect(); + } + } + /** * A wrapper class for the crypto objects supported by FingerprintManager. Currently the * framework supports {@link Signature}, {@link Cipher} and {@link Mac} objects. @@ -222,7 +233,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing public boolean isStrongBiometric() { return mIsStrongBiometric; } - }; + } /** * Callback structure provided to {@link FingerprintManager#authenticate(CryptoObject, @@ -274,7 +285,19 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing */ @Override public void onAuthenticationAcquired(int acquireInfo) {} - }; + } + + /** + * Callback structure provided for {@link #detectFingerprint(CancellationSignal, + * FingerprintDetectionCallback, int, Surface)}. + * @hide + */ + public interface FingerprintDetectionCallback { + /** + * Invoked when a fingerprint has been detected. + */ + void onFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric); + } /** * Callback structure provided to {@link FingerprintManager#enroll(byte[], CancellationSignal, @@ -309,7 +332,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * @param remaining The number of remaining steps */ public void onEnrollmentProgress(int remaining) { } - }; + } /** * Callback structure provided to {@link #remove}. Users of {@link FingerprintManager} may @@ -337,7 +360,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * fingerprints in the group, and 0 after the last fingerprint is removed. */ public void onRemovalSucceeded(Fingerprint fp, int remaining) { } - }; + } /** * @hide @@ -349,7 +372,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * again. */ public void onLockoutReset(int sensorId) { } - }; + } /** * @hide @@ -464,6 +487,35 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } /** + * Uses the fingerprint hardware to detect for the presence of a finger, without giving details + * about accept/reject/lockout. + * @hide + */ + @RequiresPermission(USE_BIOMETRIC_INTERNAL) + public void detectFingerprint(@NonNull CancellationSignal cancel, + @NonNull FingerprintDetectionCallback callback, int userId, @Nullable Surface surface) { + if (mService == null) { + return; + } + + if (cancel.isCanceled()) { + Slog.w(TAG, "Detection already cancelled"); + return; + } else { + cancel.setOnCancelListener(new OnFingerprintDetectionCancelListener()); + } + + mFingerprintDetectionCallback = callback; + + try { + mService.detectFingerprint(mToken, userId, mServiceReceiver, + mContext.getOpPackageName(), surface); + } catch (RemoteException e) { + Slog.w(TAG, "Remote exception when requesting finger detect", e); + } + } + + /** * Defaults to {@link FingerprintManager#enroll(byte[], CancellationSignal, int, * EnrollmentCallback, Surface)} with {@code surface} set to null. * @@ -689,24 +741,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing * @hide */ @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public boolean isUdfps() { - if (mService == null) { - Slog.w(TAG, "isUdfps: no fingerprint service"); - return false; - } - - try { - return mService.isUdfps(); - } catch (RemoteException e) { - e.rethrowFromSystemServer(); - } - return false; - } - - /** - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) public void setUdfpsOverlayController(IUdfpsOverlayController controller) { if (mService == null) { Slog.w(TAG, "setUdfpsOverlayController: no fingerprint service"); @@ -811,6 +845,24 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } /** + * Get statically configured sensor properties. + * @hide + */ + @RequiresPermission(USE_BIOMETRIC_INTERNAL) + @NonNull + public List<FingerprintSensorProperties> getSensorProperties() { + try { + if (mService == null || !mService.isHardwareDetected(mContext.getOpPackageName())) { + return new ArrayList<>(); + } + return mService.getSensorProperties(mContext.getOpPackageName()); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + return new ArrayList<>(); + } + + /** * @hide */ public void addLockoutResetCallback(final LockoutResetCallback callback) { @@ -882,12 +934,16 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing case MSG_CHALLENGE_GENERATED: sendChallengeGenerated((long) msg.obj /* challenge */); break; + case MSG_FINGERPRINT_DETECTED: + sendFingerprintDetected(msg.arg1 /* sensorId */, msg.arg2 /* userId */, + (boolean) msg.obj /* isStrongBiometric */); + break; default: Slog.w(TAG, "Unknown message: " + msg.what); } } - }; + } private void sendRemovedResult(Fingerprint fingerprint, int remaining) { if (mRemovalCallback == null) { @@ -972,6 +1028,14 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing mGenerateChallengeCallback.onChallengeGenerated(challenge); } + private void sendFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric) { + if (mFingerprintDetectionCallback == null) { + Slog.e(TAG, "sendFingerprintDetected, callback null"); + return; + } + mFingerprintDetectionCallback.onFingerprintDetected(sensorId, userId, isStrongBiometric); + } + /** * @hide */ @@ -1008,6 +1072,18 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } } + private void cancelFingerprintDetect() { + if (mService == null) { + return; + } + + try { + mService.cancelFingerprintDetect(mToken, mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + /** * @hide */ @@ -1111,6 +1187,12 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing fp).sendToTarget(); } + @Override + public void onFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric) { + mHandler.obtainMessage(MSG_FINGERPRINT_DETECTED, sensorId, userId, isStrongBiometric) + .sendToTarget(); + } + @Override // binder call public void onAuthenticationFailed() { mHandler.obtainMessage(MSG_AUTHENTICATION_FAILED).sendToTarget(); diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorProperties.aidl b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.aidl new file mode 100644 index 000000000000..83d853dd4048 --- /dev/null +++ b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.aidl @@ -0,0 +1,18 @@ +/* + * 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.hardware.fingerprint; + +parcelable FingerprintSensorProperties;
\ No newline at end of file diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java new file mode 100644 index 000000000000..a774121c43f4 --- /dev/null +++ b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java @@ -0,0 +1,85 @@ +/* + * 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.hardware.fingerprint; + +import android.annotation.IntDef; +import android.hardware.face.FaceSensorProperties; +import android.os.Parcel; +import android.os.Parcelable; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Container for fingerprint sensor properties. + * @hide + */ +public class FingerprintSensorProperties implements Parcelable { + + public static final int TYPE_UNKNOWN = 0; + public static final int TYPE_REAR = 1; + public static final int TYPE_UDFPS = 2; + public static final int TYPE_POWER_BUTTON = 3; + + @IntDef({ + TYPE_UNKNOWN, + TYPE_REAR, + TYPE_UDFPS, + TYPE_POWER_BUTTON}) + @Retention(RetentionPolicy.SOURCE) + public @interface SensorType {} + + public final int sensorId; + public final @SensorType int sensorType; + + /** + * Initializes SensorProperties with specified values + */ + public FingerprintSensorProperties(int sensorId, @SensorType int sensorType) { + this.sensorId = sensorId; + this.sensorType = sensorType; + } + + protected FingerprintSensorProperties(Parcel in) { + sensorId = in.readInt(); + sensorType = in.readInt(); + } + + public static final Creator<FingerprintSensorProperties> CREATOR = + new Creator<FingerprintSensorProperties>() { + @Override + public FingerprintSensorProperties createFromParcel(Parcel in) { + return new FingerprintSensorProperties(in); + } + + @Override + public FingerprintSensorProperties[] newArray(int size) { + return new FingerprintSensorProperties[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(sensorId); + dest.writeInt(sensorType); + } +} diff --git a/core/java/android/hardware/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl index 21ac687166f0..f6069d81934f 100644 --- a/core/java/android/hardware/fingerprint/IFingerprintService.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl @@ -21,6 +21,7 @@ import android.hardware.fingerprint.IFingerprintClientActiveCallback; import android.hardware.fingerprint.IFingerprintServiceReceiver; import android.hardware.fingerprint.IUdfpsOverlayController; import android.hardware.fingerprint.Fingerprint; +import android.hardware.fingerprint.FingerprintSensorProperties; import android.view.Surface; import java.util.List; @@ -29,12 +30,20 @@ import java.util.List; * @hide */ interface IFingerprintService { + // Retrieve static sensor properties for all fingerprint sensors + List<FingerprintSensorProperties> getSensorProperties(String opPackageName); + // Authenticate the given sessionId with a fingerprint. This is protected by // USE_FINGERPRINT/USE_BIOMETRIC permission. This is effectively deprecated, since it only comes // through FingerprintManager now. void authenticate(IBinder token, long operationId, int userId, IFingerprintServiceReceiver receiver, String opPackageName, in Surface surface); + // Uses the fingerprint hardware to detect for the presence of a finger, without giving details + // about accept/reject/lockout. + void detectFingerprint(IBinder token, int userId, IFingerprintServiceReceiver receiver, + String opPackageName, in Surface surface); + // This method prepares the service to start authenticating, but doesn't start authentication. // This is protected by the MANAGE_BIOMETRIC signatuer permission. This method should only be // called from BiometricService. The additional uid, pid, userId arguments should be determined @@ -50,6 +59,9 @@ interface IFingerprintService { // Cancel authentication for the given sessionId void cancelAuthentication(IBinder token, String opPackageName); + // Cancel finger detection + void cancelFingerprintDetect(IBinder token, String opPackageName); + // Same as above, except this is protected by the MANAGE_BIOMETRIC signature permission. Takes // an additional uid, pid, userid. void cancelAuthenticationFromService(IBinder token, String opPackageName, @@ -114,9 +126,6 @@ interface IFingerprintService { // Notifies about a finger leaving the sensor area. void onFingerUp(); - // Returns whether the sensor is an under-display fingerprint sensor (UDFPS). - boolean isUdfps(); - // Sets the controller for managing the UDFPS overlay. void setUdfpsOverlayController(in IUdfpsOverlayController controller); } diff --git a/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl index 3da07b05efb6..ad8fbc087ed0 100644 --- a/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl @@ -25,6 +25,7 @@ oneway interface IFingerprintServiceReceiver { void onEnrollResult(in Fingerprint fp, int remaining); void onAcquired(int acquiredInfo, int vendorCode); void onAuthenticationSucceeded(in Fingerprint fp, int userId, boolean isStrongBiometric); + void onFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric); void onAuthenticationFailed(); void onError(int error, int vendorCode); void onRemoved(in Fingerprint fp, int remaining); diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index eba7ff348328..7234eb1d81cd 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -87,6 +87,15 @@ public class NetworkTemplate implements Parcelable { * @hide */ public static final int NETWORK_TYPE_ALL = -1; + /** + * Virtual RAT type to represent 5G NSA (Non Stand Alone) mode, where the primary cell is + * still LTE and network allocates a secondary 5G cell so telephony reports RAT = LTE along + * with NR state as connected. This should not be overlapped with any of the + * {@code TelephonyManager.NETWORK_TYPE_*} constants. + * + * @hide + */ + public static final int NETWORK_TYPE_5G_NSA = -2; private static boolean isKnownMatchRule(final int rule) { switch (rule) { @@ -475,6 +484,9 @@ public class NetworkTemplate implements Parcelable { return TelephonyManager.NETWORK_TYPE_LTE; case TelephonyManager.NETWORK_TYPE_NR: return TelephonyManager.NETWORK_TYPE_NR; + // Virtual RAT type for 5G NSA mode, see {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}. + case NetworkTemplate.NETWORK_TYPE_5G_NSA: + return NetworkTemplate.NETWORK_TYPE_5G_NSA; default: return TelephonyManager.NETWORK_TYPE_UNKNOWN; } diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index ffe9ae9521a8..a32b41f6be4b 100644 --- a/core/java/android/net/ProxyInfo.java +++ b/core/java/android/net/ProxyInfo.java @@ -127,18 +127,6 @@ public class ProxyInfo implements Parcelable { } /** - * Create a ProxyProperties that points at a PAC URL. - * @hide - */ - public ProxyInfo(String pacFileUrl) { - mHost = LOCAL_HOST; - mPort = LOCAL_PORT; - mExclusionList = LOCAL_EXCL_LIST; - mParsedExclusionList = parseExclusionList(mExclusionList); - mPacFileUrl = Uri.parse(pacFileUrl); - } - - /** * Only used in PacManager after Local Proxy is bound. * @hide */ diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java index 18ba5a8a4a34..bb8d4fe19aa2 100644 --- a/core/java/android/os/DropBoxManager.java +++ b/core/java/android/os/DropBoxManager.java @@ -375,7 +375,8 @@ public class DropBoxManager { @RequiresPermission(allOf = { READ_LOGS, PACKAGE_USAGE_STATS }) public @Nullable Entry getNextEntry(String tag, long msec) { try { - return mService.getNextEntry(tag, msec, mContext.getOpPackageName()); + return mService.getNextEntryWithAttribution(tag, msec, mContext.getOpPackageName(), + mContext.getAttributionTag()); } catch (SecurityException e) { if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.P) { throw e; diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 38ba47ab3701..ff1bcf6b3c5e 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -538,7 +538,7 @@ public final class UserHandle implements Parcelable { UserHandle other = (UserHandle)obj; return mHandle == other.mHandle; } - } catch (ClassCastException e) { + } catch (ClassCastException ignore) { } return false; } diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java index 43bd76de1f46..17a78a8f301e 100644 --- a/core/java/android/permission/PermissionControllerManager.java +++ b/core/java/android/permission/PermissionControllerManager.java @@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DENIE import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED; import static android.permission.PermissionControllerService.SERVICE_INTERFACE; +import static com.android.internal.util.FunctionalUtils.uncheckExceptions; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkArgumentNonnegative; import static com.android.internal.util.Preconditions.checkCollectionElementsNotNull; @@ -56,6 +57,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.infra.AndroidFuture; import com.android.internal.infra.RemoteStream; import com.android.internal.infra.ServiceConnector; +import com.android.internal.os.BackgroundThread; import com.android.internal.util.CollectionUtils; import libcore.util.EmptyArray; @@ -497,8 +499,11 @@ public final class PermissionControllerManager { */ public void dump(@NonNull FileDescriptor fd, @Nullable String[] args) { try { - mRemoteService.post(service -> service.asBinder().dump(fd, args)) - .get(REQUEST_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); + mRemoteService.postAsync(service -> { + return AndroidFuture.runAsync(uncheckExceptions(() -> { + service.asBinder().dump(fd, args); + }), BackgroundThread.getExecutor()); + }).get(REQUEST_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); } catch (Exception e) { Log.e(TAG, "Could not get dump", e); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e1d48860b1e2..500e476a7b80 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11862,21 +11862,6 @@ public final class Settings { "job_scheduler_quota_controller_constants"; /** - * Job scheduler TimeController specific settings. - * This is encoded as a key=value list, separated by commas. Ex: - * - * "skip_not_ready_jobs=true5,other_key=2" - * - * <p> - * Type: string - * - * @hide - * @see com.android.server.job.JobSchedulerService.Constants - */ - public static final String JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS = - "job_scheduler_time_controller_constants"; - - /** * ShortcutManager specific settings. * This is encoded as a key=value list, separated by commas. Ex: * diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index fae26cf77c16..9f52142a5109 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1357,8 +1357,7 @@ public final class Telephony { Object[] messages; try { messages = (Object[]) intent.getSerializableExtra("pdus"); - } - catch (ClassCastException e) { + } catch (ClassCastException e) { Rlog.e(TAG, "getMessagesFromIntent: " + e); return null; } @@ -1370,9 +1369,12 @@ public final class Telephony { String format = intent.getStringExtra("format"); int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, - SubscriptionManager.getDefaultSmsSubscriptionId()); - - Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId); + SubscriptionManager.INVALID_SUBSCRIPTION_ID); + if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + Rlog.v(TAG, "getMessagesFromIntent with valid subId : " + subId); + } else { + Rlog.v(TAG, "getMessagesFromIntent"); + } int pduCount = messages.length; SmsMessage[] msgs = new SmsMessage[pduCount]; diff --git a/core/java/android/text/format/DateIntervalFormat.java b/core/java/android/text/format/DateIntervalFormat.java new file mode 100644 index 000000000000..de9ec7ab9ea9 --- /dev/null +++ b/core/java/android/text/format/DateIntervalFormat.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2013 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.text.format; + +import static android.text.format.DateUtils.FORMAT_SHOW_TIME; +import static android.text.format.DateUtils.FORMAT_UTC; + +import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; + +import android.icu.util.Calendar; +import android.icu.util.ULocale; +import android.util.LruCache; + +import com.android.internal.annotations.VisibleForTesting; + +import java.text.FieldPosition; +import java.util.TimeZone; + +/** + * A wrapper of {@link android.icu.text.DateIntervalFormat} used by {@link DateUtilsBridge}. + * + * @hide + */ +@VisibleForTesting(visibility = PACKAGE) +public final class DateIntervalFormat { + + private static final LruCache<String, android.icu.text.DateIntervalFormat> CACHED_FORMATTERS = + new LruCache<>(8); + + private DateIntervalFormat() { + } + + /** + * Format a date range. + */ + @VisibleForTesting(visibility = PACKAGE) + public static String formatDateRange(long startMs, long endMs, int flags, String olsonId) { + if ((flags & FORMAT_UTC) != 0) { + olsonId = "UTC"; + } + // We create a java.util.TimeZone here to use libcore's data and libcore's olson ID / + // pseudo-tz logic. + TimeZone tz = (olsonId != null) ? TimeZone.getTimeZone(olsonId) : TimeZone.getDefault(); + android.icu.util.TimeZone icuTimeZone = DateUtilsBridge.icuTimeZone(tz); + ULocale icuLocale = ULocale.getDefault(); + return formatDateRange(icuLocale, icuTimeZone, startMs, endMs, flags); + } + + /** + * Format a date range. This is our slightly more sensible internal API. + * A truly sane replacement would take a skeleton instead of int flags. + */ + @VisibleForTesting(visibility = PACKAGE) + public static String formatDateRange(ULocale icuLocale, android.icu.util.TimeZone icuTimeZone, + long startMs, long endMs, int flags) { + Calendar startCalendar = DateUtilsBridge.createIcuCalendar(icuTimeZone, icuLocale, startMs); + Calendar endCalendar; + if (startMs == endMs) { + endCalendar = startCalendar; + } else { + endCalendar = DateUtilsBridge.createIcuCalendar(icuTimeZone, icuLocale, endMs); + } + + // Special handling when the range ends at midnight: + // - If we're not showing times, and the range is non-empty, we fudge the end date so we + // don't count the day that's about to start. + // - If we are showing times, and the range ends at exactly 00:00 of the day following + // its start (which can be thought of as 24:00 the same day), we fudge the end date so we + // don't show the dates --- unless the start is anything displayed as 00:00, in which case + // we include both dates to disambiguate. + // This is not the behavior of icu4j's DateIntervalFormat, but it's the required behavior + // of Android's DateUtils.formatDateRange. + if (isExactlyMidnight(endCalendar)) { + boolean showTime = (flags & FORMAT_SHOW_TIME) == FORMAT_SHOW_TIME; + boolean endsDayAfterStart = DateUtilsBridge.dayDistance(startCalendar, endCalendar) + == 1; + if ((!showTime && startMs != endMs) + || (endsDayAfterStart + && !DateUtilsBridge.isDisplayMidnightUsingSkeleton(startCalendar))) { + endCalendar.add(Calendar.DAY_OF_MONTH, -1); + } + } + + String skeleton = DateUtilsBridge.toSkeleton(startCalendar, endCalendar, flags); + synchronized (CACHED_FORMATTERS) { + android.icu.text.DateIntervalFormat formatter = + getFormatter(skeleton, icuLocale, icuTimeZone); + return formatter.format(startCalendar, endCalendar, new StringBuffer(), + new FieldPosition(0)).toString(); + } + } + + private static android.icu.text.DateIntervalFormat getFormatter(String skeleton, ULocale locale, + android.icu.util.TimeZone icuTimeZone) { + String key = skeleton + "\t" + locale + "\t" + icuTimeZone; + android.icu.text.DateIntervalFormat formatter = CACHED_FORMATTERS.get(key); + if (formatter != null) { + return formatter; + } + formatter = android.icu.text.DateIntervalFormat.getInstance(skeleton, locale); + formatter.setTimeZone(icuTimeZone); + CACHED_FORMATTERS.put(key, formatter); + return formatter; + } + + private static boolean isExactlyMidnight(Calendar c) { + return c.get(Calendar.HOUR_OF_DAY) == 0 + && c.get(Calendar.MINUTE) == 0 + && c.get(Calendar.SECOND) == 0 + && c.get(Calendar.MILLISECOND) == 0; + } +} diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 51bea7753ba9..0fdd9db24e24 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -27,7 +27,6 @@ import android.icu.util.MeasureUnit; import com.android.internal.R; -import libcore.icu.DateIntervalFormat; import libcore.icu.LocaleData; import java.io.IOException; diff --git a/core/java/android/text/format/DateUtilsBridge.java b/core/java/android/text/format/DateUtilsBridge.java index 370d999abf3e..92ec9cf6d736 100644 --- a/core/java/android/text/format/DateUtilsBridge.java +++ b/core/java/android/text/format/DateUtilsBridge.java @@ -16,6 +16,20 @@ package android.text.format; +import static android.text.format.DateUtils.FORMAT_12HOUR; +import static android.text.format.DateUtils.FORMAT_24HOUR; +import static android.text.format.DateUtils.FORMAT_ABBREV_ALL; +import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; +import static android.text.format.DateUtils.FORMAT_ABBREV_TIME; +import static android.text.format.DateUtils.FORMAT_ABBREV_WEEKDAY; +import static android.text.format.DateUtils.FORMAT_NO_MONTH_DAY; +import static android.text.format.DateUtils.FORMAT_NO_YEAR; +import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_TIME; +import static android.text.format.DateUtils.FORMAT_SHOW_WEEKDAY; +import static android.text.format.DateUtils.FORMAT_SHOW_YEAR; + import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; import android.icu.util.Calendar; @@ -33,24 +47,6 @@ import com.android.internal.annotations.VisibleForTesting; */ @VisibleForTesting(visibility = PACKAGE) public final class DateUtilsBridge { - // These are all public API in DateUtils. There are others, but they're either for use with - // other methods (like FORMAT_ABBREV_RELATIVE), don't internationalize (like FORMAT_CAP_AMPM), - // or have never been implemented anyway. - public static final int FORMAT_SHOW_TIME = 0x00001; - public static final int FORMAT_SHOW_WEEKDAY = 0x00002; - public static final int FORMAT_SHOW_YEAR = 0x00004; - public static final int FORMAT_NO_YEAR = 0x00008; - public static final int FORMAT_SHOW_DATE = 0x00010; - public static final int FORMAT_NO_MONTH_DAY = 0x00020; - public static final int FORMAT_12HOUR = 0x00040; - public static final int FORMAT_24HOUR = 0x00080; - public static final int FORMAT_UTC = 0x02000; - public static final int FORMAT_ABBREV_TIME = 0x04000; - public static final int FORMAT_ABBREV_WEEKDAY = 0x08000; - public static final int FORMAT_ABBREV_MONTH = 0x10000; - public static final int FORMAT_NUMERIC_DATE = 0x20000; - public static final int FORMAT_ABBREV_RELATIVE = 0x40000; - public static final int FORMAT_ABBREV_ALL = 0x80000; /** * Creates an immutable ICU timezone backed by the specified libcore timezone data. At the time diff --git a/core/java/android/text/format/RelativeDateTimeFormatter.java b/core/java/android/text/format/RelativeDateTimeFormatter.java index c5bca172873a..9096469699c1 100644 --- a/core/java/android/text/format/RelativeDateTimeFormatter.java +++ b/core/java/android/text/format/RelativeDateTimeFormatter.java @@ -16,14 +16,14 @@ package android.text.format; -import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_ALL; -import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_MONTH; -import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_RELATIVE; -import static android.text.format.DateUtilsBridge.FORMAT_NO_YEAR; -import static android.text.format.DateUtilsBridge.FORMAT_NUMERIC_DATE; -import static android.text.format.DateUtilsBridge.FORMAT_SHOW_DATE; -import static android.text.format.DateUtilsBridge.FORMAT_SHOW_TIME; -import static android.text.format.DateUtilsBridge.FORMAT_SHOW_YEAR; +import static android.text.format.DateUtils.FORMAT_ABBREV_ALL; +import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; +import static android.text.format.DateUtils.FORMAT_ABBREV_RELATIVE; +import static android.text.format.DateUtils.FORMAT_NO_YEAR; +import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_TIME; +import static android.text.format.DateUtils.FORMAT_SHOW_YEAR; import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; diff --git a/core/java/android/view/ImeFocusController.java b/core/java/android/view/ImeFocusController.java index ad43f9556d8d..92772c1d7a44 100644 --- a/core/java/android/view/ImeFocusController.java +++ b/core/java/android/view/ImeFocusController.java @@ -125,10 +125,10 @@ public final class ImeFocusController { final View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView; onViewFocusChanged(viewForWindowFocus, true); - // Starting new input when the next focused view is same as served view but the - // editor is not aligned with the same editor or editor is inactive. - final boolean nextFocusIsServedView = mServedView != null && mServedView == focusedView; - if (nextFocusIsServedView && !immDelegate.isSameEditorAndAcceptingText(focusedView)) { + // Starting new input when the next focused view is same as served view but the currently + // active connection (if any) is not associated with it. + final boolean nextFocusIsServedView = mServedView == viewForWindowFocus; + if (nextFocusIsServedView && !immDelegate.hasActiveConnection(viewForWindowFocus)) { forceFocus = true; } @@ -254,7 +254,7 @@ public final class ImeFocusController { void setCurrentRootView(ViewRootImpl rootView); boolean isCurrentRootView(ViewRootImpl rootView); boolean isRestartOnNextWindowFocus(boolean reset); - boolean isSameEditorAndAcceptingText(View view); + boolean hasActiveConnection(View view); } public View getServedView() { diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java index 31da83ad5137..69220722fc05 100644 --- a/core/java/android/view/InsetsAnimationControlImpl.java +++ b/core/java/android/view/InsetsAnimationControlImpl.java @@ -308,7 +308,7 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll false /* isScreenRound */, false /* alwaysConsumeSystemBars */, null /* displayCutout */, LayoutParams.SOFT_INPUT_ADJUST_RESIZE /* legacySoftInputMode*/, - 0 /* legacySystemUiFlags */, typeSideMap) + 0 /* legacyWindowFlags */, 0 /* legacySystemUiFlags */, typeSideMap) .getInsets(mTypes); } diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index a679b3740fd9..c383bc7a4d70 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -501,6 +501,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation private PendingControlRequest mPendingImeControlRequest; private int mLastLegacySoftInputMode; + private int mLastLegacyWindowFlags; private int mLastLegacySystemUiFlags; private DisplayCutout mLastDisplayCutout; private boolean mStartingAnimation; @@ -569,8 +570,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation WindowInsets insets = state.calculateInsets(mFrame, mState /* ignoringVisibilityState*/, mLastInsets.isRound(), mLastInsets.shouldAlwaysConsumeSystemBars(), - mLastDisplayCutout, mLastLegacySoftInputMode, mLastLegacySystemUiFlags, - null /* typeSideMap */); + mLastDisplayCutout, mLastLegacySoftInputMode, mLastLegacyWindowFlags, + mLastLegacySystemUiFlags, null /* typeSideMap */); mHost.dispatchWindowInsetsAnimationProgress(insets, mUnmodifiableTmpRunningAnims); if (DEBUG) { for (WindowInsetsAnimation anim : mUnmodifiableTmpRunningAnims) { @@ -706,13 +707,14 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation @VisibleForTesting public WindowInsets calculateInsets(boolean isScreenRound, boolean alwaysConsumeSystemBars, DisplayCutout cutout, - int legacySoftInputMode, int legacySystemUiFlags) { + int legacySoftInputMode, int legacyWindowFlags, int legacySystemUiFlags) { mLastLegacySoftInputMode = legacySoftInputMode; + mLastLegacyWindowFlags = legacyWindowFlags; mLastLegacySystemUiFlags = legacySystemUiFlags; mLastDisplayCutout = cutout; mLastInsets = mState.calculateInsets(mFrame, null /* ignoringVisibilityState*/, isScreenRound, alwaysConsumeSystemBars, cutout, - legacySoftInputMode, legacySystemUiFlags, + legacySoftInputMode, legacyWindowFlags, legacySystemUiFlags, null /* typeSideMap */); return mLastInsets; } diff --git a/core/java/android/view/InsetsState.java b/core/java/android/view/InsetsState.java index 91e7591193f1..6b0b509932a8 100644 --- a/core/java/android/view/InsetsState.java +++ b/core/java/android/view/InsetsState.java @@ -22,13 +22,14 @@ import static android.view.ViewRootImpl.NEW_INSETS_MODE_IME; import static android.view.ViewRootImpl.NEW_INSETS_MODE_NONE; import static android.view.ViewRootImpl.sNewInsetsMode; import static android.view.WindowInsets.Type.MANDATORY_SYSTEM_GESTURES; -import static android.view.WindowInsets.Type.SIZE; import static android.view.WindowInsets.Type.SYSTEM_GESTURES; import static android.view.WindowInsets.Type.displayCutout; import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.indexOf; import static android.view.WindowInsets.Type.isVisibleInsetsType; +import static android.view.WindowInsets.Type.statusBars; import static android.view.WindowInsets.Type.systemBars; +import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; @@ -38,7 +39,6 @@ import android.graphics.Insets; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; -import android.util.ArrayMap; import android.util.ArraySet; import android.util.SparseIntArray; import android.view.WindowInsets.Type; @@ -171,7 +171,7 @@ public class InsetsState implements Parcelable { */ public WindowInsets calculateInsets(Rect frame, @Nullable InsetsState ignoringVisibilityState, boolean isScreenRound, boolean alwaysConsumeSystemBars, DisplayCutout cutout, - int legacySoftInputMode, int legacySystemUiFlags, + int legacySoftInputMode, int legacyWindowFlags, int legacySystemUiFlags, @Nullable @InternalInsetsSide SparseIntArray typeSideMap) { Insets[] typeInsetsMap = new Insets[Type.SIZE]; Insets[] typeMaxInsetsMap = new Insets[Type.SIZE]; @@ -218,10 +218,17 @@ public class InsetsState implements Parcelable { } } final int softInputAdjustMode = legacySoftInputMode & SOFT_INPUT_MASK_ADJUST; + + @InsetsType int compatInsetsTypes = systemBars() | displayCutout(); + if (softInputAdjustMode == SOFT_INPUT_ADJUST_RESIZE) { + compatInsetsTypes |= ime(); + } + if ((legacyWindowFlags & FLAG_FULLSCREEN) != 0) { + compatInsetsTypes &= ~statusBars(); + } + return new WindowInsets(typeInsetsMap, typeMaxInsetsMap, typeVisibilityMap, isScreenRound, - alwaysConsumeSystemBars, cutout, softInputAdjustMode == SOFT_INPUT_ADJUST_RESIZE - ? systemBars() | displayCutout() | ime() - : systemBars() | displayCutout(), + alwaysConsumeSystemBars, cutout, compatInsetsTypes, sNewInsetsMode == NEW_INSETS_MODE_FULL && (legacySystemUiFlags & SYSTEM_UI_FLAG_LAYOUT_STABLE) != 0); } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 2168fe331972..4e63a3392d48 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -3506,6 +3506,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * 1 PFLAG4_AUTOFILL_HIDE_HIGHLIGHT * 11 PFLAG4_SCROLL_CAPTURE_HINT_MASK * 1 PFLAG4_ALLOW_CLICK_WHEN_DISABLED + * 1 PFLAG4_DETACHED * |-------|-------|-------|-------| */ @@ -3567,6 +3568,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ private static final int PFLAG4_ALLOW_CLICK_WHEN_DISABLED = 0x000001000; + /** + * Indicates if the view is just detached. + */ + private static final int PFLAG4_DETACHED = 0x000002000; + /* End of masks for mPrivateFlags4 */ /** @hide */ @@ -4323,9 +4329,46 @@ public class View implements Drawable.Callback, KeyEvent.Callback, equals = STATUS_BAR_TRANSPARENT, name = "STATUS_BAR_TRANSPARENT") }, formatToHexString = true) + @SystemUiVisibility int mSystemUiVisibility; /** + * @hide + */ + @IntDef(flag = true, prefix = "", value = { + SYSTEM_UI_FLAG_LOW_PROFILE, + SYSTEM_UI_FLAG_HIDE_NAVIGATION, + SYSTEM_UI_FLAG_FULLSCREEN, + SYSTEM_UI_FLAG_LAYOUT_STABLE, + SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION, + SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN, + SYSTEM_UI_FLAG_IMMERSIVE, + SYSTEM_UI_FLAG_IMMERSIVE_STICKY, + SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, + SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR, + STATUS_BAR_DISABLE_EXPAND, + STATUS_BAR_DISABLE_NOTIFICATION_ICONS, + STATUS_BAR_DISABLE_NOTIFICATION_ALERTS, + STATUS_BAR_DISABLE_NOTIFICATION_TICKER, + STATUS_BAR_DISABLE_SYSTEM_INFO, + STATUS_BAR_DISABLE_HOME, + STATUS_BAR_DISABLE_BACK, + STATUS_BAR_DISABLE_CLOCK, + STATUS_BAR_DISABLE_RECENT, + STATUS_BAR_DISABLE_SEARCH, + STATUS_BAR_TRANSIENT, + NAVIGATION_BAR_TRANSIENT, + STATUS_BAR_UNHIDE, + NAVIGATION_BAR_UNHIDE, + STATUS_BAR_TRANSLUCENT, + NAVIGATION_BAR_TRANSLUCENT, + NAVIGATION_BAR_TRANSPARENT, + STATUS_BAR_TRANSPARENT, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface SystemUiVisibility {} + + /** * Reference count for transient state. * @see #setHasTransientState(boolean) */ @@ -8330,7 +8373,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); boolean isWindowDisappearedEvent = isWindowStateChanged && ((event.getContentChangeTypes() & AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_DISAPPEARED) != 0); - if (!isShown() && !isWindowDisappearedEvent) { + boolean detached = detached(); + if (!isShown() && !isWindowDisappearedEvent && !detached) { return; } onInitializeAccessibilityEvent(event); @@ -8341,6 +8385,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, SendAccessibilityEventThrottle throttle = getThrottleForAccessibilityEvent(event); if (throttle != null) { throttle.post(event); + } else if (!isWindowDisappearedEvent && detached) { + // Views could be attached soon later. Accessibility events during this temporarily + // detached period should be sent too. + postDelayed(() -> { + if (AccessibilityManager.getInstance(mContext).isEnabled() && isShown()) { + requestParentSendAccessibilityEvent(event); + } + }, ViewConfiguration.getSendRecurringAccessibilityEventsInterval()); } else { requestParentSendAccessibilityEvent(event); } @@ -11126,6 +11178,26 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return false; } + private boolean detached() { + View current = this; + //noinspection ConstantConditions + do { + if ((current.mPrivateFlags4 & PFLAG4_DETACHED) != 0) { + return true; + } + ViewParent parent = current.mParent; + if (parent == null) { + return false; + } + if (!(parent instanceof View)) { + return false; + } + current = (View) parent; + } while (current != null); + + return false; + } + /** * Called by the view hierarchy when the content insets for a window have * changed, to allow it to adjust its content to fit within those windows. @@ -29460,7 +29532,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @Override public void run() { - if (AccessibilityManager.getInstance(mContext).isEnabled()) { + if (AccessibilityManager.getInstance(mContext).isEnabled() && isShown()) { requestParentSendAccessibilityEvent(mAccessibilityEvent); } reset(); @@ -30449,4 +30521,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } } } + + /** + * Set the view to be detached or not detached. + * + * @param detached Whether the view is detached. + * + * @hide + */ + protected void setDetached(boolean detached) { + if (detached) { + mPrivateFlags4 |= PFLAG4_DETACHED; + } else { + mPrivateFlags4 &= ~PFLAG4_DETACHED; + } + } } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 05b75e4f0d41..4a37f8005c65 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5811,6 +5811,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager child.mPrivateFlags = (child.mPrivateFlags & ~PFLAG_DIRTY_MASK & ~PFLAG_DRAWING_CACHE_VALID) | PFLAG_DRAWN | PFLAG_INVALIDATED; + child.setDetached(false); this.mPrivateFlags |= PFLAG_INVALIDATED; if (child.hasFocus()) { @@ -5839,6 +5840,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @see #removeDetachedView(View, boolean) */ protected void detachViewFromParent(View child) { + child.setDetached(true); removeFromArray(indexOfChild(child)); } @@ -5860,6 +5862,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @see #removeDetachedView(View, boolean) */ protected void detachViewFromParent(int index) { + if (index >= 0 && index < mChildrenCount) { + mChildren[index].setDetached(true); + } removeFromArray(index); } @@ -5882,6 +5887,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @see #removeDetachedView(View, boolean) */ protected void detachViewsFromParent(int start, int count) { + start = Math.max(0, start); + final int end = Math.min(mChildrenCount, start + count); + for (int i = start; i < end; i++) { + mChildren[i].setDetached(true); + } removeFromArray(start, count); } @@ -5911,6 +5921,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager for (int i = count - 1; i >= 0; i--) { children[i].mParent = null; + children[i].setDetached(true); children[i] = null; } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index f2cec250d47f..fe6f33da6d2a 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2257,7 +2257,8 @@ public final class ViewRootImpl implements ViewParent, mLastWindowInsets = mInsetsController.calculateInsets( mContext.getResources().getConfiguration().isScreenRound(), mAttachInfo.mAlwaysConsumeSystemBars, mPendingDisplayCutout.get(), - mWindowAttributes.softInputMode, (mWindowAttributes.systemUiVisibility + mWindowAttributes.softInputMode, mWindowAttributes.flags, + (mWindowAttributes.systemUiVisibility | mWindowAttributes.subtreeSystemUiVisibility)); Rect visibleInsets = mInsetsController.calculateVisibleInsets( diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index 4d6b72f96aab..5e94758b003c 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -17,7 +17,6 @@ package android.view; -import static android.view.WindowInsets.Type.CAPTION_BAR; import static android.view.WindowInsets.Type.DISPLAY_CUTOUT; import static android.view.WindowInsets.Type.FIRST; import static android.view.WindowInsets.Type.IME; @@ -95,7 +94,7 @@ public final class WindowInsets { private final boolean mStableInsetsConsumed; private final boolean mDisplayCutoutConsumed; - private final int mCompatInsetTypes; + private final int mCompatInsetsTypes; private final boolean mCompatIgnoreVisibility; /** @@ -150,8 +149,8 @@ public final class WindowInsets { @Nullable Insets[] typeMaxInsetsMap, boolean[] typeVisibilityMap, boolean isRound, - boolean alwaysConsumeSystemBars, DisplayCutout displayCutout, int compatInsetTypes, - boolean compatIgnoreVisibility) { + boolean alwaysConsumeSystemBars, DisplayCutout displayCutout, + @InsetsType int compatInsetsTypes, boolean compatIgnoreVisibility) { mSystemWindowInsetsConsumed = typeInsetsMap == null; mTypeInsetsMap = mSystemWindowInsetsConsumed ? new Insets[SIZE] @@ -165,7 +164,7 @@ public final class WindowInsets { mTypeVisibilityMap = typeVisibilityMap; mIsRound = isRound; mAlwaysConsumeSystemBars = alwaysConsumeSystemBars; - mCompatInsetTypes = compatInsetTypes; + mCompatInsetsTypes = compatInsetsTypes; mCompatIgnoreVisibility = compatIgnoreVisibility; mDisplayCutoutConsumed = displayCutout == null; @@ -183,7 +182,7 @@ public final class WindowInsets { src.mStableInsetsConsumed ? null : src.mTypeMaxInsetsMap, src.mTypeVisibilityMap, src.mIsRound, src.mAlwaysConsumeSystemBars, displayCutoutCopyConstructorArgument(src), - src.mCompatInsetTypes, + src.mCompatInsetsTypes, src.mCompatIgnoreVisibility); } @@ -310,11 +309,11 @@ public final class WindowInsets { @NonNull public Insets getSystemWindowInsets() { Insets result = mCompatIgnoreVisibility - ? getInsetsIgnoringVisibility(mCompatInsetTypes & ~ime()) - : getInsets(mCompatInsetTypes); + ? getInsetsIgnoringVisibility(mCompatInsetsTypes & ~ime()) + : getInsets(mCompatInsetsTypes); // We can't query max insets for IME, so we need to add it manually after. - if ((mCompatInsetTypes & ime()) != 0 && mCompatIgnoreVisibility) { + if ((mCompatInsetsTypes & ime()) != 0 && mCompatIgnoreVisibility) { result = Insets.max(result, getInsets(ime())); } return result; @@ -503,7 +502,7 @@ public final class WindowInsets { mTypeVisibilityMap, mIsRound, mAlwaysConsumeSystemBars, null /* displayCutout */, - mCompatInsetTypes, mCompatIgnoreVisibility); + mCompatInsetsTypes, mCompatIgnoreVisibility); } @@ -554,7 +553,7 @@ public final class WindowInsets { mTypeVisibilityMap, mIsRound, mAlwaysConsumeSystemBars, displayCutoutCopyConstructorArgument(this), - mCompatInsetTypes, mCompatIgnoreVisibility); + mCompatInsetsTypes, mCompatIgnoreVisibility); } // TODO(b/119190588): replace @code with @link below @@ -627,7 +626,7 @@ public final class WindowInsets { @Deprecated @NonNull public Insets getStableInsets() { - return getInsets(mTypeMaxInsetsMap, mCompatInsetTypes); + return getInsets(mTypeMaxInsetsMap, mCompatInsetsTypes); } /** @@ -939,7 +938,7 @@ public final class WindowInsets { : mDisplayCutout == null ? DisplayCutout.NO_CUTOUT : mDisplayCutout.inset(left, top, right, bottom), - mCompatInsetTypes, mCompatIgnoreVisibility); + mCompatInsetsTypes, mCompatIgnoreVisibility); } @Override diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 795e8f304f71..1d54d9251abb 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1229,32 +1229,54 @@ public interface WindowManager extends ViewManager { * @hide */ @IntDef(prefix = "TYPE_", value = { - TYPE_ACCESSIBILITY_OVERLAY, + TYPE_BASE_APPLICATION, TYPE_APPLICATION, - TYPE_APPLICATION_ATTACHED_DIALOG, - TYPE_APPLICATION_MEDIA, - TYPE_APPLICATION_OVERLAY, - TYPE_APPLICATION_PANEL, TYPE_APPLICATION_STARTING, - TYPE_APPLICATION_SUB_PANEL, - TYPE_BASE_APPLICATION, TYPE_DRAWN_APPLICATION, - TYPE_INPUT_METHOD, - TYPE_INPUT_METHOD_DIALOG, - TYPE_KEYGUARD, - TYPE_KEYGUARD_DIALOG, - TYPE_PHONE, - TYPE_PRIORITY_PHONE, - TYPE_PRIVATE_PRESENTATION, - TYPE_SEARCH_BAR, + TYPE_APPLICATION_PANEL, + TYPE_APPLICATION_MEDIA, + TYPE_APPLICATION_SUB_PANEL, + TYPE_APPLICATION_ATTACHED_DIALOG, + TYPE_APPLICATION_MEDIA_OVERLAY, + TYPE_APPLICATION_ABOVE_SUB_PANEL, TYPE_STATUS_BAR, - TYPE_STATUS_BAR_PANEL, + TYPE_SEARCH_BAR, + TYPE_PHONE, TYPE_SYSTEM_ALERT, + TYPE_KEYGUARD, + TYPE_TOAST, + TYPE_SYSTEM_OVERLAY, + TYPE_PRIORITY_PHONE, TYPE_SYSTEM_DIALOG, + TYPE_KEYGUARD_DIALOG, TYPE_SYSTEM_ERROR, - TYPE_SYSTEM_OVERLAY, - TYPE_TOAST, + TYPE_INPUT_METHOD, + TYPE_INPUT_METHOD_DIALOG, TYPE_WALLPAPER, + TYPE_STATUS_BAR_PANEL, + TYPE_SECURE_SYSTEM_OVERLAY, + TYPE_DRAG, + TYPE_STATUS_BAR_SUB_PANEL, + TYPE_POINTER, + TYPE_NAVIGATION_BAR, + TYPE_VOLUME_OVERLAY, + TYPE_BOOT_PROGRESS, + TYPE_INPUT_CONSUMER, + TYPE_NAVIGATION_BAR_PANEL, + TYPE_DISPLAY_OVERLAY, + TYPE_MAGNIFICATION_OVERLAY, + TYPE_PRIVATE_PRESENTATION, + TYPE_VOICE_INTERACTION, + TYPE_ACCESSIBILITY_OVERLAY, + TYPE_VOICE_INTERACTION_STARTING, + TYPE_DOCK_DIVIDER, + TYPE_QS_DIALOG, + TYPE_SCREENSHOT, + TYPE_PRESENTATION, + TYPE_APPLICATION_OVERLAY, + TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY, + TYPE_NOTIFICATION_SHADE, + TYPE_STATUS_BAR_ADDITIONAL }) @Retention(RetentionPolicy.SOURCE) public @interface WindowType {} @@ -1715,6 +1737,46 @@ public interface WindowManager extends ViewManager { public static final int FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS = 0x80000000; /** + * @hide + */ + @IntDef(flag = true, prefix = "FLAG_", value = { + FLAG_ALLOW_LOCK_WHILE_SCREEN_ON, + FLAG_DIM_BEHIND, + FLAG_BLUR_BEHIND, + FLAG_NOT_FOCUSABLE, + FLAG_NOT_TOUCHABLE, + FLAG_NOT_TOUCH_MODAL, + FLAG_TOUCHABLE_WHEN_WAKING, + FLAG_KEEP_SCREEN_ON, + FLAG_LAYOUT_IN_SCREEN, + FLAG_LAYOUT_NO_LIMITS, + FLAG_FULLSCREEN, + FLAG_FORCE_NOT_FULLSCREEN, + FLAG_DITHER, + FLAG_SECURE, + FLAG_SCALED, + FLAG_IGNORE_CHEEK_PRESSES, + FLAG_LAYOUT_INSET_DECOR, + FLAG_ALT_FOCUSABLE_IM, + FLAG_WATCH_OUTSIDE_TOUCH, + FLAG_SHOW_WHEN_LOCKED, + FLAG_SHOW_WALLPAPER, + FLAG_TURN_SCREEN_ON, + FLAG_DISMISS_KEYGUARD, + FLAG_SPLIT_TOUCH, + FLAG_HARDWARE_ACCELERATED, + FLAG_LAYOUT_IN_OVERSCAN, + FLAG_TRANSLUCENT_STATUS, + FLAG_TRANSLUCENT_NAVIGATION, + FLAG_LOCAL_FOCUS_MODE, + FLAG_SLIPPERY, + FLAG_LAYOUT_ATTACHED_IN_DECOR, + FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, + }) + @Retention(RetentionPolicy.SOURCE) + public @interface Flags {} + + /** * Various behavioral options/flags. Default is none. * * @see #FLAG_ALLOW_LOCK_WHILE_SCREEN_ON @@ -1809,6 +1871,7 @@ public interface WindowManager extends ViewManager { @ViewDebug.FlagToString(mask = FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, equals = FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, name = "DRAWS_SYSTEM_BAR_BACKGROUNDS") }, formatToHexString = true) + @Flags public int flags; /** @@ -2027,6 +2090,7 @@ public interface WindowManager extends ViewManager { * @hide */ public static final int PRIVATE_FLAG_TRUSTED_OVERLAY = 0x20000000; + /** * An internal annotation for flags that can be specified to {@link #softInputMode}. * @@ -2041,6 +2105,38 @@ public interface WindowManager extends ViewManager { public @interface SystemFlags {} /** + * @hide + */ + @IntDef(flag = true, prefix="PRIVATE_FLAG_", value = { + PRIVATE_FLAG_FAKE_HARDWARE_ACCELERATED, + PRIVATE_FLAG_FORCE_HARDWARE_ACCELERATED, + PRIVATE_FLAG_WANTS_OFFSET_NOTIFICATIONS, + SYSTEM_FLAG_SHOW_FOR_ALL_USERS, + PRIVATE_FLAG_NO_MOVE_ANIMATION, + PRIVATE_FLAG_COMPATIBLE_WINDOW, + PRIVATE_FLAG_SYSTEM_ERROR, + PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS, + PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR, + PRIVATE_FLAG_PRESERVE_GEOMETRY, + PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY, + PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH, + PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME, + PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS, + PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE, + SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS, + PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY, + PRIVATE_FLAG_IS_SCREEN_DECOR, + PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION, + PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC, + PRIVATE_FLAG_USE_BLAST, + PRIVATE_FLAG_APPEARANCE_CONTROLLED, + PRIVATE_FLAG_BEHAVIOR_CONTROLLED, + PRIVATE_FLAG_FIT_INSETS_CONTROLLED, + PRIVATE_FLAG_TRUSTED_OVERLAY, + }) + public @interface PrivateFlags {} + + /** * Control flags that are private to the platform. * @hide */ @@ -2127,6 +2223,10 @@ public interface WindowManager extends ViewManager { equals = PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC, name = "COLOR_SPACE_AGNOSTIC"), @ViewDebug.FlagToString( + mask = PRIVATE_FLAG_USE_BLAST, + equals = PRIVATE_FLAG_USE_BLAST, + name = "USE_BLAST"), + @ViewDebug.FlagToString( mask = PRIVATE_FLAG_APPEARANCE_CONTROLLED, equals = PRIVATE_FLAG_APPEARANCE_CONTROLLED, name = "APPEARANCE_CONTROLLED"), @@ -2143,6 +2243,7 @@ public interface WindowManager extends ViewManager { equals = PRIVATE_FLAG_TRUSTED_OVERLAY, name = "TRUSTED_OVERLAY") }) + @PrivateFlags @TestApi public int privateFlags; diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index 28a18da37b3e..2fe7c021bb21 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -276,7 +276,7 @@ public final class WindowManagerImpl implements WindowManager { if (ViewRootImpl.sNewInsetsMode == NEW_INSETS_MODE_FULL) { return insetsState.calculateInsets(bounds, null /* ignoringVisibilityState*/, isScreenRound, alwaysConsumeSystemBars, displayCutout.get(), - SOFT_INPUT_ADJUST_NOTHING, + SOFT_INPUT_ADJUST_NOTHING, attrs.flags, SYSTEM_UI_FLAG_VISIBLE, null /* typeSideMap */); } else { return new WindowInsets.Builder() diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index 492ab6f8a3d5..8c355202b63f 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -49,6 +49,13 @@ public interface WindowManagerPolicyConstants { int PRESENCE_INTERNAL = 1 << 0; int PRESENCE_EXTERNAL = 1 << 1; + // Alternate bars position values + int ALT_BAR_UNKNOWN = -1; + int ALT_BAR_LEFT = 1 << 0; + int ALT_BAR_RIGHT = 1 << 1; + int ALT_BAR_BOTTOM = 1 << 2; + int ALT_BAR_TOP = 1 << 3; + // Navigation bar position values int NAV_BAR_INVALID = -1; int NAV_BAR_LEFT = 1 << 0; diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index 3f5ef5a2651d..64c59e54e85b 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -43,8 +43,7 @@ import java.security.SecureRandom; import java.util.ArrayList; /** - * Session used when the Android a system-provided content capture service - * about events associated with views. + * Session used when notifying the Android system about events associated with views. */ public abstract class ContentCaptureSession implements AutoCloseable { diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java index 07fef76961f9..c5f2299e4f83 100644 --- a/core/java/android/view/inputmethod/EditorInfo.java +++ b/core/java/android/view/inputmethod/EditorInfo.java @@ -27,6 +27,7 @@ import android.os.LocaleList; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; +import android.text.Editable; import android.text.InputType; import android.text.TextUtils; import android.util.Printer; @@ -567,7 +568,8 @@ public class EditorInfo implements InputType, Parcelable { * editor wants to trim out the first 10 chars, subTextStart should be 10. */ public void setInitialSurroundingSubText(@NonNull CharSequence subText, int subTextStart) { - Objects.requireNonNull(subText); + CharSequence newSubText = Editable.Factory.getInstance().newEditable(subText); + Objects.requireNonNull(newSubText); // Swap selection start and end if necessary. final int subTextSelStart = initialSelStart > initialSelEnd @@ -575,7 +577,7 @@ public class EditorInfo implements InputType, Parcelable { final int subTextSelEnd = initialSelStart > initialSelEnd ? initialSelStart - subTextStart : initialSelEnd - subTextStart; - final int subTextLength = subText.length(); + final int subTextLength = newSubText.length(); // Unknown or invalid selection. if (subTextStart < 0 || subTextSelStart < 0 || subTextSelEnd > subTextLength) { mInitialSurroundingText = new InitialSurroundingText(); @@ -589,12 +591,12 @@ public class EditorInfo implements InputType, Parcelable { } if (subTextLength <= MEMORY_EFFICIENT_TEXT_LENGTH) { - mInitialSurroundingText = new InitialSurroundingText(subText, subTextSelStart, + mInitialSurroundingText = new InitialSurroundingText(newSubText, subTextSelStart, subTextSelEnd); return; } - trimLongSurroundingText(subText, subTextSelStart, subTextSelEnd); + trimLongSurroundingText(newSubText, subTextSelStart, subTextSelEnd); } /** diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 599a7c24e8aa..793d94097862 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -19,8 +19,8 @@ package android.view.inputmethod; import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; -import static com.android.internal.inputmethod.StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR; -import static com.android.internal.inputmethod.StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR; +import static com.android.internal.inputmethod.StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION; +import static com.android.internal.inputmethod.StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION; import android.annotation.DrawableRes; import android.annotation.NonNull; @@ -89,6 +89,7 @@ import com.android.internal.view.InputBindResult; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.lang.ref.WeakReference; import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.Collections; @@ -610,14 +611,13 @@ public final class InputMethodManager { @Override public void startInputAsyncOnWindowFocusGain(View focusedView, @SoftInputModeFlags int softInputMode, int windowFlags, boolean forceNewFocus) { - final boolean forceNewFocus1 = forceNewFocus; final int startInputFlags = getStartInputFlags(focusedView, 0); final ImeFocusController controller = getFocusController(); if (controller == null) { return; } - if (controller.checkFocus(forceNewFocus1, false)) { + if (controller.checkFocus(forceNewFocus, false)) { // We need to restart input on the current focus view. This // should be done in conjunction with telling the system service // about the window gaining focus, to help make the transition @@ -633,15 +633,15 @@ public final class InputMethodManager { // we'll just do a window focus gain and call it a day. try { View servedView = controller.getServedView(); - boolean nextFocusSameEditor = servedView != null && servedView == focusedView - && isSameEditorAndAcceptingText(focusedView); + boolean nextFocusHasConnection = servedView != null && servedView == focusedView + && hasActiveConnection(focusedView); if (DEBUG) { Log.v(TAG, "Reporting focus gain, without startInput" - + ", nextFocusIsServedView=" + nextFocusSameEditor); + + ", nextFocusIsServedView=" + nextFocusHasConnection); } final int startInputReason = - nextFocusSameEditor ? WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR - : WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR; + nextFocusHasConnection ? WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION + : WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION; mService.startInputOrWindowGainedFocus( startInputReason, mClient, focusedView.getWindowToken(), startInputFlags, softInputMode, @@ -701,33 +701,24 @@ public final class InputMethodManager { } /** - * For {@link ImeFocusController} to check if the given focused view aligns with the same - * editor and the editor is active to accept the text input. + * Checks whether the active input connection (if any) is for the given view. * - * TODO(b/160968797): Remove this method and move mCurrentTextBoxAttritube to + * TODO(b/160968797): Remove this method and move mServedInputConnectionWrapper to * ImeFocusController. - * In the long-term, we should make mCurrentTextBoxAtrtribue as per-window base instance, - * so that we we can directly check if the current focused view aligned with the same editor - * in the window without using this checking. * - * Note that this method is only use for fixing start new input may ignored issue + * Note that this method is only intended for restarting input after focus gain * (e.g. b/160391516), DO NOT leverage this method to do another check. */ - public boolean isSameEditorAndAcceptingText(View view) { + @Override + public boolean hasActiveConnection(View view) { synchronized (mH) { - if (!hasServedByInputMethodLocked(view) || mCurrentTextBoxAttribute == null) { + if (!hasServedByInputMethodLocked(view)) { return false; } - final EditorInfo ic = mCurrentTextBoxAttribute; - // This sameEditor checking is based on using object hash comparison to check if - // some fields of the current EditorInfo (e.g. autoFillId, OpPackageName) the - // hash code is same as the given focused view. - final boolean sameEditor = view.onCheckIsTextEditor() && view.getId() == ic.fieldId - && view.getAutofillId() == ic.autofillId - && view.getContext().getOpPackageName() == ic.packageName; - return sameEditor && mServedInputConnectionWrapper != null - && mServedInputConnectionWrapper.isActive(); + return mServedInputConnectionWrapper != null + && mServedInputConnectionWrapper.isActive() + && mServedInputConnectionWrapper.mServedView.get() == view; } } } @@ -980,11 +971,13 @@ public final class InputMethodManager { private static class ControlledInputConnectionWrapper extends IInputConnectionWrapper { private final InputMethodManager mParentInputMethodManager; + private final WeakReference<View> mServedView; - public ControlledInputConnectionWrapper(final Looper mainLooper, final InputConnection conn, - final InputMethodManager inputMethodManager) { + ControlledInputConnectionWrapper(Looper mainLooper, InputConnection conn, + InputMethodManager inputMethodManager, View servedView) { super(mainLooper, conn); mParentInputMethodManager = inputMethodManager; + mServedView = new WeakReference<>(servedView); } @Override @@ -1007,6 +1000,7 @@ public final class InputMethodManager { + "connection=" + getInputConnection() + " finished=" + isFinished() + " mParentInputMethodManager.mActive=" + mParentInputMethodManager.mActive + + " mServedView=" + mServedView.get() + "}"; } } @@ -1187,7 +1181,8 @@ public final class InputMethodManager { mMainLooper = looper; mH = new H(looper); mDisplayId = displayId; - mIInputContext = new ControlledInputConnectionWrapper(looper, mDummyInputConnection, this); + mIInputContext = new ControlledInputConnectionWrapper(looper, mDummyInputConnection, this, + null); } /** @@ -1970,7 +1965,7 @@ public final class InputMethodManager { icHandler = ic.getHandler(); } servedContext = new ControlledInputConnectionWrapper( - icHandler != null ? icHandler.getLooper() : vh.getLooper(), ic, this); + icHandler != null ? icHandler.getLooper() : vh.getLooper(), ic, this, view); } else { servedContext = null; missingMethodFlags = 0; diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java index 5820f4bdafad..135ff9fcd989 100644 --- a/core/java/android/widget/CompoundButton.java +++ b/core/java/android/widget/CompoundButton.java @@ -183,14 +183,14 @@ public abstract class CompoundButton extends Button implements Checkable { public void setStateDescription(@Nullable CharSequence stateDescription) { mCustomStateDescription = stateDescription; if (stateDescription == null) { - setDefaultStateDescritption(); + setDefaultStateDescription(); } else { super.setStateDescription(stateDescription); } } /** @hide **/ - protected void setDefaultStateDescritption() { + protected void setDefaultStateDescription() { if (mCustomStateDescription == null) { super.setStateDescription(getButtonStateDescription()); } @@ -210,6 +210,8 @@ public abstract class CompoundButton extends Button implements Checkable { // Avoid infinite recursions if setChecked() is called from a listener if (mBroadcasting) { + // setStateDescription will not send out event if the description is unchanged. + setDefaultStateDescription(); return; } @@ -228,7 +230,7 @@ public abstract class CompoundButton extends Button implements Checkable { mBroadcasting = false; } // setStateDescription will not send out event if the description is unchanged. - setDefaultStateDescritption(); + setDefaultStateDescription(); } /** diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 4b32e10d083b..35605c4c6f6e 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -69,6 +69,7 @@ import com.android.internal.R; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Locale; /** * <p> @@ -249,6 +250,9 @@ public class ProgressBar extends View { private ObjectAnimator mLastProgressAnimator; + private NumberFormat mPercentFormat; + private Locale mCachedLocale; + /** * Create a new progress bar with range 0...100 and initial progress of 0. * @param context the application environment @@ -1591,8 +1595,15 @@ public class ProgressBar extends View { * @return state description based on progress */ private CharSequence formatStateDescription(int progress) { - return NumberFormat.getPercentInstance(mContext.getResources().getConfiguration().locale) - .format(getPercent(progress)); + // Cache the locale-appropriate NumberFormat. Configuration locale is guaranteed + // non-null, so the first time this is called we will always get the appropriate + // NumberFormat, then never regenerate it unless the locale changes on the fly. + final Locale curLocale = mContext.getResources().getConfiguration().getLocales().get(0); + if (!curLocale.equals(mCachedLocale)) { + mCachedLocale = curLocale; + mPercentFormat = NumberFormat.getPercentInstance(curLocale); + } + return mPercentFormat.format(getPercent(progress)); } /** diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index e1fd77624a29..5bca56f14add 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -311,7 +311,7 @@ public class Switch extends CompoundButton { refreshDrawableState(); // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); setChecked(isChecked()); } @@ -856,7 +856,7 @@ public class Switch extends CompoundButton { requestLayout(); // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); } /** @@ -879,7 +879,7 @@ public class Switch extends CompoundButton { requestLayout(); // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); } /** diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index eaa4c573b0e4..6f14dfb89e6b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -11003,17 +11003,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * not among the handles. */ boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) { + boolean res = true; if (mPrimePointerId == NO_POINTER_ID) { mPrimePointerId = event.getPointerId(0); mIsPrimePointerFromHandleView = fromHandleView; } else if (mPrimePointerId != event.getPointerId(0)) { - return mIsPrimePointerFromHandleView && fromHandleView; + res = mIsPrimePointerFromHandleView && fromHandleView; } if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) { mPrimePointerId = -1; } - return true; + return res; } @Override diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java index 59e0c16cde37..24061a2ab05b 100644 --- a/core/java/android/widget/ToggleButton.java +++ b/core/java/android/widget/ToggleButton.java @@ -60,7 +60,7 @@ public class ToggleButton extends CompoundButton { syncTextState(); // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); a.recycle(); } @@ -111,7 +111,7 @@ public class ToggleButton extends CompoundButton { mTextOn = textOn; // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); } /** @@ -133,7 +133,7 @@ public class ToggleButton extends CompoundButton { mTextOff = textOff; // Default state is derived from on/off-text, so state has to be updated when on/off-text // are updated. - setDefaultStateDescritption(); + setDefaultStateDescription(); } /** diff --git a/core/java/android/window/DisplayAreaOrganizer.java b/core/java/android/window/DisplayAreaOrganizer.java index 3daf6d371450..f035d36a0f71 100644 --- a/core/java/android/window/DisplayAreaOrganizer.java +++ b/core/java/android/window/DisplayAreaOrganizer.java @@ -68,6 +68,14 @@ public class DisplayAreaOrganizer extends WindowOrganizer { public static final int FEATURE_WINDOWED_MAGNIFICATION = FEATURE_SYSTEM_FIRST + 4; /** + * Display area that can be magnified in + * {@link Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN}. This is different from + * {@link #FEATURE_WINDOWED_MAGNIFICATION} that the whole display will be magnified. + * @hide + */ + public static final int FEATURE_FULLSCREEN_MAGNIFICATION = FEATURE_SYSTEM_FIRST + 5; + + /** * The last boundary of display area for system features */ public static final int FEATURE_SYSTEM_LAST = 10_000; diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index fbf050ad08f6..3a89dcd96487 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -3134,6 +3134,7 @@ public class ChooserActivity extends ResolverActivity implements // ends up disabled. That's because at some point the old tab's vertical scrolling is // disabled and the new tab's is enabled. For context, see b/159997845 setVerticalScrollEnabled(true); + mResolverDrawerLayout.scrollNestedScrollableChildBackToTop(); } @Override diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 233231cfcfdf..c3b570331671 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1202,7 +1202,7 @@ public class ResolverActivity extends Activity implements final PackageManager pm = getPackageManager(); // Set the preferred Activity - pm.addPreferredActivity(filter, bestMatch, set, intent.getComponent()); + pm.addUniquePreferredActivity(filter, bestMatch, set, intent.getComponent()); if (ri.handleAllWebDataURI) { // Set default Browser if needed diff --git a/core/java/com/android/internal/inputmethod/InputMethodDebug.java b/core/java/com/android/internal/inputmethod/InputMethodDebug.java index 085cdfcf9462..37f68233db53 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodDebug.java +++ b/core/java/com/android/internal/inputmethod/InputMethodDebug.java @@ -46,10 +46,10 @@ public final class InputMethodDebug { return "UNSPECIFIED"; case StartInputReason.WINDOW_FOCUS_GAIN: return "WINDOW_FOCUS_GAIN"; - case StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR: - return "WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR"; - case StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR: - return "WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR"; + case StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION: + return "WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION"; + case StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION: + return "WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION"; case StartInputReason.APP_CALLED_RESTART_INPUT_API: return "APP_CALLED_RESTART_INPUT_API"; case StartInputReason.CHECK_FOCUS: diff --git a/core/java/com/android/internal/inputmethod/StartInputReason.java b/core/java/com/android/internal/inputmethod/StartInputReason.java index 946ce858c12d..2ba708dd9312 100644 --- a/core/java/com/android/internal/inputmethod/StartInputReason.java +++ b/core/java/com/android/internal/inputmethod/StartInputReason.java @@ -30,8 +30,8 @@ import java.lang.annotation.Retention; @IntDef(value = { StartInputReason.UNSPECIFIED, StartInputReason.WINDOW_FOCUS_GAIN, - StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR, - StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR, + StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION, + StartInputReason.WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION, StartInputReason.APP_CALLED_RESTART_INPUT_API, StartInputReason.CHECK_FOCUS, StartInputReason.BOUND_TO_IMMS, @@ -54,13 +54,13 @@ public @interface StartInputReason { * view and its input connection remains. {@link android.view.inputmethod.InputMethodManager} * just reports this window focus change event to sync IME input target for system. */ - int WINDOW_FOCUS_GAIN_REPORT_WITH_SAME_EDITOR = 2; + int WINDOW_FOCUS_GAIN_REPORT_WITH_CONNECTION = 2; /** * {@link android.view.Window} gained focus but there is no {@link android.view.View} that is * eligible to have IME focus. {@link android.view.inputmethod.InputMethodManager} just reports * this window focus change event for logging. */ - int WINDOW_FOCUS_GAIN_REPORT_WITHOUT_EDITOR = 3; + int WINDOW_FOCUS_GAIN_REPORT_WITHOUT_CONNECTION = 3; /** * {@link android.view.inputmethod.InputMethodManager#restartInput(android.view.View)} is * either explicitly called by the application or indirectly called by some Framework class diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index 8ea5aa815a1c..b4727499d8ef 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -21,6 +21,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.net.Ikev2VpnProfile; import android.net.PlatformVpnProfile; import android.net.ProxyInfo; +import android.net.Uri; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -287,7 +288,7 @@ public final class VpnProfile implements Cloneable, Parcelable { profile.proxy = new ProxyInfo(host, port.isEmpty() ? 0 : Integer.parseInt(port), exclList); } else if (!pacFileUrl.isEmpty()) { - profile.proxy = new ProxyInfo(pacFileUrl); + profile.proxy = new ProxyInfo(Uri.parse(pacFileUrl)); } } // else profile.proxy = null diff --git a/core/java/com/android/internal/os/IDropBoxManagerService.aidl b/core/java/com/android/internal/os/IDropBoxManagerService.aidl index 5e60394e5675..9141719d7a35 100644 --- a/core/java/com/android/internal/os/IDropBoxManagerService.aidl +++ b/core/java/com/android/internal/os/IDropBoxManagerService.aidl @@ -37,6 +37,10 @@ interface IDropBoxManagerService { boolean isTagEnabled(String tag); /** @see DropBoxManager#getNextEntry */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk=30, + publicAlternatives="Use {@link android.os.DropBoxManager#getNextEntry} instead") DropBoxManager.Entry getNextEntry(String tag, long millis, String packageName); + + DropBoxManager.Entry getNextEntryWithAttribution(String tag, long millis, String packageName, + String attributionTag); } diff --git a/core/java/com/android/internal/widget/PointerLocationView.java b/core/java/com/android/internal/widget/PointerLocationView.java index dc8d57ab709e..a2de0aff5dfa 100644 --- a/core/java/com/android/internal/widget/PointerLocationView.java +++ b/core/java/com/android/internal/widget/PointerLocationView.java @@ -371,7 +371,7 @@ public class PointerLocationView extends View implements InputDeviceListener, } if (haveLast) { canvas.drawLine(lastX, lastY, x, y, mPathPaint); - final Paint paint = ps.mTraceCurrent[i] ? mCurrentPointPaint : mPaint; + final Paint paint = ps.mTraceCurrent[i - 1] ? mCurrentPointPaint : mPaint; canvas.drawPoint(lastX, lastY, paint); drawn = true; } diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java index 3f708f84750c..90eeabb47e9a 100644 --- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java +++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java @@ -464,11 +464,7 @@ public class ResolverDrawerLayout extends ViewGroup { smoothScrollTo(mCollapsibleHeight + mUncollapsibleHeight, yvel); mDismissOnScrollerFinished = true; } else { - if (isNestedListChildScrolled()) { - mNestedListChild.smoothScrollToPosition(0); - } else if (isNestedRecyclerChildScrolled()) { - mNestedRecyclerChild.smoothScrollToPosition(0); - } + scrollNestedScrollableChildBackToTop(); smoothScrollTo(yvel < 0 ? 0 : mCollapsibleHeight, yvel); } } @@ -493,6 +489,17 @@ public class ResolverDrawerLayout extends ViewGroup { return handled; } + /** + * Scroll nested scrollable child back to top if it has been scrolled. + */ + public void scrollNestedScrollableChildBackToTop() { + if (isNestedListChildScrolled()) { + mNestedListChild.smoothScrollToPosition(0); + } else if (isNestedRecyclerChildScrolled()) { + mNestedRecyclerChild.smoothScrollToPosition(0); + } + } + private void onSecondaryPointerUp(MotionEvent ev) { final int pointerIndex = ev.getActionIndex(); final int pointerId = ev.getPointerId(pointerIndex); diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index 792c00572318..bdb4544f4aae 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -16,20 +16,21 @@ #define LOG_TAG "InputWindowHandle" -#include <nativehelper/JNIHelp.h> -#include "core_jni_helpers.h" -#include "jni.h" -#include <android_runtime/AndroidRuntime.h> -#include <utils/threads.h> +#include "android_hardware_input_InputWindowHandle.h" #include <android/graphics/region.h> +#include <android_runtime/AndroidRuntime.h> +#include <binder/IPCThreadState.h> #include <gui/SurfaceControl.h> +#include <nativehelper/JNIHelp.h> #include <ui/Region.h> +#include <utils/threads.h> -#include "android_hardware_input_InputWindowHandle.h" #include "android_hardware_input_InputApplicationHandle.h" #include "android_util_Binder.h" -#include <binder/IPCThreadState.h> +#include "core_jni_helpers.h" +#include "input/InputWindow.h" +#include "jni.h" namespace android { @@ -113,10 +114,10 @@ bool NativeInputWindowHandle::updateInfo() { mInfo.name = getStringField(env, obj, gInputWindowHandleClassInfo.name, "<null>"); - mInfo.layoutParamsFlags = env->GetIntField(obj, - gInputWindowHandleClassInfo.layoutParamsFlags); - mInfo.layoutParamsType = env->GetIntField(obj, - gInputWindowHandleClassInfo.layoutParamsType); + mInfo.flags = Flags<InputWindowInfo::Flag>( + env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsFlags)); + mInfo.type = static_cast<InputWindowInfo::Type>( + env->GetIntField(obj, gInputWindowHandleClassInfo.layoutParamsType)); mInfo.dispatchingTimeout = decltype(mInfo.dispatchingTimeout)( env->GetLongField(obj, gInputWindowHandleClassInfo.dispatchingTimeoutNanos)); mInfo.frameLeft = env->GetIntField(obj, @@ -157,8 +158,8 @@ bool NativeInputWindowHandle::updateInfo() { gInputWindowHandleClassInfo.ownerPid); mInfo.ownerUid = env->GetIntField(obj, gInputWindowHandleClassInfo.ownerUid); - mInfo.inputFeatures = env->GetIntField(obj, - gInputWindowHandleClassInfo.inputFeatures); + mInfo.inputFeatures = static_cast<InputWindowInfo::Feature>( + env->GetIntField(obj, gInputWindowHandleClassInfo.inputFeatures)); mInfo.displayId = env->GetIntField(obj, gInputWindowHandleClassInfo.displayId); mInfo.portalToDisplayId = env->GetIntField(obj, diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index e6881b3995a8..efca33aaf520 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -39,7 +39,6 @@ #include "androidfw/AssetManager2.h" #include "androidfw/AttributeResolution.h" #include "androidfw/MutexGuard.h" -#include "androidfw/PosixUtils.h" #include "androidfw/ResourceTypes.h" #include "androidfw/ResourceUtils.h" @@ -58,7 +57,6 @@ extern "C" int capget(cap_user_header_t hdrp, cap_user_data_t datap); extern "C" int capset(cap_user_header_t hdrp, const cap_user_data_t datap); using ::android::base::StringPrintf; -using ::android::util::ExecuteBinary; namespace android { @@ -114,88 +112,6 @@ constexpr inline static ApkAssetsCookie JavaCookieToApkAssetsCookie(jint cookie) return cookie > 0 ? static_cast<ApkAssetsCookie>(cookie - 1) : kInvalidCookie; } -static jobjectArray NativeCreateIdmapsForStaticOverlaysTargetingAndroid(JNIEnv* env, - jclass /*clazz*/) { - // --input-directory can be given multiple times, but idmap2 expects the directory to exist - std::vector<std::string> input_dirs; - struct stat st; - if (stat(AssetManager::VENDOR_OVERLAY_DIR, &st) == 0) { - input_dirs.push_back(AssetManager::VENDOR_OVERLAY_DIR); - } - - if (stat(AssetManager::PRODUCT_OVERLAY_DIR, &st) == 0) { - input_dirs.push_back(AssetManager::PRODUCT_OVERLAY_DIR); - } - - if (stat(AssetManager::SYSTEM_EXT_OVERLAY_DIR, &st) == 0) { - input_dirs.push_back(AssetManager::SYSTEM_EXT_OVERLAY_DIR); - } - - if (stat(AssetManager::ODM_OVERLAY_DIR, &st) == 0) { - input_dirs.push_back(AssetManager::ODM_OVERLAY_DIR); - } - - if (stat(AssetManager::OEM_OVERLAY_DIR, &st) == 0) { - input_dirs.push_back(AssetManager::OEM_OVERLAY_DIR); - } - - if (input_dirs.empty()) { - LOG(WARNING) << "no directories for idmap2 to scan"; - return env->NewObjectArray(0, g_stringClass, nullptr); - } - - if (access("/system/bin/idmap2", X_OK) == -1) { - PLOG(WARNING) << "unable to execute idmap2"; - return nullptr; - } - - std::vector<std::string> argv{"/system/bin/idmap2", - "scan", - "--recursive", - "--target-package-name", "android", - "--target-apk-path", "/system/framework/framework-res.apk", - "--output-directory", "/data/resource-cache"}; - - for (const auto& dir : input_dirs) { - argv.push_back("--input-directory"); - argv.push_back(dir); - } - - const auto result = ExecuteBinary(argv); - - if (!result) { - LOG(ERROR) << "failed to execute idmap2"; - return nullptr; - } - - if (result->status != 0) { - LOG(ERROR) << "idmap2: " << result->stderr; - return nullptr; - } - - std::vector<std::string> idmap_paths; - std::istringstream input(result->stdout); - std::string path; - while (std::getline(input, path)) { - idmap_paths.push_back(path); - } - - jobjectArray array = env->NewObjectArray(idmap_paths.size(), g_stringClass, nullptr); - if (array == nullptr) { - return nullptr; - } - for (size_t i = 0; i < idmap_paths.size(); i++) { - const std::string path = idmap_paths[i]; - jstring java_string = env->NewStringUTF(path.c_str()); - if (env->ExceptionCheck()) { - return nullptr; - } - env->SetObjectArrayElement(array, i, java_string); - env->DeleteLocalRef(java_string); - } - return array; -} - static jint CopyValue(JNIEnv* env, ApkAssetsCookie cookie, const Res_value& value, uint32_t ref, uint32_t type_spec_flags, ResTable_config* config, jobject out_typed_value) { env->SetIntField(out_typed_value, gTypedValueOffsets.mType, value.dataType); @@ -1563,8 +1479,6 @@ static const JNINativeMethod gAssetManagerMethods[] = { {"nativeAssetGetRemainingLength", "(J)J", (void*)NativeAssetGetRemainingLength}, // System/idmap related methods. - {"nativeCreateIdmapsForStaticOverlaysTargetingAndroid", "()[Ljava/lang/String;", - (void*)NativeCreateIdmapsForStaticOverlaysTargetingAndroid}, {"nativeGetOverlayableMap", "(JLjava/lang/String;)Ljava/util/Map;", (void*)NativeGetOverlayableMap}, {"nativeGetOverlayablesToString", "(JLjava/lang/String;)Ljava/lang/String;", diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index 9816d713c6dc..15a91107cbb1 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -342,11 +342,11 @@ static jlong android_view_MotionEvent_nativeInitialize( return 0; } - MotionEvent* event; + std::unique_ptr<MotionEvent> event; if (nativePtr) { - event = reinterpret_cast<MotionEvent*>(nativePtr); + event = std::unique_ptr<MotionEvent>(reinterpret_cast<MotionEvent*>(nativePtr)); } else { - event = new MotionEvent(); + event = std::make_unique<MotionEvent>(); } PointerProperties pointerProperties[pointerCount]; @@ -355,7 +355,7 @@ static jlong android_view_MotionEvent_nativeInitialize( for (jint i = 0; i < pointerCount; i++) { jobject pointerPropertiesObj = env->GetObjectArrayElement(pointerPropertiesObjArray, i); if (!pointerPropertiesObj) { - goto Error; + return 0; } pointerPropertiesToNative(env, pointerPropertiesObj, &pointerProperties[i]); env->DeleteLocalRef(pointerPropertiesObj); @@ -363,7 +363,7 @@ static jlong android_view_MotionEvent_nativeInitialize( jobject pointerCoordsObj = env->GetObjectArrayElement(pointerCoordsObjArray, i); if (!pointerCoordsObj) { jniThrowNullPointerException(env, "pointerCoords"); - goto Error; + return 0; } pointerCoordsToNative(env, pointerCoordsObj, xOffset, yOffset, &rawPointerCoords[i]); env->DeleteLocalRef(pointerCoordsObj); @@ -377,13 +377,7 @@ static jlong android_view_MotionEvent_nativeInitialize( downTimeNanos, eventTimeNanos, pointerCount, pointerProperties, rawPointerCoords); - return reinterpret_cast<jlong>(event); - -Error: - if (!nativePtr) { - delete event; - } - return 0; + return reinterpret_cast<jlong>(event.release()); } static void android_view_MotionEvent_nativeDispose(JNIEnv* env, jclass clazz, diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index b7c5289043d6..c73441cbd4f9 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -101,6 +101,19 @@ #include "nativebridge/native_bridge.h" +/* Functions in the callchain during the fork shall not be protected with + Armv8.3-A Pointer Authentication, otherwise child will not be able to return. */ +#ifdef __ARM_FEATURE_PAC_DEFAULT +#ifdef __ARM_FEATURE_BTI_DEFAULT +#define NO_PAC_FUNC __attribute__((target("branch-protection=bti"))) +#else +#define NO_PAC_FUNC __attribute__((target("branch-protection=none"))) +#endif /* __ARM_FEATURE_BTI_DEFAULT */ +#else /* !__ARM_FEATURE_PAC_DEFAULT */ +#define NO_PAC_FUNC +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + + namespace { // TODO (chriswailes): Add a function to initialize native Zygote data. @@ -1066,7 +1079,23 @@ static void ClearUsapTable() { gUsapPoolCount = 0; } +NO_PAC_FUNC +static void PAuthKeyChange(JNIEnv* env) { +#ifdef __aarch64__ + unsigned long int hwcaps = getauxval(AT_HWCAP); + if (hwcaps & HWCAP_PACA) { + const unsigned long key_mask = PR_PAC_APIAKEY | PR_PAC_APIBKEY | + PR_PAC_APDAKEY | PR_PAC_APDBKEY | PR_PAC_APGAKEY; + if (prctl(PR_PAC_RESET_KEYS, key_mask, 0, 0, 0) != 0) { + ALOGE("Failed to change the PAC keys: %s", strerror(errno)); + RuntimeAbort(env, __LINE__, "PAC key change failed."); + } + } +#endif +} + // Utility routine to fork a process from the zygote. +NO_PAC_FUNC static pid_t ForkCommon(JNIEnv* env, bool is_system_server, const std::vector<int>& fds_to_close, const std::vector<int>& fds_to_ignore, @@ -1117,6 +1146,7 @@ static pid_t ForkCommon(JNIEnv* env, bool is_system_server, } // The child process. + PAuthKeyChange(env); PreApplicationInit(); // Clean up any descriptors which must be closed immediately @@ -2052,6 +2082,7 @@ static void com_android_internal_os_Zygote_nativePreApplicationInit(JNIEnv*, jcl PreApplicationInit(); } +NO_PAC_FUNC static jint com_android_internal_os_Zygote_nativeForkAndSpecialize( JNIEnv* env, jclass, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, @@ -2104,6 +2135,7 @@ static jint com_android_internal_os_Zygote_nativeForkAndSpecialize( return pid; } +NO_PAC_FUNC static jint com_android_internal_os_Zygote_nativeForkSystemServer( JNIEnv* env, jclass, uid_t uid, gid_t gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, @@ -2175,6 +2207,7 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer( * @param is_priority_fork Controls the nice level assigned to the newly created process * @return */ +NO_PAC_FUNC static jint com_android_internal_os_Zygote_nativeForkUsap(JNIEnv* env, jclass, jint read_pipe_fd, diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 9bbe0caa9e98..ac143ac1a147 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -508,7 +508,7 @@ message GlobalSettingsProto { optional SettingProto job_scheduler_constants = 66 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto job_scheduler_quota_controller_constants = 149 [ (android.privacy).dest = DEST_AUTOMATIC ]; - optional SettingProto job_scheduler_time_controller_constants = 150 [ (android.privacy).dest = DEST_AUTOMATIC ]; + reserved 150; // job_scheduler_time_controller_constants optional SettingProto keep_profile_in_background = 67 [ (android.privacy).dest = DEST_AUTOMATIC ]; diff --git a/core/proto/android/server/jobscheduler.proto b/core/proto/android/server/jobscheduler.proto index f2f20e3ac12e..76b7fc028a98 100644 --- a/core/proto/android/server/jobscheduler.proto +++ b/core/proto/android/server/jobscheduler.proto @@ -324,7 +324,7 @@ message ConstantsProto { // ready now. reserved 1; // skip_not_ready_jobs // Whether or not TimeController will use a non-wakeup alarm for delay constraints. - optional bool use_non_wakeup_alarm_for_delay = 2; + reserved 2; // use_non_wakeup_alarm_for_delay } optional TimeController time_controller = 25; diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 02213ed84f09..c21663811756 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -28,6 +28,7 @@ import "frameworks/base/core/proto/android/view/enums.proto"; import "frameworks/base/core/proto/android/view/surface.proto"; import "frameworks/base/core/proto/android/view/windowlayoutparams.proto"; import "frameworks/base/core/proto/android/privacy.proto"; +import "frameworks/base/core/proto/android/typedef.proto"; package com.android.server.wm; @@ -43,8 +44,8 @@ message WindowManagerServiceDumpProto { optional string focused_app = 4; optional IdentifierProto input_method_window = 5; optional bool display_frozen = 6; - optional int32 rotation = 7; - optional int32 last_orientation = 8; + optional int32 rotation = 7 [(.android.typedef) = "android.view.Surface.Rotation"]; + optional int32 last_orientation = 8 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"]; optional int32 focused_display_id = 9; } @@ -177,7 +178,7 @@ message DisplayContentProto { repeated WindowTokenProto ime_windows = 8 [deprecated=true]; optional int32 dpi = 9; optional .android.view.DisplayInfoProto display_info = 10; - optional int32 rotation = 11; + optional int32 rotation = 11 [(.android.typedef) = "android.view.Surface.Rotation"]; optional ScreenRotationAnimationProto screen_rotation_animation = 12; optional DisplayFramesProto display_frames = 13; optional int32 surface_size = 14 [deprecated=true]; @@ -264,8 +265,8 @@ message TaskProto { optional int32 display_id = 15; optional int32 root_task_id = 16; - optional int32 activity_type = 17; - optional int32 resize_mode = 18; + optional int32 activity_type = 17 [(.android.typedef) = "android.app.WindowConfiguration.ActivityType"]; + optional int32 resize_mode = 18 [(.android.typedef) = "android.appwidget.AppWidgetProviderInfo.ResizeModeFlags"]; optional int32 min_width = 19; optional int32 min_height = 20; @@ -351,7 +352,7 @@ message WindowStateProto { optional .android.graphics.RectProto surface_position = 16; optional int32 requested_width = 18; optional int32 requested_height = 19; - optional int32 view_visibility = 20; + optional int32 view_visibility = 20 [(.android.typedef) = "android.view.View.Visibility"]; optional int32 system_ui_visibility = 21; optional bool has_surface = 22; optional bool is_ready_for_display = 23; @@ -424,7 +425,7 @@ message WindowContainerProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional ConfigurationContainerProto configuration_container = 1; - optional int32 orientation = 2; + optional int32 orientation = 2 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"]; optional bool visible = 3; optional SurfaceAnimatorProto surface_animator = 4; repeated WindowContainerChildProto children = 5; diff --git a/core/proto/android/typedef.proto b/core/proto/android/typedef.proto new file mode 100644 index 000000000000..be8742de5673 --- /dev/null +++ b/core/proto/android/typedef.proto @@ -0,0 +1,30 @@ +/* + * 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. + */ + +syntax = "proto2"; + +package android; + +import "google/protobuf/descriptor.proto"; + +extend google.protobuf.FieldOptions { + // Used to specify the IntDef annotation type so that ints + // can be associated with their string representation + + // 60001 is a random field numbers assigned to the custom options + // numbers between 50000 and 99999 are reserved for internal use within individual organizations + optional string typedef = 60001; +} diff --git a/core/proto/android/view/windowlayoutparams.proto b/core/proto/android/view/windowlayoutparams.proto index 272a24515367..64e6da852529 100644 --- a/core/proto/android/view/windowlayoutparams.proto +++ b/core/proto/android/view/windowlayoutparams.proto @@ -19,6 +19,7 @@ syntax = "proto2"; import "frameworks/base/core/proto/android/graphics/pixelformat.proto"; import "frameworks/base/core/proto/android/view/display.proto"; import "frameworks/base/core/proto/android/privacy.proto"; +import "frameworks/base/core/proto/android/typedef.proto"; package android.view; option java_multiple_files = true; @@ -27,15 +28,15 @@ option java_multiple_files = true; message WindowLayoutParamsProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional int32 type = 1; + optional int32 type = 1 [(.android.typedef) = "android.view.WindowManager.LayoutParams.WindowType"]; optional int32 x = 2; optional int32 y = 3; optional int32 width = 4; optional int32 height = 5; optional float horizontal_margin = 6; optional float vertical_margin = 7; - optional int32 gravity = 8; - optional int32 soft_input_mode = 9; + optional int32 gravity = 8; // TODO (b/160129453): Add IntDef + optional int32 soft_input_mode = 9 [(.android.typedef) = "android.view.WindowManager.LayoutParams.SoftInputModeFlags"]; optional .android.graphics.PixelFormatProto.Format format = 10; optional int32 window_animations = 11; optional float alpha = 12; @@ -53,17 +54,17 @@ message WindowLayoutParamsProto { optional float preferred_refresh_rate = 16; optional int32 preferred_display_mode_id = 17; optional bool has_system_ui_listeners = 18; - optional uint32 input_feature_flags = 19; + optional uint32 input_feature_flags = 19; // TODO (b/160129453): Add IntDef optional int64 user_activity_timeout = 20; optional DisplayProto.ColorMode color_mode = 23; - optional uint32 flags = 24; - optional uint32 private_flags = 26; - optional uint32 system_ui_visibility_flags = 27; - optional uint32 subtree_system_ui_visibility_flags = 28; - optional uint32 appearance = 29; - optional uint32 behavior = 30; - optional uint32 fit_insets_types = 31; - optional uint32 fit_insets_sides = 32; + optional uint32 flags = 24 [(.android.typedef) = "android.view.WindowManager.LayoutParams.Flags"]; + optional uint32 private_flags = 26 [(.android.typedef) = "android.view.WindowManager.LayoutParams.PrivateFlags"]; + optional uint32 system_ui_visibility_flags = 27; // TODO (b/160129453): Add IntDef + optional uint32 subtree_system_ui_visibility_flags = 28; // TODO (b/160129453): Add IntDef + optional uint32 appearance = 29 [(.android.typedef) = "android.view.WindowInsetsController.Appearance"]; + optional uint32 behavior = 30 [(.android.typedef) = "android.view.WindowInsetsController.Behavior"]; + optional uint32 fit_insets_types = 31 [(.android.typedef) = "android.view.WindowInsets.Type.InsetsType"]; + optional uint32 fit_insets_sides = 32 [(.android.typedef) = "android.view.WindowInsets.Side.InsetsSide"]; optional bool fit_ignore_visibility = 33; } diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 6bc69cd3b56c..3b61c367e1bf 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Opgedateer deur jou administrateur"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Uitgevee deur jou administrateur"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batterybespaarder doen die volgende om die batterylewe te verleng:\n\n•Skakel Donkertema aan\n•Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Ok Google\", af of beperk hulle\n\n"<annotation id="url">"Kom meer te wete"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batterybespaarder doen die volgende om batterylewe te verleng:\n\n•Skakel Donkertema aan\n•Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Ok Google\", af of beperk hulle"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batterybespaarder doen die volgende om die batterylewe te verleng:\n\n• Skakel Donkertema aan\n• Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Ok Google\", af of beperk dit\n\n"<annotation id="url">"Kom meer te wete"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batterybespaarder doen die volgende om batterylewe te verleng:\n\n• Skakel Donkertema aan\n• Skakel agtergrondaktiwiteit, sommige visuele effekte en ander kenmerke, soos \"Ok Google\", af of beperk dit"</string> <string name="data_saver_description" msgid="4995164271550590517">"Databespaarder verhoed sommige programme om data in die agtergrond te stuur of te aanvaar om datagebruik te help verminder. \'n Program wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys totdat jy op hulle tik nie."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Skakel Databespaarder aan?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Skakel aan"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 6640661d1c11..9ce214fdf3ab 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"በእርስዎ አስተዳዳሪ ተዘምኗል"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"በእርስዎ አስተዳዳሪ ተሰርዟል"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"እሺ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"የባትሪ ዕድሜን ለማራዘም፣ የባትሪ ቆጣቢ፦\n\n•ጨለማ ገጽታን ያበራል\n•የበስተጀርባ እንቅስቃሴን፣ አንዳንድ የሚታዩ ማሳመሪያዎችን፣ እና ሌሎች እንደ «Hey Google» ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል\n\n"<annotation id="url">"የበለጠ ለመረዳት"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"የባትሪ ዕድሜን ለማራዘም፣ የባትሪ ቆጣቢ፦\n\n•ጨለማ ገጽታን ያበራል\n•የበስተጀርባ እንቅስቃሴን፣ አንዳንድ የሚታዩ ማሳመሪያዎችን፣ እና ሌሎች እንደ «Hey Google» ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"የባትሪ ዕድሜን ለማራዘም፣ የባትሪ ቆጣቢ፦\n\n•ጨለማ ገጽታን ያበራል\n•የበስተጀርባ እንቅስቃሴን፣ አንዳንድ የሚታዩ ማሳመሪያዎችን፣ እና ሌሎች እንደ «Hey Google» ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል\n\n"<annotation id="url">"የበለጠ ለመረዳት"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"የባትሪ ዕድሜን ለማራዘም የባትሪ ኃይል ቆጣቢ፦\n\n• ጨለማ ገጽታን ያበራል\n• የበስተጀርባ እንቅስቃሴን፣ አንዳንድ ምስላዊ ተጽዕኖዎችን እና ሌሎች እንደ «Hey Google» ያሉ ባህሪያትን ያጠፋል ወይም ይገድባል"</string> <string name="data_saver_description" msgid="4995164271550590517">"የውሂብ አጠቃቀም እንዲቀንስ ለማገዝ ውሂብ ቆጣቢ አንዳንድ መተግበሪያዎች ከበስተጀርባ ሆነው ውሂብ እንዳይልኩ ወይም እንዳይቀበሉ ይከለክላቸዋል። በአሁኑ ጊዜ እየተጠቀሙበት ያለ መተግበሪያ ውሂብ ሊደርስ ይችላል፣ ነገር ግን ባነሰ ተደጋጋሚነት ሊሆን ይችላል። ይሄ ማለት ለምሳሌ ምስሎችን መታ እስኪያደርጓቸው ድረስ ላይታዩ ይችላሉ ማለት ነው።"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ውሂብ ቆጣቢ ይጥፋ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"አብራ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index f5d7246b96a3..e80720d9a2b8 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1884,8 +1884,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"تم التحديث بواسطة المشرف"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"تم الحذف بواسطة المشرف"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"حسنًا"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"لإطالة عمر البطارية، تعمل ميزة \"توفير شحن البطارية\" على:\n\n• تفعيل \"المظهر الداكن\"\n• إيقاف أو حظر النشاط في الخلفية وبعض التأثيرات المرئية والميزات الأخرى، مثل \"Ok Google\".\n\n"<annotation id="url">"مزيد من المعلومات"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"لإطالة عمر البطارية، تعمل ميزة \"توفير شحن البطارية\" على:\n\n• تفعيل \"المظهر الداكن\"\n• إيقاف أو حظر النشاط في الخلفية وبعض التأثيرات المرئية والميزات الأخرى، مثل \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"لإطالة عمر البطارية، تعمل ميزة \"توفير شحن البطارية\" على:\n·تفعيل \"المظهر الداكن\"\n إيقاف أو حظر النشاط في الخلفية وبعض التأثيرات المرئية والميزات الأخرى، مثل \"Ok Google\"\n\n\n"<annotation id="url">"مزيد من المعلومات"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"لإطالة عمر البطارية، تعمل ميزة \"توفير شحن البطارية\" على:\n\n• تفعيل \"المظهر الداكن\"\n• إيقاف أو حظر النشاط في الخلفية وبعض التأثيرات المرئية والميزات الأخرى، مثل \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"للمساعدة في خفض استخدام البيانات، تمنع ميزة \"توفير البيانات\" بعض التطبيقات من إرسال البيانات وتلقّيها في الخلفية. يمكن للتطبيقات المتاحة لديك الآن استخدام البيانات، ولكن لا يمكنها الإكثار من ذلك. وهذا يعني أن الصور مثلاً لا تظهر حتى تنقر عليها."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"هل تريد تفعيل توفير البيانات؟"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"تفعيل"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index e7acc3b845da..881a1278666c 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"আপোনাৰ প্ৰশাসকে আপেডট কৰিছে"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"আপোনাৰ প্ৰশাসকে মচিছে"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ঠিক আছে"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰিবলৈ, বেটাৰী সঞ্চয়কাৰীয়ে:\n\n•গাঢ় ৰঙৰ থীম অন কৰে\n•পটভূমিৰ কাৰ্যকলাপ, কিছুমান ভিজুৱেল প্ৰভাৱ আৰু “Hey Google”ৰ দৰে অন্য সুবিধাসমূহ অফ কৰে অথবা সেইবোৰ সীমাবদ্ধ কৰে\n\n"<annotation id="url">"অধিক জানক"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰিবলৈ, বেটাৰী সঞ্চয়কাৰীয়ে:\n\n•গাঢ় ৰঙৰ থীম অন কৰে\n•পটভূমিৰ কাৰ্যকলাপ, কিছুমান ভিজুৱেল প্ৰভাৱ আৰু “Hey Google”ৰ দৰে অন্য সুবিধাসমূহ অফ কৰে অথবা সেইবোৰ সীমাবদ্ধ কৰে"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰিবলৈ, বেটাৰী সঞ্চয়কাৰীয়ে:\n\n•গাঢ় ৰঙৰ থীম অন কৰে\n•নেপথ্যৰ কাৰ্যকলাপ, কিছুমান ভিজুৱেল ইফেক্ট আৰু “Hey Google”ৰ দৰে অন্য সুবিধাসমূহ অফ কৰে অথবা সেইবোৰ সীমাবদ্ধ কৰে\n\n"<annotation id="url">"অধিক জানক"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰিবলৈ বেটাৰী সঞ্চয়কাৰীয়ে:\n\n• গাঢ় ৰঙৰ থীম অন কৰে\n• নেপথ্যৰ কাৰ্যকলাপ, কিছুমান ভিজুৱেল ইফেক্ট আৰু “Hey Google”ৰ দৰে অন্য সুবিধাসমূহ অফ কৰে অথবা সীমাবদ্ধ কৰে"</string> <string name="data_saver_description" msgid="4995164271550590517">"ডেটা ব্য়ৱহাৰ মাত্ৰা কম কৰিবৰ বাবে ডেটা সঞ্চয়কাৰীয়ে কিছুমান এপক নেপথ্য়ত ডেটা প্ৰেৰণ বা সংগ্ৰহ কৰাত বাধা প্ৰদান কৰে। আপুনি বৰ্তমান ব্য়ৱহাৰ কৰি থকা এটা এপে ডেটা ব্য়ৱহাৰ কৰিব পাৰে, কিন্তু সঘনাই এই কার্য কৰিব নোৱাৰিব পাৰে। ইয়াৰ অৰ্থ এইয়ে হ\'ব পাৰে যে, উদাহৰণস্বৰূপে, আপুনি নিটিপা পর্যন্ত প্ৰতিচ্ছবিসমূহ দেখুওৱা নহ’ব।"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ডেটা সঞ্চয়কাৰী অন কৰিবনে?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"অন কৰক"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 3240808f2eb9..6408ef629b36 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Admin tərəfindən yeniləndi"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Admin tərəfindən silindi"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət funksiyası:\n\n•Qaranlıq temanı aktiv edir\n•Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər funksiyaları deaktiv edir və ya məhdudlaşdırır\n\n"<annotation id="url">"Ətraflı məlumat"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət funksiyası:\n\n•Qaranlıq temanı aktiv edir\n•Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər funksiyaları deaktiv edir və ya məhdudlaşdırır"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət funksiyası:\n\n• Qaranlıq temanı aktiv edir\n• Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər funksiyaları deaktiv edir və ya məhdudlaşdırır\n\n"<annotation id="url">"Ətraflı məlumat"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batareyanın ömrünü artırmaq üçün Enerjiyə Qənaət funksiyası:\n\n• Qaranlıq temanı aktiv edir\n• Arxa fondakı fəaliyyəti, bəzi vizual effektləri və “Hey Google” kimi digər funksiyaları deaktiv edir və ya məhdudlaşdırır"</string> <string name="data_saver_description" msgid="4995164271550590517">"Data istifadəsini azalatmaq üçün, Data Qanaəti bəzi tətbiqlərin arxafonda data göndərməsinin və qəbulunun qarşısını alır. Hazırda işlətdiyiniz tətbiq dataya daxil ola bilər, ancaq bunu tez-tez edə bilməz. Bu o deməkdir ki, məsələn, Siz üzərinə tıklamadıqca o şəkillər göstərilməyəcək."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Data Qənaəti aktiv edilsin?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivləşdirin"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 590bd4f14363..2bcf9095cb04 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1179,7 +1179,7 @@ <string name="noApplications" msgid="1186909265235544019">"Nijedna aplikacija ne može da obavlja ovu radnju."</string> <string name="aerr_application" msgid="4090916809370389109">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> je zaustavljena"</string> <string name="aerr_process" msgid="4268018696970966407">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> je zaustavljen"</string> - <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> se stalno zaustavlja(ju)"</string> + <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> se stalno zaustavlja"</string> <string name="aerr_process_repeated" msgid="1153152413537954974">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> se stalno zaustavlja"</string> <string name="aerr_restart" msgid="2789618625210505419">"Ponovo otvori aplikaciju"</string> <string name="aerr_report" msgid="3095644466849299308">"Pošaljite povratne informacije"</string> @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ažurirao je administrator"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Izbrisao je administrator"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Potvrdi"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Da bi se produžilo trajanje baterije, Ušteda baterije:\n\n•uključuje tamnu temu\n•isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“\n\n"<annotation id="url">"Saznajte više"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Da bi se produžilo trajanje baterije, Ušteda baterije:\n\n•uključuje tamnu temu\n•isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Da bi se produžilo trajanje baterije, Ušteda baterije:\n\n• uključuje tamnu temu\n• isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“\n\n"<annotation id="url">"Saznajte više"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Da bi se produžilo trajanje baterije, Ušteda baterije:\n\n• uključuje tamnu temu\n• isključuje ili ograničava aktivnosti u pozadini, neke vizuelne efekte i druge funkcije, na primer, „Ok Google“"</string> <string name="data_saver_description" msgid="4995164271550590517">"Da bi se smanjila potrošnja podataka, Ušteda podataka sprečava neke aplikacije da šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može da pristupa podacima, ali će to činiti ređe. Na primer, slike se neće prikazivati dok ih ne dodirnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Želite da uključite Uštedu podataka?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Uključi"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 8da6a75d7100..ed781fb25698 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Абноўлены вашым адміністратарам"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Выдалены вашым адміністратарам"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n\n•·уключае цёмную тэму;\n• выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\"\n\n"<annotation id="url">"Даведацца больш"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n\n• уключае цёмную тэму;\n• выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n\n•·уключае цёмную тэму;\n• выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\"\n\n"<annotation id="url">"Даведацца больш"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Каб павялічыць тэрмін службы акумулятара, рэжым эканоміі зараду:\n\n• уключае цёмную тэму;\n• выключае ці абмяжоўвае дзеянні ў фонавым рэжыме, некаторыя візуальныя эфекты і іншыя функцыі, напрыклад \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"У рэжыме \"Эканомія трафіка\" фонавая перадача для некаторых праграмам адключана. Праграма, якую вы зараз выкарыстоўваеце, можа атрымліваць доступ да даных, але радзей, чым звычайна. Напрыклад, відарысы могуць не загружацца, пакуль вы не націсніце на іх."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Уключыць Эканомію трафіка?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Уключыць"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 0b4055935722..f089d62707b5 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Актуализирано от администратора ви"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Изтрито от администратора ви"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"С цел удължаване на живота на батерията режимът за запазването ѝ:\n\n•·включва тъмната тема;\n•·изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“.\n\n"<annotation id="url">"Научете повече"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"С цел удължаване на живота на батерията режимът за запазването ѝ:\n\n• включва тъмната тема;\n• изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"С цел удължаване на живота на батерията режимът за запазването ѝ:\n\n•·включва тъмната тема;\n•·изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“.\n\n"<annotation id="url">"Научете повече"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"С цел удължаване на живота на батерията режимът за запазването ѝ:\n\n• включва тъмната тема;\n• изключва или ограничава активността на заден план, някои визуални ефекти и други функции, като например „Ok Google“."</string> <string name="data_saver_description" msgid="4995164271550590517">"С цел намаляване на преноса на данни функцията за икономия на данни не позволява на някои приложения да изпращат или получават данни на заден план. Понастоящем използвано от вас приложение може да използва данни, но по-рядко. Това например може да означава, че изображенията не се показват, докато не ги докоснете."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Ще вкл. ли „Икономия на данни“?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Включване"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 7f219ac5eb37..1ac213f01d6b 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"আপনার প্রশাসক আপডেট করেছেন"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"আপনার প্রশাসক মুছে দিয়েছেন"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ঠিক আছে"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n\n•গাঢ় থিম চালু করে\n•ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ বা সীমিত করে\n\n"<annotation id="url">"আরও জানুন"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n\n•গাঢ় থিম চালু করে\n•ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ বা সীমিত করে"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n\n• ডার্ক থিম চালু করে\n• ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ বা সীমিত করে\n\n"<annotation id="url">"আরও জানুন"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ব্যাটারি আরও বেশিক্ষণ চালাতে, ব্যাটারি সেভার:\n\n• ডার্ক থিম চালু করে\n• ব্যাকগ্রাউন্ড অ্যাক্টিভিটি, কিছু ভিজ্যুয়াল এফেক্ট এবং “হ্যালো Google”-এর মতো অন্যান্য ফিচার বন্ধ অথবা সীমিত করে"</string> <string name="data_saver_description" msgid="4995164271550590517">"ডেটার ব্যবহার কমাতে সহায়তা করার জন্য, ডেটা সেভার ব্যাকগ্রাউন্ডে কিছু অ্যাপ্লিকেশনকে ডেটা পাঠাতে বা গ্রহণ করতে বাধা দেয়৷ আপনি বর্তমানে এমন একটি অ্যাপ্লিকেশন ব্যবহার করছেন যেটি ডেটা অ্যাক্সেস করতে পারে, তবে সেটি কমই করে৷ এর ফলে যা হতে পারে, উদাহরণস্বরূপ, আপনি ছবির উপর ট্যাপ না করা পর্যন্ত সেগুলি দেখানো হবে না৷"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ডেটা সেভার চালু করবেন?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"চালু করুন"</string> @@ -2040,7 +2040,7 @@ <string name="accessibility_system_action_quick_settings_label" msgid="4583900123506773783">"দ্রুত সেটিংস"</string> <string name="accessibility_system_action_power_dialog_label" msgid="8095341821683910781">"পাওয়ার ডায়লগ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"লক স্ক্রিন"</string> - <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্রিনশট"</string> + <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্রিনশট নিন"</string> <string name="accessibility_system_action_on_screen_a11y_shortcut_label" msgid="8488701469459210309">"অন-স্ক্রিন অ্যাক্সেসিবিলিটি শর্টকাট"</string> <string name="accessibility_system_action_on_screen_a11y_shortcut_chooser_label" msgid="1057878690209817886">"অন-স্ক্রিন অ্যাক্সেসিবিলিটি শর্টকাট বেছে নেওয়ার বিকল্প"</string> <string name="accessibility_system_action_hardware_a11y_shortcut_label" msgid="5764644187715255107">"অ্যাক্সেসিবিলিটি শর্টকাট"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 176f8309507d..f27441a667e7 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ažurirao je vaš administrator"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Izbrisao je vaš administrator"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Uredu"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Radi produženja vijeka trajanja baterije, Ušteda baterije:\n\n•Uključuje Tamnu temu\n•Isključuje ili ograničava aktivnosti u pozadini, određene vizuelne efekte i druge funkcije kao što je \"Ok Google\"\n\n"<annotation id="url">"Saznajte više"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Radi produženja vijeka trajanja baterije, Ušteda baterije:\n\n•Uključuje Tamnu temu\n•Isključuje ili ograničava aktivnosti u pozadini, određene vizuelne efekte i druge funkcije kao što je \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Radi produženja vijeka trajanja baterije, Ušteda baterije:\n\n• Uključuje Tamnu temu\n• Isključuje ili ograničava aktivnosti u pozadini, određene vizuelne efekte i druge funkcije kao što je \"Ok Google\"\n\n"<annotation id="url">"Saznajte više"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Radi produženja vijeka trajanja baterije, Ušteda baterije:\n\n• Uključuje Tamnu temu\n• Isključuje ili ograničava aktivnost u pozadini, određene vizuelne efekte i druge funkcije kao što je \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"Radi smanjenja prijenosa podataka, Ušteda podataka sprečava da neke aplikacije šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može pristupiti podacima, ali će to činiti rjeđe. Naprimjer, to može značiti da se slike ne prikazuju dok ih ne dodirnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Uključiti Uštedu podataka?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Uključi"</string> @@ -2064,7 +2064,7 @@ <item quantity="few"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> fajla</item> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> fajlova</item> </plurals> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Nijedna osoba nije preporučena za dijeljenje"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Nema preporučenih osoba za dijeljenje"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Lista aplikacija"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Ovoj aplikaciji nije dato odobrenje za snimanje, ali može snimati zvuk putem ovog USB uređaja."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Početna stranica"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 0d7341d817ef..5fadc92d2970 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Actualitzat per l\'administrador"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Suprimit per l\'administrador"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"D\'acord"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Per allargar la durada de la bateria, el mode Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\".\n\n"<annotation id="url">"Més informació"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Per allargar la durada de la bateria, el mode Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Per allargar la durada de la bateria, la funció Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\".\n\n"<annotation id="url">"Més informació"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Per allargar la durada de la bateria, la funció Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Per reduir l\'ús de dades, la funció Economitzador de dades evita que determinades aplicacions enviïn o rebin dades en segon pla. L\'aplicació que estiguis fent servir podrà accedir a les dades, però menys sovint. Això vol dir, per exemple, que les imatges no es mostraran fins que no les toquis."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Activar l\'Economitzador de dades?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activa"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ccaf0b775f7e..856176455150 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Aktualizováno administrátorem"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Smazáno administrátorem"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Spořič baterie za účelem úspory energie:\n\n• zapne tmavý motiv,\n• vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Ok Google“\n\n"<annotation id="url">"Další informace"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Spořič baterie za účelem úspory energie:\n\n• zapne tmavý motiv,\n• vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Ok Google“"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Spořič baterie za účelem úspory energie:\n\n• Zapne tmavý motiv.\n• Vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Ok Google“.\n\n"<annotation id="url">"Další informace"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Spořič baterie za účelem úspory energie:\n\n• Zapne tmavý motiv.\n• Vypne nebo omezí aktivitu na pozadí, některé vizuální efekty a další funkce jako „Ok Google“."</string> <string name="data_saver_description" msgid="4995164271550590517">"Spořič dat z důvodu snížení využití dat některým aplikacím brání v odesílání nebo příjmu dat na pozadí. Aplikace, kterou právě používáte, data přenášet může, ale může tak činit méně často. V důsledku toho se například obrázky nemusejí zobrazit, dokud na ně neklepnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Chcete zapnout Spořič dat?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Zapnout"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 0bb19aa86de4..1b3dab2352f4 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Opdateret af din administrator"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Slettet af din administrator"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batterisparefunktionen gør følgende for at spare på batteriet:\n\n•Aktiverer Mørkt tema\n•Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\"\n\n"<annotation id="url">"Få flere oplysninger"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batterisparefunktionen gør følgende for at spare på batteriet:\n\n•Aktiverer Mørkt tema\n•Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batterisparefunktionen gør følgende for at spare på batteriet:\n\n• Aktiverer Mørkt tema\n• Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\"\n\n"<annotation id="url">"Få flere oplysninger"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batterisparefunktionen gør følgende for at spare på batteriet:\n\n• Aktiverer Mørkt tema\n• Deaktiverer eller begrænser aktivitet i baggrunden, visse visuelle effekter og andre funktioner som f.eks. \"Hey Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"Datasparefunktionen forhindrer nogle apps i at sende eller modtage data i baggrunden for at reducere dataforbruget. En app, der er i brug, kan få adgang til data, men gør det måske ikke så ofte. Dette kan f.eks. betyde, at billeder ikke vises, før du trykker på dem."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vil du aktivere Datasparefunktion?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivér"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index dc0b6c3681de..296200f8004c 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -935,7 +935,7 @@ <string name="save_password_label" msgid="9161712335355510035">"Bestätigen"</string> <string name="double_tap_toast" msgid="7065519579174882778">"Tipp: Zum Vergrößern und Verkleinern doppeltippen"</string> <string name="autofill_this_form" msgid="3187132440451621492">"AutoFill"</string> - <string name="setup_autofill" msgid="5431369130866618567">"AutoFill konfig."</string> + <string name="setup_autofill" msgid="5431369130866618567">"Autom.Ausfüll.konf."</string> <string name="autofill_window_title" msgid="4379134104008111961">"Mit <xliff:g id="SERVICENAME">%1$s</xliff:g> automatisch ausfüllen"</string> <string name="autofill_address_name_separator" msgid="8190155636149596125">" "</string> <string name="autofill_address_summary_name_format" msgid="3402882515222673691">"$1$2$3"</string> @@ -1104,7 +1104,7 @@ <string name="selectTextMode" msgid="3225108910999318778">"Text auswählen"</string> <string name="undo" msgid="3175318090002654673">"Rückgängig machen"</string> <string name="redo" msgid="7231448494008532233">"Wiederholen"</string> - <string name="autofill" msgid="511224882647795296">"AutoFill"</string> + <string name="autofill" msgid="511224882647795296">"Automatisches Ausfüllen"</string> <string name="textSelectionCABTitle" msgid="5151441579532476940">"Textauswahl"</string> <string name="addToDictionary" msgid="8041821113480950096">"Zum Wörterbuch hinzufügen"</string> <string name="deleteText" msgid="4200807474529938112">"Löschen"</string> @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Von deinem Administrator aktualisiert"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Von deinem Administrator gelöscht"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Der Energiesparmodus sorgt für eine längere Akkulaufzeit:\n\n• Das dunkle Design wird aktiviert\n• Hintergrundaktivitäten, einige optische Effekte und weitere Funktionen wie \"Ok Google\" werden abgeschaltet oder eingeschränkt\n\n"<annotation id="url">"Weitere Informationen"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Der Energiesparmodus sorgt für eine längere Akkulaufzeit:\n\n• Das dunkle Design wird aktiviert\n• Hintergrundaktivitäten, einige optische Effekte und weitere Funktionen wie \"Ok Google\" werden abgeschaltet oder eingeschränkt"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Der Energiesparmodus sorgt für eine längere Akkulaufzeit:\n\n• Das dunkle Design wird aktiviert\n• Hintergrundaktivitäten, einige optische Effekte und weitere Funktionen wie \"Ok Google\" werden abgeschaltet oder eingeschränkt\n\n"<annotation id="url">"Weitere Informationen"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Der Energiesparmodus sorgt für eine längere Akkulaufzeit:\n\n• Das dunkle Design wird aktiviert\n• Hintergrundaktivitäten, einige optische Effekte und weitere Funktionen wie \"Ok Google\" werden abgeschaltet oder eingeschränkt"</string> <string name="data_saver_description" msgid="4995164271550590517">"Der Datensparmodus verhindert zum einen, dass manche Apps im Hintergrund Daten senden oder empfangen, sodass weniger Daten verbraucht werden. Zum anderen werden die Datenzugriffe der gerade aktiven App eingeschränkt, was z. B. dazu führen kann, dass Bilder erst angetippt werden müssen, bevor sie sichtbar werden."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Datensparmodus aktivieren?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivieren"</string> @@ -1928,13 +1928,13 @@ <string name="time_picker_prompt_label" msgid="303588544656363889">"Uhrzeit eingeben"</string> <string name="time_picker_text_input_mode_description" msgid="4761160667516611576">"In den Texteingabemodus wechseln, um die Uhrzeit einzugeben."</string> <string name="time_picker_radial_mode_description" msgid="1222342577115016953">"In den Uhrzeitmodus wechseln, um die Uhrzeit einzugeben."</string> - <string name="autofill_picker_accessibility_title" msgid="4425806874792196599">"AutoFill-Optionen"</string> - <string name="autofill_save_accessibility_title" msgid="1523225776218450005">"Für AutoFill speichern"</string> + <string name="autofill_picker_accessibility_title" msgid="4425806874792196599">"Optionen für automatisches Ausfüllen"</string> + <string name="autofill_save_accessibility_title" msgid="1523225776218450005">"Für \"Automatisches Ausfüllen\" speichern"</string> <string name="autofill_error_cannot_autofill" msgid="6528827648643138596">"Inhalte können nicht automatisch ausgefüllt werden"</string> - <string name="autofill_picker_no_suggestions" msgid="1076022650427481509">"Keine AutoFill-Vorschläge"</string> + <string name="autofill_picker_no_suggestions" msgid="1076022650427481509">"Keine Vorschläge für automatisches Ausfüllen"</string> <plurals name="autofill_picker_some_suggestions" formatted="false" msgid="6651883186966959978"> - <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> AutoFill-Vorschläge</item> - <item quantity="one">1 AutoFill-Vorschlag</item> + <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> Vorschläge für automatisches Ausfüllen</item> + <item quantity="one">1 Vorschlag für automatisches Ausfüllen</item> </plurals> <string name="autofill_save_title" msgid="7719802414283739775">"In "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>" speichern?"</string> <string name="autofill_save_title_with_type" msgid="3002460014579799605">"<xliff:g id="TYPE">%1$s</xliff:g> in "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>" speichern?"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 7d346e3aad36..e790c9a071a9 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ενημερώθηκε από τον διαχειριστή σας"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Διαγράφηκε από τον διαχειριστή σας"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Για την επέκταση της διάρκειας ζωής της μπαταρίας σας, η Εξοικονόμηση μπαταρίας:\n\n•Ενεργοποιεί το Σκούρο θέμα\n•Απενεργοποιεί ή περιορίζει τη δραστηριότητα παρασκηνίου, ορισμένα οπτικά εφέ και άλλες λειτουργίες όπως την εντολή Hey Google\n\n"<annotation id="url">"Μάθετε περισσότερα"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Για την επέκταση της διάρκειας ζωής της μπαταρίας, η Εξοικονόμηση μπαταρίας:\n\n•Ενεργοποιεί το Σκούρο θέμα\n•Απενεργοποιεί ή περιορίζει τη δραστηριότητα παρασκηνίου, ορισμένα οπτικά εφέ και άλλες λειτουργίες όπως την εντολή Hey Google."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Για την επέκταση της διάρκειας ζωής της μπαταρίας σας, η Εξοικονόμηση μπαταρίας:\n\n• Ενεργοποιεί το Σκούρο θέμα\n• Απενεργοποιεί ή περιορίζει τη δραστηριότητα παρασκηνίου, ορισμένα οπτικά εφέ και άλλες λειτουργίες όπως την εντολή Hey Google\n\n"<annotation id="url">"Μάθετε περισσότερα"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Για την επέκταση της διάρκειας ζωής της μπαταρίας σας, η Εξοικονόμηση μπαταρίας:\n\n• Ενεργοποιεί το Σκούρο θέμα\n• Απενεργοποιεί ή περιορίζει τη δραστηριότητα στο παρασκήνιο, ορισμένα οπτικά εφέ και άλλες λειτουργίες, όπως την εντολή Hey Google"</string> <string name="data_saver_description" msgid="4995164271550590517">"Προκειμένου να μειωθεί η χρήση δεδομένων, η Εξοικονόμηση δεδομένων αποτρέπει την αποστολή ή λήψη δεδομένων από ορισμένες εφαρμογές στο παρασκήνιο. Μια εφαρμογή που χρησιμοποιείτε αυτήν τη στιγμή μπορεί να χρησιμοποιήσει δεδομένα αλλά με μικρότερη συχνότητα. Για παράδειγμα, οι εικόνες μπορεί να μην εμφανίζονται μέχρι να τις πατήσετε."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Ενεργ.Εξοικονόμησης δεδομένων;"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ενεργοποίηση"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 77c6d4e55937..0f1566b10347 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'\n\n"<annotation id="url">"Learn more"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you\'re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index e8452bbbb691..84b3ce1ffc22 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like \"Hey Google\"\n\n"<annotation id="url">"Learn more"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like \"Hey Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you\'re currently using can access data, but may do so less frequently. This may mean, for example, that images don\'t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index ee1716840136..d9a2bdba5f10 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'\n\n"<annotation id="url">"Learn more"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app that you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 4733daf0008b..1209f2bc4318 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'\n\n"<annotation id="url">"Learn more"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects and other features like \'Hey Google\'"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects and other features like “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app that you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index dee052668a1e..7f29fd463403 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Updated by your admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Deleted by your admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects, and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation>""</string> - <string name="battery_saver_description" msgid="8587408568232177204">"To extend battery life, Battery Saver:\n\n•Turns on Dark theme\n•Turns off or restricts background activity, some visual effects, and other features like “Hey Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects, and other features like “Hey Google”\n\n"<annotation id="url">"Learn more"</annotation>""</string> + <string name="battery_saver_description" msgid="6794188153647295212">"To extend battery life, Battery Saver:\n\n• Turns on Dark theme\n• Turns off or restricts background activity, some visual effects, and other features like “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Turn on Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Turn on"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 8276684ea50f..f8ead2795a9a 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Tu administrador actualizó este paquete"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Tu administrador borró este paquete"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Aceptar"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para extender la duración de la batería, el Ahorro de batería hace lo siguiente:\n\n•Activa el Tema oscuro.\n•Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Hey Google\".\n\n"<annotation id="url">"Más información"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para extender la duración de batería, el Ahorro de batería hace lo siguiente:\n\n•Activa el Tema oscuro.\n•Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Hey Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para extender la duración de batería, el Ahorro de batería hace lo siguiente:\n\n• Activa el Tema oscuro.\n• Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Hey Google\".\n\n"<annotation id="url">"Más información"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para extender la duración de batería, el Ahorro de batería hace lo siguiente:\n\n• Activa el Tema oscuro.\n• Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Hey Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Para reducir el uso de datos, el modo Ahorro de datos evita que algunas apps envíen y reciban datos en segundo plano. La app que estés usando podrá acceder a los datos, pero con menor frecuencia. De esta forma, por ejemplo, las imágenes no se mostrarán hasta que las presiones."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"¿Deseas activar Ahorro de datos?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activar"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index d312d859a58c..741c89f0e5d9 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Actualizado por el administrador"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminado por el administrador"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Aceptar"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para que la batería dure más, el modo Ahorro de batería hace lo siguiente:\n\n• Activa el tema oscuro\n•Desactiva o restringe actividad en segundo plano, algunos efectos visuales y otras funciones como \"Ok Google\"\n\n"<annotation id="url">"Más información"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para que la batería dure más, el modo Ahorro de batería hace lo siguiente:\n\n• Activa el tema oscuro\n• Desactiva o restringe actividad en segundo plano, algunos efectos visuales y otras funciones como \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para que la batería dure más, Ahorro de batería hace lo siguiente:\n\n• Activa el tema oscuro.\n• Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Ok Google\".\n\n"<annotation id="url">"Más información"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para que la batería dure más, Ahorro de batería hace lo siguiente:\n\n• Activa el tema oscuro.\n• Desactiva o restringe la actividad en segundo plano, algunos efectos visuales y otras funciones, como \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"El modo Ahorro de datos evita que algunas aplicaciones envíen o reciban datos en segundo plano, lo que puede reducir el uso de datos. Una aplicación activa puede acceder a los datos, aunque con menos frecuencia. Esto significa que es posible que, por ejemplo, algunas imágenes no se muestren hasta que las toques."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"¿Activar Ahorro de datos?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activar"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 94d6e5e3251d..d724046c2a73 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Administraator on seda värskendanud"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Administraator on selle kustutanud"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n\n• Lülitab sisse tumeda teema.\n• Lülitab välja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Ok Google”) või piirab neid.\n\n"<annotation id="url">"Lisateave"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n\n• Lülitab sisse tumeda teema.\n• Lülitab välja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Ok Google”) või piirab neid."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n\n• Lülitab sisse tumeda teema.\n• Lülitab välja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Ok Google”) või piirab neid.\n\n"<annotation id="url">"Lisateave"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Aku tööea pikendamiseks teeb akusäästja järgmist.\n\n• Lülitab sisse tumeda teema.\n• Lülitab välja taustategevused, mõned visuaalsed efektid ja muud funktsioonid (nt „Ok Google”) või piirab neid."</string> <string name="data_saver_description" msgid="4995164271550590517">"Andmekasutuse vähendamiseks keelab andmemahu säästja mõne rakenduse puhul andmete taustal saatmise ja vastuvõtmise. Rakendus, mida praegu kasutate, pääseb andmesidele juurde, kuid võib seda teha väiksema sagedusega. Seetõttu võidakse näiteks pildid kuvada alles siis, kui neid puudutate."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Lülitada andmemahu säästja sisse?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Lülita sisse"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 506069caa934..24d3eef619e8 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Administratzaileak eguneratu du"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Administratzaileak ezabatu du"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Ados"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Bateriaren iraupena luzatzeko, erabili bateria-aurrezlea:\n\n• Gai iluna aktibatzen du.\n• Desaktibatu edo murriztu egiten ditu atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk, hala nola \"Ok Google\".\n\n"<annotation id="url">"Lortu informazio gehiago"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Bateriaren iraupena luzatzeko, erabili bateria-aurrezlea:\n\n• Gai iluna aktibatzen du.\n• Desaktibatu edo murriztu egiten ditu atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk, hala nola \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Bateriaren iraupena luzatzeko, erabili bateria-aurrezlea:\n\n• Gai iluna aktibatzen du.\n• Desaktibatu edo murriztu egiten ditu atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk, hala nola \"Ok Google\".\n\n"<annotation id="url">"Lortu informazio gehiago"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Bateriaren iraupena luzatzeko, erabili bateria-aurrezlea:\n\n• Gai iluna aktibatzen du.\n• Atzeko planoko jarduerak, zenbait efektu bisual eta beste eginbide batzuk desaktibatzen edo murrizten ditu, hala nola \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Datuen erabilera murrizteko, atzeko planoan datuak bidaltzea eta jasotzea galarazten die datu-aurrezleak aplikazio batzuei. Une honetan erabiltzen ari zaren aplikazioak atzitu egin ahal izango ditu datuak, baina baliteke maiztasun txikiagoarekin atzitzea. Horrela, adibidez, baliteke irudiak ez erakustea haiek sakatu arte."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Datu-aurrezlea aktibatu nahi duzu?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktibatu"</string> @@ -1926,7 +1926,7 @@ <string name="time_picker_header_text" msgid="9073802285051516688">"Ezarri ordua"</string> <string name="time_picker_input_error" msgid="8386271930742451034">"Idatzi balio duen ordu bat"</string> <string name="time_picker_prompt_label" msgid="303588544656363889">"Idatzi ordua"</string> - <string name="time_picker_text_input_mode_description" msgid="4761160667516611576">"Ordua idazteko, aldatu testua idazteko metodora."</string> + <string name="time_picker_text_input_mode_description" msgid="4761160667516611576">"Ordua idazteko, aldatu testua idazteko modura."</string> <string name="time_picker_radial_mode_description" msgid="1222342577115016953">"Aldatu erloju modura ordua zehazteko."</string> <string name="autofill_picker_accessibility_title" msgid="4425806874792196599">"Betetze automatikoaren aukerak"</string> <string name="autofill_save_accessibility_title" msgid="1523225776218450005">"Gorde betetze automatikoarekin erabiltzeko"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index f0440b517377..b0b533858b3a 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"توسط سرپرست سیستم بهروزرسانی شد"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"توسط سرپرست سیستم حذف شد"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"تأیید"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n\n•«طرح زمینه تیره» را روشن میکند\n•فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مانند «Ok Google» را خاموش یا محدود میکند\n\n"<annotation id="url">"بیشتر بدانید"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n\n•«طرح زمینه تیره» را روشن میکند\n•فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مانند «Ok Google» را خاموش یا محدود میکند"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n\n• «طرح زمینه تیره» را روشن میکند\n• فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مانند «Ok Google» را خاموش یا محدود میکند\n\n"<annotation id="url">"بیشتر بدانید"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"برای افزایش عمر باتری، «بهینهسازی باتری»:\n\n• «طرح زمینه تیره» را روشن میکند\n• فعالیت پسزمینه، برخی جلوههای بصری، و دیگر ویژگیها مثل «Ok Google» را خاموش یا محدود میکند"</string> <string name="data_saver_description" msgid="4995164271550590517">"«صرفهجویی داده»، برای کمک به کاهش مصرف داده، از ارسال و دریافت داده در پسزمینه ازطرف بعضی برنامهها جلوگیری میکند. برنامهای که درحالحاضر استفاده میکنید میتواند به دادهها دسترسی داشته باشد اما دفعات دسترسی آن محدود است.این یعنی، برای مثال، تصاویر تازمانیکه روی آنها ضربه نزنید نشان داده نمیشوند."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"«صرفهجویی داده» روشن شود؟"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"روشن کردن"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index bb7cac0803ab..815daaa5d7ae 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1159,8 +1159,8 @@ <string name="noApplications" msgid="1186909265235544019">"Yksikään sovellus ei voi suorittaa tätä toimintoa."</string> <string name="aerr_application" msgid="4090916809370389109">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyi."</string> <string name="aerr_process" msgid="4268018696970966407">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyi."</string> - <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyy toistuvasti."</string> - <string name="aerr_process_repeated" msgid="1153152413537954974">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyy toistuvasti."</string> + <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyy toistuvasti"</string> + <string name="aerr_process_repeated" msgid="1153152413537954974">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyy toistuvasti"</string> <string name="aerr_restart" msgid="2789618625210505419">"Avaa sovellus uudelleen"</string> <string name="aerr_report" msgid="3095644466849299308">"Lähetä palautetta"</string> <string name="aerr_close" msgid="3398336821267021852">"Sulje"</string> @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Järjestelmänvalvoja päivitti tämän."</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Järjestelmänvalvoja poisti tämän."</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Parantaakseen akunkestoa Virransäästö\n\n•·laittaa tumman teeman päälle\n•·laittaa pois päältä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Hei Google).\n\n"<annotation id="url">"Lue lisää"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Parantaakseen akunkestoa Virransäästö\n\n•·laittaa tumman teeman päälle\n•·laittaa pois päältä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Hei Google)."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Parantaakseen akunkestoa Virransäästö\n\n•·laittaa tumman teeman päälle\n•·laittaa pois päältä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Ok Google).\n\n"<annotation id="url">"Lue lisää"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Parantaakseen akunkestoa Virransäästö\n\n•·laittaa tumman teeman päälle\n•·laittaa pois päältä tai rajoittaa taustatoimintoja, joitakin visuaalisia tehosteita ja muita ominaisuuksia (esim. Ok Google)."</string> <string name="data_saver_description" msgid="4995164271550590517">"Data Saver estää joitakin sovelluksia lähettämästä tai vastaanottamasta tietoja taustalla, jotta datan käyttöä voidaan vähentää. Käytössäsi oleva sovellus voi yhä käyttää dataa, mutta se saattaa tehdä niin tavallista harvemmin. Tämä voi tarkoittaa esimerkiksi sitä, että kuva ladataan vasta, kun kosketat sitä."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Otetaanko Data Saver käyttöön?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ota käyttöön"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 1b530a4806ff..d3323d733824 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Mise à jour par votre administrateur"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Supprimé par votre administrateur"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n\n•·Active le thème sombre\n•·Désactive ou limite l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Ok Google »\n\n"<annotation id="url">"En savoir plus"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n\n•·Active le thème sombre\n•·Désactive ou limite l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Ok Google »"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n\n•·Active le thème sombre\n•·Désactive ou limite l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Ok Google »\n\n"<annotation id="url">"En savoir plus"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Pour prolonger l\'autonomie de la pile, l\'économiseur de pile effectue les actions suivantes :\n\n•·Active le thème sombre\n•·Désactive ou limite l\'activité en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme « Ok Google »"</string> <string name="data_saver_description" msgid="4995164271550590517">"Pour aider à diminuer l\'utilisation des données, la fonctionnalité Économiseur de données empêche certaines applications d\'envoyer ou de recevoir des données en arrière-plan. Une application que vous utilisez actuellement peut accéder à des données, mais peut le faire moins souvent. Cela peut signifier, par exemple, que les images ne s\'affichent pas jusqu\'à ce que vous les touchiez."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Activer l\'économiseur de données?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activer"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 80c8f645b217..4a1646f8ba30 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Mis à jour par votre administrateur"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Supprimé par votre administrateur"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Pour prolonger l\'autonomie de la batterie, l\'économiseur de batterie :\n\n·• active le thème sombre\n·• désactive ou restreint les activités en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme \"Ok Google\"\n\n"<annotation id="url">"En savoir plus"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Pour prolonger l\'autonomie de la batterie, l\'économiseur de batterie :\n\n·• active le thème sombre\n • désactive ou restreint les activités en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Pour prolonger l\'autonomie de la batterie, l\'économiseur de batterie :\n\n·• active le thème sombre ;\n·• désactive ou restreint les activités en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme \"Hey Google\".\n\n"<annotation id="url">"En savoir plus"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Pour prolonger l\'autonomie de la batterie, l\'économiseur de batterie :\n\n• active le thème sombre ;\n • désactive ou restreint les activités en arrière-plan, certains effets visuels et d\'autres fonctionnalités, comme \"Hey Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Pour réduire la consommation de données, l\'économiseur de données empêche certaines applications d\'envoyer ou de recevoir des données en arrière-plan. Ainsi, les applications que vous utilisez peuvent toujours accéder aux données, mais pas en permanence. Par exemple, il se peut que les images ne s\'affichent pas tant que vous n\'appuyez pas dessus."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Activer l\'économiseur de données ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activer"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index bd328b542966..54e17faf9b4a 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Actualizado polo teu administrador"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminado polo teu administrador"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Aceptar"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n\n•Activa o tema escuro\n•Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\"\n\n"<annotation id="url">"Máis información"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n\n•Activa o tema escuro\n•Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n\n• Activa o tema escuro.\n• Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\".\n\n"<annotation id="url">"Máis información"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para aumentar a duración da batería, a función Aforro de batería fai o seguinte:\n\n• Activa o tema escuro\n• Desactiva ou restrinxe a actividade en segundo plano, algúns efectos visuais e outras funcións, como \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"Para contribuír a reducir o uso de datos, o aforro de datos impide que algunhas aplicacións envíen ou reciban datos en segundo plano. Cando esteas utilizando unha aplicación, esta poderá acceder aos datos, pero é posible que o faga con menos frecuencia. Por exemplo, é posible que as imaxes non se mostren ata que as toques."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Queres activar o aforro de datos?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activar"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 8a959ef4170b..be17cfd03115 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -854,7 +854,7 @@ <string name="lockscreen_transport_stop_description" msgid="1449552232598355348">"રોકો"</string> <string name="lockscreen_transport_rew_description" msgid="7680106856221622779">"રીવાઇન્ડ કરો"</string> <string name="lockscreen_transport_ffw_description" msgid="4763794746640196772">"ઝડપી ફોરવર્ડ કરો"</string> - <string name="emergency_calls_only" msgid="3057351206678279851">"ફક્ત કટોકટીના કૉલ્સ"</string> + <string name="emergency_calls_only" msgid="3057351206678279851">"ફક્ત ઇમર્જન્સી કૉલ"</string> <string name="lockscreen_network_locked_message" msgid="2814046965899249635">"નેટવર્ક લૉક થયું"</string> <string name="lockscreen_sim_puk_locked_message" msgid="6618356415831082174">"સિમ કાર્ડ, PUK-લૉક કરેલ છે."</string> <string name="lockscreen_sim_puk_locked_instructions" msgid="5307979043730860995">"વપરાશકર્તા માર્ગદર્શિકા જુઓ અથવા ગ્રાહક સંભાળનો સંપર્ક કરો."</string> @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"તમારા વ્યવસ્થાપક દ્વારા અપડેટ કરવામાં આવેલ છે"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"તમારા વ્યવસ્થાપક દ્વારા કાઢી નાખવામાં આવેલ છે"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ઓકે"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n\n•ઘેરી થીમ ચાલુ કરે છે\n•બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “ઓકે Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે\n\n"<annotation id="url">"વધુ જાણો"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n\n•ઘેરી થીમ ચાલુ કરે છે\n•બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “ઓકે Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n\n• ઘેરી થીમ ચાલુ કરે છે\n• બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “ઓકે Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે\n\n"<annotation id="url">"વધુ જાણો"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"બૅટરીની આવરદા વધારવા માટે, બૅટરી સેવર:\n\n• ઘેરી થીમ ચાલુ કરે છે\n• બૅકગ્રાઉન્ડ પ્રવૃત્તિ, અમુક વિઝ્યુઅલ ઇફેક્ટ અને “ઓકે Google” જેવી અન્ય સુવિધાઓ બંધ અથવા પ્રતિબંધિત કરે છે"</string> <string name="data_saver_description" msgid="4995164271550590517">"ડેટા વપરાશને ઘટાડવામાં સહાય માટે, ડેટા સેવર કેટલીક ઍપને બૅકગ્રાઉન્ડમાં ડેટા મોકલવા અથવા પ્રાપ્ત કરવાથી અટકાવે છે. તમે હાલમાં ઉપયોગ કરી રહ્યાં છો તે ઍપ ડેટાને ઍક્સેસ કરી શકે છે, પરંતુ તે આ ક્યારેક જ કરી શકે છે. આનો અર્થ એ હોઈ શકે છે, ઉદાહરણ તરીકે, છબીઓ ત્યાં સુધી પ્રદર્શિત થશે નહીં જ્યાં સુધી તમે તેને ટૅપ નહીં કરો."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ડેટા સેવર ચાલુ કરીએ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ચાલુ કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 4f3d89009323..97118f8bffae 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"आपके व्यवस्थापक ने अपडेट किया है"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"आपके व्यवस्थापक ने हटा दिया है"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ठीक है"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"बैटरी लाइफ़ बढ़ाने के लिए, बैटरी सेवर:\n\n•गहरे रंग वाली थीम चालू करता है\n•बैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और \"Hey Google\" जैसी दूसरी सुविधाएं इस्तेमाल करने से रोकता है या उन्हें बंद कर देता है\n\n"<annotation id="url">"ज़्यादा जानें"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"बैटरी लाइफ़ बढ़ाने के लिए, बैटरी सेवर:\n\n•गहरे रंग वाली थीम चालू करता है\n•बैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और \"Hey Google\" जैसी दूसरी सुविधाएं इस्तेमाल करने से रोकता है या उन्हें बंद कर देता है"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"बैटरी लाइफ़ बढ़ाने के लिए, बैटरी सेवर:\n\n• गहरे रंग वाली थीम चालू करता है\n• बैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और \"Hey Google\" जैसी दूसरी सुविधाएं इस्तेमाल करने से रोकता है या इन्हें बंद कर देता है\n\n"<annotation id="url">"ज़्यादा जानें"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"बैटरी लाइफ़ बढ़ाने के लिए, बैटरी सेवर:\n\n• गहरे रंग वाली थीम चालू करता है\n• बैकग्राउंड की गतिविधि, कुछ विज़ुअल इफ़ेक्ट, और \"Hey Google\" जैसी दूसरी सुविधाएं इस्तेमाल करने से रोकता है या इन्हें बंद कर देता है"</string> <string name="data_saver_description" msgid="4995164271550590517">"डेटा खर्च को कम करने के लिए, डेटा बचाने की सेटिंग कुछ ऐप्लिकेशन को बैकग्राउंड में डेटा भेजने या डेटा पाने से रोकती है. फ़िलहाल, आप जिस ऐप्लिकेशन का इस्तेमाल कर रहे हैं वह डेटा ऐक्सेस कर सकता है, लेकिन ऐसा कभी-कभी ही हो पाएगा. उदाहरण के लिए, इमेज तब तक दिखाई नहीं देंगी जब तक कि आप उन पर टैप नहीं करते."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"डेटा बचाने की सेटिंग चालू करें?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"चालू करें"</string> @@ -2030,7 +2030,7 @@ <item quantity="one"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> फ़ाइलें</item> <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> फ़ाइलें</item> </plurals> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"शेयर करने के लिए किसी व्यक्ति का सुझाव नहीं दिया गया है"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"शेयर करने के लिए, किसी व्यक्ति का सुझाव नहीं दिया गया है"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"ऐप्लिकेशन की सूची"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"इस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऐसा कर सकता है."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"होम"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 503eab8da081..a1b303ee7cd4 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ažurirao administrator"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Izbrisao administrator"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"U redu"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Da bi se produljilo trajanje baterije, Štednja baterije:\n\n• Uključuje Tamnu temu.\n• Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\".\n\n"<annotation id="url">"Saznajte više"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Da bi se produljilo trajanje baterije, Štednja baterije:\n\n• Uključuje Tamnu temu.\n• Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Da bi se produljilo trajanje baterije, Štednja baterije:\n\n• Uključuje Tamnu temu.\n• Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\".\n\n"<annotation id="url">"Saznajte više"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Da bi se produljilo trajanje baterije, Štednja baterije:\n\n• Uključuje Tamnu temu.\n• Isključuje ili ograničava aktivnosti u pozadini, neke vizualne efekte i druge značajke kao što je \"Hey Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Da bi se smanjio podatkovni promet, značajka Štednja podatkovnog prometa onemogućuje nekim aplikacijama slanje ili primanje podataka u pozadini. Aplikacija koju trenutačno upotrebljavate može pristupiti podacima, no možda će to činiti rjeđe. To može značiti da se, na primjer, slike neće prikazivati dok ih ne dodirnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Uključiti Štednju podatkovnog prometa?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Uključi"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index bdd12d2a8418..ff0d4709c970 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"A rendszergazda által frissítve"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"A rendszergazda által törölve"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n\n• Bekapcsolja a sötét témát.\n• Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat.\n\n"<annotation id="url">"További információ"</annotation>"."</string> - <string name="battery_saver_description" msgid="8587408568232177204">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n\n• Bekapcsolja a sötét témát.\n• Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n\n• Bekapcsolja a sötét témát.\n• Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat.\n\n"<annotation id="url">"További információ"</annotation>"."</string> + <string name="battery_saver_description" msgid="6794188153647295212">"Az Akkumulátorkímélő mód az akkumulátor üzemidejének növelése érdekében a következőket teszi:\n\n• Bekapcsolja a sötét témát.\n• Kikapcsolja vagy korlátozza a háttérben futó tevékenységeket, egyes vizuális effekteket, az „Ok Google” parancsot és egyéb funkciókat."</string> <string name="data_saver_description" msgid="4995164271550590517">"Az adatforgalom csökkentése érdekében az Adatforgalom-csökkentő megakadályozza, hogy egyes alkalmazások adatokat küldjenek vagy fogadjanak a háttérben. Az Ön által jelenleg használt alkalmazások hozzáférhetnek az adatokhoz, de csak ritkábban. Ez például azt jelentheti, hogy a képek csak rákoppintás után jelennek meg."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Bekapcsolja az Adatforgalom-csökkentőt?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Bekapcsolás"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index f1b474775082..05c447d50f7b 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Թարմացվել է ձեր ադմինիստրատորի կողմից"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Ջնջվել է ձեր ադմինիստրատորի կողմից"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Եղավ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Մարտկոցի աշխատաժամանակը երկարացնելու համար «Մարտկոցի տնտեսում» գործառույթը.\n\n•Միացնում է մուգ թեման։\n•Անջատում կամ սահմանափակում է աշխատանքը ֆոնային ռեժիմում, որոշ վիզուալ էֆեկտներ և այլ գործառույթներ, օրինակ՝ «Ok Google» հրահանգը։\n\n"<annotation id="url">"Իմանալ ավելին"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Մարտկոցի աշխատաժամանակը երկարացնելու համար «Մարտկոցի տնտեսում» գործառույթը.\n\n•Միացնում է մուգ թեման։\n•Անջատում կամ սահմանափակում է աշխատանքը ֆոնային ռեժիմում, որոշ վիզուալ էֆեկտներ և այլ գործառույթներ, օրինակ՝ «Ok Google» հրահանգը:"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Մարտկոցի աշխատաժամանակը երկարացնելու համար «Մարտկոցի տնտեսում» գործառույթը՝\n\n• Միացնում է մուգ թեման։\n• Անջատում կամ սահմանափակում է աշխատանքը ֆոնային ռեժիմում, որոշ վիզուալ էֆեկտներ և այլ գործառույթներ, օրինակ՝ «Ok Google» հրահանգը։\n\n"<annotation id="url">"Իմանալ ավելին"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Մարտկոցի աշխատաժամանակը երկարացնելու համար «Մարտկոցի տնտեսում» գործառույթը՝\n\n• Միացնում է մուգ թեման։\n• Անջատում կամ սահմանափակում է աշխատանքը ֆոնային ռեժիմում, որոշ վիզուալ էֆեկտներ և այլ գործառույթներ, օրինակ՝ «Ok Google» հրահանգը։"</string> <string name="data_saver_description" msgid="4995164271550590517">"Թրաֆիկի տնտեսման ռեժիմում որոշ հավելվածների համար տվյալների ֆոնային փոխանցումն անջատված է։ Հավելվածը, որն օգտագործում եք, կարող է տվյալներ փոխանցել և ստանալ, սակայն ոչ այնքան հաճախ: Օրինակ՝ պատկերները կցուցադրվեն միայն դրանց վրա սեղմելուց հետո։"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Միացնե՞լ թրաֆիկի տնտեսումը"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Միացնել"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 10ea70ee78ff..a6f68d171ec4 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Diupdate oleh admin Anda"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Dihapus oleh admin Anda"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Oke"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai:\n\n•Mengaktifkan Tema gelap\n•Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”\n\n"<annotation id="url">"Pelajari lebih lanjut"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai:\n\n•Mengaktifkan Tema gelap\n•Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai akan:\n\n• Mengaktifkan Tema gelap\n• Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”\n\n"<annotation id="url">"Pelajari lebih lanjut"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Untuk memperpanjang masa pakai baterai, Penghemat Baterai akan:\n\n• Mengaktifkan Tema gelap\n• Menonaktifkan atau membatasi aktivitas di latar belakang, beberapa efek visual, dan fitur lain seperti “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Untuk membantu mengurangi penggunaan data, Penghemat Data mencegah beberapa aplikasi mengirim atau menerima data di latar belakang. Aplikasi yang sedang digunakan dapat mengakses data, tetapi frekuensinya agak lebih jarang. Misalnya saja, gambar hanya akan ditampilkan setelah diketuk."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Aktifkan Penghemat Data?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktifkan"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 7db90ebcaf7a..92f6f2488d18 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Kerfisstjóri uppfærði"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Kerfisstjóri eyddi"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Í lagi"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Til að auka rafhlöðuendingu gerir rafhlöðusparnaður eftirfarandi:\n\n•Kveikir á dökku þema\n•Slekkur á eða takmarkar bakgrunnsvirkni, tilteknar myndbrellur og aðra eiginleika eins og „Ok Google“\n\n"<annotation id="url">"Frekari upplýsingar"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Til að auka rafhlöðuendingu gerir rafhlöðusparnaður eftirfarandi:\n\n•Kveikir á dökku þema\n•Slekkur á eða takmarkar bakgrunnsvirkni, tilteknar myndbrellur og aðra eiginleika eins og „Ok Google“"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Til að auka rafhlöðuendingu gerir rafhlöðusparnaður eftirfarandi:\n\n•·Kveikir á dökku þema\n•·Slekkur á eða takmarkar bakgrunnsvirkni, tilteknar myndbrellur og aðra eiginleika eins og „Ok Google“\n\n"<annotation id="url">"Frekari upplýsingar"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Til að auka rafhlöðuendingu gerir rafhlöðusparnaður eftirfarandi:\n\n•·Kveikir á dökku þema\n•·Slekkur á eða takmarkar bakgrunnsvirkni, tilteknar myndbrellur og aðra eiginleika eins og „Ok Google“"</string> <string name="data_saver_description" msgid="4995164271550590517">"Gagnasparnaður getur hjálpað til við að draga úr gagnanotkun með því að hindra forrit í að senda eða sækja gögn í bakgrunni. Forrit sem er í notkun getur náð í gögn, en gerir það kannski sjaldnar. Niðurstaðan getur verið, svo dæmi sé tekið, að myndir eru ekki birtar fyrr en þú ýtir á þær."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Kveikja á gagnasparnaði?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Kveikja"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index d617a3a4cf17..8f857fa32c73 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Aggiornato dall\'amministratore"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminato dall\'amministratore"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Per estendere la durata della batteria, la funzionalità di risparmio energetico:\n\n•Attiva il tema scuro\n•Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\"\n\n"<annotation id="url">"Ulteriori informazioni"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Per estendere la durata della batteria, la funzionalità di risparmio energetico:\n\n•Attiva il tema scuro\n•Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Per estendere la durata della batteria, la funzionalità di risparmio energetico:\n\n• Attiva il tema scuro\n• Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\"\n\n"<annotation id="url">"Ulteriori informazioni"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Per estendere la durata della batteria, la funzionalità di risparmio energetico:\n\n• Attiva il tema scuro\n• Disattiva o limita le attività in background, alcuni effetti visivi e altre funzionalità come \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"Per contribuire a ridurre l\'utilizzo dei dati, la funzione Risparmio dati impedisce ad alcune app di inviare o ricevere dati in background. Un\'app in uso può accedere ai dati, ma potrebbe farlo con meno frequenza. Esempio: le immagini non vengono visualizzate finché non le tocchi."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Attivare Risparmio dati?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Attiva"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index d1072a1de2c1..4d6d8155a981 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1203,7 +1203,7 @@ <string name="aerr_process_repeated" msgid="1153152413537954974">"האפליקציה <xliff:g id="PROCESS">%1$s</xliff:g> נעצרת שוב ושוב"</string> <string name="aerr_restart" msgid="2789618625210505419">"פתח שוב את האפליקציה"</string> <string name="aerr_report" msgid="3095644466849299308">"משוב"</string> - <string name="aerr_close" msgid="3398336821267021852">"סגור"</string> + <string name="aerr_close" msgid="3398336821267021852">"סגירה"</string> <string name="aerr_mute" msgid="2304972923480211376">"השתק עד הפעלה מחדש של המכשיר"</string> <string name="aerr_wait" msgid="3198677780474548217">"המתן"</string> <string name="aerr_close_app" msgid="8318883106083050970">"סגור את האפליקציה"</string> @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"עודכנה על ידי מנהל המערכת"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"נמחקה על ידי מנהל המערכת"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"אישור"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"כדי להאריך את חיי הסוללה, התכונה \'חיסכון בסוללה\':\n\n•מפעילה עיצוב כהה\n•מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו Ok Google\n\n"<annotation id="url">"מידע נוסף"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"כדי להאריך את חיי הסוללה, התכונה \'חיסכון בסוללה\':\n\n•מפעילה עיצוב כהה\n•מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו Ok Google"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"כדי להאריך את חיי הסוללה, התכונה \'חיסכון בסוללה\':\n\n• מפעילה עיצוב כהה\n• מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו Ok Google\n\n"<annotation id="url">"למידע נוסף"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"כדי להאריך את חיי הסוללה, התכונה \'חיסכון בסוללה\':\n\n• מפעילה עיצוב כהה\n• מכבה או מגבילה פעילות ברקע, חלק מהאפקטים החזותיים ותכונות אחרות כמו Ok Google"</string> <string name="data_saver_description" msgid="4995164271550590517">"כדי לסייע בהפחתת השימוש בנתונים, חוסך הנתונים (Data Saver) מונע מאפליקציות מסוימות שליחה או קבלה של נתונים ברקע. אפליקציה שבה נעשה שימוש כרגע יכולה לגשת לנתונים, אבל בתדירות נמוכה יותר. המשמעות היא, למשל, שתמונות יוצגו רק לאחר שמקישים עליהן."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"להפעיל את חוסך הנתונים?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"הפעל"</string> @@ -1925,7 +1925,7 @@ <string name="floating_toolbar_open_overflow_description" msgid="2260297653578167367">"אפשרויות נוספות"</string> <string name="floating_toolbar_close_overflow_description" msgid="3949818077708138098">"סגור את האפשרויות הנוספות"</string> <string name="maximize_button_text" msgid="4258922519914732645">"הגדל"</string> - <string name="close_button_text" msgid="10603510034455258">"סגור"</string> + <string name="close_button_text" msgid="10603510034455258">"סגירה"</string> <string name="notification_messaging_title_template" msgid="772857526770251989">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string> <plurals name="selected_count" formatted="false" msgid="3946212171128200491"> <item quantity="two">בחרת <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -2098,7 +2098,7 @@ <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> קבצים</item> <item quantity="one"><xliff:g id="FILE_NAME_0">%s</xliff:g> + קובץ אחד (<xliff:g id="COUNT_1">%d</xliff:g>)</item> </plurals> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"אין אנשים מומלצים שניתן לשתף איתם"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"אין אנשים שניתן לשתף איתם"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"רשימת האפליקציות"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"לאפליקציה זו לא ניתנה הרשאת הקלטה, אבל אפשר להקליט אודיו באמצעות התקן ה-USB הזה."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"בית"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index eabf37c50878..27889fb9b512 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"管理者により更新されています"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"管理者により削除されています"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n\n•ダークテーマをオンにする\n•バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能をオフにする、または制限する\n\n"<annotation id="url">"詳細"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n\n•ダークテーマをオンにする\n•バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能をオフにする、または制限する"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n\n• ダークテーマを ON にする\n• バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能を OFF にする、または制限する\n\n"<annotation id="url">"詳細"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"電池を長持ちさせるためにバッテリー セーバーが行う操作:\n\n• ダークテーマを ON にする\n• バックグラウンド アクティビティ、一部の視覚効果や、「OK Google」などの機能を OFF にする、または制限する"</string> <string name="data_saver_description" msgid="4995164271550590517">"データセーバーは、一部のアプリによるバックグラウンドでのデータ送受信を停止することでデータ使用量を抑制します。使用中のアプリからデータを送受信することはできますが、その頻度は低くなる場合があります。この影響として、たとえば画像はタップしないと表示されないようになります。"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"データセーバーを ON にしますか？"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ON にする"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index a67cdc033736..6547185c4beb 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"განახლებულია თქვენი ადმინისტრატორის მიერ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"წაიშალა თქვენი ადმინისტრატორის მიერ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"კარგი"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ბატარეის მუშაობის გახანგრძლივების მიზნით, ბატარეის დამზოგველი:\n\n•ჩართავს ბნელ თემას\n•გამორთავს ან ზღუდავს ფონურ აქტივობას, გარკვეულ ვიზუალურ ეფექტებს და სხვა ფუნქციებს, მაგალითად, „Hey Google“\n\n"<annotation id="url">"შეიტყვეთ მეტი"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ბატარეის მუშაობის გახანგრძლივების მიზნით, ბატარეის დამზოგველი:\n\n•ჩართავს ბნელ თემას\n•გამორთავს ან ზღუდავს ფონურ აქტივობას, გარკვეულ ვიზუალურ ეფექტებს და სხვა ფუნქციებს, მაგალითად, „Hey Google“"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ბატარეის მუშაობის გახანგრძლივების მიზნით, ბატარეის დამზოგველი:\n\n• ჩართავს ბნელ თემას\n• გამორთავს ან ზღუდავს ფონურ აქტივობას, გარკვეულ ვიზუალურ ეფექტებს და სხვა ფუნქციებს, მაგალითად, „Hey Google“\n\n"<annotation id="url">"შეიტყვეთ მეტი"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ბატარეის მუშაობის გახანგრძლივების მიზნით, ბატარეის დამზოგი:\n\n• ჩართავს ბნელ თემას\n• გამორთავს ან შეზღუდავს ფონურ აქტივობას, გარკვეულ ვიზუალურ ეფექტებს და სხვა ფუნქციებს, მაგალითად, „Hey Google“"</string> <string name="data_saver_description" msgid="4995164271550590517">"მობილური ინტერნეტის მოხმარების შემცირების მიზნით, მონაცემთა დამზოგველი ზოგიერთ აპს ფონურ რეჟიმში მონაცემთა გაგზავნასა და მიღებას შეუზღუდავს. თქვენ მიერ ამჟამად გამოყენებული აპი მაინც შეძლებს მობილურ ინტერნეტზე წვდომას, თუმცა ამას ნაკლები სიხშირით განახორციელებს. ეს ნიშნავს, რომ, მაგალითად, სურათები არ გამოჩნდება მანამ, სანამ მათ საგანგებოდ არ შეეხებით."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ჩაირთოს მონაცემთა დამზოგველი?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ჩართვა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 351790d44b7b..3d53912ad62b 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Әкімші жаңартқан"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Әкімші жойған"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Жарайды"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Батарея жұмысының ұзақтығын арттыру үшін Battery Saver:\n\n•қараңғы тақырыпты іске қосады;\n•фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді немесе шектейді.\n\n"<annotation id="url">"Толығырақ"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Батарея жұмысының ұзақтығын арттыру үшін Battery Saver:\n\n•қараңғы тақырыпты іске қосады;\n•фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді немесе шектейді."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Батарея жұмысының ұзақтығын арттыру үшін Battery Saver:\n\n•қараңғы тақырыпты іске қосады;\n•фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді не шектейді.\n\n"<annotation id="url">"Толығырақ"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Батарея ұзағырақ жұмыс істеуі үшін, Battery Saver:\n\n• қараңғы тақырыпты қосады;\n•фондық жұмысты, кейбір визуалды әсерлерді және \"Ok Google\" сияқты басқа функцияларды өшіреді не шектейді."</string> <string name="data_saver_description" msgid="4995164271550590517">"Дерек шығынын азайту үшін Data Saver функциясы кейбір қолданбаларға деректерді фондық режимде жіберуге және алуға жол бермейді. Ашық тұрған қолданба деректерді пайдаланады, бірақ шектеулі шамада (мысалы, кескіндер оларды түрткенге дейін көрсетілмейді)."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Data Saver функциясын қосу керек пе?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Қосу"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 80be70a6a2a8..760d256ca62c 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ធ្វើបច្ចុប្បន្នភាពដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"លុបដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"យល់ព្រម"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម កម្មវិធីសន្សំថ្ម៖\n\n•បើករចនាប័ទ្មងងឹត\n•បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលជារូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Ok Google” ជាដើម\n\n"<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម កម្មវិធីសន្សំថ្ម៖\n\n•បើករចនាប័ទ្មងងឹត\n•បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលជារូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Ok Google” ជាដើម"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម កម្មវិធីសន្សំថ្ម៖\n\n• បើករចនាប័ទ្មងងឹត\n• បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលជារូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Ok Google” ជាដើម\n\n"<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ដើម្បីបង្កើនកម្រិតថាមពលថ្ម មុខងារសន្សំថ្ម៖\n\n• បើករចនាប័ទ្មងងឹត\n• បិទ ឬដាក់កំហិតលើសកម្មភាពផ្ទៃខាងក្រោយ ឥទ្ធិពលរូបភាពមួយចំនួន និងមុខងារផ្សេងទៀតដូចជា “Ok Google” ជាដើម"</string> <string name="data_saver_description" msgid="4995164271550590517">"ដើម្បីជួយកាត់បន្ថយការប្រើប្រាស់ទិន្នន័យ កម្មវិធីសន្សំសំចៃទិន្នន័យរារាំងកម្មវិធីមួយចំនួនមិនឲ្យបញ្ជូន ឬទទួលទិន្នន័យនៅផ្ទៃខាងក្រោយទេ។ កម្មវិធីដែលអ្នកកំពុងប្រើនាពេលបច្ចុប្បន្នអាចចូលប្រើប្រាស់ទិន្នន័យបាន ប៉ុន្តែអាចនឹងមិនញឹកញាប់ដូចមុនទេ។ ឧទាហរណ៍ រូបភាពមិនបង្ហាញទេ លុះត្រាតែអ្នកប៉ះរូបភាពទាំងនោះ។"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"បើកកម្មវិធីសន្សំសំចៃទិន្នន័យ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"បើក"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 69a402ef0c77..6513481089ad 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ ಅಪ್ಡೇಟ್ ಮಾಡಲ್ಪಟ್ಟಿದೆ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅಳಿಸಿದ್ದಾರೆ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ಸರಿ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n\n•ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n•ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ದೃಶ್ಯಾತ್ಮಕ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “ಹೇ Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ\n\n"<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n\n•ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n•ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ವಿಷುವಲ್ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “ಹೇ Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n\n• ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n•ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ದೃಶ್ಯಾತ್ಮಕ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “ಹೇ Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ\n\n"<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ವಿಸ್ತರಿಸಲು, ಬ್ಯಾಟರಿ ಸೇವರ್:\n\n• ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಆನ್ ಮಾಡುತ್ತದೆ\n• ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ, ಕೆಲವು ವಿಷುವಲ್ ಎಫೆಕ್ಟ್ಗಳು ಮತ್ತು “Ok Google” ನಂತಹ ಇತರ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ ಅಥವಾ ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string> <string name="data_saver_description" msgid="4995164271550590517">"ಡೇಟಾ ಬಳಕೆ ಕಡಿಮೆ ಮಾಡುವ ನಿಟ್ಟಿನಲ್ಲಿ, ಡೇಟಾ ಸೇವರ್ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಡೇಟಾ ಕಳುಹಿಸುವುದನ್ನು ಅಥವಾ ಸ್ವೀಕರಿಸುವುದನ್ನು ತಡೆಯುತ್ತದೆ. ನೀವು ಪ್ರಸ್ತುತ ಬಳಸುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು ಆದರೆ ಪದೇ ಪದೇ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಇದರರ್ಥ, ಉದಾಹರಣೆಗೆ, ನೀವು ಅವುಗಳನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವವರೆಗೆ ಆ ಚಿತ್ರಗಳು ಕಾಣಿಸಿಕೊಳ್ಳುವುದಿಲ್ಲ."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ಡೇಟಾ ಸೇವರ್ ಆನ್ ಮಾಡಬೇಕೇ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ಆನ್ ಮಾಡಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 421ae440a741..db8d379c4083 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"관리자에 의해 업데이트되었습니다."</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"관리자에 의해 삭제되었습니다."</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"확인"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"배터리 수명을 늘리기 위해 절전 모드가 다음과 같이 작동합니다.\n\n•어두운 테마를 사용 설정합니다.\n•백그라운드 활동, 일부 시각 효과 및 \'Hey Google\'과 같은 기타 기능을 사용 중지하거나 제한합니다.\n\n"<annotation id="url">"자세히 알아보기"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"배터리 수명을 늘리기 위해 절전 모드가 다음과 같이 작동합니다.\n\n•어두운 테마를 사용 설정합니다.\n•백그라운드 활동, 일부 시각 효과 및 \'Hey Google\'과 같은 기타 기능을 사용 중지하거나 제한합니다."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"배터리 수명을 늘리기 위해 절전 모드가 다음과 같이 작동합니다.\n\n• 어두운 테마를 사용 설정합니다.\n• 백그라운드 활동, 일부 시각 효과 및 \'Hey Google\'과 같은 기타 기능을 사용 중지하거나 제한합니다.\n\n"<annotation id="url">"자세히 알아보기"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"배터리 수명을 연장하기 위해 절전 모드가 다음과 같이 작동합니다.\n\n• 어두운 테마를 사용 설정합니다.\n• 백그라운드 활동, 일부 시각 효과 및 \'Hey Google\' 등의 기타 기능을 사용 중지하거나 제한합니다."</string> <string name="data_saver_description" msgid="4995164271550590517">"데이터 사용량을 줄이기 위해 데이터 절약 모드는 일부 앱이 백그라운드에서 데이터를 전송하거나 수신하지 못하도록 합니다. 현재 사용 중인 앱에서 데이터에 액세스할 수 있지만 빈도가 줄어듭니다. 예를 들면, 이미지를 탭하기 전에는 이미지가 표시되지 않습니다."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"데이터 절약 모드를 사용 설정하시겠습니까?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"사용 설정"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index f1bea56a62fd..c208396b278a 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Администраторуңуз жаңыртып койгон"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Администраторуңуз жок кылып салган"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ЖАРАЙТ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Батареянын мөөнөтүн узартуу үчүн, Батареяны үнөмдөгүч режими төмөнкүлөрдү аткарат:\n\n•Караңгы теманы күйгүзөт\n•Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт\n\n"<annotation id="url">"Кеңири маалымат"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Батареянын иштешин узартуу үчүн, Батареяны үнөмдөөчү режим:\n\n•Караңгы теманы күйгүзөт\n•Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Батареянын мөөнөтүн узартуу үчүн, Батареяны үнөмдөгүч режими төмөнкүлөрдү аткарат:\n\n• Караңгы теманы күйгүзөт\n• Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт\n\n"<annotation id="url">"Кеңири маалымат"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Батареянын мөөнөтүн узартуу үчүн, Батареяны үнөмдөгүч режими:\n\n• Караңгы теманы күйгүзөт\n• Фондогу аракеттерди, айрым визуалдык эффекттерди жана \"Окей Google\" сыяктуу башка функцияларды өчүрөт же чектейт"</string> <string name="data_saver_description" msgid="4995164271550590517">"Трафикти үнөмдөө режиминде айрым колдонмолор дайын-даректерди фондо өткөрө алышпайт. Учурда сиз пайдаланып жаткан колдонмо дайын-даректерди жөнөтүп/ала алат, бирок адаттагыдан азыраак өткөргөндүктөн, анын айрым функциялары талаптагыдай иштебей коюшу мүмкүн. Мисалы, сүрөттөр басылмайынча жүктөлбөйт."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Трафикти үнөмдөө режимин иштетесизби?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Күйгүзүү"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index f9456a7ff721..f388cfaed0ca 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ຖືກອັບໂຫລດໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ຖືກລຶບອອກໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ຕົກລົງ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ເພື່ອຍືດອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດແບັດເຕີຣີຈະ:\n\n•ເປີດໃຊ້ຮູບແບບສີສັນມືດ\n•ປິດ ຫຼື ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງ, ເອັບເຟັກດ້ານພາບບາງຢ່າງ ແລະ ຄຸນສົມບັດອື່ນໆ ເຊັ່ນ: “Ok Google”\n\n"<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ເພື່ອຍືດອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດແບັດເຕີຣີຈະ:\n\n•ເປີດໃຊ້ຮູບແບບສີສັນມືດ\n•ປິດ ຫຼື ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງ, ເອັບເຟັກດ້ານພາບບາງຢ່າງ ແລະ ຄຸນສົມບັດອື່ນໆ ເຊັ່ນ: “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ເພື່ອຍືດອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດແບັດເຕີຣີຈະ:\n\n• ເປີດໃຊ້ຮູບແບບສີສັນມືດ\n• ປິດ ຫຼື ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງ, ເອັບເຟັກດ້ານພາບບາງຢ່າງ ແລະ ຄຸນສົມບັດອື່ນໆ ເຊັ່ນ: “Ok Google”\n\n"<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ເພື່ອຍືດອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດແບັດເຕີຣີຈະ:\n\n• ເປີດໃຊ້ຮູບແບບສີສັນມືດ\n• ປິດ ຫຼື ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງ, ເອັບເຟັກດ້ານພາບບາງຢ່າງ ແລະ ຄຸນສົມບັດອື່ນໆ ເຊັ່ນ: “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"ເພື່ອຊ່ວຍຫຼຸດຜ່ອນການນຳໃຊ້ຂໍ້ມູນ, ຕົວປະຢັດອິນເຕີເນັດຈະປ້ອງກັນບໍ່ໃຫ້ບາງແອັບສົ່ງ ຫຼື ຮັບຂໍ້ມູນໃນພື້ນຫຼັງ. ແອັບໃດໜຶ່ງທີ່ທ່ານກຳລັງໃຊ້ຢູ່ຈະສາມາດເຂົ້າເຖິງຂໍ້ມູນໄດ້ ແຕ່ອາດເຂົ້າເຖິງໄດ້ຖີ່ໜ້ອຍລົງ. ນີ້ອາດໝາຍຄວາມວ່າ ຮູບພາບຕ່າງໆອາດບໍ່ສະແດງຈົນກວ່າທ່ານຈະແຕະໃສ່ກ່ອນ."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ເປີດຕົວປະຢັດອິນເຕີເນັດບໍ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ເປີດໃຊ້"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index de0f7478a604..d68cd8d3c822 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Atnaujino administratorius"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Ištrynė administratorius"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Gerai"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Kad akumuliatorius veiktų ilgiau, Akumuliatoriaus tausojimo priemonė:\n\n• įjungia tamsiąją temą;\n• išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Ok Google“.\n\n"<annotation id="url">"Sužinokite daugiau"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Kad akumuliatorius veiktų ilgiau, Akumuliatoriaus tausojimo priemonė:\n\n• įjungia tamsiąją temą;\n• išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Ok Google“."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Kad akumuliatorius veiktų ilgiau, Akumuliatoriaus tausojimo priemonė:\n\n• įjungia tamsiąją temą;\n• išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Ok Google“.\n\n"<annotation id="url">"Sužinokite daugiau"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Kad akumuliatorius veiktų ilgiau, Akumuliatoriaus tausojimo priemonė:\n\n• įjungia tamsiąją temą;\n• išjungia arba apriboja veiklą fone, kai kuriuos vaizdinius efektus ir kitas funkcijas, pvz., „Ok Google“."</string> <string name="data_saver_description" msgid="4995164271550590517">"Kad padėtų sumažinti duomenų naudojimą, Duomenų taupymo priemonė neleidžia kai kurioms programoms siųsti ar gauti duomenų fone. Šiuo metu naudojama programa gali pasiekti duomenis, bet tai bus daroma rečiau. Tai gali reikšti, kad, pvz., vaizdai nebus pateikiami, jei jų nepaliesite."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Įj. Duomenų taupymo priemonę?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Įjungti"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 818d61c421c4..9462c227a3cf 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Atjaunināja administrators"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Dzēsa administrators"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Labi"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Lai paildzinātu akumulatora darbību, akumulatora jaudas taupīšanas režīmā tiek veiktas tālāk norādītās darbības.\n\n• Tiek ieslēgts tumšais motīvs.\n• Tiek izslēgtas vai ierobežotas darbības fonā, noteikti vizuālie efekti un citas funkcijas, piemēram, “Ok Google”.\n\n"<annotation id="url">"Uzzināt vairāk"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Lai paildzinātu akumulatora darbību, akumulatora jaudas taupīšanas režīmā tiek veiktas tālāk norādītās darbības.\n\n• Tiek ieslēgts tumšais motīvs.\n• Tiek izslēgtas vai ierobežotas darbības fonā, noteikti vizuālie efekti un citas funkcijas, piemēram, “Ok Google”."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Lai paildzinātu akumulatora darbības laiku, ieslēdzot akumulatora jaudas taupīšanas režīmu, tiek veiktas tālāk norādītās darbības.\n\n• Tiek ieslēgts tumšais motīvs.\n• Tiek izslēgtas vai ierobežotas fonā veiktās darbības, daži vizuālie efekti un citas funkcijas, piemēram, “Ok Google”.\n\n"<annotation id="url">"Uzzināt vairāk"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Lai paildzinātu akumulatora darbības laiku, ieslēdzot akumulatora jaudas taupīšanas režīmu, tiek veiktas tālāk norādītās darbības.\n\n• Tiek ieslēgts tumšais motīvs.\n• Tiek izslēgtas vai ierobežotas fonā veiktās darbības, daži vizuālie efekti un citas funkcijas, piemēram, “Ok Google”."</string> <string name="data_saver_description" msgid="4995164271550590517">"Lai samazinātu datu lietojumu, datu lietojuma samazinātājs neļauj dažām lietotnēm fonā nosūtīt vai saņemt datus. Lietotne, kuru pašlaik izmantojat, var piekļūt datiem, bet, iespējams, piekļūs tiem retāk (piemēram, attēli tiks parādīti tikai tad, kad tiem pieskarsieties)."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vai ieslēgt datu lietojuma samazinātāju?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ieslēgt"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 5c720a3315a4..aee1fca01cb1 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ажурирано од администраторот"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Избришано од администраторот"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Во ред"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n\n•вклучува темна тема;\n•исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Ok Google“.\n\n"<annotation id="url">"Дознајте повеќе"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n\n•вклучува темна тема;\n•исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Ok Google“."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n\n• вклучува темна тема\n• исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Hey Google“\n\n"<annotation id="url">"Дознајте повеќе"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"За да го продолжи траењето на батеријата, „Штедачот на батерија“:\n\n• вклучува темна тема\n• исклучува или ограничува активност во заднина, некои визуелни ефекти и други функции како „Hey Google“"</string> <string name="data_saver_description" msgid="4995164271550590517">"За да се намали користењето интернет, „Штедачот на интернет“ спречува дел од апликациите да испраќаат или да примаат податоци во заднина. Одредена апликација што ја користите ќе може да користи интернет, но можеби тоа ќе го прави поретко. Ова значи, на пример, дека сликите нема да се прикажуваат додека не ги допрете."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Да се вклучи „Штедач на интернет“?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Вклучи"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index b4982ebdeeca..375cb98b0c4f 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"നിങ്ങളുടെ അഡ്മിൻ അപ്ഡേറ്റ് ചെയ്യുന്നത്"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"നിങ്ങളുടെ അഡ്മിൻ ഇല്ലാതാക്കുന്നത്"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ശരി"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ബാറ്ററി ലെെഫ് വികസിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\':\n\n•ഡാർക്ക് തീം ഓണാക്കും\n•പശ്ചാത്തല പ്രവർത്തനം, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “ഹേയ് Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യും\n\n"<annotation id="url">"കൂടുതലറിയുക"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ബാറ്ററി ലെെഫ് വികസിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\':\n\n•ഡാർക്ക് തീം ഓണാക്കും\n•പശ്ചാത്തല പ്രവർത്തനം, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “ഹേയ് Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യും"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ബാറ്ററി ലെെഫ് വർദ്ധിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\' ഇനിപ്പറയുന്നവ ചെയ്യുന്നു:\n\n•ഡാർക്ക് തീം ഓണാക്കുന്നു\n•പശ്ചാത്തല ആക്റ്റിവിറ്റി, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “Ok Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യന്നു\n\n"<annotation id="url">"കൂടുതലറിയുക"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ബാറ്ററി ലെെഫ് വർദ്ധിപ്പിക്കാൻ, \'ബാറ്ററി ലാഭിക്കൽ\' ഇനിപ്പറയുന്നവ ചെയ്യുന്നു:\n\n• ഡാർക്ക് തീം ഓണാക്കുന്നു\n• പശ്ചാത്തല ആക്റ്റിവിറ്റി, ചില വിഷ്വൽ ഇഫക്റ്റുകൾ, “Ok Google” പോലുള്ള മറ്റ് ഫീച്ചറുകൾ എന്നിവ ഓഫാക്കുകയോ നിയന്ത്രിക്കുകയോ ചെയ്യുന്നു"</string> <string name="data_saver_description" msgid="4995164271550590517">"ഡാറ്റാ ഉപയോഗം കുറയ്ക്കാൻ സഹായിക്കുന്നതിനായി പശ്ചാത്തലത്തിൽ ഡാറ്റ അയയ്ക്കുകയോ സ്വീകരിക്കുകയോ ചെയ്യുന്നതിൽ നിന്ന് ചില ആപ്പുകളെ ഡാറ്റാ സേവർ തടയുന്നു. നിങ്ങൾ നിലവിൽ ഉപയോഗിക്കുന്ന ഒരു ആപ്പിന് ഡാറ്റ ആക്സസ് ചെയ്യാനാകും, എന്നാൽ വല്ലപ്പോഴും മാത്രമെ സംഭവിക്കുന്നുള്ളു. ഇതിനർത്ഥം, ഉദാഹരണമായി നിങ്ങൾ ടാപ്പ് ചെയ്യുന്നത് വരെ ചിത്രങ്ങൾ പ്രദർശിപ്പിക്കുകയില്ല എന്നാണ്."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ഡാറ്റ സേവർ ഓണാക്കണോ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ഓണാക്കുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 02b9de5c1b95..1472c4e9f178 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Таны админ шинэчилсэн"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Таны админ устгасан"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Батарейн ажиллах хугацааг уртасгахын тулд Батарей хэмнэгч:\n\n•Бараан загварыг асаана\n•Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарлана\n\n"<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Батарейн ажиллах хугацааг уртасгахын тулд Батарей хэмнэгч:\n\n•Бараан загварыг асаана\n•Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарлана"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Батарейн ажиллах хугацааг уртасгахын тулд Батарей хэмнэгч:\n\n•Бараан загварыг асаадаг\n•Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарладаг\n\n"<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Батарей хэмнэгч нь батарейн ажиллах хугацааг уртасгахын тулд:\n\n• Бараан загварыг асаадаг\n• Арын үйл ажиллагаа, зарим визуал эффект болон “Hey Google” зэрэг бусад онцлогийг унтрааж эсвэл хязгаарладаг"</string> <string name="data_saver_description" msgid="4995164271550590517">"Дата ашиглалтыг багасгахын тулд дата хэмнэгч нь ар талд ажиллаж буй зарим апп-н өгөгдлийг илгээх болон авахаас сэргийлдэг. Таны одоогийн ашиглаж буй апп нь өгөгдөлд хандах боломжтой хэдий ч тогтмол хандахгүй. Энэ нь жишээлбэл зургийг товших хүртэл харагдахгүй гэсэн үг юм."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Дата хэмнэгчийг асаах уу?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Асаах"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index f5db8ccdb36b..6695de6c7a33 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"आपल्या प्रशासकाने अपडेट केले"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"आपल्या प्रशासकाने हटवले"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ओके"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"बॅटरीचे आयुष्य वाढवण्यासाठी बॅटरी सेव्हर:\n\n•गडद थीम सुरू करते\n•बॅकग्राउंड ॲक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि \"Ok Google\" यांसारखी वैशिष्ट्ये बंद किंवा मर्यादित करते.\n\n"<annotation id="url">"अधिक जाणून घ्या"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"बॅटरीचे आयुष्य वाढवण्यासाठी बॅटरी सेव्हर:\n\n•गडद थीम सुरू करते\n•बॅकग्राउंड ॲक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि \"Ok Google\" यांसारखी वैशिष्ट्ये बंद किंवा मर्यादित करते."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"बॅटरी लाइफ वाढवण्यासाठी बॅटरी सेव्हर:\n\n•गडद थीम सुरू करते\n•बॅकग्राउंड ॲक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि \"Ok Google\" यांसारखी वैशिष्ट्ये बंद किंवा मर्यादित करते.\n\n"<annotation id="url">"अधिक जाणून घ्या"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"बॅटरी लाइफ वाढवण्यासाठी बॅटरी सेव्हर:\n\n• गडद थीम सुरू करते\n• बॅकग्राउंड ॲक्टिव्हिटी, काही व्हिज्युअल इफेक्ट आणि “Ok Google” यांसारखी इतर वैशिष्ट्ये बंद किंवा मर्यादित करते"</string> <string name="data_saver_description" msgid="4995164271550590517">"डेटाचा वापर कमी करण्यात मदत करण्यासाठी काही अॅप्सना बॅकग्राउंडमध्ये डेटा पाठवण्यास किंवा मिळवण्यास डेटा सर्व्हर प्रतिबंध करतो. तुम्ही सध्या वापरत असलेले अॅप डेटा अॅक्सेस करू शकते, पण तसे खूप कमी वेळा होते. याचाच अर्थ असा की, तुम्ही इमेजवर टॅप करेपर्यंत त्या डिस्प्ले होणार नाहीत असे होऊ शकते."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"डेटा सेव्हर सुरू करायचे?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"सुरू करा"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 0b905a6cb095..c8f37c305ff7 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Dikemas kini oleh pentadbir anda"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Dipadamkan oleh pentadbir anda"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n\n•Menghidupkan Tema gelap\n•Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri lain seperti “Ok Google”\n\n"<annotation id="url">"Ketahui lebih lanjut"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n\n•Menghidupkan Tema gelap\n•Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri lain seperti “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n\n• Menghidupkan Tema gelap\n• Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri lain seperti “Ok Google”\n\n"<annotation id="url">"Ketahui lebih lanjut"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Untuk melanjutkan hayat bateri, Penjimat Bateri:\n\n•Menghidupkan Tema gelap\n• Mematikan atau mengehadkan aktiviti latar belakang, sesetengah kesan visual dan ciri-ciri lain seperti “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Untuk membantu mengurangkan penggunaan data, Penjimat Data menghalang sesetengah apl daripada menghantar atau menerima data di latar. Apl yang sedang digunakan boleh mengakses data tetapi mungkin tidak secara kerap. Perkara ini mungkin bermaksud bahawa imej tidak dipaparkan sehingga anda mengetik pada imej itu, contohnya."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Hidupkan Penjimat Data?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Hidupkan"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 793a6f9d2bee..dcb4e3cfc634 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"သင်၏ စီမံခန့်ခွဲသူက အပ်ဒိတ်လုပ်ထားသည်"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"သင်၏ စီမံခန့်ခွဲသူက ဖျက်လိုက်ပါပြီ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က- \n\n•မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည်\n•နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့နှင့် “Ok Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်သည် သို့မဟုတ် ကန့်သတ်သည်\n\n"<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က- \n\n•မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည်\n•နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့နှင့် “Ok Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်သည် သို့မဟုတ် ကန့်သတ်သည်"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က- \n\n• မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည်\n• နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့နှင့် “Ok Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်သည် သို့မဟုတ် ကန့်သတ်သည်\n\n"<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ဘက်ထရီသက်တမ်း ပိုရှည်စေရန် \'ဘက်ထရီအားထိန်း\' က-\n\n•မှောင်သည့် အပြင်အဆင်ကို ဖွင့်သည်\n•နောက်ခံလုပ်ဆောင်ချက်၊ ပြသမှုဆိုင်ရာ အထူးပြုလုပ်ချက်အချို့နှင့် “Ok Google” ကဲ့သို့ အခြား ဝန်ဆောင်မှုများကို ပိတ်သည် သို့မဟုတ် ကန့်သတ်သည်"</string> <string name="data_saver_description" msgid="4995164271550590517">"ဒေတာအသုံးလျှော့ချနိုင်ရန်အတွက် အက်ပ်များကို နောက်ခံတွင် ဒေတာပို့ခြင်းနှင့် လက်ခံခြင်းမပြုရန် \'ဒေတာချွေတာမှု\' စနစ်က တားဆီးထားပါသည်။ ယခုအက်ပ်ဖြင့် ဒေတာအသုံးပြုနိုင်သော်လည်း အကြိမ်လျှော့၍သုံးရပါမည်။ ဥပမာ၊ သင်က မတို့မချင်း ပုံများပေါ်လာမည် မဟုတ်ပါ။"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ဒေတာချွေတာမှုစနစ် ဖွင့်မလား။"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ဖွင့်ပါ"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 5db133874d0b..6926d659ed3f 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Oppdatert av administratoren din"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Slettet av administratoren din"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"For å forlenge batterilevetiden gjør Batterisparing dette:\n\n• Slår på mørkt tema\n• Slår av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»\n\n"<annotation id="url">"Finn ut mer"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"For å forlenge batterilevetiden gjør Batterisparing dette:\n\n• Slår på mørkt tema\n• Slår av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"For å forlenge batterilevetiden gjør Batterisparing dette:\n\n• Slår på mørkt tema\n• Slår av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»\n\n"<annotation id="url">"Finn ut mer"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"For å forlenge batterilevetiden gjør Batterisparing dette:\n\n• Slår på mørkt tema\n• Slår av eller begrenser bakgrunnsaktivitet, enkelte visuelle effekter og andre funksjoner, for eksempel «Hey Google»"</string> <string name="data_saver_description" msgid="4995164271550590517">"Datasparing hindrer noen apper fra å sende og motta data i bakgrunnen, for å redusere dataforbruket. Aktive apper kan bruke data, men kanskje ikke så mye som ellers – for eksempel vises ikke bilder før du trykker på dem."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vil du slå på Datasparing?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Slå på"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 355ee94ac3b7..c9ac6ec47001 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"तपाईंका प्रशासकले अद्यावधिक गर्नुभएको"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"तपाईंका प्रशासकले मेट्नुभएको"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ठिक छ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ब्याट्रीको आयु बढाउन ब्याट्री सेभरले:\n\n•अँध्यारो थिम सक्रिय गर्छ\n•पृष्ठभूमिका गतिविधि, केही दृश्यात्मक प्रभाव तथा “Hey Google” जस्ता अन्य सुविधाहरू निष्क्रिय वा सीमित पार्छ\n\n"<annotation id="url">"थप जान्नुहोस्"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ब्याट्रीको आयु बढाउन ब्याट्री सेभरले:\n\n•अँध्यारो थिम सक्रिय गर्छ\n•पृष्ठभूमिका गतिविधि, केही दृश्यात्मक प्रभाव तथा “Hey Google” जस्ता अन्य सुविधाहरू निष्क्रिय वा सीमित पार्छ"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ब्याट्री सेभरले यन्त्रको ब्याट्री बढी समय टिकाउन:\n\n•अँध्यारो थिम सक्रिय गर्छ\n•पृष्ठभूमिका गतिविधि, केही दृश्यात्मक प्रभाव तथा “Hey Google” जस्ता अन्य सुविधाहरू निष्क्रिय वा सीमित पार्छ\n\n"<annotation id="url">"थप जान्नुहोस्"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ब्याट्री सेभरले यन्त्रको ब्याट्री बढी समय टिकाउन:\n\n• अँध्यारो थिम अन गर्छ\n• पृष्ठभूमिका क्रियाकलाप, केही दृश्यात्मक प्रभाव तथा “Hey Google” जस्ता अन्य सुविधाहरू अफ गर्छ वा सीमित पार्छ"</string> <string name="data_saver_description" msgid="4995164271550590517">"डेटाको प्रयोगलाई कम गर्न डेटा सर्भरले केही एपलाई पृष्ठभूमिमा डेटा पठाउन वा प्राप्त गर्न दिँदैन। तपाईंले हाल प्रयोग गरिरहनुभएको अनु्प्रयोगले डेटा चलाउन सक्छ, तर पहिला भन्दा कम अन्तरालमा मात्र। उदाहरणका लागि, तपाईले छविहरूमा ट्याप नगरेसम्म ती छविहरू देखिँदैनन्।"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"डेटा सेभर सक्रिय गर्ने हो?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"सक्रिय गर्नुहोस्"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index ed57f7ffc89d..904c90665229 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Geüpdatet door je beheerder"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Verwijderd door je beheerder"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n\n•Het donkere thema aanzetten\n•Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitzetten of beperken\n\n"<annotation id="url">"Meer informatie"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n\n•Het donkere thema aanzetten\n•Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitzetten of beperken"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n\n• Het donkere thema inschakelen\n• Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitschakelen of beperken\n\n"<annotation id="url">"Meer informatie"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batterijbesparing doet het volgende om de batterijduur te verlengen:\n\n• Het donkere thema inschakelen.\n• Achtergrondactiviteit, bepaalde visuele effecten en andere functies (zoals \'Hey Google\') uitschakelen of beperken."</string> <string name="data_saver_description" msgid="4995164271550590517">"Databesparing beperkt het datagebruik door te voorkomen dat sommige apps gegevens verzenden of ontvangen op de achtergrond. De apps die je open hebt, kunnen nog steeds data verbruiken, maar doen dit minder vaak. Afbeeldingen worden dan bijvoorbeeld niet weergegeven totdat je erop tikt."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Databesparing aanzetten?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Inschakelen"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index c60f5e166a4a..62505a31a169 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ଆପଣଙ୍କ ଆଡମିନ୍ ଅପଡେଟ୍ କରିଛନ୍ତି"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ଆପଣଙ୍କ ଆଡମିନ୍ ଡିଲିଟ୍ କରିଛନ୍ତି"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ଠିକ୍ ଅଛି"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଇବାକୁ ବ୍ୟାଟେରୀ ସେଭର୍:\n\n•ଗାଢ଼ା ଥିମ୍ ଚାଲୁ କରେ\n•ପୃଷ୍ଠପଟ କାର୍ଯ୍ୟକଳାପ, କିଛି ଭିଜୁଆଲ୍ ପ୍ରଭାବ ଏବଂ “Hey Google” ପରି ଅନ୍ୟ ଫିଚରଗୁଡ଼ିକୁ ବନ୍ଦ କିମ୍ବା ପ୍ରତିବନ୍ଧିତ କରିଥାଏ\n\n"<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଇବାକୁ ବ୍ୟାଟେରୀ ସେଭର୍:\n\n•ଗାଢ଼ା ଥିମ୍ ଚାଲୁ କରେ\n•ପୃଷ୍ଠପଟ କାର୍ଯ୍ୟକଳାପ, କିଛି ଭିଜୁଆଲ୍ ପ୍ରଭାବ ଏବଂ “Hey Google” ପରି ଅନ୍ୟ ଫିଚରଗୁଡ଼ିକୁ ବନ୍ଦ କିମ୍ବା ପ୍ରତିବନ୍ଧିତ କରିଥାଏ"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଇବାକୁ ବ୍ୟାଟେରୀ ସେଭର୍:\n\n•ଗାଢ଼ା ଥିମ୍ ଚାଲୁ କରେ\n•ପୃଷ୍ଠପଟ କାର୍ଯ୍ୟକଳାପ, କିଛି ଭିଜୁଆଲ୍ ପ୍ରଭାବ ଏବଂ “Hey Google” ପରି ଅନ୍ୟ ଫିଚରଗୁଡ଼ିକୁ ବନ୍ଦ କିମ୍ବା ପ୍ରତିବନ୍ଧିତ କରିଥାଏ\n\n"<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଇବାକୁ ବ୍ୟାଟେରୀ ସେଭର୍:\n\n• ଗାଢ଼ା ଥିମ୍ ଚାଲୁ କରେ\n• ପୃଷ୍ଠପଟ କାର୍ଯ୍ୟକଳାପ, କିଛି ଭିଜୁଆଲ୍ ପ୍ରଭାବ ଏବଂ “Hey Google” ପରି ଅନ୍ୟ ଫିଚରଗୁଡ଼ିକୁ ବନ୍ଦ କିମ୍ବା ପ୍ରତିବନ୍ଧିତ କରିଥାଏ"</string> <string name="data_saver_description" msgid="4995164271550590517">"ଡାଟା ବ୍ୟବହାର କମ୍ କରିବାରେ ସାହାଯ୍ୟ କରିବାକୁ, ଡାଟା ସେଭର୍ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡରେ ଡାଟା ପଠାଇବା କିମ୍ବା ପ୍ରାପ୍ତ କରିବାକୁ କିଛି ଆପ୍କୁ ବାରଣ କରେ। ଆପଣ ବର୍ତ୍ତମାନ ବ୍ୟବହାର କରୁଥିବା ଆପ୍, ଡାଟା ଆକ୍ସେସ୍ କରିପାରେ, କିନ୍ତୁ ଏହା କମ୍ ଥର କରିପାରେ। ଏହାର ଅର୍ଥ ହୋଇପାରେ ଯେମିତି ଆପଣ ଇମେଜଗୁଡ଼ିକୁ ଟାପ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ସେଗୁଡ଼ିକ ଡିସପ୍ଲେ ହୁଏ ନାହିଁ।"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ଡାଟା ସେଭର୍ ଚାଲୁ କରିବେ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ଚାଲୁ କରନ୍ତୁ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 11f3cacee7e3..346ee9a476c7 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਮਿਟਾਇਆ ਗਿਆ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ਠੀਕ ਹੈ"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n\n•ਗੂੜ੍ਹਾ ਥੀਮ ਚਾਲੂ ਕਰਦਾ ਹੈ\n•ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ਟੀਗਤ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Ok Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ\n\n"<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n\n•ਗੂੜ੍ਹਾ ਥੀਮ ਚਾਲੂ ਕਰਦਾ ਹੈ\n•ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ਟੀਗਤ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Ok Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n\n• ਗੂੜ੍ਹਾ ਥੀਮ ਚਾਲੂ ਕਰਦਾ ਹੈ\n• ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ਟੀਗਤ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Ok Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ\n\n"<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਉਣ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ:\n\n• ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ\n• ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ, ਕੁਝ ਦ੍ਰਿਸ਼ਟੀਗਤ ਪ੍ਰਭਾਵਾਂ, ਅਤੇ \"Ok Google\" ਵਰਗੀਆਂ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ ਜਾਂ ਉਹਨਾਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦਾ ਹੈ"</string> <string name="data_saver_description" msgid="4995164271550590517">"ਡਾਟਾ ਵਰਤੋਂ ਘਟਾਉਣ ਵਿੱਚ ਮਦਦ ਲਈ, ਡਾਟਾ ਸੇਵਰ ਕੁਝ ਐਪਾਂ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡਾਟਾ ਭੇਜਣ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਵਰਤੀ ਜਾ ਰਹੀ ਐਪ ਡਾਟਾ \'ਤੇ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ, ਪਰ ਉਹ ਇੰਝ ਕਦੇ-ਕਦਾਈਂ ਕਰ ਸਕਦੀ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਚਿੱਤਰ ਤਦ ਤੱਕ ਨਹੀਂ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੇ ਜਾਂਦੇ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ \'ਤੇ ਟੈਪ ਨਹੀਂ ਕਰਦੇ।"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ਕੀ ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ਚਾਲੂ ਕਰੋ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 990ce70a92d4..7d2795e2db0f 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Zaktualizowany przez administratora"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Usunięty przez administratora"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Aby wydłużyć czas pracy na baterii, funkcja Oszczędzanie baterii:\n\n•włącza tryb ciemny\n•wyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”\n\n"<annotation id="url">"Więcej informacji"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Aby wydłużyć czas pracy na baterii, funkcja Oszczędzanie baterii:\n\n•włącza tryb ciemny\n•wyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Aby wydłużyć czas pracy na baterii, funkcja Oszczędzanie baterii:\n\n•włącza tryb ciemny,\n• wyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”.\n\n"<annotation id="url">"Więcej informacji"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Aby wydłużyć czas pracy na baterii, Oszczędzanie baterii:\n\n• włącza tryb ciemny,\n• wyłącza lub ogranicza aktywność w tle, niektóre efekty wizualne oraz inne funkcje, np. „OK Google”."</string> <string name="data_saver_description" msgid="4995164271550590517">"Oszczędzanie danych uniemożliwia niektórym aplikacjom wysyłanie i odbieranie danych w tle, zmniejszając w ten sposób ich użycie. Aplikacja, z której w tej chwili korzystasz, może uzyskiwać dostęp do danych, ale rzadziej. Może to powodować, że obrazy będą się wyświetlać dopiero po kliknięciu."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Włączyć Oszczędzanie danych?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Włącz"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 0883b7cdc0b0..4fec5b3779a2 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Atualizado pelo seu administrador"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Excluído pelo seu administrador"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n•ativa o tema escuro;\n•desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n•ativa o tema escuro;\n•desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n• ativa o tema escuro;\n• desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n• ativa o tema escuro;\n• desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Para ajudar a reduzir o uso de dados, a Economia de dados impede que alguns apps enviem ou recebam dados em segundo plano. Um app que você esteja usando no momento pode acessar dados, mas com menos frequência. Isso pode fazer com que imagens não sejam exibidas até que você toque nelas."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Ativar \"Economia de dados\"?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ativar"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 2a958dc080b6..5f6fb5cf553c 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Atualizado pelo seu gestor"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Eliminado pelo seu gestor"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n\n•Ativa o tema escuro.\n•Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\".\n\n"<annotation id="url">"Saber mais"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n\n•Ativa o tema escuro.\n•Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n\n•Ativa o tema escuro.\n•Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para prolongar a autonomia da bateria, a Poupança de bateria:\n\n• Ativa o tema escuro.\n•·Desativa ou restringe a atividade em segundo plano, alguns efeitos visuais e outras funcionalidades como \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Para ajudar a reduzir a utilização de dados, a Poupança de dados impede que algumas aplicações enviem ou recebam dados em segundo plano. Uma determinada app que esteja a utilizar atualmente pode aceder aos dados, mas é possível que o faça com menos frequência. Isto pode significar, por exemplo, que as imagens não são apresentadas até que toque nas mesmas."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Pretende ativar a Poupança de dados?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ativar"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 0883b7cdc0b0..4fec5b3779a2 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Atualizado pelo seu administrador"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Excluído pelo seu administrador"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n•ativa o tema escuro;\n•desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n•ativa o tema escuro;\n•desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n• ativa o tema escuro;\n• desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\".\n\n"<annotation id="url">"Saiba mais"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para prolongar a duração da carga, a \"Economia de bateria\":\n\n• ativa o tema escuro;\n• desativa ou restringe atividades em segundo plano, alguns efeitos visuais e outros recursos, como o \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Para ajudar a reduzir o uso de dados, a Economia de dados impede que alguns apps enviem ou recebam dados em segundo plano. Um app que você esteja usando no momento pode acessar dados, mas com menos frequência. Isso pode fazer com que imagens não sejam exibidas até que você toque nelas."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Ativar \"Economia de dados\"?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Ativar"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 0a30432b4c1d..a0e35985b142 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Actualizat de administratorul dvs."</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Șters de administratorul dvs."</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Pentru a mări autonomia bateriei, Economisirea bateriei:\n\n•·activează tema întunecată;\n•·dezactivează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”.\n\n"<annotation id="url">"Aflați mai multe"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Pentru a mări autonomia bateriei, Economisirea bateriei:\n\n• activează tema întunecată;\n• dezactivează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Pentru a mări autonomia bateriei, Economisirea bateriei:\n\n•·activează tema întunecată;\n•·dezactivează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”.\n\n"<annotation id="url">"Aflați mai multe"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Pentru a mări autonomia bateriei, Economisirea bateriei:\n\n• activează tema întunecată;\n• dezactivează sau restricționează activitatea în fundal, unele efecte vizuale și alte funcții, cum ar fi „Ok Google”."</string> <string name="data_saver_description" msgid="4995164271550590517">"Pentru a contribui la reducerea utilizării de date, Economizorul de date împiedică unele aplicații să trimită sau să primească date în fundal. O aplicație pe care o folosiți poate accesa datele, însă mai rar. Aceasta poate însemna, de exemplu, că imaginile se afișează numai după ce le atingeți."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Activați Economizorul de date?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Activați"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 2590f05aafa7..1a65847fecf4 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Обновлено администратором"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Удалено администратором"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\n\n• включается тёмная тема;\n• отключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\").\n\n"<annotation id="url">"Подробнее…"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\n\n• включается тёмная тема;\n• отключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\")."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\n\n• включается тёмная тема;\n• отключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\").\n\n"<annotation id="url">"Подробнее…"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Чтобы продлить время работы от батареи, в режиме энергосбережения:\n\n• включается тёмная тема;\n• отключаются или ограничиваются фоновые процессы, некоторые визуальные эффекты и другие функции (например, распознавание команды \"Окей, Google\")."</string> <string name="data_saver_description" msgid="4995164271550590517">"В режиме экономии трафика фоновая передача данных для некоторых приложений отключена. Приложение, которым вы пользуетесь, может получать и отправлять данные, но реже, чем обычно. Например, изображения могут не загружаться, пока вы не нажмете на них."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Включить экономию трафика?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Включить"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 4224d510bc74..db759f62b8ae 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"ඔබගේ පරිපාලක මඟින් යාවත්කාලීන කර ඇත"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ඔබගේ පරිපාලක මඟින් මකා දමා ඇත"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"හරි"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n\n•අඳුරු තේමාව ක්රියාත්මක කරයි\n•පසුබිමේ ක්රියාකාරකම, සමහර දෘෂ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි\n\n"<annotation id="url">"තව දැන ගන්න"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n\n•අඳුරු තේමාව ක්රියාත්මක කරයි\n•පසුබිමේ ක්රියාකාරකම, සමහර දෘෂ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n\n•අඳුරු තේමාව ක්රියාත්මක කරයි\n•පසුබිමේ ක්රියාකාරකම, සමහර දෘශ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි\n\n"<annotation id="url">"තව දැන ගන්න"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"බැටරියේ ජීව කාලය දික් කිරීමට, බැටරි සුරැකුම:\n\n•අඳුරු තේමාව ක්රියාත්මක කරයි\n•පසුබිමේ ක්රියාකාරකම, සමහර දෘශ්ය ප්රයෝග සහ “Hey Google” වැනි වෙනත් විශේෂාංග ක්රියාවිරහිත කරයි නැතහොත් අවහිර කරයි"</string> <string name="data_saver_description" msgid="4995164271550590517">"දත්ත භාවිතය අඩු කිරීමට උදවු වීමට, දත්ත සුරැකුම සමහර යෙදුම් පසුබිමින් දත්ත යැවීම සහ ලබා ගැනීම වළක්වයි. ඔබ දැනට භාවිත කරන යෙදුමකට දත්ත වෙත පිවිසීමට හැකිය, නමුත් එසේ කරන්නේ කලාතුරකින් විය හැකිය. මෙයින් අදහස් වන්නේ, උදාහරණයක් ලෙස, එම රූප ඔබ ඒවාට තට්ටු කරන තෙක් සංදර්ශනය නොවන බවය."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"දත්ත සුරැකුම ක්රියාත්මක කරන්නද?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ක්රියාත්මක කරන්න"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 7621cf1755b6..5f80364368eb 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Aktualizoval správca"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Odstránil správca"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Šetrič batérie predlžuje výdrž batérie:\n\n• zapnutím tmavého motívu;\n•vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad kľúčového slova „Hey Google“.\n\n"<annotation id="url">"Ďalšie informácie"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Šetrič batérie predlžuje výdrž batérie:\n\n• zapnutím tmavého motívu;\n• vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad kľúčového slova „Hey Google“."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Šetrič batérie predlžuje výdrž batérie:\n\n• zapnutím tmavého motívu;\n• vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad kľúčového výrazu „Hey Google“.\n\n"<annotation id="url">"Ďalšie informácie"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Šetrič batérie predlžuje výdrž batérie:\n\n• zapnutím tmavého motívu;\n• vypnutím alebo obmedzením aktivity na pozadí, niektorých vizuálnych efektov a ďalších funkcií, ako napríklad kľúčového výrazu „Hey Google“."</string> <string name="data_saver_description" msgid="4995164271550590517">"S cieľom znížiť spotrebu dát bráni šetrič dát niektorým aplikáciám odosielať alebo prijímať dáta na pozadí. Aplikácia, ktorú práve používate, môže využívať dáta, ale možno to bude robiť menej často. Znamená to napríklad, že sa nezobrazia obrázky, kým na ne neklepnete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Chcete zapnúť šetrič dát?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Zapnúť"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 34e71161cb37..4e3705976e5f 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Posodobil skrbnik"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Izbrisal skrbnik"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"V redu"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Funkcija varčevanja z energijo baterije podaljša čas delovanja baterije tako:\n\n•Vklopi temno temo,\n•izklopi ali omeji izvajanje dejavnosti v ozadju, nekaterih vizualnih učinkov in drugih funkcij, kot je »Hey Google«.\n\n"<annotation id="url">"Več o tem"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Funkcija varčevanja z energijo baterije podaljša čas delovanja baterije tako:\n\n•Vklopi temno temo,\n•izklopi ali omeji izvajanje dejavnosti v ozadju, nekaterih vizualnih učinkov in drugih funkcij, kot je »Hey Google«."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Funkcija varčevanja z energijo baterije podaljša čas delovanja baterije tako:\n\n•vklopi temno temo,\n•izklopi ali omeji dejavnost v ozadju, nekatere vizualne učinke in druge funkcije, kot je »Hey Google«.\n\n"<annotation id="url">"Več o tem"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Funkcija varčevanja z energijo baterije podaljša čas delovanja baterije tako:\n\n• vklopi temno temo;\n• izklopi ali omeji dejavnost v ozadju, nekatere vizualne učinke in druge funkcije, kot je »Hey Google«."</string> <string name="data_saver_description" msgid="4995164271550590517">"Zaradi zmanjševanja prenesene količine podatkov funkcija varčevanja s podatki nekaterim aplikacijam preprečuje, da bi v ozadju pošiljale ali prejemale podatke. Aplikacija, ki jo trenutno uporabljate, lahko prenaša podatke, vendar to morda počne manj pogosto. To na primer pomeni, da se slike ne prikažejo, dokler se jih ne dotaknete."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vklop varčevanja s podatki?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Vklop"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index bf77b84ca85d..30e75558bb76 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Përditësuar nga administratori"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Fshirë nga administratori"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Në rregull"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Për të rritur kohëzgjatjen e baterisë, \"Kursyesi i baterisë\":\n\n• Aktivizon \"Temën e errët\"\n•Çaktivizon ose kufizon aktivitetin në sfond, disa efekte vizuale dhe veçori të tjera si “Ok Google”\n\n"<annotation id="url">"Mëso më shumë"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Për të rritur kohëzgjatjen e baterisë, \"Kursyesi i baterisë\":\n\n• Aktivizon \"Temën e errët\"\n•Çaktivizon ose kufizon aktivitetin në sfond, disa efekte vizuale dhe veçori të tjera si “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Për të rritur kohëzgjatjen e baterisë, \"Kursyesi i baterisë\":\n\n• Aktivizon \"Temën e errët\"\n• Çaktivizon ose kufizon aktivitetin në sfond, disa efekte vizuale dhe veçori të tjera si “Ok Google”\n\n"<annotation id="url">"Mëso më shumë"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Për të rritur kohëzgjatjen e baterisë, \"Kursyesi i baterisë\":\n\n• Aktivizon \"Temën e errët\"\n• Çaktivizon ose kufizon aktivitetin në sfond, disa efekte vizuale dhe veçori të tjera si “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Për të ndihmuar në reduktimin e përdorimit të të dhënave, \"Kursyesi i të dhënave\" pengon që disa aplikacione të dërgojnë apo të marrin të dhëna në sfond. Një aplikacion që po përdor aktualisht mund të ketë qasje te të dhënat, por këtë mund ta bëjë më rrallë. Kjo mund të nënkuptojë, për shembull, se imazhet nuk shfaqen kur troket mbi to."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Të aktivizohet \"Kursyesi i të dhënave\"?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivizo"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index f3b057853f3c..6890b800ac1e 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1179,7 +1179,7 @@ <string name="noApplications" msgid="1186909265235544019">"Ниједна апликација не може да обавља ову радњу."</string> <string name="aerr_application" msgid="4090916809370389109">"Апликација <xliff:g id="APPLICATION">%1$s</xliff:g> је заустављена"</string> <string name="aerr_process" msgid="4268018696970966407">"Процес <xliff:g id="PROCESS">%1$s</xliff:g> је заустављен"</string> - <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> се стално зауставља(ју)"</string> + <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> се стално зауставља"</string> <string name="aerr_process_repeated" msgid="1153152413537954974">"Процес <xliff:g id="PROCESS">%1$s</xliff:g> се стално зауставља"</string> <string name="aerr_restart" msgid="2789618625210505419">"Поново отвори апликацију"</string> <string name="aerr_report" msgid="3095644466849299308">"Пошаљите повратне информације"</string> @@ -1815,8 +1815,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Ажурирао је администратор"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Избрисао је администратор"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Потврди"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Да би се продужило трајање батерије, Уштеда батерије:\n\n•укључује тамну тему\n•искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“\n\n"<annotation id="url">"Сазнајте више"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Да би се продужило трајање батерије, Уштеда батерије:\n\n•укључује тамну тему\n•искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Да би се продужило трајање батерије, Уштеда батерије:\n\n• укључује тамну тему\n• искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“\n\n"<annotation id="url">"Сазнајте више"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Да би се продужило трајање батерије, Уштеда батерије:\n\n• укључује тамну тему\n• искључује или ограничава активности у позадини, неке визуелне ефекте и друге функције, на пример, „Ок Google“"</string> <string name="data_saver_description" msgid="4995164271550590517">"Да би се смањила потрошња података, Уштеда података спречава неке апликације да шаљу или примају податке у позадини. Апликација коју тренутно користите може да приступа подацима, али ће то чинити ређе. На пример, слике се неће приказивати док их не додирнете."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Желите да укључите Уштеду података?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Укључи"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index e0e54ed0434c..87b087203a6a 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Administratören uppdaterade paketet"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Administratören raderade paketet"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batterisparläget förlänger batteritiden genom att:\n\n• aktivera mörkt tema\n• inaktivera eller begränsa aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”\n\n"<annotation id="url">"Läs mer"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batterisparläget förlänger batteritiden genom att:\n\n• aktivera mörkt tema\n• inaktivera eller begränsa aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batterisparläget förlänger batteritiden genom att\n\n• aktivera mörkt tema\n• inaktivera eller begränsa aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”\n\n"<annotation id="url">"Läs mer"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batterisparläget förlänger batteritiden genom att\n\n• aktivera Mörkt tema\n• inaktivera eller begränsa aktivitet i bakgrunden, vissa visuella effekter och andra funktioner, som ”Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Med databesparing kan du minska dataanvändningen genom att hindra en del appar från att skicka eller ta emot data i bakgrunden. Appar som du använder kan komma åt data, men det sker kanske inte lika ofta. Detta innebär t.ex. att bilder inte visas förrän du trycker på dem."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vill du aktivera Databesparing?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aktivera"</string> @@ -2030,7 +2030,7 @@ <item quantity="other"><xliff:g id="FILE_NAME_2">%s</xliff:g> + <xliff:g id="COUNT_3">%d</xliff:g> filer</item> <item quantity="one"><xliff:g id="FILE_NAME_0">%s</xliff:g> + <xliff:g id="COUNT_1">%d</xliff:g> fil</item> </plurals> - <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Det finns inga rekommendationer för delning"</string> + <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Inga rekommenderade personer att dela med"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Applista"</string> <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Appen har inte fått inspelningsbehörighet men kan spela in ljud via denna USB-enhet."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Startsida"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index c2642ffe37bc..fbf4ccae2e4a 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Imesasishwa na msimamizi wako"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Imefutwa na msimamizi wako"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Sawa"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n\n•Huwasha Mandhari meusi\n•Huzima au kuzuia shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\"\n\n"<annotation id="url">"Pata maelezo zaidi"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n\n•Huwasha Mandhari meusi\n•Huzima au kuzuia shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\""</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n\n• Huwasha Mandhari meusi\n• Huzima au kuzuia shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\"\n\n"<annotation id="url">"Pata maelezo zaidi"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Ili kuongeza muda wa matumizi ya betri, Kiokoa Betri:\n\n• Huwasha Mandhari meusi\n• Huzima au kudhibiti shughuli za chinichini, baadhi ya madoido yanayoonekana na vipengele vingine kama vile \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"Ili kusaidia kupunguza matumizi ya data, Kiokoa Data huzuia baadhi ya programu kupokea na kutuma data chinichini. Programu ambayo unatumia sasa inaweza kufikia data, lakini si kila wakati. Kwa mfano, haitaonyesha picha hadi utakapozifungua."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Ungependa Kuwasha Kiokoa Data?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Washa"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 5ff6d4bdcf82..731a796a9d08 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"உங்கள் நிர்வாகி புதுப்பித்துள்ளார்"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"உங்கள் நிர்வாகி நீக்கியுள்ளார்"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"சரி"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n\n•டார்க் தீமினை ஆன் செய்யும்\n•பின்னணி செயல்பாடு, சில விஷுவல் எஃபெக்ட்கள், “Hey Google” போன்ற பிற அம்சங்களை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்\n\n"<annotation id="url">"மேலும் அறிக"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n\n•டார்க் தீமினை ஆன் செய்யும்\n•பின்னணி செயல்பாடு, சில விஷுவல் எஃபெக்ட்கள், “Hey Google” போன்ற பிற அம்சங்களை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n\n• டார்க் தீமினை ஆன் செய்யும்\n• பின்னணி செயல்பாடு, சில விஷுவல் எஃபெக்ட்கள், “Ok Google” போன்ற பிற அம்சங்களை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்\n\n"<annotation id="url">"மேலும் அறிக"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"பேட்டரி நிலையை நீட்டிப்பதற்காக, பேட்டரி சேமிப்பான்:\n\n• டார்க் தீமினை ஆன் செய்யும்\n• பின்னணிச் செயல்பாடு, சில விஷுவல் எஃபெக்ட்கள், “Ok Google” போன்ற பிற அம்சங்களை ஆஃப் செய்யும் அல்லது கட்டுப்படுத்தும்"</string> <string name="data_saver_description" msgid="4995164271550590517">"டேட்டா உபயோகத்தைக் குறைப்பதற்கு உதவ, பின்புலத்தில் டேட்டாவை அனுப்புவது அல்லது பெறுவதிலிருந்து சில ஆப்ஸை டேட்டா சேமிப்பான் தடுக்கும். தற்போது பயன்படுத்தும் ஆப்ஸானது எப்போதாவது டேட்டாவை அணுகலாம். எடுத்துக்காட்டாக, படங்களை நீங்கள் தட்டும் வரை அவை காட்டப்படாது."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"டேட்டா சேமிப்பானை இயக்கவா?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"இயக்கு"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 6d39248a8069..a2ec7872113b 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"మీ నిర్వాహకులు నవీకరించారు"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"మీ నిర్వాహకులు తొలగించారు"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"సరే"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"బ్యాటరీ జీవితకాలాన్ని పెంచడానికి, బ్యాటరీ సేవర్ వీటిని చేస్తుంది:\n\n•ముదురు రంగు రూపాన్ని ఆన్ చేస్తుంది\n•బ్యాక్గ్రౌండ్ యాక్టివిటీ, కొన్ని విజువల్ ఎఫెక్ట్లతో పాటు “Ok Google” వంటి ఇతర ఫీచర్లను ఆఫ్ చేస్తుంది లేదా పరిమితం చేస్తుంది\n\n"<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"బ్యాటరీ జీవితకాలాన్ని పెంచడానికి, బ్యాటరీ సేవర్ వీటిని చేస్తుంది:\n\n•ముదురు రంగు రూపాన్ని ఆన్ చేస్తుంది\n•బ్యాక్గ్రౌండ్ యాక్టివిటీ, కొన్ని విజువల్ ఎఫెక్ట్లతో పాటు “Ok Google” వంటి ఇతర ఫీచర్లను ఆఫ్ చేస్తుంది లేదా పరిమితం చేస్తుంది"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"బ్యాటరీ జీవితకాలాన్ని పెంచడానికి, బ్యాటరీ సేవర్ వీటిని చేస్తుంది:\n\n• ముదురు రంగు రూపాన్ని ఆన్ చేస్తుంది\n•బ్యాక్గ్రౌండ్ యాక్టివిటీని, కొన్ని విజువల్ ఎఫెక్ట్లను, అలాగే “Ok Google” వంటి ఇతర ఫీచర్లను ఆఫ్ చేస్తుంది లేదా పరిమితం చేస్తుంది\n\n"<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"బ్యాటరీ జీవితకాలాన్ని పెంచడానికి, బ్యాటరీ సేవర్ వీటిని చేస్తుంది:\n\n•ముదురు రంగు రూపాన్ని ఆన్ చేస్తుంది\n•బ్యాక్గ్రౌండ్ యాక్టివిటీని, కొన్ని విజువల్ ఎఫెక్ట్లను, అలాగే “Ok Google” వంటి ఇతర ఫీచర్లను ఆఫ్ చేస్తుంది లేదా పరిమితం చేస్తుంది"</string> <string name="data_saver_description" msgid="4995164271550590517">"డేటా వినియోగాన్ని తగ్గించడంలో డేటా సేవర్ సహాయకరంగా ఉంటుంది. బ్యాక్గ్రౌండ్లో కొన్ని యాప్లు డేటాను పంపకుండా లేదా స్వీకరించకుండా నిరోధిస్తుంది. మీరు ప్రస్తుతం ఉపయోగిస్తోన్న యాప్, డేటాను యాక్సెస్ చేయగలదు. కానీ తక్కువ సార్లు మాత్రమే అలా చేయవచ్చు. ఉదాహరణకు, మీరు నొక్కే వరకు ఫోటోలు ప్రదర్శించబడవు."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"డేటా సేవర్ను ఆన్ చేయాలా?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"ఆన్ చేయి"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 13a5e3894a2b..6773014ec2f8 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"อัปเดตโดยผู้ดูแลระบบ"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"ลบโดยผู้ดูแลระบบ"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ตกลง"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n\n•เปิดธีมมืด\n•ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น “Ok Google”\n\n"<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n\n•เปิดธีมมืด\n•ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n\n• เปิดธีมมืด\n•ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น “Ok Google”\n\n"<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"โหมดประหยัดแบตเตอรี่จะดำเนินการดังต่อไปนี้เพื่อยืดอายุการใช้งานแบตเตอรี่\n\n• เปิดธีมมืด\n• ปิดหรือจำกัดกิจกรรมในเบื้องหลัง เอฟเฟกต์ภาพบางอย่าง และฟีเจอร์อื่นๆ อย่างเช่น \"Ok Google\""</string> <string name="data_saver_description" msgid="4995164271550590517">"เพื่อช่วยลดปริมาณการใช้อินเทอร์เน็ต โปรแกรมประหยัดอินเทอร์เน็ตจะช่วยป้องกันไม่ให้บางแอปส่งหรือรับข้อมูลโดยการใช้อินเทอร์เน็ตอยู่เบื้องหลัง แอปที่คุณกำลังใช้งานสามารถเข้าถึงอินเทอร์เน็ตได้ แต่อาจไม่บ่อยเท่าเดิม ตัวอย่างเช่น ภาพต่างๆ จะไม่แสดงจนกว่าคุณจะแตะที่ภาพเหล่านั้น"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"เปิดการประหยัดอินเทอร์เน็ตไหม"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"เปิด"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 7e7f86a3c915..da3e4373382a 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Na-update ng iyong admin"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Na-delete ng iyong admin"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n\n•I-on ang Madilim na tema\n•I-off o paghigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”\n\n"<annotation id="url">"Matuto pa"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n\n•I-on ang Madilim na tema\n•I-off o paghigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n\n• I-on ang Madilim na tema\n• I-off o paghihigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”\n\n"<annotation id="url">"Matuto pa"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Para patagalin ang baterya, ginagawa ng Pangtipid sa Baterya na:\n\n• I-on ang Madilim na tema\n• I-off o paghihigpitan ang aktibidad sa background, ilang visual effect, at iba pang feature gaya ng “Hey Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Upang makatulong na mabawasan ang paggamit ng data, pinipigilan ng Data Saver ang ilang app na magpadala o makatanggap ng data sa background. Maaaring mag-access ng data ang isang app na ginagamit mo sa kasalukuyan, ngunit mas bihira na nito magagawa iyon. Halimbawa, maaaring hindi lumabas ang mga larawan hangga\'t hindi mo nata-tap ang mga ito."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"I-on ang Data Saver?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"I-on"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index b7af87e38fcb..bf17f6c360d4 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Yöneticiniz tarafından güncellendi"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Yöneticiniz tarafından silindi"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"Tamam"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Pil ömrünü uzatmak için Pil Tasarrufu:\n\n•Koyu temayı açar\n•Arka plan etkinliğini, bazı görsel efektleri ve \"Ok Google\" gibi diğer özellikleri kapatır veya kısıtlar\n\n"<annotation id="url">"Daha fazla bilgi"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Pil ömrünü uzatmak için Pil Tasarrufu:\n\n•Koyu temayı açar\n•Arka plan etkinliğini, bazı görsel efektleri ve \"Ok Google\" gibi diğer özellikleri kapatır veya kısıtlar"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Pil ömrünü uzatmak için Pil Tasarrufu:\n\n• Koyu temayı açar\n• Arka plan etkinliğini, bazı görsel efektleri ve \"Ok Google\" gibi diğer özellikleri kapatır veya kısıtlar\n\n"<annotation id="url">"Daha fazla bilgi"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Pil ömrünü uzatmak için Pil Tasarrufu:\n\n• Koyu temayı açar\n• Arka plan etkinliğini, bazı görsel efektleri ve \"Ok Google\" gibi diğer özellikleri kapatır veya kısıtlar"</string> <string name="data_saver_description" msgid="4995164271550590517">"Veri kullanımını azaltmaya yardımcı olması için Veri Tasarrufu, bazı uygulamaların arka planda veri göndermesini veya almasını engeller. Şu anda kullandığınız bir uygulama veri bağlantısına erişebilir, ancak bunu daha seyrek yapabilir. Bu durumda örneğin, siz resimlere dokunmadan resimler görüntülenmez."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Veri Tasarrufu açılsın mı?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Aç"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 0842221b1ee8..9464efa043f0 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1838,8 +1838,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Оновлено адміністратором"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Видалено адміністратором"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ОК"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n\n•вмикає темну тему;\n•припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти та інші енергозатратні функції, зокрема команду \"Ok Google\".\n\n"<annotation id="url">"Докладніше"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n\n•вмикає темну тему;\n•припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти та інші енергозатратні функції, зокрема команду \"Ok Google\"."</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n\n• вмикає темну тему;\n• припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти та інші енергозатратні функції, зокрема команду \"Ok Google\".\n\n"<annotation id="url">"Докладніше"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Щоб подовжити час роботи акумулятора, режим енергозбереження:\n\n• вмикає темну тему;\n• припиняє або обмежує фонову активність, вимикає деякі візуальні ефекти та інші енергозатратні функції, зокрема команду \"Ok Google\"."</string> <string name="data_saver_description" msgid="4995164271550590517">"Щоб зменшити використання трафіку, функція \"Заощадження трафіку\" не дозволяє деяким додаткам надсилати чи отримувати дані у фоновому режимі. Поточний додаток зможе отримувати доступ до таких даних, але рідше. Наприклад, зображення не відображатиметься, доки ви не торкнетеся його."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Увімкнути заощадження трафіку?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Увімкнути"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 3f5eb3e0d3f7..15a1fe7d45f0 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -222,7 +222,7 @@ <string name="reboot_to_update_prepare" msgid="6978842143587422365">"اپ ڈیٹ کرنے کی تیاری ہو رہی ہے…"</string> <string name="reboot_to_update_package" msgid="4644104795527534811">"اپ ڈیٹ پیکج پر کاروائی کی جارہی ہے…"</string> <string name="reboot_to_update_reboot" msgid="4474726009984452312">"دوبارہ شروع ہو رہا ہے…"</string> - <string name="reboot_to_reset_title" msgid="2226229680017882787">"فیکٹری ڈیٹا کی دوبارہ ترتیب"</string> + <string name="reboot_to_reset_title" msgid="2226229680017882787">"فیکٹری ڈیٹا ری سیٹ"</string> <string name="reboot_to_reset_message" msgid="3347690497972074356">"دوبارہ شروع ہو رہا ہے…"</string> <string name="shutdown_progress" msgid="5017145516412657345">"بند ہو رہا ہے…"</string> <string name="shutdown_confirm" product="tablet" msgid="2872769463279602432">"آپ کا ٹیبلیٹ بند ہو جائے گا۔"</string> @@ -686,9 +686,9 @@ <string name="policylab_forceLock" msgid="7360335502968476434">"اسکرین مقفل کریں"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"اسکرین کب اور کس طرح مقفل ہوتی ہے اس کو کنٹرول کریں۔"</string> <string name="policylab_wipeData" msgid="1359485247727537311">"سبھی ڈیٹا صاف کریں"</string> - <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"فیکٹری ڈیٹا کی دوبارہ ترتیب انجام دے کر وارننگ کے بغیر ٹیبلٹ کا ڈیٹا مٹائیں۔"</string> + <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"فیکٹری ڈیٹا ری سیٹ انجام دے کر وارننگ کے بغیر ٹیبلٹ کا ڈیٹا مٹائیں۔"</string> <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"فیکٹری ڈیٹا ری سیٹ کو انجام دے کر انتباہ کیے بغیر اپنے Android TV آلہ کا ڈیٹا مٹائیں۔"</string> - <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"فیکٹری ڈیٹا کی دوبارہ ترتیب انجام دے کر وارننگ کے بغیر فون کا ڈیٹا مٹائیں۔"</string> + <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"فیکٹری ڈیٹا ری سیٹ انجام دے کر وارننگ کے بغیر فون کا ڈیٹا مٹائیں۔"</string> <string name="policylab_wipeData_secondaryUser" msgid="413813645323433166">"صارف کا ڈیٹا ہٹائیں"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"وارننگ کے بغیر اس ٹیبلٹ پر موجود اس صارف کا ڈیٹا ہٹائیں۔"</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2293713284515865200">"انتباہ کے بغیر اس Android TV آلہ پر اس صارف کا ڈیٹا ہٹائیں۔"</string> @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"آپ کے منتظم کے ذریعے اپ ڈیٹ کیا گیا"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"آپ کے منتظم کے ذریعے حذف کیا گیا"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"ٹھیک ہے"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور:\n\n•گہری تھیم کو آن کرتی ہے\n•پس منظر کی سرگرمی، کچھ بصری اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے\n\n"<annotation id="url">"مزید جانیں"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور:\n\n•گہری تھیم کو آن کرتی ہے\n•پس منظر کی سرگرمی، کچھ بصری اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور:\n\n• گہری تھیم کو آن کرتی ہے\n• پس منظر کی سرگرمی، کچھ بصری اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے\n\n"<annotation id="url">"مزید جانیں"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"بیٹری لائف کو بڑھانے کے لیے، بیٹری سیور: \n\n• گہری تھیم کو آن کرتی ہے\n• پس منظر کی سرگرمی، کچھ ویژوئل اثرات اور دیگر خصوصیات جیسے کہ \"Ok Google\" کو آف یا محدود کرتی ہے"</string> <string name="data_saver_description" msgid="4995164271550590517">"ڈیٹا کے استعمال کو کم کرنے میں مدد کیلئے، ڈیٹا سیور پس منظر میں کچھ ایپس کو ڈیٹا بھیجنے یا موصول کرنے سے روکتی ہے۔ آپ جو ایپ فی الحال استعمال کر رہے ہیں وہ ڈیٹا تک رسائی کر سکتی ہے مگر ہو سکتا ہے ایسا اکثر نہ ہو۔ اس کا مطلب مثال کے طور پر یہ ہو سکتا ہے کہ تصاویر تھپتھپانے تک ظاہر نہ ہوں۔"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"ڈیٹا سیور آن کریں؟"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"آن کریں"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index be21f7b8df15..76d2c609b63d 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Administrator tomonidan yangilangan"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Administrator tomonidan o‘chirilgan"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n\n•Tungi mavzuni yoqadi\n•Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi\n\n"<annotation id="url">"Batafsil"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n\n•Tungi mavzuni yoqadi\n•Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n\n• Tungi mavzuni yoqadi\n• Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi\n\n"<annotation id="url">"Batafsil"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Batareya quvvatini uzaytirish uchun Quvvat tejash funksiyasi:\n\n• Tungi mavzuni yoqadi\n• Fondagi harakatlar, vizual effektlar va “Hey Google” kabi boshqa funksiyalarni faolsizlantiradi"</string> <string name="data_saver_description" msgid="4995164271550590517">"Trafik tejash rejimida ayrim ilovalar uchun orqa fonda internetdan foydalanish imkoniyati cheklanadi. Siz ishlatayotgan ilova zaruratga qarab internet-trafik sarflashi mumkin, biroq cheklangan miqdorda. Masalan, rasmlar ustiga bosmaguningizcha ular yuklanmaydi."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Trafik tejash yoqilsinmi?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Yoqish"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 33675da1fd38..9f44841f573c 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Do quản trị viên của bạn cập nhật"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Do quản trị viên của bạn xóa"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Để tăng thời lượng pin, Trình tiết kiệm pin sẽ:\n\n•Bật Giao diện tối\n•Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”\n\n"<annotation id="url">"Tìm hiểu thêm"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Để tăng thời lượng pin, Trình tiết kiệm pin sẽ:\n\n•Bật Giao diện tối\n•Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Để tăng thời lượng pin, Trình tiết kiệm pin sẽ:\n\n• Bật Giao diện tối\n• Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”\n\n"<annotation id="url">"Tìm hiểu thêm"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Để tăng thời lượng pin, Trình tiết kiệm pin sẽ:\n\n• Bật Giao diện tối\n• Tắt hoặc hạn chế hoạt động chạy trong nền, một số hiệu ứng hình ảnh và các tính năng khác như lệnh “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Để giúp giảm mức sử dụng dữ liệu, Trình tiết kiệm dữ liệu sẽ chặn một số ứng dụng gửi hoặc nhận dữ liệu trong nền. Ứng dụng mà bạn hiện sử dụng có thể dùng dữ liệu nhưng tần suất sẽ giảm. Ví dụ: hình ảnh sẽ không hiển thị cho đến khi bạn nhấn vào hình ảnh đó."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Bật Trình tiết kiệm dữ liệu?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Bật"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 7da8f15b4a44..32ac0cf297c4 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"已由您的管理员更新"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"已由您的管理员删除"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"确定"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"为了延长电池续航时间，省电模式会执行以下操作：\n\n• 开启深色主题\n• 关闭或限制后台活动、部分视觉效果和其他功能，例如“Ok Google”\n\n"<annotation id="url">"了解详情"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"为了延长电池续航时间，省电模式会执行以下操作：\n\n• 开启深色主题\n• 关闭或限制后台活动、部分视觉效果和其他功能，例如“Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"为了延长电池续航时间，省电模式会执行以下操作：\n\n• 开启深色主题\n• 关闭或限制后台活动、部分视觉效果和其他功能，例如“Ok Google”\n\n"<annotation id="url">"了解详情"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"为了延长电池续航时间，省电模式会执行以下操作：\n\n• 开启深色主题\n• 关闭或限制后台活动、部分视觉效果和其他功能，例如“Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"为了减少流量消耗，流量节省程序会阻止某些应用在后台收发数据。您当前使用的应用可以收发数据，但频率可能会降低。举例而言，这可能意味着图片只有在您点按之后才会显示。"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"要开启流量节省程序吗？"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"开启"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 35bc1aa93b25..82b079fd98af 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"已由您的管理員更新"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"已由您的管理員刪除"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"好"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"為延長電池壽命，「省電模式」會：\n\n•開啟深色主題背景\n•關閉或限制背景活動、某些視覺效果和其他功能 (例如「Hey Google」)\n\n"<annotation id="url">"瞭解詳情"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"為延長電池壽命，「省電模式」會：\n\n•開啟深色主題背景\n•關閉或限制背景活動、某些視覺效果和其他功能 (例如「Hey Google」)"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"為延長電池壽命，「省電模式」會：\n\n• 開啟深色主題背景\n• 關閉或限制背景活動、某些視覺效果和其他功能 (例如「Hey Google」)\n\n"<annotation id="url">"瞭解詳情"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"為延長電池壽命，「省電模式」會：\n\n• 開啟深色主題背景\n• 停用或限制背景活動、部分視覺效果和其他功能 (例如「Hey Google」)"</string> <string name="data_saver_description" msgid="4995164271550590517">"「數據節省模式」可防止部分應用程式在背景收發資料，以節省數據用量。您正在使用的應用程式可存取資料，但次數可能會減少。例如，圖片可能需要輕按才會顯示。"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"要開啟「數據節省模式」嗎？"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"開啟"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 6ccfc09a46a0..02c02008dea3 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"已由你的管理員更新"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"已由你的管理員刪除"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"確定"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"為了延長電池續航力，省電模式會執行以下動作：\n\n•開啟深色主題\n•關閉或限制背景活動、部分視覺效果和其他功能，例如「Hey Google」啟動字詞\n\n"<annotation id="url">"瞭解詳情"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"為了延長電池續航力，省電模式會執行以下動作：\n\n•開啟深色主題\n•關閉或限制背景活動、部分視覺效果和其他功能，例如「Hey Google」啟動字詞"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"為了延長電池續航力，節約耗電量模式會執行以下動作：\n\n• 開啟深色主題\n• 關閉或限制背景活動、某些視覺效果和其他功能，例如「Ok Google」啟動字詞\n\n"<annotation id="url">"瞭解詳情"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"為了延長電池續航力，節約耗電量模式會執行以下動作：\n\n• 開啟深色主題\n• 關閉或限制背景活動、某些視覺效果和其他功能，例如「Ok Google」啟動字詞"</string> <string name="data_saver_description" msgid="4995164271550590517">"「數據節省模式」可防止部分應用程式在背景收發資料，以節省數據用量。你目前使用的應用程式可以存取資料，但存取頻率可能不如平時高。舉例來說，圖片可能不會自動顯示，在你輕觸後才會顯示。"</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"要開啟數據節省模式嗎？"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"開啟"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index ff2baa6c7145..7fe333d4bc33 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1792,8 +1792,8 @@ <string name="package_updated_device_owner" msgid="7560272363805506941">"Kubuyekezwe umlawuli wakho"</string> <string name="package_deleted_device_owner" msgid="2292335928930293023">"Kususwe umlawuli wakho"</string> <string name="confirm_battery_saver" msgid="5247976246208245754">"KULUNGILE"</string> - <string name="battery_saver_description_with_learn_more" msgid="5997766757551917769">"Ukuze unwebe impilo yebhethri, Isilondolozi Sebhethri:\n\n•Sivula itimu emnyama\n•Sivala noma sibeka umkhawulo emsebenzini wangemuva, kweminye imithelela yokubuka, nakwezinye izici ezifana nokuthi “Ok Google”\n\n"<annotation id="url">"Funda kabanzi"</annotation></string> - <string name="battery_saver_description" msgid="8587408568232177204">"Ukuze unwebe impilo yebhethri, Isilondolozi sebhethri:\n\n•Sivula itimu emnyama\n•Sivala noma sibeka umkhawulo emsebenzini wangemuva, kweminye imithelela yokubuka, nakwezinye izici ezifana nokuthi “Ok Google”"</string> + <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Ukuze unwebe impilo yebhethri, Isilondolozi Sebhethri:\n\n•Sivula itimu emnyama\n• Sivala noma sibeka umkhawulo emsebenzini wangemuva, kweminye imithelela yokubuka, nakwezinye izici ezifana nokuthi “Ok Google”\n\n"<annotation id="url">"Funda kabanzi"</annotation></string> + <string name="battery_saver_description" msgid="6794188153647295212">"Ukuze unwebe impilo yebhethri, Isilondolozi sebhethri:\n\n•Sivula itimu emnyama\n• Sivala noma sibeka umkhawulo emsebenzini wangemuva, kweminye imithelela yokubuka, nakwezinye izici ezifana nokuthi “Ok Google”"</string> <string name="data_saver_description" msgid="4995164271550590517">"Ukusiza ukwehlisa ukusetshenziswa kwedatha, iseva yedatha igwema ezinye izinhlelo zokusebenza ukuthi zithumele noma zamukele idatha ngasemuva. Uhlelo lokusebenza olisebenzisa okwamanje lingafinyelela idatha, kodwa lingenza kanjalo kancane. Lokhu kungachaza, isibonelo, ukuthi izithombe azibonisi uze uzithephe."</string> <string name="data_saver_enable_title" msgid="7080620065745260137">"Vula iseva yedatha?"</string> <string name="data_saver_enable_button" msgid="4399405762586419726">"Vula"</string> diff --git a/core/tests/coretests/src/android/graphics/PaintNativeInstanceTest.kt b/core/tests/coretests/src/android/graphics/PaintNativeInstanceTest.kt new file mode 100644 index 000000000000..ac88601a83f0 --- /dev/null +++ b/core/tests/coretests/src/android/graphics/PaintNativeInstanceTest.kt @@ -0,0 +1,161 @@ +/* + * Copyright 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.graphics + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import java.util.concurrent.Callable +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +// Verify that various calls to getNativeInstance do not deadlock or otherwise fail. +@RunWith(AndroidJUnit4::class) +class PaintNativeInstanceTest { + + // Force a GC after each test, so that if there was a double free, it would happen now, rather + // than later during other tests. + @After + fun runGcAndFinalizersSync() { + Runtime.getRuntime().gc() + Runtime.getRuntime().runFinalization() + val fence = CountDownLatch(1) + object : Any() { + @Throws(Throwable::class) + protected fun finalize() = fence.countDown() + } + try { + do { + Runtime.getRuntime().gc() + Runtime.getRuntime().runFinalization() + } while (!fence.await(100, TimeUnit.MILLISECONDS)) + } catch (ex: InterruptedException) { + throw RuntimeException(ex) + } + } + + private fun setupComposeShader(test: (Paint, ComposeShader, Shader, Shader) -> Unit) { + val size = 255f + val blue = LinearGradient(0f, 0f, size, 0f, Color.GREEN, Color.BLUE, + Shader.TileMode.MIRROR) + val red = LinearGradient(0f, 0f, 0f, size, Color.GREEN, Color.RED, + Shader.TileMode.MIRROR) + val compose = ComposeShader(blue, red, BlendMode.SCREEN) + val paint = Paint().apply { + shader = compose + } + test(paint, compose, blue, red) + } + + // Change the matrix arbitrarily to invalidate the shader. + private fun Shader.changeMatrix() { + val matrix = Matrix().apply { + setScale(2f, 2f) + } + setLocalMatrix(matrix) + } + + @Test + fun testUnchangedPaintNativeInstance() = setupComposeShader { + paint, compose, shaderA, shaderB -> + val nativeInstance = paint.nativeInstance + for (shader in listOf(compose, shaderA, shaderB)) { + shader.changeMatrix() + // Although the shader is invalidated, the Paint's nativeInstance remains the same. + assertEquals(nativeInstance, paint.nativeInstance) + } + } + + @Test + fun testInvalidateSubShader() = setupComposeShader { + paint, compose, shaderA, shaderB -> + // Trigger the creation of native objects. + shaderA.nativeInstance + compose.nativeInstance + val instanceB = shaderB.nativeInstance + + // Changing shaderA's matrix invalidates shaderA and compose. A new instance will be lazily + // created for each of them. We cannot assert that the new nativeInstance does not match, + // since it might be allocated at the same location. But we can verify that shaderB did not + // change, and that there was no deadlock. + shaderA.changeMatrix() + assertEquals(instanceB, shaderB.nativeInstance) + paint.nativeInstance + } + + @Test + fun testInvalidateSubShaderDraw() = setupComposeShader { + paint, _, _, shaderB -> + + val original = PaintTask(paint).call() + + // Change one of the subshaders and verify that the paint now draws differently. + shaderB.changeMatrix() + val changed = PaintTask(paint).call() + assertFalse(changed.sameAs(original)) + } + + /* + * This task will trigger the creation of native objects, if they have not already been + * created. + */ + class PaintTask(private val mPaint: Paint) : Callable<Bitmap> { + private val size = 255 // matches size of gradients in setupComposeShader + override fun call(): Bitmap = Bitmap.createBitmap(size, size, + Bitmap.Config.ARGB_8888).apply { + val canvas = Canvas(this) + canvas.drawPaint(mPaint) + } + } + + @Test + fun testMultiThreadShader() = setupComposeShader { + paint, _, _, _ -> + // Create an arbitrary number of tasks and try to start them at approximately the same time. + // They will race to create the native objects, but this should be safe. + val tasks = List(5) { PaintTask(paint) } + val results = Executors.newCachedThreadPool().invokeAll(tasks) + var expectedBitmap: Bitmap? = null + for (result in results) { + if (expectedBitmap == null) { + expectedBitmap = result.get() + } else { + assertTrue(expectedBitmap.sameAs(result.get())) + } + } + } + + @Test + fun testMultiThreadColorFilter() { + val paint = Paint().apply { + color = Color.MAGENTA + colorFilter = LightingColorFilter(Color.BLUE, Color.GREEN) + } + // Create an arbitrary number of tasks and try to start them at approximately the same time. + // They will race to create the native objects, but this should be safe. + val tasks = List(5) { PaintTask(paint) } + val results = Executors.newCachedThreadPool().invokeAll(tasks) + for (result in results) { + assertEquals(Color.CYAN, result.get().getPixel(0, 0)) + } + } +} diff --git a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java index d00d052db590..0af8c728aba3 100644 --- a/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java +++ b/core/tests/coretests/src/android/service/euicc/EuiccProfileInfoTest.java @@ -154,6 +154,29 @@ public class EuiccProfileInfoTest { } @Test + public void testBuilder_BasedOnAnotherProfileWithEmptyAccessRules() { + EuiccProfileInfo p = + new EuiccProfileInfo.Builder("21430000000000006587") + .setNickname("profile nickname") + .setProfileName("profile name") + .setServiceProviderName("service provider") + .setCarrierIdentifier( + new CarrierIdentifier( + new byte[] {0x23, 0x45, 0x67}, + "123", + "45")) + .setState(EuiccProfileInfo.PROFILE_STATE_ENABLED) + .setProfileClass(EuiccProfileInfo.PROFILE_CLASS_OPERATIONAL) + .setPolicyRules(EuiccProfileInfo.POLICY_RULE_DO_NOT_DELETE) + .setUiccAccessRule(null) + .build(); + + EuiccProfileInfo copied = new EuiccProfileInfo.Builder(p).build(); + + assertEquals(null, copied.getUiccAccessRules()); + } + + @Test public void testEqualsHashCode() { EuiccProfileInfo p = new EuiccProfileInfo.Builder("21430000000000006587") diff --git a/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java b/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java new file mode 100644 index 000000000000..0f17d27048f3 --- /dev/null +++ b/core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java @@ -0,0 +1,671 @@ +/* + * Copyright (C) 2013 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.text.format; + +import static android.icu.util.TimeZone.GMT_ZONE; +import static android.icu.util.ULocale.ENGLISH; +import static android.text.format.DateIntervalFormat.formatDateRange; +import static android.text.format.DateUtils.FORMAT_12HOUR; +import static android.text.format.DateUtils.FORMAT_24HOUR; +import static android.text.format.DateUtils.FORMAT_ABBREV_ALL; +import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH; +import static android.text.format.DateUtils.FORMAT_ABBREV_TIME; +import static android.text.format.DateUtils.FORMAT_ABBREV_WEEKDAY; +import static android.text.format.DateUtils.FORMAT_NO_MONTH_DAY; +import static android.text.format.DateUtils.FORMAT_NO_YEAR; +import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_TIME; +import static android.text.format.DateUtils.FORMAT_SHOW_WEEKDAY; +import static android.text.format.DateUtils.FORMAT_SHOW_YEAR; +import static android.text.format.DateUtils.FORMAT_UTC; + +import static org.junit.Assert.assertEquals; + +import android.icu.util.Calendar; +import android.icu.util.TimeZone; +import android.icu.util.ULocale; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.function.BiFunction; + +@Presubmit +@SmallTest +@RunWith(AndroidJUnit4.class) +public class DateIntervalFormatTest { + private static final long MINUTE = 60 * 1000; + private static final long HOUR = 60 * MINUTE; + private static final long DAY = 24 * HOUR; + private static final long MONTH = 31 * DAY; + private static final long YEAR = 12 * MONTH; + + // These are the old CTS tests for DateIntervalFormat.formatDateRange. + @Test + public void test_formatDateInterval() throws Exception { + TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles"); + + Calendar c = Calendar.getInstance(tz, ULocale.US); + c.set(Calendar.MONTH, Calendar.JANUARY); + c.set(Calendar.DAY_OF_MONTH, 19); + c.set(Calendar.HOUR_OF_DAY, 3); + c.set(Calendar.MINUTE, 30); + c.set(Calendar.SECOND, 15); + c.set(Calendar.MILLISECOND, 0); + long timeWithCurrentYear = c.getTimeInMillis(); + + c.set(Calendar.YEAR, 2009); + long fixedTime = c.getTimeInMillis(); + + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + long onTheHour = c.getTimeInMillis(); + + long noonDuration = (8 * 60 + 30) * 60 * 1000 - 15 * 1000; + long midnightDuration = (3 * 60 + 30) * 60 * 1000 + 15 * 1000; + + ULocale de_DE = new ULocale("de", "DE"); + ULocale en_US = new ULocale("en", "US"); + ULocale es_ES = new ULocale("es", "ES"); + ULocale es_US = new ULocale("es", "US"); + + assertEquals("Monday", + formatDateRange(en_US, tz, fixedTime, fixedTime + HOUR, FORMAT_SHOW_WEEKDAY)); + assertEquals("January 19", + formatDateRange(en_US, tz, timeWithCurrentYear, timeWithCurrentYear + HOUR, + FORMAT_SHOW_DATE)); + assertEquals("3:30 AM", formatDateRange(en_US, tz, fixedTime, fixedTime, FORMAT_SHOW_TIME)); + assertEquals("January 19, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + HOUR, FORMAT_SHOW_YEAR)); + assertEquals("January 19", + formatDateRange(en_US, tz, fixedTime, fixedTime + HOUR, FORMAT_NO_YEAR)); + assertEquals("January", + formatDateRange(en_US, tz, timeWithCurrentYear, timeWithCurrentYear + HOUR, + FORMAT_NO_MONTH_DAY)); + assertEquals("3:30 AM", + formatDateRange(en_US, tz, fixedTime, fixedTime, FORMAT_12HOUR | FORMAT_SHOW_TIME)); + assertEquals("03:30", + formatDateRange(en_US, tz, fixedTime, fixedTime, FORMAT_24HOUR | FORMAT_SHOW_TIME)); + assertEquals("3:30 AM", formatDateRange(en_US, tz, fixedTime, fixedTime, + FORMAT_12HOUR /*| FORMAT_CAP_AMPM*/ | FORMAT_SHOW_TIME)); + assertEquals("12:00 PM", + formatDateRange(en_US, tz, fixedTime + noonDuration, fixedTime + noonDuration, + FORMAT_12HOUR | FORMAT_SHOW_TIME)); + assertEquals("12:00 PM", + formatDateRange(en_US, tz, fixedTime + noonDuration, fixedTime + noonDuration, + FORMAT_12HOUR | FORMAT_SHOW_TIME /*| FORMAT_CAP_NOON*/)); + assertEquals("12:00 PM", + formatDateRange(en_US, tz, fixedTime + noonDuration, fixedTime + noonDuration, + FORMAT_12HOUR /*| FORMAT_NO_NOON*/ | FORMAT_SHOW_TIME)); + assertEquals("12:00 AM", formatDateRange(en_US, tz, fixedTime - midnightDuration, + fixedTime - midnightDuration, + FORMAT_12HOUR | FORMAT_SHOW_TIME /*| FORMAT_NO_MIDNIGHT*/)); + assertEquals("3:30 AM", + formatDateRange(en_US, tz, fixedTime, fixedTime, FORMAT_SHOW_TIME | FORMAT_UTC)); + assertEquals("3 AM", formatDateRange(en_US, tz, onTheHour, onTheHour, + FORMAT_SHOW_TIME | FORMAT_ABBREV_TIME)); + assertEquals("Mon", formatDateRange(en_US, tz, fixedTime, fixedTime + HOUR, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_WEEKDAY)); + assertEquals("Jan 19", + formatDateRange(en_US, tz, timeWithCurrentYear, timeWithCurrentYear + HOUR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_MONTH)); + assertEquals("Jan 19", + formatDateRange(en_US, tz, timeWithCurrentYear, timeWithCurrentYear + HOUR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + + assertEquals("1/19/2009", formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * HOUR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("1/19/2009 – 1/22/2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("1/19/2009 – 4/22/2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("1/19/2009 – 2/9/2012", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + + assertEquals("19.1.2009", formatDateRange(de_DE, tz, fixedTime, fixedTime + HOUR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19.–22.01.2009", formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19.01. – 22.04.2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19.01.2009 – 09.02.2012", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + + assertEquals("19/1/2009", formatDateRange(es_US, tz, fixedTime, fixedTime + HOUR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–22/1/2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–22/4/2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–9/2/2012", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + + assertEquals("19/1/2009", formatDateRange(es_ES, tz, fixedTime, fixedTime + HOUR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–22/1/2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–22/4/2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + assertEquals("19/1/2009–9/2/2012", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_YEAR | FORMAT_NUMERIC_DATE)); + + // These are some random other test cases I came up with. + + assertEquals("January 19 – 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * DAY, 0)); + assertEquals("Jan 19 – 22, 2009", formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Mon, Jan 19 – Thu, Jan 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("Monday, January 19 – Thursday, January 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY)); + + assertEquals("January 19 – April 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * MONTH, 0)); + assertEquals("Jan 19 – Apr 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Mon, Jan 19 – Wed, Apr 22, 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("January – April 2009", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY)); + + assertEquals("Jan 19, 2009 – Feb 9, 2012", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Jan 2009 – Feb 2012", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL)); + assertEquals("January 19, 2009 – February 9, 2012", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * YEAR, 0)); + assertEquals("Monday, January 19, 2009 – Thursday, February 9, 2012", + formatDateRange(en_US, tz, fixedTime, fixedTime + 3 * YEAR, FORMAT_SHOW_WEEKDAY)); + + // The same tests but for de_DE. + + assertEquals("19.–22. Januar 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * DAY, 0)); + assertEquals("19.–22. Jan. 2009", formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Mo., 19. – Do., 22. Jan. 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("Montag, 19. – Donnerstag, 22. Januar 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY)); + + assertEquals("19. Januar – 22. April 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * MONTH, 0)); + assertEquals("19. Jan. – 22. Apr. 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Mo., 19. Jan. – Mi., 22. Apr. 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("Januar–April 2009", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY)); + + assertEquals("19. Jan. 2009 – 9. Feb. 2012", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("Jan. 2009 – Feb. 2012", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL)); + assertEquals("19. Januar 2009 – 9. Februar 2012", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * YEAR, 0)); + assertEquals("Montag, 19. Januar 2009 – Donnerstag, 9. Februar 2012", + formatDateRange(de_DE, tz, fixedTime, fixedTime + 3 * YEAR, FORMAT_SHOW_WEEKDAY)); + + // The same tests but for es_US. + + assertEquals("19–22 de enero de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, 0)); + assertEquals("19–22 de ene. de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("lun., 19 de ene. – jue., 22 de ene. de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("lunes, 19 de enero–jueves, 22 de enero de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY)); + + assertEquals("19 de enero–22 de abril de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, 0)); + assertEquals("19 de ene. – 22 de abr. 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("lun., 19 de ene. – mié., 22 de abr. de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("enero–abril de 2009", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY)); + + assertEquals("19 de ene. de 2009 – 9 de feb. de 2012", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("ene. de 2009 – feb. de 2012", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL)); + assertEquals("19 de enero de 2009–9 de febrero de 2012", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, 0)); + assertEquals("lunes, 19 de enero de 2009–jueves, 9 de febrero de 2012", + formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, FORMAT_SHOW_WEEKDAY)); + + // The same tests but for es_ES. + + assertEquals("19–22 de enero de 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY, 0)); + assertEquals("19–22 ene. 2009", formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("lun., 19 ene. – jue., 22 ene. 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("lunes, 19 de enero–jueves, 22 de enero de 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY)); + + assertEquals("19 de enero–22 de abril de 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * MONTH, 0)); + assertEquals("19 ene. – 22 abr. 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("lun., 19 ene. – mié., 22 abr. 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * MONTH, + FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); + assertEquals("enero–abril de 2009", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY)); + + assertEquals("19 ene. 2009 – 9 feb. 2012", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); + assertEquals("ene. 2009 – feb. 2012", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * YEAR, + FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL)); + assertEquals("19 de enero de 2009–9 de febrero de 2012", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * YEAR, 0)); + assertEquals("lunes, 19 de enero de 2009–jueves, 9 de febrero de 2012", + formatDateRange(es_ES, tz, fixedTime, fixedTime + 3 * YEAR, FORMAT_SHOW_WEEKDAY)); + } + + // http://b/8862241 - we should be able to format dates past 2038. + // See also http://code.google.com/p/android/issues/detail?id=13050. + @Test + public void test8862241() throws Exception { + ULocale l = ULocale.US; + TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles"); + Calendar c = Calendar.getInstance(tz, l); + c.clear(); + c.set(2042, Calendar.JANUARY, 19, 3, 30); + long jan_19_2042 = c.getTimeInMillis(); + c.set(2046, Calendar.OCTOBER, 4, 3, 30); + long oct_4_2046 = c.getTimeInMillis(); + int flags = FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL; + assertEquals("Jan 19, 2042 – Oct 4, 2046", + formatDateRange(l, tz, jan_19_2042, oct_4_2046, flags)); + } + + // http://b/10089890 - we should take the given time zone into account. + @Test + public void test10089890() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + TimeZone pacific = TimeZone.getTimeZone("America/Los_Angeles"); + int flags = FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL | FORMAT_SHOW_TIME | FORMAT_24HOUR; + + // The Unix epoch is UTC, so 0 is 1970-01-01T00:00Z... + assertEquals("Jan 1, 1970, 00:00 – Jan 2, 1970, 00:00", + formatDateRange(l, utc, 0, DAY + 1, flags)); + // But MTV is hours behind, so 0 was still the afternoon of the previous day... + assertEquals("Dec 31, 1969, 16:00 – Jan 1, 1970, 16:00", + formatDateRange(l, pacific, 0, DAY, flags)); + } + + // http://b/10318326 - we can drop the minutes in a 12-hour time if they're zero, + // but not if we're using the 24-hour clock. That is: "4 PM" is reasonable, "16" is not. + @Test + public void test10318326() throws Exception { + long midnight = 0; + long teaTime = 16 * HOUR; + + int time12 = FORMAT_12HOUR | FORMAT_SHOW_TIME; + int time24 = FORMAT_24HOUR | FORMAT_SHOW_TIME; + int abbr12 = time12 | FORMAT_ABBREV_ALL; + int abbr24 = time24 | FORMAT_ABBREV_ALL; + + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + // Full length on-the-hour times. + assertEquals("00:00", formatDateRange(l, utc, midnight, midnight, time24)); + assertEquals("12:00 AM", formatDateRange(l, utc, midnight, midnight, time12)); + assertEquals("16:00", formatDateRange(l, utc, teaTime, teaTime, time24)); + assertEquals("4:00 PM", formatDateRange(l, utc, teaTime, teaTime, time12)); + + // Abbreviated on-the-hour times. + assertEquals("00:00", formatDateRange(l, utc, midnight, midnight, abbr24)); + assertEquals("12 AM", formatDateRange(l, utc, midnight, midnight, abbr12)); + assertEquals("16:00", formatDateRange(l, utc, teaTime, teaTime, abbr24)); + assertEquals("4 PM", formatDateRange(l, utc, teaTime, teaTime, abbr12)); + + // Abbreviated on-the-hour ranges. + assertEquals("00:00 – 16:00", formatDateRange(l, utc, midnight, teaTime, abbr24)); + assertEquals("12 AM – 4 PM", formatDateRange(l, utc, midnight, teaTime, abbr12)); + + // Abbreviated mixed ranges. + assertEquals("00:00 – 16:01", formatDateRange(l, utc, midnight, teaTime + MINUTE, abbr24)); + assertEquals("12:00 AM – 4:01 PM", + formatDateRange(l, utc, midnight, teaTime + MINUTE, abbr12)); + } + + // http://b/10560853 - when the time is not displayed, an end time 0 ms into the next day is + // considered to belong to the previous day. + @Test + public void test10560853_when_time_not_displayed() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + long midnight = 0; + long midnightNext = 1 * DAY; + + int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY; + + // An all-day event runs until 0 milliseconds into the next day, but is formatted as if it's + // just the first day. + assertEquals("Thursday, January 1, 1970", + formatDateRange(l, utc, midnight, midnightNext, flags)); + + // Run one millisecond over, though, and you're into the next day. + long nextMorning = 1 * DAY + 1; + assertEquals("Thursday, January 1 – Friday, January 2, 1970", + formatDateRange(l, utc, midnight, nextMorning, flags)); + + // But the same reasoning applies for that day. + long nextMidnight = 2 * DAY; + assertEquals("Thursday, January 1 – Friday, January 2, 1970", + formatDateRange(l, utc, midnight, nextMidnight, flags)); + } + + // http://b/10560853 - when the start and end times are otherwise on the same day, + // an end time 0 ms into the next day is considered to belong to the previous day. + @Test + public void test10560853_for_single_day_events() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + int flags = FORMAT_SHOW_TIME | FORMAT_24HOUR | FORMAT_SHOW_DATE; + + assertEquals("January 1, 1970, 22:00 – 00:00", + formatDateRange(l, utc, 22 * HOUR, 24 * HOUR, flags)); + assertEquals("January 1, 1970, 22:00 – January 2, 1970, 00:30", + formatDateRange(l, utc, 22 * HOUR, 24 * HOUR + 30 * MINUTE, flags)); + } + + // The fix for http://b/10560853 didn't work except for the day around the epoch, which was + // all the unit test checked! + @Test + public void test_single_day_events_later_than_epoch() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + int flags = FORMAT_SHOW_TIME | FORMAT_24HOUR | FORMAT_SHOW_DATE; + + Calendar c = Calendar.getInstance(utc, l); + c.clear(); + c.set(1980, Calendar.JANUARY, 1, 0, 0); + long jan_1_1980 = c.getTimeInMillis(); + assertEquals("January 1, 1980, 22:00 – 00:00", + formatDateRange(l, utc, jan_1_1980 + 22 * HOUR, jan_1_1980 + 24 * HOUR, flags)); + assertEquals("January 1, 1980, 22:00 – January 2, 1980, 00:30", + formatDateRange(l, utc, jan_1_1980 + 22 * HOUR, + jan_1_1980 + 24 * HOUR + 30 * MINUTE, flags)); + } + + // The fix for http://b/10560853 didn't work except for UTC, which was + // all the unit test checked! + @Test + public void test_single_day_events_not_in_UTC() throws Exception { + ULocale l = ULocale.US; + TimeZone pacific = TimeZone.getTimeZone("America/Los_Angeles"); + + int flags = FORMAT_SHOW_TIME | FORMAT_24HOUR | FORMAT_SHOW_DATE; + + Calendar c = Calendar.getInstance(pacific, l); + c.clear(); + c.set(1980, Calendar.JANUARY, 1, 0, 0); + long jan_1_1980 = c.getTimeInMillis(); + assertEquals("January 1, 1980, 22:00 – 00:00", + formatDateRange(l, pacific, jan_1_1980 + 22 * HOUR, jan_1_1980 + 24 * HOUR, flags)); + + c.set(1980, Calendar.JULY, 1, 0, 0); + long jul_1_1980 = c.getTimeInMillis(); + assertEquals("July 1, 1980, 22:00 – 00:00", + formatDateRange(l, pacific, jul_1_1980 + 22 * HOUR, jul_1_1980 + 24 * HOUR, flags)); + } + + // http://b/10209343 - even if the caller didn't explicitly ask us to include the year, + // we should do so for years other than the current year. + @Test + public void test10209343_when_not_this_year() { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_TIME | FORMAT_24HOUR; + + assertEquals("Thursday, January 1, 1970, 00:00", formatDateRange(l, utc, 0L, 0L, flags)); + + long t1833 = ((long) Integer.MIN_VALUE + Integer.MIN_VALUE) * 1000L; + assertEquals("Sunday, November 24, 1833, 17:31", + formatDateRange(l, utc, t1833, t1833, flags)); + + long t1901 = Integer.MIN_VALUE * 1000L; + assertEquals("Friday, December 13, 1901, 20:45", + formatDateRange(l, utc, t1901, t1901, flags)); + + long t2038 = Integer.MAX_VALUE * 1000L; + assertEquals("Tuesday, January 19, 2038, 03:14", + formatDateRange(l, utc, t2038, t2038, flags)); + + long t2106 = (2L + Integer.MAX_VALUE + Integer.MAX_VALUE) * 1000L; + assertEquals("Sunday, February 7, 2106, 06:28", + formatDateRange(l, utc, t2106, t2106, flags)); + } + + // http://b/10209343 - for the current year, we should honor the FORMAT_SHOW_YEAR flags. + @Test + public void test10209343_when_this_year() { + // Construct a date in the current year (whenever the test happens to be run). + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + Calendar c = Calendar.getInstance(utc, l); + c.set(Calendar.MONTH, Calendar.FEBRUARY); + c.set(Calendar.DAY_OF_MONTH, 10); + c.set(Calendar.HOUR_OF_DAY, 0); + long thisYear = c.getTimeInMillis(); + + // You don't get the year if it's this year... + assertEquals("February 10", formatDateRange(l, utc, thisYear, thisYear, FORMAT_SHOW_DATE)); + + // ...unless you explicitly ask for it. + assertEquals(String.format("February 10, %d", c.get(Calendar.YEAR)), + formatDateRange(l, utc, thisYear, thisYear, FORMAT_SHOW_DATE | FORMAT_SHOW_YEAR)); + + // ...or it's not actually this year... + Calendar c2 = (Calendar) c.clone(); + c2.set(Calendar.YEAR, 1980); + long oldYear = c2.getTimeInMillis(); + assertEquals("February 10, 1980", + formatDateRange(l, utc, oldYear, oldYear, FORMAT_SHOW_DATE)); + + // (But you can disable that!) + assertEquals("February 10", + formatDateRange(l, utc, oldYear, oldYear, FORMAT_SHOW_DATE | FORMAT_NO_YEAR)); + + // ...or the start and end years aren't the same... + assertEquals(String.format("February 10, 1980 – February 10, %d", c.get(Calendar.YEAR)), + formatDateRange(l, utc, oldYear, thisYear, FORMAT_SHOW_DATE)); + + // (And you can't avoid that --- icu4c steps in and overrides you.) + assertEquals(String.format("February 10, 1980 – February 10, %d", c.get(Calendar.YEAR)), + formatDateRange(l, utc, oldYear, thisYear, FORMAT_SHOW_DATE | FORMAT_NO_YEAR)); + } + + // http://b/8467515 - yet another y2k38 bug report. + @Test + public void test8467515() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_YEAR | FORMAT_ABBREV_MONTH + | FORMAT_ABBREV_WEEKDAY; + long t; + + Calendar calendar = Calendar.getInstance(utc, l); + calendar.clear(); + + calendar.set(2038, Calendar.JANUARY, 19, 12, 0, 0); + t = calendar.getTimeInMillis(); + assertEquals("Tue, Jan 19, 2038", formatDateRange(l, utc, t, t, flags)); + + calendar.set(1900, Calendar.JANUARY, 1, 0, 0, 0); + t = calendar.getTimeInMillis(); + assertEquals("Mon, Jan 1, 1900", formatDateRange(l, utc, t, t, flags)); + } + + // http://b/12004664 + @Test + public void test12004664() throws Exception { + TimeZone utc = TimeZone.getTimeZone("UTC"); + Calendar c = Calendar.getInstance(utc, ULocale.US); + c.clear(); + c.set(Calendar.YEAR, 1980); + c.set(Calendar.MONTH, Calendar.FEBRUARY); + c.set(Calendar.DAY_OF_MONTH, 10); + c.set(Calendar.HOUR_OF_DAY, 0); + long thisYear = c.getTimeInMillis(); + + int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_YEAR; + assertEquals("Sunday, February 10, 1980", + formatDateRange(new ULocale("en", "US"), utc, thisYear, thisYear, flags)); + + // If we supported non-Gregorian calendars, this is what that we'd expect for these + // ULocales. + // This is really the correct behavior, but since java.util.Calendar currently only supports + // the Gregorian calendar, we want to deliberately force icu4c to agree, otherwise we'd have + // a mix of calendars throughout an app's UI depending on whether Java or native code + // formatted + // the date. + // assertEquals("یکشنبه ۲۱ بهمن ۱۳۵۸ ه.ش.", formatDateRange(new ULocale("fa"), utc, + // thisYear, thisYear, flags)); + // assertEquals("AP ۱۳۵۸ سلواغه ۲۱, یکشنبه", formatDateRange(new ULocale("ps"), utc, + // thisYear, thisYear, flags)); + // assertEquals("วันอาทิตย์ 10 กุมภาพันธ์ 2523", formatDateRange(new ULocale("th"), utc, + // thisYear, thisYear, flags)); + + // For now, here are the localized Gregorian strings instead... + assertEquals("یکشنبه ۱۰ فوریهٔ ۱۹۸۰", + formatDateRange(new ULocale("fa"), utc, thisYear, thisYear, flags)); + assertEquals("يونۍ د ۱۹۸۰ د فبروري ۱۰", + formatDateRange(new ULocale("ps"), utc, thisYear, thisYear, flags)); + assertEquals("วันอาทิตย์ที่ 10 กุมภาพันธ์ ค.ศ. 1980", + formatDateRange(new ULocale("th"), utc, thisYear, thisYear, flags)); + } + + // http://b/13234532 + @Test + public void test13234532() throws Exception { + ULocale l = ULocale.US; + TimeZone utc = TimeZone.getTimeZone("UTC"); + + int flags = FORMAT_SHOW_TIME | FORMAT_ABBREV_ALL | FORMAT_12HOUR; + + assertEquals("10 – 11 AM", formatDateRange(l, utc, 10 * HOUR, 11 * HOUR, flags)); + assertEquals("11 AM – 1 PM", formatDateRange(l, utc, 11 * HOUR, 13 * HOUR, flags)); + assertEquals("2 – 3 PM", formatDateRange(l, utc, 14 * HOUR, 15 * HOUR, flags)); + } + + // http://b/20708022 + @Test + public void testEndOfDayOnLastDayOfMonth() throws Exception { + final ULocale locale = new ULocale("en"); + final TimeZone timeZone = TimeZone.getTimeZone("UTC"); + + assertEquals("11:00 PM – 12:00 AM", formatDateRange(locale, timeZone, + 1430434800000L, 1430438400000L, FORMAT_SHOW_TIME)); + } + + // http://b/68847519 + @Test + public void testEndAtMidnight_dateAndTime() { + BiFunction<Long, Long, String> fmt = (from, to) -> formatDateRange( + ENGLISH, GMT_ZONE, from, to, FORMAT_SHOW_DATE | FORMAT_SHOW_TIME | FORMAT_24HOUR); + // If we're showing times and the end-point is midnight the following day, we want the + // behaviour of suppressing the date for the end... + assertEquals("February 27, 2007, 04:00 – 00:00", fmt.apply(1172548800000L, 1172620800000L)); + // ...unless the start-point is also midnight, in which case we need dates to disambiguate. + assertEquals("February 27, 2007, 00:00 – February 28, 2007, 00:00", + fmt.apply(1172534400000L, 1172620800000L)); + // We want to show the date if the end-point is a millisecond after midnight the following + // day, or if it is exactly midnight the day after that. + assertEquals("February 27, 2007, 04:00 – February 28, 2007, 00:00", + fmt.apply(1172548800000L, 1172620800001L)); + assertEquals("February 27, 2007, 04:00 – March 1, 2007, 00:00", + fmt.apply(1172548800000L, 1172707200000L)); + // We want to show the date if the start-point is anything less than a minute after + // midnight, + // since that gets displayed as midnight... + assertEquals("February 27, 2007, 00:00 – February 28, 2007, 00:00", + fmt.apply(1172534459999L, 1172620800000L)); + // ...but not if it is exactly one minute after midnight. + assertEquals("February 27, 2007, 00:01 – 00:00", fmt.apply(1172534460000L, 1172620800000L)); + } + + // http://b/68847519 + @Test + public void testEndAtMidnight_dateOnly() { + BiFunction<Long, Long, String> fmt = (from, to) -> formatDateRange( + ENGLISH, GMT_ZONE, from, to, FORMAT_SHOW_DATE); + // If we're only showing dates and the end-point is midnight of any day, we want the + // behaviour of showing an end date one earlier. So if the end-point is March 2, 2007 00:00, + // show March 1, 2007 instead (whether the start-point is midnight or not). + assertEquals("February 27 – March 1, 2007", fmt.apply(1172534400000L, 1172793600000L)); + assertEquals("February 27 – March 1, 2007", fmt.apply(1172548800000L, 1172793600000L)); + // We want to show the true date if the end-point is a millisecond after midnight. + assertEquals("February 27 – March 2, 2007", fmt.apply(1172534400000L, 1172793600001L)); + + // 2006-02-27 00:00:00.000 GMT - 2007-03-02 00:00:00.000 GMT + assertEquals("February 27, 2006 – March 1, 2007", + fmt.apply(1140998400000L, 1172793600000L)); + + // Spans a leap year's Feb 29th. + assertEquals("February 27 – March 1, 2004", fmt.apply(1077840000000L, 1078185600000L)); + } +} diff --git a/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java b/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java index d9ba8fb81d3c..4b3b5735b4f3 100644 --- a/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java +++ b/core/tests/coretests/src/android/text/format/RelativeDateTimeFormatterTest.java @@ -16,11 +16,11 @@ package android.text.format; -import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_ALL; -import static android.text.format.DateUtilsBridge.FORMAT_ABBREV_RELATIVE; -import static android.text.format.DateUtilsBridge.FORMAT_NO_YEAR; -import static android.text.format.DateUtilsBridge.FORMAT_NUMERIC_DATE; -import static android.text.format.DateUtilsBridge.FORMAT_SHOW_YEAR; +import static android.text.format.DateUtils.FORMAT_ABBREV_ALL; +import static android.text.format.DateUtils.FORMAT_ABBREV_RELATIVE; +import static android.text.format.DateUtils.FORMAT_NO_YEAR; +import static android.text.format.DateUtils.FORMAT_NUMERIC_DATE; +import static android.text.format.DateUtils.FORMAT_SHOW_YEAR; import static android.text.format.RelativeDateTimeFormatter.DAY_IN_MILLIS; import static android.text.format.RelativeDateTimeFormatter.HOUR_IN_MILLIS; import static android.text.format.RelativeDateTimeFormatter.MINUTE_IN_MILLIS; diff --git a/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java b/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java index bfcf52af80bf..eb695258142a 100644 --- a/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java +++ b/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java @@ -86,7 +86,7 @@ public class ImeInsetsSourceConsumerTest { false, new DisplayCutout( Insets.of(10, 10, 10, 10), rect, rect, rect, rect), - SOFT_INPUT_ADJUST_RESIZE, 0); + SOFT_INPUT_ADJUST_RESIZE, 0, 0); mImeConsumer = (ImeInsetsSourceConsumer) mController.getSourceConsumer(ITYPE_IME); }); } diff --git a/core/tests/coretests/src/android/view/InsetsControllerTest.java b/core/tests/coretests/src/android/view/InsetsControllerTest.java index c36f1067149e..801cd4ddb94e 100644 --- a/core/tests/coretests/src/android/view/InsetsControllerTest.java +++ b/core/tests/coretests/src/android/view/InsetsControllerTest.java @@ -165,7 +165,7 @@ public class InsetsControllerTest { false, new DisplayCutout( Insets.of(10, 10, 10, 10), rect, rect, rect, rect), - SOFT_INPUT_ADJUST_RESIZE, 0); + SOFT_INPUT_ADJUST_RESIZE, 0, 0); mController.onFrameChanged(new Rect(0, 0, 100, 100)); }); InstrumentationRegistry.getInstrumentation().waitForIdleSync(); diff --git a/core/tests/coretests/src/android/view/InsetsStateTest.java b/core/tests/coretests/src/android/view/InsetsStateTest.java index 5260ef83cc4f..c7d835ca7c7e 100644 --- a/core/tests/coretests/src/android/view/InsetsStateTest.java +++ b/core/tests/coretests/src/android/view/InsetsStateTest.java @@ -29,6 +29,7 @@ import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE; import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.navigationBars; import static android.view.WindowInsets.Type.statusBars; +import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; @@ -77,7 +78,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_IME).setVisible(true); SparseIntArray typeSideMap = new SparseIntArray(); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, typeSideMap); + false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, 0, typeSideMap); assertEquals(Insets.of(0, 100, 0, 100), insets.getSystemWindowInsets()); assertEquals(Insets.of(0, 100, 0, 100), insets.getInsets(Type.all())); assertEquals(ISIDE_TOP, typeSideMap.get(ITYPE_STATUS_BAR)); @@ -96,7 +97,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_IME).setFrame(new Rect(0, 100, 100, 300)); mState.getSource(ITYPE_IME).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, null); + false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, 0, null); assertEquals(100, insets.getStableInsetBottom()); assertEquals(Insets.of(0, 0, 0, 100), insets.getInsetsIgnoringVisibility(Type.systemBars())); assertEquals(Insets.of(0, 0, 0, 200), insets.getSystemWindowInsets()); @@ -115,7 +116,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_NAVIGATION_BAR).setFrame(new Rect(80, 0, 100, 300)); mState.getSource(ITYPE_NAVIGATION_BAR).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, 0, 0, null); + false, DisplayCutout.NO_CUTOUT, 0, 0, 0, null); assertEquals(Insets.of(0, 100, 20, 0), insets.getSystemWindowInsets()); assertEquals(Insets.of(0, 100, 0, 0), insets.getInsets(Type.statusBars())); assertEquals(Insets.of(0, 0, 20, 0), insets.getInsets(Type.navigationBars())); @@ -131,7 +132,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_IME).setFrame(new Rect(0, 200, 100, 300)); mState.getSource(ITYPE_IME).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, 0, null); + false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, 0, 0, null); assertEquals(0, insets.getSystemWindowInsetBottom()); assertEquals(100, insets.getInsets(ime()).bottom); assertTrue(insets.isVisible(ime())); @@ -147,11 +148,28 @@ public class InsetsStateTest { mState.getSource(ITYPE_IME).setFrame(new Rect(0, 200, 100, 300)); mState.getSource(ITYPE_IME).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, + false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, 0, SYSTEM_UI_FLAG_LAYOUT_STABLE, null); assertEquals(100, insets.getSystemWindowInsetTop()); insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, false, - DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, + DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, 0, + 0 /* legacySystemUiFlags */, null); + assertEquals(0, insets.getSystemWindowInsetTop()); + } + } + + @Test + public void testCalculateInsets_systemUiFlagLayoutStable_windowFlagFullscreen() { + try (final InsetsModeSession session = + new InsetsModeSession(ViewRootImpl.NEW_INSETS_MODE_FULL)) { + mState.getSource(ITYPE_STATUS_BAR).setFrame(new Rect(0, 0, 100, 100)); + mState.getSource(ITYPE_STATUS_BAR).setVisible(false); + WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, + false, DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, FLAG_FULLSCREEN, + SYSTEM_UI_FLAG_LAYOUT_STABLE, null); + assertEquals(0, insets.getSystemWindowInsetTop()); + insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, false, + DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_NOTHING, 0, 0 /* legacySystemUiFlags */, null); assertEquals(0, insets.getSystemWindowInsetTop()); } @@ -195,7 +213,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_EXTRA_NAVIGATION_BAR).setFrame(new Rect(80, 0, 100, 300)); mState.getSource(ITYPE_EXTRA_NAVIGATION_BAR).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, 0, 0, null); + false, DisplayCutout.NO_CUTOUT, 0, 0, 0, null); assertEquals(Insets.of(0, 100, 20, 0), insets.getSystemWindowInsets()); assertEquals(Insets.of(0, 100, 0, 0), insets.getInsets(Type.statusBars())); assertEquals(Insets.of(0, 0, 20, 0), insets.getInsets(Type.navigationBars())); @@ -211,7 +229,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_NAVIGATION_BAR).setFrame(new Rect(80, 0, 100, 300)); mState.getSource(ITYPE_NAVIGATION_BAR).setVisible(true); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, - false, DisplayCutout.NO_CUTOUT, 0, 0, null); + false, DisplayCutout.NO_CUTOUT, 0, 0, 0, null); assertEquals(Insets.of(0, 100, 20, 0), insets.getSystemWindowInsets()); assertEquals(Insets.of(0, 100, 0, 0), insets.getInsets(Type.statusBars())); assertEquals(Insets.of(0, 0, 20, 0), insets.getInsets(Type.navigationBars())); @@ -226,7 +244,7 @@ public class InsetsStateTest { mState.getSource(ITYPE_IME).setVisible(true); mState.removeSource(ITYPE_IME); WindowInsets insets = mState.calculateInsets(new Rect(0, 0, 100, 300), null, false, false, - DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, null); + DisplayCutout.NO_CUTOUT, SOFT_INPUT_ADJUST_RESIZE, 0, 0, null); assertEquals(0, insets.getSystemWindowInsetBottom()); } diff --git a/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java index 02ffc00dcba5..93de03adfa84 100644 --- a/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java @@ -264,6 +264,25 @@ public class EditorInfoTest { InputConnection.GET_TEXT_WITH_STYLES))); } + @Test + public void surroundingTextRetrieval_writeToParcel_noException() { + StringBuilder sb = new StringBuilder("abcdefg"); + Parcel parcel = Parcel.obtain(); + EditorInfo editorInfo = new EditorInfo(); + editorInfo.initialSelStart = 2; + editorInfo.initialSelEnd = 5; + editorInfo.inputType = EditorInfo.TYPE_CLASS_TEXT; + + editorInfo.setInitialSurroundingText(sb); + sb.setLength(0); + editorInfo.writeToParcel(parcel, 0); + + try { + editorInfo.getInitialTextBeforeCursor(60, 1); + fail("Test shouldn't have exception"); + } catch (AssertionError e) { } + } + private static void assertExpectedTextLength(EditorInfo editorInfo, @Nullable Integer expectBeforeCursorLength, @Nullable Integer expectSelectionLength, @Nullable Integer expectAfterCursorLength) { diff --git a/data/etc/preinstalled-packages-platform-overlays.xml b/data/etc/preinstalled-packages-platform-overlays.xml index 84c1897a2b62..83323beb8dd4 100644 --- a/data/etc/preinstalled-packages-platform-overlays.xml +++ b/data/etc/preinstalled-packages-platform-overlays.xml @@ -19,250 +19,188 @@ <config> <install-in-user-type package="com.android.internal.display.cutout.emulation.corner"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.display.cutout.emulation.double"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.display.cutout.emulation.hole"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.display.cutout.emulation.tall"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.display.cutout.emulation.waterfall"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> - </install-in-user-type> - <install-in-user-type package="com.android.internal.systemui.navbar.twobutton"> - <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> - </install-in-user-type> - <install-in-user-type package="com.android.internal.systemui.navbar.threebutton"> - <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.systemui.navbar.gestural"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.systemui.navbar.gestural_extra_wide_back"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.systemui.navbar.gestural_narrow_back"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.internal.systemui.navbar.gestural_wide_back"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> + </install-in-user-type> + <install-in-user-type package="com.android.internal.systemui.navbar.threebutton"> + <install-in user-type="FULL" /> + </install-in-user-type> + <install-in-user-type package="com.android.internal.systemui.navbar.twobutton"> + <install-in user-type="FULL" /> </install-in-user-type> <install-in-user-type package="com.android.internal.systemui.onehanded.gestural"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.amethyst"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.aquamarine"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.black"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.carbon"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.cinnamon"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.green"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.ocean"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.orchid"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.palette"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.purple"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.sand"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.space"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.color.tangerine"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.font.notoserifsource"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.circular.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.circular.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.circular.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.circular.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.circular.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.filled.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.filled.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.filled.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.filled.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.filled.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.kai.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.kai.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.kai.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.kai.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.kai.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.rounded.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.rounded.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.rounded.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.rounded.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.rounded.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.sam.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.sam.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.sam.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.sam.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.sam.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.victor.android"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.victor.launcher"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.victor.settings"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.victor.systemui"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon_pack.victor.themepicker"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.pebble"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.roundedrect"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.squircle"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.taperedrect"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.teardrop"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> <install-in-user-type package="com.android.theme.icon.vessel"> <install-in user-type="FULL" /> - <install-in user-type="PROFILE" /> </install-in-user-type> </config> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 06791421d60f..6798c0a3f87e 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -160,6 +160,7 @@ applications that come with the platform <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/> <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <permission name="android.permission.DUMP"/> + <permission name="android.permission.HANDLE_CAR_MODE_CHANGES"/> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.LOCAL_MAC_ADDRESS"/> <permission name="android.permission.MANAGE_USERS"/> @@ -428,6 +429,10 @@ applications that come with the platform <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" /> <!-- Permissions required for CTS test - AdbManagerTest --> <permission name="android.permission.MANAGE_DEBUGGING" /> + <!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp --> + <permission name="android.car.permission.CAR_DRIVING_STATE" /> + <!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases --> + <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/data/keyboards/OWNERS b/data/keyboards/OWNERS index 031a6c1c7a89..c4f6df824a39 100644 --- a/data/keyboards/OWNERS +++ b/data/keyboards/OWNERS @@ -2,3 +2,4 @@ set noparent michaelwr@google.com svv@google.com +lzye@google.com diff --git a/data/keyboards/Vendor_046d_Product_c216.kl b/data/keyboards/Vendor_046d_Product_c216.kl index 6743323d7db8..8bc142f0cab0 100644 --- a/data/keyboards/Vendor_046d_Product_c216.kl +++ b/data/keyboards/Vendor_046d_Product_c216.kl @@ -16,15 +16,15 @@ # Logitech Dual Action Controller # -key 0x120 BUTTON_A -key 0x123 BUTTON_B -key 0x121 BUTTON_X -key 0x122 BUTTON_Y +key 0x121 BUTTON_A +key 0x122 BUTTON_B +key 0x120 BUTTON_X +key 0x123 BUTTON_Y key 0x124 BUTTON_L1 key 0x125 BUTTON_R1 key 0x126 BUTTON_L2 key 0x127 BUTTON_R2 -key 0x128 BUTTON_SELECT +key 0x128 BACK key 0x129 BUTTON_START key 0x12a BUTTON_THUMBL key 0x12b BUTTON_THUMBR diff --git a/data/keyboards/Vendor_056e_Product_2010.kl b/data/keyboards/Vendor_056e_Product_2010.kl new file mode 100644 index 000000000000..09e15eaa62b8 --- /dev/null +++ b/data/keyboards/Vendor_056e_Product_2010.kl @@ -0,0 +1,48 @@ +# 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. + +# +# Elecom JC-U4113S in DirectInput Mode (D mode). +# + +# Mapping according to https://developer.android.com/training/game-controllers/controller-input.html + +key 306 BUTTON_A +key 307 BUTTON_B +key 304 BUTTON_X +key 305 BUTTON_Y + +key 308 BUTTON_L1 +key 309 BUTTON_R1 +key 310 BUTTON_L2 +key 311 BUTTON_R2 + +key 312 BUTTON_THUMBL +key 313 BUTTON_THUMBR + +key 314 BACK +key 315 BUTTON_START + +# Left and right stick. +axis 0x00 X +axis 0x01 Y +axis 0x05 Z +axis 0x02 RZ + +# Hat. +axis 0x10 HAT_X +axis 0x11 HAT_Y + +# "Guide" button (Xbox key). +key 316 BUTTON_MODE diff --git a/data/keyboards/Vendor_056e_Product_2013.kl b/data/keyboards/Vendor_056e_Product_2013.kl new file mode 100644 index 000000000000..c2a74a9fd442 --- /dev/null +++ b/data/keyboards/Vendor_056e_Product_2013.kl @@ -0,0 +1,44 @@ +# 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. + +# +# Elecom JC-U4113S in XInput Mode (X mode). +# + +key 304 BUTTON_A +key 305 BUTTON_B +key 307 BUTTON_X +key 308 BUTTON_Y +key 310 BUTTON_L1 +key 311 BUTTON_R1 +key 315 BUTTON_START +key 314 BACK +key 317 BUTTON_THUMBL +key 318 BUTTON_THUMBR + +# Left and right stick. +axis 0x00 X +axis 0x01 Y +axis 0x03 Z +axis 0x04 RZ + +axis 0x02 BRAKE +axis 0x05 GAS + +# Hat. +axis 0x10 HAT_X +axis 0x11 HAT_Y + +# "Guide" button (Xbox key). +key 316 BUTTON_MODE diff --git a/data/keyboards/Vendor_1532_Product_0709.kl b/data/keyboards/Vendor_1532_Product_0709.kl new file mode 100644 index 000000000000..20ea2ab7504e --- /dev/null +++ b/data/keyboards/Vendor_1532_Product_0709.kl @@ -0,0 +1,51 @@ +# 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. + +# +# Razer Junglecat Controller with wireless Bluetooth interface. +# + +# Mapping according to https://developer.android.com/training/game-controllers/controller-input.html + +key 0x133 BUTTON_X +key 0x130 BUTTON_A +key 0x131 BUTTON_B +key 0x134 BUTTON_Y + +key 0x136 BUTTON_L1 +key 0x137 BUTTON_R1 +key 0x138 BUTTON_L2 +key 0x139 BUTTON_R2 + +# Left Analog Stick +axis 0x00 X +axis 0x01 Y +# Right Analog Stick +axis 0x02 Z +axis 0x05 RZ + +# Left stick click +key 0x13d BUTTON_THUMBL +# Right stick click +key 0x13e BUTTON_THUMBR + +# Hat +axis 0x10 HAT_X +axis 0x11 HAT_Y + +# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt +# Select key +key 0x13a BUTTON_SELECT +# Start key +key 0x13b BUTTON_START diff --git a/data/keyboards/Vendor_27f8_Product_0bbf.kl b/data/keyboards/Vendor_27f8_Product_0bbf.kl new file mode 100644 index 000000000000..a59f5663842c --- /dev/null +++ b/data/keyboards/Vendor_27f8_Product_0bbf.kl @@ -0,0 +1,54 @@ +# 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. + +# +# Razer Kishi Mobile Controller +# + + +# Mapping according to https://developer.android.com/training/game-controllers/controller-input.html + +key 0x133 BUTTON_X +key 0x130 BUTTON_A +key 0x131 BUTTON_B +key 0x134 BUTTON_Y + +key 0x136 BUTTON_L1 +key 0x137 BUTTON_R1 +key 0x138 BUTTON_L2 +key 0x139 BUTTON_R2 + +axis 0x00 X +axis 0x01 Y + +axis 0x02 Z +axis 0x05 RZ + +axis 0x09 RTRIGGER +axis 0x0a LTRIGGER + +key 0x13d BUTTON_THUMBL +key 0x13e BUTTON_THUMBR + +# Hat +axis 0x10 HAT_X +axis 0x11 HAT_Y + +# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt +# Left Triangle Button +key 0x13a BUTTON_SELECT +# Right Triangle Button +key 0x13b BUTTON_START +# Home Button +key 0x13c BUTTON_MODE diff --git a/graphics/java/android/graphics/ColorFilter.java b/graphics/java/android/graphics/ColorFilter.java index 4c2ef84404e2..8fd6f7f609c6 100644 --- a/graphics/java/android/graphics/ColorFilter.java +++ b/graphics/java/android/graphics/ColorFilter.java @@ -48,7 +48,7 @@ public class ColorFilter { return 0; } - void discardNativeInstance() { + synchronized final void discardNativeInstance() { if (mNativeInstance != 0) { mCleaner.run(); mCleaner = null; @@ -57,7 +57,7 @@ public class ColorFilter { } /** @hide */ - public long getNativeInstance() { + public synchronized final long getNativeInstance() { if (mNativeInstance == 0) { mNativeInstance = createNativeInstance(); diff --git a/graphics/java/android/graphics/ComposeShader.java b/graphics/java/android/graphics/ComposeShader.java index 279e2937a80a..b840f3f7654d 100644 --- a/graphics/java/android/graphics/ComposeShader.java +++ b/graphics/java/android/graphics/ComposeShader.java @@ -95,13 +95,9 @@ public class ComposeShader extends Shader { /** @hide */ @Override - protected void verifyNativeInstance() { - if (mShaderA.getNativeInstance() != mNativeInstanceShaderA - || mShaderB.getNativeInstance() != mNativeInstanceShaderB) { - // Child shader native instance has been updated, - // so our cached native instance is no longer valid - discard it - discardNativeInstance(); - } + protected boolean shouldDiscardNativeInstance() { + return mShaderA.getNativeInstance() != mNativeInstanceShaderA + || mShaderB.getNativeInstance() != mNativeInstanceShaderB; } private static native long nativeCreate(long nativeMatrix, diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 3b586242e5b1..28d7911c771f 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -674,10 +674,15 @@ public class Paint { * Return the pointer to the native object while ensuring that any * mutable objects that are attached to the paint are also up-to-date. * + * Note: Although this method is |synchronized|, this is simply so it + * is not thread-hostile to multiple threads calling this method. It + * is still unsafe to attempt to change the Shader/ColorFilter while + * another thread attempts to access the native object. + * * @hide */ @UnsupportedAppUsage - public long getNativeInstance() { + public synchronized long getNativeInstance() { long newNativeShader = mShader == null ? 0 : mShader.getNativeInstance(); if (newNativeShader != mNativeShader) { mNativeShader = newNativeShader; diff --git a/graphics/java/android/graphics/Shader.java b/graphics/java/android/graphics/Shader.java index fb15d0794dd7..8154ebf1e508 100644 --- a/graphics/java/android/graphics/Shader.java +++ b/graphics/java/android/graphics/Shader.java @@ -150,7 +150,12 @@ public class Shader { /** * @hide Only to be used by subclasses in the graphics package. */ - protected final void discardNativeInstance() { + protected synchronized final void discardNativeInstance() { + discardNativeInstanceLocked(); + } + + // For calling inside a synchronized method. + private void discardNativeInstanceLocked() { if (mNativeInstance != 0) { mCleaner.run(); mCleaner = null; @@ -159,11 +164,12 @@ public class Shader { } /** - * Callback for subclasses to call {@link #discardNativeInstance()} if the most recently - * constructed native instance is no longer valid. + * Callback for subclasses to specify whether the most recently + * constructed native instance is still valid. * @hide Only to be used by subclasses in the graphics package. */ - protected void verifyNativeInstance() { + protected boolean shouldDiscardNativeInstance() { + return false; } @@ -171,9 +177,10 @@ public class Shader { * @hide so it can be called by android.graphics.drawable but must not be called from outside * the module. */ - public final long getNativeInstance() { - // verify mNativeInstance is valid - verifyNativeInstance(); + public synchronized final long getNativeInstance() { + if (shouldDiscardNativeInstance()) { + discardNativeInstanceLocked(); + } if (mNativeInstance == 0) { mNativeInstance = createNativeInstance(mLocalMatrix == null diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index b8934dc8c583..843b17703676 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -22,8 +22,4 @@ android_library { "res", ], manifest: "AndroidManifest.xml", - - platform_apis: true, - sdk_version: "current", - min_sdk_version: "system_current", } diff --git a/packages/SystemUI/res/anim/tv_pip_controls_focus_gain_animation.xml b/libs/WindowManager/Shell/res/anim/tv_pip_controls_focus_gain_animation.xml index 257bf35c8e76..29d9b257cc59 100644 --- a/packages/SystemUI/res/anim/tv_pip_controls_focus_gain_animation.xml +++ b/libs/WindowManager/Shell/res/anim/tv_pip_controls_focus_gain_animation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- 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. @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:propertyName="alpha" android:valueTo="1" diff --git a/packages/SystemUI/res/anim/tv_pip_controls_focus_loss_animation.xml b/libs/WindowManager/Shell/res/anim/tv_pip_controls_focus_loss_animation.xml index e032008b3750..70f553b89657 100644 --- a/packages/SystemUI/res/anim/tv_pip_controls_focus_loss_animation.xml +++ b/libs/WindowManager/Shell/res/anim/tv_pip_controls_focus_loss_animation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- 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. @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:propertyName="alpha" android:valueTo="0" diff --git a/packages/SystemUI/res/anim/tv_pip_menu_fade_in_animation.xml b/libs/WindowManager/Shell/res/anim/tv_pip_menu_fade_in_animation.xml index 257bf35c8e76..29d9b257cc59 100644 --- a/packages/SystemUI/res/anim/tv_pip_menu_fade_in_animation.xml +++ b/libs/WindowManager/Shell/res/anim/tv_pip_menu_fade_in_animation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- 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. @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:propertyName="alpha" android:valueTo="1" diff --git a/packages/SystemUI/res/anim/tv_pip_menu_fade_out_animation.xml b/libs/WindowManager/Shell/res/anim/tv_pip_menu_fade_out_animation.xml index e032008b3750..70f553b89657 100644 --- a/packages/SystemUI/res/anim/tv_pip_menu_fade_out_animation.xml +++ b/libs/WindowManager/Shell/res/anim/tv_pip_menu_fade_out_animation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- 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. @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:propertyName="alpha" android:valueTo="0" diff --git a/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient.xml b/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient.xml new file mode 100644 index 000000000000..8b3057d5841e --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient.xml @@ -0,0 +1,25 @@ +<?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. +--> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <gradient + android:angle="270" + android:startColor="#00000000" + android:endColor="#77000000" + android:type="linear" /> +</shape>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient_transition.xml b/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient_transition.xml new file mode 100644 index 000000000000..772d0a5ea89b --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/floating_dismiss_gradient_transition.xml @@ -0,0 +1,20 @@ +<?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. +--> +<transition xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:color/transparent" /> + <item android:drawable="@drawable/floating_dismiss_gradient" /> +</transition>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/floating_dismiss_gradient.xml b/libs/WindowManager/Shell/res/drawable/pip_expand.xml index 8f7fb1011cf4..c99d81934aab 100644 --- a/packages/SystemUI/res/drawable/floating_dismiss_gradient.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_expand.xml @@ -13,12 +13,16 @@ 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"> - <gradient - android:angle="270" - android:startColor="#00000000" - android:endColor="#77000000" - android:type="linear" /> -</shape>
\ No newline at end of file +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="36dp" + android:height="36dp" + android:viewportWidth="36" + android:viewportHeight="36"> + + <path + android:pathData="M0 0h36v36H0z" /> + <path + android:fillColor="#FFFFFF" + android:pathData="M10 21H7v8h8v-3h-5v-5zm-3-6h3v-5h5V7H7v8zm19 11h-5v3h8v-8h-3v5zM21 +7v3h5v5h3V7h-8z" /> +</vector>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/pip_ic_close_white.xml b/libs/WindowManager/Shell/res/drawable/pip_ic_close_white.xml new file mode 100644 index 000000000000..bcc850a854de --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/pip_ic_close_white.xml @@ -0,0 +1,25 @@ +<?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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:pathData="M19.000000,6.400000l-1.400000,-1.400000 -5.600000,5.600000 -5.600000,-5.600000 -1.400000,1.400000 5.600000,5.600000 -5.600000,5.600000 1.400000,1.400000 5.600000,-5.600000 5.600000,5.600000 1.400000,-1.400000 -5.600000,-5.600000z" + android:fillColor="#FFFFFFFF"/> +</vector> diff --git a/packages/SystemUI/res/drawable/pip_expand.xml b/libs/WindowManager/Shell/res/drawable/pip_ic_fullscreen_white.xml index cdb2ee50482f..56699dc04e10 100644 --- a/packages/SystemUI/res/drawable/pip_expand.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_ic_fullscreen_white.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2017 The Android Open Source Project + Copyright (C) 2020 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 @@ -15,15 +15,11 @@ Copyright (C) 2017 The Android Open Source Project limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="36dp" - android:viewportWidth="36" - android:viewportHeight="36"> - - <path - android:pathData="M0 0h36v36H0z" /> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> <path android:fillColor="#FFFFFF" - android:pathData="M10 21H7v8h8v-3h-5v-5zm-3-6h3v-5h5V7H7v8zm19 11h-5v3h8v-8h-3v5zM21 -7v3h5v5h3V7h-8z" /> -</vector>
\ No newline at end of file + android:pathData="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" /> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_pause_white.xml b/libs/WindowManager/Shell/res/drawable/pip_ic_pause_white.xml index 5b65f100490c..ef9b2d9c1c63 100644 --- a/packages/SystemUI/res/drawable/ic_pause_white.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_ic_pause_white.xml @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2016 The Android Open Source Project + Copyright (C) 2020 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 diff --git a/packages/SystemUI/res/drawable/ic_play_arrow_white.xml b/libs/WindowManager/Shell/res/drawable/pip_ic_play_arrow_white.xml index ddc9e8dd17a0..f12d2cbebc87 100644 --- a/packages/SystemUI/res/drawable/ic_play_arrow_white.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_ic_play_arrow_white.xml @@ -1,7 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2016 The Android Open Source Project + Copyright (C) 2020 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 diff --git a/libs/WindowManager/Shell/res/drawable/pip_ic_settings.xml b/libs/WindowManager/Shell/res/drawable/pip_ic_settings.xml new file mode 100644 index 000000000000..b61e98ce2f9f --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/pip_ic_settings.xml @@ -0,0 +1,28 @@ +<?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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/> +</vector> diff --git a/packages/SystemUI/res/drawable/pip_icon.xml b/libs/WindowManager/Shell/res/drawable/pip_icon.xml index bd92ccd2e6e3..b19d907d1ff3 100644 --- a/packages/SystemUI/res/drawable/pip_icon.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_icon.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2017 The Android Open Source Project + Copyright (C) 2020 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 diff --git a/packages/SystemUI/res/drawable/pip_resize_handle.xml b/libs/WindowManager/Shell/res/drawable/pip_resize_handle.xml index 0a8cbc429dd8..4d1e080cf466 100644 --- a/packages/SystemUI/res/drawable/pip_resize_handle.xml +++ b/libs/WindowManager/Shell/res/drawable/pip_resize_handle.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2020 The Android Open Source Project + Copyright (C) 2020 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 diff --git a/libs/WindowManager/Shell/res/drawable/tv_pip_button_focused.xml b/libs/WindowManager/Shell/res/drawable/tv_pip_button_focused.xml new file mode 100644 index 000000000000..cce13035dba7 --- /dev/null +++ b/libs/WindowManager/Shell/res/drawable/tv_pip_button_focused.xml @@ -0,0 +1,18 @@ +<?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. +--> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="#9AFFFFFF" android:radius="17dp" /> diff --git a/libs/WindowManager/Shell/res/layout/pip_menu_action.xml b/libs/WindowManager/Shell/res/layout/pip_menu_action.xml new file mode 100644 index 000000000000..7a026ca63f50 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/pip_menu_action.xml @@ -0,0 +1,23 @@ +<?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. +--> +<ImageButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/pip_action_size" + android:layout_height="@dimen/pip_action_size" + android:padding="@dimen/pip_action_padding" + android:background="?android:selectableItemBackgroundBorderless" + android:forceHasOverlappingRendering="false" /> diff --git a/packages/SystemUI/res/layout/pip_menu_activity.xml b/libs/WindowManager/Shell/res/layout/pip_menu_activity.xml index 2b33e17a5fbd..2e0a5e09e34f 100644 --- a/packages/SystemUI/res/layout/pip_menu_activity.xml +++ b/libs/WindowManager/Shell/res/layout/pip_menu_activity.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- + 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 + 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 + 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. + 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. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" @@ -61,25 +62,30 @@ </FrameLayout> </FrameLayout> - <ImageButton - android:id="@+id/settings" - android:layout_width="@dimen/pip_action_size" - android:layout_height="@dimen/pip_action_size" - android:layout_gravity="top|start" - android:padding="@dimen/pip_action_padding" - android:contentDescription="@string/pip_phone_settings" - android:src="@drawable/ic_settings" - android:background="?android:selectableItemBackgroundBorderless" /> - - <ImageButton - android:id="@+id/dismiss" - android:layout_width="@dimen/pip_action_size" - android:layout_height="@dimen/pip_action_size" + <LinearLayout + android:id="@+id/top_end_container" android:layout_gravity="top|end" - android:padding="@dimen/pip_action_padding" - android:contentDescription="@string/pip_phone_close" - android:src="@drawable/ic_close_white" - android:background="?android:selectableItemBackgroundBorderless" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <ImageButton + android:id="@+id/settings" + android:layout_width="@dimen/pip_action_size" + android:layout_height="@dimen/pip_action_size" + android:padding="@dimen/pip_action_padding" + android:contentDescription="@string/pip_phone_settings" + android:src="@drawable/pip_ic_settings" + android:background="?android:selectableItemBackgroundBorderless" /> + + <ImageButton + android:id="@+id/dismiss" + android:layout_width="@dimen/pip_action_size" + android:layout_height="@dimen/pip_action_size" + android:padding="@dimen/pip_action_padding" + android:contentDescription="@string/pip_phone_close" + android:src="@drawable/pip_ic_close_white" + android:background="?android:selectableItemBackgroundBorderless" /> + </LinearLayout> <!--TODO (b/156917828): Add content description for a11y purposes?--> <ImageButton @@ -88,6 +94,7 @@ android:layout_height="@dimen/pip_resize_handle_size" android:layout_gravity="top|start" android:layout_margin="@dimen/pip_resize_handle_margin" + android:padding="@dimen/pip_resize_handle_padding" android:src="@drawable/pip_resize_handle" android:background="?android:selectableItemBackgroundBorderless" /> </FrameLayout> diff --git a/packages/SystemUI/res/layout/tv_pip_control_button.xml b/libs/WindowManager/Shell/res/layout/tv_pip_control_button.xml index b9b0154e70b7..72287c144bed 100644 --- a/packages/SystemUI/res/layout/tv_pip_control_button.xml +++ b/libs/WindowManager/Shell/res/layout/tv_pip_control_button.xml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -** -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> + 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. +--> <!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/packages/SystemUI/res/layout/tv_pip_controls.xml b/libs/WindowManager/Shell/res/layout/tv_pip_controls.xml index 0b7bce13d761..22e0452d620d 100644 --- a/packages/SystemUI/res/layout/tv_pip_controls.xml +++ b/libs/WindowManager/Shell/res/layout/tv_pip_controls.xml @@ -1,22 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -** -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> + 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. +--> <!-- Layout for {@link com.android.systemui.pip.tv.PipControlsView}. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> @@ -24,7 +21,7 @@ android:id="@+id/full_button" android:layout_width="@dimen/picture_in_picture_button_width" android:layout_height="wrap_content" - android:src="@drawable/ic_fullscreen_white_24dp" + android:src="@drawable/pip_ic_fullscreen_white" android:text="@string/pip_fullscreen" /> <com.android.systemui.pip.tv.PipControlButtonView @@ -32,7 +29,7 @@ android:layout_width="@dimen/picture_in_picture_button_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/picture_in_picture_button_start_margin" - android:src="@drawable/ic_close_white" + android:src="@drawable/pip_ic_close_white" android:text="@string/pip_close" /> <com.android.systemui.pip.tv.PipControlButtonView @@ -40,7 +37,7 @@ android:layout_width="@dimen/picture_in_picture_button_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/picture_in_picture_button_start_margin" - android:src="@drawable/ic_pause_white" + android:src="@drawable/pip_ic_pause_white" android:text="@string/pip_pause" android:visibility="gone" /> </merge> diff --git a/libs/WindowManager/Shell/res/layout/tv_pip_custom_control.xml b/libs/WindowManager/Shell/res/layout/tv_pip_custom_control.xml new file mode 100644 index 000000000000..e6cd1122ca77 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/tv_pip_custom_control.xml @@ -0,0 +1,21 @@ +<?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. +--> +<com.android.systemui.pip.tv.PipControlButtonView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/picture_in_picture_button_width" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/picture_in_picture_button_start_margin" /> diff --git a/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml new file mode 100644 index 000000000000..a049787b40b9 --- /dev/null +++ b/libs/WindowManager/Shell/res/layout/tv_pip_menu.xml @@ -0,0 +1,31 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:paddingTop="350dp" + android:background="#CC000000" + android:gravity="top|center_horizontal" + android:clipChildren="false"> + + <com.android.systemui.pip.tv.PipControlsView + android:id="@+id/pip_controls" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="0" /> +</LinearLayout> diff --git a/libs/WindowManager/Shell/res/values-tvdpi/dimen.xml b/libs/WindowManager/Shell/res/values-tvdpi/dimen.xml new file mode 100644 index 000000000000..7920fd237a08 --- /dev/null +++ b/libs/WindowManager/Shell/res/values-tvdpi/dimen.xml @@ -0,0 +1,22 @@ +<?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> + <!-- The dimensions to user for picture-in-picture action buttons. --> + <dimen name="picture_in_picture_button_width">100dp</dimen> + <dimen name="picture_in_picture_button_start_margin">-50dp</dimen> +</resources> + diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml index c894eb0133b5..245c0725c2a8 100644 --- a/libs/WindowManager/Shell/res/values/config.xml +++ b/libs/WindowManager/Shell/res/values/config.xml @@ -1,21 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* -** Copyright 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. -*/ ---> + 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> -</resources>
\ No newline at end of file + <!-- Animation duration for resizing of PIP when entering/exiting. --> + <integer name="config_pipResizeAnimationDuration">425</integer> + + <!-- Allow dragging the PIP to a location to close it --> + <bool name="config_pipEnableDismissDragToEdge">true</bool> + + <!-- Allow PIP to resize to a slightly bigger state upon touch/showing the menu --> + <bool name="config_pipEnableResizeForMenu">true</bool> + + <!-- Allow PIP to enable round corner, see also R.dimen.pip_corner_radius --> + <bool name="config_pipEnableRoundCorner">false</bool> +</resources> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml new file mode 100644 index 000000000000..1c1217681b9f --- /dev/null +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -0,0 +1,59 @@ +<?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> + <dimen name="dismiss_circle_size">52dp</dimen> + + <!-- The height of the gradient indicating the dismiss edge when moving a PIP. --> + <dimen name="floating_dismiss_gradient_height">250dp</dimen> + + <!-- The padding around a PiP actions. --> + <dimen name="pip_action_padding">12dp</dimen> + + <!-- The height of the PiP actions container in which the actions are vertically centered. --> + <dimen name="pip_action_size">48dp</dimen> + + <!-- The padding between actions in the PiP in landscape Note that the PiP does not reflect + the configuration of the device, so we can't use -land resources. --> + <dimen name="pip_between_action_padding_land">8dp</dimen> + + <!-- The buffer to use when calculating whether the pip is in an adjust zone. --> + <dimen name="pip_bottom_offset_buffer">1dp</dimen> + + <!-- The corner radius for PiP window. --> + <dimen name="pip_corner_radius">8dp</dimen> + + <!-- The bottom margin of the PIP drag to dismiss info text shown when moving a PIP. --> + <dimen name="pip_dismiss_text_bottom_margin">24dp</dimen> + + <!-- The bottom margin of the expand container when there are actions. + Equal to pip_action_size - pip_action_padding. --> + <dimen name="pip_expand_container_edge_margin">30dp</dimen> + + <!-- The shortest-edge size of the expanded PiP. --> + <dimen name="pip_expanded_shortest_edge_size">160dp</dimen> + + <!-- The additional offset to apply to the IME animation to account for the input field. --> + <dimen name="pip_ime_offset">48dp</dimen> + + <!-- The touchable/draggable edge size for PIP resize. --> + <dimen name="pip_resize_edge_size">48dp</dimen> + + <!-- PIP Resize handle size, margin and padding. --> + <dimen name="pip_resize_handle_size">12dp</dimen> + <dimen name="pip_resize_handle_margin">4dp</dimen> + <dimen name="pip_resize_handle_padding">0dp</dimen> +</resources> diff --git a/libs/WindowManager/Shell/res/values/ids.xml b/libs/WindowManager/Shell/res/values/ids.xml new file mode 100644 index 000000000000..ed20398f309d --- /dev/null +++ b/libs/WindowManager/Shell/res/values/ids.xml @@ -0,0 +1,19 @@ +<?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> + <item type="id" name="action_pip_resize" /> +</resources> diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml new file mode 100644 index 000000000000..6752b56fcdf3 --- /dev/null +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -0,0 +1,56 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Label for PIP close button [CHAR LIMIT=NONE]--> + <string name="pip_phone_close">Close</string> + + <!-- Making the PIP fullscreen [CHAR LIMIT=25] --> + <string name="pip_phone_expand">Expand</string> + + <!-- Label for PIP settings button [CHAR LIMIT=NONE]--> + <string name="pip_phone_settings">Settings</string> + + <!-- Title of menu shown over picture-in-picture. Used for accessibility. --> + <string name="pip_menu_title">Menu</string> + + <!-- PiP BTW notification title. [CHAR LIMIT=50] --> + <string name="pip_notification_title"><xliff:g id="name" example="Google Maps">%s</xliff:g> is in picture-in-picture</string> + + <!-- PiP BTW notification description. [CHAR LIMIT=NONE] --> + <string name="pip_notification_message">If you don\'t want <xliff:g id="name" example="Google Maps">%s</xliff:g> to use this feature, tap to open settings and turn it off.</string> + + <!-- Button to play the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> + <string name="pip_play">Play</string> + + <!-- Button to pause the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> + <string name="pip_pause">Pause</string> + + <!-- Button to skip to the next media on picture-in-picture (PIP) [CHAR LIMIT=30] --> + <string name="pip_skip_to_next">Skip to next</string> + + <!-- 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> + + <!-- TODO Deprecated. Label for PIP action to Minimize the PIP. DO NOT TRANSLATE [CHAR LIMIT=25] --> + <string name="pip_phone_minimize">Minimize</string> + + <!-- TODO Deprecated. Label for PIP the drag to dismiss hint. DO NOT TRANSLATE [CHAR LIMIT=NONE]--> + <string name="pip_phone_dismiss_hint">Drag down to dismiss</string> +</resources> diff --git a/libs/WindowManager/Shell/res/values/strings_tv.xml b/libs/WindowManager/Shell/res/values/strings_tv.xml new file mode 100644 index 000000000000..2dfdcabaa931 --- /dev/null +++ b/libs/WindowManager/Shell/res/values/strings_tv.xml @@ -0,0 +1,34 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Picture-in-Picture (PIP) notification --> + <!-- Title for the notification channel for TV PIP controls. [CHAR LIMIT=NONE] --> + <string name="notification_channel_tv_pip">Picture-in-Picture</string> + + <!-- Title of the picture-in-picture (PIP) notification title + when the media doesn't have title [CHAR LIMIT=NONE] --> + <string name="pip_notification_unknown_title">(No title program)</string> + + <!-- Picture-in-Picture (PIP) menu --> + <eat-comment /> + <!-- Button to close picture-in-picture (PIP) in PIP menu [CHAR LIMIT=30] --> + <string name="pip_close">Close PIP</string> + + <!-- Button to move picture-in-picture (PIP) screen to the fullscreen in PIP menu [CHAR LIMIT=30] --> + <string name="pip_fullscreen">Full screen</string> +</resources> + diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp index 5a50245a3765..67d8c07e61de 100644 --- a/libs/hwui/DeferredLayerUpdater.cpp +++ b/libs/hwui/DeferredLayerUpdater.cpp @@ -149,6 +149,9 @@ void DeferredLayerUpdater::apply() { sk_sp<SkImage> layerImage = mImageSlots[slot].createIfNeeded( hardwareBuffer, dataspace, newContent, mRenderState.getRenderThread().getGrContext()); + // unref to match the ref added by ASurfaceTexture_dequeueBuffer. eglCreateImageKHR + // (invoked by createIfNeeded) will add a ref to the AHardwareBuffer. + AHardwareBuffer_release(hardwareBuffer); if (layerImage.get()) { SkMatrix textureTransform; mat4(transformMatrix).copyTo(textureTransform); diff --git a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java index 403a7667c150..0822cda04417 100644 --- a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java +++ b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java @@ -611,24 +611,18 @@ public class GnssMetrics { if (atomTag != FrameworkStatsLog.GNSS_STATS) { throw new UnsupportedOperationException("Unknown tagId = " + atomTag); } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mLocationFailureReportsStatistics.getCount()) - .writeLong(mLocationFailureReportsStatistics.getLongSum()) - .writeLong(mTimeToFirstFixMilliSReportsStatistics.getCount()) - .writeLong(mTimeToFirstFixMilliSReportsStatistics.getLongSum()) - .writeLong(mPositionAccuracyMetersReportsStatistics.getCount()) - .writeLong(mPositionAccuracyMetersReportsStatistics.getLongSum()) - .writeLong(mTopFourAverageCn0DbmHzReportsStatistics.getCount()) - .writeLong(mTopFourAverageCn0DbmHzReportsStatistics.getLongSum()) - .writeLong(mL5TopFourAverageCn0DbmHzReportsStatistics.getCount()) - .writeLong(mL5TopFourAverageCn0DbmHzReportsStatistics.getLongSum()) - .writeLong(mSvStatusReports) - .writeLong(mSvStatusReportsUsedInFix) - .writeLong(mL5SvStatusReports) - .writeLong(mL5SvStatusReportsUsedInFix) - .build(); - data.add(e); + data.add(FrameworkStatsLog.buildStatsEvent(atomTag, + mLocationFailureReportsStatistics.getCount(), + mLocationFailureReportsStatistics.getLongSum(), + mTimeToFirstFixMilliSReportsStatistics.getCount(), + mTimeToFirstFixMilliSReportsStatistics.getLongSum(), + mPositionAccuracyMetersReportsStatistics.getCount(), + mPositionAccuracyMetersReportsStatistics.getLongSum(), + mTopFourAverageCn0DbmHzReportsStatistics.getCount(), + mTopFourAverageCn0DbmHzReportsStatistics.getLongSum(), + mL5TopFourAverageCn0DbmHzReportsStatistics.getCount(), + mL5TopFourAverageCn0DbmHzReportsStatistics.getLongSum(), mSvStatusReports, + mSvStatusReportsUsedInFix, mL5SvStatusReports, mL5SvStatusReportsUsedInFix)); return StatsManager.PULL_SUCCESS; } } diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java index 590def4d4ced..98ca2f9c4253 100644 --- a/media/java/android/media/MediaCas.java +++ b/media/java/android/media/MediaCas.java @@ -34,7 +34,6 @@ import android.media.tv.tunerresourcemanager.ResourceClientProfile; import android.media.tv.tunerresourcemanager.TunerResourceManager; import android.os.Bundle; import android.os.Handler; -import android.os.HandlerExecutor; import android.os.HandlerThread; import android.os.IHwBinder; import android.os.Looper; @@ -50,6 +49,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -392,7 +392,10 @@ public final class MediaCas implements AutoCloseable { @Override public void onReclaimResources() { synchronized (mSessionMap) { - mSessionMap.forEach((casSession, sessionResourceHandle) -> casSession.close()); + List<Session> sessionList = new ArrayList<>(mSessionMap.keySet()); + for (Session casSession: sessionList) { + casSession.close(); + } } mEventHandler.sendMessage(mEventHandler.obtainMessage( EventHandler.MSG_CAS_RESOURCE_LOST)); @@ -734,7 +737,7 @@ public final class MediaCas implements AutoCloseable { ResourceClientProfile profile = new ResourceClientProfile(tvInputServiceSessionId, priorityHint); mTunerResourceManager.registerClientProfile( - profile, new HandlerExecutor(mEventHandler), mResourceListener, clientId); + profile, context.getMainExecutor(), mResourceListener, clientId); mClientId = clientId[0]; } } diff --git a/media/java/android/media/MediaMetrics.java b/media/java/android/media/MediaMetrics.java index 2cfaf4f3dba5..3a5216e1c4e7 100644 --- a/media/java/android/media/MediaMetrics.java +++ b/media/java/android/media/MediaMetrics.java @@ -52,6 +52,7 @@ public class MediaMetrics { public static final String AUDIO_SERVICE = AUDIO + SEPARATOR + "service"; public static final String AUDIO_VOLUME = AUDIO + SEPARATOR + "volume"; public static final String AUDIO_VOLUME_EVENT = AUDIO_VOLUME + SEPARATOR + "event"; + public static final String AUDIO_MODE = AUDIO + SEPARATOR + "mode"; } /** @@ -139,6 +140,10 @@ public class MediaMetrics { public static final Key<String> REQUEST = createKey("request", String.class); + // For audio mode + public static final Key<String> REQUESTED_MODE = + createKey("requestedMode", String.class); // audio_mode + // For Bluetooth public static final Key<String> SCO_AUDIO_MODE = createKey("scoAudioMode", String.class); diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index 42635216e98f..f4fd1fca2ff9 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -53,6 +53,7 @@ import java.util.UUID; * <li> {@link android.media.audiofx.PresetReverb}</li> * <li> {@link android.media.audiofx.EnvironmentalReverb}</li> * <li> {@link android.media.audiofx.DynamicsProcessing}</li> + * <li> {@link android.media.audiofx.HapticGenerator}</li> * </ul> * <p>To apply the audio effect to a specific AudioTrack or MediaPlayer instance, * the application must specify the audio session ID of that instance when creating the AudioEffect. @@ -146,6 +147,14 @@ public class AudioEffect { .fromString("7261676f-6d75-7369-6364-28e2fd3ac39e"); /** + * UUID for Haptic Generator. + */ + // This is taken from system/media/audio/include/system/audio_effects/effect_hapticgenerator.h + @NonNull + public static final UUID EFFECT_TYPE_HAPTIC_GENERATOR = UUID + .fromString("1411e6d6-aecd-4021-a1cf-a6aceb0d71e5"); + + /** * Null effect UUID. See {@link AudioEffect(UUID, UUID, int, int)} for use. * @hide */ @@ -225,7 +234,8 @@ public class AudioEffect { * {@link AudioEffect#EFFECT_TYPE_BASS_BOOST}, {@link AudioEffect#EFFECT_TYPE_ENV_REVERB}, * {@link AudioEffect#EFFECT_TYPE_EQUALIZER}, {@link AudioEffect#EFFECT_TYPE_NS}, * {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB}, {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}, - * {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}. + * {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}, + * {@link AudioEffect#EFFECT_TYPE_HAPTIC_GENERATOR}. * </li> * <li>uuid: UUID for this particular implementation</li> * <li>connectMode: {@link #EFFECT_INSERT} or {@link #EFFECT_AUXILIARY}</li> @@ -246,8 +256,9 @@ public class AudioEffect { * {@link AudioEffect#EFFECT_TYPE_AGC}, {@link AudioEffect#EFFECT_TYPE_BASS_BOOST}, * {@link AudioEffect#EFFECT_TYPE_ENV_REVERB}, {@link AudioEffect#EFFECT_TYPE_EQUALIZER}, * {@link AudioEffect#EFFECT_TYPE_NS}, {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB} - * {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER} - * or {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}.<br> + * {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}, + * {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}, + * or {@link AudioEffect#EFFECT_TYPE_HAPTIC_GENERATOR}.<br> * For reverberation, bass boost, EQ and virtualizer, the UUID * corresponds to the OpenSL ES Interface ID. */ @@ -284,7 +295,8 @@ public class AudioEffect { * {@link AudioEffect#EFFECT_TYPE_EQUALIZER}, {@link AudioEffect#EFFECT_TYPE_NS}, * {@link AudioEffect#EFFECT_TYPE_PRESET_REVERB}, * {@link AudioEffect#EFFECT_TYPE_VIRTUALIZER}, - * {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}. + * {@link AudioEffect#EFFECT_TYPE_DYNAMICS_PROCESSING}, + * {@link AudioEffect#EFFECT_TYPE_HAPTIC_GENERATOR}. * @param uuid UUID for this particular implementation * @param connectMode {@link #EFFECT_INSERT} or {@link #EFFECT_AUXILIARY} * @param name human readable effect name diff --git a/media/java/android/media/audiofx/HapticGenerator.java b/media/java/android/media/audiofx/HapticGenerator.java new file mode 100644 index 000000000000..f8529eb05c03 --- /dev/null +++ b/media/java/android/media/audiofx/HapticGenerator.java @@ -0,0 +1,128 @@ +/* + * 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.media.audiofx; + +import android.annotation.NonNull; +import android.media.AudioManager; +import android.util.Log; + +import java.util.UUID; + +/** + * Haptic Generator(HG). + * <p>HG is an audio post-processor which generates haptic data based on the audio channels. The + * generated haptic data is sent along with audio data down to the audio HAL, which will require the + * device to support audio-coupled-haptic playback. In that case, the effect will only be created on + * device supporting audio-coupled-haptic playback. Call {@link HapticGenerator#isAvailable()} to + * check if the device supports this effect. + * <p>An application can create a HapticGenerator object to initiate and control this audio effect + * in the audio framework. An application can set which audio channel to be used to generate + * haptic data. + * <p>To attach the HapticGenerator to a particular AudioTrack or MediaPlayer, specify the audio + * session ID of this AudioTrack or MediaPlayer when constructing the HapticGenerator. + * <p>See {@link android.media.MediaPlayer#getAudioSessionId()} for details on audio sessions. + * <p>See {@link android.media.audiofx.AudioEffect} class for more details on controlling audio + * effects. + */ +public class HapticGenerator extends AudioEffect implements AutoCloseable { + + private static final String TAG = "HapticGenerator"; + + // For every HapticGenerator, it contains a volume control effect so that the volume control + // will always be handled in the effect chain. In that case, the HapticGenerator can generate + // haptic data based on the raw audio data. + private AudioEffect mVolumeControlEffect; + + public static boolean isAvailable() { + return AudioManager.isHapticPlaybackSupported() + && AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_HAPTIC_GENERATOR); + } + + /** + * Creates a HapticGenerator and attaches it to the given audio session. + * Use {@link android.media.AudioTrack#getAudioSessionId()} or + * {@link android.media.MediaPlayer#getAudioSessionId()} to + * apply this effect on specific AudioTrack or MediaPlayer instance. + * + * @param audioSession system wide unique audio session identifier. The HapticGenerator will be + * applied to the players with the same audio session. + * @return HapticGenerator created or null if the device does not support HapticGenerator or + * the audio session is invalid. + * @throws java.lang.IllegalArgumentException when HapticGenerator is not supported + * @throws java.lang.UnsupportedOperationException when the effect library is not loaded. + * @throws java.lang.RuntimeException for all other error + */ + public static @NonNull HapticGenerator create(int audioSession) { + return new HapticGenerator(audioSession); + } + + /** + * Class constructor. + * + * @param audioSession system wide unique audio session identifier. The HapticGenerator will be + * attached to the MediaPlayer or AudioTrack in the same audio session. + * @throws java.lang.IllegalArgumentException + * @throws java.lang.UnsupportedOperationException + * @throws java.lang.RuntimeException + */ + private HapticGenerator(int audioSession) { + super(EFFECT_TYPE_HAPTIC_GENERATOR, EFFECT_TYPE_NULL, 0, audioSession); + mVolumeControlEffect = new AudioEffect( + AudioEffect.EFFECT_TYPE_NULL, + UUID.fromString("119341a0-8469-11df-81f9-0002a5d5c51b"), + 0, + audioSession); + } + + /** + * Enable or disable the effect. + * + * @param enabled the requested enable state + * @return {@link #SUCCESS} in case of success, {@link #ERROR_INVALID_OPERATION} + * or {@link #ERROR_DEAD_OBJECT} in case of failure. + */ + @Override + public int setEnabled(boolean enabled) { + int ret = super.setEnabled(enabled); + if (ret == SUCCESS) { + if (mVolumeControlEffect == null + || mVolumeControlEffect.setEnabled(enabled) != SUCCESS) { + Log.w(TAG, "Failed to enable volume control effect for HapticGenerator"); + } + } + return ret; + } + + /** + * Releases the native AudioEffect resources. + */ + @Override + public void release() { + if (mVolumeControlEffect != null) { + mVolumeControlEffect.release(); + } + super.release(); + } + + /** + * Release the resources that are held by the effect. + */ + @Override + public void close() { + release(); + } +} diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index df022d562768..6e26f2c2da9e 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -3497,6 +3497,10 @@ static jlong android_media_tv_Tuner_read_dvr(JNIEnv *env, jobject dvr, jlong siz } else { ALOGE("dvrMq.beginWrite failed"); } + + if (ret > 0) { + dvrSp->mDvrMQEventFlag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_READY)); + } return (jlong) ret; } @@ -3524,7 +3528,7 @@ static jlong android_media_tv_Tuner_read_dvr_from_array( if (dvrSp->mDvrMQ->write(reinterpret_cast<unsigned char*>(src) + offset, size)) { env->ReleaseByteArrayElements(buffer, src, 0); - dvrSp->mDvrMQEventFlag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_CONSUMED)); + dvrSp->mDvrMQEventFlag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_READY)); } else { ALOGD("Failed to write FMQ"); env->ReleaseByteArrayElements(buffer, src, 0); @@ -3585,6 +3589,9 @@ static jlong android_media_tv_Tuner_write_dvr(JNIEnv *env, jobject dvr, jlong si } else { ALOGE("dvrMq.beginRead failed"); } + if (ret > 0) { + dvrSp->mDvrMQEventFlag->wake(static_cast<uint32_t>(DemuxQueueNotifyBits::DATA_CONSUMED)); + } return (jlong) ret; } diff --git a/media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java b/media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java index de5ed5422dd1..5c87d30068b2 100644 --- a/media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java +++ b/media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java @@ -283,5 +283,50 @@ public class MediaTranscodingBenchmark String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; transcode(testVideoName, transcodedVideoName); - }*/ + } */ + + @Test + public void testBenchmarkingHEVCToAVCWith107FramesWithoutAudio() throws Exception { + String videoNameWithoutExtension = "video_1920x1080_107frame_hevc_4Mbps_30fps"; + String testVideoName = videoNameWithoutExtension + ".mp4"; + String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; + + transcode(testVideoName, transcodedVideoName); + } + + @Test + public void testBenchmarkingHEVCToAVCWith928FramesWithoutAudio() throws Exception { + String videoNameWithoutExtension = "video_1920x1080_928frame_hevc_4Mbps_30fps"; + String testVideoName = videoNameWithoutExtension + ".mp4"; + String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; + + transcode(testVideoName, transcodedVideoName); + } + + @Test + public void testBenchmarkingHEVCToAVCWith1863FramesWithoutAudio() throws Exception { + String videoNameWithoutExtension = "video_1920x1080_1863frame_hevc_4Mbps_30fps"; + String testVideoName = videoNameWithoutExtension + ".mp4"; + String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; + + transcode(testVideoName, transcodedVideoName); + } + + @Test + public void testBenchmarkingHEVCToAVCWith3863FramesWithoutAudio() throws Exception { + String videoNameWithoutExtension = "video_1920x1080_3863frame_hevc_4Mbps_30fps"; + String testVideoName = videoNameWithoutExtension + ".mp4"; + String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; + + transcode(testVideoName, transcodedVideoName); + } + + @Test + public void testBenchmarkingHEVCToAVCWith9374FramesWithoutAudio() throws Exception { + String videoNameWithoutExtension = "video_1920x1080_9374frame_hevc_4Mbps_30fps"; + String testVideoName = videoNameWithoutExtension + ".mp4"; + String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4"; + + transcode(testVideoName, transcodedVideoName); + } } diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index c14f23f6ace0..0dc76313cf5c 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -27666,6 +27666,7 @@ package android.media.audiofx { field public static final java.util.UUID EFFECT_TYPE_DYNAMICS_PROCESSING; field public static final java.util.UUID EFFECT_TYPE_ENV_REVERB; field public static final java.util.UUID EFFECT_TYPE_EQUALIZER; + field @NonNull public static final java.util.UUID EFFECT_TYPE_HAPTIC_GENERATOR; field public static final java.util.UUID EFFECT_TYPE_LOUDNESS_ENHANCER; field public static final java.util.UUID EFFECT_TYPE_NS; field public static final java.util.UUID EFFECT_TYPE_PRESET_REVERB; @@ -28018,6 +28019,13 @@ package android.media.audiofx { field public short numBands; } + public class HapticGenerator extends android.media.audiofx.AudioEffect implements java.lang.AutoCloseable { + method public void close(); + method @NonNull public static android.media.audiofx.HapticGenerator create(int); + method public static boolean isAvailable(); + method public int setEnabled(boolean); + } + public class LoudnessEnhancer extends android.media.audiofx.AudioEffect { ctor public LoudnessEnhancer(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException; method public float getTargetGain() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException; diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index c8406f199edd..a5ca196ef5b4 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -1,4 +1,12 @@ // Signature format: 2.0 +package android.app { + + public class AppOpsManager { + field public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage"; + } + +} + package android.content.rollback { public class RollbackManagerFrameworkInitializer { diff --git a/packages/CarSystemUI/TEST_MAPPING b/packages/CarSystemUI/TEST_MAPPING index f520c8a07a16..54afb9097f87 100644 --- a/packages/CarSystemUI/TEST_MAPPING +++ b/packages/CarSystemUI/TEST_MAPPING @@ -18,5 +18,15 @@ } ] } + ], + "carsysui-presubmit": [ + { + "name": "CarSystemUITests", + "options" : [ + { + "include-annotation": "com.android.systemui.car.CarSystemUiTest" + } + ] + } ] } diff --git a/packages/CarSystemUI/res/layout/system_icons.xml b/packages/CarSystemUI/res/layout/system_icons.xml index a7dd65eab550..d23579294ce8 100644 --- a/packages/CarSystemUI/res/layout/system_icons.xml +++ b/packages/CarSystemUI/res/layout/system_icons.xml @@ -31,10 +31,4 @@ android:gravity="center_vertical" android:orientation="horizontal" /> - - <com.android.systemui.BatteryMeterView - android:id="@+id/battery" - android:layout_width="0dp" - android:layout_height="match_parent" - /> </LinearLayout>
\ No newline at end of file diff --git a/packages/CarSystemUI/src/com/android/systemui/car/CarSystemUiTest.java b/packages/CarSystemUI/src/com/android/systemui/car/CarSystemUiTest.java new file mode 100644 index 000000000000..5f593b06c511 --- /dev/null +++ b/packages/CarSystemUI/src/com/android/systemui/car/CarSystemUiTest.java @@ -0,0 +1,32 @@ +/* + * 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.car; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotates that a test class should be run as part of CarSystemUI presubmit + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Documented +public @interface CarSystemUiTest { +} diff --git a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java index 37dfce4e16ce..35b2080dddf9 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java @@ -16,10 +16,12 @@ package com.android.systemui.car.navigationbar; +import static android.view.InsetsState.ITYPE_BOTTOM_GESTURES; import static android.view.InsetsState.ITYPE_CLIMATE_BAR; import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; import static android.view.InsetsState.ITYPE_STATUS_BAR; +import static android.view.InsetsState.ITYPE_TOP_GESTURES; import static android.view.InsetsState.containsType; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; @@ -368,13 +370,15 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks WindowManager.LayoutParams lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, height, - WindowManager.LayoutParams.TYPE_STATUS_BAR, + WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH, PixelFormat.TRANSLUCENT); lp.setTitle("TopCarNavigationBar"); + lp.providesInsetsTypes = new int[]{ITYPE_STATUS_BAR, ITYPE_TOP_GESTURES}; + lp.setFitInsetsTypes(0); lp.windowAnimations = 0; lp.gravity = Gravity.TOP; mWindowManager.addView(mTopNavigationBarWindow, lp); @@ -388,13 +392,14 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks WindowManager.LayoutParams lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, height, - WindowManager.LayoutParams.TYPE_NAVIGATION_BAR, + WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH, PixelFormat.TRANSLUCENT); lp.setTitle("BottomCarNavigationBar"); + lp.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR, ITYPE_BOTTOM_GESTURES}; lp.windowAnimations = 0; lp.gravity = Gravity.BOTTOM; mWindowManager.addView(mBottomNavigationBarWindow, lp); diff --git a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBarView.java b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBarView.java index 029d4c7fa2fb..0ced4021ce38 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBarView.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBarView.java @@ -16,7 +16,10 @@ package com.android.systemui.car.navigationbar; +import static android.view.WindowInsets.Type.systemBars; + import android.content.Context; +import android.graphics.Insets; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -79,9 +82,28 @@ public class CarNavigationBarView extends LinearLayout { @Override public WindowInsets onApplyWindowInsets(WindowInsets windowInsets) { + applyMargins(windowInsets.getInsets(systemBars())); return windowInsets; } + private void applyMargins(Insets insets) { + final int count = getChildCount(); + for (int i = 0; i < count; i++) { + View child = getChildAt(i); + if (child.getLayoutParams() instanceof LayoutParams) { + LayoutParams lp = (LayoutParams) child.getLayoutParams(); + if (lp.rightMargin != insets.right || lp.leftMargin != insets.left + || lp.topMargin != insets.top || lp.bottomMargin != insets.bottom) { + lp.rightMargin = insets.right; + lp.leftMargin = insets.left; + lp.topMargin = insets.top; + lp.bottomMargin = insets.bottom; + child.requestLayout(); + } + } + } + } + // Used to forward touch events even if the touch was initiated from a child component @Override public boolean onInterceptTouchEvent(MotionEvent ev) { diff --git a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java index bab67154e75d..0a677bfaa742 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/CarStatusBarHeader.java @@ -26,7 +26,6 @@ import android.widget.LinearLayout; import androidx.annotation.IdRes; import com.android.settingslib.Utils; -import com.android.systemui.BatteryMeterView; import com.android.systemui.R; import com.android.systemui.plugins.DarkIconDispatcher; @@ -49,10 +48,7 @@ public class CarStatusBarHeader extends LinearLayout { float intensity = colorForeground == Color.WHITE ? 0f : 1f; Rect tintArea = new Rect(0, 0, 0, 0); - applyDarkness(R.id.battery, tintArea, intensity, colorForeground); applyDarkness(R.id.clock, tintArea, intensity, colorForeground); - - ((BatteryMeterView) findViewById(R.id.battery)).setForceShowPercent(true); } private void applyDarkness(@IdRes int id, Rect tintArea, float intensity, int color) { diff --git a/packages/CarSystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java b/packages/CarSystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java index fe59cbf20a13..d769cacadf1d 100644 --- a/packages/CarSystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java +++ b/packages/CarSystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java @@ -33,6 +33,7 @@ import androidx.test.internal.runner.ClassPathScanner.ExternalClassNameFilter; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,6 +56,7 @@ import java.util.Collections; * test suite causes errors, such as the incorrect settings provider being cached. * For an example, see {@link com.android.systemui.DependencyTest}. */ +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @SmallTest public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestCase { diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/hvac/HvacControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/hvac/HvacControllerTest.java index 7996170ba7d6..e179ef1ce2a4 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/hvac/HvacControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/hvac/HvacControllerTest.java @@ -32,6 +32,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarServiceProvider; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Before; import org.junit.Test; @@ -39,6 +40,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java index 189e240169c3..62dc23624520 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/keyguard/CarKeyguardViewControllerTest.java @@ -41,6 +41,7 @@ import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarServiceProvider; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.car.navigationbar.CarNavigationBarController; import com.android.systemui.car.window.OverlayViewGlobalStateController; import com.android.systemui.keyguard.DismissCallbackRegistry; @@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations; import dagger.Lazy; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonRoleHolderControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonRoleHolderControllerTest.java index a57736bb3502..4b8268052324 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonRoleHolderControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonRoleHolderControllerTest.java @@ -39,6 +39,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarDeviceProvisionedController; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.tests.R; import org.junit.Before; @@ -49,6 +50,7 @@ import org.mockito.MockitoAnnotations; import java.util.List; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonSelectionStateControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonSelectionStateControllerTest.java index 893057e222a9..f623c26d12b6 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonSelectionStateControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/ButtonSelectionStateControllerTest.java @@ -28,6 +28,7 @@ import android.widget.LinearLayout; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.tests.R; import org.junit.Before; @@ -38,6 +39,7 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java index e84e42c77245..dec8b8ecdfb4 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarControllerTest.java @@ -31,6 +31,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.car.hvac.HvacController; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.statusbar.phone.StatusBarIconController; @@ -41,6 +42,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarTest.java index 0caa86f0eab2..d9edfa960858 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarTest.java @@ -45,6 +45,7 @@ import com.android.internal.view.AppearanceRegion; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarDeviceProvisionedController; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.LightBarController; @@ -63,6 +64,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarViewTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarViewTest.java index 19e394f69af4..47fd8201d197 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarViewTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationBarViewTest.java @@ -30,6 +30,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import org.junit.After; import org.junit.Before; @@ -38,6 +39,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationButtonTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationButtonTest.java index bcaa5e9a03ee..173f5487c728 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationButtonTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/navigationbar/CarNavigationButtonTest.java @@ -37,6 +37,7 @@ import android.widget.LinearLayout; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.statusbar.AlphaOptimizedImageView; import com.android.systemui.tests.R; @@ -45,6 +46,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/CarHeadsUpNotificationSystemContainerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/CarHeadsUpNotificationSystemContainerTest.java index ccaeb458fe54..384888ab42c3 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/CarHeadsUpNotificationSystemContainerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/CarHeadsUpNotificationSystemContainerTest.java @@ -30,6 +30,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarDeviceProvisionedController; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.car.window.OverlayViewGlobalStateController; import org.junit.Before; @@ -38,6 +39,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/NotificationVisibilityLoggerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/NotificationVisibilityLoggerTest.java index 89dac58cd2a7..d51aeb18135d 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/NotificationVisibilityLoggerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/notification/NotificationVisibilityLoggerTest.java @@ -37,6 +37,7 @@ import com.android.car.notification.NotificationDataManager; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.NotificationVisibility; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -49,6 +50,7 @@ import org.mockito.MockitoAnnotations; import java.util.Collections; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppDetectorTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppDetectorTest.java index 77620f3fb345..421e2109356d 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppDetectorTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppDetectorTest.java @@ -37,6 +37,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarDeviceProvisionedController; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Before; import org.junit.Test; @@ -44,6 +45,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppListenerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppListenerTest.java index 73f9f6a55afc..20576e9ec11f 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppListenerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/sideloaded/SideLoadedAppListenerTest.java @@ -35,6 +35,7 @@ import android.view.DisplayInfo; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Before; import org.junit.Test; @@ -46,6 +47,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewControllerTest.java index 797dbf515b7e..2e9d43b595a1 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewControllerTest.java @@ -36,6 +36,7 @@ import android.view.ViewGroup; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.car.window.OverlayViewGlobalStateController; import org.junit.Before; @@ -44,6 +45,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewMediatorTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewMediatorTest.java index a808e2d40e26..de6feb64391f 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewMediatorTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/userswitcher/UserSwitchTransitionViewMediatorTest.java @@ -25,6 +25,7 @@ import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import com.android.systemui.car.CarServiceProvider; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Before; import org.junit.Test; @@ -32,6 +33,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/voicerecognition/ConnectedDeviceVoiceRecognitionNotifierTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/voicerecognition/ConnectedDeviceVoiceRecognitionNotifierTest.java index 232df2eced39..31f1170c9603 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/voicerecognition/ConnectedDeviceVoiceRecognitionNotifierTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/voicerecognition/ConnectedDeviceVoiceRecognitionNotifierTest.java @@ -35,11 +35,13 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java index 45a05ac69bd7..7311cdb68a3c 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayPanelViewControllerTest.java @@ -39,6 +39,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; import com.android.systemui.car.CarDeviceProvisionedController; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.tests.R; @@ -52,6 +53,7 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewControllerTest.java index c24a3b52e348..e784761f6d5d 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewControllerTest.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.tests.R; import org.junit.Before; @@ -39,6 +40,7 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java index cba42e5a9be4..20f9bc8ec1cb 100644 --- a/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java +++ b/packages/CarSystemUI/tests/src/com/android/systemui/car/window/OverlayViewGlobalStateControllerTest.java @@ -32,6 +32,7 @@ import android.view.ViewStub; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.car.CarSystemUiTest; import com.android.systemui.car.navigationbar.CarNavigationBarController; import com.android.systemui.tests.R; @@ -44,6 +45,7 @@ import org.mockito.MockitoAnnotations; import java.util.Arrays; +@CarSystemUiTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp index 9420954748c4..75bd32ec0301 100644 --- a/packages/PackageInstaller/Android.bp +++ b/packages/PackageInstaller/Android.bp @@ -20,6 +20,7 @@ android_app { certificate: "platform", privileged: true, platform_apis: true, + rename_resources_package: false, static_libs: [ "xz-java", diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceListener.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceListener.java index 9535ef06f888..348c971e17cc 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceListener.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceListener.java @@ -22,6 +22,8 @@ import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; import android.text.TextUtils; +import androidx.annotation.GuardedBy; + import com.android.printservice.recommendation.R; import com.android.printservice.recommendation.util.DiscoveryListenerMultiplexer; import com.android.printservice.recommendation.util.PrinterHashMap; @@ -40,7 +42,12 @@ public class ServiceListener implements ServiceResolveQueue.ResolveCallback { private final String[] mServiceType; private final Observer mObserver; private final ServiceResolveQueue mResolveQueue; + private final Object mLock = new Object(); + + @GuardedBy("mLock") private List<NsdManager.DiscoveryListener> mListeners = new ArrayList<>(); + + @GuardedBy("mLock") public HashMap<String, PrinterHashMap> mVendorHashMap = new HashMap<>(); public interface Observer { @@ -73,108 +80,120 @@ public class ServiceListener implements ServiceResolveQueue.ResolveCallback { printerFound(nsdServiceInfo); } - private synchronized void printerFound(NsdServiceInfo nsdServiceInfo) { + private void printerFound(NsdServiceInfo nsdServiceInfo) { if (nsdServiceInfo == null) return; if (TextUtils.isEmpty(PrinterHashMap.getKey(nsdServiceInfo))) return; String vendor = MDnsUtils.getVendor(nsdServiceInfo); if (vendor == null) vendor = ""; - for(Map.Entry<String,VendorInfo> entry : mVendorInfoHashMap.entrySet()) { - for(String vendorValues : entry.getValue().mDNSValues) { - if (vendor.equalsIgnoreCase(vendorValues)) { + + boolean mapsChanged; + synchronized (mLock) { + for (Map.Entry<String, VendorInfo> entry : mVendorInfoHashMap.entrySet()) { + for (String vendorValues : entry.getValue().mDNSValues) { + if (vendor.equalsIgnoreCase(vendorValues)) { + vendor = entry.getValue().mVendorID; + break; + } + } + // intentional pointer check + //noinspection StringEquality + if ((vendor != entry.getValue().mVendorID) && + MDnsUtils.isVendorPrinter(nsdServiceInfo, entry.getValue().mDNSValues)) { vendor = entry.getValue().mVendorID; - break; } + // intentional pointer check + //noinspection StringEquality + if (vendor == entry.getValue().mVendorID) break; } - // intentional pointer check - //noinspection StringEquality - if ((vendor != entry.getValue().mVendorID) && - MDnsUtils.isVendorPrinter(nsdServiceInfo, entry.getValue().mDNSValues)) { - vendor = entry.getValue().mVendorID; - } - // intentional pointer check - //noinspection StringEquality - if (vendor == entry.getValue().mVendorID) break; - } - if (TextUtils.isEmpty(vendor)) { - return; - } + if (TextUtils.isEmpty(vendor)) { + return; + } - if (!mObserver.matchesCriteria(vendor, nsdServiceInfo)) - return; - boolean mapsChanged; + if (!mObserver.matchesCriteria(vendor, nsdServiceInfo)) + return; - PrinterHashMap vendorHash = mVendorHashMap.get(vendor); - if (vendorHash == null) { - vendorHash = new PrinterHashMap(); + PrinterHashMap vendorHash = mVendorHashMap.get(vendor); + if (vendorHash == null) { + vendorHash = new PrinterHashMap(); + } + mapsChanged = (vendorHash.addPrinter(nsdServiceInfo) == null); + mVendorHashMap.put(vendor, vendorHash); } - mapsChanged = (vendorHash.addPrinter(nsdServiceInfo) == null); - mVendorHashMap.put(vendor, vendorHash); if (mapsChanged) { mObserver.dataSetChanged(); } } - private synchronized void printerRemoved(NsdServiceInfo nsdServiceInfo) { + private void printerRemoved(NsdServiceInfo nsdServiceInfo) { boolean wasRemoved = false; - Set<String> vendors = mVendorHashMap.keySet(); - for(String vendor : vendors) { - PrinterHashMap map = mVendorHashMap.get(vendor); - wasRemoved |= (map.removePrinter(nsdServiceInfo) != null); - if (map.isEmpty()) wasRemoved |= (mVendorHashMap.remove(vendor) != null); + + synchronized (mLock) { + Set<String> vendors = mVendorHashMap.keySet(); + for (String vendor : vendors) { + PrinterHashMap map = mVendorHashMap.get(vendor); + wasRemoved |= (map.removePrinter(nsdServiceInfo) != null); + if (map.isEmpty()) wasRemoved |= (mVendorHashMap.remove(vendor) != null); + } } + if (wasRemoved) { mObserver.dataSetChanged(); } } public void start() { - stop(); - for(final String service :mServiceType) { - NsdManager.DiscoveryListener listener = new NsdManager.DiscoveryListener() { - @Override - public void onStartDiscoveryFailed(String s, int i) { + synchronized (mLock) { + stop(); - } + for (final String service : mServiceType) { + NsdManager.DiscoveryListener listener = new NsdManager.DiscoveryListener() { + @Override + public void onStartDiscoveryFailed(String s, int i) { - @Override - public void onStopDiscoveryFailed(String s, int i) { + } - } + @Override + public void onStopDiscoveryFailed(String s, int i) { - @Override - public void onDiscoveryStarted(String s) { + } - } + @Override + public void onDiscoveryStarted(String s) { - @Override - public void onDiscoveryStopped(String s) { + } - } + @Override + public void onDiscoveryStopped(String s) { - @Override - public void onServiceFound(NsdServiceInfo nsdServiceInfo) { - mResolveQueue.queueRequest(nsdServiceInfo, ServiceListener.this); - } + } - @Override - public void onServiceLost(NsdServiceInfo nsdServiceInfo) { - mResolveQueue.removeRequest(nsdServiceInfo, ServiceListener.this); - printerRemoved(nsdServiceInfo); - } - }; - DiscoveryListenerMultiplexer.addListener(mNSDManager, service, listener); - mListeners.add(listener); + @Override + public void onServiceFound(NsdServiceInfo nsdServiceInfo) { + mResolveQueue.queueRequest(nsdServiceInfo, ServiceListener.this); + } + + @Override + public void onServiceLost(NsdServiceInfo nsdServiceInfo) { + mResolveQueue.removeRequest(nsdServiceInfo, ServiceListener.this); + printerRemoved(nsdServiceInfo); + } + }; + DiscoveryListenerMultiplexer.addListener(mNSDManager, service, listener); + mListeners.add(listener); + } } } public void stop() { - for(NsdManager.DiscoveryListener listener : mListeners) { - DiscoveryListenerMultiplexer.removeListener(mNSDManager, listener); + synchronized (mLock) { + for (NsdManager.DiscoveryListener listener : mListeners) { + DiscoveryListenerMultiplexer.removeListener(mNSDManager, listener); + } + mVendorHashMap.clear(); + mListeners.clear(); } - mVendorHashMap.clear(); - mListeners.clear(); } /** @@ -183,8 +202,10 @@ public class ServiceListener implements ServiceResolveQueue.ResolveCallback { public ArrayList<InetAddress> getPrinters() { ArrayList<InetAddress> printerAddressess = new ArrayList<>(); - for (PrinterHashMap oneVendorPrinters : mVendorHashMap.values()) { - printerAddressess.addAll(oneVendorPrinters.getPrinterAddresses()); + synchronized (mLock) { + for (PrinterHashMap oneVendorPrinters : mVendorHashMap.values()) { + printerAddressess.addAll(oneVendorPrinters.getPrinterAddresses()); + } } return printerAddressess; diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 16029ee2b3b0..d042c0f89b1e 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -508,7 +508,7 @@ <string name="zen_mode_duration_always_prompt_title" msgid="3212996860498119555">"Да се пита винаги"</string> <string name="zen_mode_forever" msgid="3339224497605461291">"До изключване"</string> <string name="time_unit_just_now" msgid="3006134267292728099">"Току-що"</string> - <string name="media_transfer_this_device_name" msgid="2716555073132169240">"Високоговорител на телефона"</string> + <string name="media_transfer_this_device_name" msgid="2716555073132169240">"Високоговорител"</string> <string name="profile_connect_timeout_subtext" msgid="4043408193005851761">"При свързването възникна проблем. Изключете устройството и го включете отново"</string> <string name="media_transfer_wired_device_name" msgid="4447880899964056007">"Аудиоустройство с кабел"</string> <string name="help_label" msgid="3528360748637781274">"Помощ и отзиви"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 3a45526290e0..fb7d00f866b1 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -555,5 +555,5 @@ <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"מושבת"</string> <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"מופעל"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"צריך להפעיל מחדש את המכשיר כדי להחיל את השינוי. יש להפעיל מחדש עכשיו או לבטל."</string> - <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"אוזניות עם חוט"</string> + <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"אוזניות חוטיות"</string> </resources> diff --git a/packages/SettingsLib/res/values-ml/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml index ac643c3a6e62..c95f8bf2fe39 100644 --- a/packages/SettingsLib/res/values-ml/strings.xml +++ b/packages/SettingsLib/res/values-ml/strings.xml @@ -553,5 +553,5 @@ <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"പ്രവർത്തനരഹിതമാക്കി"</string> <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"പ്രവർത്തനക്ഷമമാക്കി"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"ഈ മാറ്റം ബാധകമാകുന്നതിന് നിങ്ങളുടെ ഉപകരണം റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്. ഇപ്പോൾ റീബൂട്ട് ചെയ്യുകയോ റദ്ദാക്കുകയോ ചെയ്യുക."</string> - <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്ഫോൺ"</string> + <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"വയേർഡ് ഹെഡ്ഫോൺ"</string> </resources> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 41ccdeb29f3e..5c80627003cd 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -553,5 +553,5 @@ <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Imezimwa"</string> <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"Imewashwa"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"Ni lazima uwashe tena kifaa chako ili mabadiliko haya yatekelezwe. Washa tena sasa au ughairi."</string> - <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Vipokea sauti vyenye waya vinavyobanwa kichwani"</string> + <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Vipokea sauti vya waya"</string> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 27576b107efd..ef3bdbc95809 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -866,9 +866,6 @@ class SettingsProtoDumpUtil { Settings.Global.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS, GlobalSettingsProto.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS); dumpSetting(s, p, - Settings.Global.JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS, - GlobalSettingsProto.JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS); - dumpSetting(s, p, Settings.Global.KEEP_PROFILE_IN_BACKGROUND, GlobalSettingsProto.KEEP_PROFILE_IN_BACKGROUND); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index b90b9c1208ae..2f1191a6325a 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -311,7 +311,6 @@ public class SettingsBackupTest { Settings.Global.INTENT_FIREWALL_UPDATE_METADATA_URL, Settings.Global.JOB_SCHEDULER_CONSTANTS, Settings.Global.JOB_SCHEDULER_QUOTA_CONTROLLER_CONSTANTS, - Settings.Global.JOB_SCHEDULER_TIME_CONTROLLER_CONSTANTS, Settings.Global.KEEP_PROFILE_IN_BACKGROUND, Settings.Global.KERNEL_CPU_THREAD_READER, Settings.Global.LANG_ID_UPDATE_CONTENT_URL, diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index d50dc7cba52b..7f7afcbf11f5 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -317,6 +317,11 @@ <!-- Permissions required for CTS test - AdbManagerTest --> <uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> + <!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp --> + <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" /> + <!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases --> + <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" diff --git a/packages/Shell/res/values-bn/strings.xml b/packages/Shell/res/values-bn/strings.xml index 39f62fe6a00a..ede125bce935 100644 --- a/packages/Shell/res/values-bn/strings.xml +++ b/packages/Shell/res/values-bn/strings.xml @@ -35,7 +35,7 @@ <string name="bugreport_add_details_to_zip_failed" msgid="1302931926486712371">"জিপ ফাইলে ত্রুটি প্রতিবেদনের বিশদ বিবরণ যোগ করা যায়নি"</string> <string name="bugreport_unnamed" msgid="2800582406842092709">"নামবিহীন"</string> <string name="bugreport_info_action" msgid="2158204228510576227">"বিশদ বিবরণ"</string> - <string name="bugreport_screenshot_action" msgid="8677781721940614995">"স্ক্রিনশট"</string> + <string name="bugreport_screenshot_action" msgid="8677781721940614995">"স্ক্রিনশট নিন"</string> <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"স্ক্রিনশট সফলভাবে নেওয়া হয়েছে৷"</string> <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"স্ক্রিনশট নেওয়া যায়নি৷"</string> <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"ত্রুটির প্রতিবেদন <xliff:g id="ID">#%d</xliff:g> এর বিশদ বিবরণ"</string> diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java index d2f168eb5e3e..d69f3d620d48 100644 --- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java +++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java @@ -333,6 +333,9 @@ public final class RingtonePickerActivity extends AlertActivity implements @Override public void onDestroy() { + if (mHandler != null) { + mHandler.removeCallbacksAndMessages(null); + } if (mCursor != null) { mCursor.close(); mCursor = null; diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml index 8a1f6de432f8..92dd9fd96111 100644 --- a/packages/SystemUI/res-keyguard/values-af/strings.xml +++ b/packages/SystemUI/res-keyguard/values-af/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Geen diens nie."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Wissel invoermetode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Vliegtuigmodus"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN word vereis om vir opdatering voor te berei"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Patroon word vereis om vir opdatering voor te berei"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Wagwoord word vereis om vir opdatering voor te berei"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Patroon word vereis nadat toestel herbegin het"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN word vereis nadat toestel herbegin het"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Wagwoord word vereis nadat toestel herbegin het"</string> diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml index 0a4aee53b7be..f94c20f9ad01 100644 --- a/packages/SystemUI/res-keyguard/values-am/strings.xml +++ b/packages/SystemUI/res-keyguard/values-am/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ከአገልግሎት መስጫ ክልል ውጪ።"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"የግቤት ስልት ቀይር"</string> <string name="airplane_mode" msgid="2528005343938497866">"የአውሮፕላን ሁነታ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ለዝማኔ ለማዘጋጀት ፒን ያስፈልጋል"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ለዝማኔ ለማዘጋጀት ሥርዓተ ጥለት ያስፈልጋል"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ለዝማኔ ለማዘጋጀት የይለፍ ቃል ያስፈልጋል"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"መሣሪያ ዳግም ከጀመረ በኋላ ሥርዓተ ጥለት ያስፈልጋል"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"መሣሪያ ዳግም ከተነሳ በኋላ ፒን ያስፈልጋል"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"መሣሪያ ዳግም ከጀመረ በኋላ የይለፍ ቃል ያስፈልጋል"</string> diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index 491dc39aa08d..6d86a78360d8 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -113,9 +113,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"لا تتوفر خدمة."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"تبديل أسلوب الإدخال"</string> <string name="airplane_mode" msgid="2528005343938497866">"وضع الطائرة"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"يجب إدخال رقم التعريف الشخصي للتحضير للتحديث."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"يجب رسم النقش للتحضير للتحديث."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"يجب إدخال كلمة المرور للتحضير للتحديث."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"يجب رسم النقش بعد إعادة تشغيل الجهاز"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"يجب إدخال رقم التعريف الشخصي بعد إعادة تشغيل الجهاز"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"يجب إدخال كلمة المرور بعد إعادة تشغيل الجهاز"</string> diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml index 4367efb8c679..3b51e480b7dd 100644 --- a/packages/SystemUI/res-keyguard/values-as/strings.xml +++ b/packages/SystemUI/res-keyguard/values-as/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"কোনো সেৱা নাই।"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ইনপুট পদ্ধতি সলনি কৰক"</string> <string name="airplane_mode" msgid="2528005343938497866">"এয়াৰপ্লেন ম\'ড"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"আপডে\'টৰ বাবে সাজু হ\'বলৈ পিনৰ আৱশ্যক"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"আপডে\'টৰ বাবে সাজু হ\'বলৈ আর্হিৰ আৱশ্যক"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"আপডে\'টৰ বাবে সাজু হ\'বলৈ পাছৱৰ্ডৰ আৱশ্যক"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত আৰ্হি দিয়াটো বাধ্যতামূলক"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত পিন দিয়াটো বাধ্যতামূলক"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ডিভাইচ ৰিষ্টাৰ্ট হোৱাৰ পিছত পাছৱৰ্ড দিয়াটো বাধ্যতামূলক"</string> diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml index d89bf6a8c0ae..ea07c3db4354 100644 --- a/packages/SystemUI/res-keyguard/values-az/strings.xml +++ b/packages/SystemUI/res-keyguard/values-az/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Xidmət yoxdur."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Daxiletmə metoduna keçin"</string> <string name="airplane_mode" msgid="2528005343938497866">"Təyyarə rejimi"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Güncəlləməyə hazırlıq üçün PIN kod tələb olunur"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Güncəlləməyə hazırlıq üçün model tələb olunur"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Güncəlləməyə hazırlıq üçün parol tələb olunur"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cihaz yenidən başladıqdan sonra model tələb olunur"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cihaz yeniden başladıqdan sonra PIN tələb olunur"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cihaz yeniden başladıqdan sonra parol tələb olunur"</string> diff --git a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml index 656e32301153..e206958d1e95 100644 --- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Mreža nije dostupna."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promeni metod unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim rada u avionu"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN je obavezan radi pripreme za ažuriranje"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Šablon je obavezan radi pripreme za ažuriranje"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Lozinka je obavezna radi pripreme za ažuriranje"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Treba da unesete šablon kada se uređaj ponovo pokrene"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Treba da unesete PIN kada se uređaj ponovo pokrene"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Treba da unesete lozinku kada se uređaj ponovo pokrene"</string> diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml index 07b6f358dcfc..569e705fbcc2 100644 --- a/packages/SystemUI/res-keyguard/values-be/strings.xml +++ b/packages/SystemUI/res-keyguard/values-be/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Не абслугоўваецца."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Пераключэнне рэжыму ўводу"</string> <string name="airplane_mode" msgid="2528005343938497866">"Рэжым палёту"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Для падрыхтоўкі да абнаўлення неабходна ўвесці PIN-код"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Для падрыхтоўкі да абнаўлення неабходна ўвесці ўзор разблакіроўкі"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Для падрыхтоўкі да абнаўлення неабходна ўвесці пароль"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Пасля перазапуску прылады патрабуецца ўзор"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Пасля перазапуску прылады патрабуецца PIN-код"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Пасля перазапуску прылады патрабуецца пароль"</string> diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml index a8c64f5d9551..d015be320e20 100644 --- a/packages/SystemUI/res-keyguard/values-bg/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Няма покритие."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Превключване на метода на въвеждане"</string> <string name="airplane_mode" msgid="2528005343938497866">"Самолетен режим"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"За подготовката за актуализация се изисква ПИН код"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"За подготовката за актуализация се изисква фигура"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"За подготовката за актуализация се изисква парола"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"След рестартиране на устройството се изисква фигура"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"След рестартиране на устройството се изисква ПИН код"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"След рестартиране на устройството се изисква парола"</string> diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml index 479e83ab3954..8eae6e6e2e18 100644 --- a/packages/SystemUI/res-keyguard/values-bn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"কোনো পরিষেবা নেই।"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ইনপুট পদ্ধতি পরিবর্তন করুন"</string> <string name="airplane_mode" msgid="2528005343938497866">"বিমান মোড"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"আপডেট প্রস্তুত করতে পিন দরকার"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"আপডেট প্রস্তুত করতে প্যাটার্ন দরকার"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"আপডেট প্রস্তুত করতে পাসওয়ার্ড দরকার"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ডিভাইসটি পুনরায় চালু হওয়ার পর প্যাটার্নের প্রয়োজন হবে"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ডিভাইসটি পুনরায় চালু হওয়ার পর পিন প্রয়োজন হবে"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ডিভাইসটি পুনরায় চালু হওয়ার পর পাসওয়ার্ডের প্রয়োজন হবে"</string> diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml index ada4c134fce7..286b08be1c5e 100644 --- a/packages/SystemUI/res-keyguard/values-bs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nema mreže."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promjena načina unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način rada u avionu"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Za pripremu ažuriranja potreban je PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Za pripremu ažuriranja potreban je uzorak"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Za pripremu ažuriranja potrebna je lozinka"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Potreban je uzorak nakon što se uređaj ponovo pokrene"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Potreban je PIN nakon što se uređaj ponovo pokrene"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Potrebna je lozinka nakon što se uređaj ponovo pokrene"</string> diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml index 6f5b6829c3e0..cb7fa37b281d 100644 --- a/packages/SystemUI/res-keyguard/values-ca/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sense servei"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Canvia el mètode d\'introducció"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode d\'avió"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Cal introduir el PIN per preparar l\'actualització"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Cal introduir el patró per preparar l\'actualització"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Cal introduir la contrasenya per preparar l\'actualització"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cal introduir el patró quan es reinicia el dispositiu"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cal introduir el PIN quan es reinicia el dispositiu"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cal introduir la contrasenya quan es reinicia el dispositiu"</string> diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml index a2f79adff1db..4f0c0ffa4962 100644 --- a/packages/SystemUI/res-keyguard/values-cs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Žádný signál"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Přepnout metodu zadávání"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim Letadlo"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Příprava na aktualizaci vyžaduje PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Příprava na aktualizaci vyžaduje gesto"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Příprava na aktualizaci vyžaduje heslo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po restartování zařízení je vyžadováno gesto"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po restartování zařízení je vyžadován kód PIN"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po restartování zařízení je vyžadováno heslo"</string> diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml index ef06269b5630..e486fc625699 100644 --- a/packages/SystemUI/res-keyguard/values-da/strings.xml +++ b/packages/SystemUI/res-keyguard/values-da/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ingen dækning."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Skift indtastningsmetode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flytilstand"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Du skal angive din pinkode for at forberede opdateringen"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Du skal angive dit mønster for at forberede opdateringen"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Du skal angive din adgangskode for at forberede opdateringen"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du skal angive et mønster, når du har genstartet enheden"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Der skal angives en pinkode efter genstart af enheden"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Der skal angives en adgangskode efter genstart af enheden"</string> diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml index fdfce1ffb338..06d012f4e84d 100644 --- a/packages/SystemUI/res-keyguard/values-de/strings.xml +++ b/packages/SystemUI/res-keyguard/values-de/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Dienst nicht verfügbar"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Eingabemethode wechseln"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flugmodus"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Zur Vorbereitung auf das Update ist eine PIN erforderlich"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Zur Vorbereitung auf das Update ist ein Muster erforderlich"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Zur Vorbereitung auf das Update ist ein Passwort erforderlich"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Nach dem Neustart des Geräts ist die Eingabe des Musters erforderlich"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Nach dem Neustart des Geräts ist die Eingabe der PIN erforderlich"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Nach dem Neustart des Geräts ist die Eingabe des Passworts erforderlich"</string> diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml index 8e4578f8445c..176428421476 100644 --- a/packages/SystemUI/res-keyguard/values-el/strings.xml +++ b/packages/SystemUI/res-keyguard/values-el/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Καμία υπηρεσία."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Εναλλαγή μεθόδου εισαγωγής"</string> <string name="airplane_mode" msgid="2528005343938497866">"Λειτουργία πτήσης"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Απαιτείται PIN για την προετοιμασία για ενημέρωση"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Απαιτείται μοτίβο για την προετοιμασία για ενημέρωση"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Απαιτείται κωδικός πρόσβασης για την προετοιμασία για ενημέρωση"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Απαιτείται μοτίβο μετά από την επανεκκίνηση της συσκευής"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Απαιτείται PIN μετά από την επανεκκίνηση της συσκευής"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Απαιτείται κωδικός πρόσβασης μετά από την επανεκκίνηση της συσκευής"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"No service"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pattern required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password required to prepare for update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index 921ba6b59af9..719f1a18a744 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"No service"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pattern required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password required to prepare for update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"No service"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pattern required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password required to prepare for update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml index 21cfe48689ae..92a15949a8ab 100644 --- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"No service"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Aeroplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pattern required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password required to prepare for update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml index fc59d0dfcdc5..975b1f644ef8 100644 --- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"No service."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Switch input method"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pattern required to prepare for update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password required to prepare for update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN required after device restarts"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password required after device restarts"</string> diff --git a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml index ab0c8f351562..25ab6159998e 100644 --- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sin servicio"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambiar método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo de avión"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Se requiere el PIN para actualizar el sistema"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Se requiere el patrón para actualizar el sistema"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Se requiere la contraseña para actualizar el sistema"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Se requiere el patrón después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Se requiere el PIN después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Se requiere la contraseña después de reiniciar el dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml index 38451c7cfba5..0754681215cc 100644 --- a/packages/SystemUI/res-keyguard/values-es/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sin servicio"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambiar método de introducción"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avión"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Debes introducir el PIN para prepararte para la actualización"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Debes dibujar el patrón para prepararte para la actualización"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Debes introducir la contraseña para prepararte para la actualización"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Debes introducir el patrón después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Debes introducir el PIN después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Debes introducir la contraseña después de reiniciar el dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml index f8ad18bba2f7..331a95c73c5e 100644 --- a/packages/SystemUI/res-keyguard/values-et/strings.xml +++ b/packages/SystemUI/res-keyguard/values-et/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Teenus puudub."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Vaheta sisestusmeetodit"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lennukirežiim"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada PIN-kood"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada muster"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Värskendamiseks ettevalmistuste tegemiseks tuleb sisestada parool"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pärast seadme taaskäivitamist tuleb sisestada muster"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pärast seadme taaskäivitamist tuleb sisestada PIN-kood"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pärast seadme taaskäivitamist tuleb sisestada parool"</string> diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml index 8510bee0711b..3ff224b9e55a 100644 --- a/packages/SystemUI/res-keyguard/values-eu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ez dago konektatuta inongo saretara."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Aldatu idazketa-metodoa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Hegaldi modua"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN kodea behar da eguneratzea prestatzeko"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Eredua behar da eguneratzea prestatzeko"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Pasahitza behar da eguneratzea prestatzeko"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Eredua marraztu beharko duzu gailua berrabiarazten denean"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN kodea idatzi beharko duzu gailua berrabiarazten denean"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pasahitza idatzi beharko duzu gailua berrabiarazten denean"</string> diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml index 43d32140b153..5e696369634e 100644 --- a/packages/SystemUI/res-keyguard/values-fa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"سرویسی وجود ندارد."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"تغییر روش ورودی"</string> <string name="airplane_mode" msgid="2528005343938497866">"حالت هواپیما"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"آمادهسازی برای بهروزرسانی به پین نیاز دارد"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"آمادهسازی برای بهروزرسانی به الگو نیاز دارد"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"آمادهسازی برای بهروزرسانی به گذرواژه نیاز دارد"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"بعد از بازنشانی دستگاه باید الگو وارد شود"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"بعد از بازنشانی دستگاه باید پین وارد شود"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"بعد از بازنشانی دستگاه باید گذرواژه وارد شود"</string> diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml index 7dc12c93e45e..54bc4d8cba58 100644 --- a/packages/SystemUI/res-keyguard/values-fi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ei yhteyttä"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Vaihda syöttötapaa."</string> <string name="airplane_mode" msgid="2528005343938497866">"Lentokonetila"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Päivitykseen valmistautuminen edellyttää PIN-koodia"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Päivitykseen valmistautuminen edellyttää kuviota"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Päivitykseen valmistautuminen edellyttää salasanaa"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kuvio vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN-koodi vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Salasana vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml index f093c1745e76..3e858c2ecf12 100644 --- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Aucun service"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Changer de méthode d\'entrée"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode Avion"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Le NIP est nécessaire pour préparer la mise à jour"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Le schéma est nécessaire pour préparer la mise à jour"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Le mot de passe est nécessaire pour préparer la mise à jour"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Le schéma est exigé après le redémarrage de l\'appareil"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Le NIP est exigé après le redémarrage de l\'appareil"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Le mot de passe est exigé après le redémarrage de l\'appareil"</string> diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml index d6d5a32874c2..8551fab7281f 100644 --- a/packages/SystemUI/res-keyguard/values-fr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Aucun service."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Changer le mode de saisie"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode Avion"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Veuillez saisir le code pour lancer la préparation de la mise à jour"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Veuillez saisir le schéma pour lancer la préparation de la mise à jour"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Veuillez saisir le mot de passe pour lancer la préparation de la mise à jour"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Veuillez dessiner le schéma après le redémarrage de l\'appareil"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Veuillez saisir le code après le redémarrage de l\'appareil"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Veuillez saisir le mot de passe après le redémarrage de l\'appareil"</string> diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml index f5d5bb4d13d4..46079810aee4 100644 --- a/packages/SystemUI/res-keyguard/values-gl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Non hai servizo."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambia o método de introdución"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avión"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Necesítase o PIN para preparar o dispositivo co fin de actualizalo"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Necesítase o padrón para preparar o dispositivo co fin de actualizalo"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Necesítase o contrasinal para preparar o dispositivo co fin de actualizalo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"É necesario o padrón despois do reinicio do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"É necesario o PIN despois do reinicio do dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"É necesario o contrasinal despois do reinicio do dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml index 29e2fe040082..b02d3d97b39f 100644 --- a/packages/SystemUI/res-keyguard/values-gu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"કોઈ સેવા નથી."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string> <string name="airplane_mode" msgid="2528005343938497866">"એરપ્લેન મોડ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"અપડેટ માટે તૈયાર કરવા માટે પિન જરુરી છે"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"અપડેટ માટે તૈયાર કરવા માટે પૅટર્ન જરુરી છે"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"અપડેટ માટે તૈયાર કરવા માટે પાસવર્ડ જરુરી છે"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પૅટર્ન જરૂરી છે"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પિન જરૂરી છે"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ઉપકરણનો પુનઃપ્રારંભ થાય તે પછી પાસવર્ડ જરૂરી છે"</string> diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml index d26c79f9c420..f6b15de0e97e 100644 --- a/packages/SystemUI/res-keyguard/values-hi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"कोई सेवा नहीं."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट का तरीका बदलें"</string> <string name="airplane_mode" msgid="2528005343938497866">"हवाई जहाज़ मोड"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"अपडेट के लिए पिन डालना ज़रूरी है"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"अपडेट के लिए पैटर्न डालना ज़रूरी है"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"अपडेट के लिए पासवर्ड डालना ज़रूरी है"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"डिवाइस फिर से चालू होने के बाद पैटर्न ज़रूरी है"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"डिवाइस फिर से चालू होने के बाद पिन ज़रूरी है"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"डिवाइस फिर से चालू होने के बाद पासवर्ड ज़रूरी है"</string> diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml index c8dd9b0a0932..49db3f88669a 100644 --- a/packages/SystemUI/res-keyguard/values-hr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nema usluge."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Promjena načina unosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način rada u zrakoplovu"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Za pripremu ažuriranja potreban je PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Za pripremu ažuriranja potreban je uzorak"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Za pripremu ažuriranja potrebna je zaporka"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Nakon ponovnog pokretanja uređaja morate unijeti uzorak"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Nakon ponovnog pokretanja uređaja morate unijeti PIN"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Nakon ponovnog pokretanja uređaja morate unijeti zaporku"</string> diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml index f0023d20e6bd..c26998f01ff0 100644 --- a/packages/SystemUI/res-keyguard/values-hu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nincs szolgáltatás."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Beviteli módszer váltása"</string> <string name="airplane_mode" msgid="2528005343938497866">"Repülős üzemmód"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"A frissítésre való felkészüléshez meg kell adni a PIN-kódot"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"A frissítésre való felkészüléshez meg kell adni a mintát"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"A frissítésre való felkészüléshez meg kell adni a jelszót"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Az eszköz újraindítását követően meg kell adni a mintát"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Az eszköz újraindítását követően meg kell adni a PIN-kódot"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Az eszköz újraindítását követően meg kell adni a jelszót"</string> diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml index 42247052014f..ad949d48fe0c 100644 --- a/packages/SystemUI/res-keyguard/values-hy/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ծառայությունն անհասանելի է։"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Փոխել ներածման եղանակը"</string> <string name="airplane_mode" msgid="2528005343938497866">"Ավիառեժիմ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել PIN-ը"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել նախշը"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Թարմացմանը պատրաստվելու համար անհրաժեշտ է մուտքագրել գաղտնաբառը"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել նախշը"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել PIN կոդը"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել գաղտնաբառը"</string> diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml index d62795ba1b14..85b2a4726fa2 100644 --- a/packages/SystemUI/res-keyguard/values-in/strings.xml +++ b/packages/SystemUI/res-keyguard/values-in/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Tidak ada layanan."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Beralih metode masukan"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mode pesawat"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN diwajibkan untuk menyiapkan update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pola diwajibkan untuk menyiapkan update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Sandi diwajibkan untuk menyiapkan update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pola diperlukan setelah perangkat dimulai ulang"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN diperlukan setelah perangkat dimulai ulang"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Sandi diperlukan setelah perangkat dimulai ulang"</string> diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml index 5e3765571c02..e40cdca33034 100644 --- a/packages/SystemUI/res-keyguard/values-is/strings.xml +++ b/packages/SystemUI/res-keyguard/values-is/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ekkert símasamband."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Skipta um innsláttaraðferð"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flugstilling"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Slá þarf inn PIN-númer til að undirbúa uppfærsluna"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Teikna þarf mynstur til að undirbúa uppfærsluna"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Gefa þarf upp aðgangsorð til að undirbúa uppfærsluna"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Mynsturs er krafist þegar tækið er endurræst"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN-númers er krafist þegar tækið er endurræst"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Aðgangsorðs er krafist þegar tækið er endurræst"</string> diff --git a/packages/SystemUI/res-keyguard/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml index fe460e38dc0b..e1c9ee8b7d34 100644 --- a/packages/SystemUI/res-keyguard/values-it/strings.xml +++ b/packages/SystemUI/res-keyguard/values-it/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nessun servizio."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Cambia metodo di immissione"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modalità aereo"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN obbligatorio per la preparazione all\'aggiornamento"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Sequenza obbligatoria per la preparazione all\'aggiornamento"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Password obbligatoria per la preparazione all\'aggiornamento"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Sequenza obbligatoria dopo il riavvio del dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN obbligatorio dopo il riavvio del dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Password obbligatoria dopo il riavvio del dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml index 71f3048ba11c..e054f629836e 100644 --- a/packages/SystemUI/res-keyguard/values-iw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"אין שירות."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"החלפת שיטת קלט"</string> <string name="airplane_mode" msgid="2528005343938497866">"מצב טיסה"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"נדרש קוד אימות להכנת העדכון"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"נדרש קו ביטול נעילה להכנת העדכון"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"נדרשת סיסמה להכנת העדכון"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"יש להזין את קו ביטול הנעילה לאחר הפעלה מחדש של המכשיר"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"יש להזין קוד גישה לאחר הפעלה מחדש של המכשיר"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"יש להזין סיסמה לאחר הפעלה מחדש של המכשיר"</string> diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml index 23ff82c6f2a7..957d78a8b440 100644 --- a/packages/SystemUI/res-keyguard/values-ja/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"通信サービスはありません。"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"入力方法の切り替え"</string> <string name="airplane_mode" msgid="2528005343938497866">"機内モード"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"更新の準備には PIN の入力が必要です"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"更新の準備にはパターンの入力が必要です"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"更新の準備にはパスワードが必要です"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"デバイスの再起動後はパターンの入力が必要となります"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"デバイスの再起動後は PIN の入力が必要となります"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"デバイスの再起動後はパスワードの入力が必要となります"</string> diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml index 25b9b1b22c1c..d0d15fec7172 100644 --- a/packages/SystemUI/res-keyguard/values-ka/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"სერვისი არ არის."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"შეყვანის მეთოდის გადართვა"</string> <string name="airplane_mode" msgid="2528005343938497866">"თვითმფრინავის რეჟიმი"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"განახლების მოსამზადებლად საჭიროა PIN-კოდი"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"განახლების მოსამზადებლად საჭიროა ნიმუში"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"განახლების მოსამზადებლად საჭიროა პაროლი"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა ნიმუშის დახატვა"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა PIN-კოდის შეყვანა"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა პაროლის შეყვანა"</string> diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml index 456088181d7f..62afd1e45df8 100644 --- a/packages/SystemUI/res-keyguard/values-kk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Қызмет көрсетілмейді."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Енгізу әдісін ауыстыру"</string> <string name="airplane_mode" msgid="2528005343938497866">"Ұшақ режимі"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Жаңа нұсқа орнатуға дайындау үшін PIN кодын енгізу қажет."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Жаңа нұсқа орнатуға дайындау үшін өрнек енгізу қажет."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Жаңа нұсқа орнатуға дайындау үшін құпия сөз енгізу қажет."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Құрылғы қайта іске қосылғаннан кейін, өрнекті енгізу қажет"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Құрылғы қайта іске қосылғаннан кейін, PIN кодын енгізу қажет"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Құрылғы қайта іске қосылғаннан кейін, құпия сөзді енгізу қажет"</string> diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml index e5ea9ea105dd..24b5c23a6732 100644 --- a/packages/SystemUI/res-keyguard/values-km/strings.xml +++ b/packages/SystemUI/res-keyguard/values-km/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"គ្មានសេវាទេ។"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ប្ដូរវិធីបញ្ចូល"</string> <string name="airplane_mode" msgid="2528005343938497866">"មុខងារពេលជិះយន្តហោះ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំធ្វើបច្ចុប្បន្នភាព"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំធ្វើបច្ចុប្បន្នភាព"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំធ្វើបច្ចុប្បន្នភាព"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"តម្រូវឲ្យប្រើលំនាំ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"តម្រូវឲ្យបញ្ចូលកូដ PIN បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"តម្រូវឲ្យបញ្ចូលពាក្យសម្ងាត់ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml index 8173ca047fe3..785ca4338326 100644 --- a/packages/SystemUI/res-keyguard/values-kn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ಸೇವೆ ಇಲ್ಲ."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ಇನ್ಪುಟ್ ವಿಧಾನ ಬದಲಿಸಿ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ಅಪ್ಡೇಟ್ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪಿನ್ ಅಗತ್ಯವಿದೆ"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ಅಪ್ಡೇಟ್ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ಅಪ್ಡೇಟ್ಗಾಗಿ ಸಿದ್ಧಗೊಳಿಸಲು, ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml index 606bb5047245..848490ebb9b8 100644 --- a/packages/SystemUI/res-keyguard/values-ko/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"서비스 불가"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"입력 방법 전환"</string> <string name="airplane_mode" msgid="2528005343938497866">"비행기 모드"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"업데이트를 준비하려면 PIN이 필요합니다."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"업데이트를 준비하려면 패턴이 필요합니다."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"업데이트를 준비하려면 비밀번호가 필요합니다."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"기기가 다시 시작되면 패턴이 필요합니다."</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"기기가 다시 시작되면 PIN이 필요합니다."</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"기기가 다시 시작되면 비밀번호가 필요합니다."</string> diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml index 72f95dbfa59f..d868788a3eca 100644 --- a/packages/SystemUI/res-keyguard/values-ky/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Интернет жок."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Киргизүү ыкмасын өзгөртүү"</string> <string name="airplane_mode" msgid="2528005343938497866">"Учак режими"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Жаңыртууга даярдоо үчүн PIN код талап кылынат"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Жаңыртууга даярдоо үчүн графикалык ачкыч талап кылынат"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Жаңыртууга даярдоо үчүн сырсөз талап кылынат"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Түзмөк кайра күйгүзүлгөндөн кийин графикалык ачкычты тартуу талап кылынат"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Түзмөк кайра күйгүзүлгөндөн кийин PIN-кодду киргизүү талап кылынат"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Түзмөк кайра күйгүзүлгөндөн кийин сырсөздү киргизүү талап кылынат"</string> diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml index 25e36c1b3115..ebaffb13d5b4 100644 --- a/packages/SystemUI/res-keyguard/values-lo/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ບໍ່ມີບໍລິການ"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ໂໝດໃນຍົນ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ຕ້ອງໃຊ້ PIN ເພື່ອກະກຽມອັບເດດ"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອກະກຽມອັບເດດ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອກະກຽມອັບເດດ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ຈຳເປັນຕ້ອງມີແບບຮູບປົດລັອກຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ຈຳເປັນຕ້ອງມີ PIN ຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ຈຳເປັນຕ້ອງມີລະຫັດຜ່ານຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml index 158efe2feabb..4d598f6bfb6d 100644 --- a/packages/SystemUI/res-keyguard/values-lt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nėra paslaugos."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Perjungti įvesties metodą"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lėktuvo režimas"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Kad būtų pasiruošta atnaujinti, reikia įvesti PIN kodą"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Kad būtų pasiruošta atnaujinti, reikia įvesti atrakinimo piešinį"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Kad būtų pasiruošta atnaujinti, reikia įvesti slaptažodį"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Iš naujo paleidus įrenginį būtinas atrakinimo piešinys"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Iš naujo paleidus įrenginį būtinas PIN kodas"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Iš naujo paleidus įrenginį būtinas slaptažodis"</string> diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml index c4a4e7f45b38..fad67d536e58 100644 --- a/packages/SystemUI/res-keyguard/values-lv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nav pakalpojuma."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Pārslēgt ievades metodi"</string> <string name="airplane_mode" msgid="2528005343938497866">"Lidojuma režīms"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Lai sagatavotos atjauninājumam, nepieciešams PIN."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Lai sagatavotos atjauninājumam, nepieciešama kombinācija."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Lai sagatavotos atjauninājumam, nepieciešama parole."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Pēc ierīces restartēšanas ir jāievada atbloķēšanas kombinācija."</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pēc ierīces restartēšanas ir jāievada PIN kods."</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Pēc ierīces restartēšanas ir jāievada parole."</string> diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml index de4a83b97021..1397f467e116 100644 --- a/packages/SystemUI/res-keyguard/values-mk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Нема услуга."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Префрли метод за внесување"</string> <string name="airplane_mode" msgid="2528005343938497866">"Авионски режим"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Потребен е PIN за да се подготви за ажурирање"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Потребна е шема за да се подготви за ажурирање"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Потребна е лозинка за да се подготви за ажурирање"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Потребна е шема по рестартирање на уредот"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Потребен е PIN-код по рестартирање на уредот"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Потребна е лозинка по рестартирање на уредот"</string> diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml index da26ba788932..f82f822ca26c 100644 --- a/packages/SystemUI/res-keyguard/values-ml/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"സേവനമില്ല"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ഇൻപുട്ട് രീതി മാറുക"</string> <string name="airplane_mode" msgid="2528005343938497866">"ഫ്ലൈറ്റ് മോഡ്"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"അപ്ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പിൻ ആവശ്യമാണ്"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"അപ്ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പാറ്റേൺ ആവശ്യമാണ്"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"അപ്ഡേറ്റിനായി തയ്യാറെടുക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പാറ്റേൺ വരയ്ക്കേണ്ടതുണ്ട്"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പിൻ നൽകേണ്ടതുണ്ട്"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ഉപകരണം റീസ്റ്റാർട്ടായശേഷം പാസ്വേഡ് നൽകേണ്ടതുണ്ട്"</string> diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml index fb032f15df7f..462017af1922 100644 --- a/packages/SystemUI/res-keyguard/values-mn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Үйлчилгээ алга."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Оруулах аргыг сэлгэх"</string> <string name="airplane_mode" msgid="2528005343938497866">"Нислэгийн горим"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Шинэчлэхэд бэлтгэхийн тулд ПИН шаардлагатай"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Шинэчлэхэд бэлтгэхийн тулд хээ шаардлагатай"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Шинэчлэхэд бэлтгэхийн тулд нууц үг шаардлагатай"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Төхөөрөмжийг дахин эхлүүлсний дараа загвар оруулах шаардлагатай"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Төхөөрөмжийг дахин эхлүүлсний дараа ПИН оруулах шаардлагатай"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Төхөөрөмжийг дахин эхлүүлсний дараа нууц үг оруулах шаардлагатай"</string> diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index e79e5c5d9234..0166791dc3ba 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"सेवा नाही."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट पद्धत स्विच करा"</string> <string name="airplane_mode" msgid="2528005343938497866">"विमान मोड"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"अपडेटसाठी तयार करण्याकरिता पिन आवश्यक आहे"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"अपडेटसाठी तयार करण्याकरिता पॅटर्न आवश्यक आहे"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"अपडेटसाठी तयार करण्याकरिता पासवर्ड आवश्यक आहे"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"डिव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"डिव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml index 5bc5df4d7c26..67500866f3d4 100644 --- a/packages/SystemUI/res-keyguard/values-ms/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Tiada perkhidmatan."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Tukar kaedah masukan"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mod Pesawat"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN diperlukan untuk menyediakan kemas kini"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Corak diperlukan untuk menyediakan kemas kini"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Kata laluan diperlukan untuk menyediakan kemas kini"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Corak diperlukan setelah peranti dimulakan semula"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"PIN diperlukan setelah peranti dimulakan semula"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kata laluan diperlukan setelah peranti dimulakan semula"</string> diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml index 43732d8ff260..3b32f06e19cd 100644 --- a/packages/SystemUI/res-keyguard/values-my/strings.xml +++ b/packages/SystemUI/res-keyguard/values-my/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ဝန်ဆောင်မှု မရှိပါ။"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"စာရိုက်စနစ်ပြောင်းရန်"</string> <string name="airplane_mode" msgid="2528005343938497866">"လေယာဉ်ပျံမုဒ်"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် ပင်နံပါတ် လိုပါသည်"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် ပုံစံလိုပါသည်"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"အပ်ဒိတ်အတွက် ပြင်ဆင်ရန် စကားဝှက် လိုပါသည်"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပုံစံ လိုအပ်ပါသည်"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် ပင်နံပါတ် လိုအပ်ပါသည်"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"စက်ပစ္စည်းကို ပိတ်ပြီးပြန်ဖွင့်လိုက်သည့်အခါတွင် စကားဝှက် လိုအပ်ပါသည်"</string> diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml index 6dd3b2ad6e72..ebd8f2922ba2 100644 --- a/packages/SystemUI/res-keyguard/values-nb/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ingen tilkobling."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Bytt inndatametode"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flymodus"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN-koden kreves for å klargjøre for oppdateringen"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Mønsteret kreves for å klargjøre for oppdateringen"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Passordet kreves for å klargjøre for oppdateringen"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du må tegne mønsteret etter at enheten har startet på nytt"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Du må skrive inn PIN-koden etter at enheten har startet på nytt"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Du må skrive inn passordet etter at enheten har startet på nytt"</string> diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml index a1e6d62234e9..ce05e38dca10 100644 --- a/packages/SystemUI/res-keyguard/values-ne/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"सेवा उपलब्ध छैन।"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"इनपुट विधिलाई स्विच गर्नुहोस्"</string> <string name="airplane_mode" msgid="2528005343938497866">"हवाइजहाज मोड"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"अद्यावधिक गर्ने कार्यका लागि तयार पार्न PIN चाहिन्छ"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"अद्यावधिक गर्ने कार्यका लागि तयार पार्न प्याटर्न चाहिन्छ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"अद्यावधिक गर्ने कार्यका लागि तयार पार्न पासवर्ड चाहिन्छ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"यन्त्र पुनः सुरु भएपछि ढाँचा आवश्यक पर्दछ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"यन्त्र पुनः सुरु भएपछि PIN आवश्यक पर्दछ"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"यन्त्र पुनः सुरु भएपछि पासवर्ड आवश्यक पर्दछ"</string> diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml index f3c35a405bd6..aa783e84b892 100644 --- a/packages/SystemUI/res-keyguard/values-nl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Geen service."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Invoermethode wijzigen"</string> <string name="airplane_mode" msgid="2528005343938497866">"Vliegtuigmodus"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Pincode vereist voor voorbereiding op update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Patroon vereist voor voorbereiding op update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Wachtwoord vereist voor voorbereiding op update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Patroon vereist nadat het apparaat opnieuw is opgestart"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Pincode vereist nadat het apparaat opnieuw is opgestart"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Wachtwoord vereist nadat het apparaat opnieuw is opgestart"</string> diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml index e92dc42680e1..8bbdcf1e9eb6 100644 --- a/packages/SystemUI/res-keyguard/values-or/strings.xml +++ b/packages/SystemUI/res-keyguard/values-or/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"କୌଣସି ସେବା ନାହିଁ।"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ଇନପୁଟ୍ ପଦ୍ଧତି ବଦଳାନ୍ତୁ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ଏରୋପ୍ଲେନ୍ ମୋଡ୍"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ PIN ଆବଶ୍ୟକ"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ ପାଟର୍ନ ଆବଶ୍ୟକ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ଅପଡେଟ୍ ପାଇଁ ପ୍ରସ୍ତୁତ ହେବାକୁ ପାସୱାର୍ଡ ଆବଶ୍ୟକ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାଟର୍ନ ଆବଶ୍ୟକ ଅଟେ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବାପରେ ପାସ୍ୱର୍ଡ ଆବଶ୍ୟକ"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ଡିଭାଇସ୍ ରିଷ୍ଟାର୍ଟ ହେବା ପରେ ପାସୱର୍ଡ ଆବଶ୍ୟକ ଅଟେ"</string> diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml index 5c83ab8a354c..78e066526840 100644 --- a/packages/SystemUI/res-keyguard/values-pa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ।"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string> <string name="airplane_mode" msgid="2528005343938497866">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ਅੱਪਡੇਟ ਨੂੰ ਤਿਆਰ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੈ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ"</string> diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml index 5f1df3e109b1..5094cf9983a1 100644 --- a/packages/SystemUI/res-keyguard/values-pl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Brak usługi."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Przełączanie metody wprowadzania"</string> <string name="airplane_mode" msgid="2528005343938497866">"Tryb samolotowy"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Aby przygotować się do aktualizacji, wymagany jest kod PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Aby przygotować się do aktualizacji, wymagany jest wzór"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Aby przygotować się do aktualizacji, wymagane jest hasło"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po ponownym uruchomieniu urządzenia wymagany jest wzór"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po ponownym uruchomieniu urządzenia wymagany jest kod PIN"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po ponownym uruchomieniu urządzenia wymagane jest hasło"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml index 1e47efa2cc4f..5bfc3dbc900d 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sem serviço."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avião"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Insira o PIN para se preparar para a atualização"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Insira o padrão para se preparar para a atualização"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Insira a senha para se preparar para a atualização"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"O padrão é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"O PIN é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"A senha é exigida após a reinicialização do dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index 09cfcf1da02f..5af8bc09a05b 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sem serviço."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alternar o método de introdução"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo de avião"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"É necessário introduzir o PIN para a preparação para a atualização."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"É necessário introduzir o padrão para a preparação para a atualização."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"É necessário introduzir a palavra-passe para a preparação para a atualização."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"É necessário um padrão após reiniciar o dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"É necessário um PIN após reiniciar o dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"É necessária uma palavra-passe após reiniciar o dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml index 1e47efa2cc4f..5bfc3dbc900d 100644 --- a/packages/SystemUI/res-keyguard/values-pt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Sem serviço."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modo avião"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Insira o PIN para se preparar para a atualização"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Insira o padrão para se preparar para a atualização"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Insira a senha para se preparar para a atualização"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"O padrão é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"O PIN é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"A senha é exigida após a reinicialização do dispositivo"</string> diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml index 7df2db6f03f1..8122241e6613 100644 --- a/packages/SystemUI/res-keyguard/values-ro/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Fără serviciu."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Comutați metoda de introducere"</string> <string name="airplane_mode" msgid="2528005343938497866">"Mod Avion"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Pentru a vă pregăti pentru actualizare este necesar codul PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Pentru a vă pregăti pentru actualizare este necesar modelul"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Pentru a vă pregăti pentru actualizare este necesară parola"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Modelul este necesar după repornirea dispozitivului"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Codul PIN este necesar după repornirea dispozitivului"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Parola este necesară după repornirea dispozitivului"</string> diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml index ccd3c968cd51..b80b479ca29a 100644 --- a/packages/SystemUI/res-keyguard/values-ru/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Нет сигнала."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Сменить способ ввода"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим полета"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Для подготовки к обновлению необходимо ввести PIN-код."</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Для подготовки к обновлению необходимо ввести графический ключ."</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Для подготовки к обновлению необходимо ввести пароль."</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"После перезагрузки устройства необходимо ввести графический ключ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"После перезагрузки устройства необходимо ввести PIN-код"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"После перезагрузки устройства необходимо ввести пароль"</string> diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml index 3dfc282ccae5..1cd876f15d47 100644 --- a/packages/SystemUI/res-keyguard/values-si/strings.xml +++ b/packages/SystemUI/res-keyguard/values-si/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"සේවාව නැත."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ආදාන ක්රමය මාරු කිරීම"</string> <string name="airplane_mode" msgid="2528005343938497866">"ගුවන් යානා ප්රකාරය"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"යාවත්කාලීනය සඳහා සුදානම් කිරීමට PIN අවශ්යය"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"යාවත්කාලීනය සඳහා සුදානම් කිරීමට රටාව අවශ්යය"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"යාවත්කාලීනය සඳහා සුදානම් කිරීමට මුරපදය අවශ්යය"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"උපාංගය නැවත ආරම්භ වූ පසු රටාව අවශ්යයි"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"උපාංගය නැවත ආරම්භ වූ පසු PIN අංකය අවශ්යයි"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"උපාංගය නැවත ආරම්භ වූ පසු මුරපදය අවශ්යයි"</string> diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml index 8568e14fecc3..801a7dbccf6d 100644 --- a/packages/SystemUI/res-keyguard/values-sk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Žiadny signál."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Prepnúť metódu vstupu"</string> <string name="airplane_mode" msgid="2528005343938497866">"Režim v lietadle"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Príprava na aktualizáciu vyžaduje zadanie kódu PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Príprava na aktualizáciu vyžaduje zadanie vzoru"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Príprava na aktualizáciu vyžaduje zadanie hesla"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po reštartovaní zariadenia musíte zadať bezpečnostný vzor"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po reštartovaní zariadenia musíte zadať kód PIN"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po reštartovaní zariadenia musíte zadať heslo"</string> diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml index 168158d9d602..967255cb50e7 100644 --- a/packages/SystemUI/res-keyguard/values-sl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ni storitve."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Preklop načina vnosa"</string> <string name="airplane_mode" msgid="2528005343938497866">"Način za letalo"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Za pripravo na posodobitev morate vnesti kodo PIN"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Za pripravo na posodobitev morate vnesti vzorec"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Za pripravo na posodobitev morate vnesti geslo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Po vnovičnem zagonu naprave je treba vnesti vzorec"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Po vnovičnem zagonu naprave je treba vnesti kodo PIN"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Po vnovičnem zagonu naprave je treba vnesti geslo"</string> diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml index 14973f82dc4d..382a4dcafed7 100644 --- a/packages/SystemUI/res-keyguard/values-sq/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Nuk ka shërbim."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Ndërro metodën e hyrjes"</string> <string name="airplane_mode" msgid="2528005343938497866">"Modaliteti i aeroplanit"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Kërkohet kodi PIN për t\'u përgatitur për përditësimin"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Kërkohet motivi për t\'u përgatitur për përditësimin"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Kërkohet fjalëkalimi për t\'u përgatitur për përditësimin"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kërkohet motivi pas rinisjes së pajisjes"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Kërkohet kodi PIN pas rinisjes së pajisjes"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kërkohet fjalëkalimi pas rinisjes së pajisjes"</string> diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml index 24a1125f9a7d..f83df3f8925e 100644 --- a/packages/SystemUI/res-keyguard/values-sr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml @@ -104,9 +104,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Мрежа није доступна."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Промени метод уноса"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим рада у авиону"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"PIN је обавезан ради припреме за ажурирање"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Шаблон је обавезан ради припреме за ажурирање"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Лозинка је обавезна ради припреме за ажурирање"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Треба да унесете шаблон када се уређај поново покрене"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Треба да унесете PIN када се уређај поново покрене"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Треба да унесете лозинку када се уређај поново покрене"</string> diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml index a37c4809ccdb..a037bffa4da2 100644 --- a/packages/SystemUI/res-keyguard/values-sv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ingen tjänst."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Byt inmatningsmetod"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flygplansläge"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Pinkod krävs för att förbereda för uppdatering"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Grafiskt lösenord krävs för att förbereda för uppdatering"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Lösenord krävs för att förbereda för uppdatering"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du måste ange grafiskt lösenord när du har startat om enheten"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Du måste ange pinkod när du har startat om enheten"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Du måste ange lösenord när du har startat om enheten"</string> diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml index c4a9a1445ceb..efa5ecfd44fd 100644 --- a/packages/SystemUI/res-keyguard/values-sw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Hakuna mtandao."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Kubadili mbinu ya kuingiza data"</string> <string name="airplane_mode" msgid="2528005343938497866">"Hali ya ndegeni"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Inahitaji PIN ili kujiandaa kwa ajili ya sasisho"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Inahitaji mchoro ili kujiandaa kwa ajili ya sasisho"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Inahitaji nenosiri ili kujiandaa kwa ajili ya sasisho"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Unafaa kuchora mchoro baada ya kuwasha kifaa upya"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Unafaa kuweka PIN baada ya kuwasha kifaa upya"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Unafaa kuweka nenosiri baada ya kuwasha kifaa upya"</string> diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml index a4dc0be3496f..96dbbb0314d6 100644 --- a/packages/SystemUI/res-keyguard/values-ta/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"சேவை இல்லை."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"உள்ளீட்டு முறையை மாற்றும்"</string> <string name="airplane_mode" msgid="2528005343938497866">"விமானப் பயன்முறை"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"புதுப்பிப்பிற்குத் தயார்செய்ய பின் தேவை"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"புதுப்பிப்பிற்குத் தயார்செய்ய பேட்டர்ன் தேவை"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"புதுப்பிப்பிற்குத் தயார்செய்ய கடவுச்சொல் தேவை"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"சாதனத்தை மீண்டும் தொடங்கியதும், பேட்டர்னை வரைய வேண்டும்"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"சாதனத்தை மீண்டும் தொடங்கியதும், பின்னை உள்ளிட வேண்டும்"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"சாதனத்தை மீண்டும் தொடங்கியதும், கடவுச்சொல்லை உள்ளிட வேண்டும்"</string> diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml index 3e27ce8ba702..74386bc7a487 100644 --- a/packages/SystemUI/res-keyguard/values-te/strings.xml +++ b/packages/SystemUI/res-keyguard/values-te/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"సేవ లేదు."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ఇన్పుట్ పద్ధతిని మార్చు"</string> <string name="airplane_mode" msgid="2528005343938497866">"విమానం మోడ్"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"అప్డేట్కు సిద్ధం చేయడానికి పిన్ అవసరం"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"అప్డేట్కు సిద్ధం చేయడానికి ఆకృతి అవసరం"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"అప్డేట్కు సిద్ధం చేయడానికి పాస్వర్డ్ అవసరం"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత నమూనాను గీయాలి"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"డివైజ్ను పునఃప్రారంభించిన తర్వాత పిన్ నమోదు చేయాలి"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత పాస్వర్డ్ను నమోదు చేయాలి"</string> diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml index 48ae2ceb9fbd..e157be4ac18e 100644 --- a/packages/SystemUI/res-keyguard/values-th/strings.xml +++ b/packages/SystemUI/res-keyguard/values-th/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"ไม่มีบริการ"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"สลับวิธีการป้อนข้อมูล"</string> <string name="airplane_mode" msgid="2528005343938497866">"โหมดบนเครื่องบิน"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"ต้องใช้ PIN เพื่อเตรียมรับการอัปเดต"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"ต้องใช้รูปแบบเพื่อเตรียมรับการอัปเดต"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"ต้องใช้รหัสผ่านเพื่อเตรียมรับการอัปเดต"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"ต้องวาดรูปแบบหลังจากอุปกรณ์รีสตาร์ท"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"ต้องระบุ PIN หลังจากอุปกรณ์รีสตาร์ท"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"ต้องป้อนรหัสผ่านหลังจากอุปกรณ์รีสตาร์ท"</string> diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml index bd87b20a2ccb..7b7e17dc8dcb 100644 --- a/packages/SystemUI/res-keyguard/values-tl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Walang serbisyo."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Magpalit ng pamamaraan ng pag-input"</string> <string name="airplane_mode" msgid="2528005343938497866">"Airplane mode"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Kinakailangan ang PIN para makapaghanda sa pag-update"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Kinakailangan ang pattern para makapaghanda sa pag-update"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Kinakailangan ang password para makapaghanda sa pag-update"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Kailangan ng pattern pagkatapos mag-restart ng device"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Kailangan ng PIN pagkatapos mag-restart ng device"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Kailangan ng password pagkatapos mag-restart ng device"</string> diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml index cf37451a9ed8..8c0caead0bdb 100644 --- a/packages/SystemUI/res-keyguard/values-tr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Hizmet yok."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Giriş yöntemini değiştir"</string> <string name="airplane_mode" msgid="2528005343938497866">"Uçak modu"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Güncellemenin hazırlanması için PIN gerekli"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Güncellemenin hazırlanması için desen gerekli"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Güncellemenin hazırlanması için şifre gerekli"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Cihaz yeniden başladıktan sonra desen gerekir"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Cihaz yeniden başladıktan sonra PIN gerekir"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Cihaz yeniden başladıktan sonra şifre gerekir"</string> diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml index 0ccd012c5221..6e5ce0f142dc 100644 --- a/packages/SystemUI/res-keyguard/values-uk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml @@ -107,9 +107,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Зв’язку немає."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Змінити метод введення"</string> <string name="airplane_mode" msgid="2528005343938497866">"Режим польоту"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Щоб підготуватися до оновлення, введіть PIN-код"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Щоб підготуватися до оновлення, введіть ключ"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Щоб підготуватися до оновлення, введіть пароль"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Після перезавантаження пристрою потрібно ввести ключ"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Після перезавантаження пристрою потрібно ввести PIN-код"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Після перезавантаження пристрою потрібно ввести пароль"</string> diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml index 22a477e3d63f..0fd5e17c953e 100644 --- a/packages/SystemUI/res-keyguard/values-ur/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"کوئی سروس نہیں ہے۔"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"اندراج کا طریقہ سوئچ کریں"</string> <string name="airplane_mode" msgid="2528005343938497866">"ہوائی جہاز وضع"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"اپ ڈیٹ تیار کرنے کے لیے PIN درکار ہے"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"اپ ڈیٹ تیار کرنے کے لیے پیٹرن درکار ہے"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"اپ ڈیٹ تیار کرنے کے لیے پاس ورڈ درکار ہے"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"آلہ دوبارہ چالو ہونے کے بعد پیٹرن درکار ہوتا ہے"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"آلہ دوبارہ چالو ہونے کے بعد PIN درکار ہوتا ہے"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"آلہ دوبارہ چالو ہونے کے بعد پاسورڈ درکار ہوتا ہے"</string> diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml index 72d4fae575b8..323fea5a608e 100644 --- a/packages/SystemUI/res-keyguard/values-uz/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Aloqa yo‘q."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Matn kiritish usulini almashtirish"</string> <string name="airplane_mode" msgid="2528005343938497866">"Parvoz rejimi"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Yangilashga tayyorlash uchun PIN kod talab etiladi"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Yangilashga tayyorlash uchun grafik kalit talab etiladi"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Yangilashga tayyorlash uchun parol talab etiladi"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Qurilma o‘chirib yoqilgandan keyin grafik kalit talab qilinadi"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Qurilma o‘chirib yoqilgandan keyin PIN kod talab qilinadi"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Qurilma o‘chirib yoqilgandan keyin parol talab qilinadi"</string> diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml index de642f3cc27c..2ba5089c7ed9 100644 --- a/packages/SystemUI/res-keyguard/values-vi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Không có dịch vụ."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Chuyển phương thức nhập"</string> <string name="airplane_mode" msgid="2528005343938497866">"Chế độ trên máy bay"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Cần nhập mã PIN để chuẩn bị cập nhật"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Cần nhập hình mở khóa để chuẩn bị cập nhật"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Cần nhập mật khẩu để chuẩn bị cập nhật"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Yêu cầu hình mở khóa sau khi thiết bị khởi động lại"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Yêu cầu mã PIN sau khi thiết bị khởi động lại"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Yêu cầu mật khẩu sau khi thiết bị khởi động lại"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml index be162b0b5790..b4bff5fab6d6 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"无服务。"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"切换输入法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飞行模式"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"需要输入 PIN 码才能让设备做好更新准备"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"需要绘制解锁图案才能让设备做好更新准备"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"需要输入密码才能让设备做好更新准备"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"重启设备后需要绘制解锁图案"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"重启设备后需要输入 PIN 码"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"重启设备后需要输入密码"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index 33e5b44ac31e..b3d387706fa5 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"沒有服務。"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"轉換輸入方法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飛行模式"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"必須提供 PIN 碼，才能準備進行更新"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"必須畫出上鎖圖案，才能準備進行更新"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"必須輸入密碼，才能準備進行更新"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"裝置重新啟動後，必須畫出上鎖圖案才能使用"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"裝置重新啟動後，必須輸入 PIN 碼才能使用"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"裝置重新啟動後，必須輸入密碼才能使用"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml index 763233cc2e15..03dec4852771 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"沒有服務。"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"切換輸入法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飛航模式"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"請輸入 PIN 碼，以便為更新作業進行準備"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"請畫出解鎖圖案，以便為更新作業進行準備"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"請輸入密碼，以便為更新作業進行準備"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"裝置重新啟動後需要畫出解鎖圖案"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"裝置重新啟動後需要輸入 PIN 碼"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"裝置重新啟動後需要輸入密碼"</string> diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml index 397c868e6547..5ab567f706c3 100644 --- a/packages/SystemUI/res-keyguard/values-zu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml @@ -101,9 +101,6 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ayikho isevisi"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Shintsha indlela yokufaka"</string> <string name="airplane_mode" msgid="2528005343938497866">"Imodi yendiza"</string> - <string name="kg_prompt_reason_prepare_for_update_pin" msgid="8878724145347297575">"Iphinikhodi iyadingeka ukuze kulungiselelwe isibuyekezo"</string> - <string name="kg_prompt_reason_prepare_for_update_pattern" msgid="4873394344883271519">"Iphethini iyadingeka ukuze kulungiselelwe isibuyekezo"</string> - <string name="kg_prompt_reason_prepare_for_update_password" msgid="5625446803865598337">"Iphasiwedi iyadingeka ukuze kulungiselelwe isibuyekezo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Iphethini iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Iphinikhodi iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Iphasiwedi iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index 4d184d5758d3..f7e9fedd5f66 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -240,15 +240,6 @@ <!-- Description of airplane mode --> <string name="airplane_mode">Airplane mode</string> - <!-- An explanation text that the PIN needs to be entered to prepare for an operating system update. [CHAR LIMIT=80] --> - <string name="kg_prompt_reason_prepare_for_update_pin">PIN required to prepare for update</string> - - <!-- An explanation text that the pattern needs to be entered to prepare for an operating system update. [CHAR LIMIT=80] --> - <string name="kg_prompt_reason_prepare_for_update_pattern">Pattern required to prepare for update</string> - - <!-- An explanation text that the password needs to be entered to prepare for an operating system update. [CHAR LIMIT=80] --> - <string name="kg_prompt_reason_prepare_for_update_password">Password required to prepare for update</string> - <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] --> <string name="kg_prompt_reason_restart_pattern">Pattern required after device restarts</string> diff --git a/packages/SystemUI/res/drawable/ic_sysbar_rotate_button.xml b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_ccw_start_0.xml index 3304c19b1ed8..ff5cb9ef6b67 100644 --- a/packages/SystemUI/res/drawable/ic_sysbar_rotate_button.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_ccw_start_0.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2017 The Android Open Source Project + 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. @@ -23,7 +23,7 @@ android:viewportHeight="28.0"> <!-- Use scaleX to flip icon so arrows always point in the direction of motion --> <group android:name="icon" android:pivotX="14" android:pivotY="14" - android:scaleX="?attr/rotateButtonScaleX"> + android:scaleX="1"> <!-- Tint color to be set directly --> <path android:fillColor="#FFFFFFFF" android:pathData="M12.02,10.83L9.25,8.06l2.77,-2.77l1.12,1.12l-0.85,0.86h5.16c0.72,0 1.31,0.56 1.31,1.26v9.16l-1.58,-1.58V8.85h-4.89l0.86,0.86L12.02,10.83zM15.98,17.17l-1.12,1.12l0.85,0.86h-4.88v-7.26L9.25,10.3v9.17c0,0.7 0.59,1.26 1.31,1.26h5.16v0.01l-0.85,0.85l1.12,1.12l2.77,-2.77L15.98,17.17z"/> @@ -107,8 +107,8 @@ <objectAnimator android:propertyName="rotation" android:startOffset="100" android:duration="600" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonEndAngle"> + android:valueFrom="0" + android:valueTo="-90"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> </aapt:attr> @@ -118,14 +118,14 @@ <objectAnimator android:propertyName="rotation" android:startOffset="1300" android:duration="100" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonStartAngle"/> + android:valueFrom="0" + android:valueTo="0"/> <!-- Icon rotation with start timing offset after fade in --> <objectAnimator android:propertyName="rotation" android:duration="600" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonEndAngle"> + android:valueFrom="0" + android:valueTo="-90"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> </aapt:attr> @@ -135,14 +135,14 @@ <objectAnimator android:propertyName="rotation" android:startOffset="1300" android:duration="100" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonStartAngle"/> + android:valueFrom="0" + android:valueTo="0"/> <!-- Icon rotation with start timing offset after fade in --> <objectAnimator android:propertyName="rotation" android:duration="600" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonEndAngle"> + android:valueFrom="0" + android:valueTo="-90"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> </aapt:attr> @@ -152,14 +152,14 @@ <objectAnimator android:propertyName="rotation" android:startOffset="1300" android:duration="100" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonStartAngle"/> + android:valueFrom="0" + android:valueTo="0"/> <!-- Icon rotation with start timing offset after fade in --> <objectAnimator android:propertyName="rotation" android:duration="600" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonEndAngle"> + android:valueFrom="0" + android:valueTo="-90"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> </aapt:attr> @@ -169,14 +169,14 @@ <objectAnimator android:propertyName="rotation" android:startOffset="1300" android:duration="100" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonStartAngle"/> + android:valueFrom="0" + android:valueTo="0"/> <!-- Icon rotation with start timing offset after fade in --> <objectAnimator android:propertyName="rotation" android:duration="600" - android:valueFrom="?attr/rotateButtonStartAngle" - android:valueTo="?attr/rotateButtonEndAngle"> + android:valueFrom="0" + android:valueTo="-90"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> </aapt:attr> diff --git a/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_ccw_start_90.xml b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_ccw_start_90.xml new file mode 100644 index 000000000000..90fedb17ecf1 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_ccw_start_90.xml @@ -0,0 +1,187 @@ +<?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. +--> +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector android:name="root" + android:width="28dp" + android:height="28dp" + android:viewportWidth="28.0" + android:viewportHeight="28.0"> + <!-- Use scaleX to flip icon so arrows always point in the direction of motion --> + <group android:name="icon" android:pivotX="14" android:pivotY="14" + android:scaleX="1"> + <!-- Tint color to be set directly --> + <path android:fillColor="#FFFFFFFF" + android:pathData="M12.02,10.83L9.25,8.06l2.77,-2.77l1.12,1.12l-0.85,0.86h5.16c0.72,0 1.31,0.56 1.31,1.26v9.16l-1.58,-1.58V8.85h-4.89l0.86,0.86L12.02,10.83zM15.98,17.17l-1.12,1.12l0.85,0.86h-4.88v-7.26L9.25,10.3v9.17c0,0.7 0.59,1.26 1.31,1.26h5.16v0.01l-0.85,0.85l1.12,1.12l2.77,-2.77L15.98,17.17z"/> + </group> + </vector> + </aapt:attr> + + <!-- Repeat all animations 5 times but don't fade out at the end --> + <target android:name="root"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + </set> + </aapt:attr> + </target> + <target android:name="icon"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="100" + android:duration="600" + android:valueFrom="90" + android:valueTo="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="0"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_0.xml b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_0.xml new file mode 100644 index 000000000000..a89e7a34ad26 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_0.xml @@ -0,0 +1,187 @@ +<?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. +--> +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector android:name="root" + android:width="28dp" + android:height="28dp" + android:viewportWidth="28.0" + android:viewportHeight="28.0"> + <!-- Use scaleX to flip icon so arrows always point in the direction of motion --> + <group android:name="icon" android:pivotX="14" android:pivotY="14" + android:scaleX="-1"> + <!-- Tint color to be set directly --> + <path android:fillColor="#FFFFFFFF" + android:pathData="M12.02,10.83L9.25,8.06l2.77,-2.77l1.12,1.12l-0.85,0.86h5.16c0.72,0 1.31,0.56 1.31,1.26v9.16l-1.58,-1.58V8.85h-4.89l0.86,0.86L12.02,10.83zM15.98,17.17l-1.12,1.12l0.85,0.86h-4.88v-7.26L9.25,10.3v9.17c0,0.7 0.59,1.26 1.31,1.26h5.16v0.01l-0.85,0.85l1.12,1.12l2.77,-2.77L15.98,17.17z"/> + </group> + </vector> + </aapt:attr> + + <!-- Repeat all animations 5 times but don't fade out at the end --> + <target android:name="root"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + </set> + </aapt:attr> + </target> + <target android:name="icon"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="100" + android:duration="600" + android:valueFrom="0" + android:valueTo="90"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="0" + android:valueTo="0"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="0" + android:valueTo="90"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="0" + android:valueTo="0"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="0" + android:valueTo="90"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="0" + android:valueTo="0"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="0" + android:valueTo="90"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="0" + android:valueTo="0"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="0" + android:valueTo="90"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_90.xml b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_90.xml new file mode 100644 index 000000000000..0dc67b0d22af --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_rotate_button_cw_start_90.xml @@ -0,0 +1,187 @@ +<?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. +--> +<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"> + <aapt:attr name="android:drawable"> + <vector android:name="root" + android:width="28dp" + android:height="28dp" + android:viewportWidth="28.0" + android:viewportHeight="28.0"> + <!-- Use scaleX to flip icon so arrows always point in the direction of motion --> + <group android:name="icon" android:pivotX="14" android:pivotY="14" + android:scaleX="-1"> + <!-- Tint color to be set directly --> + <path android:fillColor="#FFFFFFFF" + android:pathData="M12.02,10.83L9.25,8.06l2.77,-2.77l1.12,1.12l-0.85,0.86h5.16c0.72,0 1.31,0.56 1.31,1.26v9.16l-1.58,-1.58V8.85h-4.89l0.86,0.86L12.02,10.83zM15.98,17.17l-1.12,1.12l0.85,0.86h-4.88v-7.26L9.25,10.3v9.17c0,0.7 0.59,1.26 1.31,1.26h5.16v0.01l-0.85,0.85l1.12,1.12l2.77,-2.77L15.98,17.17z"/> + </group> + </vector> + </aapt:attr> + + <!-- Repeat all animations 5 times but don't fade out at the end --> + <target android:name="root"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + <!-- Linear fade out --> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="1700" + android:valueFrom="1" + android:valueTo="0" + android:interpolator="@android:anim/linear_interpolator"/> + <!-- Linear fade in--> + <objectAnimator android:propertyName="alpha" + android:duration="100" + android:startOffset="100" + android:valueFrom="0" + android:valueTo="1" + android:interpolator="@android:anim/linear_interpolator" /> + </set> + </aapt:attr> + </target> + <target android:name="icon"> + <aapt:attr name="android:animation"> + <set android:ordering="sequentially"> + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="100" + android:duration="600" + android:valueFrom="90" + android:valueTo="180"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="180"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="180"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="180"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + + <!-- Reset rotation position for fade in --> + <objectAnimator android:propertyName="rotation" + android:startOffset="1300" + android:duration="100" + android:valueFrom="90" + android:valueTo="90"/> + + <!-- Icon rotation with start timing offset after fade in --> + <objectAnimator android:propertyName="rotation" + android:duration="600" + android:valueFrom="90" + android:valueTo="180"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.408,1.181 0.674,1.08 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> +</animated-vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/pip_menu_action.xml b/packages/SystemUI/res/layout/pip_menu_action.xml deleted file mode 100644 index 3ad35460d8b9..000000000000 --- a/packages/SystemUI/res/layout/pip_menu_action.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<ImageButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/pip_action_size" - android:layout_height="@dimen/pip_action_size" - android:padding="@dimen/pip_action_padding" - android:background="?android:selectableItemBackgroundBorderless" - android:forceHasOverlappingRendering="false" /> diff --git a/packages/SystemUI/res/layout/qs_footer_impl.xml b/packages/SystemUI/res/layout/qs_footer_impl.xml index 5c00af5705e9..436188a83d4f 100644 --- a/packages/SystemUI/res/layout/qs_footer_impl.xml +++ b/packages/SystemUI/res/layout/qs_footer_impl.xml @@ -62,7 +62,7 @@ android:gravity="center_vertical" android:focusable="true" android:singleLine="true" - android:ellipsize="end" + android:ellipsize="marquee" android:textAppearance="@style/TextAppearance.QS.Status" android:layout_marginEnd="4dp" android:visibility="gone"/> diff --git a/packages/SystemUI/res/layout/tv_pip_custom_control.xml b/packages/SystemUI/res/layout/tv_pip_custom_control.xml deleted file mode 100644 index dd0fce466576..000000000000 --- a/packages/SystemUI/res/layout/tv_pip_custom_control.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2017, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<com.android.systemui.pip.tv.PipControlButtonView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/picture_in_picture_button_width" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/picture_in_picture_button_start_margin" /> diff --git a/packages/SystemUI/res/layout/tv_pip_menu.xml b/packages/SystemUI/res/layout/tv_pip_menu.xml deleted file mode 100644 index 35f2af4f7526..000000000000 --- a/packages/SystemUI/res/layout/tv_pip_menu.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2016, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:paddingTop="350dp" - android:background="#CC000000" - android:gravity="top|center_horizontal" - android:clipChildren="false"> - - <com.android.systemui.pip.tv.PipControlsView - android:id="@+id/pip_controls" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:alpha="0" /> -</LinearLayout> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 39660d230575..e48fe656d187 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Wysig volgorde van instellings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Bladsy <xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Sluitskerm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Vou uit"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimeer"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Maak toe"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Instellings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Swiep af om toe te maak"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Kieslys"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in beeld-in-beeld"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"As jy nie wil hê dat <xliff:g id="NAME">%s</xliff:g> hierdie kenmerk moet gebruik nie, tik om instellings oop te maak en skakel dit af."</string> - <string name="pip_play" msgid="333995977693142810">"Speel"</string> - <string name="pip_pause" msgid="1139598607050555845">"Laat wag"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Slaan oor na volgende"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Slaan oor na vorige"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Verander grootte"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Foon afgeskakel weens hitte"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Jou foon werk nou normaal"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Jou foon werk nou normaal.\nTik vir meer inligting"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Jou foon was te warm en dit het afgeskakel om af te koel. Jou foon werk nou normaal.\n\nJou foon kan dalk te warm word as jy:\n • Hulpbron-intensiewe programme (soos dobbel-, video- of navigasieprogramme) gebruik\n • Groot lêers af- of oplaai\n • Jou foon in hoë temperature gebruik"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Sien versorgingstappe"</string> <string name="high_temp_title" msgid="2218333576838496100">"Foon raak warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Sommige kenmerke is beperk terwyl foon afkoel"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Sommige kenmerke is beperk terwyl foon afkoel.\nTik vir meer inligting"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Jou foon sal outomaties probeer om af te koel. Jy kan steeds jou foon gebruik, maar dit sal dalk stadiger wees.\n\nJou foon sal normaalweg werk nadat dit afgekoel het."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Sien versorgingstappe"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Trek laaier uit"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Kan nie hierdie toestel laai nie. Trek die kragprop uit, en wees versigtig, want die kabel kan warm wees."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Sien versorgingstappe"</string> diff --git a/packages/SystemUI/res/values-af/strings_tv.xml b/packages/SystemUI/res/values-af/strings_tv.xml index 2ea6c60ab1b8..f277529397f6 100644 --- a/packages/SystemUI/res/values-af/strings_tv.xml +++ b/packages/SystemUI/res/values-af/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Beeld-in-beeld"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Titellose program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Maak PIP toe"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Volskerm"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofoon aktief"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s het toegang tot jou mikrofoon"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 62314c054744..300ca0e5b141 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"የቅንብሮድ ቅደም-ተከተል አርትዕ።"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"ገጽ <xliff:g id="ID_1">%1$d</xliff:g> ከ <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ማያ ገጽ ቁልፍ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ዘርጋ"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"አሳንስ"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ዝጋ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ቅንብሮች"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ለማሰናበት ወደ ታች ይጎትቱ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ምናሌ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> በስዕል-ላይ-ስዕል ውስጥ ነው"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> ይህን ባህሪ እንዲጠቀም ካልፈለጉ ቅንብሮችን ለመክፈት መታ ያድርጉና ያጥፉት።"</string> - <string name="pip_play" msgid="333995977693142810">"አጫውት"</string> - <string name="pip_pause" msgid="1139598607050555845">"ባለበት አቁም"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ወደ ቀጣይ ዝለል"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ወደ ቀዳሚ ዝለል"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"መጠን ይቀይሩ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ስልክ በሙቀት ምክንያት ጠፍቷል"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"የእርስዎ ስልክ አሁን በመደበኝነት እያሄደ ነው"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"የእርስዎ ስልክ በመደበኛ ሁኔታ እየሠራ ነው።\nለተጨማሪ መረጃ መታ ያድርጉ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"የእርስዎ ስልክ በጣም ግሎ ነበር፣ ስለዚህ እንዲቀዘቅዝ ጠፍቷል። የእርስዎ ስልክ አሁን በመደበኝነት እያሄደ ነው።\n\nየሚከተሉትን ካደረጉ የእርስዎ በጣም ሊግል ይችላል፦\n • ኃይል በጣም የሚጠቀሙ መተግበሪያዎችን (እንደ ጨዋታ፣ ቪዲዮ ወይም የአሰሳ መተግበሪያዎች ያሉ) ከተጠቀሙ\n • ትላልቅ ፋይሎችን ካወረዱ ወይም ከሰቀሉ\n • ስልክዎን በከፍተኛ ሙቀት ውስጥ ከተጠቀሙ"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"የእንክብካቤ ደረጃዎችን ይመልከቱ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ስልኩ እየሞቀ ነው"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ስልኩ እየቀዘቀዘ ሳለ አንዳንድ ባህሪዎች ይገደባሉ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"አንዳንድ ባሕሪያት ስልኩ እየቀዘቀዘ እያለ ውስን ይሆናሉ።\nለተጨማሪ መረጃ መታ ያድርጉ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"የእርስዎ ስልክ በራስ-ሰር ለመቀዝቀዝ ይሞክራል። አሁንም ስልክዎን መጠቀም ይችላሉ፣ ነገር ግን ሊንቀራፈፍ ይችላል።\n\nአንዴ ስልክዎ ከቀዘቀዘ በኋላ በመደበኝነት ያሄዳል።"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"የእንክብካቤ ደረጃዎችን ይመልከቱ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ኃይል መሙያን ይንቀሉ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"የዚህን መሣሪያ ባትሪ መሙላት ላይ ችግር አለ። የኃይል አስማሚውን ይንቀሉትና ሊግል ስለሚችል ገመዱን ይጠብቁት።"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"የእንክብካቤ ደረጃዎችን ይመልከቱ"</string> diff --git a/packages/SystemUI/res/values-am/strings_tv.xml b/packages/SystemUI/res/values-am/strings_tv.xml index 83e3fd9f539f..d9ec459d06f7 100644 --- a/packages/SystemUI/res/values-am/strings_tv.xml +++ b/packages/SystemUI/res/values-am/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ስዕል-ላይ-ስዕል"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ርዕስ የሌለው ፕሮግራም)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIPን ዝጋ"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ሙሉ ማያ ገጽ"</string> <string name="mic_active" msgid="5766614241012047024">"ማይክራፎን ንቁ ነው"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s የእርስዎን ማይክራፎን ደርሶበታል"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 1af73a05a6f4..7f2a405efed2 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -936,25 +936,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"تعديل ترتيب الإعدادات."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"الصفحة <xliff:g id="ID_1">%1$d</xliff:g> من <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"شاشة القفل"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"توسيع"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"تصغير"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"إغلاق"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"الإعدادات"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"اسحب لأسفل للإلغاء"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"القائمة"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> يظهر في صورة داخل صورة"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"إذا كنت لا تريد أن يستخدم <xliff:g id="NAME">%s</xliff:g> هذه الميزة، فانقر لفتح الإعدادات، ثم أوقِف تفعيل هذه الميزة."</string> - <string name="pip_play" msgid="333995977693142810">"تشغيل"</string> - <string name="pip_pause" msgid="1139598607050555845">"إيقاف مؤقت"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"التخطي إلى التالي"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"التخطي إلى السابق"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"تغيير الحجم"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"تم إيقاف الهاتف بسبب الحرارة"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"يعمل هاتفك الآن بشكل طبيعي"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"يعمل هاتفك الآن بشكل طبيعي.\nانقر للحصول على مزيد من المعلومات."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ارتفعت درجة حرارة هاتفك بشدة، لذا تم إيقاف تشغيله لخفض درجة حرارته. يعمل هاتفك الآن بشكل طبيعي.\n\nقد ترتفع بشدة درجة حرارة هاتفك إذا:\n • استخدمت تطبيقات كثيفة الاستخدام لموارد الجهاز (مثل الألعاب أو الفيديو أو تطبيقات التنقل)\n • نزَّلت أو حمَّلت ملفات كبيرة الحجم\n • استخدمت هاتفك وسط أجواء مرتفعة الحرارة"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"الاطّلاع على خطوات العناية"</string> <string name="high_temp_title" msgid="2218333576838496100">"تزداد درجة حرارة الهاتف"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"يتم تقييد عمل بعض الميزات إلى أن تنخفض درجة حرارة الهاتف"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"يتم تقييد عمل بعض الميزات إلى أن تنخفض درجة حرارة الهاتف.\nانقر للحصول على مزيد من المعلومات."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"سيحاول الهاتف تخفيض درجة حرارته تلقائيًا. سيظل بإمكانك استخدام هاتفك، ولكن قد يعمل بشكل أبطأ.\n\nبعد أن تنخفض درجة حرارة الهاتف، سيستعيد سرعته المعتادة."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"الاطّلاع على خطوات العناية"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"فصل الشاحن"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"هناك مشكلة في شحن هذا الجهاز. يُرجى فصل محوِّل الطاقة بحرص لأن الكابل قد يكون ساخنًا."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"الاطّلاع على خطوات العناية"</string> diff --git a/packages/SystemUI/res/values-ar/strings_tv.xml b/packages/SystemUI/res/values-ar/strings_tv.xml index 76403ab1a4ee..c29d804f841f 100644 --- a/packages/SystemUI/res/values-ar/strings_tv.xml +++ b/packages/SystemUI/res/values-ar/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"نافذة ضمن النافذة"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ليس هناك عنوان للبرنامج)"</string> - <string name="pip_close" msgid="5775212044472849930">"إغلاق PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ملء الشاشة"</string> <string name="mic_active" msgid="5766614241012047024">"الميكروفون نشط"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"تمكن %1$s من الوصول إلى الميكروفون الخاص بك."</string> </resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index d750bc969aa7..0345af07cd91 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ছেটিংসমূহৰ ক্ৰম সম্পাদনা কৰক।"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g>ৰ পৃষ্ঠা <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"লক স্ক্ৰীণ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"বিস্তাৰ কৰক"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"সৰু কৰক"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"বন্ধ কৰক"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ছেটিংসমূহ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"অগ্ৰাহ্য কৰিবলৈ তললৈ টানক"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"মেনু"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> চিত্ৰৰ ভিতৰৰ চিত্ৰত আছে"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"আপুনি যদি <xliff:g id="NAME">%s</xliff:g> সুবিধাটো ব্যৱহাৰ কৰিব নোখোজে, তেন্তে ছেটিংসমূহ খুলিবলৈ টিপক আৰু তালৈ গৈ ইয়াক অফ কৰক।"</string> - <string name="pip_play" msgid="333995977693142810">"প্লে কৰক"</string> - <string name="pip_pause" msgid="1139598607050555845">"পজ কৰক"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"পৰৱৰ্তী মিডিয়ালৈ যাওক"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"আগৰটো মিডিয়ালৈ যাওক"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"আকাৰ সলনি কৰক"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"আপোনাৰ ফ\'নটো গৰম হোৱাৰ কাৰণে অফ কৰা হৈছিল"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"আপোনাৰ ফ\'নটো এতিয়া স্বাভাৱিকভাৱে চলি আছে"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"আপোনাৰ ফ’নটো এতিয়া স্বাভাৱিকভাৱে চলি আছে।\nঅধিক তথ্যৰ বাবে টিপক"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"আপোনাৰ ফ\'নটো অত্যধিক গৰম হোৱাৰ বাবে ইয়াক ঠাণ্ডা কৰিবলৈ অফ কৰা হৈছিল। আপোনাৰ ফ\'নটো এতিয়া স্বাভাৱিকভাৱে চলি আছে।\n\nআপোনাৰ ফ\'নটো গৰম হ\'ব পাৰে, যদিহে আপুনি:\n • ফ\'নটোৰ হাৰ্ডৱেৰ অত্যধিক মাত্ৰাত ব্যৱহাৰ কৰা এপসমূহ চলালে (যেনে, ভিডিঅ\' গেইম, ভিডিঅ\', দিক্-নিৰ্দেশনা এপসমূহ)\n • খুউব ডাঙৰ আকাৰৰ ফাইল আপল\'ড বা ডাউনল’ড কৰিলে\n • আপোনাৰ ফ\'নটো উচ্চ তাপমাত্ৰাৰ পৰিৱেশত ব্যৱহাৰ কৰিলে"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"যত্ন লোৱাৰ পদক্ষেপসমূহ চাওক"</string> <string name="high_temp_title" msgid="2218333576838496100">"ফ\'নটো গৰম হ\'বলৈ ধৰিছে"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ফ\'নটো ঠাণ্ডা হৈ থকা সময়ত কিছুমান সুবিধা উপলব্ধ নহ’ব"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ফ’নটো ঠাণ্ডা হৈ থকাৰ সময়ত কিছুমান সুবিধা উপলব্ধ নহয়।\nঅধিক তথ্যৰ বাবে টিপক"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"আপোনাৰ ফ\'নটোৱে নিজে নিজে ঠাণ্ডা হ\'বলৈ স্বয়ংক্ৰিয়ভাৱে চেষ্টা কৰিব। আপুনি ফ\'নটো ব্যৱহাৰ কৰি থাকিব পাৰে কিন্তু ই লাহে লাহে চলিব পাৰে।\n\nফ\'নটো সম্পূৰ্ণভাৱে ঠাণ্ডা হোৱাৰ পিছত ই আগৰ নিচিনাকৈয়েই চলিব।"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"যত্ন লোৱাৰ পদক্ষেপসমূহ চাওক"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"চ্চার্জাৰ আনপ্লাগ কৰক"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"এই ডিভাইচটো চ্চার্জ কৰোঁতে কিবা সমস্যা হৈছে। পাৱাৰ এডাপ্টাৰটো আনপ্লাগ কৰক, কেব’লডাল গৰম হ’ব পাৰে গতিকে সাবধান হ’ব।"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"যত্ন লোৱাৰ পদক্ষেপসমূহ চাওক"</string> diff --git a/packages/SystemUI/res/values-as/strings_tv.xml b/packages/SystemUI/res/values-as/strings_tv.xml index 2076c99bf901..1db8f2297cc3 100644 --- a/packages/SystemUI/res/values-as/strings_tv.xml +++ b/packages/SystemUI/res/values-as/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"চিত্ৰৰ ভিতৰত চিত্ৰ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(শিৰোনামবিহীন কাৰ্যক্ৰম)"</string> - <string name="pip_close" msgid="5775212044472849930">"পিপ বন্ধ কৰক"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"সম্পূৰ্ণ স্ক্ৰীণ"</string> <string name="mic_active" msgid="5766614241012047024">"মাইক্ৰ’ফ’ন সক্ৰিয় কৰা আছে"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$sএ আপোনাৰ মাইক্ৰ’ফ’ন এক্সেছ কৰিছে"</string> </resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 59c9ba6b5f7c..d0025306d203 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Ayarların sıralanmasını redaktə edin."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> səhifədən <xliff:g id="ID_1">%1$d</xliff:g> səhifə"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ekran kilidi"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Genişləndirin"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Kiçildin"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Bağlayın"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ayarlar"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Rədd etmək üçün aşağı çəkin"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menyu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> şəkil içində şəkildədir"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> tətbiqinin bu funksiyadan istifadə etməyini istəmirsinizsə, ayarları açmaq və deaktiv etmək üçün klikləyin."</string> - <string name="pip_play" msgid="333995977693142810">"Oxudun"</string> - <string name="pip_pause" msgid="1139598607050555845">"Fasilə verin"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Növbətiyə keçin"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Əvvəlkinə keçin"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ölçüsünü dəyişin"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"İstiliyə görə telefon söndü"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon indi normal işləyir"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonunuz indi normal işləyir.\nƏtraflı məlumat üçün toxunun"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon çox isti idi və soyumaq üçün söndü. Hazırda telefon normal işləyir.\n\n Telefon bu hallarda çox isti ola bilər:\n • Çox resurslu tətbiq istifadə etsəniz (oyun, video və ya naviqasiya tətbiqi kimi)\n • Böyük həcmli fayl endirsəniz və ya yükləsəniz\n • Telefonu yüksək temperaturda istifadə etsəniz"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ehtiyat tədbiri mərhələlərinə baxın"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon qızmağa başlayır"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Telefon soyuyana kimi bəzi funksiyalar məhdudlaşdırılır"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Telefon soyuyana kimi bəzi funksiyalar məhdudlaşdırılır.\nƏtraflı məlumat üçün toxunun"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonunuz avtomatik olaraq soyumağa başlayacaq. Telefon istifadəsinə davam edə bilərsiniz, lakin sürəti yavaşlaya bilər.\n\nTelefonunuz soyuduqdan sonra normal işləyəcək."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ehtiyat tədbiri mərhələlərinə baxın"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Adapteri cərəyandan ayırın"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Bu cihazın batareya yığmasında problem var. Adapteri cərəyandan ayırın. Ehtiyatlı olun, kabel isti ola bilər."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ehtiyat tədbiri mərhələlərinə baxın"</string> diff --git a/packages/SystemUI/res/values-az/strings_tv.xml b/packages/SystemUI/res/values-az/strings_tv.xml index e4e8880df847..d690c642488f 100644 --- a/packages/SystemUI/res/values-az/strings_tv.xml +++ b/packages/SystemUI/res/values-az/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Şəkil-içində-Şəkil"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Başlıqsız proqram)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP bağlayın"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Tam ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon Aktivdir"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s mikrofona daxil olub"</string> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 8cf7d0bdd008..5cca958bbe96 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Izmeni redosled podešavanja."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>. strana od <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Zaključan ekran"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Proširi"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Umanji"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zatvori"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Podešavanja"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Prevucite nadole da biste odbili"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meni"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> je slika u slici"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ako ne želite da <xliff:g id="NAME">%s</xliff:g> koristi ovu funkciju, dodirnite da biste otvorili podešavanja i isključili je."</string> - <string name="pip_play" msgid="333995977693142810">"Pusti"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pauziraj"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Pređi na sledeće"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Pređi na prethodno"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Promenite veličinu"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon se isključio zbog toplote"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon sada normalno radi"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon sada normalno radi.\nDodirnite za više informacija"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon je bio prevruć, pa se isključio da se ohladi. Sada radi normalno.\n\nTelefon može previše da se ugreje ako:\n • Koristite aplikacije koje zahtevaju puno resursa (npr. video igre, video ili aplikacije za navigaciju)\n • Preuzimate/otpremate velike datoteke\n • Koristite telefon na visokoj temperaturi"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Pogledajte upozorenja"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon se zagrejao"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Neke funkcije su ograničene dok se telefon ne ohladi"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Neke funkcije su ograničene dok se telefon ne ohladi.\nDodirnite za više informacija"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon će automatski pokušati da se ohladi. I dalje ćete moći da koristite telefon, ali će sporije reagovati.\n\nKada se telefon ohladi, normalno će raditi."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Pogledajte upozorenja"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Isključite punjač iz napajanja"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Došlo je do problema sa punjenjem ovog uređaja. Isključite adapter iz napajanja i budite pažljivi jer kabl može da bude topao."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Pogledajte upozorenja"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml index 4e2d610da4c5..d045ceaa4fca 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Slika u slici"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program bez naslova)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zatvori PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Ceo ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon je aktivan"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikacija %1$s je pristupila mikrofonu"</string> </resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 805fe3ac4288..956ef477c927 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Змяніць парадак налад."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Старонка <xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Экран блакіроўкі"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Разгарнуць"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Згарнуць"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Закрыць"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Налады"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Перацягніце ўніз, каб адхіліць"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Меню"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> з’яўляецца відарысам у відарысе"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Калі вы не хочаце, каб праграма <xliff:g id="NAME">%s</xliff:g> выкарыстоўвала гэту функцыю, дакраніцеся, каб адкрыць налады і адключыць яе."</string> - <string name="pip_play" msgid="333995977693142810">"Прайграць"</string> - <string name="pip_pause" msgid="1139598607050555845">"Прыпыніць"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Перайсці да наступнага"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Перайсці да папярэдняга"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Змяніць памер"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"З-за перагрэву тэл. выключыўся"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Тэлефон працуе нармальна"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ваш тэлефон працуе нармальна.\nНацісніце, каб даведацца больш"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Ваш тэлефон пераграваўся, таму ён выключыўся, каб астыць. Зараз тэлефон працуе нармальна.\n\nТэлефон можа перагравацца пры:\n • Выкарыстанні рэсурсаёмістых праграм (напрыклад, гульняў, відэа або праграм навігацыі)\n • Спампоўцы або запампоўцы вялікіх файлаў\n • Выкарыстанні тэлефона пры высокіх тэмпературах"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Глядзець паэтапную дапамогу"</string> <string name="high_temp_title" msgid="2218333576838496100">"Тэлефон награваецца"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Некаторыя функцыі абмежаваны, пакуль тэлефон астывае"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Некаторыя функцыі абмежаваны, пакуль тэлефон не астыне.\nНацісніце, каб даведацца больш"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ваш тэлефон аўтаматычна паспрабуе астыць. Вы можаце па-ранейшаму карыстацца сваім тэлефонам, але ён можа працаваць больш павольна.\n\nПасля таго як ваш тэлефон астыне, ён будзе працаваць у звычайным рэжыме."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Глядзець паэтапную дапамогу"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Адключыце зарадную прыладу"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Узнікла праблема з зарадкай гэтай прылады. Адключыце адаптар сілкавання і праверце, ці не нагрэўся кабель."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Глядзець паэтапную дапамогу"</string> diff --git a/packages/SystemUI/res/values-be/strings_tv.xml b/packages/SystemUI/res/values-be/strings_tv.xml index c75a49236e04..37f925e1fae1 100644 --- a/packages/SystemUI/res/values-be/strings_tv.xml +++ b/packages/SystemUI/res/values-be/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Відарыс у відарысе"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Праграма без назвы)"</string> - <string name="pip_close" msgid="5775212044472849930">"Закрыць PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Ва ўвесь экран"</string> <string name="mic_active" msgid="5766614241012047024">"Мікрафон актыўны"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Праграма \"%1$s\" атрымала доступ да мікрафона"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 6b99aeb7ca7b..d0836e4509fe 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Редактиране на подредбата на настройките."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Страница <xliff:g id="ID_1">%1$d</xliff:g> от <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Заключен екран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Разгъване"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Намаляване"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Затваряне"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Настройки"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Преместете надолу с плъзгане, за да отхвърлите"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Меню"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> е в режима „Картина в картината“"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ако не искате <xliff:g id="NAME">%s</xliff:g> да използва тази функция, докоснете, за да отворите настройките, и я изключете."</string> - <string name="pip_play" msgid="333995977693142810">"Пускане"</string> - <string name="pip_pause" msgid="1139598607050555845">"Поставяне на пауза"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Към следващия елемент"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Към предишния елемент"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Преоразмеряване"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Тел. се изкл. поради загряване"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Телефонът ви вече работи нормално"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Телефонът ви вече работи нормално.\nДокоснете за още информация"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефонът ви бе твърде горещ, затова се изключи с цел охлаждане. Вече работи нормално.\n\nТелефонът ви може да стане твърде горещ, ако:\n • използвате приложения, които ползват голям обем ресурси (като например игри, видеосъдържание или приложения за навигация);\n • изтегляте или качвате големи файлове;\n • използвате устройството си при високи температури."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Вижте стъпките, които да предприемете"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефонът загрява"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Някои функции са ограничени, докато телефонът се охлажда"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Някои функции са ограничени, докато телефонът се охлажда.\nДокоснете за още информация"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Телефонът ви автоматично ще направи опит за охлаждане. Пак можете да го използвате, но той може да работи по-бавно.\n\nСлед като се охлади, ще работи нормално."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Вижте стъпките, които да предприемете"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Изключете зарядното устройство"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"При зареждането на това устройство възникна проблем. Изключете захранващия адаптер и внимавайте, тъй като кабелът може да е топъл."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Вижте стъпките, които да предприемете"</string> diff --git a/packages/SystemUI/res/values-bg/strings_tv.xml b/packages/SystemUI/res/values-bg/strings_tv.xml index 6d2b842117f1..f322079f77a1 100644 --- a/packages/SystemUI/res/values-bg/strings_tv.xml +++ b/packages/SystemUI/res/values-bg/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Картина в картината"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Програма без заглавие)"</string> - <string name="pip_close" msgid="5775212044472849930">"Затваряне на PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Цял екран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофонът е активен"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s осъществи достъп до микрофона ви"</string> </resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 3e0adea9262a..a584955b534d 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -76,7 +76,7 @@ <string name="learn_more" msgid="4690632085667273811">"আরও জানুন"</string> <string name="compat_mode_on" msgid="4963711187149440884">"স্ক্রীণ পূরণ করতে জুম করুন"</string> <string name="compat_mode_off" msgid="7682459748279487945">"ফুল স্ক্রিন করুন"</string> - <string name="global_action_screenshot" msgid="2760267567509131654">"স্ক্রিনশট"</string> + <string name="global_action_screenshot" msgid="2760267567509131654">"স্ক্রিনশট নিন"</string> <string name="remote_input_image_insertion_text" msgid="4850791636452521123">"একটি ছবি পাঠানো হয়েছে"</string> <string name="screenshot_saving_ticker" msgid="6519186952674544916">"স্ক্রিনশট সেভ করা হচ্ছে..."</string> <string name="screenshot_saving_title" msgid="2298349784913287333">"স্ক্রিনশট সেভ করা হচ্ছে..."</string> @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ক্রম বা সেটিংস সম্পাদনা করুন৷"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g>টির মধ্যে <xliff:g id="ID_1">%1$d</xliff:g> নং পৃষ্ঠা"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"লক স্ক্রিন"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"বড় করুন"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ছোটো করুন"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"বন্ধ করুন"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"সেটিংস"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"খারিজ করতে নিচের দিকে টেনে আনুন"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"মেনু"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"ছবির-মধ্যে-ছবি তে <xliff:g id="NAME">%s</xliff:g> আছেন"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> কে এই বৈশিষ্ট্যটি ব্যবহার করতে দিতে না চাইলে ট্যাপ করে সেটিংসে গিয়ে সেটি বন্ধ করে দিন।"</string> - <string name="pip_play" msgid="333995977693142810">"চালান"</string> - <string name="pip_pause" msgid="1139598607050555845">"বিরাম দিন"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"এগিয়ে যাওয়ার জন্য এড়িয়ে যান"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"পিছনে যাওয়ার জন্য এড়িয়ে যান"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"রিসাইজ করুন"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"আপনার ফোন গরম হওয়ার জন্য বন্ধ হয়ে গেছে"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"আপনার ফোন এখন ঠিক-ঠাক চলছে"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"আপনার ফোন এখন ভালভাবে কাজ করছে।\nআরও তথ্যের জন্য ট্যাপ করুন"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"আপনার ফোন খুব বেশি গরম হয়েছিল বলে ঠাণ্ডা হওয়ার জন্য বন্ধ হয়ে গেছে। আপনার ফোন ঠিক-ঠাক ভাবে চলছে না।\n\nআপনার ফোন খুব বেশি গরম হয়ে যাবে যদি আপনি:\n •এমন অ্যাপ ব্যবহার করলে যেটি আপনার ডিভাইসের রিসোর্স বেশি ব্যবহার করে (যেমন গেমিং, ভিডিও বা নেভিগেশন অ্যাপ)\n • বড় ফাইল ডাউনলোড বা আপলোড করলে\n • বেশি তাপমাত্রায় আপনার ফোন ব্যবহার করলে"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ডিভাইস রক্ষণাবেক্ষণের ধাপগুলি দেখুন"</string> <string name="high_temp_title" msgid="2218333576838496100">"ফোনটি গরম হচ্ছে"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ফোনটি ঠাণ্ডা হওয়ার সময় কিছু বৈশিষ্ট্য সীমিত হতে পারে"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ফোন ঠাণ্ডা না হওয়া পর্যন্ত কিছু ফিচার কাজ করে না।\nআরও তথ্যের জন্য ট্যাপ করুন"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"আপনার ফোনটি নিজে থেকেই ঠাণ্ডা হওয়ার চেষ্টা করবে৷ আপনি তবুও আপনার ফোন ব্যবহার করতে পারেন, কিন্তু এটি একটু ধীরে চলতে পারে৷\n\nআপনার ফোনটি পুরোপুরি ঠাণ্ডা হয়ে গেলে এটি স্বাভাবিকভাবে চলবে৷"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ডিভাইস রক্ষণাবেক্ষণের ধাপগুলি দেখুন"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"চার্জার আনপ্লাগ করুন"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"এই ডিভাইস চার্জ করার সময় সমস্যা হয়েছে। চার্জিং কেবলটি হয়ত গরম হয়ে গেছে, পাওয়ার অ্যাডাপ্টারটি আনপ্লাগ করুন।"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"কী করতে হবে ধাপে ধাপে দেখুন"</string> diff --git a/packages/SystemUI/res/values-bn/strings_tv.xml b/packages/SystemUI/res/values-bn/strings_tv.xml index 795314c4b15c..56ca0233ae45 100644 --- a/packages/SystemUI/res/values-bn/strings_tv.xml +++ b/packages/SystemUI/res/values-bn/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ছবির-মধ্যে-ছবি"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(শিরোনামহীন প্রোগ্রাম)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP বন্ধ করুন"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"পূর্ণ স্ক্রিন"</string> <string name="mic_active" msgid="5766614241012047024">"মাইক্রোফোন চালু আছে"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s আপনার ডিভাইসের মাইক্রোফোন অ্যাক্সেস করেছে"</string> </resources> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index d9cfd9d5bc62..4c872d22054f 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Urediti raspored postavki."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Stranica <xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Zaključavanje ekrana"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Proširi"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimiziraj"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zatvori"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Postavke"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Povucite prema dolje da odbacite"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meni"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> je u načinu priakza Slika u slici"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ako ne želite da <xliff:g id="NAME">%s</xliff:g> koristi ovu funkciju, dodirnite da otvorite postavke i isključite je."</string> - <string name="pip_play" msgid="333995977693142810">"Reproduciraj"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pauziraj"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Preskoči na sljedeći"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Preskoči na prethodni"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Promjena veličine"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon se isključio zbog pregrijavanja"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Vaš telefon sada radi normalno"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Vaš telefon sada radi normalno.\nDodirnite za više informacija"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Vaš telefon se pregrijao, pa se isključio da se ohladi. Telefon sada radi normalno.\n\nTelefon se može pregrijati ako:\n • Koristite aplikacije koje troše puno resursa (kao što su aplikacije za igranje, videozapise ili navigaciju)\n • Preuzimate ili otpremate velike fajlove\n • Koristite telefon na visokim temperaturama"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Pogledajte korake za zaštitu"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon se pregrijava"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Neke funkcije su ograničene dok se telefon hladi"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Neke funkcije su ograničene dok se telefon hladi.\nDodirnite za više informacija"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Vaš telefon će se automatski pokušati ohladiti. I dalje možete koristi telefon, ali će možda raditi sporije.\n\nNakon što se ohladi, telefon će normalno raditi."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Pogledajte korake za zaštitu"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Isključite punjač"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Došlo je do problema prilikom punjenja ovog uređaja. Pažljivo isključite adapter za napajanje jer je moguće da je kabl vruć."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Prikaz koraka za zaštitu"</string> diff --git a/packages/SystemUI/res/values-bs/strings_tv.xml b/packages/SystemUI/res/values-bs/strings_tv.xml index 1dd803516841..acd93d657bac 100644 --- a/packages/SystemUI/res/values-bs/strings_tv.xml +++ b/packages/SystemUI/res/values-bs/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Slika u slici"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program bez naslova)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zatvori PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Cijeli ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon je aktivan"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikacija %1$s je pristupila vašem mikrofonu"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 4c2cd6df4c3c..7267c31b1f36 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -21,7 +21,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"IU del sistema"</string> <string name="status_bar_clear_all_button" msgid="2491321682873657397">"Esborra"</string> - <string name="status_bar_no_notifications_title" msgid="7812479124981107507">"Cap notificació"</string> + <string name="status_bar_no_notifications_title" msgid="7812479124981107507">"No hi ha cap notificació"</string> <string name="status_bar_ongoing_events_title" msgid="3986169317496615446">"Continu"</string> <string name="status_bar_latest_events_title" msgid="202755896454005436">"Notificacions"</string> <string name="battery_low_title" msgid="6891106956328275225">"És possible que la bateria s\'esgoti aviat"</string> @@ -517,7 +517,7 @@ <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"Esborra totes les notificacions silencioses"</string> <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"Notificacions pausades pel mode No molestis"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"Comença ara"</string> - <string name="empty_shade_text" msgid="8935967157319717412">"Cap notificació"</string> + <string name="empty_shade_text" msgid="8935967157319717412">"No hi ha cap notificació"</string> <string name="profile_owned_footer" msgid="2756770645766113964">"El perfil es pot supervisar"</string> <string name="vpn_footer" msgid="3457155078010607471">"És possible que la xarxa estigui supervisada."</string> <string name="branded_vpn_footer" msgid="816930186313188514">"És possible que la xarxa estigui supervisada"</string> @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edita l\'ordre de la configuració."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Pàgina <xliff:g id="ID_1">%1$d</xliff:g> (<xliff:g id="ID_2">%2$d</xliff:g> en total)"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Pantalla de bloqueig"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Desplega"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimitza"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Tanca"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Configuració"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arrossega cap avall per ignorar-ho"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menú"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> està en pantalla en pantalla"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Si no vols que <xliff:g id="NAME">%s</xliff:g> utilitzi aquesta funció, toca per obrir la configuració i desactiva-la."</string> - <string name="pip_play" msgid="333995977693142810">"Reprodueix"</string> - <string name="pip_pause" msgid="1139598607050555845">"Posa en pausa"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Ves al següent"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Torna a l\'anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Canvia la mida"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telèfon apagat per la calor"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Ara el telèfon funciona de manera normal"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ara el telèfon funciona correctament.\nToca per obtenir més informació"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"El telèfon s\'havia sobreescalfat i s\'ha apagat per refredar-se. Ara funciona amb normalitat.\n\nEs pot sobreescalfar si:\n • utilitzes aplicacions que consumeixen molts recursos (com ara, videojocs, vídeos o aplicacions de navegació);\n • baixes o penges fitxers grans;\n • l\'utilitzes amb temperatures altes."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Mostra els passos de manteniment"</string> <string name="high_temp_title" msgid="2218333576838496100">"El telèfon s\'està escalfant"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Algunes funcions estaran limitades mentre el telèfon es refreda"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Algunes funcions estan limitades mentre el telèfon es refreda.\nToca per obtenir més informació"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"El telèfon provarà de refredar-se automàticament. Podràs continuar utilitzant-lo, però és possible que funcioni més lentament.\n\nUn cop s\'hagi refredat, funcionarà amb normalitat."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Mostra els passos de manteniment"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconnecta el carregador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"No es pot carregar el dispositiu. Desconnecta l\'adaptador de corrent amb compte, ja que el cable podria estar calent."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Mostra els pasos de manteniment"</string> diff --git a/packages/SystemUI/res/values-ca/strings_tv.xml b/packages/SystemUI/res/values-ca/strings_tv.xml index 44cc9410ed0b..c41d5714e60e 100644 --- a/packages/SystemUI/res/values-ca/strings_tv.xml +++ b/packages/SystemUI/res/values-ca/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pantalla en pantalla"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programa sense títol)"</string> - <string name="pip_close" msgid="5775212044472849930">"Tanca PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pantalla completa"</string> <string name="mic_active" msgid="5766614241012047024">"Micròfon actiu"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ha accedit al teu micròfon"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 2dd314dffdfe..29b5281f689f 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Upravit pořadí nastavení."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Stránka <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Obrazovka uzamčení"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Rozbalit"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimalizovat"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zavřít"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Nastavení"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Nápovědu zavřete přetažením dolů"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Nabídka"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"Aplikace <xliff:g id="NAME">%s</xliff:g> je v režimu obraz v obraze"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Pokud nechcete, aby aplikace <xliff:g id="NAME">%s</xliff:g> tuto funkci používala, klepnutím otevřete nastavení a funkci vypněte."</string> - <string name="pip_play" msgid="333995977693142810">"Přehrát"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pozastavit"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Přeskočit na další"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Přeskočit na předchozí"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Změnit velikost"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon se vypnul z důvodu zahřátí"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Nyní telefon funguje jako obvykle."</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Nyní telefon funguje jako obvykle.\nKlepnutím zobrazíte další informace"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon byl příliš zahřátý, proto se vypnul, aby vychladl. Nyní telefon funguje jako obvykle.\n\nTelefon se může příliš zahřát v těchto případech:\n • používání náročných aplikací (např. her, videí nebo navigace),\n • stahování nebo nahrávání velkých souborů,\n • používání telefonu při vysokých teplotách."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Zobrazit pokyny, co dělat"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon se zahřívá"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Některé funkce jsou při chladnutí omezeny"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Některé funkce jsou při chladnutí telefonu omezeny.\nKlepnutím zobrazíte další informace"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon se automaticky pokusí vychladnout. Lze jej nadále používat, ale může být pomalejší.\n\nAž telefon vychladne, bude fungovat normálně."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Zobrazit pokyny, co dělat"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Odpojte nabíječku"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Při nabíjení zařízení došlo k problému. Odpojte napájecí adaptér (dávejte pozor, kabel může být horký)."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Zobrazit pokyny, co dělat"</string> diff --git a/packages/SystemUI/res/values-cs/strings_tv.xml b/packages/SystemUI/res/values-cs/strings_tv.xml index 0494bc12b469..2d95d46a078f 100644 --- a/packages/SystemUI/res/values-cs/strings_tv.xml +++ b/packages/SystemUI/res/values-cs/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Obraz v obraze"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Bez názvu)"</string> - <string name="pip_close" msgid="5775212044472849930">"Ukončit obraz v obraze (PIP)"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Celá obrazovka"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon je aktivní"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikace %1$s použila mikrofon"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 701c0d6f2b78..dff770d49e28 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Rediger rækkefølgen af indstillinger."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Side <xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Låseskærm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Udvid"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimer"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Luk"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Indstillinger"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Træk ned for at fjerne"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> vises som integreret billede"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Hvis du ikke ønsker, at <xliff:g id="NAME">%s</xliff:g> skal benytte denne funktion, kan du åbne indstillingerne og deaktivere den."</string> - <string name="pip_play" msgid="333995977693142810">"Afspil"</string> - <string name="pip_pause" msgid="1139598607050555845">"Sæt på pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Gå videre til næste"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Gå til forrige"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Rediger størrelse"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefonen slukkede pga. varme"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Din telefon kører nu normalt"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Din telefon kører nu normalt.\nTryk for at få flere oplysninger"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Din telefon var blevet for varm, så den slukkede for at køle ned. Din telefon kører nu igen normalt. \n\nDin telefon kan blive for varm, hvis du:\n • Bruger ressourcekrævende apps (f.eks. spil, video eller navigation)\n • Downloader eller uploader store filer\n • Bruger din telefon i varme omgivelser"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Se håndteringsvejledning"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefonen er ved at blive varm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Nogle funktioner er begrænsede, mens telefonen køler ned"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Nogle funktioner er begrænsede, mens telefonen køler ned.\nTryk for at få flere oplysninger"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Din telefon forsøger automatisk at køle ned. Du kan stadig bruge telefonen, men den kører muligvis langsommere.\n\nNår din telefon er kølet ned, fungerer den normalt igen."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Se håndteringsvejledning"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Frakobl opladeren"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Der er et problem med opladning af denne enhed. Frakobl strømadapteren, og vær forsigtig, da kablet kan være varmt."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Se vejledningen i pleje"</string> diff --git a/packages/SystemUI/res/values-da/strings_tv.xml b/packages/SystemUI/res/values-da/strings_tv.xml index 5b8bf6c9c2c4..f70427d90cd0 100644 --- a/packages/SystemUI/res/values-da/strings_tv.xml +++ b/packages/SystemUI/res/values-da/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Integreret billede"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program uden titel)"</string> - <string name="pip_close" msgid="5775212044472849930">"Luk integreret billede"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Fuld skærm"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofonen er slået til"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s fik adgang til din mikrofon"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index c80b6e0840bf..52275fcd637e 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Reihenfolge der Einstellungen bearbeiten."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Seite <xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Sperrbildschirm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Maximieren"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimieren"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Schließen"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Einstellungen"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Zum Verwerfen nach unten ziehen"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menü"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ist in Bild im Bild"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Wenn du nicht möchtest, dass <xliff:g id="NAME">%s</xliff:g> diese Funktion verwendet, tippe, um die Einstellungen zu öffnen und die Funktion zu deaktivieren."</string> - <string name="pip_play" msgid="333995977693142810">"Wiedergeben"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausieren"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Vorwärts springen"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Rückwärts springen"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Größe anpassen"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Ausgeschaltet, da zu heiß"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Dein Smartphone funktioniert jetzt wieder normal"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Dein Smartphone funktioniert jetzt wieder normal.\nFür mehr Informationen tippen."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Dein Smartphone war zu heiß und wurde zum Abkühlen ausgeschaltet. Nun funktioniert es wieder normal.\n\nMögliche Ursachen:\n • Verwendung ressourcenintensiver Apps (z. B. Spiele-, Video- oder Navigations-Apps)\n • Download oder Upload großer Dateien \n • Verwendung des Smartphones bei hohen Temperaturen"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Schritte zur Abkühlung des Geräts ansehen"</string> <string name="high_temp_title" msgid="2218333576838496100">"Smartphone wird warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Einige Funktionen sind während der Abkühlphase des Smartphones eingeschränkt"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Einige Funktionen sind während der Abkühlphase des Smartphones eingeschränkt.\nFür mehr Informationen tippen."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Dein Smartphone kühlt sich automatisch ab. Du kannst dein Smartphone weiterhin nutzen, aber es reagiert möglicherweise langsamer.\n\nSobald dein Smartphone abgekühlt ist, funktioniert es wieder normal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Schritte zur Abkühlung des Geräts ansehen"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Ladegerät vom Stromnetz trennen"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Beim Laden dieses Geräts ist ein Problem aufgetreten. Trenne das Netzteil vom Stromnetz. Sei dabei vorsichtig, denn das Netzteil oder das Kabel könnte heiß sein."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Schritte zur Fehlerbehebung ansehen"</string> diff --git a/packages/SystemUI/res/values-de/strings_tv.xml b/packages/SystemUI/res/values-de/strings_tv.xml index ba2052840c10..b947b2ce1336 100644 --- a/packages/SystemUI/res/values-de/strings_tv.xml +++ b/packages/SystemUI/res/values-de/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Bild im Bild"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Kein Sendungsname gefunden)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP schließen"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Vollbild"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon aktiv"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s hat auf dein Mikrofon zugegriffen"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 0002f607c354..bf4c61994c29 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Επεξεργασία σειράς ρυθμίσεων."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Σελίδα <xliff:g id="ID_1">%1$d</xliff:g> από <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Οθόνη κλειδώματος"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Ανάπτυξη"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Ελαχιστοποίηση"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Κλείσιμο"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ρυθμίσεις"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Σύρετε προς τα κάτω για παράβλεψη"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Μενού"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"Η λειτουργία picture-in-picture είναι ενεργή σε <xliff:g id="NAME">%s</xliff:g>."</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Εάν δεν θέλετε να χρησιμοποιείται αυτή η λειτουργία από την εφαρμογή <xliff:g id="NAME">%s</xliff:g>, πατήστε για να ανοίξετε τις ρυθμίσεις και απενεργοποιήστε την."</string> - <string name="pip_play" msgid="333995977693142810">"Αναπαραγωγή"</string> - <string name="pip_pause" msgid="1139598607050555845">"Παύση"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Μετάβαση στο επόμενο"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Μετάβαση στο προηγούμενο"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Αλλαγή μεγέθους"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Το τηλέφωνο απεν. λόγω ζέστης"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Το τηλέφωνο λειτουργεί πλέον κανονικά"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Το τηλέφωνο λειτουργεί πλέον κανονικά.\nΠατήστε για περισσότερες πληροφορίες."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Η θερμοκρασία του τηλεφώνου είναι πολύ υψηλή και απενεργοποιήθηκε για να κρυώσει. Πλέον, λειτουργεί κανονικά.\n\nΗ θερμοκρασία ενδέχεται να ανέβει κατά τη:\n • Χρήση εφαρμογών υψηλής κατανάλωσης πόρων (όπως gaming, βίντεο ή περιήγησης)\n • Λήψη/μεταφόρτωση μεγάλων αρχείων\n • Χρήση σε υψηλές θερμοκρασίες"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Δείτε βήματα αντιμετώπισης."</string> <string name="high_temp_title" msgid="2218333576838496100">"Αύξηση θερμοκρασίας τηλεφώνου"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Ορισμένες λειτουργίες περιορίζονται κατά τη μείωση της θερμοκρασίας"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Ορισμένες λειτουργίες περιορίζονται κατά τη μείωση της θερμοκρασίας.\nΠατήστε για περισσότερες πληροφορίες."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Το τηλέφωνό σας θα προσπαθήσει να μειώσει αυτόματα τη θερμοκρασία. Μπορείτε να εξακολουθήσετε να το χρησιμοποιείτε, αλλά είναι πιθανό να λειτουργεί πιο αργά.\n\nΜόλις μειωθεί η θερμοκρασία του τηλεφώνου σας, θα λειτουργεί ξανά κανονικά."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Δείτε βήματα αντιμετώπισης."</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Αποσυνδέστε τον φορτιστή"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Υπάρχει κάποιο πρόβλημα με τη φόρτιση αυτής της συσκευής. Αποσυνδέστε τον μετασχηματιστή με προσοχή, λαμβάνοντας υπόψη ότι το καλώδιο μπορεί να είναι ζεστό."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Δείτε βήματα αντιμετώπισης"</string> diff --git a/packages/SystemUI/res/values-el/strings_tv.xml b/packages/SystemUI/res/values-el/strings_tv.xml index 5f93f3246f82..d03961366a2c 100644 --- a/packages/SystemUI/res/values-el/strings_tv.xml +++ b/packages/SystemUI/res/values-el/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Λειτουργία Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Δεν υπάρχει τίτλος προγράμματος)"</string> - <string name="pip_close" msgid="5775212044472849930">"Κλείσιμο PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Πλήρης οθόνη"</string> <string name="mic_active" msgid="5766614241012047024">"Ενεργό μικρόφωνο"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Πραγματοποιήθηκε πρόσβαση στο μικρόφωνό σας από το %1$s"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 83d769d47c88..acb811107463 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expand"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimise"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Close"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Settings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Drag down to dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string> - <string name="pip_play" msgid="333995977693142810">"Play"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Skip to next"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Skip to previous"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Your phone is now running normally"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Some features limited while phone cools down"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features are limited while phone cools down.\nTap for more info"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run more slowly.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adaptor, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings_tv.xml b/packages/SystemUI/res/values-en-rAU/strings_tv.xml index efbaa1c42e60..f81611fba4a5 100644 --- a/packages/SystemUI/res/values-en-rAU/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rAU/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(No title program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Close PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone active"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accessed your microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index 3d549baf3ebd..e3bad1f83a90 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expand"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimise"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Close"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Settings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Drag down to dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string> - <string name="pip_play" msgid="333995977693142810">"Play"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Skip to next"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Skip to previous"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Your phone is now running normally"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Some features limited while phone cools down"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features are limited while phone cools down.\nTap for more info"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run more slowly.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adaptor, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings_tv.xml b/packages/SystemUI/res/values-en-rCA/strings_tv.xml index efbaa1c42e60..f81611fba4a5 100644 --- a/packages/SystemUI/res/values-en-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rCA/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(No title program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Close PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone active"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accessed your microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 83d769d47c88..acb811107463 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expand"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimise"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Close"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Settings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Drag down to dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string> - <string name="pip_play" msgid="333995977693142810">"Play"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Skip to next"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Skip to previous"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Your phone is now running normally"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Some features limited while phone cools down"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features are limited while phone cools down.\nTap for more info"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run more slowly.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adaptor, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings_tv.xml b/packages/SystemUI/res/values-en-rGB/strings_tv.xml index efbaa1c42e60..f81611fba4a5 100644 --- a/packages/SystemUI/res/values-en-rGB/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rGB/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(No title program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Close PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone active"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accessed your microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 83d769d47c88..acb811107463 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expand"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimise"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Close"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Settings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Drag down to dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string> - <string name="pip_play" msgid="333995977693142810">"Play"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Skip to next"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Skip to previous"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Your phone is now running normally"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Some features limited while phone cools down"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features are limited while phone cools down.\nTap for more info"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run more slowly.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adaptor, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings_tv.xml b/packages/SystemUI/res/values-en-rIN/strings_tv.xml index efbaa1c42e60..f81611fba4a5 100644 --- a/packages/SystemUI/res/values-en-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rIN/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(No title program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Close PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone active"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accessed your microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 13c06f34be3d..25ec6c384157 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit order of settings."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expand"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimize"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Close"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Settings"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Drag down to dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string> - <string name="pip_play" msgid="333995977693142810">"Play"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Skip to next"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Skip to previous"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Phone turned off due to heat"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Your phone is now running normally"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Your phone is now running normally.\nTap for more info"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video, or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"See care steps"</string> <string name="high_temp_title" msgid="2218333576838496100">"Phone is getting warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Some features limited while phone cools down"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Some features limited while phone cools down.\nTap for more info"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"See care steps"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Unplug charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"There’s an issue charging this device. Unplug the power adapter, and take care as the cable may be warm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"See care steps"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings_tv.xml b/packages/SystemUI/res/values-en-rXC/strings_tv.xml index 1ca2385af9c4..88c5843b7c96 100644 --- a/packages/SystemUI/res/values-en-rXC/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rXC/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-Picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(No title program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Close PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone Active"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accessed your microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index a245b08fba13..01bed104a951 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editar orden de configuración"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Página <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Pantalla de bloqueo"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expandir"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Cerrar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Configuración"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arrastra hacia abajo para descartar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menú"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> está en modo de Pantalla en pantalla"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Si no quieres que <xliff:g id="NAME">%s</xliff:g> use esta función, presiona para abrir la configuración y desactivarla."</string> - <string name="pip_play" msgid="333995977693142810">"Reproducir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Siguiente"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Cambiar el tamaño"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"El teléfono se apagó por calor"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Tu teléfono ya funciona correctamente"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Tu teléfono ahora se ejecuta con normalidad.\nPresiona para obtener más información"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Tu teléfono estaba muy caliente y se apagó para enfriarse. Ya funciona correctamente.\n\nTu teléfono puede calentarse en estos casos:\n • Usas apps que consumen muchos recursos (como juegos, videos o navegación).\n • Subes o descargas archivos grandes.\n • Usas el teléfono en condiciones de temperatura alta."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ver pasos de mantenimiento"</string> <string name="high_temp_title" msgid="2218333576838496100">"El teléfono se está calentando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Se limitarán algunas funciones mientras se enfría el teléfono"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Algunas funciones se limitan durante el enfriamiento del teléfono.\nPresiona para obtener más información"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Tu teléfono intentará enfriarse automáticamente. Podrás usarlo, pero es posible que funcione más lento.\n\nUna vez que se haya enfriado, volverá a funcionar correctamente."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ver pasos de mantenimiento"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconectar cargador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"No se puede cargar el dispositivo. Desconecta el adaptador de la corriente con cuidado, ya que el cable podría estar caliente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver pasos de mantenimiento"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings_tv.xml b/packages/SystemUI/res/values-es-rUS/strings_tv.xml index 3921fd822e57..8e9e048b06f6 100644 --- a/packages/SystemUI/res/values-es-rUS/strings_tv.xml +++ b/packages/SystemUI/res/values-es-rUS/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pantalla en pantalla"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Sin título de programa)"</string> - <string name="pip_close" msgid="5775212044472849930">"Cerrar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pantalla completa"</string> <string name="mic_active" msgid="5766614241012047024">"Micrófono activado"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accedió al micrófono"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index d7ab19d359d9..67678d24a0a6 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Cambiar el orden de los ajustes."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Página <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Pantalla de bloqueo"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Mostrar"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Cerrar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ajustes"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arrastra hacia abajo para ignorar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menú"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> está en imagen en imagen"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Si no quieres que <xliff:g id="NAME">%s</xliff:g> utilice esta función, toca la notificación para abrir los ajustes y desactivarla."</string> - <string name="pip_play" msgid="333995977693142810">"Reproducir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Saltar al siguiente"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Volver al anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Cambiar tamaño"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Teléfono apagado por calor"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"El teléfono ahora funciona con normalidad"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"El teléfono ya funciona con normalidad.\nToca para ver más información"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"El teléfono se había calentado demasiado y se ha apagado para enfriarse. Ahora funciona con normalidad.\n\nPuede calentarse demasiado si:\n • Usas aplicaciones que consumen muchos recursos (p. ej., apps de juegos, vídeos o navegación)\n • Descargas o subes archivos grandes\n • Lo usas a altas temperaturas"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ver pasos de mantenimiento"</string> <string name="high_temp_title" msgid="2218333576838496100">"El teléfono se está calentando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Se limitan algunas funciones mientras el teléfono se enfría"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Se han limitado algunas funciones mientras el teléfono se enfría.\nToca para ver más información"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"El teléfono intentará enfriarse. Puedes seguir utilizándolo, pero es posible que funcione con mayor lentitud.\n\nUna vez que se haya enfriado, funcionará con normalidad."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ver pasos de mantenimiento"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconecta el cargador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"No se puede cargar el dispositivo. Desconecta el adaptador de corriente con cuidado, ya que el cable puede estar caliente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver pasos de mantenimiento"</string> diff --git a/packages/SystemUI/res/values-es/strings_tv.xml b/packages/SystemUI/res/values-es/strings_tv.xml index e18d9b6075bc..6a72a3d3a77e 100644 --- a/packages/SystemUI/res/values-es/strings_tv.xml +++ b/packages/SystemUI/res/values-es/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Imagen en imagen"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programa sin título)"</string> - <string name="pip_close" msgid="5775212044472849930">"Cerrar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pantalla completa"</string> <string name="mic_active" msgid="5766614241012047024">"Micrófono activado"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ha accedido a tu micrófono"</string> </resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index ca43ac0ef13a..a46fa490b4a8 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Muuda seadete järjestust."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Leht <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lukustuskuva"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Laiendamine"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimeeri"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Sule"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Seaded"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Loobumiseks lohistage alla"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menüü"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> on režiimis Pilt pildis"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Kui te ei soovi, et rakendus <xliff:g id="NAME">%s</xliff:g> seda funktsiooni kasutaks, puudutage seadete avamiseks ja lülitage see välja."</string> - <string name="pip_play" msgid="333995977693142810">"Esita"</string> - <string name="pip_pause" msgid="1139598607050555845">"Peata"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Järgmise juurde"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Eelmise juurde"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Suuruse muutmine"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Tel. lül. kuumuse tõttu välja"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon töötab nüüd tavapäraselt"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon töötab nüüd tavapäraselt.\nPuudutage lisateabe saamiseks."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon oli liiga kuum, seetõttu lülitus see jahtumiseks välja. Telefon töötab nüüd tavapäraselt.\n\nTelefon võib kuumaks minna:\n • ressursse koormavate rakenduste kasutamisel (nt mängu-, video- või navigatsioonirakendused)\n • suurte failide alla-/üleslaadimisel\n • telefoni kasutamisel kõrgel temperatuuril"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Vaadake hooldusjuhiseid"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon soojeneb"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Mõned funktsioonid on piiratud, kuni telefon jahtub"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Mõned funktsioonid on piiratud, kuni telefon jahtub.\nPuudutage lisateabe saamiseks."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Teie telefon proovib automaatselt maha jahtuda. Saate telefoni ikka kasutada, kuid see võib olla aeglasem.\n\nKui telefon on jahtunud, töötab see tavapäraselt."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Vaadake hooldusjuhiseid"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Eemaldage laadija vooluvõrgust"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Selle seadme laadimisega on probleem. Eemaldage toiteadapter ja olge ettevaatlik, sest kaabel võib olla soe."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Vaadake hooldusjuhiseid"</string> diff --git a/packages/SystemUI/res/values-et/strings_tv.xml b/packages/SystemUI/res/values-et/strings_tv.xml index f36d8ec89eed..61c14356809b 100644 --- a/packages/SystemUI/res/values-et/strings_tv.xml +++ b/packages/SystemUI/res/values-et/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pilt pildis"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programmi pealkiri puudub)"</string> - <string name="pip_close" msgid="5775212044472849930">"Sule PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Täisekraan"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon on aktiivne"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s pääses teie mikrofonile juurde"</string> </resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index ed5dc7cfca3f..19fc4f50d0d3 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editatu ezarpenen ordena."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> orria"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Pantaila blokeatua"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Zabaldu"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizatu"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Itxi"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ezarpenak"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Baztertzeko, arrastatu behera"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menua"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"Pantaila txiki gainjarrian dago <xliff:g id="NAME">%s</xliff:g>"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ez baduzu nahi <xliff:g id="NAME">%s</xliff:g> zerbitzuak eginbide hori erabiltzea, sakatu hau ezarpenak ireki eta aukera desaktibatzeko."</string> - <string name="pip_play" msgid="333995977693142810">"Erreproduzitu"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausatu"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Saltatu hurrengora"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Saltatu aurrekora"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Aldatu tamaina"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Beroegi egoteagatik itzali da"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Orain, ohiko moduan dabil telefonoa"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ohi bezala ari da funtzionatzen telefonoa orain.\nInformazio gehiago lortzeko, sakatu hau."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonoa gehiegi berotu da, eta itzali egin da tenperatura jaisteko. Orain, ohiko moduan dabil.\n\nBerotzearen zergati posibleak:\n • Baliabide asko behar dituzten aplikazioak erabiltzea (adib., jokoak, bideoak edo nabigazio-aplikazioak).\n • Fitxategi handiak deskargatu edo kargatzea.\n • Telefonoa giro beroetan erabiltzea."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ikusi zaintzeko urratsak"</string> <string name="high_temp_title" msgid="2218333576838496100">"Berotzen ari da telefonoa"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Eginbide batzuk ezingo dira erabili telefonoa hoztu arte"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Eginbide batzuk ezingo dira erabili telefonoa hoztu arte.\nInformazio gehiago lortzeko, sakatu hau."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonoa automatikoki saiatuko da hozten. Hoztu bitartean, telefonoa erabiltzen jarrai dezakezu, baina mantsoago funtziona lezake.\n\nTelefonoaren tenperatura jaitsi bezain laster, ohi bezala funtzionatzen jarraituko du."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ikusi zaintzeko urratsak"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Deskonektatu kargagailua"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Arazo bat izan da gailua kargatzean. Deskonektatu egokigailua eta kontuz ibili, kablea bero egon baitaiteke."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ikusi zaintzeko urratsak"</string> diff --git a/packages/SystemUI/res/values-eu/strings_tv.xml b/packages/SystemUI/res/values-eu/strings_tv.xml index bdd1ffadf652..e77de5015fa1 100644 --- a/packages/SystemUI/res/values-eu/strings_tv.xml +++ b/packages/SystemUI/res/values-eu/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pantaila txiki gainjarria"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programa izengabea)"</string> - <string name="pip_close" msgid="5775212044472849930">"Itxi PIPa"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pantaila osoa"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofonoa aktibatuta dago"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s aplikazioak mikrofonoa atzitu du"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 6be188060734..b8c87938d423 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ویرایش ترتیب تنظیمات."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"صفحه <xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"صفحه قفل"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"بزرگ کردن"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"کوچک کردن"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"بستن"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"تنظیمات"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"برای نپذیرفتن، به پایین بکشید"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"منو"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> درحالت تصویر در تصویر است"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"اگر نمیخواهید <xliff:g id="NAME">%s</xliff:g> از این قابلیت استفاده کند، با ضربه زدن، تنظیمات را باز کنید و آن را خاموش کنید."</string> - <string name="pip_play" msgid="333995977693142810">"پخش"</string> - <string name="pip_pause" msgid="1139598607050555845">"توقف موقت"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"رد شدن به بعدی"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"رد شدن به قبلی"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"تغییر اندازه"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"تلفن به علت گرم شدن خاموش شد"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"اکنون تلفنتان عملکرد معمولش را دارد"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"اکنون عملکرد تلفنتان به حالت عادی برگشته است.\nبرای اطلاعات بیشتر ضربه بزنید"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"تلفنتان خیلی گرم شده بود، بنابراین خاموش شد تا خنک شود. اکنون تلفنتان عملکرد معمولش را دارد.\n\nتلفنتان خیلی گرم میشود، اگر:\n • از برنامههای نیازمند پردازش زیاد (مانند بازی، برنامههای ویدیویی یا پیمایشی) استفاده کنید\n • فایلهای بزرگ بارگیری یا بارگذاری کنید\n • در دماهای بالا از تلفنتان استفاده کنید"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"دیدن اقدامات محافظتی"</string> <string name="high_temp_title" msgid="2218333576838496100">"تلفن درحال گرم شدن است"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"وقتی تلفن درحال خنک شدن است، بعضی از قابلیتها محدود میشوند"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"وقتی تلفن درحال خنک شدن است، بعضی از ویژگیها محدود میشوند.\nبرای اطلاعات بیشتر ضربه بزنید"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"تلفنتان بهطور خودکار سعی میکند خنک شود. همچنان میتوانید از تلفنتان استفاده کنید، اما ممکن است کندتر عمل کند.\n\nوقتی تلفن خنک شد، عملکرد عادیاش از سرگرفته میشود."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"دیدن اقدامات محافظتی"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"جدا کردن شارژر از برق"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"مشکلی در شارژ کردن این دستگاه وجود دارد. آداپتور برق را از برق جدا کنید و مراقب باشید زیرا ممکن است کابل گرم باشد."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"مشاهده مراحل احتیاط"</string> diff --git a/packages/SystemUI/res/values-fa/strings_tv.xml b/packages/SystemUI/res/values-fa/strings_tv.xml index fb6d42c2e3ba..bf3987d6e10d 100644 --- a/packages/SystemUI/res/values-fa/strings_tv.xml +++ b/packages/SystemUI/res/values-fa/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"تصویر در تصویر"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(برنامه بدون عنوان)"</string> - <string name="pip_close" msgid="5775212044472849930">"بستن PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"تمام صفحه"</string> <string name="mic_active" msgid="5766614241012047024">"میکروفون فعال است"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s به میکروفون شما دسترسی پیدا کرد"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index cfbd4d52ab18..44a66c31b954 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Muokkaa asetusten järjestystä."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Sivu <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lukitusnäyttö"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Laajenna"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Pienennä"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Sulje"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Asetukset"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Hylkää vetämällä alas."</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Valikko"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> on kuva kuvassa ‑tilassa"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Jos et halua, että <xliff:g id="NAME">%s</xliff:g> voi käyttää tätä ominaisuutta, avaa asetukset napauttamalla ja poista se käytöstä."</string> - <string name="pip_play" msgid="333995977693142810">"Toista"</string> - <string name="pip_pause" msgid="1139598607050555845">"Keskeytä"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Siirry seuraavaan"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Siirry edelliseen"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Muuta kokoa"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Puhelin sammui kuumuuden takia"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Puhelimesi toimii nyt normaalisti."</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Puhelimesi toimii nyt normaalisti.\nLue lisää napauttamalla"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Puhelimesi oli liian kuuma, joten se sammui. Puhelimesi toimii nyt normaalisti.\n\nPuhelimesi voi kuumentua liikaa, jos\n • käytät paljon resursseja vaativia sovelluksia (esim. pelejä, videoita tai navigointisovelluksia)\n • lataat tai lähetät suuria tiedostoja\n • käytät puhelintasi korkeissa lämpötiloissa."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Katso huoltovaiheet"</string> <string name="high_temp_title" msgid="2218333576838496100">"Puhelin lämpenee"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Joidenkin ominaisuuksien käyttöä on rajoitettu puhelimen jäähtymisen aikana."</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Joidenkin ominaisuuksien käyttöä on rajoitettu puhelimen jäähtymisen aikana.\nLue lisää napauttamalla"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Puhelimesi yrittää automaattisesti jäähdyttää itsensä. Voit silti käyttää puhelinta, mutta se voi toimia hitaammin.\n\nKun puhelin on jäähtynyt, se toimii normaalisti."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Katso huoltovaiheet"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Irrota laturi"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Laitetta ladattaessa tapahtui virhe. Irrota virtalähde varovasti – johto voi olla lämmin."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Katso huoltovaiheet"</string> diff --git a/packages/SystemUI/res/values-fi/strings_tv.xml b/packages/SystemUI/res/values-fi/strings_tv.xml index e22a1660db0c..0b1f02f4cad4 100644 --- a/packages/SystemUI/res/values-fi/strings_tv.xml +++ b/packages/SystemUI/res/values-fi/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Kuva kuvassa"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Nimetön)"</string> - <string name="pip_close" msgid="5775212044472849930">"Sulje PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Koko näyttö"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofoni aktiivinen"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s sai pääsyn mikrofoniisi"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index f58d1aa7b7dd..15cf6eb40658 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Modifier l\'ordre des paramètres."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Écran de verrouillage"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Développer"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Réduire"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Fermer"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Paramètres"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Faire glisser vers le bas pour ignorer"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> est en mode d\'incrustation d\'image"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Si vous ne voulez pas que <xliff:g id="NAME">%s</xliff:g> utilise cette fonctionnalité, touchez l\'écran pour ouvrir les paramètres, puis désactivez-la."</string> - <string name="pip_play" msgid="333995977693142810">"Lire"</string> - <string name="pip_pause" msgid="1139598607050555845">"Interrompre"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Passer au suivant"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Revenir au précédent"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionner"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Tél. éteint car il surchauffait"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Votre téléphone fonctionne maintenant normalement"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Votre téléphone fonctionne maintenant de manière normale.\nTouchez pour en savoir plus"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Votre téléphone s\'est éteint, car il surchauffait. Il s\'est refroidi et fonctionne normalement.\n\nIl peut surchauffer si vous :\n • Util. des applis utilisant beaucoup de ressources (jeux, vidéo, navigation, etc.)\n • Téléchargez ou téléversez de gros fichiers\n • Utilisez téléphone dans des températures élevées"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Afficher les étapes d\'entretien"</string> <string name="high_temp_title" msgid="2218333576838496100">"Le téléphone commence à chauffer"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Les fonctionnalités sont limitées pendant que le téléphone refroidit"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Certaines fonctionnalités sont limitées pendant que le téléphone refroidit.\nTouchez pour en savoir plus"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Votre téléphone va essayer de se refroidir automatiquement. Vous pouvez toujours l\'utiliser, mais il risque d\'être plus lent.\n\nUne fois refroidi, il fonctionnera normalement."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Afficher les étapes d\'entretien"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Débranchez le chargeur"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Il y a un problème avec la recharge de cet appareil. Débranchez l\'adaptateur d\'alimentation, et faites attention, car le câble pourrait être chaud."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Afficher les étapes d\'entretien"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml index abf4c1916d29..23dd656c431f 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Incrustation d\'image"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Aucun programme de titre)"</string> - <string name="pip_close" msgid="5775212044472849930">"Fermer mode IDI"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Plein écran"</string> <string name="mic_active" msgid="5766614241012047024">"Microphone actif"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s a accédé à votre microphone"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index ed9a5dd11ad7..784186b013a9 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Modifier l\'ordre des paramètres."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Écran de verrouillage"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Développer"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Réduire"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Fermer"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Paramètres"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Faire glisser vers le bas pour ignorer"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> est en mode Picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Si vous ne voulez pas que l\'application <xliff:g id="NAME">%s</xliff:g> utilise cette fonctionnalité, appuyez ici pour ouvrir les paramètres et la désactiver."</string> - <string name="pip_play" msgid="333995977693142810">"Lecture"</string> - <string name="pip_pause" msgid="1139598607050555845">"Suspendre"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Passer au contenu suivant"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Passer au contenu précédent"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionner"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Tél. éteint car il surchauffait"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"À présent, votre téléphone fonctionne normalement"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"À présent, votre téléphone fonctionne normalement.\nAppuyer pour en savoir plus"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Votre téléphone s\'est éteint, car il surchauffait. Il s\'est refroidi et fonctionne normalement.\n\nIl peut surchauffer si vous :\n • exécutez applis utilisant beaucoup de ressources (jeux, vidéo, navigation, etc.) ;\n • téléchargez ou importez gros fichiers ;\n • utilisez téléphone à des températures élevées."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Afficher les étapes d\'entretien"</string> <string name="high_temp_title" msgid="2218333576838496100">"Le téléphone chauffe"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Fonctionnalités limitées pendant le refroidissement du téléphone"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Fonctionnalités limitées pendant le refroidissement du téléphone.\nAppuyer pour en savoir plus"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Votre téléphone va essayer de se refroidir automatiquement. Vous pouvez toujours l\'utiliser, mais il risque d\'être plus lent.\n\nUne fois refroidi, il fonctionnera normalement."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Afficher les étapes d\'entretien"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Débrancher le chargeur"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Un problème est survenu lors de la recharge de cet appareil. Débranchez l\'adaptateur secteur en faisant attention, car le câble risque d\'être chaud."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Afficher les étapes d\'entretien"</string> diff --git a/packages/SystemUI/res/values-fr/strings_tv.xml b/packages/SystemUI/res/values-fr/strings_tv.xml index 1fc43a1cff4a..4ab6a24b1aca 100644 --- a/packages/SystemUI/res/values-fr/strings_tv.xml +++ b/packages/SystemUI/res/values-fr/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-Picture (PIP)"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programme sans titre)"</string> - <string name="pip_close" msgid="5775212044472849930">"Fermer mode PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Plein écran"</string> <string name="mic_active" msgid="5766614241012047024">"Micro actif"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s a accédé à votre micro"</string> </resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 33e30e0b8164..c732c7bbff1f 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editar a orde das opcións de configuración."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Páxina <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Pantalla de bloqueo"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Despregar"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Pechar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Configuración"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arrastra cara abaixo para ignorar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menú"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> está na pantalla superposta"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Se non queres que <xliff:g id="NAME">%s</xliff:g> utilice esta función, toca a configuración para abrir as opcións e desactivar a función."</string> - <string name="pip_play" msgid="333995977693142810">"Reproducir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Ir ao seguinte"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Ir ao anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Cambiar tamaño"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"O teléfono apagouse pola calor"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"O teu teléfono funciona agora con normalidade"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"O teléfono funciona con normalidade.\nToca para obter máis información"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"O teléfono estaba moi quente, apagouse para que arrefríe e agora funciona con normalidade.\n\nÉ posible que estea moi quente se:\n • Usas aplicacións que requiren moitos recursos (como aplicacións de navegación, vídeos e xogos)\n • Descargas/cargas ficheiros grandes\n • Usas o teléfono a alta temperatura"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ver pasos de mantemento"</string> <string name="high_temp_title" msgid="2218333576838496100">"O teléfono está quentando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"O uso dalgunhas funcións é limitado mentres o teléfono arrefría"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"O uso dalgunhas funcións é limitado mentres o teléfono arrefría.\nToca para obter máis información"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"O teléfono tentará arrefriar automaticamente. Podes utilizalo, pero é probable que funcione máis lento.\n\nUnha vez que arrefríe, funcionará con normalidade."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ver pasos de mantemento"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconecta o cargador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Produciuse un problema ao cargar este dispositivo. Desconecta o adaptador de corrente e ten coidado porque o cable pode estar quente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver pasos de mantemento"</string> diff --git a/packages/SystemUI/res/values-gl/strings_tv.xml b/packages/SystemUI/res/values-gl/strings_tv.xml index 9455f956e890..123a86ef8322 100644 --- a/packages/SystemUI/res/values-gl/strings_tv.xml +++ b/packages/SystemUI/res/values-gl/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pantalla superposta"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programa sen título)"</string> - <string name="pip_close" msgid="5775212044472849930">"Pechar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pantalla completa"</string> <string name="mic_active" msgid="5766614241012047024">"Micrófono activo"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s accedeu ao teu micrófono"</string> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 5c91a1743ed6..5d3d3af8f917 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -21,7 +21,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4811759950673118541">"સિસ્ટમ UI"</string> <string name="status_bar_clear_all_button" msgid="2491321682873657397">"સાફ કરો"</string> - <string name="status_bar_no_notifications_title" msgid="7812479124981107507">"કોઈ સૂચનાઓ નથી"</string> + <string name="status_bar_no_notifications_title" msgid="7812479124981107507">"કોઈ નોટિફિકેશન નથી"</string> <string name="status_bar_ongoing_events_title" msgid="3986169317496615446">"ચાલુ"</string> <string name="status_bar_latest_events_title" msgid="202755896454005436">"નોટિફિકેશનો"</string> <string name="battery_low_title" msgid="6891106956328275225">"બૅટરી ટૂંક સમયમાં સમાપ્ત થશે"</string> @@ -368,7 +368,7 @@ <string name="quick_settings_location_off_label" msgid="7923929131443915919">"સ્થાન બંધ"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"મીડિયા ઉપકરણ"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> - <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ફક્ત કટોકટીના કૉલ્સ"</string> + <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"ફક્ત ઇમર્જન્સી કૉલ"</string> <string name="quick_settings_settings_label" msgid="2214639529565474534">"સેટિંગ"</string> <string name="quick_settings_time_label" msgid="3352680970557509303">"સમય"</string> <string name="quick_settings_user_label" msgid="1253515509432672496">"હું"</string> @@ -517,7 +517,7 @@ <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"બધા સાઇલન્ટ નોટિફિકેશન સાફ કરો"</string> <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"ખલેલ પાડશો નહીં દ્વારા થોભાવેલ નોટિફિકેશન"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"હવે પ્રારંભ કરો"</string> - <string name="empty_shade_text" msgid="8935967157319717412">"કોઈ સૂચનાઓ નથી"</string> + <string name="empty_shade_text" msgid="8935967157319717412">"કોઈ નોટિફિકેશન નથી"</string> <string name="profile_owned_footer" msgid="2756770645766113964">"પ્રોફાઇલ મૉનિટર કરી શકાય છે"</string> <string name="vpn_footer" msgid="3457155078010607471">"નેટવર્ક મૉનિટર કરી શકાય છે"</string> <string name="branded_vpn_footer" msgid="816930186313188514">"નેટવર્ક મૉનિટર કરવામાં આવી શકે છે"</string> @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"સેટિંગ્સનો ક્રમ સંપાદિત કરો."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> પૃષ્ઠ"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"લૉક સ્ક્રીન"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"વિસ્તૃત કરો"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"નાનું કરો"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"બંધ કરો"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"સેટિંગ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"છોડી દેવા માટે નીચે ખેંચો"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"મેનૂ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ચિત્રમાં-ચિત્રની અંદર છે"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"જો તમે નથી ઇચ્છતા કે <xliff:g id="NAME">%s</xliff:g> આ સુવિધાનો ઉપયોગ કરે, તો સેટિંગ ખોલવા માટે ટૅપ કરો અને તેને બંધ કરો."</string> - <string name="pip_play" msgid="333995977693142810">"ચલાવો"</string> - <string name="pip_pause" msgid="1139598607050555845">"થોભાવો"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"આગલા પર જાઓ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"પહેલાંના પર જાઓ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"કદ બદલો"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ફોન વધુ પડતી ગરમીને લીધે બંધ થઇ ગયો છે"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"તમારો ફોન હવે સામાન્યપણે કાર્ય કરી રહ્યો છે"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"તમારો ફોન હવે સામાન્યપણે કાર્ય કરી રહ્યો છે.\nવધુ માહિતી માટે ટૅપ કરો"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"તમારો ફોન અત્યંત ગરમ હતો, તેથી તે ઠંડો થવા આપમેળે બંધ થઇ ગયો છે. તમારો ફોન હવે સામાન્યપણે કાર્ય કરી રહ્યો છે.\n\nતમારો ફોન અત્યંત ગરમ થઇ શકે છે, જો તમે:\n • એવી ઍપ્લિકેશન વાપરતા હો જે સંસાધન સઘન રીતે વાપરતી હોય (જેમ કે ગેમિંગ, વીડિઓ, અથવા નેવિગેટ કરતી ઍપ્લિકેશનો)\n • મોટી ફાઇલો અપલોડ અથવા ડાઉનલોડ કરતા હો\n • તમારા ફોનનો ઉપયોગ ઉચ્ચ તાપમાનમાં કરતા હો"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"સારસંભાળના પગલાં જુઓ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ફોન ગરમ થઈ રહ્યો છે"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ફોન ઠંડો થાય ત્યાં સુધી કેટલીક સુવિધાઓ મર્યાદિત હોય છે"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ફોન ઠંડો થાય ત્યાં સુધી અમુક સુવિધાઓ મર્યાદિત હોય છે.\nવધુ માહિતી માટે ટૅપ કરો"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"તમારો ફોન આપમેળે ઠંડો થવાનો પ્રયાસ કરશે. તમે હજી પણ તમારા ફોનનો ઉપયોગ કરી શકો છો, પરંતુ તે કદાચ થોડો ધીમો ચાલે.\n\nતમારો ફોન ઠંડો થઈ જવા પર, તે સામાન્ય રીતે ચાલશે."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"સારસંભાળના પગલાં જુઓ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ચાર્જરને અનપ્લગ કરો"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"આ ડિવાઇસને ચાર્જ કરવામાં કોઈ સમસ્યા છે. પાવર અડૅપ્ટર અનપ્લગ કરો અને કાળજી લેજો કદાચ કેબલ થોડો ગરમ થયો હોઈ શકે છે."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"સારસંભાળના પગલાં જુઓ"</string> diff --git a/packages/SystemUI/res/values-gu/strings_tv.xml b/packages/SystemUI/res/values-gu/strings_tv.xml index 3ea64873a856..72a6803aa202 100644 --- a/packages/SystemUI/res/values-gu/strings_tv.xml +++ b/packages/SystemUI/res/values-gu/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ચિત્રમાં-ચિત્ર"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(કોઈ ટાઇટલ પ્રોગ્રામ નથી)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP બંધ કરો"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"પૂર્ણ સ્ક્રીન"</string> <string name="mic_active" msgid="5766614241012047024">"માઇક્રોફોન સક્રિય છે"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$sએ તમારો માઇક્રોફોન ઍક્સેસ કર્યો હતો"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index bdd2052f6aa6..f6bc4cdab087 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -370,7 +370,7 @@ <string name="quick_settings_location_off_label" msgid="7923929131443915919">"जगह की जानकारी बंद है"</string> <string name="quick_settings_media_device_label" msgid="8034019242363789941">"मीडिया डिवाइस"</string> <string name="quick_settings_rssi_label" msgid="3397615415140356701">"RSSI"</string> - <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"केवल आपातकालीन कॉल"</string> + <string name="quick_settings_rssi_emergency_only" msgid="7499207215265078598">"सिर्फ़ आपातकालीन कॉल"</string> <string name="quick_settings_settings_label" msgid="2214639529565474534">"सेटिंग"</string> <string name="quick_settings_time_label" msgid="3352680970557509303">"समय"</string> <string name="quick_settings_user_label" msgid="1253515509432672496">"मुझे"</string> @@ -519,7 +519,7 @@ <string name="accessibility_notification_section_header_gentle_clear_all" msgid="6490207897764933919">"बिना आवाज़ की सभी सूचनाएं हटाएं"</string> <string name="dnd_suppressing_shade_text" msgid="5588252250634464042">"\'परेशान न करें\' सुविधा के ज़रिए कुछ समय के लिए सूचनाएं दिखाना रोक दिया गया है"</string> <string name="media_projection_action_text" msgid="3634906766918186440">"अभी शुरू करें"</string> - <string name="empty_shade_text" msgid="8935967157319717412">"कोई सूचना नहीं मिली"</string> + <string name="empty_shade_text" msgid="8935967157319717412">"कोई सूचना नहीं है"</string> <string name="profile_owned_footer" msgid="2756770645766113964">"प्रोफ़ाइल को मॉनीटर किया जा सकता है"</string> <string name="vpn_footer" msgid="3457155078010607471">"नेटवर्क को मॉनीटर किया जा सकता है"</string> <string name="branded_vpn_footer" msgid="816930186313188514">"नेटवर्क को मॉनिटर किया जा सकता है"</string> @@ -918,25 +918,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"सेटिंग के क्रम को बदलें"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"पेज <xliff:g id="ID_2">%2$d</xliff:g> में से <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"लॉक स्क्रीन"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"विस्तार करें"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"छोटा करें"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"बंद करें"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"सेटिंग"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"खारिज करने के लिए नीचे खींचें और छोड़ें"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"मेन्यू"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> \"पिक्चर में पिक्चर\" के अंदर है"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"अगर आप नहीं चाहते कि <xliff:g id="NAME">%s</xliff:g> इस सुविधा का उपयोग करे, तो सेटिंग खोलने के लिए टैप करें और उसे बंद करें ."</string> - <string name="pip_play" msgid="333995977693142810">"चलाएं"</string> - <string name="pip_pause" msgid="1139598607050555845">"रोकें"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"अगले पर जाएं"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"पिछले पर जाएं"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"आकार बदलें"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"गर्म होने की वजह से फ़ोन बंद हुआ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"आपका फ़ोन अब सामान्य रूप से चल रहा है"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"आपका फ़ोन सामान्य रूप से काम कर रहा है.\nज़्यादा जानकारी के लिए टैप करें"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"फ़ोन बहुत गर्म हो गया था, इसलिए ठंडा होने के लिए बंद हो गया. फ़ोन अब अच्छे से चल रहा है.\n\nफ़ोन तब बहुत गर्म हो सकता है जब आप:\n • ज़्यादा रिसॉर्स का इस्तेमाल करने वाले ऐप्लिकेशन चलाते हैं (जैसे गेमिंग, वीडियो या नेविगेशन ऐप्लिकेशन)\n • बड़ी फ़ाइलें डाउनलोड या अपलोड करते हैं\n • ज़्यादा तापमान में फ़ोन का इस्तेमाल करते हैं"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"डिवाइस के रखरखाव के तरीके देखें"</string> <string name="high_temp_title" msgid="2218333576838496100">"फ़ोन गर्म हो रहा है"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"फ़ोन के ठंडा होने के दौरान कुछ सुविधाएं सीमित होती हैं"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"फ़ोन के ठंडा होने तक कुछ सुविधाएं काम नहीं करतीं.\nज़्यादा जानकारी के लिए टैप करें"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"आपका फ़ोन अपने आप ठंडा होने की कोशिश करेगा. आप अब भी अपने फ़ोन का उपयोग कर सकते हैं, लेकिन हो सकता है कि यह धीमी गति से चले.\n\nठंडा हो जाने पर आपका फ़ोन सामान्य रूप से चलेगा."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"डिवाइस के रखरखाव के तरीके देखें"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"चार्जर निकालें"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"इस डिवाइस को चार्ज करने में समस्या हुई. पावर अडैप्टर का प्लग निकालें. ऐसा करते समय सावधानी बरतें क्योंकि तार गर्म हो सकता है."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"प्रबंधन से जुड़े चरण देखें"</string> diff --git a/packages/SystemUI/res/values-hi/strings_tv.xml b/packages/SystemUI/res/values-hi/strings_tv.xml index e5c6eb2e6e20..9282c3c4b861 100644 --- a/packages/SystemUI/res/values-hi/strings_tv.xml +++ b/packages/SystemUI/res/values-hi/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"पिक्चर में पिक्चर"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(कोई शीर्षक कार्यक्रम नहीं)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP बंद करें"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"फ़ुल स्क्रीन"</string> <string name="mic_active" msgid="5766614241012047024">"माइक्रोफ़ोन चालू है"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ने आपका माइक्रोफ़ोन ऐक्सेस किया था"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 22444c2ccb3f..bfd5aa001c24 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Uređivanje redoslijeda postavki."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Stranica <xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Zaključan zaslon"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Proširivanje"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimiziraj"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zatvori"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Postavke"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Povucite prema dolje da biste odbacili"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Izbornik"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> jest na slici u slici"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ako ne želite da aplikacija <xliff:g id="NAME">%s</xliff:g> upotrebljava tu značajku, dodirnite da biste otvorili postavke i isključili je."</string> - <string name="pip_play" msgid="333995977693142810">"Reproduciraj"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pauziraj"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Preskoči na sljedeće"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Preskoči na prethodno"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Promjena veličine"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon se isključio zbog vrućine"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon sada radi normalno"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon sad radi normalno.\nDodirnite za više informacija"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon se pregrijao, stoga se isključio kako bi se ohladio Telefon sada radi normalno.\n\nTelefon se može pregrijati ako:\n • upotrebljavate zahtjevne aplikacije (kao što su igre, aplikacije za videozapise ili navigaciju)\n • preuzimate ili prenosite velike datoteke\n • upotrebljavate telefon na visokim temperaturama."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Pročitajte upute za održavanje"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon se zagrijava"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Neke su značajke ograničene dok se telefon hladi"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Neke su značajke ograničene dok se telefon ne ohladi.\nDodirnite za više informacija"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon će se automatski pokušati ohladiti. Možete ga nastaviti koristiti, no mogao bi raditi sporije.\n\nKad se ohladi, radit će normalno."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Pročitajte upute za održavanje"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Iskopčajte punjač"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Pojavio se problem s punjenjem uređaja. Iskopčajte pretvarač napona i pazite jer se kabel može zagrijati."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Pogledajte upute za održavanje"</string> diff --git a/packages/SystemUI/res/values-hr/strings_tv.xml b/packages/SystemUI/res/values-hr/strings_tv.xml index e226460298b7..59dcd0ceadbb 100644 --- a/packages/SystemUI/res/values-hr/strings_tv.xml +++ b/packages/SystemUI/res/values-hr/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Slika u slici"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program bez naslova)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zatvori PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Cijeli zaslon"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon aktivan"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikacija %1$s pristupila je mikrofonu"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index ef49fa58d594..c8f4a467f94b 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Beállítások sorrendjének szerkesztése."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>. oldal, összesen: <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lezárási képernyő"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Kibontás"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Kis méret"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Bezárás"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Beállítások"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Elvetéshez húzza lefelé"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menü"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"A(z) <xliff:g id="NAME">%s</xliff:g> kép a képben funkciót használ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ha nem szeretné, hogy a(z) <xliff:g id="NAME">%s</xliff:g> használja ezt a funkciót, koppintson a beállítások megnyitásához, és kapcsolja ki."</string> - <string name="pip_play" msgid="333995977693142810">"Lejátszás"</string> - <string name="pip_pause" msgid="1139598607050555845">"Szüneteltetés"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Ugrás a következőre"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Ugrás az előzőre"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Átméretezés"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"A meleg miatt kikapcsolt"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"A telefon most már megfelelően működik"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonja most már megfelelően működik.\nKoppintson, ha további információra van szüksége."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonja túlmelegedett, így kikapcsolt, hogy lehűlhessen. Most már megfelelően működik.\n\nA telefon akkor melegedhet túl, ha Ön:\n • Energiaigényes alkalmazásokat használ (például játékokat, videókat vagy navigációs alkalmazásokat)\n • Nagy fájlokat tölt le vagy fel\n • Melegben használja a telefonját"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Olvassa el a kímélő használat lépéseit"</string> <string name="high_temp_title" msgid="2218333576838496100">"A telefon melegszik"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Bizonyos funkciók korlátozottan működnek a telefon hűlése közben"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Bizonyos funkciók korlátozottan működnek a telefon lehűlése közben.\nKoppintson, ha további információra van szüksége."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"A telefon automatikusan megpróbál lehűlni. Továbbra is tudja használni a telefont, de elképzelhető, hogy működése lelassul.\n\nAmint a telefon lehűl, újra a szokásos módon működik majd."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Olvassa el a kímélő használat lépéseit"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Húzza ki a töltőt"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Probléma adódott az eszköz töltése során. Húzza ki a hálózati adaptert. Vigyázzon, a kábel forró lehet."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Olvassa el a megfelelő használat lépéseit"</string> diff --git a/packages/SystemUI/res/values-hu/strings_tv.xml b/packages/SystemUI/res/values-hu/strings_tv.xml index f039c0d82238..548207244ad0 100644 --- a/packages/SystemUI/res/values-hu/strings_tv.xml +++ b/packages/SystemUI/res/values-hu/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Kép a képben"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Cím nélküli program)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP bezárása"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Teljes képernyő"</string> <string name="mic_active" msgid="5766614241012047024">"A mikrofon aktív"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"A(z) %1$s hozzáfért a mikrofonhoz"</string> </resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 15e45986a5cc..53286188af47 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Խմբագրել կարգավորումների հերթականությունը:"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Էջ <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Կողպէկրան"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Ընդարձակել"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Ծալել"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Փակել"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Կարգավորումներ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Քաշեք վար՝ փակելու համար"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Ընտրացանկ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g>-ը «Նկար նկարի մեջ» ռեժիմում է"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Եթե չեք ցանկանում, որ <xliff:g id="NAME">%s</xliff:g>-ն օգտագործի այս գործառույթը, հպեք՝ կարգավորումները բացելու և այն անջատելու համար։"</string> - <string name="pip_play" msgid="333995977693142810">"Նվագարկել"</string> - <string name="pip_pause" msgid="1139598607050555845">"Դադարեցնել"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Անցնել հաջորդին"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Վերադառնալ նախորդին"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Փոխել չափը"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Հեռախոսն անջատվել է տաքանալու պատճառով"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Հեռախոսն այժմ նորմալ աշխատում է"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Հեռախոսն այժմ նորմալ է աշխատում։\nՀպեք՝ ավելին իմանալու համար։"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Ձեր հեռախոսը չափազանց տաք էր, այդ պատճառով այն անջատվել է՝ հովանալու համար: Հեռախոսն այժմ նորմալ աշխատում է:\n\nՀեռախոսը կարող է տաքանալ, եթե՝\n • Օգտագործում եք ռեսուրսատար հավելվածներ (օրինակ՝ խաղեր, տեսանյութեր կամ նավարկման հավելվածներ)\n • Ներբեռնում կամ վերբեռնում եք ծանր ֆայլեր\n • Օգտագործում եք ձեր հեռախոսը բարձր ջերմային պայմաններում"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Քայլեր գերտաքացման ահազանգի դեպքում"</string> <string name="high_temp_title" msgid="2218333576838496100">"Հեռախոսը տաքանում է"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Հովանալու ընթացքում հեռախոսի որոշ գործառույթներ սահմանափակ են"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Հովանալու ընթացքում հեռախոսի որոշ գործառույթներ սահմանափակ են։\nՀպեք՝ ավելին իմանալու համար։"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ձեր հեռախոսն ավտոմատ կերպով կփորձի hովանալ: Կարող եք շարունակել օգտագործել հեռախոսը, սակայն հնարավոր է, որ այն ավելի դանդաղ աշխատի:\n\nՀովանալուց հետո հեռախոսը կաշխատի կանոնավոր կերպով:"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Քայլեր գերտաքացման ահազանգի դեպքում"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Անջատեք լիցքավորիչը հոսանքից"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Չհաջողվեց լիցքավորել սարքը: Անջատեք հոսանքի ադապտերը և ուշադիր եղեք՝ մալուխը կարող է տաքացած լինել:"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Քայլեր գերտաքացման ահազանգի դեպքում"</string> diff --git a/packages/SystemUI/res/values-hy/strings_tv.xml b/packages/SystemUI/res/values-hy/strings_tv.xml index d5dad69ca1ac..4009335ec7d5 100644 --- a/packages/SystemUI/res/values-hy/strings_tv.xml +++ b/packages/SystemUI/res/values-hy/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Նկար նկարի մեջ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Առանց վերնագրի ծրագիր)"</string> - <string name="pip_close" msgid="5775212044472849930">"Փակել PIP-ն"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Լիէկրան"</string> <string name="mic_active" msgid="5766614241012047024">"Խոսափողն ակտիվացված է"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s հավելվածն օգտագործել է ձեր խոսափողը"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index c1c554b566c9..dfed57b94c51 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit urutan setelan."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Halaman <xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Layar kunci"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Luaskan"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimalkan"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Tutup"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Setelan"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Tarik ke bawah untuk menutup"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> adalah picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Jika Anda tidak ingin <xliff:g id="NAME">%s</xliff:g> menggunakan fitur ini, ketuk untuk membuka setelan dan menonaktifkannya."</string> - <string name="pip_play" msgid="333995977693142810">"Putar"</string> - <string name="pip_pause" msgid="1139598607050555845">"Jeda"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Lewati ke berikutnya"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Lewati ke sebelumnya"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ubah ukuran"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Ponsel dimatikan karena panas"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Ponsel kini berfungsi normal"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ponsel kini berfungsi normal.\nKetuk untuk info selengkapnya"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Ponsel menjadi terlalu panas, jadi dimatikan untuk mendinginkan. Ponsel kini berfungsi normal.\n\nPonsel dapat menjadi terlalu panas jika Anda:\n • Menggunakan aplikasi yang menggunakan sumber daya secara intensif (seperti aplikasi game, video, atau navigasi)\n • Mendownload atau mengupload file besar\n • Menggunakan ponsel dalam suhu tinggi"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Lihat langkah-langkah perawatan"</string> <string name="high_temp_title" msgid="2218333576838496100">"Ponsel menjadi hangat"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Beberapa fitur dibatasi saat ponsel mendingin"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Beberapa fitur dibatasi saat ponsel mendingin.\nKetuk untuk info selengkapnya"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ponsel akan otomatis mencoba mendingin. Anda tetap dapat menggunakan ponsel, tetapi mungkin berjalan lebih lambat.\n\nSetelah dingin, ponsel akan berjalan seperti biasa."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Lihat langkah-langkah perawatan"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Cabut pengisi daya"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Ada masalah saat mengisi daya perangkat ini. Cabut adaptor daya dan berhati-hatilah karena kabelnya mungkin panas."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Lihat langkah-langkah perawatan"</string> diff --git a/packages/SystemUI/res/values-in/strings_tv.xml b/packages/SystemUI/res/values-in/strings_tv.xml index 5c4212358c65..670f8125582a 100644 --- a/packages/SystemUI/res/values-in/strings_tv.xml +++ b/packages/SystemUI/res/values-in/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program tanpa judul)"</string> - <string name="pip_close" msgid="5775212044472849930">"Tutup PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Layar penuh"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon Aktif"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s mengakses mikrofon"</string> </resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 9d0c2b464ef0..57cdb272f176 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Breyta röð stillinga."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Blaðsíða <xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lásskjár"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Stækka"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minnka"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Loka"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Stillingar"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Draga niður til að hunsa"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Valmynd"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> er með mynd í mynd"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ef þú vilt ekki að <xliff:g id="NAME">%s</xliff:g> noti þennan eiginleika skaltu ýta til að opna stillingarnar og slökkva á því."</string> - <string name="pip_play" msgid="333995977693142810">"Spila"</string> - <string name="pip_pause" msgid="1139598607050555845">"Gera hlé"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Fara á næsta"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Fara á fyrra"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Breyta stærð"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Slökkt var á símanum vegna hita"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Síminn virkar núna sem skyldi"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Síminn virkar nú eins og venjulega.\nÝttu til að fá frekari upplýsingar"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Síminn varð of heitur og því var slökkt á honum til að kæla hann. Síminn virkar núna sem skyldi.\n\nSíminn getur orðið of heitur ef þú:\n • Notar plássfrek forrit (t.d. leikja-, myndbands- eða leiðsagnarforrit\n • Sækir eða hleður upp stórum skrám\n • Notar símann í miklum hita"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Sjá varúðarskref"</string> <string name="high_temp_title" msgid="2218333576838496100">"Síminn er að hitna"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Sumir eiginleikar eru takmarkaðir þegar síminn kælir sig"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Sumir eiginleikar eru takmarkaðir meðan síminn kælir sig.\nÝttu til að fá frekari upplýsingar"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Síminn reynir sjálfkrafa að kæla sig. Þú getur enn notað símann en hann gæti verið hægvirkari.\n\nEftir að síminn hefur kælt sig niður virkar hann eðlilega."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Sjá varúðarskref"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Taktu hleðslutækið úr sambandi"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Upp kom vandamál varðandi hleðslu tækisins. Taktu straumbreytinn úr sambandi og farðu varlega því snúran gæti verið heit."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Sjá varúðarskref"</string> diff --git a/packages/SystemUI/res/values-is/strings_tv.xml b/packages/SystemUI/res/values-is/strings_tv.xml index d3a2bec324ee..27334af093f5 100644 --- a/packages/SystemUI/res/values-is/strings_tv.xml +++ b/packages/SystemUI/res/values-is/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Mynd í mynd"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Efni án titils)"</string> - <string name="pip_close" msgid="5775212044472849930">"Loka mynd í mynd"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Allur skjárinn"</string> <string name="mic_active" msgid="5766614241012047024">"Hljóðnemi virkur"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s fékk aðgang að hljóðnemanum þínum"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 749ce6d1cc50..679eb551e7f0 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Modifica l\'ordine delle impostazioni."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Pagina <xliff:g id="ID_1">%1$d</xliff:g> di <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Schermata di blocco"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Espandi"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Riduci a icona"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Chiudi"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Impostazioni"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Trascina verso il basso per ignorare"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> è in Picture in picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Se non desideri che l\'app <xliff:g id="NAME">%s</xliff:g> utilizzi questa funzione, tocca per aprire le impostazioni e disattivarla."</string> - <string name="pip_play" msgid="333995977693142810">"Riproduci"</string> - <string name="pip_pause" msgid="1139598607050555845">"Metti in pausa"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Passa ai contenuti successivi"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Passa ai contenuti precedenti"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ridimensiona"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Il telefono si è spento perché surriscaldato"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Ora il telefono funziona normalmente"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ora il telefono funziona normalmente.\nTocca per ulteriori informazioni"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Il telefono era surriscaldato e si è spento per raffreddarsi. Ora funziona normalmente.\n\nIl telefono può surriscaldarsi se:\n • Utilizzi app che consumano molte risorse (ad esempio app di navigazione, giochi o video)\n • Scarichi o carichi grandi file\n • Lo utilizzi in presenza di alte temperature"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Leggi le misure da adottare"</string> <string name="high_temp_title" msgid="2218333576838496100">"Il telefono si sta scaldando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Alcune funzioni limitate durante il raffreddamento del telefono"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Alcune funzionalità limitate durante il raffreddamento del telefono.\nTocca per ulteriori informazioni"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Il telefono cercherà automaticamente di raffreddarsi. Puoi comunque usarlo, ma potrebbe essere più lento.\n\nUna volta raffreddato, il telefono funzionerà normalmente."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Leggi le misure da adottare"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Scollega il caricabatterie"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Si è verificato un problema durante la ricarica del dispositivo. Scollega l\'alimentatore e presta attenzione perché il cavo potrebbe essere caldo."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Leggi le misure da adottare"</string> diff --git a/packages/SystemUI/res/values-it/strings_tv.xml b/packages/SystemUI/res/values-it/strings_tv.xml index 782b959a134a..e0fce871895a 100644 --- a/packages/SystemUI/res/values-it/strings_tv.xml +++ b/packages/SystemUI/res/values-it/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture in picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programma senza titolo)"</string> - <string name="pip_close" msgid="5775212044472849930">"Chiudi PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Schermo intero"</string> <string name="mic_active" msgid="5766614241012047024">"Microfono attivo"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ha avuto accesso al tuo microfono"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index c2f0a9f2f8e3..b6a723f00024 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"עריכת סדר ההגדרות."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"דף <xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"מסך נעילה"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"הרחב"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"מזער"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"סגור"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"הגדרות"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"גרור למטה כדי לסגור"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"תפריט"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> במצב תמונה בתוך תמונה"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"אם אינך רוצה שהתכונה הזו תשמש את <xliff:g id="NAME">%s</xliff:g>, יש להקיש כדי לפתוח את ההגדרות ולכבות את התכונה."</string> - <string name="pip_play" msgid="333995977693142810">"הפעל"</string> - <string name="pip_pause" msgid="1139598607050555845">"השהה"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"אפשר לדלג אל הבא"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"אפשר לדלג אל הקודם"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"שינוי גודל"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"הטלפון כבה עקב התחממות"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"הטלפון פועל כרגיל עכשיו"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"הטלפון פועל כרגיל עכשיו.\nיש להקיש כדי להציג מידע נוסף"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"הטלפון שלך התחמם יותר מדי וכבה כדי להתקרר. הטלפון פועל כרגיל עכשיו.\n\nייתכן שהטלפון יתחמם יותר מדי אם:\n • תשתמש באפליקציות עתירות משאבים (כגון משחקים, אפליקציות וידאו או אפליקציות ניווט)\n • תוריד או תעלה קבצים גדולים\n • תשתמש בטלפון בטמפרטורות גבוהות"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"לצפייה בשלבי הטיפול"</string> <string name="high_temp_title" msgid="2218333576838496100">"הטלפון מתחמם"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"חלק מהתכונות מוגבלות כל עוד הטלפון מתקרר"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"חלק מהתכונות מוגבלות כל עוד הטלפון מתקרר.\nיש להקיש כדי להציג מידע נוסף"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"קירור הטלפון ייעשה באופן אוטומטי. תוכל עדיין להשתמש בטלפון, אבל ייתכן שהוא יפעל לאט יותר.\n\nהטלפון יחזור לפעול כרגיל לאחר שיתקרר."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"לצפייה בשלבי הטיפול"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"יש לנתק את המטען"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"יש בעיה עם טעינת מכשיר זה. יש לנתק את מתאם המתח בזהירות כיוון שייתכן שהכבל חם."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"לצפייה בשלבי הטיפול"</string> diff --git a/packages/SystemUI/res/values-iw/strings_tv.xml b/packages/SystemUI/res/values-iw/strings_tv.xml index 1e5fc91ecff1..2bd86efa02a4 100644 --- a/packages/SystemUI/res/values-iw/strings_tv.xml +++ b/packages/SystemUI/res/values-iw/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"תמונה בתוך תמונה"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(תוכנית ללא כותרת)"</string> - <string name="pip_close" msgid="5775212044472849930">"סגור PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"מסך מלא"</string> <string name="mic_active" msgid="5766614241012047024">"המיקרופון פעיל"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s קיבלה גישה למיקרופון שלך"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index f33ac282b99d..b70e2e2bc14f 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"設定の順序を編集します。"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"ページ <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ロック画面"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"展開"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"最小化"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"閉じる"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"設定"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"下にドラッグして閉じる"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"メニュー"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g>はピクチャー イン ピクチャーで表示中です"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g>でこの機能を使用しない場合は、タップして設定を開いて OFF にしてください。"</string> - <string name="pip_play" msgid="333995977693142810">"再生"</string> - <string name="pip_pause" msgid="1139598607050555845">"一時停止"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"次へスキップ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"前へスキップ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"サイズ変更"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"高熱で電源が OFF になりました"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"お使いのスマートフォンは現在、正常に動作しています"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"お使いのスマートフォンは現在、正常に動作しています。\nタップして詳細を表示"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"スマートフォンが熱すぎたため電源が OFF になりました。現在は正常に動作しています。\n\nスマートフォンは以下の場合に熱くなる場合があります。\n • リソースを集中的に使用する機能やアプリ（ゲームアプリ、動画アプリ、ナビアプリなど）を使用\n • サイズの大きいファイルをダウンロードまたはアップロード\n • 高温の場所で使用"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"取り扱いに関する手順をご覧ください"</string> <string name="high_temp_title" msgid="2218333576838496100">"スマートフォンの温度が上昇中"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"スマートフォンのクールダウン中は一部の機能が制限されます"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"スマートフォンのクールダウン中は一部の機能が制限されます。\nタップして詳細を表示"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"スマートフォンは自動的にクールダウンを行います。その間もスマートフォンを使用できますが、動作が遅くなる可能性があります。\n\nクールダウンが完了すると、通常どおり動作します。"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"取り扱いに関する手順をご覧ください"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"充電器を電源から外してください"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"このデバイスの充電中に問題が発生しました。電源アダプターを電源から外してください。ケーブルが熱くなっている可能性がありますのでご注意ください。"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"取り扱いに関する手順をご覧ください"</string> diff --git a/packages/SystemUI/res/values-ja/strings_tv.xml b/packages/SystemUI/res/values-ja/strings_tv.xml index 32f30d388320..1e7d05bb3713 100644 --- a/packages/SystemUI/res/values-ja/strings_tv.xml +++ b/packages/SystemUI/res/values-ja/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ピクチャー イン ピクチャー"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"（無題の番組）"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP を閉じる"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"全画面表示"</string> <string name="mic_active" msgid="5766614241012047024">"マイク: 有効"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s がマイクにアクセスしました"</string> </resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 7dcc7a6d5030..0dda483b9d16 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"პარამეტრების მიმდევრობის რედაქტირება."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"გვერდი <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>-დან"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ჩაკეტილი ეკრანი"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"გაშლა"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ჩაკეცვა"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"დახურვა"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"პარამეტრები"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"დასახურად ჩავლებით ჩამოიტანეთ ქვემოთ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"მენიუ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> იყენებს რეჟიმს „ეკრანი ეკრანში“"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"თუ არ გსურთ, რომ <xliff:g id="NAME">%s</xliff:g> ამ ფუნქციას იყენებდეს, აქ შეხებით შეგიძლიათ გახსნათ პარამეტრები და გამორთოთ ის."</string> - <string name="pip_play" msgid="333995977693142810">"დაკვრა"</string> - <string name="pip_pause" msgid="1139598607050555845">"დაპაუზება"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"შემდეგზე გადასვლა"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"წინაზე გადასვლა"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ზომის შეცვლა"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ტელეფონი გამოირთო გაცხელების გამო"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"თქვენი ტელეფონი ახლა ჩვეულებრივად მუშაობს"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"თქვენი ტელეფონი უკვე ნორმალურად მუშაობს.\nშეეხეთ დამატებითი ინფორმაციის მისაღებად"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"თქვენი ტელეფონი გამოირთო გასაგრილებლად, რადგან ის მეტისმეტად გაცხელდა. ახლა ის ჩვეულებრივად მუშაობს.\n\nტელეფონის გაცხელების მიზეზებია:\n • რესურსტევადი აპების გამოყენება (მაგ. სათამაშო, ვიდეო ან ნავიგაციის აპების)\n • დიდი ფაილების ჩამოტვირთვა ან ატვირთვა\n • ტელეფონის გამოყენება მაღალი ტემპერატურისას"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"მისაღები ზომების გაცნობა"</string> <string name="high_temp_title" msgid="2218333576838496100">"ტელეფონი ცხელდება"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ზოგიერთი ფუნქცია შეზღუდული იქნება, სანამ ტელეფონი გაგრილდება"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ზოგიერთი ფუნქცია შეზღუდული იქნება, სანამ ტელეფონი გაგრილდება.\nშეეხეთ დამატებითი ინფორმაციის მისაღებად"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"თქვენი ტელეფონი გაგრილებას ავტომატურად შეეცდება. შეგიძლიათ გააგრძელოთ მისით სარგებლობა, თუმცა ტელეფონმა შეიძლება უფრო ნელა იმუშაოს.\n\nგაგრილების შემდგომ ის ჩვეულებრივად იმუშავებს."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"მისაღები ზომების გაცნობა"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"გამოაერთეთ დამტენი"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ამ მოწყობილობის დატენა ვერ ხერხდება პრობლემის გამო. გამოაერთეთ ელკვების ადაპტერი და გამოიჩინეთ სიფრთხილე, რადგან კაბელი შეიძლებოდა გაცხელებულიყო."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"მისაღები ზომების გაცნობა"</string> diff --git a/packages/SystemUI/res/values-ka/strings_tv.xml b/packages/SystemUI/res/values-ka/strings_tv.xml index b0ed30a4f218..476658d816f2 100644 --- a/packages/SystemUI/res/values-ka/strings_tv.xml +++ b/packages/SystemUI/res/values-ka/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ეკრანი ეკრანში"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(პროგრამის სათაურის გარეშე)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP-ის დახურვა"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"სრულ ეკრანზე"</string> <string name="mic_active" msgid="5766614241012047024">"მიკროფონი აქტიურია"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s-მა გამოიყენა თქვენი მიკროფონი"</string> </resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index a6dbec3a2b48..8e10230f2212 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Параметрлер тәртібін өзгерту."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> ішінен <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Құлыпталған экран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Жаю"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Кішірейту"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Жабу"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Параметрлер"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Жабу үшін төмен қарай сүйреңіз"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Mәзір"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> \"суреттегі сурет\" режимінде"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> деген пайдаланушының бұл мүмкіндікті пайдалануын қаламасаңыз, параметрлерді түртіп ашыңыз да, оларды өшіріңіз."</string> - <string name="pip_play" msgid="333995977693142810">"Ойнату"</string> - <string name="pip_pause" msgid="1139598607050555845">"Кідірту"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Келесіге өту"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Алдыңғысына оралу"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Өлшемін өзгерту"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефон қызып кеткендіктен өшірілді"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Телефоныңыз қазір қалыпты жұмыс істеп тұр"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Телефоныңыз қалыпты жұмыс істеп тұр.\nТолығырақ ақпарат алу үшін түртіңіз."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефоныңыз қатты қызып кеткендіктен өшірілді. Телефоныңыз қазір қалыпты жұмыс істеп тұр.\n\nТелефоныңыз мына жағдайларда ыстық болуы мүмкін:\n • Ресурстар талап ететін қолданбаларды пайдалану (ойын, бейне немесе навигация қолданбалары)\n • Үлкен көлемді файлдарды жүктеу немесе жүктеп салу\n • Телефонды жоғары температурада пайдалану"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Пайдалану нұсқаулығын қараңыз"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефон қызуда"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Телефон толық суығанға дейін, кейбір функциялардың жұмысы шектеледі"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Телефон толық суығанға дейін, кейбір функциялардың жұмысы шектеледі.\nТолығырақ ақпарат үшін түртіңіз."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Телефон автоматты түрде суи бастайды. Оны пайдалана бере аласыз, бірақ ол баяуырақ жұмыс істеуі мүмкін.\n\nТелефон суығаннан кейін, оның жұмысы қалпына келеді."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Пайдалану нұсқаулығын қараңыз"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Зарядтағышты ажыратыңыз"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Құрылғыны зарядтау кезінде ақау шықты. Қуат адаптерін ажыратыңыз. Кабель ыстық болуы мүмкін, абай болыңыз."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Пайдалану нұсқаулығын қараңыз"</string> diff --git a/packages/SystemUI/res/values-kk/strings_tv.xml b/packages/SystemUI/res/values-kk/strings_tv.xml index 323c5e6c0bc7..d4b3c73f8308 100644 --- a/packages/SystemUI/res/values-kk/strings_tv.xml +++ b/packages/SystemUI/res/values-kk/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Суреттегі сурет"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Атаусыз бағдарлама)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP жабу"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Толық экран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофон қосулы"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s микрофоныңызды пайдаланды."</string> </resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index f2774e4ab305..36d5aa8ab45b 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"កែលំដាប់ការកំណត់"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"ទំព័រ <xliff:g id="ID_1">%1$d</xliff:g> នៃ <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"អេក្រង់ចាក់សោ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ពង្រីក"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"បង្រួម"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"បិទ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ការកំណត់"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"អូសចុះក្រោមដើម្បីបដិសេធ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ម៉ឺនុយ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ស្ថិតក្នុងមុខងាររូបក្នុងរូប"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"ប្រសិនបើអ្នកមិនចង់ឲ្យ <xliff:g id="NAME">%s</xliff:g> ប្រើមុខងារនេះ សូមចុចបើកការកំណត់ រួចបិទវា។"</string> - <string name="pip_play" msgid="333995977693142810">"លេង"</string> - <string name="pip_pause" msgid="1139598607050555845">"ផ្អាក"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"រំលងទៅបន្ទាប់"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"រំលងទៅក្រោយ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ប្ដូរទំហំ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ទូរសព្ទបានបិទដោយសារវាឡើងកម្តៅ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ឥឡូវនេះទូរសព្ទរបស់អ្នកកំពុងដំណើរការធម្មតា"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ឥឡូវនេះ ទូរសព្ទរបស់អ្នកកំពុងដំណើរការជាធម្មតា។\nសូមចុចដើម្បីទទួលបានព័ត៌មានបន្ថែម"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ទូរសព្ទរបស់អ្នកក្តៅពេក ដូច្នេះវាបានបិទដើម្បីបន្ថយកម្តៅ។ ឥឡូវនេះ ទូរសព្ទរបស់អ្នកកំពុងដំណើរការធម្មតា។\n\nទូរសព្ទរបស់អ្នកអាចនឹងឡើងកម្តៅខ្លាំងជ្រុល ប្រសិនបើអ្នក៖\n • ប្រើប្រាស់កម្មវិធីដែលប្រើប្រាស់ទិន្នន័យច្រើនក្នុងរយៈពេលខ្លី (ដូចជាហ្គេម វីដេអូ ឬកម្មវិធីរុករក)\n • ទាញយក ឬបង្ហោះឯកសារដែលមានទំហំធំ\n • ប្រើប្រាស់ទូរសព្ទរបស់អ្នកនៅកន្លែងមានសីតុណ្ហភាពខ្ពស់"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"មើលជំហានថែទាំ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ទូរសព្ទនេះកំពុងកើនកម្តៅ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"មុខងារមួយចំនួននឹងមិនអាចប្រើបានពេញលេញនោះទេ ខណៈពេលដែលទូរសព្ទកំពុងបញ្ចុះកម្តៅ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"មុខងារមួយចំនួននឹងមិនអាចប្រើបានពេញលេញនោះទេ ខណៈពេលដែលទូរសព្ទកំពុងបញ្ចុះកម្ដៅ។\nសូមចុចដើម្បីទទួលបានព័ត៌មានបន្ថែម"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ទូរសព្ទរបស់អ្នកនឹងព្យាយាមបញ្ចុះកម្តៅដោយស្វ័យប្រវត្តិ។ អ្នកនៅតែអាចប្រើទូរសព្ទរបស់អ្នកបានដដែល ប៉ុន្តែវានឹងដំណើរការយឺតជាងមុន។\n\nបន្ទាប់ពីទូរសព្ទរបស់អ្នកត្រជាក់ជាងមុនហើយ វានឹងដំណើរការដូចធម្មតា។"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"មើលជំហានថែទាំ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ផ្ដាច់ឆ្នាំងសាក"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"មានបញ្ហាក្នុងការសាកថ្មឧបករណ៍នេះ។ សូមផ្ដាច់ឆ្នាំងសាក ហើយប្រុងប្រយ័ត្ន ដោយសារខ្សែអាចមានកម្ដៅក្ដៅ។"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"មើលជំហានថែទាំ"</string> diff --git a/packages/SystemUI/res/values-km/strings_tv.xml b/packages/SystemUI/res/values-km/strings_tv.xml index f905f49f695b..685a5e482e89 100644 --- a/packages/SystemUI/res/values-km/strings_tv.xml +++ b/packages/SystemUI/res/values-km/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"រូបក្នុងរូប"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(កម្មវិធីគ្មានចំណងជើង)"</string> - <string name="pip_close" msgid="5775212044472849930">"បិទ PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ពេញអេក្រង់"</string> <string name="mic_active" msgid="5766614241012047024">"មីក្រូហ្វូនកំពុងដំណើរការ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s បានចូលប្រើមីក្រូហ្វូនរបស់អ្នក"</string> </resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 1f4d90326acd..2034472d18cd 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ಸೆಟ್ಟಿಂಗ್ಗಳ ಕ್ರಮವನ್ನು ಎಡಿಟ್ ಮಾಡಿ."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="ID_1">%1$d</xliff:g> ಪುಟ"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ಲಾಕ್ ಪರದೆ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ವಿಸ್ತೃತಗೊಳಿಸು"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ಕುಗ್ಗಿಸಿ"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ಮುಚ್ಚಿ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ವಜಾಗೊಳಿಸಲು ಕೆಳಕ್ಕೆ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ಮೆನು"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರವಾಗಿದೆ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> ಈ ವೈಶಿಷ್ಟ್ಯ ಬಳಸುವುದನ್ನು ನೀವು ಬಯಸದಿದ್ದರೆ, ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ತೆರೆಯಲು ಮತ್ತು ಅದನ್ನು ಆಫ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> - <string name="pip_play" msgid="333995977693142810">"ಪ್ಲೇ"</string> - <string name="pip_pause" msgid="1139598607050555845">"ವಿರಾಮಗೊಳಿಸಿ"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ಮುಂದಕ್ಕೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ಹಿಂದಕ್ಕೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ಮರುಗಾತ್ರಗೊಳಿಸಿ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ಫೋನ್ ಬಿಸಿಯಾಗಿದ್ದರಿಂದ ಆಫ್ ಆಗಿದೆ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ಈಗ ನಿಮ್ಮ ಫೋನ್ ಎಂದಿನಂತೆ ಕೆಲಸ ಮಾಡುತ್ತಿದೆ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ನಿಮ್ಮ ಫೋನ್ ಈಗ ಎಂದಿನಂತೆ ರನ್ ಆಗುತ್ತಿದೆ.\nಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ನಿಮ್ಮ ಫೋನ್ ತುಂಬಾ ಬಿಸಿಯಾಗಿತ್ತು, ತಣ್ಣಗಾಗಲು ಅದು ತಾನಾಗಿ ಆಫ್ ಆಗಿದೆ. ಈಗ ನಿಮ್ಮ ಫೋನ್ ಎಂದಿನಂತೆ ಕೆಲಸ ಮಾಡುತ್ತಿದೆ.\n\nನಿಮ್ಮ ಫೋನ್ ಬಿಸಿಯಾಗಲು ಕಾರಣಗಳು:\n • ಹೆಚ್ಚು ಸಂಪನ್ಮೂಲ ಉಪಯೋಗಿಸುವ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಬಳಕೆ (ಉದಾ, ಗೇಮಿಂಗ್, ವೀಡಿಯೊ/ನ್ಯಾವಿಗೇಶನ್ ಅಪ್ಲಿಕೇಶನ್ಗಳು)\n • ದೊಡ್ಡ ಫೈಲ್ಗಳ ಡೌನ್ಲೋಡ್ ಅಥವಾ ಅಪ್ಲೋಡ್\n • ಅಧಿಕ ಉಷ್ಣಾಂಶದಲ್ಲಿ ಫೋನಿನ ಬಳಕೆ"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ಕಾಳಜಿಯ ಹಂತಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ಫೋನ್ ಬಿಸಿಯಾಗುತ್ತಿದೆ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ಫೋನ್ ತಣ್ಣಗಾಗುವವರೆಗೂ ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸೀಮಿತಗೊಳಿಸುತ್ತದೆ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ಫೋನ್ ತಣ್ಣಗಾಗುವವರೆಗೂ ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸೀಮಿತಗೊಳಿಸಲಾಗುತ್ತದೆ\nಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ನಿಮ್ಮ ಫೋನ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತಣ್ಣಗಾಗಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ. ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಈಗಲೂ ಬಳಸಬಹುದಾಗಿರುತ್ತದೆ, ಆದರೆ ಇದು ನಿಧಾನವಾಗಿರಬಹುದು.\n\nಒಮ್ಮೆ ನಿಮ್ಮ ಫೋನ್ ತಣ್ಣಗಾದ ನಂತರ ಇದು ಸಾಮಾನ್ಯ ರೀತಿಯಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ಕಾಳಜಿಯ ಹಂತಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ಚಾರ್ಜರ್ ಅನ್ಪ್ಲಗ್ ಮಾಡಿ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡುತ್ತಿರುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ಪವರ್ ಅಡಾಪ್ಟರ್ ಅನ್ನು ಅನ್ಪ್ಲಗ್ ಮಾಡಿ ಮತ್ತು ಕೇಬಲ್ ಬೆಚ್ಚಗಿರಬೇಕೆಂದು ಜಾಗ್ರತೆ ವಹಿಸಿ."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ಕಾಳಜಿ ಹಂತಗಳನ್ನು ನೋಡಿ"</string> diff --git a/packages/SystemUI/res/values-kn/strings_tv.xml b/packages/SystemUI/res/values-kn/strings_tv.xml index d01e14780046..7db0c7080919 100644 --- a/packages/SystemUI/res/values-kn/strings_tv.xml +++ b/packages/SystemUI/res/values-kn/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ಚಿತ್ರದಲ್ಲಿ ಚಿತ್ರ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ಶೀರ್ಷಿಕೆ ರಹಿತ ಕಾರ್ಯಕ್ರಮ)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP ಮುಚ್ಚಿ"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ಪೂರ್ಣ ಪರದೆ"</string> <string name="mic_active" msgid="5766614241012047024">"ಮೈಕ್ರೋಫೋನ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿದೆ"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 271c976b3364..ef4a5f63d0d3 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"설정 순서 수정"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g>페이지 중 <xliff:g id="ID_1">%1$d</xliff:g>페이지"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"잠금 화면"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"펼치기"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"최소화"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"닫기"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"설정"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"아래로 드래그하여 닫기"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"메뉴"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g>에서 PIP 사용 중"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g>에서 이 기능이 사용되는 것을 원하지 않는 경우 탭하여 설정을 열고 기능을 사용 중지하세요."</string> - <string name="pip_play" msgid="333995977693142810">"재생"</string> - <string name="pip_pause" msgid="1139598607050555845">"일시중지"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"다음으로 건너뛰기"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"이전으로 건너뛰기"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"크기 조절"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"발열로 인해 휴대전화 전원이 종료됨"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"휴대전화가 정상적으로 실행 중입니다."</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"이제 휴대전화가 정상적으로 작동합니다.\n자세히 알아보려면 탭하세요."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"휴대전화가 과열되어 온도를 낮추기 위해 전원이 종료되었습니다. 지금은 휴대전화가 정상적으로 실행 중입니다.\n\n휴대전화가 과열되는 이유는 다음과 같습니다.\n • 리소스를 많이 사용하는 앱 사용(예: 게임, 동영상 또는 내비게이션 앱)\n • 대용량 파일을 다운로드 또는 업로드\n • 온도가 높은 곳에서 휴대폰 사용"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"해결 방법 확인하기"</string> <string name="high_temp_title" msgid="2218333576838496100">"휴대전화 온도가 높음"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"휴대전화 온도를 낮추는 동안 일부 기능이 제한됩니다."</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"휴대전화 온도를 낮추는 동안 일부 기능이 제한됩니다.\n자세히 알아보려면 탭하세요."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"휴대전화 온도를 자동으로 낮추려고 시도합니다. 휴대전화를 계속 사용할 수는 있지만 작동이 느려질 수도 있습니다.\n\n휴대전화 온도가 낮아지면 정상적으로 작동됩니다."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"해결 방법 확인하기"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"충전기를 연결 해제하세요"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"기기를 충전하는 중에 문제가 발생했습니다. 케이블이 뜨거울 수 있으므로 주의하여 전원 어댑터를 분리하세요."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"취해야 할 조치 확인"</string> diff --git a/packages/SystemUI/res/values-ko/strings_tv.xml b/packages/SystemUI/res/values-ko/strings_tv.xml index 0615fe85d72e..10889705ddc3 100644 --- a/packages/SystemUI/res/values-ko/strings_tv.xml +++ b/packages/SystemUI/res/values-ko/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"PIP 모드"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(제목 없는 프로그램)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP 닫기"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"전체화면"</string> <string name="mic_active" msgid="5766614241012047024">"마이크 사용 중"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s에서 내 마이크에 액세스했습니다."</string> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 9aa5e36152eb..cfd91b56ddf5 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Жөндөөлөрдүн иретин өзгөртүү."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> ичинен <xliff:g id="ID_1">%1$d</xliff:g>-бет"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Кулпуланган экран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Жайып көрсөтүү"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Кичирейтүү"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Жабуу"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Жөндөөлөр"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Четке кагуу үчүн төмөн сүйрөңүз"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Меню"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> – сүрөт ичиндеги сүрөт"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Эгер <xliff:g id="NAME">%s</xliff:g> колдонмосу бул функцияны пайдаланбасын десеңиз, жөндөөлөрдү ачып туруп, аны өчүрүп коюңуз."</string> - <string name="pip_play" msgid="333995977693142810">"Ойнотуу"</string> - <string name="pip_pause" msgid="1139598607050555845">"Тындыруу"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Кийинкисине өткөрүп жиберүү"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Мурункусуна өткөрүп жиберүү"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Өлчөмүн өзгөртүү"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефон ысыгандыктан өчүрүлдү"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Телефонуңуз кадимкидей иштеп жатат"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Телефонуңуз кадимкидей иштеп жатат.\nКеңири маалымат алуу үчүн таптап коюңуз"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефонуңуз өтө ысып кеткендиктен, аны муздатуу үчүн өчүрүлдү. Эми телефонуңуз кадимкидей иштеп жатат.\n\nТелефонуңуз төмөнкү шарттарда ысып кетиши мүмкүн:\n • Ашыкча ресурс короткон колдонмолорду (оюндар, видео же чабыттоо колдонмолору) пайдалансаңыз \n • Ири көлөмдөгү файлдарды жүктөп алсаңыз же берсеңиз\n • Телефонуңузду жогорку температураларда пайдалансаңыз"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Тейлөө кадамдарын көрүңүз"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефонуңуз ысып баратат"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Телефон сууганча айрым элементтердин иши чектелген"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Телефон сууганча айрым элементтердин иши чектелген.\nКеңири маалымат алуу үчүн таптап коюңуз"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Телефонуңуз автоматтык түрдө сууйт. Аны колдоно берсеңиз болот, бирок ал жайыраак иштеп калат.\n\nТелефонуңуз суугандан кийин адаттагыдай эле иштеп баштайт."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Тейлөө кадамдарын көрүңүз"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Кубаттагычты сууруңуз"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Бул түзмөктү кубаттоодо маселе келип чыкты. Кабель ысып кетиши мүмкүн, андыктан кубаттагыч адаптерин сууруп коюңуз."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Тейлөө кадамдарын көрүңүз"</string> diff --git a/packages/SystemUI/res/values-ky/strings_tv.xml b/packages/SystemUI/res/values-ky/strings_tv.xml index 5b40ca93bac2..b69b1c6e26b5 100644 --- a/packages/SystemUI/res/values-ky/strings_tv.xml +++ b/packages/SystemUI/res/values-ky/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Сүрөт ичиндеги сүрөт"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Аталышы жок программа)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP\'ти жабуу"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Толук экран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофон күйүк"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s микрофонуңузду колдонууда"</string> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index fcffa124ec91..90b5ad2267ac 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ແກ້ໄຂລຳດັບການຕັ້ງຄ່າ."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ໜ້າຈໍລັອກ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ຂະຫຍາຍ"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ຫຍໍ້"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ປິດ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ການຕັ້ງຄ່າ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ລາກລົງເພື່ອປິດໄວ້"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ເມນູ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ແມ່ນເປັນການສະແດງຜົນຫຼາຍຢ່າງພ້ອມກັນ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"ຫາກທ່ານບໍ່ຕ້ອງການ <xliff:g id="NAME">%s</xliff:g> ໃຫ້ໃຊ້ຄຸນສົມບັດນີ້, ໃຫ້ແຕະເພື່ອເປີດການຕັ້ງຄ່າ ແລ້ວປິດມັນໄວ້."</string> - <string name="pip_play" msgid="333995977693142810">"ຫຼິ້ນ"</string> - <string name="pip_pause" msgid="1139598607050555845">"ຢຸດຊົ່ວຄາວ"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ຂ້າມໄປລາຍການໜ້າ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ຂ້າມໄປລາຍການກ່ອນນີ້"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ປ່ຽນຂະໜາດ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ປິດໂທລະສັບເນື່ອງຈາກຮ້ອນເກີນໄປ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ໂທລະສັບຂອງທ່ານຕອນນີ້ເຮັດວຽກປົກກະຕິແລ້ວ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ໂທລະສັບຂອງທ່ານຕອນນີ້ເຮັດວຽກປົກກະຕິແລ້ວ.\nແຕະເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ໂທລະສັບຂອງທ່ານຮ້ອນເກີນໄປ, ດັ່ງນັ້ນມັນຈຶ່ງຖືກປິດໄວ້ເພື່ອໃຫ້ເຢັນກ່ອນ. ໂທລະສັບຂອງທ່ານຕອນນີ້ເຮັດວຽກປົກກະຕິແລ້ວ.\n\nໂທລະສັບຂອງທ່ານອາດຮ້ອນຫາກວ່າທ່ານ:\n • ໃຊ້ແອັບທີ່ກິນຊັບພະຍາກອນຫຼາຍ (ເຊັ່ນ: ເກມ, ວິດີໂອ ຫຼື ແອັບການນຳທາງ)\n • ດາວໂຫລດ ຫຼື ອັບໂຫລດຮູບພາບຂະໜາດໃຫຍ່\n • ໃຊ້ໂທລະສັບຂອງທ່ານໃນບ່ອນທີ່ມີອຸນຫະພູມສູງ"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ເບິ່ງຂັ້ນຕອນການເບິ່ງແຍງ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ໂທລະສັບກຳລັງຮ້ອນຂຶ້ນ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ຄຸນສົມບັດບາງຢ່າງຖືກຈຳກັດໄວ້ເນື່ອງໃນເວລາຫຼຸດອຸນຫະພູມຂອງໂທລະສັບ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ຄຸນສົມບັດບາງຢ່າງຖືກຈຳກັດໄວ້ໃນເວລາຫຼຸດອຸນຫະພູມຂອງໂທລະສັບ.\nແຕະເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ໂທລະສັບຂອງທ່ານຈະພະຍາຍາມລົດອຸນຫະພູມລົງ. ທ່ານຍັງຄົງສາມາດໃຊ້ໂທລະສັບຂອງທ່ານໄດ້ຢູ່, ແຕ່ມັນຈະເຮັດວຽກຊ້າລົງ.\n\nເມື່ອໂທລະສັບຂອງທ່ານບໍ່ຮ້ອນຫຼາຍແລ້ວ, ມັນຈະກັບມາເຮັດວຽກຕາມປົກກະຕິ."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ເບິ່ງຂັ້ນຕອນການເບິ່ງແຍງ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ຖອດສາຍສາກອອກ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ເກີດບັນຫາໃນການສາກໄຟອຸປະກອນນີ້. ກະລຸນາຖອດສາຍສາກອອກ ແລະ ລະວັງເນື່ອງຈາກສາຍອາດຈະຍັງອຸ່ນຢູ່."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ເບິ່ງຂັ້ນຕອນການເບິ່ງແຍງ"</string> diff --git a/packages/SystemUI/res/values-lo/strings_tv.xml b/packages/SystemUI/res/values-lo/strings_tv.xml index 7e7a4dded891..056612eb49e9 100644 --- a/packages/SystemUI/res/values-lo/strings_tv.xml +++ b/packages/SystemUI/res/values-lo/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ສະແດງຜົນຫຼາຍຢ່າງພ້ອມກັນ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ໂປຣແກຣມບໍ່ມີຊື່)"</string> - <string name="pip_close" msgid="5775212044472849930">"ປິດ PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ເຕັມໜ້າຈໍ"</string> <string name="mic_active" msgid="5766614241012047024">"ໄມໂຄຣໂຟນເປີດໃຊ້ຢູ່"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ເຂົ້າເຖິງໄມໂຄຣໂຟນຂອງທ່ານແລ້ວ"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 3d19a913a5b4..5c8e8d9ac8fb 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Redaguoti nustatymų tvarką."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g> psl. iš <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Užrakinimo ekranas"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Išskleisti"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Sumažinti"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Uždaryti"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Nustatymai"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Nuvilkite žemyn, kad atsisakytumėte"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meniu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> rodom. vaizdo vaizde"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Jei nenorite, kad „<xliff:g id="NAME">%s</xliff:g>“ naudotų šią funkciją, palietę atidarykite nustatymus ir išjunkite ją."</string> - <string name="pip_play" msgid="333995977693142810">"Leisti"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pristabdyti"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Praleisti ir eiti į kitą"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Praleisti ir eiti į ankstesnį"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Pakeisti dydį"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefonas išjungt., nes įkaito"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Dabar telefonas veikia įprastai"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonas dabar veikia normaliai.\nPalietę gausite daugiau informacijos"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonas per daug įkaito, todėl buvo išj., kad atvėstų. Dabar telefonas veikia įprastai.\n\nTelefonas gali per daug įkaisti, jei:\n • esate įjungę daug išteklių naudoj. progr. (pvz., žaidimų, vaizdo įr. arba navig. progr.);\n • atsis. arba įkeliate didelius failus;\n • telefoną naudojate aukštoje temper."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Žr. priežiūros veiksmus"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefonas kaista"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Kai kurios funkcijos gali neveikti, kol telefonas vėsta"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Kai kurios funkcijos gali neveikti, kol telefonas vėsta.\nPalietę gausite daugiau informacijos"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonas automatiškai bandys atvėsti. Telefoną vis tiek galėsite naudoti, tačiau jis gali veikti lėčiau.\n\nKai telefonas atvės, jis veiks įprastai."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Žr. priežiūros veiksmus"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Atjunkite kroviklį"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Įkraunant šį įrenginį iškilo problema. Atjunkite maitinimo adapterį. Būkite atsargūs, nes laidas gali būti įkaitęs."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Žr. priežiūros veiksmus"</string> diff --git a/packages/SystemUI/res/values-lt/strings_tv.xml b/packages/SystemUI/res/values-lt/strings_tv.xml index cb0cb6c2845b..7739680c82b3 100644 --- a/packages/SystemUI/res/values-lt/strings_tv.xml +++ b/packages/SystemUI/res/values-lt/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Vaizdas vaizde"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programa be pavadinimo)"</string> - <string name="pip_close" msgid="5775212044472849930">"Uždaryti PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Visas ekranas"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofonas aktyvus"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"„%1$s“ pasiekė jūsų mikrofoną"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 42dc57c189c1..cbe076896d9f 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -294,7 +294,7 @@ <string name="accessibility_quick_settings_more_time" msgid="7646479831704665284">"Vairāk laika."</string> <string name="accessibility_quick_settings_less_time" msgid="9110364286464977870">"Mazāk laika."</string> <string name="accessibility_quick_settings_flashlight_off" msgid="7606563260714825190">"Apgaismojums ir izslēgts."</string> - <string name="accessibility_quick_settings_flashlight_unavailable" msgid="7458591827288347635">"Zibspuldze nav pieejama."</string> + <string name="accessibility_quick_settings_flashlight_unavailable" msgid="7458591827288347635">"Lukturītis nav pieejams."</string> <string name="accessibility_quick_settings_flashlight_on" msgid="3785616827729850766">"Apgaismojums ir ieslēgts."</string> <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3782375441381402599">"Apgaismojums ir izslēgts."</string> <string name="accessibility_quick_settings_flashlight_changed_on" msgid="4747870681508334200">"Apgaismojums ir ieslēgts."</string> @@ -407,7 +407,7 @@ <item quantity="other">%d ierīces</item> </plurals> <string name="quick_settings_notifications_label" msgid="3379631363952582758">"Paziņojumi"</string> - <string name="quick_settings_flashlight_label" msgid="4904634272006284185">"Zibspuldze"</string> + <string name="quick_settings_flashlight_label" msgid="4904634272006284185">"Lukturītis"</string> <string name="quick_settings_flashlight_camera_in_use" msgid="4820591564526512571">"Kamera tiek lietota"</string> <string name="quick_settings_cellular_detail_title" msgid="792977203299358893">"Mobilie dati"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="6105969068871138427">"Datu lietojums"</string> @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Rediģēt iestatījumu secību."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>. lpp. no <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Bloķēšanas ekrāns"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Izvērst"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizēt"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Aizvērt"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Iestatījumi"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Velciet lejup, lai noraidītu"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Izvēlne"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ir attēlā attēlā"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ja nevēlaties lietotnē <xliff:g id="NAME">%s</xliff:g> izmantot šo funkciju, pieskarieties, lai atvērtu iestatījumus un izslēgtu funkciju."</string> - <string name="pip_play" msgid="333995977693142810">"Atskaņot"</string> - <string name="pip_pause" msgid="1139598607050555845">"Apturēt"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Pāriet uz nākamo"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Pāriet uz iepriekšējo"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Mainīt lielumu"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Tālrunis izslēgts karstuma dēļ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Tagad jūsu tālrunis darbojas normāli"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Tagad jūsu tālrunis darbojas normāli.\nPieskarieties, lai uzzinātu vairāk."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Jūsu tālrunis bija pārkarsis un tika izslēgts. Tagad tas darbojas normāli.\n\nTālrunis var sakarst, ja:\n • tiek izmantotas lietotnes, kas patērē daudz enerģijas (piem., spēles, video lietotnes vai navigācija);\n • tiek lejupielādēti/augšupielādēti lieli faili;\n • tālrunis tiek lietots augstā temperatūrā."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Skatīt apkopes norādījumus"</string> <string name="high_temp_title" msgid="2218333576838496100">"Tālrunis kļūst silts"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Dažas funkcijas ir ierobežotas, kamēr tālrunis mēģina atdzist"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Dažas funkcijas ir ierobežotas, kamēr notiek tālruņa atdzišana.\nPieskarieties, lai uzzinātu vairāk."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Jūsu tālrunis automātiski mēģinās atdzist. Jūs joprojām varat izmantot tālruni, taču tas, iespējams, darbosies lēnāk.\n\nTiklīdz tālrunis būs atdzisis, tas darbosies normāli."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Skatīt apkopes norādījumus"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Lādētāja atvienošana"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Uzlādējot šo ierīci, radās problēma. Atvienojiet strāvas adapteri. Esiet uzmanīgs — vads var būt uzsilis."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Skatīt apkopes norādījumus"</string> diff --git a/packages/SystemUI/res/values-lv/strings_tv.xml b/packages/SystemUI/res/values-lv/strings_tv.xml index e08b0ea4379f..6b841d2c244b 100644 --- a/packages/SystemUI/res/values-lv/strings_tv.xml +++ b/packages/SystemUI/res/values-lv/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Attēls attēlā"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programma bez nosaukuma)"</string> - <string name="pip_close" msgid="5775212044472849930">"Aizvērt PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pilnekrāna režīms"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofons ir aktīvs"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Lietotne %1$s piekļuva jūsu mikrofonam"</string> </resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 39af976fc437..5a000de3e843 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Уредете го редоследот на поставките."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Страница <xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Заклучен екран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Проширете"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Минимизирај"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Затвори"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Поставки"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Повлечете надолу за да отфрлите"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Мени"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> е во слика во слика"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ако не сакате <xliff:g id="NAME">%s</xliff:g> да ја користи функцијава, допрете за да ги отворите поставките и да ја исклучите."</string> - <string name="pip_play" msgid="333995977693142810">"Пушти"</string> - <string name="pip_pause" msgid="1139598607050555845">"Паузирај"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Прескокни до следната"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Прескокни до претходната"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Промени големина"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефонот се исклучи поради загреаност"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Сега телефонот работи нормално"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Сега телефонот работи нормално.\nДопрете за повеќе информации"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефонот беше премногу загреан, така што се исклучи за да се олади. Сега работи нормално.\n\nТелефонот може премногу да се загрее ако:\n • користите апликации што работат со многу ресурси (како што се, на пример, апликациите за видеа, навигација или игри)\n • преземате или поставувате големи датотеки\n •го користите телефонот на високи температури"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Прикажи ги чекорите за грижа за уредот"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефонот се загрева"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Некои функции се ограничени додека телефонот се лади"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Некои функции се ограничени додека телефонот се лади.\nДопрете за повеќе информации"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Телефонот автоматски ќе се обиде да се олади. Вие сепак ќе може да го користите, но тој може да работи побавно.\n\nОткако ќе се олади, ќе работи нормално."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Прикажи ги чекорите за грижа за уредот"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Исклучете го полначот"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Има проблем со полнењето на уредов. Исклучете го адаптерот за напојување и внимавајте зошто кабелот може да е топол."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Прикажи ги чекорите за грижа за уредот"</string> diff --git a/packages/SystemUI/res/values-mk/strings_tv.xml b/packages/SystemUI/res/values-mk/strings_tv.xml index b4de2156155c..a935cc47b6cf 100644 --- a/packages/SystemUI/res/values-mk/strings_tv.xml +++ b/packages/SystemUI/res/values-mk/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Слика во слика"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Програма без наслов)"</string> - <string name="pip_close" msgid="5775212044472849930">"Затвори PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Цел екран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофонот е активен"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s пристапи до вашиот микрофон"</string> </resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 34f1ac6cfeaf..22392279a919 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ക്രമീകരണ ക്രമം എഡിറ്റുചെയ്യുക."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"പേജ് <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ലോക്ക് സ്ക്രീൻ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"വികസിപ്പിക്കുക"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ചെറുതാക്കുക"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"അവസാനിപ്പിക്കുക"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ക്രമീകരണം"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"തള്ളിക്കളയാൻ താഴേക്ക് വലിച്ചിടുക"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"മെനു"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ചിത്രത്തിനുള്ളിൽ ചിത്രം രീതിയിലാണ്"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> ഈ ഫീച്ചർ ഉപയോഗിക്കേണ്ടെങ്കിൽ, ടാപ്പ് ചെയ്ത് ക്രമീകരണം തുറന്ന് അത് ഓഫാക്കുക."</string> - <string name="pip_play" msgid="333995977693142810">"പ്ലേ ചെയ്യുക"</string> - <string name="pip_pause" msgid="1139598607050555845">"താൽക്കാലികമായി നിർത്തുക"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"അടുത്തതിലേക്ക് പോകുക"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"മുമ്പത്തേതിലേക്ക് പോകുക"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"വലുപ്പം മാറ്റുക"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ചൂട് കൂടിയതിനാൽ ഫോൺ ഓഫാക്കി"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ഫോൺ ഇപ്പോൾ സാധാരണഗതിയിൽ പ്രവർത്തിക്കുന്നു"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"നിങ്ങളുടെ ഫോൺ ഇപ്പോൾ സാധാരണ ഗതിയിൽ പ്രവർത്തിക്കുന്നു.\nകൂടുതൽ വിവരങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ഫോൺ ചൂടായിരിക്കുന്നതിനാൽ തണുക്കാൻ ഓഫാക്കിയിരിക്കുന്നു. ഫോൺ ഇപ്പോൾ സാധാരണഗതിയിൽ പ്രവർത്തിക്കുന്നു.\n\nഫോണിന് ചൂട് കൂടാൻ കാരണം:\n • ഗെയിമിംഗ്, വീഡിയോ അല്ലെങ്കിൽ നാവിഗേഷൻ തുടങ്ങിയ റിസോഴ്സ്-ഇന്റൻസീവായ ആപ്പുകൾ ഉപയോഗിക്കുന്നത്\n • വലിയ ഫയലുകൾ അപ്ലോഡോ ഡൗൺലോഡോ ചെയ്യുന്നത്\n • ഉയർന്ന താപനിലയിൽ ഫോൺ ഉപയോഗിക്കുന്നത്"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"പരിപാലന നിർദ്ദേശങ്ങൾ കാണുക"</string> <string name="high_temp_title" msgid="2218333576838496100">"ഫോൺ ചൂടായിക്കൊണ്ടിരിക്കുന്നു"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ഫോൺ തണുത്തുകൊണ്ടിരിക്കുമ്പോൾ ചില ഫീച്ചറുകൾ പരിമിതപ്പെടുത്തപ്പെടും"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ഫോൺ തണുത്തുകൊണ്ടിരിക്കുമ്പോൾ ചില ഫീച്ചറുകൾ പരിമിതപ്പെടുത്തപ്പെടും.\nകൂടുതൽ വിവരങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"നിങ്ങളുടെ ഫോൺ സ്വയമേവ തണുക്കാൻ ശ്രമിക്കും. നിങ്ങൾക്ക് അപ്പോഴും ഫോൺ ഉപയോഗിക്കാമെങ്കിലും പ്രവർത്തനം മന്ദഗതിയിലായിരിക്കും.\n\nതണുത്തുകഴിഞ്ഞാൽ, ഫോൺ സാധാരണ ഗതിയിൽ പ്രവർത്തിക്കും."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"പരിപാലന നിർദ്ദേശങ്ങൾ കാണുക"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ചാർജർ അൺപ്ലഗ് ചെയ്യുക"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ഈ ഉപകരണം ചാർജ് ചെയ്യുന്നതിൽ തടസ്സമുണ്ട്. പവർ അഡാപ്റ്റർ അൺപ്ലഗ് ചെയ്യുക, കേബിളിന് ചൂടുണ്ടായിരിക്കുമെന്നതിനാൽ ശ്രദ്ധിക്കണം."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"മുൻകരുതൽ നടപടികൾ കാണുക"</string> diff --git a/packages/SystemUI/res/values-ml/strings_tv.xml b/packages/SystemUI/res/values-ml/strings_tv.xml index bf925c454f6d..97843376a364 100644 --- a/packages/SystemUI/res/values-ml/strings_tv.xml +++ b/packages/SystemUI/res/values-ml/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ചിത്രത്തിനുള്ളിൽ ചിത്രം"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(പേരില്ലാത്ത പ്രോഗ്രാം)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP അടയ്ക്കുക"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"പൂര്ണ്ണ സ്ക്രീന്"</string> <string name="mic_active" msgid="5766614241012047024">"മൈക്രോഫോൺ സജീവമാണ്"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s, നിങ്ങളുടെ മൈക്രോഫോൺ ആക്സസ് ചെയ്തു"</string> </resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 13ad38f48cad..8141ef3a1fc6 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Тохиргооны дарааллыг өөрчилнө үү."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g>-н <xliff:g id="ID_1">%1$d</xliff:g>-р хуудас"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Түгжигдсэн дэлгэц"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Дэлгэх"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Багасгах"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Хаах"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Тохиргоо"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Хаахын тулд доош чирэх"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Цэс"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> дэлгэцэн доторх дэлгэцэд байна"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Та <xliff:g id="NAME">%s</xliff:g>-д энэ онцлогийг ашиглуулахыг хүсэхгүй байвал тохиргоог нээгээд, үүнийг унтраана уу."</string> - <string name="pip_play" msgid="333995977693142810">"Тоглуулах"</string> - <string name="pip_pause" msgid="1139598607050555845">"Түр зогсоох"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Дараагийн медиад очих"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Өмнөх медиад очих"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Хэмжээг өөрчлөх"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Халснаас үүдэн утас унтарсан"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Таны утас одоо хэвийн ажиллаж байна"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Таны утас одоо хэвийн ажиллаж байна.\nДэлгэрэнгүй мэдээлэл авах бол товшино уу"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Таны утас хэт халсан тул хөргөхөөр унтраасан болно. Таны утас одоо хэвийн ажиллаж байна.\n\nХэрэв та дараахыг хийвэл таны утас хэт халж болзошгүй:\n • Их хэмжээний нөөц хэрэглээний апп (тоглоом, видео эсвэл шилжилтийн апп зэрэг)\n • Багтаамж ихтэй файл татах, байршуулах\n • Утсаа өндөр температурт ашиглах"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Хянамж болгоомжийн алхмыг харах"</string> <string name="high_temp_title" msgid="2218333576838496100">"Утас халж эхэлж байна"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Таны утас хөрж байх зуур зарим онцлогийг хязгаарласан"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Утсыг хөрөх үед зарим онцлогийг хязгаарлана.\nДэлгэрэнгүй мэдээлэл авах бол товшино уу"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Таны утас автоматаар хөрөх болно. Та утсаа ашиглаж болох хэдий ч удаан ажиллаж болзошгүй.\n\nТаны утас хөрсний дараагаар хэвийн ажиллана."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Хянамж болгоомжийн алхмыг харах"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Цэнэглэгчийг салгана уу"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Энэ төхөөрөмжийг цэнэглэхэд асуудал гарлаа. Тэжээлийн залгуурыг салгана уу. Кабель халсан байж болзошгүй тул болгоомжтой байгаарай."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Хянамж болгоомжийн алхмыг харна уу"</string> diff --git a/packages/SystemUI/res/values-mn/strings_tv.xml b/packages/SystemUI/res/values-mn/strings_tv.xml index 6eb4449a9796..3a5ff747a01e 100644 --- a/packages/SystemUI/res/values-mn/strings_tv.xml +++ b/packages/SystemUI/res/values-mn/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Дэлгэцэн-доторх-Дэлгэц"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Гарчиггүй хөтөлбөр)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP-г хаах"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Бүтэн дэлгэц"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофон идэвхтэй байна"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s нь таны микрофонд хандcан байна"</string> </resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 90a937e319b8..79b7ae8b12a5 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"सेटिंग्जचा क्रम संपादित करा."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"पृष्ठ <xliff:g id="ID_2">%2$d</xliff:g> पैकी <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"लॉक स्क्रीन"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"विस्तृत करा"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"लहान करा"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"बंद करा"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"सेटिंग्ज"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"डिसमिस करण्यासाठी खाली ड्रॅग करा"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"मेनू"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> चित्रामध्ये चित्र मध्ये आहे"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g>ने हे वैशिष्ट्य वापरू नये असे तुम्हाला वाटत असल्यास, सेटिंग्ज उघडण्यासाठी टॅप करा आणि ते बंद करा."</string> - <string name="pip_play" msgid="333995977693142810">"प्ले करा"</string> - <string name="pip_pause" msgid="1139598607050555845">"थांबवा"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"डावलून पुढे जा"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"डावलून मागे जा"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"आकार बदला"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"तापल्यामुळे फोन बंद झाला"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"तुमचा फोन आता व्यवस्थित सुरू आहे"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"तुमचा फोन आता नेहमीप्रमाणे काम करत आहे.\nअधिक माहितीसाठी टॅप करा"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"तुमचा फोन खूप तापलाय, म्हणून तो थंड होण्यासाठी बंद झाला आहे. तुमचा फोन आता व्यवस्थित सुरू आहे.\n\nतुम्ही असे केल्यास तुमचा फोन खूप तापेल:\n •संसाधन केंद्रित अॅप वापरणे (गेमिंग, व्हिडिओ किंवा नेव्हिगेशन अॅप यासारखे)\n •मोठ्या फाइल डाउनलोड किंवा अपलोड करणे\n •उच्च तापमानामध्ये तुमचा फोन वापरणे"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"काय काळजी घ्यावी ते पाहा"</string> <string name="high_temp_title" msgid="2218333576838496100">"फोन ऊष्ण होत आहे"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"फोन थंड होत असताना काही वैशिष्ट्ये मर्यादित असतात"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"फोन थंड होईपर्यंत काही वैशिष्ट्ये मर्यादित केली.\nअधिक माहितीसाठी टॅप करा"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"तुमचा फोन स्वयंचलितपणे थंड होईल. तुम्ही अद्यापही तुमचा फोन वापरू शकता परंतु तो कदाचित धीमेपणे कार्य करेल.\n\nतुमचा फोन एकदा थंड झाला की, तो सामान्यपणे कार्य करेल."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"काय काळजी घ्यावी ते पाहा"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"चार्जर अनप्लग करा"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"हे डिव्हाइस चार्ज करताना समस्या आहे. पॉवर अडॅप्टर अनप्लग करा आणि शक्य तेवढी काळजी घ्या कदाचित केबल गरम असू शकते."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"काय काळजी घ्यावी ते पाहा"</string> diff --git a/packages/SystemUI/res/values-mr/strings_tv.xml b/packages/SystemUI/res/values-mr/strings_tv.xml index 587832a6bda6..7f58fe779e03 100644 --- a/packages/SystemUI/res/values-mr/strings_tv.xml +++ b/packages/SystemUI/res/values-mr/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"चित्रा-मध्ये-चित्र"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(शीर्षक नसलेला कार्यक्रम)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP बंद करा"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"फुल स्क्रीन"</string> <string name="mic_active" msgid="5766614241012047024">"मायक्रोफोन ॲक्टिव्ह आहे"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s यांनी तुमचा मायक्रोफोन अॅक्सेस केला आहे"</string> </resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index b2bfa707a58a..37cbb7edf753 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edit susunan tetapan."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Halaman <xliff:g id="ID_1">%1$d</xliff:g> daripada <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Kunci skrin"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Kembangkan"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimumkan"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Tutup"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Tetapan"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Seret ke bawah untuk mengetepikan"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> terdapat dalam gambar dalam gambar"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Jika anda tidak mahu <xliff:g id="NAME">%s</xliff:g> menggunakan ciri ini, ketik untuk membuka tetapan dan matikan ciri."</string> - <string name="pip_play" msgid="333995977693142810">"Main"</string> - <string name="pip_pause" msgid="1139598607050555845">"Jeda"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Langkau ke seterusnya"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Langkau ke sebelumnya"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ubah saiz"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon dimatikan kerana panas"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon anda kini berjalan seperti biasa"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon anda kini berjalan seperti biasa.\nKetik untuk mendapatkan maklumat lanjut"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon anda terlalu panas, jadi telefon itu telah dimatikan untuk menyejuk. Sekarang, telefon anda berjalan seperti biasa.\n\nTelefon anda mungkin menjadi terlalu panas jika anda:\n • Menggunakan apl intensif sumber (seperti permainan, video atau apl navigasi)\n • Memuat turun atau memuat naik fail besar\n • Menggunakan telefon anda dalam suhu tinggi"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Lihat langkah penjagaan"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon semakin panas"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Sesetengah ciri adalah terhad semasa telefon menyejuk"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Sesetengah ciri adalah terhad semasa telefon menyejuk.\nKetik untuk mendapatkan maklumat lanjut"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon anda akan cuba menyejuk secara automatik. Anda masih dapat menggunakan telefon itu tetapi telefon tersebut mungkin berjalan lebih perlahan.\n\nSetelah telefon anda sejuk, telefon itu akan berjalan seperti biasa."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Lihat langkah penjagaan"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Cabut palam pengejas"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Terdapat isu semasa mengecas peranti ini. Cabut palam penyesuai kuasa. Berhati-hati kerana kabel mungkin hangat."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Lihat langkah penjagaan"</string> diff --git a/packages/SystemUI/res/values-ms/strings_tv.xml b/packages/SystemUI/res/values-ms/strings_tv.xml index ba6a85e3e546..3c62891c5530 100644 --- a/packages/SystemUI/res/values-ms/strings_tv.xml +++ b/packages/SystemUI/res/values-ms/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Gambar dalam Gambar"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program tiada tajuk)"</string> - <string name="pip_close" msgid="5775212044472849930">"Tutup PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Skrin penuh"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon Aktif"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s telah mengakses mikrofon anda"</string> </resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 96f1d1bbfdab..376ed2fd2d9a 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ဆက်တင်များ၏ အစီအစဉ်ကို တည်းဖြတ်ပါ။"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"စာမျက်နှာ <xliff:g id="ID_2">%2$d</xliff:g> အနက်မှ စာမျက်နှာ <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"လော့ခ်ချထားချိန် မျက်နှာပြင်"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ချဲ့ရန်"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ချုံ့ရန်"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ပိတ်ရန်"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ဆက်တင်များ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ပယ်ရန်အတွက် အောက်သို့ ပွတ်ဆွဲပါ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"မီနူး"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> သည် တစ်ခုပေါ် တစ်ခုထပ်၍ ဖွင့်ထားသည်"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> အား ဤဝန်ဆောင်မှုကို အသုံးမပြုစေလိုလျှင် ဆက်တင်ကိုဖွင့်ရန် တို့ပြီး ၎င်းဝန်ဆောင်မှုကို ပိတ်လိုက်ပါ။"</string> - <string name="pip_play" msgid="333995977693142810">"ဖွင့်ရန်"</string> - <string name="pip_pause" msgid="1139598607050555845">"ခေတ္တရပ်ရန်"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"နောက်တစ်ခုသို့ ကျော်ရန်"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ယခင်တစ်ခုသို့ ပြန်သွားရန်"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"အရွယ်အစားပြောင်းရန်"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"အပူရှိန်ကြောင့်ဖုန်းပိတ်ထားသည်"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"သင်၏ဖုန်းသည် ပုံမှန် အလုပ်လုပ်နေပါသည်"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"သင့်ဖုန်းသည် ယခု ပုံမှန်အလုပ်လုပ်နေပါပြီ။\nနောက်ထပ်အချက်အလက်များအတွက် တို့ပါ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"သင့်ဖုန်းအလွန်ပူနေသည့်အတွက် အေးသွားစေရန် ပိတ်ထားပါသည်။ ယခုပုံမှန် အလုပ်လုပ်ပါပြီ။\n\nအောက်ပါတို့ကိုသုံးလျှင် ပူလာပါမည်-\n • အရင်းအမြစ်များသောအက်ပ်ကို သုံးခြင်း (ဥပမာ ဂိမ်းကစားခြင်း၊ ဗီဒီယိုကြည့်ခြင်း (သို့) လမ်းညွှန်အက်ပ်)\n • ကြီးမားသောဖိုင်များ ဒေါင်းလုဒ် (သို့) အပ်လုဒ်လုပ်ခြင်း\n • အပူရှိန်မြင့်သောနေရာတွင် သုံးခြင်း"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ဂရုပြုစရာ အဆင့်များ ကြည့်ရန်"</string> <string name="high_temp_title" msgid="2218333576838496100">"ဖုန်း ပူနွေးလာပါပြီ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ဖုန်းကို အေးအောင်ပြုလုပ်နေစဉ်တွင် အချို့ဝန်ဆောင်မှုများကို ကန့်သတ်ထားပါသည်"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ဖုန်းကို အေးအောင်ပြုလုပ်နေစဉ်တွင် အချို့ဝန်ဆောင်မှုများကို ကန့်သတ်ထားပါသည်။\nနောက်ထပ်အချက်အလက်များအတွက် တို့ပါ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"သင့်ဖုန်းသည် အလိုအလျောက် ပြန်အေးသွားပါလိမ့်မည်။ ဖုန်းကို အသုံးပြုနိုင်ပါသေးသည် သို့သော် ပိုနှေးနိုင်ပါသည်။\n\nသင့်ဖုန်း အေးသွားသည်နှင့် ပုံမှန်အတိုင်း ပြန်အလုပ်လုပ်ပါလိမ့်မည်။"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ဂရုပြုစရာ အဆင့်များ ကြည့်ရန်"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"အားသွင်းကိရိယာ ပလပ်ဖြုတ်ပါ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ဤစက်ပစ္စည်းကို အားသွင်းရာတွင် ပြဿနာရှိနေသည်။ ပါဝါ ကြားခံကိရိယာကို ပလပ်ဖြုတ်ပါ။ ကေဘယ်ကြိုး ပူနွေးနေနိုင်သဖြင့် သတိထားပါ။"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ဂရုပြုစရာ အဆင့်များ ကြည့်ရန်"</string> diff --git a/packages/SystemUI/res/values-my/strings_tv.xml b/packages/SystemUI/res/values-my/strings_tv.xml index e33a1c32557a..88d7d53d8390 100644 --- a/packages/SystemUI/res/values-my/strings_tv.xml +++ b/packages/SystemUI/res/values-my/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ခေါင်းစဉ်မဲ့ အစီအစဉ်)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP ကိုပိတ်ပါ"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"မျက်နှာပြင် အပြည့်"</string> <string name="mic_active" msgid="5766614241012047024">"မိုက်ခရိုဖုန်း ဖွင့်ထားသည်"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s က သင့်မိုက်ခရိုဖုန်းကို သုံးထားသည်"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index b717273f084c..26268301333c 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Endre rekkefølgen på innstillingene."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Side <xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Låseskjerm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Vis"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimer"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Lukk"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Innstillinger"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Dra ned for å avvise"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meny"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> er i bilde-i-bilde"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Hvis du ikke vil at <xliff:g id="NAME">%s</xliff:g> skal bruke denne funksjonen, kan du trykke for å åpne innstillingene og slå den av."</string> - <string name="pip_play" msgid="333995977693142810">"Spill av"</string> - <string name="pip_pause" msgid="1139598607050555845">"Sett på pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Hopp til neste"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Hopp til forrige"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Endre størrelse"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon ble slått av pga varme"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefonen din kjører nå som normalt"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonen kjører nå som normalt.\nTrykk for å se mer informasjon"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonen din var for varm, så den ble slått av for å kjøles ned. Telefonen din kjører nå som normalt.\n\nTelefonen kan blir for varm hvis du:\n • bruker ressurskrevende apper (for eksempel spill-, video- eller navigeringsapper)\n • laster store filer opp eller ned\n • bruker telefonen ved høy temperatur"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Se vedlikeholdstrinnene"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefonen begynner å bli varm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Enkelte funksjoner er begrenset mens telefonen kjøles ned"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Enkelte funksjoner er begrenset mens telefonen kjøles ned.\nTrykk for å se mer informasjon"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonen din kommer til å prøve å kjøle seg ned automatisk. Du kan fremdeles bruke telefonen, men den kjører muligens saktere.\n\nTelefonen kommer til å kjøre som normalt, når den har kjølt seg ned."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Se vedlikeholdstrinnene"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Koble fra laderen"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Det oppsto et problem med lading av enheten. Koble fra strømadapteren, og vær forsiktig, kabelen kan være varm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Se vedlikeholdstrinnene"</string> diff --git a/packages/SystemUI/res/values-nb/strings_tv.xml b/packages/SystemUI/res/values-nb/strings_tv.xml index 9b466788d9e0..cd558735315f 100644 --- a/packages/SystemUI/res/values-nb/strings_tv.xml +++ b/packages/SystemUI/res/values-nb/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Bilde-i-bilde"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program uten tittel)"</string> - <string name="pip_close" msgid="5775212044472849930">"Lukk PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Fullskjerm"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofonen er aktiv"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s fikk tilgang til mikrofonen din"</string> </resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 4d0d2ef2cefa..d962af76ec41 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"सेटिङहरूको क्रमलाई सम्पादन गर्नुहोस्।"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> मध्ये पृष्ठ <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"लक स्क्रिन"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"विस्तृत गर्नुहोस्"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"सानो बनाउनुहोस्"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"बन्द गर्नुहोस्"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"सेटिङहरू"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"खारेज गर्न तल तान्नुहोस्"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"मेनु"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> Picture-in-picture मा छ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"तपाईं <xliff:g id="NAME">%s</xliff:g> ले सुविधा प्रयोग नगरोस् भन्ने चाहनुहुन्छ भने ट्याप गरेर सेटिङहरू खोल्नुहोस् र यसलाई निष्क्रिय पार्नुहोस्।"</string> - <string name="pip_play" msgid="333995977693142810">"प्ले गर्नुहोस्"</string> - <string name="pip_pause" msgid="1139598607050555845">"पज गर्नुहोस्"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"अर्कोमा जानुहोस्"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"अघिल्लोमा जानुहोस्"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"आकार बदल्नुहोस्"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"फोन अति नै तातिएकाले चिसिन बन्द भयो"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"तपाईंको फोन अब सामान्य ढंगले चल्दै छ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"तपाईंको फोन अहिले सामान्य रूपमा चलिरहेको छ।\nथप जानकारीका लागि ट्याप गर्नुहोस्"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"तपाईंको फोन अति नै तातिएकाले चिसिन बन्द भयो। तपाईंको फोन अब सामान्य ढंगले चल्दै छ।\n\nतपाईंले निम्न कुराहरू गर्नुभयो भने तपाईंको फोन अत्यन्त तातो हुनसक्छ:\n • धेरै संसाधन खपत गर्ने एपहरूको प्रयोग (जस्तै गेमिङ, भिडियो वा नेभिगेसन एपहरू)\n • ठूला फाइलहरूको डाउनलोड वा अपलोड\n • उच्च तापक्रममा फोनको प्रयोग"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"यन्त्रको हेरचाह गर्ने तरिका हेर्नुहोस्"</string> <string name="high_temp_title" msgid="2218333576838496100">"फोन तातो भइरहेको छ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"फोन चिसो हुँदै गर्दा केही विशेषताहरूलाई सीमित गरिन्छ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"फोन नचिस्सिँदासम्म केही सुविधाहरू उपलब्ध हुने छैनन्।\nथप जानकारीका लागि ट्याप गर्नुहोस्"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"तपाईंको फोन स्वतः चिसो हुने प्रयास गर्ने छ। तपाईं अझै पनि आफ्नो फोनको प्रयोग गर्न सक्नुहुन्छ तर त्यो अझ ढिलो चल्न सक्छ।\n\nचिसो भएपछि तपाईंको फोन सामान्य गतिमा चल्नेछ।"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"यन्त्रको हेरचाह गर्ने तरिका हेर्नुहोस्"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"चार्जर अनप्लग गर्नुहोस्"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"यो यन्त्र चार्ज गर्दा कुनै समस्या भयो। पावर एडाप्टर अनप्लग गर्नुहोस् र केबल तातो हुन सक्ने भएकाले ध्यान दिनुहोस्।"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"हेरचाहसम्बन्धी चरणहरू हेर्नुहोस्"</string> diff --git a/packages/SystemUI/res/values-ne/strings_tv.xml b/packages/SystemUI/res/values-ne/strings_tv.xml index 20411351b549..22f7f71793fa 100644 --- a/packages/SystemUI/res/values-ne/strings_tv.xml +++ b/packages/SystemUI/res/values-ne/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-Picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(शीर्षकविहीन कार्यक्रम)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP लाई बन्द गर्नुहोस्"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"फुल स्क्रिन"</string> <string name="mic_active" msgid="5766614241012047024">"माइक्रोफोन सक्रिय छ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ले तपाईंको माइक्रोफोनमाथि पहुँच राख्यो"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 36d1d61b3e40..7a4de7516e05 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Volgorde van instellingen bewerken."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Pagina <xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Vergrendelscherm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Uitvouwen"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimaliseren"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Sluiten"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Instellingen"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Sleep omlaag om te sluiten"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> is in scherm-in-scherm"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Als je niet wilt dat <xliff:g id="NAME">%s</xliff:g> deze functie gebruikt, tik je om de instellingen te openen en schakel je de functie uit."</string> - <string name="pip_play" msgid="333995977693142810">"Afspelen"</string> - <string name="pip_pause" msgid="1139598607050555845">"Onderbreken"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Doorgaan naar volgende"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Teruggaan naar vorige"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Formaat aanpassen"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefoon uitgezet wegens hitte"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Je telefoon presteert nu weer zoals gebruikelijk"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Je telefoon functioneert nu weer zoals gebruikelijk.\nTik voor meer informatie"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Je telefoon was te warm en is uitgeschakeld om af te koelen. Je telefoon presteert nu weer zoals gebruikelijk.\n\nJe telefoon kan warm worden als je:\n • bronintensieve apps gebruikt (zoals game-, video-, of navigatie-apps),\n • grote bestanden up- of downloadt,\n • je telefoon gebruikt bij hoge temperaturen."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Onderhoudsstappen bekijken"</string> <string name="high_temp_title" msgid="2218333576838496100">"De telefoon wordt warm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Bepaalde functies zijn beperkt terwijl de telefoon afkoelt"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Bepaalde functies zijn beperkt terwijl de telefoon afkoelt.\nTik voor meer informatie"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Je telefoon probeert automatisch af te koelen. Je kunt je telefoon nog steeds gebruiken, maar deze kan langzamer werken.\n\nZodra de telefoon is afgekoeld, werkt deze weer normaal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Onderhoudsstappen bekijken"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Oplader loskoppelen"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Er is een probleem met het opladen van dit apparaat. Koppel de voedingsadapter los. Wees voorzichtig, want de kabel kan warm zijn."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Onderhoudsstappen bekijken"</string> diff --git a/packages/SystemUI/res/values-nl/strings_tv.xml b/packages/SystemUI/res/values-nl/strings_tv.xml index c8dd088f8725..3b8e3201e440 100644 --- a/packages/SystemUI/res/values-nl/strings_tv.xml +++ b/packages/SystemUI/res/values-nl/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Scherm-in-scherm"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Naamloos programma)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP sluiten"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Volledig scherm"</string> <string name="mic_active" msgid="5766614241012047024">"Microfoon actief"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s heeft toegang tot je microfoon gehad"</string> </resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 6168e0c417ae..e112f446acb1 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ସେଟିଙ୍ଗର କ୍ରମ ସଂଶୋଧନ କରନ୍ତୁ।"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"ପୃଷ୍ଠା <xliff:g id="ID_1">%1$d</xliff:g> ମୋଟ <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"ଲକ୍ ସ୍କ୍ରୀନ୍"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ବଢ଼ାନ୍ତୁ"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ଛୋଟ କରନ୍ତୁ"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ବନ୍ଦ କରନ୍ତୁ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ସେଟିଂସ୍"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ଖାରଜ କରିବାକୁ ତଳକୁ ଟାଣନ୍ତୁ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ମେନୁ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> \"ଛବି-ଭିତରେ-ଛବି\"ରେ ଅଛି"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"ଏହି ବୈଶିଷ୍ଟ୍ୟ <xliff:g id="NAME">%s</xliff:g> ବ୍ୟବହାର ନକରିବାକୁ ଯଦି ଆପଣ ଚାହାଁନ୍ତି, ସେଟିଙ୍ଗ ଖୋଲିବାକୁ ଟାପ୍ କରନ୍ତୁ ଏବଂ ଏହା ଅଫ୍ କରିଦିଅନ୍ତୁ।"</string> - <string name="pip_play" msgid="333995977693142810">"ପ୍ଲେ କରନ୍ତୁ"</string> - <string name="pip_pause" msgid="1139598607050555845">"ପଜ୍ କରନ୍ତୁ"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ପରବର୍ତ୍ତୀକୁ ଯାଆନ୍ତୁ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ପୂର୍ବବର୍ତ୍ତୀକୁ ଛାଡ଼ନ୍ତୁ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ରିସାଇଜ୍ କରନ୍ତୁ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ଗରମ ହେତୁ ଫୋନ୍ ଅଫ୍ କରିଦିଆଗଲା"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ଆପଣଙ୍କ ଫୋନ୍ ବର୍ତ୍ତମାନ ସାମାନ୍ୟ ଅବସ୍ଥାରେ ଚାଲୁଛି"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ଆପଣଙ୍କ ଫୋନ୍ ବର୍ତ୍ତମାନ ସାମାନ୍ୟ ରୂପେ ଚାଲୁଛି।\nଅଧିକ ସୂଚନା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ଆପଣଙ୍କ ଫୋନ୍ ବହୁତ ଗରମ ଥିଲା, ତେଣୁ ଏହାକୁ ଥଣ୍ଡା କରାଯିବାକୁ ଅଫ୍ କରିଦିଆଗଲା। ଆପଣଙ୍କ ଫୋନ୍ ବର୍ତ୍ତମାନ ସାମାନ୍ୟ ଅବସ୍ଥାରେ ଚାଲୁଛି।\n\nଆପଣଙ୍କ ଫୋନ୍ ଅଧିକ ଗରମ ହୋଇଯାଇପାରେ ଯଦି ଆପଣ:\n • ରିସୋର୍ସ-ଇଣ୍ଟେନସିଭ୍ ଆପ୍ (ଯେପରିକି ଗେମିଙ୍ଗ, ଭିଡିଓ, କିମ୍ବା ନେଭିଗେସନ୍ ଆପ୍) ବ୍ୟବହାର କରନ୍ତି\n • ବଡ ଫାଇଲ୍ ଡାଉନଲୋଡ୍ କିମ୍ବା ଅପଲୋଡ୍ କରନ୍ତି\n • ଅଧିକ ତାପମାତ୍ରାରେ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରନ୍ତି"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ଯତ୍ନ ନେବା ପାଇଁ ଷ୍ଟେପଗୁଡ଼ିକ ଦେଖନ୍ତୁ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ଫୋନ୍ ଗରମ ହୋଇଯାଉଛି"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ଫୋନ୍ ଥଣ୍ଡା ହେବା ସମୟରେ କିଛି ଫିଚର୍ ସୀମିତ ଭାବେ କାମ କରିଥାଏ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ଫୋନ୍ ଥଣ୍ଡା ହେବା ସମୟରେ କିଛି ଫିଚର୍ ଠିକ ଭାବେ କାମ କରିନଥାଏ।\nଅଧିକ ସୂଚନା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ଆପଣଙ୍କ ଫୋନ୍ ସ୍ୱଚାଳିତ ଭାବେ ଥଣ୍ଡା ହେବାକୁ ଚେଷ୍ଟା କରିବ। ଆପଣ ତଥାପି ନିଜ ଫୋନ୍ ବ୍ୟବହାର କରିପାରିବେ, କିନ୍ତୁ ଏହା ଧୀରେ ଚାଲିପାରେ।\n\nଆପଣଙ୍କ ଫୋନ୍ ଥଣ୍ଡା ହୋଇଯିବାପରେ, ଏହା ସାମାନ୍ୟ ଭାବେ ଚାଲିବ।"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ଯତ୍ନ ନେବା ପାଇଁ ଷ୍ଟେପଗୁଡ଼ିକ ଦେଖନ୍ତୁ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ଚାର୍ଜର୍ ଅନ୍ପ୍ଲଗ୍ କରନ୍ତୁ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ଏହି ଡିଭାଇସ୍ ଚାର୍ଜ କରିବାରେ ଗୋଟିଏ ସମସ୍ୟା ଅଛି। ଯେହେତୁ କେବଳ ଗରମ ହୋଇଯାଇପାରେ, ତେଣୁ ପାୱାର୍ ଆଡପ୍ଟର୍ ଅନ୍ପ୍ଲଗ୍ କରନ୍ତୁ ଏବଂ ଯତ୍ନ ନିଅନ୍ତୁ।"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ସେବା ସମ୍ବନ୍ଧିତ ଷ୍ଟେପ୍ଗୁଡ଼ିକ ଦେଖନ୍ତୁ"</string> diff --git a/packages/SystemUI/res/values-or/strings_tv.xml b/packages/SystemUI/res/values-or/strings_tv.xml index 4593d6ad8c6c..b44dc3bffe12 100644 --- a/packages/SystemUI/res/values-or/strings_tv.xml +++ b/packages/SystemUI/res/values-or/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ପିକଚର୍-ଇନ୍-ପିକଚର୍"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(କୌଣସି ଟାଇଟଲ୍ ପ୍ରୋଗ୍ରାମ୍ ନାହିଁ)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP ବନ୍ଦ କରନ୍ତୁ"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରୀନ୍"</string> <string name="mic_active" msgid="5766614241012047024">"ମାଇକ୍ରୋଫୋନ୍ ସକ୍ରିୟ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ଆପଣଙ୍କର ମାଇକ୍ରୋଫୋନ୍କୁ ଆକ୍ସେସ୍ କରିଛି"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 519606def5fe..6ac824b59e6b 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ਸੈਟਿੰਗਾਂ ਦੇ ਕ੍ਰਮ ਦਾ ਸੰਪਾਦਨ ਕਰੋ।"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> ਦਾ <xliff:g id="ID_1">%1$d</xliff:g> ਪੰਨਾ"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">" ਲਾਕ ਸਕ੍ਰੀਨ"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ਵਿਸਤਾਰ ਕਰੋ"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ਛੋਟਾ ਕਰੋ"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ਬੰਦ ਕਰੋ"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ਸੈਟਿੰਗਾਂ"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ਖਾਰਜ ਕਰਨ ਲਈ ਹੇਠਾਂ ਘਸੀਟੋ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"ਮੀਨੂ"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ਤਸਵੀਰ-ਅੰਦਰ-ਤਸਵੀਰ ਵਿੱਚ ਹੈ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"ਜੇਕਰ ਤੁਸੀਂ ਨਹੀਂ ਚਾਹੁੰਦੇ ਕਿ <xliff:g id="NAME">%s</xliff:g> ਐਪ ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਦੀ ਵਰਤੋਂ ਕਰੇ, ਤਾਂ ਸੈਟਿੰਗਾਂ ਖੋਲ੍ਹਣ ਲਈ ਟੈਪ ਕਰੋ ਅਤੇ ਇਸਨੂੰ ਬੰਦ ਕਰੋ।"</string> - <string name="pip_play" msgid="333995977693142810">"ਚਲਾਓ"</string> - <string name="pip_pause" msgid="1139598607050555845">"ਵਿਰਾਮ ਦਿਓ"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ਅਗਲੇ \'ਤੇ ਜਾਓ"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ਪਿਛਲੇ \'ਤੇ ਜਾਓ"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ਆਕਾਰ ਬਦਲੋ"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"ਗਰਮ ਹੋਣ ਕਾਰਨ ਫ਼ੋਨ ਬੰਦ ਹੋ ਗਿਆ"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ ਸਹੀ ਚੱਲ ਰਿਹਾ ਹੈ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ ਸਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">\n"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬਹੁਤ ਗਰਮ ਸੀ, ਇਸ ਲਈ ਇਹ ਠੰਡਾ ਹੋਣ ਵਾਸਤੇ ਬੰਦ ਹੋ ਗਿਆ ਸੀ। ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ ਸਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n\nਤੁਹਾਡਾ ਫ਼ੋਨ ਬਹੁਤ ਗਰਮ ਹੋ ਸਕਦਾ ਹੈ ਜੇ:\n • ਤੁਸੀਂ ਸਰੋਤਾਂ ਦੀ ਵੱਧ ਵਰਤੋਂ ਵਾਲੀਆਂ ਐਪਾਂ (ਜਿਵੇਂ ਗੇਮਿੰਗ, ਵੀਡੀਓ, ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਐਪਾਂ) ਵਰਤਦੇ ਹੋ • ਵੱਡੀਆਂ ਫ਼ਾਈਲਾਂ ਡਾਊਨਲੋਡ ਜਾਂ ਅੱਪਲੋਡ ਕਰਦੇ ਹੋ\n • ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਉੱਚ ਤਾਪਮਾਨਾਂ ਵਿੱਚ ਵਰਤਦੇ ਹੋ"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ਦੇਖਭਾਲ ਦੇ ਪੜਾਅ ਦੇਖੋ"</string> <string name="high_temp_title" msgid="2218333576838496100">"ਫ਼ੋਨ ਗਰਮ ਹੋ ਰਿਹਾ ਹੈ"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ਫ਼ੋਨ ਦੇ ਠੰਡਾ ਹੋਣ ਦੇ ਦੌਰਾਨ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸੀਮਿਤ ਹੁੰਦੀਆਂ ਹਨ"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ਫ਼ੋਨ ਦੇ ਠੰਡਾ ਹੋਣ ਦੇ ਦੌਰਾਨ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸੀਮਤ ਹੁੰਦੀਆਂ ਹਨ।\nਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਰੂਪ ਵਿੱਚ ਠੰਡਾ ਹੋਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਵਰਤ ਸਕਦੇ ਹੋ, ਪਰੰਤੂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਵਧੇਰੇ ਹੌਲੀ ਚੱਲੇ।\n\nਇੱਕ ਵਾਰ ਠੰਡਾ ਹੋਣ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਫ਼ੋਨ ਸਧਾਰਨ ਤੌਰ \'ਤੇ ਚੱਲੇਗਾ।"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ਦੇਖਭਾਲ ਦੇ ਪੜਾਅ ਦੇਖੋ"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ਚਾਰਜਰ ਨੂੰ ਕੱਢੋ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰਨ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆ ਗਈ ਹੈ। ਪਾਵਰ ਅਡਾਪਟਰ ਨੂੰ ਕੱਢੋ ਅਤੇ ਧਿਆਨ ਰੱਖੋ ਸ਼ਾਇਦ ਕੇਬਲ ਗਰਮ ਹੋਵੇ।"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ਦੇਖਭਾਲ ਦੇ ਪੜਾਅ ਦੇਖੋ"</string> diff --git a/packages/SystemUI/res/values-pa/strings_tv.xml b/packages/SystemUI/res/values-pa/strings_tv.xml index fd567698088b..f5300b318d10 100644 --- a/packages/SystemUI/res/values-pa/strings_tv.xml +++ b/packages/SystemUI/res/values-pa/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ਸਿਰਲੇਖ-ਰਹਿਤ ਪ੍ਰੋਗਰਾਮ)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP ਬੰਦ ਕਰੋ"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string> <string name="mic_active" msgid="5766614241012047024">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਕਿਰਿਆਸ਼ੀਲ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ਨੇ ਤੁਹਾਡੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕੀਤੀ"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index df819ef17b44..f5ef1a045bdd 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Edytuj kolejność ustawień."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Strona <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ekran blokady"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Rozwiń"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimalizuj"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zamknij"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ustawienia"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Przeciągnij w dół, by zamknąć"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"Aplikacja <xliff:g id="NAME">%s</xliff:g> działa w trybie obraz w obrazie"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Jeśli nie chcesz, by aplikacja <xliff:g id="NAME">%s</xliff:g> korzystała z tej funkcji, otwórz ustawienia i wyłącz ją."</string> - <string name="pip_play" msgid="333995977693142810">"Odtwórz"</string> - <string name="pip_pause" msgid="1139598607050555845">"Wstrzymaj"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Dalej"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Wstecz"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Zmień rozmiar"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon wyłączony: przegrzanie"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefon działa teraz normalnie"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon działa teraz normalnie\nKliknij, by dowiedzieć się więcej"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon był zbyt gorący i wyłączył się, by obniżyć temperaturę. Urządzenie działa teraz normalnie.\n\nTelefon może się przegrzać, gdy:\n • Używasz aplikacji zużywających dużo zasobów (np. gier, nawigacji czy odtwarzaczy filmów)\n • Pobierasz lub przesyłasz duże pliki\n • Używasz telefonu w wysokiej temperaturze"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Zobacz instrukcję postępowania"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon się nagrzewa"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Podczas obniżania temperatury telefonu niektóre funkcje są ograniczone"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Podczas obniżania temperatury telefonu niektóre funkcje są ograniczone\nKliknij, by dowiedzieć się więcej"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon automatycznie podejmie próbę obniżenia temperatury. Możesz go wciąż używać, ale telefon może działać wolniej.\n\nGdy temperatura się obniży, telefon będzie działał normalnie."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Zobacz instrukcję postępowania"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Odłącz ładowarkę"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Podczas ładowania tego urządzenia wystąpił błąd. Odłącz zasilacz, zwracając uwagę na kabel, który może być gorący."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Zobacz instrukcję postępowania"</string> @@ -1000,7 +989,7 @@ <string name="slice_permission_deny" msgid="6870256451658176895">"Odmów"</string> <string name="auto_saver_title" msgid="6873691178754086596">"Kliknij, by zaplanować działanie oszczędzania baterii"</string> <string name="auto_saver_text" msgid="3214960308353838764">"Oszczędzanie baterii włącza się, jeśli bateria jest prawie wyczerpana"</string> - <string name="no_auto_saver_action" msgid="7467924389609773835">"Nie"</string> + <string name="no_auto_saver_action" msgid="7467924389609773835">"Nie, dziękuję"</string> <string name="auto_saver_enabled_title" msgid="4294726198280286333">"Harmonogram oszczędzania baterii jest aktywny"</string> <string name="auto_saver_enabled_text" msgid="7889491183116752719">"Oszczędzanie baterii włączy się automatycznie, gdy poziom naładowania baterii spadnie poniżej <xliff:g id="PERCENTAGE">%d</xliff:g>%%."</string> <string name="open_saver_setting_action" msgid="2111461909782935190">"Ustawienia"</string> diff --git a/packages/SystemUI/res/values-pl/strings_tv.xml b/packages/SystemUI/res/values-pl/strings_tv.xml index 852ea5056460..b060141b0275 100644 --- a/packages/SystemUI/res/values-pl/strings_tv.xml +++ b/packages/SystemUI/res/values-pl/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Obraz w obrazie"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program bez tytułu)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zamknij PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Pełny ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon aktywny"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikacja %1$s uzyskała dostęp do mikrofonu"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 8751637ab4fe..c8eaa0ddc4fb 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editar ordem das configurações."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Página <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Tela de bloqueio"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expandir"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Fechar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Configurações"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arraste para baixo para dispensar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> está em picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Se você não quer que o app <xliff:g id="NAME">%s</xliff:g> use este recurso, toque para abrir as configurações e desativá-lo."</string> - <string name="pip_play" msgid="333995977693142810">"Reproduzir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Pular para a próxima"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Pular para a anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionar"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"O smartphone foi desligado devido ao aquecimento"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"O smartphone está sendo executado normalmente agora"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"O smartphone está funcionando normalmente agora.\nToque para saber mais"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"O smartphone estava muito quente e foi desligado para resfriar. Agora, ele está sendo executado normalmente.\n\nO smartphone pode ficar quente demais se você:\n • usar apps que consomem muitos recursos (como apps de jogos, vídeos ou navegação);\n • fizer o download ou upload de arquivos grandes;\n • usar o smartphone em temperaturas altas."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ver etapas de cuidado"</string> <string name="high_temp_title" msgid="2218333576838496100">"O smartphone está esquentando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Alguns recursos ficam limitados enquanto o smartphone é resfriado"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Alguns recursos ficam limitados enquanto o smartphone é resfriado.\nToque para saber mais"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Seu smartphone tentará se resfriar automaticamente. Você ainda poderá usá-lo, mas talvez ele fique mais lento.\n\nQuando o smartphone estiver resfriado, ele voltará ao normal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ver etapas de cuidado"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconecte o carregador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Ocorreu um problema com o carregamento deste dispositivo. Desconecte o adaptador de energia com cuidado, já que o cabo pode estar quente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver etapas de cuidado"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml index a0cbeafb9c9a..19cb4eacf402 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(programa sem título)"</string> - <string name="pip_close" msgid="5775212044472849930">"Fechar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Tela cheia"</string> <string name="mic_active" msgid="5766614241012047024">"Microfone ativado"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s acessou seu microfone"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 11c94642cbc6..6b8b674ea412 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editar a ordem das definições."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Página <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ecrã de bloqueio"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expandir"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Fechar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Definições"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arrastar para baixo para ignorar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <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">"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="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionar"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telem. deslig. devido ao calor"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"O telemóvel está a funcionar normalmente"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"O seu telemóvel já está a funcionar normalmente.\nToque para obter mais informações."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"O telemóvel estava muito quente, por isso desligou-se para arrefecer. Agora funciona normalmente.\n\nO telemóvel pode sobreaquecer se:\n • Utilizar aplicações que utilizam mais recursos (jogos, vídeo ou aplicações de navegação)\n • Transferir ou carregar ficheiros grandes\n • Utilizar em altas temperaturas"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Veja os passos de manutenção"</string> <string name="high_temp_title" msgid="2218333576838496100">"O telemóvel está a aquecer"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Algumas funcionalidades são limitadas enquanto o telemóvel arrefece"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Algumas funcionalidades são limitadas enquanto o telemóvel arrefece.\nToque para obter mais informações."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"O telemóvel tenta arrefecer automaticamente. Pode continuar a utilizá-lo, mas este poderá funcionar mais lentamente.\n\nAssim que o telemóvel tiver arrefecido, funcionará normalmente."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Veja os passos de manutenção"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desligar o carregador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Ocorreu um problema ao carregar este dispositivo. Desligue o transformador e tenha cuidado porque o cabo pode estar quente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver os passos a ter em consideração"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml index 65a6f03ede5a..2e60421c9008 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Ecrã no ecrã"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Sem título do programa)"</string> - <string name="pip_close" msgid="5775212044472849930">"Fechar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Ecrã inteiro"</string> <string name="mic_active" msgid="5766614241012047024">"Microfone ativado"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s acedeu ao microfone"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 8751637ab4fe..c8eaa0ddc4fb 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editar ordem das configurações."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Página <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Tela de bloqueio"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Expandir"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizar"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Fechar"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Configurações"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Arraste para baixo para dispensar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> está em picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Se você não quer que o app <xliff:g id="NAME">%s</xliff:g> use este recurso, toque para abrir as configurações e desativá-lo."</string> - <string name="pip_play" msgid="333995977693142810">"Reproduzir"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausar"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Pular para a próxima"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Pular para a anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionar"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"O smartphone foi desligado devido ao aquecimento"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"O smartphone está sendo executado normalmente agora"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"O smartphone está funcionando normalmente agora.\nToque para saber mais"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"O smartphone estava muito quente e foi desligado para resfriar. Agora, ele está sendo executado normalmente.\n\nO smartphone pode ficar quente demais se você:\n • usar apps que consomem muitos recursos (como apps de jogos, vídeos ou navegação);\n • fizer o download ou upload de arquivos grandes;\n • usar o smartphone em temperaturas altas."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Ver etapas de cuidado"</string> <string name="high_temp_title" msgid="2218333576838496100">"O smartphone está esquentando"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Alguns recursos ficam limitados enquanto o smartphone é resfriado"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Alguns recursos ficam limitados enquanto o smartphone é resfriado.\nToque para saber mais"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Seu smartphone tentará se resfriar automaticamente. Você ainda poderá usá-lo, mas talvez ele fique mais lento.\n\nQuando o smartphone estiver resfriado, ele voltará ao normal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Ver etapas de cuidado"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Desconecte o carregador"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Ocorreu um problema com o carregamento deste dispositivo. Desconecte o adaptador de energia com cuidado, já que o cabo pode estar quente."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Ver etapas de cuidado"</string> diff --git a/packages/SystemUI/res/values-pt/strings_tv.xml b/packages/SystemUI/res/values-pt/strings_tv.xml index a0cbeafb9c9a..19cb4eacf402 100644 --- a/packages/SystemUI/res/values-pt/strings_tv.xml +++ b/packages/SystemUI/res/values-pt/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(programa sem título)"</string> - <string name="pip_close" msgid="5775212044472849930">"Fechar PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Tela cheia"</string> <string name="mic_active" msgid="5766614241012047024">"Microfone ativado"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s acessou seu microfone"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 7529f046a734..08542c02c2e0 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Editați ordinea setărilor."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Pagina <xliff:g id="ID_1">%1$d</xliff:g> din <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ecran de blocare"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Extindeți"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizați"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Închideți"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Setări"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Trageți în jos pentru a închide"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meniu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> este în modul picture-in-picture"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Dacă nu doriți ca <xliff:g id="NAME">%s</xliff:g> să utilizeze această funcție, atingeți pentru a deschide setările și dezactivați-o."</string> - <string name="pip_play" msgid="333995977693142810">"Redați"</string> - <string name="pip_pause" msgid="1139598607050555845">"Întrerupeți"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Treceți la următorul"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Treceți la cel anterior"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Redimensionați"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefonul s-a oprit din cauza încălzirii"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Acum telefonul funcționează normal"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Acum telefonul funcționează normal.\nAtingeți pentru mai multe informații"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonul se încălzise prea mult și s-a oprit pentru a se răci. Acum telefonul funcționează normal.\n\nTelefonul s-ar putea încălzi prea mult dacă:\n • folosiți aplicații care consumă multe resurse (de ex., jocuri, aplicații video/de navigare);\n • descărcați/încărcați fișiere mari;\n • folosiți telefonul la temperaturi ridicate."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Vedeți pașii pentru îngrijire"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefonul se încălzește"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Anumite funcții sunt limitate în timp ce telefonul se răcește"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Anumite funcții sunt limitate în timp ce telefonul se răcește.\nAtingeți pentru mai multe informații"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonul va încerca automat să se răcească. Puteți folosi telefonul în continuare, dar este posibil să funcționeze mai lent.\n\nDupă ce se răcește, telefonul va funcționa normal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Vedeți pașii pentru îngrijire"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Deconectați încărcătorul"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Există o problemă la încărcarea acestui dispozitiv. Deconectați adaptorul de curent și aveți grijă, deoarece cablul poate fi cald."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Vedeți pașii pentru îngrijire"</string> diff --git a/packages/SystemUI/res/values-ro/strings_tv.xml b/packages/SystemUI/res/values-ro/strings_tv.xml index 1bfbd71fef9b..f4349ff91b05 100644 --- a/packages/SystemUI/res/values-ro/strings_tv.xml +++ b/packages/SystemUI/res/values-ro/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-Picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program fără titlu)"</string> - <string name="pip_close" msgid="5775212044472849930">"Închideți PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Ecran complet"</string> <string name="mic_active" msgid="5766614241012047024">"Microfon activ"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s a accesat microfonul"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 8a2cdc911c17..12c489e08e41 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Изменить порядок быстрых настроек."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Страница <xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Заблокированный экран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Развернуть"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Свернуть"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Закрыть"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Настройки"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Чтобы закрыть, потяните вниз"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Меню"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> находится в режиме \"Картинка в картинке\""</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Чтобы отключить эту функцию для приложения \"<xliff:g id="NAME">%s</xliff:g>\", перейдите в настройки."</string> - <string name="pip_play" msgid="333995977693142810">"Воспроизвести"</string> - <string name="pip_pause" msgid="1139598607050555845">"Приостановить"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Перейти к следующему"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Перейти к предыдущему"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Изменить размер"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефон выключился из-за перегрева"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Сейчас телефон работает нормально"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Сейчас телефон работает нормально.\nНажмите, чтобы получить дополнительную информацию"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Ваш телефон выключился из-за перегрева. Сейчас он работает нормально.\n\nВозможные причины перегрева телефона:\n • использование ресурсоемких игр и приложений, связанных с видео или навигацией);\n • скачивание или загрузка больших файлов;\n • высокая температура окружающей среды."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Подробнее о действиях при перегреве…"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефон нагревается"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Пока телефон не остынет, некоторые функции могут быть недоступны."</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Пока телефон не остынет, некоторые функции могут быть недоступны.\nНажмите, чтобы получить дополнительную информацию"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ваш телефон остынет автоматически.\n\nОбратите внимание, что до тех пор он может работать медленнее, чем обычно."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Подробнее о действиях при перегреве…"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Отключите зарядное устройство"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Во время зарядки возникла проблема. Отключите адаптер питания. Будьте осторожны, кабель может быть горячим."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Подробнее о действиях при перегреве…"</string> diff --git a/packages/SystemUI/res/values-ru/strings_tv.xml b/packages/SystemUI/res/values-ru/strings_tv.xml index b668cf96908b..b8638b711176 100644 --- a/packages/SystemUI/res/values-ru/strings_tv.xml +++ b/packages/SystemUI/res/values-ru/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Картинка в картинке"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Без названия)"</string> - <string name="pip_close" msgid="5775212044472849930">"\"Кадр в кадре\" – выйти"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Во весь экран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофон включен"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Приложение \"%1$s\" использовало доступ к микрофону."</string> </resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 0b35922d2c71..412050f4bb7f 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"සැකසීම්වල අනුපිළිවෙළ සංංස්කරණය කරන්න."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> න් <xliff:g id="ID_1">%1$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"අගුලු තිරය"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"දිග හරින්න"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"කුඩා කරන්න"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"වසන්න"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"සැකසීම්"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ඉවත ලෑමට පහළට ඇදගෙන යන්න"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"මෙනුව"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> පින්තූරය-තුළ-පින්තූරය තුළ වේ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"ඔබට <xliff:g id="NAME">%s</xliff:g> මෙම විශේෂාංගය භාවිත කිරීමට අවශ්ය නැති නම්, සැකසීම් විවෘත කිරීමට තට්ටු කර එය ක්රියාවිරහිත කරන්න."</string> - <string name="pip_play" msgid="333995977693142810">"ධාවනය කරන්න"</string> - <string name="pip_pause" msgid="1139598607050555845">"විරාම කරන්න"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ඊළඟ එකට පනින්න"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"පෙර එකට පනින්න"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ප්රතිප්රමාණ කරන්න"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"දුරකථනය රත් වීම නිසා ක්රියාවිරහිත කරන ලදී"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ඔබගේ දුරකථනය දැන් සාමාන්ය ලෙස ධාවනය වේ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ඔබගේ දුරකථනය දැන් සාමාන්ය ලෙස ධාවනය වේ.\nතව තතු සඳහා තට්ටු කරන්න"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"ඔබේ දුරකථනය ඉතාම උණුසුම්ය, එම නිසා එය සිසිල් වීමට ක්රියාවිරහිත කරන ලදී. ධැන් ඔබේ දුරකථනය සාමාන්ය පරිදි ධාවනය වේ.\n\nඔබ පහත දේවල් සිදු කළහොත් ඔබේ දුරකථනය ඉතාම උණුසුම් විය හැකිය:\n • සම්පත්-දැඩි සත්කාරක යෙදුම් භාවිතය (ක්රීඩා, වීඩියෝ, හෝ සංචලන යෙදුම් යනාදී)\n • විශාල ගොනු බාගැනීම හෝ උඩුගත කිරීම\n • ඔබේ දුරකථනය අධික උෂ්ණත්වයේදී භාවිත කිරීම"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"රැකවරණ පියවර බලන්න"</string> <string name="high_temp_title" msgid="2218333576838496100">"දුරකථනය උණුසුම් වෙමින්"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"දුරකථනය සිසිල් වන අතරතුර සමහර විශේෂාංග සීමිත විය හැකිය"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"දුරකථනය සිසිල් වන අතරතුර සමහර විශේෂාංග සීමිත විය හැකිය.\nතව තතු සඳහා තට්ටු කරන්න"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"ඔබගේ දුරකථනය ස්වයංක්රියව සිසිල් වීමට උත්සාහ කරනු ඇත. ඔබට තවම ඔබේ දුරකථනය භාවිත කළ හැකිය, නමුත් එය සෙමින් ධාවනය විය හැකිය.\n\nඔබේ දුරකථනය සිසිල් වූ පසු, එය සාමාන්ය ලෙස ධාවනය වනු ඇත."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"රැකවරණ පියවර බලන්න"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"චාජරය පේනුවෙන් ඉවත් කරන්න"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"මෙම උපාංගය ආරෝපණ කිරීමේ ගැටලුවක් තිබේ බල ඇඩැප්ටරය ගලවා කේබලය උණුසුම් විය හැකි බැවින් පරෙස්සම් වන්න."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"රැකවරණ පියවර බලන්න"</string> diff --git a/packages/SystemUI/res/values-si/strings_tv.xml b/packages/SystemUI/res/values-si/strings_tv.xml index 167d10578f16..411c0a075914 100644 --- a/packages/SystemUI/res/values-si/strings_tv.xml +++ b/packages/SystemUI/res/values-si/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"පින්තූරය-තුළ-පින්තූරය"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(මාතෘකාවක් නැති වැඩසටහන)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP වසන්න"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"සම්පූර්ණ තිරය"</string> <string name="mic_active" msgid="5766614241012047024">"මයික්රොෆෝනය සක්රියයි"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ඔබේ මයික්රොෆෝනයට ප්රවේශ වී ඇත"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index ab5a3885ae5f..f657d4fe71e7 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Upraviť poradie nastavení"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Strana <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Uzamknutá obrazovka"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Rozbaliť"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimalizovať"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zavrieť"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Nastavenia"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Zrušíte presunutím nadol"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Ponuka"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> je v režime obraz v obraze"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ak nechcete, aby aplikácia <xliff:g id="NAME">%s</xliff:g> používala túto funkciu, klepnutím otvorte nastavenia a vypnite ju."</string> - <string name="pip_play" msgid="333995977693142810">"Prehrať"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pozastaviť"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Preskočiť na ďalšie"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Preskočiť na predchádzajúce"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Zmeniť veľkosť"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefón sa vypol z dôvodu prehriatia"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Teraz telefón funguje ako obvykle"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Teraz telefón funguje ako obvykle.\nViac sa dozviete po klepnutí."</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefón bol príliš horúci, preto sa vypol, aby vychladol. Teraz funguje ako obvykle.\n\nTelefón sa môže príliš zahriať v týchto prípadoch:\n • používanie náročných aplikácií (napr. hier, videí alebo navigácie);\n • sťahovanie alebo nahrávanie veľkých súborov;\n • používanie telefónu pri vysokých teplotách."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Zobraziť opatrenia"</string> <string name="high_temp_title" msgid="2218333576838496100">"Teplota telefónu stúpa"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Niektoré funkcie budú obmedzené, dokým neklesne teplota telefónu"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Niektoré funkcie budú obmedzené, dokým neklesne teplota telefónu.\nViac sa dozviete po klepnutí."</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Váš telefón sa automaticky pokúsi schladiť. Môžete ho naďalej používať, ale môže fungovať pomalšie.\n\nPo poklese teploty bude telefón fungovať ako normálne."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Zobraziť opatrenia"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Odpojte nabíjačku"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Vyskytol sa problém s nabíjaním tohto zariadenia. Odpojte nabíjačku a postupujte opatrne, pretože kábel môže byť horúci."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Zobraziť opatrenia"</string> diff --git a/packages/SystemUI/res/values-sk/strings_tv.xml b/packages/SystemUI/res/values-sk/strings_tv.xml index 562742ae5f1b..b52dada595c7 100644 --- a/packages/SystemUI/res/values-sk/strings_tv.xml +++ b/packages/SystemUI/res/values-sk/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Obraz v obraze"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program bez názvu)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zavrieť režim PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Celá obrazovka"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofón je aktívny"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikácia %1$s použila váš mikrofón"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 1211944ef68b..e1e5852098b9 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Uredi vrstni red nastavitev."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>. stran od <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Zaklenjen zaslon"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Razširi"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimiraj"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Zapri"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Nastavitve"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Povlecite navzdol, da opustite"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meni"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> je v načinu slika v sliki"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Če ne želite, da aplikacija <xliff:g id="NAME">%s</xliff:g> uporablja to funkcijo, se dotaknite, da odprete nastavitve, in funkcijo izklopite."</string> - <string name="pip_play" msgid="333995977693142810">"Predvajaj"</string> - <string name="pip_pause" msgid="1139598607050555845">"Začasno ustavi"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Preskoči na naslednjega"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Preskoči na prejšnjega"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Spremeni velikost"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Tel. izklopljen zaradi vročine"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Zdaj telefon normalno deluje"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefon zdaj deluje normalno.\nDotaknite se za več informacij"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon je bil prevroč, zato se je izklopil, da se ohladi. Zdaj normalno deluje.\n\nTelefon lahko postane prevroč ob:\n • uporabi aplikacij, ki intenzivno porabljajo sredstva (npr. za igranje iger, videoposnetke ali navigacijo)\n • prenosu ali nalaganju velikih datotek\n • uporabi telefona pri visokih temp."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Oglejte si navodila za ukrepanje"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon se segreva"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Nekatere funkcije bodo med ohlajanjem omejene."</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Nekatere funkcije bodo med ohlajanjem telefona omejene.\nDotaknite se za več informacij"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon se bo samodejno poskusil ohladiti. Še naprej ga lahko uporabljate, vendar bo morda deloval počasneje.\n\nKo se telefon ohladi, bo zopet deloval kot običajno."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Oglejte si navodila za ukrepanje"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Odklopite polnilnik"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Pri polnjenju te naprave je prišlo do težave. Previdno odklopite napajalnik, ker se je kabel morda segrel."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Oglejte si navodila za ukrepanje"</string> diff --git a/packages/SystemUI/res/values-sl/strings_tv.xml b/packages/SystemUI/res/values-sl/strings_tv.xml index d3e4f259f881..109d797ebcf9 100644 --- a/packages/SystemUI/res/values-sl/strings_tv.xml +++ b/packages/SystemUI/res/values-sl/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Slika v sliki"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program brez naslova)"</string> - <string name="pip_close" msgid="5775212044472849930">"Zapri način PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Celozaslonsko"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon je aktiven"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Aplikacija %1$s je dostopala do mikrofona"</string> </resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index b9300c4777d8..64d7a2ecac52 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Modifiko rendin e cilësimeve."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Faqja <xliff:g id="ID_1">%1$d</xliff:g> nga <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ekrani i kyçjes"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Zgjero"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimizo"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Mbyll"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Cilësimet"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Zvarrit poshtë për të larguar"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menyja"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> është në figurë brenda figurës"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Nëse nuk dëshiron që <xliff:g id="NAME">%s</xliff:g> ta përdorë këtë funksion, trokit për të hapur cilësimet dhe për ta çaktivizuar."</string> - <string name="pip_play" msgid="333995977693142810">"Luaj"</string> - <string name="pip_pause" msgid="1139598607050555845">"Ndërprit"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Kalo te tjetra"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Kalo tek e mëparshmja"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ndrysho përmasat"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefoni u fik për shkak të nxehtësisë"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefoni tani punon normalisht"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefoni tani punon normalisht.\nTrokit për më shumë informacione"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefoni yt ishte tepër i nxehtë, prandaj u fik për t\'u ftohur. Telefoni tani punon normalisht.\n\nTelefoni mund të nxehet së tepërmi nëse ti:\n • Përdor aplikacione intensive për burimet (siç janë aplikacionet e lojërave, videove apo aplikacionet e navigimit)\n • Shkarkon ose ngarkon skedarë të mëdhenj\n • E përdor telefonin në temperatura të larta"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Shiko hapat për kujdesin"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefoni po bëhet i ngrohtë"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Disa funksione janë të kufizuara kur telefoni është duke u ftohur"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Disa veçori janë të kufizuara kur telefoni është duke u ftohur.\nTrokit për më shumë informacione"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefoni yt do të përpiqet automatikisht që të ftohet. Mund ta përdorësh përsëri telefonin, por ai mund të punojë më ngadalë.\n\nPasi telefoni të jetë ftohur, ai do të punojë si normalisht."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Shiko hapat për kujdesin"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Shkëput karikuesin"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Ka një problem me karikimin e kësaj pajisjeje. Hiqe spinën dhe trego kujdes pasi kablloja mund të jetë e ngrohtë."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Shiko hapat për kujdesin"</string> diff --git a/packages/SystemUI/res/values-sq/strings_tv.xml b/packages/SystemUI/res/values-sq/strings_tv.xml index 624be930cc92..6cecdb6e38f4 100644 --- a/packages/SystemUI/res/values-sq/strings_tv.xml +++ b/packages/SystemUI/res/values-sq/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Figurë brenda figurës"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Program pa titull)"</string> - <string name="pip_close" msgid="5775212044472849930">"Mbyll PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Ekrani i plotë"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofoni aktiv"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s pati qasje te mikrofoni yt"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index a01ee85ff11d..fd6f57e64113 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -921,25 +921,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Измени редослед подешавања."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>. страна од <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Закључан екран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Прошири"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Умањи"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Затвори"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Подешавања"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Превуците надоле да бисте одбили"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Мени"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> је слика у слици"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ако не желите да <xliff:g id="NAME">%s</xliff:g> користи ову функцију, додирните да бисте отворили подешавања и искључили је."</string> - <string name="pip_play" msgid="333995977693142810">"Пусти"</string> - <string name="pip_pause" msgid="1139598607050555845">"Паузирај"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Пређи на следеће"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Пређи на претходно"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Промените величину"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефон се искључио због топлоте"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Телефон сада нормално ради"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Телефон сада нормално ради.\nДодирните за више информација"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефон је био преврућ, па се искључио да се охлади. Сада ради нормално.\n\nТелефон може превише да се угреје ако:\n • Користите апликације које захтевају пуно ресурса (нпр. видео игре, видео или апликације за навигацију)\n • Преузимате/отпремате велике датотеке\n • Користите телефон на високој температури"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Погледајте упозорења"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефон се загрејао"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Неке функције су ограничене док се телефон не охлади"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Неке функције су ограничене док се телефон не охлади.\nДодирните за више информација"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Телефон ће аутоматски покушати да се охлади. И даље ћете моћи да користите телефон, али ће спорије реаговати.\n\nКада се телефон охлади, нормално ће радити."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Погледајте упозорења"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Искључите пуњач из напајања"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Дошло је до проблема са пуњењем овог уређаја. Искључите адаптер из напајања и будите пажљиви јер кабл може да буде топао."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Погледајте упозорења"</string> diff --git a/packages/SystemUI/res/values-sr/strings_tv.xml b/packages/SystemUI/res/values-sr/strings_tv.xml index 96846e702002..322938f4f787 100644 --- a/packages/SystemUI/res/values-sr/strings_tv.xml +++ b/packages/SystemUI/res/values-sr/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Слика у слици"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Програм без наслова)"</string> - <string name="pip_close" msgid="5775212044472849930">"Затвори PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Цео екран"</string> <string name="mic_active" msgid="5766614241012047024">"Микрофон је активан"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Апликација %1$s је приступила микрофону"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 9b1ab7f4b342..f96dd27aba6d 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Ändra ordning på inställningarna."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Sida <xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Låsskärm"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Utöka"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Minimera"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Stäng"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Inställningar"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Tryck och dra nedåt för att ta bort"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Meny"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> visas i bild-i-bild"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Om du inte vill att den här funktionen används i <xliff:g id="NAME">%s</xliff:g> öppnar du inställningarna genom att trycka. Sedan inaktiverar du funktionen."</string> - <string name="pip_play" msgid="333995977693142810">"Spela upp"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pausa"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Hoppa till nästa"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Hoppa till föregående"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Ändra storlek"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Mobilen stängdes av pga. värme"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Mobilen fungerar nu som vanligt"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonen fungerar nu som vanligt.\nTryck för mer information"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Mobilen var för varm och stängdes av för att kylas ned. Den fungerar nu som vanligt.\n\nMobilen kan bli för varm om du\n • använder resurskrävande appar (till exempel spel-, video- eller navigeringsappar)\n • laddar ned eller laddar upp stora filer\n • använder mobilen vid höga temperaturer."</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Visa alla skötselråd"</string> <string name="high_temp_title" msgid="2218333576838496100">"Mobilen börjar bli varm"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Vissa funktioner är begränsade medan mobilen svalnar"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Vissa funktioner är begränsade medan telefonen svalnar.\nTryck för mer information"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Mobilen försöker svalna automatiskt. Du kan fortfarande använda mobilen, men den kan vara långsammare än vanligt.\n\nMobilen fungerar som vanligt när den har svalnat."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Visa alla skötselråd"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Koppla ur laddaren"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Det går inte att ladda denna enhet. Koppla ur nätadaptern, men var försiktig eftersom kabeln kan vara varm."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Visa alla skötselråd"</string> diff --git a/packages/SystemUI/res/values-sv/strings_tv.xml b/packages/SystemUI/res/values-sv/strings_tv.xml index cf40057a005a..fb28af449fb7 100644 --- a/packages/SystemUI/res/values-sv/strings_tv.xml +++ b/packages/SystemUI/res/values-sv/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Bild-i-bild"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Namnlöst program)"</string> - <string name="pip_close" msgid="5775212044472849930">"Stäng PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Helskärm"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofonen är aktiv"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s har fått åtkomst till mikrofonen"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 512200976263..8b8c24983e98 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Badilisha orodha ya mipangilio."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Ukurasa wa <xliff:g id="ID_1">%1$d</xliff:g> kati ya <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Skrini iliyofungwa"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Panua"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Punguza"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Funga"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Mipangilio"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Buruta ili uondoe"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menyu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> iko katika hali ya picha ndani ya picha nyingine"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Ikiwa hutaki <xliff:g id="NAME">%s</xliff:g> itumie kipengele hiki, gusa ili ufungue mipangilio na uizime."</string> - <string name="pip_play" msgid="333995977693142810">"Cheza"</string> - <string name="pip_pause" msgid="1139598607050555845">"Sitisha"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Ruka ufikie inayofuata"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Ruka ufikie iliyotangulia"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Badilisha ukubwa"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Simu ilizima kutokana na joto"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Simu yako sasa inafanya kazi ipasavyo"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Simu yako sasa inafanya kazi ipasavyo.\nGusa ili upate maelezo zaidi"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Simu yako ilikuwa moto sana, kwa hivyo ilijizima ili ipoe. Simu yako sasa inafanya kazi ipasavyo.\n\nSimu yako inaweza kuwa moto sana ikiwa:\n • Unatumia programu zinazotumia vipengee vingi (kama vile michezo ya video, video au programu za uelekezaji)\n • Unapakua au upakie faili kubwa\n • Unatumia simu yako katika maeneo yenye halijoto ya juu"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Angalia hatua za utunzaji"</string> <string name="high_temp_title" msgid="2218333576838496100">"Joto la simu linaongezeka"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Baadhi ya vipengele havitatumika kwenye simu wakati inapoa"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Baadhi ya vipengele havitatumika kwenye simu wakati inapoa.\nGusa ili upate maelezo zaidi"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Simu yako itajaribu kupoa kiotomatiki. Bado unaweza kutumia simu yako, lakini huenda ikafanya kazi polepole. \n\nPindi simu yako itakapopoa, itaendelea kufanya kazi kama kawaida."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Angalia hatua za utunzaji"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Chomoa chaja"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Kuna tatizo la kuchaji kifaa hiki. Chomoa adapta ya nishati na uwe mwangalifu, huenda kebo ni moto."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Angalia hatua za ulinzi"</string> diff --git a/packages/SystemUI/res/values-sw/strings_tv.xml b/packages/SystemUI/res/values-sw/strings_tv.xml index 7e2a64cf5a6c..b51f93410bb4 100644 --- a/packages/SystemUI/res/values-sw/strings_tv.xml +++ b/packages/SystemUI/res/values-sw/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picha ndani ya picha"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Programu isiyo na jina)"</string> - <string name="pip_close" msgid="5775212044472849930">"Funga PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Skrini nzima"</string> <string name="mic_active" msgid="5766614241012047024">"Maikrofoni Inatumika"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s imefikia maikrofoni yako"</string> </resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index b757fb00cffb..b97e266850c6 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"அமைப்புகளின் வரிசை முறையைத் திருத்து."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"பக்கம் <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"லாக் ஸ்கிரீன்"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"விரி"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"சிறிதாக்கு"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"மூடு"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"அமைப்புகள்"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"நிராகரிக்க, கீழே இழுக்கவும்"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"மெனு"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> தற்போது பிக்ச்சர்-இன்-பிக்ச்சரில் உள்ளது"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> இந்த அம்சத்தைப் பயன்படுத்த வேண்டாம் என நினைத்தால் இங்கு தட்டி அமைப்புகளைத் திறந்து இதை முடக்கவும்."</string> - <string name="pip_play" msgid="333995977693142810">"இயக்கு"</string> - <string name="pip_pause" msgid="1139598607050555845">"இடைநிறுத்து"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"அடுத்ததற்குச் செல்"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"முந்தையதற்குச் செல்"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"அளவு மாற்று"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"வெப்பத்தினால் ஃபோன் ஆஃப் செய்யப்பட்டது"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"இப்போது உங்கள் ஃபோன் இயல்புநிலையில் இயங்குகிறது"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"இப்போது உங்கள் மொபைல் இயல்புநிலையில் இயங்குகிறது.\nமேலும் தகவலுக்கு தட்டவும்"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"உங்கள் ஃபோன் அதிகமாகச் சூடானதால், அதன் சூட்டைக் குறைக்க, ஆஃப் செய்யப்பட்டது. இப்போது உங்கள் ஃபோன் இயல்புநிலையில் இயங்குகிறது.\n\nபின்வருவனவற்றைச் செய்தால், ஃபோன் சூடாகலாம்:\n • அதிகளவு தரவைப் பயன்படுத்தும் ஆப்ஸை (எ.கா: கேமிங், வீடியோ (அ) வழிகாட்டுதல் ஆப்ஸ்) பயன்படுத்துவது\n • பெரிய கோப்புகளைப் பதிவிறக்குவது/பதிவேற்றுவது\n • அதிக வெப்பநிலையில் ஃபோனைப் பயன்படுத்துவது"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"மேலும் விவரங்களுக்கு இதைப் பார்க்கவும்"</string> <string name="high_temp_title" msgid="2218333576838496100">"மொபைல் சூடாகிறது"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"மொபைலின் வெப்ப அளவு குறையும் போது, சில அம்சங்களைப் பயன்படுத்த முடியாது"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"மொபைலின் வெப்ப அளவு குறையும் வரை சில அம்சங்களைப் பயன்படுத்த முடியாது.\nமேலும் தகவலுக்கு தட்டவும்"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"உங்கள் மொபைலின் வெப்ப அளவு தானாகவே குறையும். தொடர்ந்து நீங்கள் மொபைலைப் பயன்படுத்தலாம், ஆனால் அதன் வேகம் குறைவாக இருக்கக்கூடும்.\n\nமொபைலின் வெப்ப அளவு குறைந்தவுடன், அது இயல்பு நிலையில் இயங்கும்."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"மேலும் விவரங்களுக்கு இதைப் பார்க்கவும்"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"சார்ஜரைத் துண்டிக்கவும்"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதில் சிக்கல் உள்ளது. பவர் அடாப்டரைத் துண்டிக்கவும், கேபிள் சூடாக இருக்கக்கூடும் என்பதால் கவனமாகக் கையாளவும்."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"மேலும் விவரங்களுக்கு இதைப் பார்க்கவும்"</string> diff --git a/packages/SystemUI/res/values-ta/strings_tv.xml b/packages/SystemUI/res/values-ta/strings_tv.xml index 43418053f841..1ae3d1d3bdcd 100644 --- a/packages/SystemUI/res/values-ta/strings_tv.xml +++ b/packages/SystemUI/res/values-ta/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"பிக்ச்சர்-இன்-பிக்ச்சர்"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(தலைப்பு இல்லை)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIPஐ மூடு"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"முழுத்திரை"</string> <string name="mic_active" msgid="5766614241012047024">"மைக்ரோஃபோன் செயலிலுள்ளது"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s உங்கள் மைக்ரோஃபோனைப் பயன்படுத்தியது"</string> </resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index ccca95dd5ba3..13319d9719b8 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"సెట్టింగ్ల క్రమాన్ని సవరించండి."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g>లో <xliff:g id="ID_1">%1$d</xliff:g>వ పేజీ"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"లాక్ స్క్రీన్"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"విస్తరింపజేయి"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"కనిష్టీకరించు"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"మూసివేయి"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"సెట్టింగ్లు"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"తీసివేయడానికి కిందికి లాగండి"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"మెను"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> చిత్రంలో చిత్రం రూపంలో ఉంది"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> ఈ లక్షణాన్ని ఉపయోగించకూడదు అని మీరు అనుకుంటే, సెట్టింగ్లను తెరవడానికి ట్యాప్ చేసి, దీన్ని ఆఫ్ చేయండి."</string> - <string name="pip_play" msgid="333995977693142810">"ప్లే చేయి"</string> - <string name="pip_pause" msgid="1139598607050555845">"పాజ్ చేయి"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"దాటవేసి తర్వాత దానికి వెళ్లు"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"దాటవేసి మునుపటి దానికి వెళ్లు"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"పరిమాణం మార్చు"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"వేడెక్కినందుకు ఫోన్ ఆఫ్ చేయబడింది"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"మీ ఫోన్ ఇప్పుడు సాధారణంగా పని చేస్తుంది"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"మీ ఫోన్ ఇప్పుడు సాధారణంగా పని చేస్తోంది.\nమరింత సమాచారం కోసం ట్యాప్ చేయండి"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"మీ ఫోన్ చాలా వేడిగా ఉంది, కనుక చల్లబర్చడానికి ఆఫ్ చేయబడింది. మీ ఫోన్ ఇప్పుడు సాధారణంగా పని చేస్తుంది.\n\nమీరు ఇలా చేస్తే మీ ఫోన్ చాలా వేడెక్కవచ్చు:\n • వనరు-ఆధారిత అనువర్తనాలు (గేమింగ్, వీడియో లేదా నావిగేషన్ వంటి అనువర్తనాలు) ఉపయోగించడం\n • పెద్ద ఫైల్లను డౌన్లోడ్ లేదా అప్లోడ్ చేయడం\n • అధిక ఉష్ణోగ్రతలలో మీ ఫోన్ని ఉపయోగించడం"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"తీసుకోవాల్సిన జాగ్రత్తలు ఏమిటో చూడండి"</string> <string name="high_temp_title" msgid="2218333576838496100">"ఫోన్ వేడెక్కుతోంది"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ఫోన్ను చల్లబరిచే క్రమంలో కొన్ని లక్షణాలు పరిమితం చేయబడ్డాయి"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ఫోన్ను చల్లబరిచే క్రమంలో కొన్ని ఫీచర్లు పరిమితం చేయబడ్డాయి.\nమరింత సమాచారం కోసం ట్యాప్ చేయండి"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"మీ ఫోన్ స్వయంచాలకంగా చల్లబడటానికి ప్రయత్నిస్తుంది. మీరు ఇప్పటికీ మీ ఫోన్ను ఉపయోగించవచ్చు, కానీ దాని పనితీరు నెమ్మదిగా ఉండవచ్చు.\n\nమీ ఫోన్ చల్లబడిన తర్వాత, అది సాధారణ రీతిలో పని చేస్తుంది."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"తీసుకోవాల్సిన జాగ్రత్తలు ఏమిటో చూడండి"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ప్లగ్ నుండి ఛార్జర్ తీసివేయండి"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"ఈ పరికరాన్ని ఛార్జ్ చేయడంలో సమస్య ఉంది. పవర్ అడాప్టర్ను ప్లగ్ నుండి తీసివేసి, కేబుల్ ఏమైనా వేడిగా అయితే తగిన జాగ్రత్తలు తీసుకోండి."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"తీసుకోవాల్సిన జాగ్రత్తలు ఏమిటో చూడండి"</string> diff --git a/packages/SystemUI/res/values-te/strings_tv.xml b/packages/SystemUI/res/values-te/strings_tv.xml index df8b06d6705a..27911795d771 100644 --- a/packages/SystemUI/res/values-te/strings_tv.xml +++ b/packages/SystemUI/res/values-te/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"పిక్చర్-ఇన్-పిక్చర్"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(శీర్షిక లేని ప్రోగ్రామ్)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIPని మూసివేయి"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"పూర్తి స్క్రీన్"</string> <string name="mic_active" msgid="5766614241012047024">"మైక్రోఫోన్ యాక్టివ్గా ఉంది"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"మీ మైక్రోఫోన్ను %1$s యాక్సెస్ చేసింది"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 514481ee8b7b..e1c0e7e7a614 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"แก้ไขลำดับการตั้งค่า"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"หน้า <xliff:g id="ID_1">%1$d</xliff:g> จาก <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"หน้าจอล็อก"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"ขยาย"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"ย่อเล็กสุด"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"ปิด"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"การตั้งค่า"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"ลากลงเพื่อปิด"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"เมนู"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> ใช้การแสดงภาพซ้อนภาพ"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"หากคุณไม่ต้องการให้ <xliff:g id="NAME">%s</xliff:g> ใช้ฟีเจอร์นี้ ให้แตะเพื่อเปิดการตั้งค่าแล้วปิดฟีเจอร์"</string> - <string name="pip_play" msgid="333995977693142810">"เล่น"</string> - <string name="pip_pause" msgid="1139598607050555845">"หยุดชั่วคราว"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"ข้ามไปรายการถัดไป"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"ข้ามไปรายการก่อนหน้า"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"ปรับขนาด"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"โทรศัพท์ปิดไปเพราะร้อนมาก"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"ขณะนี้โทรศัพท์ทำงานเป็นปกติ"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"ขณะนี้โทรศัพท์ทำงานเป็นปกติ\nแตะเพื่อดูข้อมูลเพิ่มเติม"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"โทรศัพท์ร้อนเกินไปจึงปิดเครื่องเพื่อให้เย็นลง ขณะนี้โทรศัพท์ทำงานเป็นปกติ\n\nโทรศัพท์อาจร้อนเกินไปหากคุณ\n • ใช้แอปที่ใช้ทรัพยากรมาก (เช่น เกม วิดีโอ หรือแอปการนำทาง)\n • ดาวน์โหลดหรืออัปโหลดไฟล์ขนาดใหญ่\n • ใช้โทรศัพท์ในอุณหภูมิที่สูง"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"ดูขั้นตอนในการดูแลรักษา"</string> <string name="high_temp_title" msgid="2218333576838496100">"โทรศัพท์เริ่มเครื่องร้อน"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"ฟีเจอร์บางอย่างจะใช้งานได้จำกัดขณะโทรศัพท์ลดอุณหภูมิลง"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"ฟีเจอร์บางอย่างจะใช้งานได้จำกัดขณะโทรศัพท์เย็นลง\nแตะเพื่อดูข้อมูลเพิ่มเติม"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"โทรศัพท์จะพยายามลดอุณหภูมิลงโดยอัตโนมัติ คุณยังสามารถใช้โทรศัพท์ได้ แต่โทรศัพท์อาจทำงานช้าลง\n\nโทรศัพท์จะทำงานตามปกติเมื่อเย็นลงแล้ว"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"ดูขั้นตอนในการดูแลรักษา"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"ถอดปลั๊กที่ชาร์จ"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"พบปัญหาในการชาร์จอุปกรณ์นี้ ถอดปลั๊กอะแดปเตอร์ด้วยความระมัดระวังเพราะสายอาจร้อน"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"ดูขั้นตอนในการดูแลรักษา"</string> diff --git a/packages/SystemUI/res/values-th/strings_tv.xml b/packages/SystemUI/res/values-th/strings_tv.xml index 14d458a5a4f2..783b1f47ca7a 100644 --- a/packages/SystemUI/res/values-th/strings_tv.xml +++ b/packages/SystemUI/res/values-th/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"การแสดงภาพซ้อนภาพ"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(ไม่มีชื่อรายการ)"</string> - <string name="pip_close" msgid="5775212044472849930">"ปิด PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"เต็มหน้าจอ"</string> <string name="mic_active" msgid="5766614241012047024">"ไมโครโฟนเปิดใช้งานอยู่"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s เข้าถึงไมโครโฟนแล้ว"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index f743fd34e4ea..20a34e1ded0d 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"I-edit ang pagkakasunud-sunod ng mga setting."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Page <xliff:g id="ID_1">%1$d</xliff:g> ng <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Lock screen"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Palawakin"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"I-minimize"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Isara"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Mga Setting"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"I-drag pababa upang i-dismiss"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"Nasa picture-in-picture ang <xliff:g id="NAME">%s</xliff:g>"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Kung ayaw mong magamit ni <xliff:g id="NAME">%s</xliff:g> ang feature na ito, i-tap upang buksan ang mga setting at i-off ito."</string> - <string name="pip_play" msgid="333995977693142810">"I-play"</string> - <string name="pip_pause" msgid="1139598607050555845">"I-pause"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Lumaktaw sa susunod"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Lumaktaw sa nakaraan"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"I-resize"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Na-off ang telepono dahil sa init"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Maayos na ngayong gumagana ang iyong telepono"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Maayos na ngayong gumagana ang iyong telepono.\nMag-tap para sa higit pang impormasyon"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Napakainit ng telepono, kaya nag-off ito para lumamig. Maayos na itong gumagana.\n\nMaaaring lubos na uminit ang telepono kapag:\n • Gumamit ka ng resource-intensive na app (gaya ng app para sa gaming, video, o navigation)\n • Nag-download o nag-upload ka ng malaking file\n • Ginamit mo ito sa mainit na lugar"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Tingnan ang mga hakbang sa pangangalaga"</string> <string name="high_temp_title" msgid="2218333576838496100">"Umiinit ang telepono"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Limitado ang ilang feature habang nagku-cool down ang telepono"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Limitado ang ilang feature habang nagku-cool down ang telepono.\nMag-tap para sa higit pang impormasyon"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Awtomatikong susubukan ng iyong telepono na mag-cool down. Magagamit mo pa rin ang iyong telepono, ngunit maaaring mas mabagal ang paggana nito.\n\nKapag nakapag-cool down na ang iyong telepono, gagana na ito nang normal."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Tingnan ang mga hakbang sa pangangalaga"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Hugutin ang charger"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"May isyu sa pag-charge ng device na ito. Hugutin ang power adapter at mag-ingat dahil maaaring mainit ang cable."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Tingnan ang mga hakbang sa pangangalaga"</string> diff --git a/packages/SystemUI/res/values-tl/strings_tv.xml b/packages/SystemUI/res/values-tl/strings_tv.xml index 6e873f30edf2..bf46b8fe599a 100644 --- a/packages/SystemUI/res/values-tl/strings_tv.xml +++ b/packages/SystemUI/res/values-tl/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Picture-in-Picture"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Walang pamagat na programa)"</string> - <string name="pip_close" msgid="5775212044472849930">"Isara ang PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Full screen"</string> <string name="mic_active" msgid="5766614241012047024">"Aktibo ang Mikropono"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Na-access ng %1$s ang iyong mikropono"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index a1e5cee90657..4146f307ac18 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Ayarların sırasını düzenle."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Sayfa <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Kilit ekranı"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Genişlet"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Simge durumuna getir"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Kapat"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Ayarlar"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Kapatmak için aşağıya sürükleyin"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menü"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g>, pencere içinde pencere özelliğini kullanıyor"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> uygulamasının bu özelliği kullanmasını istemiyorsanız dokunarak ayarları açın ve söz konusu özelliği kapatın."</string> - <string name="pip_play" msgid="333995977693142810">"Oynat"</string> - <string name="pip_pause" msgid="1139598607050555845">"Duraklat"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Sonrakine atla"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Öncekine atla"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Yeniden boyutlandır"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon ısındığından kapatıldı"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefonunuz şu anda normal bir şekilde çalışıyor"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Telefonunuz şu anda normal bir şekilde çalışıyor.\nDaha fazla bilgi için dokunun"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefonunuz çok ısındığından soğuması için kapatıldı ve şu anda normal bir şekilde çalışıyor.\n\nTelefon şu koşullarda çok ısınabilir:\n • Yoğun kaynak gerektiren uygulamalar (oyun, video veya gezinme uygulamaları gibi) kullanma\n • Büyük dosyalar indirme veya yükleme\n • Telefonu sıcak yerlerde kullanma"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Bakımla ilgili adımlara bakın"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon ısınıyor"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Telefon soğurken bazı özellikler sınırlı olarak kullanılabilir"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Telefon soğurken bazı özellikler sınırlı olarak kullanılabilir.\nDaha fazla bilgi için dokunun"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefonunuz otomatik olarak soğumaya çalışacak. Bu sırada telefonunuzu kullanmaya devam edebilirsiniz ancak uygulamalar daha yavaş çalışabilir.\n\nTelefonunuz soğuduktan sonra normal şekilde çalışacaktır."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Bakımla ilgili adımlara bakın"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Şarj cihazını çıkarın"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Bu cihaz şarj edilirken bir sorun oluştu. Güç adaptörünün fişini çekin. Kablo sıcak olabileceğinden fişi çekerken dikkatli olun."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Bakımla ilgili adımlara bakın"</string> diff --git a/packages/SystemUI/res/values-tr/strings_tv.xml b/packages/SystemUI/res/values-tr/strings_tv.xml index be87e4cbcbda..30d1fc9cdb9f 100644 --- a/packages/SystemUI/res/values-tr/strings_tv.xml +++ b/packages/SystemUI/res/values-tr/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Pencere İçinde Pencere"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Başlıksız program)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP\'yi kapat"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Tam ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon Etkin"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s mikrofonunuza erişti"</string> </resources> diff --git a/packages/SystemUI/res/values-tvdpi/dimens.xml b/packages/SystemUI/res/values-tvdpi/dimens.xml index 4d978aacc65f..5327cee7cae8 100644 --- a/packages/SystemUI/res/values-tvdpi/dimens.xml +++ b/packages/SystemUI/res/values-tvdpi/dimens.xml @@ -24,8 +24,4 @@ <fraction name="battery_subpixel_smoothing_right">10%</fraction> <dimen name="battery_margin_bottom">1px</dimen> - - <!-- The dimensions to user for picture-in-picture action buttons. --> - <dimen name="picture_in_picture_button_width">100dp</dimen> - <dimen name="picture_in_picture_button_start_margin">-50dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index d5c6e253fcc3..11eb18cc48d2 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -926,25 +926,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Змінити порядок налаштувань."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Сторінка <xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Заблокований екран"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Розгорнути"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Згорнути"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Закрити"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Налаштування"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Перетягніть униз, щоб закрити"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Меню"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"У додатку <xliff:g id="NAME">%s</xliff:g> є функція \"Картинка в картинці\""</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Щоб додаток <xliff:g id="NAME">%s</xliff:g> не використовував цю функцію, вимкніть її в налаштуваннях."</string> - <string name="pip_play" msgid="333995977693142810">"Відтворити"</string> - <string name="pip_pause" msgid="1139598607050555845">"Призупинити"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Перейти далі"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Перейти назад"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Змінити розмір"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Телефон перегрівся й вимкнувся"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Зараз телефон працює, як зазвичай"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Зараз телефон працює як зазвичай.\nНатисніть, щоб дізнатися більше"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Телефон перегрівся, тому вимкнувся, щоб охолонути. Зараз він працює, як зазвичай.\n\nТелефон перегрівається, якщо ви:\n • використовуєте ресурсомісткі додатки (ігри, відео, навігація)\n • завантажуєте великі файли на телефон або з нього\n • використовуєте телефон за високої температури"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Переглянути запобіжні заходи"</string> <string name="high_temp_title" msgid="2218333576838496100">"Телефон нагрівається"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Під час охолодження деякі функції обмежуються"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Під час охолодження деякі функції обмежуються.\nНатисніть, щоб дізнатися більше"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ваш телефон охолоджуватиметься автоматично. Ви можете далі користуватися телефоном, але він може працювати повільніше.\n\nКоли телефон охолоне, він працюватиме належним чином."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Переглянути запобіжні заходи"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Відключіть зарядний пристрій"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Виникла проблема із заряджанням пристрою. Відключіть адаптер живлення, однак будьте обережні, оскільки кабель може бути гарячим."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Переглянути застереження"</string> diff --git a/packages/SystemUI/res/values-uk/strings_tv.xml b/packages/SystemUI/res/values-uk/strings_tv.xml index a11e553fea62..e3872cc35963 100644 --- a/packages/SystemUI/res/values-uk/strings_tv.xml +++ b/packages/SystemUI/res/values-uk/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Картинка в картинці"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Програма без назви)"</string> - <string name="pip_close" msgid="5775212044472849930">"Закрити PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"На весь екран"</string> <string name="mic_active" msgid="5766614241012047024">"Мікрофон активовано"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"Додаток %1$s отримав доступ до вашого мікрофона"</string> </resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index cb73ccdfb277..d7645e9bcb5b 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"ترتیبات کی ترتیب میں ترمیم کریں۔"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"صفحہ <xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"مقفل اسکرین"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"پھیلائیں"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"چھوٹی کریں"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"بند کریں"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"ترتیبات"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"برخاست کرنے کیلئے نیچے گھسیٹیں"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"مینو"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> تصویر میں تصویر میں ہے"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"اگر آپ نہیں چاہتے ہیں کہ <xliff:g id="NAME">%s</xliff:g> اس خصوصیت کا استعمال کرے تو ترتیبات کھولنے کے لیے تھپتھپا کر اسے آف کرے۔"</string> - <string name="pip_play" msgid="333995977693142810">"چلائیں"</string> - <string name="pip_pause" msgid="1139598607050555845">"موقوف کریں"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"نظرانداز کرکے اگلے پر جائیں"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"نظرانداز کرکے پچھلے پر جائیں"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"سائز تبدیل کریں"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"حرارت کی وجہ سے فون آف ہو گیا"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"آپ کا فون اب حسب معمول کام کر رہا ہے"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"آپ کا فون اب حسب معمول چل رہا ہے۔\nمزید معلومات کیلئے تھپتھپائیں"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"آپ کا فون کافی گرم ہو گيا تھا، اس لئے سرد ہونے کیلئے یہ آف ہو گیا۔ اب آپ کا فون حسب معمول کام کر رہا ہے۔\n\nمندرجہ ذیل چیزیں کرنے پر آپ کا فون کافی گرم ہو سکتا ہے:\n • ماخذ کا زیادہ استعمال کرنے والی ایپس (جیسے کہ گیمنگ، ویڈیو، یا نیویگیشن ایپس) کا استعمال کرنا\n • بڑی فائلز ڈاؤن لوڈ یا اپ لوڈ کرنا\n • اعلی درجہ حرارت میں فون کا استعمال کرنا"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"نگہداشت کے اقدامات ملاحظہ کریں"</string> <string name="high_temp_title" msgid="2218333576838496100">"فون گرم ہو رہا ہے"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"فون کے ٹھنڈے ہو جانے تک کچھ خصوصیات محدود ہیں"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"فون کے ٹھنڈے ہو جانے تک کچھ خصوصیات محدود ہیں۔\nمزید معلومات کیلئے تھپتھپائیں"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"آپ کا فون خودکار طور پر ٹھنڈا ہونے کی کوشش کرے گا۔ آپ ابھی بھی اپنا فون استعمال کر سکتے ہیں، مگر ہو سکتا ہے یہ سست چلے۔\n\nایک بار آپ کا فون ٹھنڈا ہوجائے تو یہ معمول کے مطابق چلے گا۔"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"نگہداشت کے اقدامات ملاحظہ کریں"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"چارجر ان پلگ کریں"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"اس آلہ کو چارج کرنے میں ایک مسئلہ ہے۔ پاور ایڈاپٹر کو ان پلگ کریں اور دھیان دیں کیونکہ تار گرم ہو سکتا ہے۔"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"نگہداشت کے اقدامات ملاحظہ کریں"</string> diff --git a/packages/SystemUI/res/values-ur/strings_tv.xml b/packages/SystemUI/res/values-ur/strings_tv.xml index 8f5ad0d63cf1..cb50fafaf931 100644 --- a/packages/SystemUI/res/values-ur/strings_tv.xml +++ b/packages/SystemUI/res/values-ur/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"تصویر میں تصویر"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(بلا عنوان پروگرام)"</string> - <string name="pip_close" msgid="5775212044472849930">"PIP بند کریں"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"فُل اسکرین"</string> <string name="mic_active" msgid="5766614241012047024">"مائیکروفون فعال ہے"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s نے آپ کے مائیکروفون تک رسائی حاصل کی ہے"</string> </resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 63b0888f3c3b..1fc4f9bea270 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Sozlamalar tartibini o‘zgartirish."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_1">%1$d</xliff:g>-sahifa, jami: <xliff:g id="ID_2">%2$d</xliff:g> ta sahifa"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Ekran qulfi"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Yoyish"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Yig‘ish"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Yopish"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Sozlamalar"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Yopish uchun pastga torting"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menyu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> tasvir ustida tasvir rejimida"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"<xliff:g id="NAME">%s</xliff:g> ilovasi uchun bu funksiyani sozlamalar orqali faolsizlantirish mumkin."</string> - <string name="pip_play" msgid="333995977693142810">"Ijro"</string> - <string name="pip_pause" msgid="1139598607050555845">"Pauza"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Keyingisiga o‘tish"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Avvalgisiga qaytish"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Oʻlchamini oʻzgartirish"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Qizigani uchun o‘chirildi"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Telefoningiz hozir normal holatda ishlayapti"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Endi telefoningiz normal holatda ishlayapti.\nBatafsil axborot uchun bosing"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Telefon qizib ketganligi sababli sovitish uchun o‘chirib qo‘yilgan. Endi telefoningiz normal holatda ishlayapti.\n\nTelefon bu hollarda qizib ketishi mumkin:\n • Resurstalab ilovalar ishlatilganda (masalan, o‘yin, video yoki navigatsiya ilovalari)\n • Katta faylni yuklab olishda yoki yuklashda\n • Telefondan yuqori haroratda foydalanganda"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Batafsil axborot"</string> <string name="high_temp_title" msgid="2218333576838496100">"Telefon qizib ketdi"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Telefon sovish paytida ayrim funksiyalar ishlamasligi mumkin"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Telefon sovib qolganda ayrim funksiyalari ishlamasligi mumkin.\nBatafsil axborot uchun bosing"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Telefon avtomatik ravishda o‘zini sovitadi. Telefoningizdan foydalanishda davom etishingiz mumkin, lekin u sekinroq ishlashi mumkin.\n\nTelefon sovishi bilan normal holatda ishlashni boshlaydi."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Batafsil axborot"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Quvvatlash moslamasini uzing"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Bu qurilmani quvvatlashda muammo bor. Quvvat adapteri va kabelni tarmoqdan uzing, ular qizib ketgan boʻlishi mumkin."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Batafsil axborot"</string> diff --git a/packages/SystemUI/res/values-uz/strings_tv.xml b/packages/SystemUI/res/values-uz/strings_tv.xml index 6fb5d732bfbd..09bc51ee293c 100644 --- a/packages/SystemUI/res/values-uz/strings_tv.xml +++ b/packages/SystemUI/res/values-uz/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Tasvir ustida tasvir"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Nomsiz)"</string> - <string name="pip_close" msgid="5775212044472849930">"Kadr ichida kadr – chiqish"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Butun ekran"</string> <string name="mic_active" msgid="5766614241012047024">"Mikrofon faol"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s mikrofondan foydalandi"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 1c25e97f58dd..8df5ee530210 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Chỉnh sửa thứ tự cài đặt."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Trang <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Màn hình khóa"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Mở rộng"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Thu nhỏ"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Đóng"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Cài đặt"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Kéo xuống để loại bỏ"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Menu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g> đang ở chế độ ảnh trong ảnh"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Nếu bạn không muốn <xliff:g id="NAME">%s</xliff:g> sử dụng tính năng này, hãy nhấn để mở cài đặt và tắt tính năng này."</string> - <string name="pip_play" msgid="333995977693142810">"Phát"</string> - <string name="pip_pause" msgid="1139598607050555845">"Tạm dừng"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Chuyển tới mục tiếp theo"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Chuyển về mục trước"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Đổi kích thước"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Điện thoại đã tắt do nhiệt"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Điện thoại của bạn hiện đang chạy bình thường"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Điện thoại của bạn đang chạy bình thường.\nHãy nhấn để biết thêm thông tin"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Do quá nóng nên điện thoại đã tắt để hạ nhiệt. Hiện điện thoại của bạn đang chạy bình thường.\n\nĐiện thoại có thể bị quá nóng nếu bạn:\n • Dùng các ứng dụng tốn nhiều tài nguyên (như ứng dụng trò chơi, video hoặc điều hướng)\n • Tải xuống hoặc tải lên tệp có dung lượng lớn\n • Dùng điện thoại ở nhiệt độ cao"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Xem các bước chăm sóc"</string> <string name="high_temp_title" msgid="2218333576838496100">"Điện thoại đang nóng lên"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Một số tính năng bị hạn chế trong khi điện thoại nguội dần"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Một số tính năng bị hạn chế trong khi điện thoại nguội dần.\nHãy nhấn để biết thêm thông tin"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Điện thoại của bạn sẽ tự động nguội dần. Bạn vẫn có thể sử dụng điện thoại, nhưng điện thoại có thể chạy chậm hơn. \n\nSau khi đã nguội, điện thoại sẽ chạy bình thường."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Xem các bước chăm sóc"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Rút phích cắm bộ sạc"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Đã xảy ra sự cố khi sạc thiết bị này. Hãy rút phích cắm bộ chuyển đổi điện và cẩn thận vì dây cáp có thể nóng."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Xem các bước chăm sóc"</string> diff --git a/packages/SystemUI/res/values-vi/strings_tv.xml b/packages/SystemUI/res/values-vi/strings_tv.xml index 03b53561d06e..f298407bcaf3 100644 --- a/packages/SystemUI/res/values-vi/strings_tv.xml +++ b/packages/SystemUI/res/values-vi/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Ảnh trong ảnh"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Không có chương trình tiêu đề)"</string> - <string name="pip_close" msgid="5775212044472849930">"Đóng PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Toàn màn hình"</string> <string name="mic_active" msgid="5766614241012047024">"Micrô đang hoạt động"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s đang dùng micrô của bạn"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index d127d1760825..c51982cddac3 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"修改设置顺序。"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"第 <xliff:g id="ID_1">%1$d</xliff:g> 页，共 <xliff:g id="ID_2">%2$d</xliff:g> 页"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"锁定屏幕"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"展开"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"最小化"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"关闭"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"设置"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"向下拖动即可关闭"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"菜单"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"<xliff:g id="NAME">%s</xliff:g>目前位于“画中画”中"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"如果您不想让“<xliff:g id="NAME">%s</xliff:g>”使用此功能，请点按以打开设置，然后关闭此功能。"</string> - <string name="pip_play" msgid="333995977693142810">"播放"</string> - <string name="pip_pause" msgid="1139598607050555845">"暂停"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"跳到下一个"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"跳到上一个"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"调整大小"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"手机因严重发热而自动关机"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"现在，您的手机已恢复正常运行"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"现在，您的手机已恢复正常运行。\n点按即可了解详情"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"由于发热严重，因此您的手机执行了自动关机以降温。现在，您的手机已恢复正常运行。\n\n以下情况可能会导致您的手机严重发热：\n • 使用占用大量资源的应用（例如游戏、视频或导航应用）\n • 下载或上传大型文件\n • 在高温环境下使用手机"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"查看处理步骤"</string> <string name="high_temp_title" msgid="2218333576838496100">"手机温度上升中"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"手机降温时，部分功能的使用会受限制"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"手机降温时，部分功能的使用会受限制。\n点按即可了解详情"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"您的手机将自动尝试降温。您依然可以使用您的手机，但是手机运行速度可能会更慢。\n\n手机降温后，就会恢复正常的运行速度。"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"查看处理步骤"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"拔下充电器"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"为此设备充电时出现问题。这可能是由数据线太热所导致，请拔下电源适配器并采取相应的处理措施。"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"查看处理步骤"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml index acb6ee0123e6..aa3e251c9c35 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"画中画"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"（节目没有标题）"</string> - <string name="pip_close" msgid="5775212044472849930">"关闭画中画"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"全屏"</string> <string name="mic_active" msgid="5766614241012047024">"麦克风处于启用状态"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s访问过您的麦克风"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index ffbf12d5ae2c..aa9945fbd956 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"編輯設定次序。"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"第 <xliff:g id="ID_1">%1$d</xliff:g> 頁 (共 <xliff:g id="ID_2">%2$d</xliff:g> 頁)"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"螢幕鎖定"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"展開"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"最小化"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"關閉"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"設定"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"向下拖曳即可關閉"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"選單"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"「<xliff:g id="NAME">%s</xliff:g>」目前在畫中畫模式"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"如果您不想「<xliff:g id="NAME">%s</xliff:g>」使用此功能，請輕按以開啟設定，然後停用此功能。"</string> - <string name="pip_play" msgid="333995977693142810">"播放"</string> - <string name="pip_pause" msgid="1139598607050555845">"暫停"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"跳到下一個"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"跳到上一個"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"調整大小"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"手機因過熱而關上"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"您的手機現已正常運作"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"您的手機現已正常運作。\n輕按即可瞭解詳情"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"您的手機之前因過熱而關上降溫。手機現已正常運作。\n\n以下情況可能會導致手機過熱：\n • 使用耗用大量資源的應用程式 (例如遊戲、影片或導航應用程式)\n • 下載或上載大型檔案\n • 在高溫環境下使用手機"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"查看保養步驟"</string> <string name="high_temp_title" msgid="2218333576838496100">"手機溫度正在上升"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"手機降溫時，部分功能會受限制"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"手機降溫時，部分功能會受限制。\n輕按即可瞭解詳情"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"手機會自動嘗試降溫。您仍可以使用手機，但手機的運作速度可能較慢。\n\n手機降溫後便會恢復正常。"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"查看保養步驟"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"拔下充電器"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"為此裝置充電時發生問題。請拔除電源適配器並注意安全，因為連接線可能會發熱。"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"查看保養步驟"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml index 1cd63144b904..45d3229cdcb6 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"畫中畫"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(沒有標題的節目)"</string> - <string name="pip_close" msgid="5775212044472849930">"關閉 PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"全螢幕"</string> <string name="mic_active" msgid="5766614241012047024">"麥克風已啟用"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"「%1$s」已存取您的麥克風"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index d52e247f9434..92bdfc3f1219 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"編輯設定順序。"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"第 <xliff:g id="ID_1">%1$d</xliff:g> 頁，共 <xliff:g id="ID_2">%2$d</xliff:g> 頁"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"鎖定畫面"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"展開"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"最小化"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"關閉"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"設定"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"向下拖曳即可關閉"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"選單"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"「<xliff:g id="NAME">%s</xliff:g>」目前在子母畫面中"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"如果你不想讓「<xliff:g id="NAME">%s</xliff:g>」使用這項功能，請輕觸開啟設定頁面，然後停用此功能。"</string> - <string name="pip_play" msgid="333995977693142810">"播放"</string> - <string name="pip_pause" msgid="1139598607050555845">"暫停"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"跳到下一個"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"跳到上一個"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"調整大小"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"手機先前過熱，因此關閉電源"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"手機現在已恢復正常運作"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"手機現在已恢復正常運作。\n輕觸即可瞭解詳情"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"手機先前的溫度過高，因此關閉了電源以進行降溫。手機現在已恢復正常運作。\n\n以下情況可能會導致你的手機溫度過高：\n • 使用需要密集處理資料的應用程式 (例如遊戲、影片或導航應用程式)\n • 下載或上傳大型檔案\n • 在高溫環境下使用手機"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"查看處理步驟"</string> <string name="high_temp_title" msgid="2218333576838496100">"手機變熱"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"手機降溫時，部分功能會受限"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"手機降溫時，某些功能會受限。\n輕觸即可瞭解詳情"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"手機會自動嘗試降溫。你仍可繼續使用手機，但是手機的運作速度可能會較慢。\n\n手機降溫完畢後，就會恢復正常的運作速度。"</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"查看處理步驟"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"拔除充電器"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"為這個裝置充電時發生問題。這可能是因為傳輸線過熱所致，請拔除電源變壓器並採取處理措施。"</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"查看處理步驟"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml index b48fc6f99755..fdd088449567 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"子母畫面"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(無標題的節目)"</string> - <string name="pip_close" msgid="5775212044472849930">"關閉子母畫面"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"全螢幕"</string> <string name="mic_active" msgid="5766614241012047024">"麥克風已開啟"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"「%1$s」已存取你的麥克風"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index f379bf37a80f..4ae126799141 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -916,25 +916,14 @@ <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Hlela uhlelo lwezilungiselelo."</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Ikhasi <xliff:g id="ID_1">%1$d</xliff:g> kwangu-<xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Khiya isikrini"</string> - <string name="pip_phone_expand" msgid="1424988917240616212">"Nweba"</string> - <string name="pip_phone_minimize" msgid="9057117033655996059">"Nciphisa"</string> - <string name="pip_phone_close" msgid="8801864042095341824">"Vala"</string> - <string name="pip_phone_settings" msgid="5687538631925004341">"Izilungiselelo"</string> - <string name="pip_phone_dismiss_hint" msgid="5825740708095316710">"Hudulela phansi ukuze ucashise"</string> - <string name="pip_menu_title" msgid="6365909306215631910">"Imenyu"</string> - <string name="pip_notification_title" msgid="8661573026059630525">"U-<xliff:g id="NAME">%s</xliff:g> ungaphakathi kwesithombe esiphakathi kwesithombe"</string> - <string name="pip_notification_message" msgid="4991831338795022227">"Uma ungafuni i-<xliff:g id="NAME">%s</xliff:g> ukuthi isebenzise lesi sici, thepha ukuze uvule izilungiselelo uphinde uyivale."</string> - <string name="pip_play" msgid="333995977693142810">"Dlala"</string> - <string name="pip_pause" msgid="1139598607050555845">"Misa isikhashana"</string> - <string name="pip_skip_to_next" msgid="3864212650579956062">"Yeqela kokulandelayo"</string> - <string name="pip_skip_to_prev" msgid="3742589641443049237">"Yeqela kokwangaphambilini"</string> - <string name="accessibility_action_pip_resize" msgid="8237306972921160456">"Shintsha usayizi"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Ifoni ivaliwe ngenxa yokushisa"</string> - <string name="thermal_shutdown_message" msgid="7432744214105003895">"Ifoni yakho manje isebenza kahle"</string> + <string name="thermal_shutdown_message" msgid="6142269839066172984">"Ifoni yakho manje isebenza ngokuvamile.\nThepha ukuze uthole ulwazi olungeziwe"</string> <string name="thermal_shutdown_dialog_message" msgid="6745684238183492031">"Ifoni yakho ibishisa kakhulu, ngakho-ke yacisha ukuze iphole. Ifoni yakho manje isebenza ngokuvamile.\n\nIfoni yakho ingashisa kakhulu uma:\n • Usebenzisa izinhlelo zokusebenza ezinkulu (njegegeyimu, ividiyo, noma izinhlelo zokusebenza zokuzula)\n • Landa noma layisha amafayela amakhulu\n • Sebenzisa ifoni yakho kumathempelesha aphezulu"</string> + <string name="thermal_shutdown_dialog_help_text" msgid="6413474593462902901">"Bona izinyathelo zokunakekelwa"</string> <string name="high_temp_title" msgid="2218333576838496100">"Ifoni iyafudumala"</string> - <string name="high_temp_notif_message" msgid="163928048626045592">"Ezinye izici zikhawulelwe ngenkathi ifoni iphola"</string> + <string name="high_temp_notif_message" msgid="1277346543068257549">"Ezinye izici zikhawulelwe ngenkathi ifoni iphola.\nThepha mayelana nolwazi olwengeziwe"</string> <string name="high_temp_dialog_message" msgid="3793606072661253968">"Ifoni yakho izozama ngokuzenzakalela ukuphola. Ungasasebenzisa ifoni yakho, kodwa ingasebenza ngokungasheshi.\n\nUma ifoni yakho isipholile, izosebenza ngokuvamile."</string> + <string name="high_temp_dialog_help_text" msgid="7380171287943345858">"Bona izinyathelo zokunakekelwa"</string> <string name="high_temp_alarm_title" msgid="2359958549570161495">"Khipha ishaja"</string> <string name="high_temp_alarm_notify_message" msgid="7186272817783835089">"Kukhona inkinga yokushaja le divayisi. Khipha i-adaptha yamandla, uphinde unakekele njengoba ikhebuli kungenzeka lifudumele."</string> <string name="high_temp_alarm_help_care_steps" msgid="5017002218341329566">"Bona izinyathelo zokunakekelwa"</string> diff --git a/packages/SystemUI/res/values-zu/strings_tv.xml b/packages/SystemUI/res/values-zu/strings_tv.xml index c6f8d3ffcc74..4fed753a88ad 100644 --- a/packages/SystemUI/res/values-zu/strings_tv.xml +++ b/packages/SystemUI/res/values-zu/strings_tv.xml @@ -19,10 +19,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="notification_channel_tv_pip" msgid="844249465483874817">"Isithombe-esithombeni"</string> - <string name="pip_notification_unknown_title" msgid="4413256731340767259">"(Alukho uhlelo lwesihloko)"</string> - <string name="pip_close" msgid="5775212044472849930">"Vala i-PIP"</string> - <string name="pip_fullscreen" msgid="3877997489869475181">"Iskrini esigcwele"</string> <string name="mic_active" msgid="5766614241012047024">"Imakrofoni iyasebenza"</string> <string name="app_accessed_mic" msgid="2754428675130470196">"%1$s ifinyelele imakrofoni yakho"</string> </resources> diff --git a/packages/SystemUI/res/values/arrays_tv.xml b/packages/SystemUI/res/values/arrays_tv.xml index 3343a84e7a9c..9c7707791180 100644 --- a/packages/SystemUI/res/values/arrays_tv.xml +++ b/packages/SystemUI/res/values/arrays_tv.xml @@ -17,23 +17,6 @@ */ --> <resources> - <!-- List of package names or class names which are considered as Settings, - so PIP location should be adjusted to the left of the side panel. - If it should be applied for all activities in a package, add the package name. - If it should be applied for an activity in a package, add its class name with package name. - The class name must follow format 'package_name/.class_name' ('/.' in between). - This can be overriden in an overlay. - --> - <string-array name="tv_pip_settings_class_name" translatable="false"> - <item>com.android.tv.settings</item> - <item>com.google.android.leanbacklauncher/.settings.HomeScreenSettingsActivity</item> - <item>com.google.android.apps.mediashell/.settings.CastSettingsActivity</item> - <item>com.google.android.katniss.setting/.SpeechSettingsActivity</item> - <item>com.google.android.katniss.setting/.SearchSettingsActivity</item> - <item>com.google.android.tungsten.setupwraith/.settings.usage.UsageDiagnosticsSettingActivity</item> - <item>com.google.android.tvlauncher/.notifications.NotificationsSidePanelActivity</item> - </string-array> - <string-array name="audio_recording_disclosure_exempt_apps" translatable="false"> </string-array> </resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 10c72102bba3..84dbd60b799d 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -133,11 +133,6 @@ <attr name="buttonStrokeWidth" format="dimension" /> </declare-styleable> - <!-- Used to style rotate suggestion button AVD animations --> - <attr name="rotateButtonStartAngle" format="float" /> - <attr name="rotateButtonEndAngle" format="float" /> - <attr name="rotateButtonScaleX" format="float" /> - <!-- Used to style charging animation AVD animation --> <attr name="chargingAnimColor" format="color" /> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 3b6400f208bd..27db8cb5fb46 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -494,18 +494,6 @@ <!-- On debuggable builds, alert the user if SystemUI PSS goes over this number (in kb) --> <integer name="watch_heap_limit">256000</integer> - <!-- Animation duration for resizing of PIP when entering/exiting. --> - <integer name="config_pipResizeAnimationDuration">425</integer> - - <!-- Allow dragging the PIP to a location to close it --> - <bool name="config_pipEnableDismissDragToEdge">true</bool> - - <!-- Allow PIP to resize to a slightly bigger state upon touch/showing the menu --> - <bool name="config_pipEnableResizeForMenu">true</bool> - - <!-- Allow PIP to enable round corner, see also R.dimen.pip_corner_radius --> - <bool name="config_pipEnableRoundCorner">false</bool> - <!-- SystemUI Plugins that can be loaded on user builds. --> <string-array name="config_pluginWhitelist" translatable="false"> <item>com.android.systemui</item> diff --git a/packages/SystemUI/res/values/config_tv.xml b/packages/SystemUI/res/values/config_tv.xml index d8c9428f2676..5cb840f24c84 100644 --- a/packages/SystemUI/res/values/config_tv.xml +++ b/packages/SystemUI/res/values/config_tv.xml @@ -16,10 +16,6 @@ <resources> <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows, - when the PIP menu is shown with settings. --> - <string translatable="false" name="pip_settings_bounds">"662 756 1142 1026"</string> - - <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows, when the PIP menu is shown in center. --> <string translatable="false" name="pip_menu_bounds">"596 280 1324 690"</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index eb3a55888e04..ea855eb722b9 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -974,47 +974,8 @@ <!-- The start margin of quick scrub onboarding toast. --> <dimen name="recents_quick_scrub_onboarding_margin_start">8dp</dimen> - <!-- The height of the gradient indicating the dismiss edge when moving a PIP. --> - <dimen name="floating_dismiss_gradient_height">250dp</dimen> - <dimen name="floating_dismiss_bottom_margin">50dp</dimen> - <!-- The bottom margin of the PIP drag to dismiss info text shown when moving a PIP. --> - <dimen name="pip_dismiss_text_bottom_margin">24dp</dimen> - - <!-- The shortest-edge size of the expanded PiP. --> - <dimen name="pip_expanded_shortest_edge_size">160dp</dimen> - - <!-- The additional offset to apply to the IME animation to account for the input field. --> - <dimen name="pip_ime_offset">48dp</dimen> - - <!-- The padding between actions in the PiP in landscape Note that the PiP does not reflect - the configuration of the device, so we can't use -land resources. --> - <dimen name="pip_between_action_padding_land">8dp</dimen> - - <!-- The height of the PiP actions container in which the actions are vertically centered. --> - <dimen name="pip_action_size">48dp</dimen> - - <!-- The padding around a PiP actions. --> - <dimen name="pip_action_padding">12dp</dimen> - - <!-- The bottom margin of the expand container when there are actions. - Equal to pip_action_size - pip_action_padding. --> - <dimen name="pip_expand_container_edge_margin">30dp</dimen> - - <!-- The touchable/draggable edge size for PIP resize. --> - <dimen name="pip_resize_edge_size">48dp</dimen> - - <!-- PIP Resize handle size and margin. --> - <dimen name="pip_resize_handle_size">12dp</dimen> - <dimen name="pip_resize_handle_margin">4dp</dimen> - - <!-- The corner radius for PiP window. --> - <dimen name="pip_corner_radius">8dp</dimen> - - <!-- The buffer to use when calculating whether the pip is in an adjust zone. --> - <dimen name="pip_bottom_offset_buffer">1dp</dimen> - <dimen name="default_gear_space">18dp</dimen> <dimen name="cell_overlay_padding">18dp</dimen> @@ -1249,7 +1210,6 @@ <dimen name="bubble_dismiss_target_padding_y">20dp</dimen> <dimen name="bubble_manage_menu_elevation">4dp</dimen> - <dimen name="dismiss_circle_size">52dp</dimen> <dimen name="dismiss_target_x_size">24dp</dimen> <!-- Bubbles user education views --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 454ffc845b26..d97aea7dab59 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2374,45 +2374,6 @@ <!-- SysUI Tuner: Section to customize lockscreen shortcuts [CHAR LIMIT=60] --> <string name="tuner_lock_screen">Lock screen</string> - <!-- Making the PIP fullscreen [CHAR LIMIT=25] --> - <string name="pip_phone_expand">Expand</string> - - <!-- Label for PIP action to Minimize the PIP [CHAR LIMIT=25] --> - <string name="pip_phone_minimize">Minimize</string> - - <!-- Label for PIP close button [CHAR LIMIT=NONE]--> - <string name="pip_phone_close">Close</string> - - <!-- Label for PIP settings button [CHAR LIMIT=NONE]--> - <string name="pip_phone_settings">Settings</string> - - <!-- Label for PIP the drag to dismiss hint [CHAR LIMIT=NONE]--> - <string name="pip_phone_dismiss_hint">Drag down to dismiss</string> - - <!-- Title of menu shown over picture-in-picture. Used for accessibility. --> - <string name="pip_menu_title">Menu</string> - - <!-- PiP BTW notification title. [CHAR LIMIT=50] --> - <string name="pip_notification_title"><xliff:g id="name" example="Google Maps">%s</xliff:g> is in picture-in-picture</string> - - <!-- PiP BTW notification description. [CHAR LIMIT=NONE] --> - <string name="pip_notification_message">If you don\'t want <xliff:g id="name" example="Google Maps">%s</xliff:g> to use this feature, tap to open settings and turn it off.</string> - - <!-- Button to play the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> - <string name="pip_play">Play</string> - - <!-- Button to pause the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> - <string name="pip_pause">Pause</string> - - <!-- Button to skip to the next media on picture-in-picture (PIP) [CHAR LIMIT=30] --> - <string name="pip_skip_to_next">Skip to next</string> - - <!-- 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/res/values/strings_tv.xml b/packages/SystemUI/res/values/strings_tv.xml index 6d61ff989cb1..5d7f08eef0a1 100644 --- a/packages/SystemUI/res/values/strings_tv.xml +++ b/packages/SystemUI/res/values/strings_tv.xml @@ -17,21 +17,6 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Picture-in-Picture (PIP) notification --> - <!-- Title for the notification channel for TV PIP controls. [CHAR LIMIT=NONE] --> - <string name="notification_channel_tv_pip">Picture-in-Picture</string> - <!-- Title of the picture-in-picture (PIP) notification title - when the media doesn't have title [CHAR LIMIT=NONE] --> - <string name="pip_notification_unknown_title">(No title program)</string> - - <!-- Picture-in-Picture (PIP) menu --> - <eat-comment /> - <!-- Button to close picture-in-picture (PIP) in PIP menu [CHAR LIMIT=30] --> - <string name="pip_close">Close PIP</string> - <!-- Button to move picture-in-picture (PIP) screen to the fullscreen in PIP menu [CHAR LIMIT=30] --> - <string name="pip_fullscreen">Full screen</string> - <!-- Title and subtitle for AudioRecordingIndicator --> <string name="mic_active">Microphone Active</string> <string name="app_accessed_mic">%1$s accessed your microphone</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 68c2a38f53c3..9e5b94ee855c 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -604,31 +604,6 @@ <item name="android:colorBackground">?android:attr/colorSecondary</item> </style> - <!-- Used to style rotate suggestion button AVD animations --> - <style name="RotateButtonCCWStart0"> - <item name="rotateButtonStartAngle">0</item> - <item name="rotateButtonEndAngle">-90</item> - <item name="rotateButtonScaleX">1</item> - </style> - - <style name="RotateButtonCCWStart90"> - <item name="rotateButtonStartAngle">90</item> - <item name="rotateButtonEndAngle">0</item> - <item name="rotateButtonScaleX">1</item> - </style> - - <style name="RotateButtonCWStart0"> - <item name="rotateButtonStartAngle">0</item> - <item name="rotateButtonEndAngle">90</item> - <item name="rotateButtonScaleX">-1</item> - </style> - - <style name="RotateButtonCWStart90"> - <item name="rotateButtonStartAngle">90</item> - <item name="rotateButtonEndAngle">180</item> - <item name="rotateButtonScaleX">-1</item> - </style> - <style name="MediaPlayer.Button" parent="@android:style/Widget.Material.Button.Borderless.Small"> <item name="android:background">@drawable/qs_media_light_source</item> <item name="android:tint">@android:color/white</item> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java index 65bf7e6e5025..97317cf5580f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java @@ -138,7 +138,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView case PROMPT_REASON_USER_REQUEST: return R.string.kg_prompt_reason_user_request; case PROMPT_REASON_PREPARE_FOR_UPDATE: - return R.string.kg_prompt_reason_prepare_for_update_password; + return R.string.kg_prompt_reason_timeout_password; case PROMPT_REASON_NONE: return 0; default: diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java index ad92f8f623e4..c4a9fcb45284 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java @@ -440,8 +440,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_user_request); break; case PROMPT_REASON_PREPARE_FOR_UPDATE: - mSecurityMessageDisplay.setMessage( - R.string.kg_prompt_reason_prepare_for_update_pattern); + mSecurityMessageDisplay.setMessage(R.string.kg_prompt_reason_timeout_pattern); break; case PROMPT_REASON_NONE: break; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index 6d865ab525f3..c7f27cf8a71a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -117,7 +117,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView case PROMPT_REASON_USER_REQUEST: return R.string.kg_prompt_reason_user_request; case PROMPT_REASON_PREPARE_FOR_UPDATE: - return R.string.kg_prompt_reason_prepare_for_update_pin; + return R.string.kg_prompt_reason_timeout_pin; case PROMPT_REASON_NONE: return 0; default: diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 71969e06ece1..8a36e7b127db 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -55,6 +55,7 @@ import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricSourceType; import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback; import android.hardware.face.FaceManager; +import android.hardware.face.FaceSensorProperties; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback; import android.hardware.fingerprint.FingerprintManager.AuthenticationResult; @@ -1073,6 +1074,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); } + private boolean isEncryptedOrLockdown(int userId) { + final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(userId); + final boolean isLockDown = + containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW) + || containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + final boolean isEncrypted = containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_BOOT); + return isEncrypted || isLockDown; + } + public boolean userNeedsStrongAuth() { return mStrongAuthTracker.getStrongAuthForUser(getCurrentUser()) != LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED; @@ -1249,7 +1259,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } }; - private FingerprintManager.AuthenticationCallback mFingerprintAuthenticationCallback + private final FingerprintManager.FingerprintDetectionCallback mFingerprintDetectionCallback + = (sensorId, userId, isStrongBiometric) -> { + // Trigger the fingerprint success path so the bouncer can be shown + handleFingerprintAuthenticated(userId, isStrongBiometric); + }; + + private final FingerprintManager.AuthenticationCallback mFingerprintAuthenticationCallback = new AuthenticationCallback() { @Override @@ -1280,6 +1296,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } }; + private final FaceManager.FaceDetectionCallback mFaceDetectionCallback + = (sensorId, userId, isStrongBiometric) -> { + // Trigger the face success path so the bouncer can be shown + handleFaceAuthenticated(userId, isStrongBiometric); + }; + @VisibleForTesting FaceManager.AuthenticationCallback mFaceAuthenticationCallback = new FaceManager.AuthenticationCallback() { @@ -1316,6 +1338,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private CancellationSignal mFaceCancelSignal; private FingerprintManager mFpm; private FaceManager mFaceManager; + private List<FaceSensorProperties> mFaceSensorProperties; private boolean mFingerprintLockedOut; private TelephonyManager mTelephonyManager; @@ -1757,6 +1780,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) { mFaceManager = (FaceManager) context.getSystemService(Context.FACE_SERVICE); + mFaceSensorProperties = mFaceManager.getSensorProperties(); } if (mFpm != null || mFaceManager != null) { @@ -2051,8 +2075,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mFingerprintCancelSignal.cancel(); } mFingerprintCancelSignal = new CancellationSignal(); - mFpm.authenticate(null /* crypto */, mFingerprintCancelSignal, - mFingerprintAuthenticationCallback, null /* handler */, userId); + + if (isEncryptedOrLockdown(userId)) { + mFpm.detectFingerprint(mFingerprintCancelSignal, mFingerprintDetectionCallback, + userId, null /* surface */); + } else { + mFpm.authenticate(null /* crypto */, mFingerprintCancelSignal, + mFingerprintAuthenticationCallback, null /* handler */, userId); + } setFingerprintRunningState(BIOMETRIC_STATE_RUNNING); } } @@ -2069,8 +2099,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mFaceCancelSignal.cancel(); } mFaceCancelSignal = new CancellationSignal(); - mFaceManager.authenticate(null /* crypto */, mFaceCancelSignal, - mFaceAuthenticationCallback, null /* handler */, userId); + + // This would need to be updated for multi-sensor devices + final boolean supportsFaceDetection = !mFaceSensorProperties.isEmpty() + && mFaceSensorProperties.get(0).supportsFaceDetection; + if (isEncryptedOrLockdown(userId) && supportsFaceDetection) { + mFaceManager.detectFace(mFaceCancelSignal, mFaceDetectionCallback, userId); + } else { + mFaceManager.authenticate(null /* crypto */, mFaceCancelSignal, + mFaceAuthenticationCallback, null /* handler */, userId); + } setFaceRunningState(BIOMETRIC_STATE_RUNNING); } } @@ -2088,7 +2126,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private boolean isUnlockWithFingerprintPossible(int userId) { return mFpm != null && mFpm.isHardwareDetected() && !isFingerprintDisabled(userId) - && mFpm.getEnrolledFingerprints(userId).size() > 0; + && mFpm.hasEnrolledTemplates(userId); } private boolean isUnlockWithFacePossible(int userId) { diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index a46ab3a9e35b..58698151b655 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -15,8 +15,6 @@ */ package com.android.systemui; -import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; -import static android.app.StatusBarManager.DISABLE_NONE; import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; import static com.android.systemui.DejankUtils.whitelistIpcs; @@ -56,7 +54,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.settings.CurrentUserTracker; -import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback; @@ -64,7 +61,6 @@ import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; -import com.android.systemui.util.Utils.DisableStateTracker; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -137,11 +133,6 @@ public class BatteryMeterView extends LinearLayout implements mShowPercentAvailable = context.getResources().getBoolean( com.android.internal.R.bool.config_battery_percentage_setting_available); - - addOnAttachStateChangeListener( - new DisableStateTracker(DISABLE_NONE, DISABLE2_SYSTEM_ICONS, - Dependency.get(CommandQueue.class))); - setupLayoutTransition(); mSlotBattery = context.getString( diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 42911374dc87..980e4c0fd333 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -38,6 +38,7 @@ import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.IFingerprintService; import android.os.Bundle; import android.os.Handler; @@ -265,6 +266,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, context.registerReceiver(mBroadcastReceiver, filter); } + @SuppressWarnings("deprecation") @Override public void start() { mCommandQueue.addCallback(this); @@ -273,10 +275,13 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, final FingerprintManager fpm = mContext.getSystemService(FingerprintManager.class); if (fpm != null && fpm.isHardwareDetected()) { - // TODO(b/160024833): Enumerate through all of the sensors and check whether - // at least one of them is UDFPS. - if (fpm.isUdfps()) { - mUdfpsController = new UdfpsController(mContext, mWindowManager); + final List<FingerprintSensorProperties> fingerprintSensorProperties = + fpm.getSensorProperties(); + for (FingerprintSensorProperties props : fingerprintSensorProperties) { + if (props.sensorType == FingerprintSensorProperties.TYPE_UDFPS) { + mUdfpsController = new UdfpsController(mContext, mWindowManager); + break; + } } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java index c6d128631930..87489262a420 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java @@ -712,22 +712,6 @@ class Bubble implements BubbleViewProvider { return Objects.hash(mKey); } - @Override - public void logUIEvent(int bubbleCount, int action, float normalX, float normalY, int index) { - SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED, - mPackageName, - mChannelId, - mNotificationId, - index, - bubbleCount, - action, - normalX, - normalY, - showInShade(), - false /* isOngoing (unused) */, - false /* isAppForeground (unused) */); - } - @Nullable private static String getTitle(@NonNull final NotificationEntry e) { final CharSequence titleCharSeq = e.getSbn().getNotification().extras.getCharSequence( diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 1354585ea396..434bf49ac878 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -207,12 +207,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi /** Whether or not the BubbleStackView has been added to the WindowManager. */ private boolean mAddedToWindowManager = false; - /** - * Value from {@link NotificationShadeWindowController#getForceHasTopUi()} when we forced top UI - * due to expansion. We'll restore this value when the stack collapses. - */ - private boolean mHadTopUi = false; - // Listens to user switch so bubbles can be saved and restored. private final NotificationLockscreenUserManager mNotifUserManager; @@ -1304,7 +1298,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi // Collapsing? Do this first before remaining steps. if (update.expandedChanged && !update.expanded) { mStackView.setExpanded(false); - mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi); + mNotificationShadeWindowController.setRequestTopUi(false, TAG); } // Do removals, if any. @@ -1394,8 +1388,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi if (update.expandedChanged && update.expanded) { if (mStackView != null) { mStackView.setExpanded(true); - mHadTopUi = mNotificationShadeWindowController.getForceHasTopUi(); - mNotificationShadeWindowController.setForceHasTopUi(true); + mNotificationShadeWindowController.setRequestTopUi(true, TAG); } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java index d2dc506c8e5c..10f4385ed443 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java @@ -34,6 +34,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; import com.android.systemui.bubbles.BubbleController.DismissReason; +import com.android.systemui.shared.system.SysUiStatsLog; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -59,7 +60,7 @@ import javax.inject.Singleton; @Singleton public class BubbleData { - private BubbleLogger mLogger = new BubbleLoggerImpl(); + private BubbleLoggerImpl mLogger = new BubbleLoggerImpl(); private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleData" : TAG_BUBBLES; @@ -611,6 +612,30 @@ public class BubbleData { } /** + * Logs the bubble UI event. + * + * @param provider The bubble view provider that is being interacted on. Null value indicates + * that the user interaction is not specific to one bubble. + * @param action The user interaction enum + * @param packageName SystemUI package + * @param bubbleCount Number of bubbles in the stack + * @param bubbleIndex Index of bubble in the stack + * @param normalX Normalized x position of the stack + * @param normalY Normalized y position of the stack + */ + void logBubbleEvent(@Nullable BubbleViewProvider provider, int action, String packageName, + int bubbleCount, int bubbleIndex, float normalX, float normalY) { + if (provider == null) { + mLogger.logStackUiChanged(packageName, action, bubbleCount, normalX, normalY); + } else if (provider.getKey().equals(BubbleOverflow.KEY)) { + mLogger.logShowOverflow(packageName, action, bubbleCount, normalX, normalY); + } else { + mLogger.logBubbleUiChanged((Bubble) provider, packageName, action, bubbleCount, normalX, + normalY, bubbleIndex); + } + } + + /** * Requests a change to the expanded state. * * @param shouldExpand the new requested state diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java index c1dd8c36ff6f..d702cc4e0062 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleLoggerImpl.java @@ -17,6 +17,7 @@ package com.android.systemui.bubbles; import com.android.internal.logging.UiEventLoggerImpl; +import com.android.systemui.shared.system.SysUiStatsLog; /** * Implementation of UiEventLogger for logging bubble UI events. @@ -64,4 +65,52 @@ public class BubbleLoggerImpl extends UiEventLoggerImpl implements BubbleLogger log(b, Event.BUBBLE_OVERFLOW_ADD_USER_GESTURE); } } + + void logStackUiChanged(String packageName, int action, int bubbleCount, float normalX, + float normalY) { + SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED, + packageName, + null /* notification channel */, + 0 /* notification ID */, + 0 /* bubble position */, + bubbleCount, + action, + normalX, + normalY, + false /* unread bubble */, + false /* on-going bubble */, + false /* isAppForeground (unused) */); + } + + void logShowOverflow(String packageName, int action, int bubbleCount, float normalX, + float normalY) { + SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED, + packageName, + BubbleOverflow.KEY /* notification channel */, + 0 /* notification ID */, + 0 /* bubble position */, + bubbleCount, + action, + normalX, + normalY, + false /* unread bubble */, + false /* on-going bubble */, + false /* isAppForeground (unused) */); + } + + void logBubbleUiChanged(Bubble bubble, String packageName, int action, int bubbleCount, + float normalX, float normalY, int index) { + SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED, + packageName, + bubble.getChannelId() /* notification channel */, + bubble.getNotificationId() /* notification ID */, + index, + bubbleCount, + action, + normalX, + normalY, + bubble.showInShade() /* isUnread */, + false /* isOngoing (unused) */, + false /* isAppForeground (unused) */); + } }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java index dadcb3a3a7c4..bb9d1095a37a 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java @@ -163,12 +163,6 @@ public class BubbleOverflow implements BubbleViewProvider { } @Override - public void logUIEvent(int bubbleCount, int action, float normalX, float normalY, - int index) { - // TODO(b/149133814) Log overflow UI events. - } - - @Override public View getIconView() { return mOverflowBtn; } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index b328f62e067e..f02945ef843a 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -2891,23 +2891,13 @@ public class BubbleStackView extends FrameLayout * @param action the user interaction enum. */ private void logBubbleEvent(@Nullable BubbleViewProvider provider, int action) { - if (provider == null || provider.getKey().equals(BubbleOverflow.KEY)) { - SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED, - mContext.getApplicationInfo().packageName, - provider == null ? null : BubbleOverflow.KEY /* notification channel */, - 0 /* notification ID */, - 0 /* bubble position */, - getBubbleCount(), - action, - getNormalizedXPosition(), - getNormalizedYPosition(), - false /* unread bubble */, - false /* on-going bubble */, - false /* isAppForeground (unused) */); - return; - } - provider.logUIEvent(getBubbleCount(), action, getNormalizedXPosition(), - getNormalizedYPosition(), getBubbleIndex(provider)); + mBubbleData.logBubbleEvent(provider, + action, + mContext.getApplicationInfo().packageName, + getBubbleCount(), + getBubbleIndex(provider), + getNormalizedXPosition(), + getNormalizedYPosition()); } /** diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewProvider.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewProvider.java index ca3e2e27fa9a..f1a01be48397 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewProvider.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewProvider.java @@ -32,8 +32,6 @@ interface BubbleViewProvider { @Nullable View getIconView(); - void logUIEvent(int bubbleCount, int action, float normalX, float normalY, int index); - String getKey(); Bitmap getBadgedImage(); diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java index ab7af43f91d2..f35322bd2a77 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java @@ -22,7 +22,6 @@ import android.content.Context; import android.hardware.SensorManager; import android.net.Uri; import android.provider.DeviceConfig; -import android.util.DisplayMetrics; import android.view.MotionEvent; import androidx.annotation.NonNull; @@ -62,7 +61,7 @@ public class FalsingManagerProxy implements FalsingManager, Dumpable { private static final String PROXIMITY_SENSOR_TAG = "FalsingManager"; private final ProximitySensor mProximitySensor; - private final DisplayMetrics mDisplayMetrics; + private final FalsingDataProvider mFalsingDataProvider; private FalsingManager mInternalFalsingManager; private DeviceConfig.OnPropertiesChangedListener mDeviceConfigListener; private final DeviceConfigProxy mDeviceConfig; @@ -74,18 +73,19 @@ public class FalsingManagerProxy implements FalsingManager, Dumpable { @Inject FalsingManagerProxy(Context context, PluginManager pluginManager, @Main Executor executor, - DisplayMetrics displayMetrics, ProximitySensor proximitySensor, + ProximitySensor proximitySensor, DeviceConfigProxy deviceConfig, DockManager dockManager, KeyguardUpdateMonitor keyguardUpdateMonitor, DumpManager dumpManager, @UiBackground Executor uiBgExecutor, - StatusBarStateController statusBarStateController) { - mDisplayMetrics = displayMetrics; + StatusBarStateController statusBarStateController, + FalsingDataProvider falsingDataProvider) { mProximitySensor = proximitySensor; mDockManager = dockManager; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mUiBgExecutor = uiBgExecutor; mStatusBarStateController = statusBarStateController; + mFalsingDataProvider = falsingDataProvider; mProximitySensor.setTag(PROXIMITY_SENSOR_TAG); mProximitySensor.setDelay(SensorManager.SENSOR_DELAY_GAME); mDeviceConfig = deviceConfig; @@ -143,7 +143,7 @@ public class FalsingManagerProxy implements FalsingManager, Dumpable { mInternalFalsingManager = new FalsingManagerImpl(context, mUiBgExecutor); } else { mInternalFalsingManager = new BrightLineFalsingManager( - new FalsingDataProvider(mDisplayMetrics), + mFalsingDataProvider, mKeyguardUpdateMonitor, mProximitySensor, mDeviceConfig, diff --git a/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java index 95d5ad9a7a94..a50f9ce9713b 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java @@ -132,7 +132,9 @@ public class BrightLineFalsingManager implements FalsingManager { } private void registerSensors() { - mProximitySensor.register(mSensorEventListener); + if (!mDataProvider.isWirelessCharging()) { + mProximitySensor.register(mSensorEventListener); + } } private void unregisterSensors() { diff --git a/packages/SystemUI/src/com/android/systemui/classifier/brightline/FalsingDataProvider.java b/packages/SystemUI/src/com/android/systemui/classifier/brightline/FalsingDataProvider.java index 5494c644c22c..ea46441c8fbe 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/brightline/FalsingDataProvider.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/brightline/FalsingDataProvider.java @@ -22,10 +22,13 @@ import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; import com.android.systemui.classifier.Classifier; +import com.android.systemui.statusbar.policy.BatteryController; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** * Acts as a cache and utility class for FalsingClassifiers. */ @@ -36,6 +39,7 @@ public class FalsingDataProvider { private final int mWidthPixels; private final int mHeightPixels; + private final BatteryController mBatteryController; private final float mXdpi; private final float mYdpi; @@ -50,11 +54,13 @@ public class FalsingDataProvider { private MotionEvent mFirstRecentMotionEvent; private MotionEvent mLastMotionEvent; - public FalsingDataProvider(DisplayMetrics displayMetrics) { + @Inject + public FalsingDataProvider(DisplayMetrics displayMetrics, BatteryController batteryController) { mXdpi = displayMetrics.xdpi; mYdpi = displayMetrics.ydpi; mWidthPixels = displayMetrics.widthPixels; mHeightPixels = displayMetrics.heightPixels; + mBatteryController = batteryController; FalsingClassifier.logInfo("xdpi, ydpi: " + getXdpi() + ", " + getYdpi()); FalsingClassifier.logInfo("width, height: " + getWidthPixels() + ", " + getHeightPixels()); @@ -177,6 +183,11 @@ public class FalsingDataProvider { return mLastMotionEvent.getY() < mFirstRecentMotionEvent.getY(); } + /** Returns true if phone is being charged without a cable. */ + boolean isWirelessCharging() { + return mBatteryController.isWirelessCharging(); + } + private void recalculateData() { if (!mDirty) { return; diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java index 6b8fcd562e6f..e5cc1384efa4 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIRootComponent.java @@ -29,6 +29,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.fragments.FragmentService; import com.android.systemui.keyguard.KeyguardSliceProvider; import com.android.systemui.onehanded.dagger.OneHandedModule; +import com.android.systemui.pip.phone.PipMenuActivity; import com.android.systemui.pip.phone.dagger.PipModule; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.util.InjectionInflationController; @@ -121,4 +122,9 @@ public interface SystemUIRootComponent { * Member injection into the supplied argument. */ void inject(KeyguardSliceProvider keyguardSliceProvider); + + /** + * Member injection into the supplied argument. + */ + void inject(PipMenuActivity pipMenuActivity); } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java index 0800a201bd92..abbbd1713250 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java @@ -408,10 +408,13 @@ public class DozeTriggers implements DozeMachine.Part { break; case DOZE_PULSING: case DOZE_PULSING_BRIGHT: - case DOZE_AOD_DOCKED: mWantProx = true; mWantTouchScreenSensors = false; break; + case DOZE_AOD_DOCKED: + mWantProx = false; + mWantTouchScreenSensors = false; + break; case DOZE_PULSE_DONE: mDozeSensors.requestTemporaryDisable(); // A pulse will temporarily disable sensors that require a touch screen. diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index b2e91643bed2..ef51abb1404d 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -2129,7 +2129,6 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, private boolean mShowing; private float mScrimAlpha; private ResetOrientationData mResetOrientationData; - private boolean mHadTopUi; private final NotificationShadeWindowController mNotificationShadeWindowController; private final NotificationShadeDepthController mDepthController; private final SysUiState mSysUiState; @@ -2397,8 +2396,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, public void show() { super.show(); mShowing = true; - mHadTopUi = mNotificationShadeWindowController.getForceHasTopUi(); - mNotificationShadeWindowController.setForceHasTopUi(true); + mNotificationShadeWindowController.setRequestTopUi(true, TAG); mSysUiState.setFlag(SYSUI_STATE_GLOBAL_ACTIONS_SHOWING, true) .commitUpdate(mContext.getDisplayId()); @@ -2499,7 +2497,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, dismissOverflow(true); dismissPowerOptions(true); if (mControlsUiController != null) mControlsUiController.hide(); - mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi); + mNotificationShadeWindowController.setRequestTopUi(false, TAG); mDepthController.updateGlobalDialogVisibility(0, null /* view */); mSysUiState.setFlag(SYSUI_STATE_GLOBAL_ACTIONS_SHOWING, false) .commitUpdate(mContext.getDisplayId()); diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index e12b7dd259a5..075318b3f1f7 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -306,7 +306,7 @@ class MediaCarouselController @Inject constructor( private fun updatePageIndicator() { val numPages = mediaContent.getChildCount() - pageIndicator.setNumPages(numPages, Color.WHITE) + pageIndicator.setNumPages(numPages) if (numPages == 1) { pageIndicator.setLocation(0f) } diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java b/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java index ead17867844a..72019315139b 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipAnimationController.java @@ -21,7 +21,6 @@ import android.animation.Animator; import android.animation.RectEvaluator; import android.animation.ValueAnimator; import android.annotation.IntDef; -import android.content.Context; import android.graphics.Rect; import android.view.SurfaceControl; @@ -56,13 +55,15 @@ public class PipAnimationController { public static final int TRANSITION_DIRECTION_TO_PIP = 2; public static final int TRANSITION_DIRECTION_TO_FULLSCREEN = 3; public static final int TRANSITION_DIRECTION_TO_SPLIT_SCREEN = 4; + public static final int TRANSITION_DIRECTION_REMOVE_STACK = 5; @IntDef(prefix = { "TRANSITION_DIRECTION_" }, value = { TRANSITION_DIRECTION_NONE, TRANSITION_DIRECTION_SAME, TRANSITION_DIRECTION_TO_PIP, TRANSITION_DIRECTION_TO_FULLSCREEN, - TRANSITION_DIRECTION_TO_SPLIT_SCREEN + TRANSITION_DIRECTION_TO_SPLIT_SCREEN, + TRANSITION_DIRECTION_REMOVE_STACK }) @Retention(RetentionPolicy.SOURCE) public @interface TransitionDirection {} @@ -88,7 +89,7 @@ public class PipAnimationController { }); @Inject - PipAnimationController(Context context, PipSurfaceTransactionHelper helper) { + PipAnimationController(PipSurfaceTransactionHelper helper) { mSurfaceTransactionHelper = helper; } @@ -338,6 +339,10 @@ public class PipAnimationController { @Override void onStartTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) { + if (getTransitionDirection() == TRANSITION_DIRECTION_REMOVE_STACK) { + // while removing the pip stack, no extra work needs to be done here. + return; + } getSurfaceTransactionHelper() .resetScale(tx, leash, getDestinationBounds()) .crop(tx, leash, getDestinationBounds()) diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java index 8bbd15babf19..665b90e29976 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java @@ -34,6 +34,7 @@ import android.util.DisplayMetrics; import android.util.Log; import android.util.Size; import android.util.TypedValue; +import android.view.Display; import android.view.DisplayInfo; import android.view.Gravity; import android.window.WindowContainerTransaction; @@ -60,7 +61,7 @@ public class PipBoundsHandler { private final PipSnapAlgorithm mSnapAlgorithm; private final DisplayInfo mDisplayInfo = new DisplayInfo(); private final DisplayController mDisplayController; - private final DisplayLayout mDisplayLayout; + private DisplayLayout mDisplayLayout; private ComponentName mLastPipComponentName; private float mReentrySnapFraction = INVALID_SNAP_FRACTION; @@ -177,7 +178,7 @@ public class PipBoundsHandler { } if (isValidPictureInPictureAspectRatio(mAspectRatio)) { transformBoundsToAspectRatio(normalBounds, mAspectRatio, - false /* useCurrentMinEdgeSize */); + false /* useCurrentMinEdgeSize */, false /* useCurrentSize */); } displayInfo.copyFrom(mDisplayInfo); } @@ -278,7 +279,9 @@ public class PipBoundsHandler { destinationBounds = new Rect(bounds); } if (isValidPictureInPictureAspectRatio(aspectRatio)) { - transformBoundsToAspectRatio(destinationBounds, aspectRatio, useCurrentMinEdgeSize); + boolean useCurrentSize = bounds == null && mReentrySize != null; + transformBoundsToAspectRatio(destinationBounds, aspectRatio, useCurrentMinEdgeSize, + useCurrentSize); } mAspectRatio = aspectRatio; return destinationBounds; @@ -288,6 +291,10 @@ public class PipBoundsHandler { return mDefaultAspectRatio; } + public void onOverlayChanged(Context context, Display display) { + mDisplayLayout = new DisplayLayout(context, display); + } + /** * Updatest the display info and display layout on rotation change. This is needed even when we * aren't in PIP because the rotation layout is used to calculate the proper insets for the @@ -384,7 +391,8 @@ public class PipBoundsHandler { * @param stackBounds */ public void transformBoundsToAspectRatio(Rect stackBounds) { - transformBoundsToAspectRatio(stackBounds, mAspectRatio, true); + transformBoundsToAspectRatio(stackBounds, mAspectRatio, true /* useCurrentMinEdgeSize */, + true /* useCurrentSize */); } /** @@ -392,18 +400,16 @@ public class PipBoundsHandler { * specified aspect ratio. */ private void transformBoundsToAspectRatio(Rect stackBounds, float aspectRatio, - boolean useCurrentMinEdgeSize) { + boolean useCurrentMinEdgeSize, boolean useCurrentSize) { // Save the snap fraction and adjust the size based on the new aspect ratio. final float snapFraction = mSnapAlgorithm.getSnapFraction(stackBounds, getMovementBounds(stackBounds)); - final int minEdgeSize; + final int minEdgeSize = useCurrentMinEdgeSize ? mCurrentMinSize : mDefaultMinSize; final Size size; - if (useCurrentMinEdgeSize) { - minEdgeSize = mCurrentMinSize; + if (useCurrentMinEdgeSize || useCurrentSize) { size = mSnapAlgorithm.getSizeForAspectRatio( new Size(stackBounds.width(), stackBounds.height()), aspectRatio, minEdgeSize); } else { - minEdgeSize = mDefaultMinSize; size = mSnapAlgorithm.getSizeForAspectRatio(aspectRatio, minEdgeSize, mDisplayInfo.logicalWidth, mDisplayInfo.logicalHeight); } diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java index 65ea887259be..2c7ec48e4ae7 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java @@ -23,8 +23,8 @@ import android.graphics.Rect; import android.graphics.RectF; import android.view.SurfaceControl; -import com.android.systemui.R; import com.android.systemui.statusbar.policy.ConfigurationController; +import com.android.wm.shell.R; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java index 0141dee04086..35e56ee87967 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java +++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java @@ -24,6 +24,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static com.android.systemui.pip.PipAnimationController.ANIM_TYPE_ALPHA; import static com.android.systemui.pip.PipAnimationController.ANIM_TYPE_BOUNDS; import static com.android.systemui.pip.PipAnimationController.TRANSITION_DIRECTION_NONE; +import static com.android.systemui.pip.PipAnimationController.TRANSITION_DIRECTION_REMOVE_STACK; import static com.android.systemui.pip.PipAnimationController.TRANSITION_DIRECTION_SAME; import static com.android.systemui.pip.PipAnimationController.TRANSITION_DIRECTION_TO_FULLSCREEN; import static com.android.systemui.pip.PipAnimationController.TRANSITION_DIRECTION_TO_PIP; @@ -55,10 +56,10 @@ import android.window.WindowContainerTransactionCallback; import android.window.WindowOrganizer; import com.android.internal.os.SomeArgs; -import com.android.systemui.R; import com.android.systemui.pip.phone.PipUpdateThread; import com.android.systemui.stackdivider.Divider; import com.android.systemui.wm.DisplayController; +import com.android.wm.shell.R; import java.io.PrintWriter; import java.util.ArrayList; @@ -177,6 +178,9 @@ public class PipTaskOrganizer extends TaskOrganizer implements Rect startBounds = (Rect) args.arg2; Rect toBounds = (Rect) args.arg3; userResizePip(startBounds, toBounds); + if (updateBoundsCallback != null) { + updateBoundsCallback.accept(toBounds); + } break; } } @@ -337,23 +341,32 @@ public class PipTaskOrganizer extends TaskOrganizer implements + " mInPip=" + mInPip + " mExitingPip=" + mExitingPip + " mToken=" + mToken); return; } - getUpdateHandler().post(() -> { - try { - // Reset the task bounds first to ensure the activity configuration is reset as well - final WindowContainerTransaction wct = new WindowContainerTransaction(); - wct.setBounds(mToken, null); - WindowOrganizer.applyTransaction(wct); - - ActivityTaskManager.getService().removeStacksInWindowingModes( - new int[]{ WINDOWING_MODE_PINNED }); - } catch (RemoteException e) { - Log.e(TAG, "Failed to remove PiP", e); - } - }); + + // removePipImmediately is expected when the following animation finishes. + mUpdateHandler.post(() -> mPipAnimationController + .getAnimator(mLeash, mLastReportedBounds, 1f, 0f) + .setTransitionDirection(TRANSITION_DIRECTION_REMOVE_STACK) + .setPipAnimationCallback(mPipAnimationCallback) + .setDuration(mEnterExitAnimationDuration) + .start()); mInitialState.remove(mToken.asBinder()); mExitingPip = true; } + private void removePipImmediately() { + try { + // Reset the task bounds first to ensure the activity configuration is reset as well + final WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.setBounds(mToken, null); + WindowOrganizer.applyTransaction(wct); + + ActivityTaskManager.getService().removeStacksInWindowingModes( + new int[]{ WINDOWING_MODE_PINNED }); + } catch (RemoteException e) { + Log.e(TAG, "Failed to remove PiP", e); + } + } + @Override public void onTaskAppeared(ActivityManager.RunningTaskInfo info, SurfaceControl leash) { Objects.requireNonNull(info, "Requires RunningTaskInfo"); @@ -803,7 +816,10 @@ public class PipTaskOrganizer extends TaskOrganizer implements + "directly"); } mLastReportedBounds.set(destinationBounds); - if (isInPipDirection(direction) && type == ANIM_TYPE_ALPHA) { + if (direction == TRANSITION_DIRECTION_REMOVE_STACK) { + removePipImmediately(); + return; + } else if (isInPipDirection(direction) && type == ANIM_TYPE_ALPHA) { return; } 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 8b3f4cb196bf..c715398d52da 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipAccessibilityInteractionConnection.java @@ -27,9 +27,9 @@ 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 com.android.wm.shell.R; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 2802702aa0b4..02bf475d5744 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -53,10 +53,12 @@ import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.PinnedStackListenerForwarder.PinnedStackListener; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.WindowManagerWrapper; +import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.util.DeviceConfigProxy; import com.android.systemui.util.FloatingContentCoordinator; import com.android.systemui.wm.DisplayChangeController; import com.android.systemui.wm.DisplayController; +import com.android.systemui.wm.DisplayLayout; import java.io.PrintWriter; @@ -234,6 +236,19 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio } } + public ConfigurationController.ConfigurationListener mOverlayChangedListener = + new ConfigurationController.ConfigurationListener() { + @Override + public void onOverlayChanged() { + mHandler.post(() -> { + mPipBoundsHandler.onOverlayChanged(mContext, mContext.getDisplay()); + updateMovementBounds(null /* toBounds */, + false /* fromRotation */, false /* fromImeAdjustment */, + false /* fromShelfAdjustment */, null /* windowContainerTransaction */); + }); + } + }; + @Inject public PipManager(Context context, BroadcastDispatcher broadcastDispatcher, DisplayController displayController, @@ -242,7 +257,8 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio PipBoundsHandler pipBoundsHandler, PipSnapAlgorithm pipSnapAlgorithm, PipTaskOrganizer pipTaskOrganizer, - SysUiState sysUiState) { + SysUiState sysUiState, + ConfigurationController configController) { mContext = context; mActivityManager = ActivityManager.getService(); @@ -275,6 +291,8 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio context.getDisplay().getDisplayInfo(displayInfo); mPipBoundsHandler.onDisplayInfoChanged(displayInfo); + configController.addCallback(mOverlayChangedListener); + try { mPipTaskOrganizer.registerOrganizer(WINDOWING_MODE_PINNED); ActivityManager.StackInfo stackInfo = ActivityTaskManager.getService().getStackInfo( diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java index 849a62add80f..361aafacdf76 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java @@ -194,13 +194,13 @@ public class PipMediaController { private void createMediaActions() { String pauseDescription = mContext.getString(R.string.pip_pause); mPauseAction = new RemoteAction(Icon.createWithResource(mContext, - R.drawable.ic_pause_white), pauseDescription, pauseDescription, + R.drawable.pip_ic_pause_white), pauseDescription, pauseDescription, PendingIntent.getBroadcast(mContext, 0, new Intent(ACTION_PAUSE), FLAG_UPDATE_CURRENT)); String playDescription = mContext.getString(R.string.pip_play); mPlayAction = new RemoteAction(Icon.createWithResource(mContext, - R.drawable.ic_play_arrow_white), playDescription, playDescription, + R.drawable.pip_ic_play_arrow_white), playDescription, playDescription, PendingIntent.getBroadcast(mContext, 0, new Intent(ACTION_PLAY), FLAG_UPDATE_CURRENT)); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index 89df3722bbeb..d6f3e163ad70 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -76,12 +76,15 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import com.android.systemui.Interpolators; -import com.android.systemui.R; +import com.android.systemui.SystemUIFactory; +import com.android.wm.shell.R; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + /** * Translucent activity that gets started on top of a task in PIP to allow the user to control it. */ @@ -100,6 +103,7 @@ public class PipMenuActivity extends Activity { public static final int MESSAGE_POINTER_EVENT = 7; public static final int MESSAGE_MENU_EXPANDED = 8; public static final int MESSAGE_FADE_OUT_MENU = 9; + public static final int MESSAGE_UPDATE_MENU_LAYOUT = 10; private static final int INITIAL_DISMISS_DELAY = 3500; private static final int POST_INTERACTION_DISMISS_DELAY = 2000; @@ -129,8 +133,12 @@ public class PipMenuActivity extends Activity { private View mSettingsButton; private View mDismissButton; private View mResizeHandle; + private View mTopEndContainer; private int mBetweenActionPaddingLand; + @Inject + PipMenuIconsAlgorithm mPipMenuIconsAlgorithm; + private AnimatorSet mMenuContainerAnimator; private ValueAnimator.AnimatorUpdateListener mMenuBgUpdateListener = @@ -193,6 +201,11 @@ public class PipMenuActivity extends Activity { fadeOutMenu(); break; } + case MESSAGE_UPDATE_MENU_LAYOUT: { + final Rect bounds = (Rect) msg.obj; + mPipMenuIconsAlgorithm.onBoundsChanged(bounds); + break; + } } } }; @@ -208,6 +221,9 @@ public class PipMenuActivity extends Activity { getWindow().addFlags(LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH); super.onCreate(savedInstanceState); + + SystemUIFactory.getInstance().getRootComponent().inject(this); + setContentView(R.layout.pip_menu_activity); mAccessibilityManager = getSystemService(AccessibilityManager.class); @@ -217,6 +233,7 @@ public class PipMenuActivity extends Activity { mViewRoot.setBackground(mBackgroundDrawable); mMenuContainer = findViewById(R.id.menu_container); mMenuContainer.setAlpha(0); + mTopEndContainer = findViewById(R.id.top_end_container); mSettingsButton = findViewById(R.id.settings); mSettingsButton.setAlpha(0); mSettingsButton.setOnClickListener((v) -> { @@ -238,6 +255,8 @@ public class PipMenuActivity extends Activity { mBetweenActionPaddingLand = getResources().getDimensionPixelSize( R.dimen.pip_between_action_padding_land); + mPipMenuIconsAlgorithm.bindViews((ViewGroup) mViewRoot, (ViewGroup) mTopEndContainer, + mResizeHandle, mSettingsButton, mDismissButton); updateFromIntent(getIntent()); setTitle(R.string.pip_menu_title); setDisablePreviewScreenshots(true); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java index 87e66fdc375c..267c5eacd139 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java @@ -574,6 +574,22 @@ public class PipMenuActivityController { } } + /** + * Tell the PIP Menu to recalculate its layout given its current position on the display. + */ + public void updateMenuLayout(Rect bounds) { + if (mToActivityMessenger != null) { + Message m = Message.obtain(); + m.what = PipMenuActivity.MESSAGE_UPDATE_MENU_LAYOUT; + m.obj = bounds; + try { + mToActivityMessenger.send(m); + } catch (RemoteException e) { + Log.e(TAG, "Could not dispatch touch event", e); + } + } + } + public void dump(PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; pw.println(prefix + TAG); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuIconsAlgorithm.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuIconsAlgorithm.java new file mode 100644 index 000000000000..69a04d8d3e22 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuIconsAlgorithm.java @@ -0,0 +1,90 @@ +/* + * 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.pip.phone; + +import android.content.Context; +import android.graphics.Rect; +import android.util.Log; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; + +import javax.inject.Inject; + +/** + * Helper class to calculate and place the menu icons on the PIP Menu. + */ +public class PipMenuIconsAlgorithm { + + private static final String TAG = "PipMenuIconsAlgorithm"; + + private boolean mFinishedLayout = false; + protected ViewGroup mViewRoot; + protected ViewGroup mTopEndContainer; + protected View mDragHandle; + protected View mSettingsButton; + protected View mDismissButton; + + @Inject + public PipMenuIconsAlgorithm(Context context) { + } + + /** + * Bind the necessary views. + */ + public void bindViews(ViewGroup viewRoot, ViewGroup topEndContainer, View dragHandle, + View settingsButton, View dismissButton) { + mViewRoot = viewRoot; + mTopEndContainer = topEndContainer; + mDragHandle = dragHandle; + mSettingsButton = settingsButton; + mDismissButton = dismissButton; + } + + + /** + * Updates the position of the drag handle based on where the PIP window is on the screen. + */ + public void onBoundsChanged(Rect bounds) { + if (mViewRoot == null || mTopEndContainer == null || mDragHandle == null + || mSettingsButton == null || mDismissButton == null) { + Log.e(TAG, "One if the required views is null."); + } + + //We only need to calculate the layout once since it does not change. + if (!mFinishedLayout) { + mTopEndContainer.removeView(mSettingsButton); + mViewRoot.addView(mSettingsButton); + + setLayoutGravity(mDragHandle, Gravity.START | Gravity.TOP); + setLayoutGravity(mSettingsButton, Gravity.START | Gravity.TOP); + mFinishedLayout = true; + } + } + + /** + * Set the gravity on the given view. + */ + protected static void setLayoutGravity(View v, int gravity) { + if (v.getLayoutParams() instanceof FrameLayout.LayoutParams) { + FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) v.getLayoutParams(); + params.gravity = gravity; + v.setLayoutParams(params); + } + } +} 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 8a2e4ae11878..ca3ef2465498 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java @@ -26,9 +26,10 @@ import android.os.Debug; import android.util.Log; import android.view.Choreographer; +import androidx.dynamicanimation.animation.AnimationHandler; +import androidx.dynamicanimation.animation.AnimationHandler.FrameCallbackScheduler; import androidx.dynamicanimation.animation.SpringForce; -import com.android.internal.graphics.SfVsyncFrameCallbackProvider; import com.android.systemui.pip.PipSnapAlgorithm; import com.android.systemui.pip.PipTaskOrganizer; import com.android.systemui.util.FloatingContentCoordinator; @@ -74,9 +75,6 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, /** The region that all of PIP must stay within. */ private final Rect mFloatingAllowedArea = new Rect(); - private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider = - new SfVsyncFrameCallbackProvider(); - /** * Temporary bounds used when PIP is being dragged or animated. These bounds are applied to PIP * using {@link PipTaskOrganizer#scheduleUserResizePip}, so that we can animate shrinking into @@ -94,8 +92,13 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, /** Coordinator instance for resolving conflicts with other floating content. */ private FloatingContentCoordinator mFloatingContentCoordinator; - /** Callback that re-sizes PIP to the animated bounds. */ - private final Choreographer.FrameCallback mResizePipVsyncCallback; + private ThreadLocal<AnimationHandler> mSfAnimationHandlerThreadLocal = + ThreadLocal.withInitial(() -> { + FrameCallbackScheduler scheduler = runnable -> + Choreographer.getSfInstance().postFrameCallback(t -> runnable.run()); + AnimationHandler handler = new AnimationHandler(scheduler); + return handler; + }); /** * PhysicsAnimator instance for animating {@link #mTemporaryBounds} using physics animations. @@ -124,7 +127,10 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, new PhysicsAnimator.SpringConfig( SpringForce.STIFFNESS_LOW, SpringForce.DAMPING_RATIO_LOW_BOUNCY); - private final Consumer<Rect> mUpdateBoundsCallback = mBounds::set; + private final Consumer<Rect> mUpdateBoundsCallback = (Rect newBounds) -> { + mMenuController.updateMenuLayout(newBounds); + mBounds.set(newBounds); + }; /** * Whether we're springing to the touch event location (vs. moving it to that position @@ -171,16 +177,15 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, mSnapAlgorithm = snapAlgorithm; mFloatingContentCoordinator = floatingContentCoordinator; mPipTaskOrganizer.registerPipTransitionCallback(mPipTransitionCallback); + mTemporaryBoundsPhysicsAnimator.setCustomAnimationHandler( + mSfAnimationHandlerThreadLocal.get()); - mResizePipVsyncCallback = l -> { + mResizePipUpdateListener = (target, values) -> { if (!mTemporaryBounds.isEmpty()) { mPipTaskOrganizer.scheduleUserResizePip( mBounds, mTemporaryBounds, null); } }; - - mResizePipUpdateListener = (target, values) -> - mSfVsyncFrameProvider.postFrameCallback(mResizePipVsyncCallback); } @NonNull @@ -246,7 +251,10 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, mBounds.set(toBounds); } else { mTemporaryBounds.set(toBounds); - mPipTaskOrganizer.scheduleUserResizePip(mBounds, mTemporaryBounds, null); + mPipTaskOrganizer.scheduleUserResizePip(mBounds, mTemporaryBounds, + (Rect newBounds) -> { + mMenuController.updateMenuLayout(newBounds); + }); } } else { // If PIP is 'catching up' after being stuck in the dismiss target, update the animation diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java index 1ca53f907994..d884fa956edc 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java @@ -49,16 +49,15 @@ import android.view.MotionEvent; import android.view.ViewConfiguration; import com.android.internal.policy.TaskResizingAlgorithm; -import com.android.systemui.R; import com.android.systemui.model.SysUiState; import com.android.systemui.pip.PipBoundsHandler; import com.android.systemui.pip.PipTaskOrganizer; import com.android.systemui.util.DeviceConfigProxy; +import com.android.wm.shell.R; import java.io.PrintWriter; import java.util.concurrent.Executor; import java.util.function.Function; -import java.util.function.Supplier; /** * Helper on top of PipTouchHandler that handles inputs OUTSIDE of the PIP window, which is used to 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 32f8c126373d..5434b62e19b8 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java @@ -348,7 +348,7 @@ public class PipTouchHandler { } private boolean shouldShowResizeHandle() { - return !mPipBoundsHandler.hasSaveReentryBounds(); + return false; } public void setTouchGesture(PipTouchGesture gesture) { diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlButtonView.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlButtonView.java index b21cd95626a7..db9bedd2e620 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlButtonView.java @@ -28,7 +28,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.android.systemui.R; +import com.android.wm.shell.R; /** * A view containing PIP controls including fullscreen, close, and media controls. diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java index 8efeef1ffa0a..125444d2dfb5 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsView.java @@ -22,7 +22,7 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.widget.LinearLayout; -import com.android.systemui.R; +import com.android.wm.shell.R; /** diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsViewController.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsViewController.java index bb588d409dc8..05bb882ea52e 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsViewController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipControlsViewController.java @@ -26,8 +26,8 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; -import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Main; +import com.android.wm.shell.R; import java.util.ArrayList; import java.util.List; @@ -216,10 +216,10 @@ public class PipControlsViewController { } else { mPlayPauseButtonView.setVisibility(View.VISIBLE); if (state == PipManager.PLAYBACK_STATE_PLAYING) { - mPlayPauseButtonView.setImageResource(R.drawable.ic_pause_white); + mPlayPauseButtonView.setImageResource(R.drawable.pip_ic_pause_white); mPlayPauseButtonView.setText(R.string.pip_pause); } else { - mPlayPauseButtonView.setImageResource(R.drawable.ic_play_arrow_white); + mPlayPauseButtonView.setImageResource(R.drawable.pip_ic_play_arrow_white); mPlayPauseButtonView.setText(R.string.pip_play); } } diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java index bf82a3f953d1..2138f092b790 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java @@ -43,7 +43,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; -import android.util.Pair; import android.view.DisplayInfo; import com.android.systemui.Dependency; @@ -74,10 +73,6 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio private static final String TAG = "PipManager"; static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - private static final String SETTINGS_PACKAGE_AND_CLASS_DELIMITER = "/"; - - private static List<Pair<String, String>> sSettingsPackageAndClassNamePairList; - /** * State when there's no PIP. */ @@ -123,10 +118,8 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio private final Handler mHandler = new Handler(); private List<Listener> mListeners = new ArrayList<>(); private List<MediaListener> mMediaListeners = new ArrayList<>(); - private Rect mCurrentPipBounds; private Rect mPipBounds; private Rect mDefaultPipBounds = new Rect(); - private Rect mSettingsPipBounds; private Rect mMenuModePipBounds; private int mLastOrientation = Configuration.ORIENTATION_UNDEFINED; private boolean mInitialized; @@ -261,37 +254,6 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio broadcastDispatcher.registerReceiver(mBroadcastReceiver, intentFilter, null /* handler */, UserHandle.ALL); - if (sSettingsPackageAndClassNamePairList == null) { - String[] settings = mContext.getResources().getStringArray( - R.array.tv_pip_settings_class_name); - sSettingsPackageAndClassNamePairList = new ArrayList<>(); - if (settings != null) { - for (int i = 0; i < settings.length; i++) { - Pair<String, String> entry = null; - String[] packageAndClassName = - settings[i].split(SETTINGS_PACKAGE_AND_CLASS_DELIMITER); - switch (packageAndClassName.length) { - case 1: - entry = Pair.<String, String>create(packageAndClassName[0], null); - break; - case 2: - if (packageAndClassName[1] != null) { - entry = Pair.<String, String>create(packageAndClassName[0], - packageAndClassName[1].startsWith(".") - ? packageAndClassName[0] + packageAndClassName[1] - : packageAndClassName[1]); - } - break; - } - if (entry != null) { - sSettingsPackageAndClassNamePairList.add(entry); - } else { - Log.w(TAG, "Ignoring malformed settings name " + settings[i]); - } - } - } - } - // Initialize the last orientation and apply the current configuration Configuration initialConfig = mContext.getResources().getConfiguration(); mLastOrientation = initialConfig.orientation; @@ -319,15 +281,13 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio } Resources res = mContext.getResources(); - mSettingsPipBounds = Rect.unflattenFromString(res.getString( - R.string.pip_settings_bounds)); mMenuModePipBounds = Rect.unflattenFromString(res.getString( R.string.pip_menu_bounds)); // Reset the PIP bounds and apply. PIP bounds can be changed by two reasons. // 1. Configuration changed due to the language change (RTL <-> RTL) // 2. SystemUI restarts after the crash - mPipBounds = isSettingsShown() ? mSettingsPipBounds : mDefaultPipBounds; + mPipBounds = mDefaultPipBounds; resizePinnedStack(getPinnedStackInfo() == null ? STATE_NO_PIP : STATE_PIP); } @@ -448,9 +408,10 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio return; } mState = state; + final Rect newBounds; switch (mState) { case STATE_NO_PIP: - mCurrentPipBounds = null; + newBounds = null; // If the state was already STATE_NO_PIP, then do not resize the stack below as it // will not exist if (wasStateNoPip) { @@ -458,16 +419,15 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio } break; case STATE_PIP_MENU: - mCurrentPipBounds = mMenuModePipBounds; + newBounds = mMenuModePipBounds; break; case STATE_PIP: // fallthrough default: - mCurrentPipBounds = mPipBounds; + newBounds = mPipBounds; break; } - if (mCurrentPipBounds != null) { - mPipTaskOrganizer.scheduleAnimateResizePip(mCurrentPipBounds, mResizeAnimationDuration, - null); + if (newBounds != null) { + mPipTaskOrganizer.scheduleAnimateResizePip(newBounds, mResizeAnimationDuration, null); } else { mPipTaskOrganizer.exitPip(mResizeAnimationDuration); } @@ -628,30 +588,6 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio return PLAYBACK_STATE_UNAVAILABLE; } - private boolean isSettingsShown() { - List<RunningTaskInfo> runningTasks; - try { - runningTasks = mActivityTaskManager.getTasks(1); - if (runningTasks.isEmpty()) { - return false; - } - } catch (RemoteException e) { - Log.d(TAG, "Failed to detect top activity", e); - return false; - } - ComponentName topActivity = runningTasks.get(0).topActivity; - for (Pair<String, String> componentName : sSettingsPackageAndClassNamePairList) { - String packageName = componentName.first; - if (topActivity.getPackageName().equals(packageName)) { - String className = componentName.second; - if (className == null || topActivity.getClassName().equals(className)) { - return true; - } - } - } - return false; - } - private TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() { @Override public void onTaskStackChanged() { @@ -680,9 +616,8 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio } } if (getState() == STATE_PIP) { - Rect bounds = isSettingsShown() ? mSettingsPipBounds : mDefaultPipBounds; - if (mPipBounds != bounds) { - mPipBounds = bounds; + if (mPipBounds != mDefaultPipBounds) { + mPipBounds = mDefaultPipBounds; resizePinnedStack(STATE_PIP); } } @@ -704,7 +639,6 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio stackInfo.taskNames[stackInfo.taskNames.length - 1]); // Set state to STATE_PIP so we show it when the pinned stack animation ends. mState = STATE_PIP; - mCurrentPipBounds = mPipBounds; mMediaSessionManager.addOnActiveSessionsChangedListener( mActiveMediaSessionListener, null); updateMediaController(mMediaSessionManager.getActiveSessions(null)); diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java index c2b9af326650..214088c99eeb 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipMenuActivity.java @@ -25,8 +25,8 @@ import android.content.pm.ParceledListSlice; import android.os.Bundle; import android.util.Log; -import com.android.systemui.R; import com.android.systemui.pip.tv.dagger.TvPipComponent; +import com.android.wm.shell.R; import java.util.Collections; diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java index 5b549cd92b18..651a4f367f21 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipNotification.java @@ -36,9 +36,9 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; -import com.android.systemui.R; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.util.NotificationChannels; +import com.android.wm.shell.R; /** * A notification that informs users that PIP is running and also provides PIP controls. diff --git a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java index 2c76d70fb3cc..f8655cc44d2a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java @@ -10,10 +10,18 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.NonNull; + +import com.android.settingslib.Utils; import com.android.systemui.R; import java.util.ArrayList; +/** + * Page indicator for using with pageable layouts + * + * Supports {@code android.R.attr.tint}. If missing, it will use the current accent color. + */ public class PageIndicator extends ViewGroup { private static final String TAG = "PageIndicator"; @@ -31,12 +39,22 @@ public class PageIndicator extends ViewGroup { private final int mPageIndicatorWidth; private final int mPageIndicatorHeight; private final int mPageDotWidth; + private @NonNull ColorStateList mTint; private int mPosition = -1; private boolean mAnimating; public PageIndicator(Context context, AttributeSet attrs) { super(context, attrs); + + TypedArray array = context.obtainStyledAttributes(attrs, new int[]{android.R.attr.tint}); + if (array.hasValue(0)) { + mTint = array.getColorStateList(0); + } else { + mTint = Utils.getColorAccent(context); + } + array.recycle(); + mPageIndicatorWidth = (int) mContext.getResources().getDimension(R.dimen.qs_page_indicator_width); mPageIndicatorHeight = @@ -45,15 +63,6 @@ public class PageIndicator extends ViewGroup { } public void setNumPages(int numPages) { - TypedArray array = getContext().obtainStyledAttributes( - new int[]{android.R.attr.colorControlActivated}); - int color = array.getColor(0, 0); - array.recycle(); - setNumPages(numPages, color); - } - - /** Overload of setNumPages that allows the indicator color to be specified.*/ - public void setNumPages(int numPages, int color) { setVisibility(numPages > 1 ? View.VISIBLE : View.GONE); if (numPages == getChildCount()) { return; @@ -67,13 +76,41 @@ public class PageIndicator extends ViewGroup { while (numPages > getChildCount()) { ImageView v = new ImageView(mContext); v.setImageResource(R.drawable.minor_a_b); - v.setImageTintList(ColorStateList.valueOf(color)); + v.setImageTintList(mTint); addView(v, new LayoutParams(mPageIndicatorWidth, mPageIndicatorHeight)); } // Refresh state. setIndex(mPosition >> 1); } + /** + * @return the current tint list for this view. + */ + @NonNull + public ColorStateList getTintList() { + return mTint; + } + + /** + * Set the color for this view. + * <br> + * Calling this will change the color of the current view and any new dots that are added to it. + * @param color the new color + */ + public void setTintList(@NonNull ColorStateList color) { + if (color.equals(mTint)) { + return; + } + mTint = color; + final int N = getChildCount(); + for (int i = 0; i < N; i++) { + View v = getChildAt(i); + if (v instanceof ImageView) { + ((ImageView) v).setImageTintList(mTint); + } + } + } + public void setLocation(float location) { int index = (int) location; setContentDescription(getContext().getString(R.string.accessibility_quick_settings_page, diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index 3eed8ad89075..560998b5d1d8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -508,7 +508,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { mPageListener.onPageChanged(isLayoutRtl() ? position == mPages.size() - 1 : position == 0); } - } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index c4bb4e86e41e..6e4ab9a3323a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -78,6 +78,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, private SettingsButton mSettingsButton; protected View mSettingsContainer; private PageIndicator mPageIndicator; + private TextView mBuildText; + private boolean mShouldShowBuildText; private boolean mQsDisabled; private QSPanel mQsPanel; @@ -147,6 +149,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, mActionsContainer = findViewById(R.id.qs_footer_actions_container); mEditContainer = findViewById(R.id.qs_footer_actions_edit_container); + mBuildText = findViewById(R.id.build); // RenderThread is doing more harm than good when touching the header (to expand quick // settings), so disable it for this view @@ -162,16 +165,19 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, } private void setBuildText() { - TextView v = findViewById(R.id.build); - if (v == null) return; + if (mBuildText == null) return; if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) { - v.setText(mContext.getString( + mBuildText.setText(mContext.getString( com.android.internal.R.string.bugreport_status, Build.VERSION.RELEASE_OR_CODENAME, Build.ID)); - v.setVisibility(View.VISIBLE); + // Set as selected for marquee before its made visible, then it won't be announced when + // it's made visible. + mBuildText.setSelected(true); + mShouldShowBuildText = true; } else { - v.setVisibility(View.GONE); + mShouldShowBuildText = false; + mBuildText.setSelected(false); } } @@ -321,6 +327,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, mMultiUserSwitch.setVisibility(showUserSwitcher() ? View.VISIBLE : View.INVISIBLE); mEditContainer.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE); mSettingsButton.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE); + + mBuildText.setVisibility(mExpanded && mShouldShowBuildText ? View.VISIBLE : View.GONE); } private boolean showUserSwitcher() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java index 795d0627c447..d11079294a85 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java @@ -14,6 +14,7 @@ package com.android.systemui.qs.tileimpl; +import static androidx.lifecycle.Lifecycle.State.DESTROYED; import static androidx.lifecycle.Lifecycle.State.RESUMED; import static androidx.lifecycle.Lifecycle.State.STARTED; @@ -475,6 +476,8 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy } mCallbacks.clear(); mHandler.removeCallbacksAndMessages(null); + // This will force it to be removed from all controllers that may have it registered. + mLifecycle.setCurrentState(DESTROYED); } protected void checkIfRestrictionEnforcedByAdminOnly(State state, String userRestriction) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 9c0030d528e7..adf2f654b951 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -17,6 +17,7 @@ package com.android.systemui.qs.tiles; import android.content.Intent; +import android.os.Bundle; import android.provider.Settings; import android.provider.Settings.Secure; import android.service.quicksettings.Tile; @@ -35,6 +36,10 @@ import javax.inject.Inject; /** Quick settings tile: Invert colors **/ public class ColorInversionTile extends QSTileImpl<BooleanState> { + private static final String EXTRA_FRAGMENT_ARGS_KEY = ":settings:fragment_args_key"; + private static final String EXTRA_SHOW_FRAGMENT_ARGS_KEY = ":settings:show_fragment_args"; + private static final String COLOR_INVERSION_PREFERENCE_KEY = "toggle_inversion_preference"; + private final Icon mIcon = ResourceIcon.get(drawable.ic_invert_colors); private final SecureSetting mSetting; @@ -78,7 +83,11 @@ public class ColorInversionTile extends QSTileImpl<BooleanState> { @Override public Intent getLongClickIntent() { - return new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS); + Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS); + Bundle bundle = new Bundle(); + bundle.putString(EXTRA_FRAGMENT_ARGS_KEY, COLOR_INVERSION_PREFERENCE_KEY); + intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGS_KEY, bundle); + return intent; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index d9d46605f209..570a4bb3cd12 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -197,7 +197,9 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, return; } mView.setHidden(mKeyguardStateController.isShowing()); - mImePositionProcessor.updateAdjustForIme(); + if (!mKeyguardStateController.isShowing()) { + mImePositionProcessor.updateAdjustForIme(); + } } @Override @@ -316,7 +318,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, } private void update(Configuration configuration) { - final boolean isDividerHidden = mView != null && mView.isHidden(); + final boolean isDividerHidden = mView != null && mKeyguardStateController.isShowing(); removeDivider(); addDivider(configuration); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java index 9d81d3563ebb..a86ab41141a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java @@ -842,7 +842,7 @@ public class ShadeListBuilder implements Dumpable { } private static final NotifSection sDefaultSection = - new NotifSection("DefaultSection") { + new NotifSection("UnknownSection") { @Override public boolean isInSection(ListEntry entry) { return true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java index 4b244bb18975..68ec6b620a53 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.notification.collection.coordinator; +import static android.app.NotificationManager.IMPORTANCE_MIN; + import android.app.Notification; import android.os.UserHandle; import android.service.notification.StatusBarNotification; @@ -24,9 +26,11 @@ import android.util.ArraySet; import com.android.systemui.ForegroundServiceController; import com.android.systemui.appops.AppOpsController; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.statusbar.notification.collection.ListEntry; import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; import com.android.systemui.util.Assert; @@ -43,6 +47,8 @@ import javax.inject.Singleton; * Tags notifications with appOps * Lifetime extends notifications associated with an ongoing ForegroundService. * Filters out notifications that represent foreground services that are no longer running + * Puts foreground service notifications into the FGS section. See {@link NotifCoordinators} for + * section ordering priority. * * Previously this logic lived in * frameworks/base/packages/SystemUI/src/com/android/systemui/ForegroundServiceController @@ -86,6 +92,10 @@ public class AppOpsCoordinator implements Coordinator { mAppOpsController.addCallback(ForegroundServiceController.APP_OPS, this::onAppOpsChanged); } + public NotifSection getSection() { + return mNotifSection; + } + /** * Filters out notifications that represent foreground services that are no longer running or * that already have an app notification with the appOps tagged to @@ -204,6 +214,23 @@ public class AppOpsCoordinator implements Coordinator { } }; + /** + * Puts foreground service notifications into its own section. + */ + private final NotifSection mNotifSection = new NotifSection("ForegroundService") { + @Override + public boolean isInSection(ListEntry entry) { + NotificationEntry notificationEntry = entry.getRepresentativeEntry(); + if (notificationEntry != null) { + Notification notification = notificationEntry.getSbn().getNotification(); + return notification.isForegroundService() + && notification.isColorized() + && entry.getRepresentativeEntry().getImportance() > IMPORTANCE_MIN; + } + return false; + } + }; + private void onAppOpsChanged(int code, int uid, String packageName, boolean active) { mMainExecutor.execute(() -> handleAppOpsChanged(code, uid, packageName, active)); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt index 1bac938a9fca..1a9de8829faf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt @@ -16,17 +16,25 @@ package com.android.systemui.statusbar.notification.collection.coordinator +import com.android.systemui.statusbar.notification.collection.ListEntry import com.android.systemui.statusbar.notification.collection.NotifPipeline import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection +import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier +import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_NON_PERSON import javax.inject.Inject import javax.inject.Singleton /** - * A coordinator that elevates important conversation notifications + * A Conversation/People Coordinator that: + * - Elevates important conversation notifications + * - Puts conversations into its own people section. @see [NotifCoordinators] for section ordering. */ @Singleton -class ConversationCoordinator @Inject constructor() : Coordinator { +class ConversationCoordinator @Inject constructor( + private val peopleNotificationIdentifier: PeopleNotificationIdentifier +) : Coordinator { private val notificationPromoter = object : NotifPromoter(TAG) { override fun shouldPromoteToTopLevel(entry: NotificationEntry): Boolean { @@ -34,10 +42,24 @@ class ConversationCoordinator @Inject constructor() : Coordinator { } } + private val mNotifSection: NotifSection = object : NotifSection("People") { + override fun isInSection(entry: ListEntry): Boolean { + return isConversation(entry.representativeEntry!!) + } + } + override fun attach(pipeline: NotifPipeline) { pipeline.addPromoter(notificationPromoter) } + fun getSection(): NotifSection { + return mNotifSection + } + + private fun isConversation(entry: NotificationEntry): Boolean = + peopleNotificationIdentifier.getPeopleNotificationType(entry.sbn, entry.ranking) != + TYPE_NON_PERSON + companion object { private const val TAG = "ConversationCoordinator" } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/Coordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/Coordinator.java index d8b2e4089f30..c1a11b2f64c8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/Coordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/Coordinator.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.notification.collection.coordinator; import com.android.systemui.statusbar.notification.collection.NotifPipeline; -import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Pluggable; /** @@ -29,8 +28,4 @@ public interface Coordinator { * Coordinators should register their listeners and {@link Pluggable}s to the pipeline. */ void attach(NotifPipeline pipeline); - - default NotifSection getSection() { - return null; - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java index 3fde2ed249d9..72597afc3b90 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java @@ -88,7 +88,6 @@ public class HeadsUpCoordinator implements Coordinator { pipeline.addNotificationLifetimeExtender(mLifetimeExtender); } - @Override public NotifSection getSection() { return mNotifSection; } @@ -192,7 +191,7 @@ public class HeadsUpCoordinator implements Coordinator { } }; - private final NotifSection mNotifSection = new NotifSection(TAG) { + private final NotifSection mNotifSection = new NotifSection("HeadsUp") { @Override public boolean isInSection(ListEntry entry) { return isCurrentlyShowingHun(entry); 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 99e822c66a8f..a09c6509e65e 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 @@ -60,6 +60,7 @@ public class NotifCoordinators implements Dumpable { PreparationCoordinator preparationCoordinator, MediaCoordinator mediaCoordinator) { dumpManager.registerDumpable(TAG, this); + mCoordinators.add(new HideLocallyDismissedNotifsCoordinator()); mCoordinators.add(hideNotifsForOtherUsersCoordinator); mCoordinators.add(keyguardCoordinator); @@ -67,20 +68,22 @@ public class NotifCoordinators implements Dumpable { mCoordinators.add(appOpsCoordinator); mCoordinators.add(deviceProvisionedCoordinator); mCoordinators.add(bubbleCoordinator); + mCoordinators.add(mediaCoordinator); + mCoordinators.add(conversationCoordinator); if (featureFlags.isNewNotifPipelineRenderingEnabled()) { - mCoordinators.add(conversationCoordinator); mCoordinators.add(headsUpCoordinator); mCoordinators.add(preparationCoordinator); } - // TODO: add new Coordinators here! (b/112656837) - mCoordinators.add(mediaCoordinator); - // TODO: add the sections in a particular ORDER (HeadsUp < People < Alerting) - for (Coordinator c : mCoordinators) { - if (c.getSection() != null) { - mOrderedSections.add(c.getSection()); - } + // Manually add Ordered Sections + // HeadsUp > FGS > People > Alerting > Silent > Unknown/Default + if (featureFlags.isNewNotifPipelineRenderingEnabled()) { + mOrderedSections.add(headsUpCoordinator.getSection()); // HeadsUp } + mOrderedSections.add(appOpsCoordinator.getSection()); // ForegroundService + mOrderedSections.add(conversationCoordinator.getSection()); // People + mOrderedSections.add(rankingCoordinator.getAlertingSection()); // Alerting + mOrderedSections.add(rankingCoordinator.getSilentSection()); // Silent } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java index e9cbf32ee052..0d2f9da77db7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinator.java @@ -17,15 +17,19 @@ package com.android.systemui.statusbar.notification.collection.coordinator; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.statusbar.notification.collection.ListEntry; import com.android.systemui.statusbar.notification.collection.NotifPipeline; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection; +import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider; import javax.inject.Inject; import javax.inject.Singleton; /** * Filters out NotificationEntries based on its Ranking and dozing state. + * Assigns alerting / silent section based on the importance of the notification entry. * We check the NotificationEntry's Ranking for: * - whether the notification's app is suspended or hiding its notifications * - whether DND settings are hiding notifications from ambient display or the notification list @@ -35,10 +39,14 @@ public class RankingCoordinator implements Coordinator { private static final String TAG = "RankingNotificationCoordinator"; private final StatusBarStateController mStatusBarStateController; + private final HighPriorityProvider mHighPriorityProvider; @Inject - public RankingCoordinator(StatusBarStateController statusBarStateController) { + public RankingCoordinator( + StatusBarStateController statusBarStateController, + HighPriorityProvider highPriorityProvider) { mStatusBarStateController = statusBarStateController; + mHighPriorityProvider = highPriorityProvider; } @Override @@ -49,6 +57,28 @@ public class RankingCoordinator implements Coordinator { pipeline.addPreGroupFilter(mDozingFilter); } + public NotifSection getAlertingSection() { + return mAlertingNotifSection; + } + + public NotifSection getSilentSection() { + return mSilentNotifSection; + } + + private final NotifSection mAlertingNotifSection = new NotifSection("Alerting") { + @Override + public boolean isInSection(ListEntry entry) { + return mHighPriorityProvider.isHighPriority(entry); + } + }; + + private final NotifSection mSilentNotifSection = new NotifSection("Silent") { + @Override + public boolean isInSection(ListEntry entry) { + return !mHighPriorityProvider.isHighPriority(entry); + } + }; + /** * Checks whether to filter out the given notification based the notification's Ranking object. * NotifListBuilder invalidates the notification list each time the ranking is updated, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java index cdcfac87f1c8..d264af94947d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java @@ -84,7 +84,6 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl private final Map<View, MenuItem> mMenuItemsByView = new ArrayMap<>(); private OnMenuEventListener mMenuListener; private boolean mDismissRtl; - private boolean mIsForeground; private ValueAnimator mFadeAnimator; private boolean mAnimating; @@ -191,9 +190,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl @Override public void createMenu(ViewGroup parent, StatusBarNotification sbn) { mParent = (ExpandableNotificationRow) parent; - createMenuViews(true /* resetState */, - sbn != null && (sbn.getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE) - != 0); + createMenuViews(true /* resetState */); } @Override @@ -237,8 +234,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl // Menu hasn't been created yet, no need to do anything. return; } - createMenuViews(!isMenuVisible() /* resetState */, - (sbn.getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE) != 0); + createMenuViews(!isMenuVisible() /* resetState */); } @Override @@ -253,9 +249,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl mParent.removeListener(); } - private void createMenuViews(boolean resetState, final boolean isForeground) { - mIsForeground = isForeground; - + private void createMenuViews(boolean resetState) { final Resources res = mContext.getResources(); mHorizSpaceForIcon = res.getDimensionPixelSize(R.dimen.notification_menu_icon_size); mVertSpaceForIcons = res.getDimensionPixelSize(R.dimen.notification_min_height); @@ -266,7 +260,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl SHOW_NOTIFICATION_SNOOZE, 0) == 1; // Construct the menu items based on the notification - if (!isForeground && showSnooze) { + if (showSnooze) { // Only show snooze for non-foreground notifications, and if the setting is on mSnoozeItem = createSnoozeItem(mContext); } @@ -283,7 +277,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl mInfoItem = createInfoItem(mContext); } - if (!isForeground && showSnooze) { + if (showSnooze) { mRightMenuItems.add(mSnoozeItem); } mRightMenuItems.add(mInfoItem); @@ -789,7 +783,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl public void setDismissRtl(boolean dismissRtl) { mDismissRtl = dismissRtl; if (mMenuContainer != null) { - createMenuViews(true, mIsForeground); + createMenuViews(true); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt index c87b9986ca55..91cc8963b947 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt @@ -41,8 +41,8 @@ import com.android.systemui.statusbar.notification.row.StackScrollerDecorView import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.SectionProvider import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.children -import com.android.systemui.util.takeUntil import com.android.systemui.util.foldToSparseArray +import com.android.systemui.util.takeUntil import javax.inject.Inject /** @@ -166,6 +166,9 @@ class NotificationSectionsManager @Inject internal constructor( peopleHubSubscription?.unsubscribe() peopleHubSubscription = null peopleHeaderView = reinflateView(peopleHeaderView, layoutInflater, R.layout.people_strip) + .apply { + setOnHeaderClickListener(View.OnClickListener { onGentleHeaderClick() }) + } if (ENABLE_SNOOZED_CONVERSATION_HUB) { peopleHubSubscription = peopleHubViewAdapter.bindView(peopleHubViewBoundary) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java index d7d09e05c238..d3b8a8cd2093 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java @@ -34,6 +34,8 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; +import java.lang.ref.WeakReference; + class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeActionHelper { @VisibleForTesting @@ -47,7 +49,11 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc private static final long SWIPE_MENU_TIMING = 200; - private NotificationMenuRowPlugin mCurrMenuRow; + // Hold a weak ref to the menu row so that it isn't accidentally retained in memory. The + // lifetime of the row should be the same as the ActivatableView, which is owned by the + // NotificationStackScrollLayout. If the notification isn't in the notification shade, then it + // isn't possible to swipe it and, so, this class doesn't need to "help." + private WeakReference<NotificationMenuRowPlugin> mCurrMenuRowRef; private boolean mIsExpanded; private boolean mPulsing; @@ -82,11 +88,17 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc return mMenuExposedView; } - public void setCurrentMenuRow(NotificationMenuRowPlugin menuRow) { - mCurrMenuRow = menuRow; + @VisibleForTesting + void setCurrentMenuRow(NotificationMenuRowPlugin menuRow) { + mCurrMenuRowRef = menuRow != null ? new WeakReference(menuRow) : null; } - public NotificationMenuRowPlugin getCurrentMenuRow() { return mCurrMenuRow; } + public NotificationMenuRowPlugin getCurrentMenuRow() { + if (mCurrMenuRowRef == null) { + return null; + } + return mCurrMenuRowRef.get(); + } @VisibleForTesting protected Handler getHandler() { return mHandler; } @@ -102,8 +114,9 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc @Override protected void onChildSnappedBack(View animView, float targetLeft) { - if (mCurrMenuRow != null && targetLeft == 0) { - mCurrMenuRow.resetMenu(); + final NotificationMenuRowPlugin menuRow = getCurrentMenuRow(); + if (menuRow != null && targetLeft == 0) { + menuRow.resetMenu(); clearCurrentMenuRow(); } } @@ -129,10 +142,11 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc @VisibleForTesting protected void initializeRow(SwipeableView row) { if (row.hasFinishedInitialization()) { - mCurrMenuRow = row.createMenu(); - if (mCurrMenuRow != null) { - mCurrMenuRow.setMenuClickListener(mMenuListener); - mCurrMenuRow.onTouchStart(); + final NotificationMenuRowPlugin menuRow = row.createMenu(); + setCurrentMenuRow(menuRow); + if (menuRow != null) { + menuRow.setMenuClickListener(mMenuListener); + menuRow.onTouchStart(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt index 8f77a1d776e4..b13e7fb839ff 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt @@ -93,6 +93,8 @@ class PeopleHubView(context: Context, attrs: AttributeSet) : } } + fun setOnHeaderClickListener(listener: OnClickListener) = label.setOnClickListener(listener) + private inner class PersonDataListenerImpl(val avatarView: ImageView) : DataListener<PersonViewModel?> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index e03db2c8b9c6..39f5847ce2a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -14,6 +14,7 @@ package com.android.systemui.statusbar.phone; +import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; import static android.app.StatusBarManager.DISABLE_CLOCK; import static android.app.StatusBarManager.DISABLE_NOTIFICATION_ICONS; import static android.app.StatusBarManager.DISABLE_SYSTEM_INFO; @@ -63,6 +64,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private View mNotificationIconAreaInner; private View mCenteredIconArea; private int mDisabled1; + private int mDisabled2; private StatusBar mStatusBarComponent; private DarkIconManager mDarkIconManager; private View mOperatorNameFrame; @@ -173,9 +175,12 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue state1 = adjustDisableFlags(state1); final int old1 = mDisabled1; final int diff1 = state1 ^ old1; + final int old2 = mDisabled2; + final int diff2 = state2 ^ old2; mDisabled1 = state1; - if ((diff1 & DISABLE_SYSTEM_INFO) != 0) { - if ((state1 & DISABLE_SYSTEM_INFO) != 0) { + mDisabled2 = state2; + if ((diff1 & DISABLE_SYSTEM_INFO) != 0 || ((diff2 & DISABLE2_SYSTEM_ICONS) != 0)) { + if ((state1 & DISABLE_SYSTEM_INFO) != 0 || ((state2 & DISABLE2_SYSTEM_ICONS) != 0)) { hideSystemIconArea(animate); hideOperatorName(animate); } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButton.java index 5bc17f5bc2c6..53b369c3543e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButton.java @@ -50,12 +50,12 @@ public class ContextualButton extends ButtonDispatcher { /** * Reload the drawable from resource id, should reapply the previous dark intensity. */ - public void updateIcon() { + public void updateIcon(int lightIconColor, int darkIconColor) { if (getCurrentView() == null || !getCurrentView().isAttachedToWindow() || mIconResId == 0) { return; } final KeyButtonDrawable currentDrawable = getImageDrawable(); - KeyButtonDrawable drawable = getNewDrawable(); + KeyButtonDrawable drawable = getNewDrawable(lightIconColor, darkIconColor); if (currentDrawable != null) { drawable.setDarkIntensity(currentDrawable.getDarkIntensity()); } @@ -116,9 +116,9 @@ public class ContextualButton extends ButtonDispatcher { mGroup = group; } - protected KeyButtonDrawable getNewDrawable() { - return KeyButtonDrawable.create(getContext().getApplicationContext(), mIconResId, - false /* shadow */); + protected KeyButtonDrawable getNewDrawable(int lightIconColor, int darkIconColor) { + return KeyButtonDrawable.create(getContext().getApplicationContext(), lightIconColor, + darkIconColor, mIconResId, false /* shadow */, null /* ovalBackground */); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java index 9e843f93d00e..c1017f4def0f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ContextualButtonGroup.java @@ -111,9 +111,9 @@ public class ContextualButtonGroup extends ButtonDispatcher { * Update all the icons that are attached to this group. This will get all the buttons to update * their icons for their buttons. */ - public void updateIcons() { + public void updateIcons(int lightIconColor, int darkIconColor) { for (ButtonData data : mButtonData) { - data.button.updateIcon(); + data.button.updateIcon(lightIconColor, darkIconColor); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java index 539158c40d45..a35aca553c4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java @@ -231,7 +231,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa } } - Dependency.get(ProtoTracer.class).add(this); mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT, ViewConfiguration.getLongPressTimeout()); @@ -286,6 +285,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa */ public void onNavBarAttached() { mIsAttached = true; + Dependency.get(ProtoTracer.class).add(this); mOverviewProxyService.addCallback(mQuickSwitchListener); updateIsEnabled(); startTracking(); @@ -296,6 +296,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa */ public void onNavBarDetached() { mIsAttached = false; + Dependency.get(ProtoTracer.class).remove(this); mOverviewProxyService.removeCallback(mQuickSwitchListener); updateIsEnabled(); stopTracking(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java index 16b5a2389ec6..687f5f15a78c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java @@ -16,19 +16,16 @@ package com.android.systemui.statusbar.phone; -import android.annotation.ColorInt; import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import android.graphics.PixelFormat; -import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.LayoutInflater; import android.view.Surface; import android.view.View; import android.view.WindowManager; -import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.statusbar.policy.KeyButtonDrawable; import com.android.systemui.statusbar.policy.KeyButtonView; @@ -65,6 +62,8 @@ public class FloatingRotationButton implements RotationButton { @Override public void setRotationButtonController(RotationButtonController rotationButtonController) { mRotationButtonController = rotationButtonController; + updateIcon(mRotationButtonController.getLightIconColor(), + mRotationButtonController.getDarkIconColor()); } @Override @@ -101,7 +100,6 @@ public class FloatingRotationButton implements RotationButton { default: break; } - updateIcon(); mWindowManager.addView(mKeyButtonView, lp); if (mKeyButtonDrawable != null && mKeyButtonDrawable.canAnimate()) { mKeyButtonDrawable.resetAnimation(); @@ -126,17 +124,13 @@ public class FloatingRotationButton implements RotationButton { } @Override - public void updateIcon() { - if (!mIsShowing) { - return; - } - mKeyButtonDrawable = getImageDrawable(); + public void updateIcon(int lightIconColor, int darkIconColor) { + Color ovalBackgroundColor = Color.valueOf(Color.red(darkIconColor), + Color.green(darkIconColor), Color.blue(darkIconColor), BACKGROUND_ALPHA); + mKeyButtonDrawable = KeyButtonDrawable.create(mRotationButtonController.getContext(), + lightIconColor, darkIconColor, mRotationButtonController.getIconResId(), + false /* shadow */, ovalBackgroundColor); mKeyButtonView.setImageDrawable(mKeyButtonDrawable); - mKeyButtonDrawable.setCallback(mKeyButtonView); - if (mKeyButtonDrawable != null && mKeyButtonDrawable.canAnimate()) { - mKeyButtonDrawable.resetAnimation(); - mKeyButtonDrawable.startAnimation(); - } } @Override @@ -151,20 +145,7 @@ public class FloatingRotationButton implements RotationButton { @Override public KeyButtonDrawable getImageDrawable() { - Context context = new ContextThemeWrapper(mContext.getApplicationContext(), - mRotationButtonController.getStyleRes()); - final int dualToneDarkTheme = Utils.getThemeAttr(context, R.attr.darkIconTheme); - final int dualToneLightTheme = Utils.getThemeAttr(context, R.attr.lightIconTheme); - Context lightContext = new ContextThemeWrapper(context, dualToneLightTheme); - Context darkContext = new ContextThemeWrapper(context, dualToneDarkTheme); - @ColorInt int darkColor = Utils.getColorAttrDefaultColor(darkContext, - R.attr.singleToneColor); - Color ovalBackgroundColor = Color.valueOf(Color.red(darkColor), Color.green(darkColor), - Color.blue(darkColor), BACKGROUND_ALPHA); - - return KeyButtonDrawable.create(lightContext, - Utils.getColorAttrDefaultColor(lightContext, R.attr.singleToneColor), darkColor, - R.drawable.ic_sysbar_rotate_button, false /* shadow */, ovalBackgroundColor); + return mKeyButtonDrawable; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 837543c9bdae..b7733cc5acd7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -963,13 +963,22 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback } // Change the cancel pin gesture to home and back if recents button is invisible - boolean recentsVisible = mNavigationBarView.isRecentsButtonVisible(); + boolean pinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive(); ButtonDispatcher backButton = mNavigationBarView.getBackButton(); - if (recentsVisible) { - backButton.setOnLongClickListener(this::onLongPressBackRecents); + ButtonDispatcher recentsButton = mNavigationBarView.getRecentsButton(); + if (pinningActive) { + boolean recentsVisible = mNavigationBarView.isRecentsButtonVisible(); + backButton.setOnLongClickListener(recentsVisible + ? this::onLongPressBackRecents + : this::onLongPressBackHome); + recentsButton.setOnLongClickListener(this::onLongPressBackRecents); } else { - backButton.setOnLongClickListener(this::onLongPressBackHome); + backButton.setOnLongClickListener(null); + recentsButton.setOnLongClickListener(null); } + // Note, this needs to be set after even if we're setting the listener to null + backButton.setLongClickable(pinningActive); + recentsButton.setLongClickable(pinningActive); } private void notifyNavigationBarScreenOn() { @@ -982,11 +991,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback ButtonDispatcher recentsButton = mNavigationBarView.getRecentsButton(); recentsButton.setOnClickListener(this::onRecentsClick); recentsButton.setOnTouchListener(this::onRecentsTouch); - recentsButton.setLongClickable(true); - recentsButton.setOnLongClickListener(this::onLongPressBackRecents); - - ButtonDispatcher backButton = mNavigationBarView.getBackButton(); - backButton.setLongClickable(true); ButtonDispatcher homeButton = mNavigationBarView.getHomeButton(); homeButton.setOnTouchListener(this::onHomeTouch); @@ -1094,6 +1098,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback return onLongPressNavigationButtons(v, R.id.back, R.id.recent_apps); } + /** * This handles long-press of both back and recents/home. Back is the common button with * combination of recents if it is visible or home if recents is invisible. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 1eab427b4155..7936e533f76d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -48,6 +48,7 @@ import android.os.Bundle; import android.util.AttributeSet; import android.util.Log; import android.util.SparseArray; +import android.view.ContextThemeWrapper; import android.view.Display; import android.view.MotionEvent; import android.view.Surface; @@ -63,6 +64,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import com.android.internal.annotations.VisibleForTesting; +import com.android.settingslib.Utils; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -124,6 +126,9 @@ public class NavigationBarView extends FrameLayout implements private KeyButtonDrawable mHomeDefaultIcon; private KeyButtonDrawable mRecentIcon; private KeyButtonDrawable mDockedIcon; + private Context mLightContext; + private int mLightIconColor; + private int mDarkIconColor; private EdgeBackGestureHandler mEdgeBackGestureHandler; private final DeadZone mDeadZone; @@ -278,6 +283,12 @@ public class NavigationBarView extends FrameLayout implements public NavigationBarView(Context context, AttributeSet attrs) { super(context, attrs); + final Context darkContext = new ContextThemeWrapper(context, + Utils.getThemeAttr(context, R.attr.darkIconTheme)); + mLightContext = new ContextThemeWrapper(context, + Utils.getThemeAttr(context, R.attr.lightIconTheme)); + mLightIconColor = Utils.getColorAttrDefaultColor(mLightContext, R.attr.singleToneColor); + mDarkIconColor = Utils.getColorAttrDefaultColor(darkContext, R.attr.singleToneColor); mIsVertical = false; mLongClickableAccessibilityButton = false; mNavBarMode = Dependency.get(NavigationModeController.class).addListener(this); @@ -290,7 +301,7 @@ public class NavigationBarView extends FrameLayout implements final ContextualButton imeSwitcherButton = new ContextualButton(R.id.ime_switcher, R.drawable.ic_ime_switcher_default); final RotationContextButton rotateSuggestionButton = new RotationContextButton( - R.id.rotate_suggestion, R.drawable.ic_sysbar_rotate_button); + R.id.rotate_suggestion, R.drawable.ic_sysbar_rotate_button_ccw_start_0); final ContextualButton accessibilityButton = new ContextualButton(R.id.accessibility_button, R.drawable.ic_sysbar_accessibility_button); @@ -303,8 +314,8 @@ public class NavigationBarView extends FrameLayout implements mOverviewProxyService = Dependency.get(OverviewProxyService.class); mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService); mFloatingRotationButton = new FloatingRotationButton(context); - mRotationButtonController = new RotationButtonController(context, - R.style.RotateButtonCCWStart90, + mRotationButtonController = new RotationButtonController(mLightContext, + mLightIconColor, mDarkIconColor, isGesturalMode ? mFloatingRotationButton : rotateSuggestionButton); mConfiguration = new Configuration(); @@ -501,7 +512,7 @@ public class NavigationBarView extends FrameLayout implements } if (densityChange || dirChange) { mRecentIcon = getDrawable(R.drawable.ic_sysbar_recent); - mContextualButtonGroup.updateIcons(); + mContextualButtonGroup.updateIcons(mLightIconColor, mDarkIconColor); } if (orientationChange || densityChange || dirChange) { mBackIcon = getBackDrawable(); @@ -559,11 +570,6 @@ public class NavigationBarView extends FrameLayout implements drawable.setRotation(mIsVertical ? 90 : 0); } - private KeyButtonDrawable chooseNavigationIconDrawable(@DrawableRes int icon, - @DrawableRes int quickStepIcon) { - return getDrawable(chooseNavigationIconDrawableRes(icon, quickStepIcon)); - } - private @DrawableRes int chooseNavigationIconDrawableRes(@DrawableRes int icon, @DrawableRes int quickStepIcon) { final boolean quickStepEnabled = mOverviewProxyService.shouldShowSwipeUpUI(); @@ -571,11 +577,8 @@ public class NavigationBarView extends FrameLayout implements } private KeyButtonDrawable getDrawable(@DrawableRes int icon) { - return KeyButtonDrawable.create(mContext, icon, true /* hasShadow */); - } - - private KeyButtonDrawable getDrawable(@DrawableRes int icon, boolean hasShadow) { - return KeyButtonDrawable.create(mContext, icon, hasShadow); + return KeyButtonDrawable.create(mLightContext, mLightIconColor, mDarkIconColor, icon, + true /* hasShadow */, null /* ovalBackgroundColor */); } /** To be called when screen lock/unlock state changes */ @@ -861,7 +864,6 @@ public class NavigationBarView extends FrameLayout implements mBarTransitions.onNavigationModeChanged(mNavBarMode); mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode); mRecentsOnboarding.onNavigationModeChanged(mNavBarMode); - getRotateSuggestionButton().onNavigationModeChanged(mNavBarMode); if (isGesturalMode(mNavBarMode)) { mRegionSamplingHelper.start(mSamplingBounds); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java index 07eaaa187fbe..bf858520c338 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java @@ -19,8 +19,6 @@ package com.android.systemui.statusbar.phone; import static com.android.systemui.statusbar.phone.HeadsUpAppearanceController.CONTENT_FADE_DELAY; import static com.android.systemui.statusbar.phone.HeadsUpAppearanceController.CONTENT_FADE_DURATION; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; import android.content.Context; import android.content.res.Configuration; import android.graphics.Canvas; @@ -807,6 +805,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout { } else { super.applyToView(view); } + sTempProperties.setAnimationEndAction(null); boolean inShelf = iconAppearAmount == 1.0f; icon.setIsInShelf(inShelf); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java index 5164440c1463..bc73be19ab59 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java @@ -61,6 +61,8 @@ import java.lang.ref.WeakReference; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; import java.util.function.Consumer; import javax.inject.Inject; @@ -432,7 +434,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, } private void applyHasTopUi(State state) { - mHasTopUiChanged = state.mForceHasTopUi || isExpanded(state); + mHasTopUiChanged = !state.mComponentsForcingTopUi.isEmpty() || isExpanded(state); } private void applyNotTouchable(State state) { @@ -635,12 +637,17 @@ public class NotificationShadeWindowController implements Callback, Dumpable, apply(mCurrentState); } - public boolean getForceHasTopUi() { - return mCurrentState.mForceHasTopUi; - } - - public void setForceHasTopUi(boolean forceHasTopUi) { - mCurrentState.mForceHasTopUi = forceHasTopUi; + /** + * SystemUI may need top-ui to avoid jank when performing animations. After the + * animation is performed, the component should remove itself from the list of features that + * are forcing SystemUI to be top-ui. + */ + public void setRequestTopUi(boolean requestTopUi, String componentTag) { + if (requestTopUi) { + mCurrentState.mComponentsForcingTopUi.add(componentTag); + } else { + mCurrentState.mComponentsForcingTopUi.remove(componentTag); + } apply(mCurrentState); } @@ -663,7 +670,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, boolean mBackdropShowing; boolean mWallpaperSupportsAmbientMode; boolean mNotTouchable; - boolean mForceHasTopUi; + Set<String> mComponentsForcingTopUi = new HashSet<>(); /** * The {@link StatusBar} state from the status bar. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButton.java index 2580c0e77013..687efd34ee30 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButton.java @@ -27,7 +27,7 @@ interface RotationButton { boolean show(); boolean hide(); boolean isVisible(); - void updateIcon(); + void updateIcon(int lightIconColor, int darkIconColor); void setOnClickListener(View.OnClickListener onClickListener); void setOnHoverListener(View.OnHoverListener onHoverListener); KeyButtonDrawable getImageDrawable(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java index 59b10e416b03..f83cdd488c04 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationButtonController.java @@ -21,6 +21,8 @@ import static com.android.internal.view.RotationPolicy.NATURAL_ROTATION; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; +import android.annotation.ColorInt; +import android.annotation.DrawableRes; import android.annotation.StyleRes; import android.app.StatusBarManager; import android.content.ContentResolver; @@ -30,6 +32,7 @@ import android.os.Looper; import android.os.RemoteException; import android.provider.Settings; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.IRotationWatcher.Stub; import android.view.MotionEvent; import android.view.Surface; @@ -40,6 +43,7 @@ import android.view.accessibility.AccessibilityManager; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLoggerImpl; +import com.android.settingslib.Utils; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -61,10 +65,12 @@ public class RotationButtonController { private static final int NUM_ACCEPTED_ROTATION_SUGGESTIONS_FOR_INTRODUCTION = 3; + private final Context mContext; + private final RotationButton mRotationButton; + private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper()); private final UiEventLogger mUiEventLogger = new UiEventLoggerImpl(); private final ViewRippler mViewRippler = new ViewRippler(); - private @StyleRes int mStyleRes; private int mLastRotationSuggestion; private boolean mPendingRotationSuggestion; private boolean mHoveringRotationSuggestion; @@ -75,6 +81,9 @@ public class RotationButtonController { private boolean mListenersRegistered = false; private boolean mIsNavigationBarShowing; private boolean mSkipOverrideUserLockPrefsOnce; + private int mLightIconColor; + private int mDarkIconColor; + private int mIconResId = R.drawable.ic_sysbar_rotate_button_ccw_start_90; private final Runnable mRemoveRotationProposal = () -> setRotateSuggestionButtonState(false /* visible */); @@ -82,9 +91,6 @@ public class RotationButtonController { () -> mPendingRotationSuggestion = false; private Animator mRotateHideAnimator; - private final Context mContext; - private final RotationButton mRotationButton; - private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper()); private final Stub mRotationWatcher = new Stub() { @Override @@ -117,12 +123,14 @@ public class RotationButtonController { return (disable2Flags & StatusBarManager.DISABLE2_ROTATE_SUGGESTIONS) != 0; } - RotationButtonController(Context context, @StyleRes int style, RotationButton rotationButton) { + RotationButtonController(Context context, @ColorInt int lightIconColor, + @ColorInt int darkIconColor, RotationButton rotationButton) { mContext = context; + mLightIconColor = lightIconColor; + mDarkIconColor = darkIconColor; mRotationButton = rotationButton; mRotationButton.setRotationButtonController(this); - mStyleRes = style; mIsNavigationBarShowing = true; mRotationLockController = Dependency.get(RotationLockController.class); mAccessibilityManagerWrapper = Dependency.get(AccessibilityManagerWrapper.class); @@ -275,17 +283,20 @@ public class RotationButtonController { return; } + // TODO: Remove styles? // Prepare to show the navbar icon by updating the icon style to change anim params mLastRotationSuggestion = rotation; // Remember rotation for click final boolean rotationCCW = isRotationAnimationCCW(windowRotation, rotation); - int style; if (windowRotation == Surface.ROTATION_0 || windowRotation == Surface.ROTATION_180) { - style = rotationCCW ? R.style.RotateButtonCCWStart90 : R.style.RotateButtonCWStart90; + mIconResId = rotationCCW + ? R.drawable.ic_sysbar_rotate_button_ccw_start_90 + : R.drawable.ic_sysbar_rotate_button_cw_start_90; } else { // 90 or 270 - style = rotationCCW ? R.style.RotateButtonCCWStart0 : R.style.RotateButtonCWStart0; + mIconResId = rotationCCW + ? R.drawable.ic_sysbar_rotate_button_ccw_start_0 + : R.drawable.ic_sysbar_rotate_button_ccw_start_0; } - mStyleRes = style; - mRotationButton.updateIcon(); + mRotationButton.updateIcon(mLightIconColor, mDarkIconColor); if (mIsNavigationBarShowing) { // The navbar is visible so show the icon right away @@ -316,14 +327,26 @@ public class RotationButtonController { } } - @StyleRes int getStyleRes() { - return mStyleRes; + Context getContext() { + return mContext; } RotationButton getRotationButton() { return mRotationButton; } + @DrawableRes int getIconResId() { + return mIconResId; + } + + @ColorInt int getLightIconColor() { + return mLightIconColor; + } + + @ColorInt int getDarkIconColor() { + return mDarkIconColor; + } + private void onRotateSuggestionClick(View v) { mUiEventLogger.log(RotationButtonEvent.ROTATION_SUGGESTION_ACCEPTED); incrementNumAcceptedRotationSuggestionsIfNeeded(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java index bd9675280b0b..d7e95e43ea8f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/RotationContextButton.java @@ -16,22 +16,16 @@ package com.android.systemui.statusbar.phone; -import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; - import android.annotation.DrawableRes; import android.annotation.IdRes; -import android.content.Context; -import android.view.ContextThemeWrapper; import android.view.View; import com.android.systemui.statusbar.policy.KeyButtonDrawable; /** Containing logic for the rotation button in nav bar. */ -public class RotationContextButton extends ContextualButton implements - NavigationModeController.ModeChangedListener, RotationButton { +public class RotationContextButton extends ContextualButton implements RotationButton { public static final boolean DEBUG_ROTATION = false; - private int mNavBarMode = NAV_BAR_MODE_3BUTTON; private RotationButtonController mRotationButtonController; public RotationContextButton(@IdRes int buttonResId, @DrawableRes int iconResId) { @@ -56,16 +50,10 @@ public class RotationContextButton extends ContextualButton implements } @Override - protected KeyButtonDrawable getNewDrawable() { - Context context = new ContextThemeWrapper(getContext().getApplicationContext(), - mRotationButtonController.getStyleRes()); - return KeyButtonDrawable.create(context, mIconResId, false /* shadow */, - null /* ovalBackgroundColor */); - } - - @Override - public void onNavigationModeChanged(int mode) { - mNavBarMode = mode; + protected KeyButtonDrawable getNewDrawable(int lightIconColor, int darkIconColor) { + return KeyButtonDrawable.create(mRotationButtonController.getContext(), + lightIconColor, darkIconColor, mRotationButtonController.getIconResId(), + false /* shadow */, null /* ovalBackgroundColor */); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index c14a5ef328aa..c5acd9bd0f06 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -18,6 +18,9 @@ package com.android.systemui.statusbar.phone; import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT; import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; +import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; +import static android.app.StatusBarManager.DISABLE_CLOCK; +import static android.app.StatusBarManager.DISABLE_NOTIFICATION_ICONS; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.WindowType; @@ -213,7 +216,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationListContain import com.android.systemui.statusbar.phone.dagger.StatusBarComponent; import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule; import com.android.systemui.statusbar.policy.BatteryController; -import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback; import com.android.systemui.statusbar.policy.BrightnessMirrorController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; @@ -306,6 +308,7 @@ public class StatusBar extends SystemUI implements DemoMode, public static final int FADE_KEYGUARD_DURATION = 300; public static final int FADE_KEYGUARD_DURATION_PULSING = 96; + /** If true, the system is in the half-boot-to-decryption-screen state. * Prudently disable QS and notifications. */ public static final boolean ONLY_CORE_APPS; @@ -2397,18 +2400,31 @@ public class StatusBar extends SystemUI implements DemoMode, new WirelessChargingAnimation.Callback() { @Override public void onAnimationStarting() { + mNotificationShadeWindowController.setRequestTopUi(true, TAG); CrossFadeHelper.fadeOut(mNotificationPanelViewController.getView(), 1); } @Override public void onAnimationEnded() { CrossFadeHelper.fadeIn(mNotificationPanelViewController.getView()); + mNotificationShadeWindowController.setRequestTopUi(false, TAG); } }, mDozing).show(animationDelay); } else { // workspace WirelessChargingAnimation.makeWirelessChargingAnimation(mContext, null, - transmittingBatteryLevel, batteryLevel, null, false).show(animationDelay); + transmittingBatteryLevel, batteryLevel, + new WirelessChargingAnimation.Callback() { + @Override + public void onAnimationStarting() { + mNotificationShadeWindowController.setRequestTopUi(true, TAG); + } + + @Override + public void onAnimationEnded() { + mNotificationShadeWindowController.setRequestTopUi(false, TAG); + } + }, false).show(animationDelay); } } @@ -2461,7 +2477,6 @@ public class StatusBar extends SystemUI implements DemoMode, private final Runnable mCheckBarModes = this::checkBarModes; public void setInteracting(int barWindow, boolean interacting) { - final boolean changing = ((mInteractingWindows & barWindow) != 0) != interacting; mInteractingWindows = interacting ? (mInteractingWindows | barWindow) : (mInteractingWindows & ~barWindow); @@ -2470,11 +2485,6 @@ public class StatusBar extends SystemUI implements DemoMode, } else { mAutoHideController.resumeSuspendedAutoHide(); } - // manually dismiss the volume panel when interacting with the nav bar - if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) { - mNavigationBarController.touchAutoDim(mDisplayId); - dismissVolumeDialog(); - } checkBarModes(); } @@ -4165,6 +4175,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void setTopAppHidesStatusBar(boolean topAppHidesStatusBar) { mTopHidesStatusBar = topAppHidesStatusBar; + updateStatusBarIcons(topAppHidesStatusBar); if (!topAppHidesStatusBar && mWereIconsJustHidden) { // Immediately update the icon hidden state, since that should only apply if we're // staying fullscreen. @@ -4174,6 +4185,17 @@ public class StatusBar extends SystemUI implements DemoMode, updateHideIconsForBouncer(true /* animate */); } + private void updateStatusBarIcons(boolean topAppHidesStatusBar) { + int flags1 = StatusBarManager.DISABLE_NONE; + int flags2 = StatusBarManager.DISABLE2_NONE; + if (topAppHidesStatusBar) { + flags1 = DISABLE_NOTIFICATION_ICONS | DISABLE_CLOCK; + flags2 = DISABLE2_SYSTEM_ICONS; + } + + mCommandQueue.disable(mDisplayId, flags1, flags2, false); + } + protected void toggleKeyboardShortcuts(int deviceId) { KeyboardShortcuts.toggle(mContext, deviceId); } 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 93df14f18fda..3ae84ecfc2f0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -14,9 +14,6 @@ package com.android.systemui.statusbar.phone; -import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; -import static android.app.StatusBarManager.DISABLE_NONE; - import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_ICON; import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_MOBILE; import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_WIFI; @@ -47,7 +44,6 @@ import com.android.systemui.statusbar.StatusBarWifiView; import com.android.systemui.statusbar.StatusIconDisplayable; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.MobileIconState; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; -import com.android.systemui.util.Utils.DisableStateTracker; import java.util.List; @@ -218,14 +214,6 @@ public interface StatusBarIconController { mContext = group.getContext(); mIconSize = mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.status_bar_icon_size); - - DisableStateTracker tracker = - new DisableStateTracker(DISABLE_NONE, DISABLE2_SYSTEM_ICONS, commandQueue); - mGroup.addOnAttachStateChangeListener(tracker); - if (mGroup.isAttachedToWindow()) { - // In case we miss the first onAttachedToWindow event - tracker.onViewAttachedToWindow(mGroup); - } } public boolean isDemoable() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java index 23d03a4b225a..755938863b5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonDrawable.java @@ -37,7 +37,6 @@ import android.graphics.Rect; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; import android.util.FloatProperty; -import android.view.ContextThemeWrapper; import android.view.View; import com.android.settingslib.Utils; @@ -439,34 +438,6 @@ public class KeyButtonDrawable extends Drawable { } /** - * Creates a KeyButtonDrawable with a shadow given its icon. The tint applied to the drawable - * is determined by the dark and light theme given by the context. - * @param ctx Context to get the drawable and determine the dark and light theme - * @param icon the icon resource id - * @param hasShadow if a shadow will appear with the drawable - * @param ovalBackgroundColor the color of the oval bg that will be drawn - * @return KeyButtonDrawable - */ - public static KeyButtonDrawable create(@NonNull Context ctx, @DrawableRes int icon, - boolean hasShadow, Color ovalBackgroundColor) { - final int dualToneDarkTheme = Utils.getThemeAttr(ctx, R.attr.darkIconTheme); - final int dualToneLightTheme = Utils.getThemeAttr(ctx, R.attr.lightIconTheme); - Context lightContext = new ContextThemeWrapper(ctx, dualToneLightTheme); - Context darkContext = new ContextThemeWrapper(ctx, dualToneDarkTheme); - return KeyButtonDrawable.create(lightContext, darkContext, icon, hasShadow, - ovalBackgroundColor); - } - - /** - * Creates a KeyButtonDrawable with a shadow given its icon. For more information, see - * {@link #create(Context, int, boolean, boolean)}. - */ - public static KeyButtonDrawable create(@NonNull Context ctx, @DrawableRes int icon, - boolean hasShadow) { - return create(ctx, icon, hasShadow, null /* ovalBackgroundColor */); - } - - /** * Creates a KeyButtonDrawable with a shadow given its icon. For more information, see * {@link #create(Context, int, boolean, boolean)}. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 18a7adda3f7d..cf83603997c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -284,6 +284,9 @@ public class MobileSignalController extends SignalController< mNetworkToIconLookup.put(toDisplayIconKey( TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE), TelephonyIcons.NR_5G_PLUS); + mNetworkToIconLookup.put(toIconKey( + TelephonyManager.NETWORK_TYPE_NR), + TelephonyIcons.NR_5G); } private String getIconKey() { @@ -306,9 +309,9 @@ public class MobileSignalController extends SignalController< case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO: return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus"; case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA: - return "5G"; + return toIconKey(TelephonyManager.NETWORK_TYPE_NR); case TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE: - return "5G_Plus"; + return toIconKey(TelephonyManager.NETWORK_TYPE_NR) + "_Plus"; default: return "unsupported"; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 53ac65700a05..9c3395f9332d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -79,7 +79,7 @@ import java.util.function.Consumer; /** * Host for the remote input. */ -public class RemoteInputView extends LinearLayout implements View.OnClickListener, TextWatcher { +public class RemoteInputView extends LinearLayout implements View.OnClickListener { private static final String TAG = "RemoteInput"; @@ -88,6 +88,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene public final Object mToken = new Object(); + private final SendButtonTextWatcher mTextWatcher; + private final TextView.OnEditorActionListener mEditorActionHandler; private RemoteEditText mEditText; private ImageButton mSendButton; private ProgressBar mProgressBar; @@ -113,6 +115,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene public RemoteInputView(Context context, AttributeSet attrs) { super(context, attrs); + mTextWatcher = new SendButtonTextWatcher(); + mEditorActionHandler = new EditorActionHandler(); mRemoteInputQuickSettingsDisabler = Dependency.get(RemoteInputQuickSettingsDisabler.class); mStatusBarManagerService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); @@ -128,30 +132,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mSendButton.setOnClickListener(this); mEditText = (RemoteEditText) getChildAt(0); - mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - final boolean isSoftImeEvent = event == null - && (actionId == EditorInfo.IME_ACTION_DONE - || actionId == EditorInfo.IME_ACTION_NEXT - || actionId == EditorInfo.IME_ACTION_SEND); - final boolean isKeyboardEnterKey = event != null - && KeyEvent.isConfirmKey(event.getKeyCode()) - && event.getAction() == KeyEvent.ACTION_DOWN; - - if (isSoftImeEvent || isKeyboardEnterKey) { - if (mEditText.length() > 0) { - sendRemoteInput(prepareRemoteInputFromText()); - } - // Consume action to prevent IME from closing. - return true; - } - return false; - } - }); - mEditText.addTextChangedListener(this); mEditText.setInnerFocusable(false); - mEditText.mRemoteInputView = this; } protected Intent prepareRemoteInputFromText() { @@ -292,6 +273,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); + mEditText.mRemoteInputView = this; + mEditText.setOnEditorActionListener(mEditorActionHandler); + mEditText.addTextChangedListener(mTextWatcher); if (mEntry.getRow().isChangingPosition()) { if (getVisibility() == VISIBLE && mEditText.isFocusable()) { mEditText.requestFocus(); @@ -302,6 +286,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); + mEditText.removeTextChangedListener(mTextWatcher); + mEditText.setOnEditorActionListener(null); + mEditText.mRemoteInputView = null; if (mEntry.getRow().isChangingPosition() || isTemporarilyDetached()) { return; } @@ -412,17 +399,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mSendButton.setEnabled(mEditText.getText().length() != 0); } - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) {} - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) {} - - @Override - public void afterTextChanged(Editable s) { - updateSendButton(); - } - public void close() { mEditText.defocusIfNeeded(false /* animated */); } @@ -545,6 +521,45 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene return getVisibility() == VISIBLE && mController.isSpinning(mEntry.getKey(), mToken); } + /** Handler for button click on send action in IME. */ + private class EditorActionHandler implements TextView.OnEditorActionListener { + + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + final boolean isSoftImeEvent = event == null + && (actionId == EditorInfo.IME_ACTION_DONE + || actionId == EditorInfo.IME_ACTION_NEXT + || actionId == EditorInfo.IME_ACTION_SEND); + final boolean isKeyboardEnterKey = event != null + && KeyEvent.isConfirmKey(event.getKeyCode()) + && event.getAction() == KeyEvent.ACTION_DOWN; + + if (isSoftImeEvent || isKeyboardEnterKey) { + if (mEditText.length() > 0) { + sendRemoteInput(prepareRemoteInputFromText()); + } + // Consume action to prevent IME from closing. + return true; + } + return false; + } + } + + /** Observes text change events and updates the visibility of the send button accordingly. */ + private class SendButtonTextWatcher implements TextWatcher { + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} + + @Override + public void afterTextChanged(Editable s) { + updateSendButton(); + } + } + /** * An EditText that changes appearance based on whether it's focusable and becomes * un-focusable whenever the user navigates away from it or it becomes invisible. @@ -599,7 +614,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene if (!focused) { defocusIfNeeded(true /* animate */); } - if (!mRemoteInputView.mRemoved) { + if (mRemoteInputView != null && !mRemoteInputView.mRemoved) { mLightBarController.setDirectReplying(focused); } } diff --git a/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java b/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java index a31ea7c3ab17..8946c97a4b58 100644 --- a/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java +++ b/packages/SystemUI/src/com/android/systemui/util/DismissCircleView.java @@ -40,7 +40,7 @@ public class DismissCircleView extends FrameLayout { setBackground(res.getDrawable(R.drawable.dismiss_circle_background)); - mIconView.setImageDrawable(res.getDrawable(R.drawable.ic_close_white)); + mIconView.setImageDrawable(res.getDrawable(R.drawable.pip_ic_close_white)); addView(mIconView); setViewSizes(); diff --git a/packages/SystemUI/src/com/android/systemui/util/animation/PhysicsAnimator.kt b/packages/SystemUI/src/com/android/systemui/util/animation/PhysicsAnimator.kt index 016f4de724b6..2a5424ce4ef7 100644 --- a/packages/SystemUI/src/com/android/systemui/util/animation/PhysicsAnimator.kt +++ b/packages/SystemUI/src/com/android/systemui/util/animation/PhysicsAnimator.kt @@ -20,6 +20,7 @@ import android.os.Looper import android.util.ArrayMap import android.util.Log import android.view.View +import androidx.dynamicanimation.animation.AnimationHandler import androidx.dynamicanimation.animation.DynamicAnimation import androidx.dynamicanimation.animation.FlingAnimation import androidx.dynamicanimation.animation.FloatPropertyCompat @@ -124,6 +125,12 @@ class PhysicsAnimator<T> private constructor (target: T) { private var defaultFling: FlingConfig = globalDefaultFling /** + * AnimationHandler to use if it need custom AnimationHandler, if this is null, it will use + * the default AnimationHandler in the DynamicAnimation. + */ + private var customAnimationHandler: AnimationHandler? = null + + /** * Internal listeners that respond to DynamicAnimations updating and ending, and dispatch to * the listeners provided via [addUpdateListener] and [addEndListener]. This allows us to add * just one permanent update and end listener to the DynamicAnimations. @@ -447,6 +454,14 @@ class PhysicsAnimator<T> private constructor (target: T) { this.defaultFling = defaultFling } + /** + * Set the custom AnimationHandler for all aniatmion in this animator. Set this with null for + * restoring to default AnimationHandler. + */ + fun setCustomAnimationHandler(handler: AnimationHandler) { + this.customAnimationHandler = handler + } + /** Starts the animations! */ fun start() { startAction() @@ -501,10 +516,13 @@ class PhysicsAnimator<T> private constructor (target: T) { // springs) on this property before flinging. cancel(animatedProperty) + // Apply the custom animation handler if it not null + val flingAnim = getFlingAnimation(animatedProperty, target) + flingAnim.animationHandler = + customAnimationHandler ?: flingAnim.animationHandler + // Apply the configuration and start the animation. - getFlingAnimation(animatedProperty, target) - .also { flingConfig.applyToAnimation(it) } - .start() + flingAnim.also { flingConfig.applyToAnimation(it) }.start() } } @@ -516,6 +534,21 @@ class PhysicsAnimator<T> private constructor (target: T) { if (flingConfig == null) { // Apply the configuration and start the animation. val springAnim = getSpringAnimation(animatedProperty, target) + + // If customAnimationHander is exist and has not been set to the animation, + // it should set here. + if (customAnimationHandler != null && + springAnim.animationHandler != customAnimationHandler) { + // Cancel the animation before set animation handler + if (springAnim.isRunning) { + cancel(animatedProperty) + } + // Apply the custom animation handler if it not null + springAnim.animationHandler = + customAnimationHandler ?: springAnim.animationHandler + } + + // Apply the configuration and start the animation. springConfig.applyToAnimation(springAnim) animationStartActions.add(springAnim::start) } else { @@ -570,10 +603,13 @@ class PhysicsAnimator<T> private constructor (target: T) { } } + // Apply the custom animation handler if it not null + val springAnim = getSpringAnimation(animatedProperty, target) + springAnim.animationHandler = + customAnimationHandler ?: springAnim.animationHandler + // Apply the configuration and start the spring animation. - getSpringAnimation(animatedProperty, target) - .also { springConfig.applyToAnimation(it) } - .start() + springAnim.also { springConfig.applyToAnimation(it) }.start() } } }) diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index c36bb0472240..4a8ada09b3d2 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -52,6 +52,7 @@ import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricSourceType; import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback; import android.hardware.face.FaceManager; +import android.hardware.face.FaceSensorProperties; import android.hardware.fingerprint.FingerprintManager; import android.media.AudioManager; import android.os.Bundle; @@ -131,6 +132,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { @Mock private FaceManager mFaceManager; @Mock + private List<FaceSensorProperties> mFaceSensorProperties; + @Mock private BiometricManager mBiometricManager; @Mock private PackageManager mPackageManager; @@ -174,6 +177,15 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { when(mFaceManager.isHardwareDetected()).thenReturn(true); when(mFaceManager.hasEnrolledTemplates()).thenReturn(true); when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(true); + when(mFaceManager.getSensorProperties()).thenReturn(mFaceSensorProperties); + + // IBiometricsFace@1.0 does not support detection, only authentication. + when(mFaceSensorProperties.isEmpty()).thenReturn(false); + when(mFaceSensorProperties.get(anyInt())).thenReturn(new FaceSensorProperties(0 /* id */, + false /* supportsFaceDetection */)); + + when(mFingerprintManager.isHardwareDetected()).thenReturn(true); + when(mFingerprintManager.hasEnrolledTemplates(anyInt())).thenReturn(true); when(mUserManager.isUserUnlocked(anyInt())).thenReturn(true); when(mUserManager.isPrimaryUser()).thenReturn(true); when(mStrongAuthTracker.getStub()).thenReturn(mock(IStrongAuthTracker.Stub.class)); @@ -419,6 +431,42 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } @Test + public void testTriesToAuthenticateFingerprint_whenKeyguard() { + mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(0 /* why */); + mTestableLooper.processAllMessages(); + + verify(mFingerprintManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFingerprintManager, never()).detectFingerprint(any(), any(), anyInt(), any()); + } + + @Test + public void testFingerprintDoesNotAuth_whenEncrypted() { + testFingerprintWhenStrongAuth( + KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT); + } + + @Test + public void testFingerprintDoesNotAuth_whenDpmLocked() { + testFingerprintWhenStrongAuth( + KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW); + } + + @Test + public void testFingerprintDoesNotAuth_whenUserLockdown() { + testFingerprintWhenStrongAuth( + KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + } + + private void testFingerprintWhenStrongAuth(int strongAuth) { + when(mStrongAuthTracker.getStrongAuthForUser(anyInt())).thenReturn(strongAuth); + mKeyguardUpdateMonitor.dispatchStartedGoingToSleep(0 /* why */); + mTestableLooper.processAllMessages(); + + verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFingerprintManager).detectFingerprint(any(), any(), anyInt(), any()); + } + + @Test public void testTriesToAuthenticate_whenBouncer() { mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true); mTestableLooper.processAllMessages(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java index dd3a7858fd1f..b6cc2ee03f38 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java @@ -140,6 +140,10 @@ public abstract class SysuiTestCase { return null; } + protected FakeBroadcastDispatcher getFakeBroadcastDispatcher() { + return mFakeBroadcastDispatcher; + } + public SysuiTestableContext getContext() { return mContext; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerProxyTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerProxyTest.java index ae7387996322..c3c9ecc23d59 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerProxyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingManagerProxyTest.java @@ -29,8 +29,8 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.testing.UiEventLoggerFake; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.systemui.SysuiTestCase; import com.android.systemui.classifier.brightline.BrightLineFalsingManager; +import com.android.systemui.classifier.brightline.FalsingDataProvider; import com.android.systemui.dock.DockManager; import com.android.systemui.dock.DockManagerFake; import com.android.systemui.dump.DumpManager; @@ -42,6 +42,8 @@ import com.android.systemui.util.DeviceConfigProxyFake; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.sensors.ProximitySensor; import com.android.systemui.util.time.FakeSystemClock; +import com.android.systemui.utils.leaks.FakeBatteryController; +import com.android.systemui.utils.leaks.LeakCheckedTest; import org.junit.After; import org.junit.Before; @@ -52,7 +54,7 @@ import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidTestingRunner.class) -public class FalsingManagerProxyTest extends SysuiTestCase { +public class FalsingManagerProxyTest extends LeakCheckedTest { @Mock(stubOnly = true) PluginManager mPluginManager; @Mock(stubOnly = true) @@ -62,7 +64,7 @@ public class FalsingManagerProxyTest extends SysuiTestCase { @Mock DumpManager mDumpManager; private FalsingManagerProxy mProxy; private DeviceConfigProxy mDeviceConfig; - private DisplayMetrics mDisplayMetrics = new DisplayMetrics(); + private FalsingDataProvider mFalsingDataProvider; private FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); private DockManager mDockManager = new DockManagerFake(); @@ -75,6 +77,8 @@ public class FalsingManagerProxyTest extends SysuiTestCase { mDeviceConfig = new DeviceConfigProxyFake(); mDeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, "false", false); + mFalsingDataProvider = new FalsingDataProvider( + new DisplayMetrics(), new FakeBatteryController(getLeakCheck())); } @After @@ -86,9 +90,9 @@ public class FalsingManagerProxyTest extends SysuiTestCase { @Test public void test_brightLineFalsingManagerDisabled() { - mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mDisplayMetrics, + mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mProximitySensor, mDeviceConfig, mDockManager, mKeyguardUpdateMonitor, - mDumpManager, mUiBgExecutor, mStatusBarStateController); + mDumpManager, mUiBgExecutor, mStatusBarStateController, mFalsingDataProvider); assertThat(mProxy.getInternalFalsingManager(), instanceOf(FalsingManagerImpl.class)); } @@ -97,17 +101,17 @@ public class FalsingManagerProxyTest extends SysuiTestCase { mDeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, "true", false); mExecutor.runAllReady(); - mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mDisplayMetrics, + mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mProximitySensor, mDeviceConfig, mDockManager, mKeyguardUpdateMonitor, - mDumpManager, mUiBgExecutor, mStatusBarStateController); + mDumpManager, mUiBgExecutor, mStatusBarStateController, mFalsingDataProvider); assertThat(mProxy.getInternalFalsingManager(), instanceOf(BrightLineFalsingManager.class)); } @Test public void test_brightLineFalsingManagerToggled() throws InterruptedException { - mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mDisplayMetrics, + mProxy = new FalsingManagerProxy(getContext(), mPluginManager, mExecutor, mProximitySensor, mDeviceConfig, mDockManager, mKeyguardUpdateMonitor, - mDumpManager, mUiBgExecutor, mStatusBarStateController); + mDumpManager, mUiBgExecutor, mStatusBarStateController, mFalsingDataProvider); assertThat(mProxy.getInternalFalsingManager(), instanceOf(FalsingManagerImpl.class)); mDeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI, diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/BrightLineFalsingManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/BrightLineFalsingManagerTest.java index 2f05f0b4c69b..061664b4f6d4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/BrightLineFalsingManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/BrightLineFalsingManagerTest.java @@ -17,6 +17,7 @@ package com.android.systemui.classifier.brightline; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -27,7 +28,6 @@ import android.util.DisplayMetrics; import com.android.internal.logging.testing.UiEventLoggerFake; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.systemui.SysuiTestCase; import com.android.systemui.dock.DockManager; import com.android.systemui.dock.DockManagerFake; import com.android.systemui.statusbar.StatusBarState; @@ -37,6 +37,8 @@ import com.android.systemui.util.DeviceConfigProxy; import com.android.systemui.util.DeviceConfigProxyFake; import com.android.systemui.util.sensors.ProximitySensor; import com.android.systemui.util.sensors.ThresholdSensor; +import com.android.systemui.utils.leaks.FakeBatteryController; +import com.android.systemui.utils.leaks.LeakCheckedTest; import org.junit.Before; import org.junit.Test; @@ -47,7 +49,7 @@ import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper -public class BrightLineFalsingManagerTest extends SysuiTestCase { +public class BrightLineFalsingManagerTest extends LeakCheckedTest { @Mock @@ -55,23 +57,26 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { @Mock private ProximitySensor mProximitySensor; private SysuiStatusBarStateController mStatusBarStateController; + private FalsingDataProvider mFalsingDataProvider; + private FakeBatteryController mFakeBatteryController; private BrightLineFalsingManager mFalsingManager; @Before public void setup() { MockitoAnnotations.initMocks(this); + mFakeBatteryController = new FakeBatteryController(getLeakCheck()); DisplayMetrics dm = new DisplayMetrics(); dm.xdpi = 100; dm.ydpi = 100; dm.widthPixels = 100; dm.heightPixels = 100; - FalsingDataProvider falsingDataProvider = new FalsingDataProvider(dm); + mFalsingDataProvider = new FalsingDataProvider(dm, mFakeBatteryController); DeviceConfigProxy deviceConfigProxy = new DeviceConfigProxyFake(); DockManager dockManager = new DockManagerFake(); mStatusBarStateController = new StatusBarStateControllerImpl(new UiEventLoggerFake()); mStatusBarStateController.setState(StatusBarState.KEYGUARD); - mFalsingManager = new BrightLineFalsingManager(falsingDataProvider, + mFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider, mKeyguardUpdateMonitor, mProximitySensor, deviceConfigProxy, dockManager, mStatusBarStateController); } @@ -83,6 +88,13 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { } @Test + public void testNoProximityWhenWirelessCharging() { + mFakeBatteryController.setWirelessCharging(true); + mFalsingManager.onScreenTurningOn(); + verify(mProximitySensor, never()).register(any(ThresholdSensor.Listener.class)); + } + + @Test public void testUnregisterSensor() { mFalsingManager.onScreenTurningOn(); reset(mProximitySensor); diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/ClassifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/ClassifierTest.java index 3ba5d1ac79ea..a4d198a14541 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/ClassifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/ClassifierTest.java @@ -21,29 +21,30 @@ import static com.android.systemui.classifier.Classifier.UNLOCK; import android.util.DisplayMetrics; import android.view.MotionEvent; -import com.android.systemui.SysuiTestCase; +import com.android.systemui.utils.leaks.FakeBatteryController; +import com.android.systemui.utils.leaks.LeakCheckedTest; import org.junit.After; -import org.junit.Before; import java.util.ArrayList; import java.util.List; -public class ClassifierTest extends SysuiTestCase { +public class ClassifierTest extends LeakCheckedTest { private FalsingDataProvider mDataProvider; private List<MotionEvent> mMotionEvents = new ArrayList<>(); private float mOffsetX = 0; private float mOffsetY = 0; + private FakeBatteryController mFakeBatteryController; - @Before public void setup() { DisplayMetrics displayMetrics = new DisplayMetrics(); displayMetrics.xdpi = 100; displayMetrics.ydpi = 100; displayMetrics.widthPixels = 1000; displayMetrics.heightPixels = 1000; - mDataProvider = new FalsingDataProvider(displayMetrics); + mFakeBatteryController = new FakeBatteryController(getLeakCheck()); + mDataProvider = new FalsingDataProvider(displayMetrics, mFakeBatteryController); mDataProvider.setInteractionType(UNLOCK); } @@ -56,6 +57,10 @@ public class ClassifierTest extends SysuiTestCase { return mDataProvider; } + FakeBatteryController getFakeBatteryController() { + return mFakeBatteryController; + } + void setOffsetX(float offsetX) { mOffsetX = offsetX; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/FalsingDataProviderTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/FalsingDataProviderTest.java index 448c2f7b33ad..f13bc7379436 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/FalsingDataProviderTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/brightline/FalsingDataProviderTest.java @@ -26,6 +26,8 @@ import android.view.MotionEvent; import androidx.test.filters.SmallTest; +import com.android.systemui.utils.leaks.FakeBatteryController; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,17 +39,19 @@ import java.util.List; @RunWith(AndroidTestingRunner.class) public class FalsingDataProviderTest extends ClassifierTest { + private FakeBatteryController mFakeBatteryController; private FalsingDataProvider mDataProvider; @Before public void setup() { super.setup(); + mFakeBatteryController = new FakeBatteryController(getLeakCheck()); DisplayMetrics displayMetrics = new DisplayMetrics(); displayMetrics.xdpi = 100; displayMetrics.ydpi = 100; displayMetrics.widthPixels = 1000; displayMetrics.heightPixels = 1000; - mDataProvider = new FalsingDataProvider(displayMetrics); + mDataProvider = new FalsingDataProvider(displayMetrics, mFakeBatteryController); } @After @@ -246,4 +250,12 @@ public class FalsingDataProviderTest extends ClassifierTest { assertThat(mDataProvider.isUp(), is(false)); mDataProvider.onSessionEnd(); } + + @Test + public void test_isWirelessCharging() { + assertThat(mDataProvider.isWirelessCharging(), is(false)); + + mFakeBatteryController.setWirelessCharging(true); + assertThat(mDataProvider.isWirelessCharging(), is(true)); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java index 536cae4380c4..c9c111198f4c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java @@ -61,8 +61,7 @@ public class PipAnimationControllerTest extends SysuiTestCase { @Before public void setUp() throws Exception { mPipAnimationController = new PipAnimationController( - mContext, new PipSurfaceTransactionHelper(mContext, - mock(ConfigurationController.class))); + new PipSurfaceTransactionHelper(mContext, mock(ConfigurationController.class))); mLeash = new SurfaceControl.Builder() .setContainerLayer() .setName("FakeLeash") diff --git a/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java index f404f0489e01..70c2bba040a0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/pip/PipBoundsHandlerTest.java @@ -270,6 +270,21 @@ public class PipBoundsHandlerTest extends SysuiTestCase { } @Test + public void onSaveReentryBounds_restoreLastSize() { + final Rect oldSize = mPipBoundsHandler.getDestinationBounds(mTestComponentName1, + DEFAULT_ASPECT_RATIO, EMPTY_CURRENT_BOUNDS, EMPTY_MINIMAL_SIZE); + + oldSize.scale(1.25f); + mPipBoundsHandler.onSaveReentryBounds(mTestComponentName1, oldSize); + + final Rect newSize = mPipBoundsHandler.getDestinationBounds(mTestComponentName1, + DEFAULT_ASPECT_RATIO, EMPTY_CURRENT_BOUNDS, EMPTY_MINIMAL_SIZE); + + assertEquals(oldSize.width(), newSize.width()); + assertEquals(oldSize.height(), newSize.height()); + } + + @Test public void onResetReentryBounds_useDefaultBounds() { final Rect defaultBounds = mPipBoundsHandler.getDestinationBounds(mTestComponentName1, DEFAULT_ASPECT_RATIO, EMPTY_CURRENT_BOUNDS, EMPTY_MINIMAL_SIZE); @@ -299,6 +314,22 @@ public class PipBoundsHandlerTest extends SysuiTestCase { assertBoundsInclusionWithMargin("restoreLastPosition", newBounds, actualBounds); } + @Test + public void onSaveReentryBounds_componentMismatch_restoreLastSize() { + final Rect oldSize = mPipBoundsHandler.getDestinationBounds(mTestComponentName1, + DEFAULT_ASPECT_RATIO, EMPTY_CURRENT_BOUNDS, EMPTY_MINIMAL_SIZE); + + oldSize.scale(1.25f); + mPipBoundsHandler.onSaveReentryBounds(mTestComponentName1, oldSize); + + mPipBoundsHandler.onResetReentryBounds(mTestComponentName2); + final Rect newSize = mPipBoundsHandler.getDestinationBounds(mTestComponentName1, + DEFAULT_ASPECT_RATIO, EMPTY_CURRENT_BOUNDS, EMPTY_MINIMAL_SIZE); + + assertEquals(oldSize.width(), newSize.width()); + assertEquals(oldSize.height(), newSize.height()); + } + private void assertBoundsInclusionWithMargin(String from, Rect expected, Rect actual) { final Rect expectedWithMargin = new Rect(expected); expectedWithMargin.inset(-ROUNDING_ERROR_MARGIN, -ROUNDING_ERROR_MARGIN); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java index 438de99015a4..20f13bb02435 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java @@ -260,6 +260,14 @@ public class QSTileImplTest extends SysuiTestCase { } @Test + public void testHandleDestroyLifecycle() { + assertNotEquals(DESTROYED, mTile.getLifecycle().getCurrentState()); + mTile.handleDestroy(); + + assertEquals(DESTROYED, mTile.getLifecycle().getCurrentState()); + } + + @Test public void testHandleDestroy_log() { mTile.handleDestroy(); verify(mQsLogger).logTileDestroyed(eq(SPEC), anyString()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java index 314b19140e7a..960ea79f36b4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java @@ -16,6 +16,11 @@ package com.android.systemui.statusbar.notification.collection.coordinator; +import static android.app.Notification.FLAG_FOREGROUND_SERVICE; +import static android.app.NotificationManager.IMPORTANCE_DEFAULT; +import static android.app.NotificationManager.IMPORTANCE_HIGH; +import static android.app.NotificationManager.IMPORTANCE_MIN; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -43,6 +48,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.listbuilder.pluggable.NotifSection; 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; @@ -68,13 +74,13 @@ public class AppOpsCoordinatorTest extends SysuiTestCase { @Mock private AppOpsController mAppOpsController; @Mock private NotifPipeline mNotifPipeline; - private NotificationEntry mEntry; - private Notification mNotification; + private NotificationEntryBuilder mEntryBuilder; private AppOpsCoordinator mAppOpsCoordinator; private NotifFilter mForegroundFilter; private NotifCollectionListener mNotifCollectionListener; private AppOpsController.Callback mAppOpsCallback; private NotifLifetimeExtender mForegroundNotifLifetimeExtender; + private NotifSection mFgsSection; private FakeSystemClock mClock = new FakeSystemClock(); private FakeExecutor mExecutor = new FakeExecutor(mClock); @@ -90,11 +96,8 @@ public class AppOpsCoordinatorTest extends SysuiTestCase { mAppOpsController, mExecutor); - mNotification = new Notification(); - mEntry = new NotificationEntryBuilder() - .setUser(new UserHandle(NOTIF_USER_ID)) - .setNotification(mNotification) - .build(); + mEntryBuilder = new NotificationEntryBuilder() + .setUser(new UserHandle(NOTIF_USER_ID)); mAppOpsCoordinator.attach(mNotifPipeline); @@ -122,11 +125,14 @@ public class AppOpsCoordinatorTest extends SysuiTestCase { ArgumentCaptor.forClass(AppOpsController.Callback.class); verify(mAppOpsController).addCallback(any(int[].class), appOpsCaptor.capture()); mAppOpsCallback = appOpsCaptor.getValue(); + + mFgsSection = mAppOpsCoordinator.getSection(); } @Test public void filterTest_disclosureUnnecessary() { - StatusBarNotification sbn = mEntry.getSbn(); + NotificationEntry entry = mEntryBuilder.build(); + StatusBarNotification sbn = entry.getSbn(); // GIVEN the notification is a disclosure notification when(mForegroundServiceController.isDisclosureNotification(sbn)).thenReturn(true); @@ -136,84 +142,91 @@ public class AppOpsCoordinatorTest extends SysuiTestCase { .thenReturn(false); // THEN filter out the notification - assertTrue(mForegroundFilter.shouldFilterOut(mEntry, 0)); + assertTrue(mForegroundFilter.shouldFilterOut(entry, 0)); } @Test public void filterTest_systemAlertNotificationUnnecessary() { - StatusBarNotification sbn = mEntry.getSbn(); - - // GIVEN the notification is a system alert notification + not a disclosure notification - when(mForegroundServiceController.isSystemAlertNotification(sbn)).thenReturn(true); - when(mForegroundServiceController.isDisclosureNotification(sbn)).thenReturn(false); - // GIVEN the alert notification isn't needed for this user final Bundle extras = new Bundle(); extras.putStringArray(Notification.EXTRA_FOREGROUND_APPS, new String[]{TEST_PKG}); - mNotification.extras = extras; + mEntryBuilder.modifyNotification(mContext) + .setExtras(extras); + NotificationEntry entry = mEntryBuilder.build(); + StatusBarNotification sbn = entry.getSbn(); when(mForegroundServiceController.isSystemAlertWarningNeeded(sbn.getUserId(), TEST_PKG)) .thenReturn(false); + // GIVEN the notification is a system alert notification + not a disclosure notification + when(mForegroundServiceController.isSystemAlertNotification(sbn)).thenReturn(true); + when(mForegroundServiceController.isDisclosureNotification(sbn)).thenReturn(false); + + // THEN filter out the notification - assertTrue(mForegroundFilter.shouldFilterOut(mEntry, 0)); + assertTrue(mForegroundFilter.shouldFilterOut(entry, 0)); } @Test public void filterTest_doNotFilter() { - StatusBarNotification sbn = mEntry.getSbn(); + NotificationEntry entry = mEntryBuilder.build(); + StatusBarNotification sbn = entry.getSbn(); // GIVEN the notification isn't a system alert notification nor a disclosure notification when(mForegroundServiceController.isSystemAlertNotification(sbn)).thenReturn(false); when(mForegroundServiceController.isDisclosureNotification(sbn)).thenReturn(false); // THEN don't filter out the notification - assertFalse(mForegroundFilter.shouldFilterOut(mEntry, 0)); + assertFalse(mForegroundFilter.shouldFilterOut(entry, 0)); } @Test public void extendLifetimeText_notForeground() { // GIVEN the notification doesn't represent a foreground service - mNotification.flags = 0; + mEntryBuilder.modifyNotification(mContext) + .setFlag(FLAG_FOREGROUND_SERVICE, false); // THEN don't extend the lifetime assertFalse(mForegroundNotifLifetimeExtender - .shouldExtendLifetime(mEntry, NotificationListenerService.REASON_CLICK)); + .shouldExtendLifetime(mEntryBuilder.build(), + NotificationListenerService.REASON_CLICK)); } @Test public void extendLifetimeText_foregroundNotifRecentlyPosted() { // GIVEN the notification represents a foreground service that was just posted - mNotification.flags |= Notification.FLAG_FOREGROUND_SERVICE; - mEntry = new NotificationEntryBuilder() - .setUser(new UserHandle(NOTIF_USER_ID)) + Notification notification = new Notification.Builder(mContext, "test_channel") + .setFlag(FLAG_FOREGROUND_SERVICE, true) + .build(); + NotificationEntry entry = mEntryBuilder .setSbn(new StatusBarNotification(TEST_PKG, TEST_PKG, NOTIF_USER_ID, "", - NOTIF_USER_ID, NOTIF_USER_ID, mNotification, + NOTIF_USER_ID, NOTIF_USER_ID, notification, new UserHandle(NOTIF_USER_ID), "", System.currentTimeMillis())) - .setNotification(mNotification) + .setNotification(notification) .build(); // THEN extend the lifetime assertTrue(mForegroundNotifLifetimeExtender - .shouldExtendLifetime(mEntry, NotificationListenerService.REASON_CLICK)); + .shouldExtendLifetime(entry, NotificationListenerService.REASON_CLICK)); } @Test public void extendLifetimeText_foregroundNotifOld() { // GIVEN the notification represents a foreground service that was posted 10 seconds ago - mNotification.flags |= Notification.FLAG_FOREGROUND_SERVICE; - mEntry = new NotificationEntryBuilder() - .setUser(new UserHandle(NOTIF_USER_ID)) + Notification notification = new Notification.Builder(mContext, "test_channel") + .setFlag(FLAG_FOREGROUND_SERVICE, true) + .build(); + NotificationEntry entry = mEntryBuilder .setSbn(new StatusBarNotification(TEST_PKG, TEST_PKG, NOTIF_USER_ID, "", - NOTIF_USER_ID, NOTIF_USER_ID, mNotification, + NOTIF_USER_ID, NOTIF_USER_ID, notification, new UserHandle(NOTIF_USER_ID), "", System.currentTimeMillis() - 10000)) - .setNotification(mNotification) + .setNotification(notification) .build(); // THEN don't extend the lifetime because the extended time exceeds MIN_FGS_TIME_MS assertFalse(mForegroundNotifLifetimeExtender - .shouldExtendLifetime(mEntry, NotificationListenerService.REASON_CLICK)); + .shouldExtendLifetime(entry, NotificationListenerService.REASON_CLICK)); } @Test @@ -345,4 +358,41 @@ public class AppOpsCoordinatorTest extends SysuiTestCase { // THEN the entry's active app ops is updated to empty assertTrue(entry.mActiveAppOps.isEmpty()); } + + @Test + public void testIncludeFGSInSection_importanceDefault() { + // GIVEN the notification represents a colorized foreground service with > min importance + mEntryBuilder + .setFlag(mContext, FLAG_FOREGROUND_SERVICE, true) + .setImportance(IMPORTANCE_DEFAULT) + .modifyNotification(mContext).setColorized(true); + + // THEN the entry is in the fgs section + assertTrue(mFgsSection.isInSection(mEntryBuilder.build())); + } + + @Test + public void testDiscludeFGSInSection_importanceMin() { + // GIVEN the notification represents a colorized foreground service with min importance + mEntryBuilder + .setFlag(mContext, FLAG_FOREGROUND_SERVICE, true) + .setImportance(IMPORTANCE_MIN) + .modifyNotification(mContext).setColorized(true); + + // THEN the entry is NOT in the fgs section + assertFalse(mFgsSection.isInSection(mEntryBuilder.build())); + } + + @Test + public void testDiscludeNonFGSInSection() { + // GIVEN the notification represents a colorized notification with high importance that + // is NOT a foreground service + mEntryBuilder + .setImportance(IMPORTANCE_HIGH) + .setFlag(mContext, FLAG_FOREGROUND_SERVICE, false) + .modifyNotification(mContext).setColorized(false); + + // THEN the entry is NOT in the fgs section + assertFalse(mFgsSection.isInSection(mEntryBuilder.build())); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt index dfc627e14d8c..be5c8a846afb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt @@ -25,6 +25,9 @@ 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.NotifPromoter +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection +import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier +import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_PERSON import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before @@ -40,38 +43,52 @@ import org.mockito.Mockito.`when` as whenever @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper class ConversationCoordinatorTest : SysuiTestCase() { - - private var coordinator: ConversationCoordinator = ConversationCoordinator() - // captured listeners and pluggables: - private var promoter: NotifPromoter? = null + private lateinit var promoter: NotifPromoter + private lateinit var peopleSection: NotifSection @Mock - private val pipeline: NotifPipeline? = null + private lateinit var pipeline: NotifPipeline + @Mock + private lateinit var peopleNotificationIdentifier: PeopleNotificationIdentifier @Mock - private val channel: NotificationChannel? = null - private var entry: NotificationEntry? = null + private lateinit var channel: NotificationChannel + private lateinit var entry: NotificationEntry + + private lateinit var coordinator: ConversationCoordinator @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(channel!!.isImportantConversation).thenReturn(true) + coordinator = ConversationCoordinator(peopleNotificationIdentifier) + whenever(channel.isImportantConversation).thenReturn(true) - coordinator.attach(pipeline!!) + coordinator.attach(pipeline) // capture arguments: val notifPromoterCaptor = ArgumentCaptor.forClass(NotifPromoter::class.java) verify(pipeline).addPromoter(notifPromoterCaptor.capture()) promoter = notifPromoterCaptor.value + peopleSection = coordinator.getSection() + entry = NotificationEntryBuilder().setChannel(channel).build() } @Test - fun testPromotesCurrentHUN() { - + fun testPromotesImportantConversations() { // only promote important conversations - assertTrue(promoter!!.shouldPromoteToTopLevel(entry)) - assertFalse(promoter!!.shouldPromoteToTopLevel(NotificationEntryBuilder().build())) + assertTrue(promoter.shouldPromoteToTopLevel(entry)) + assertFalse(promoter.shouldPromoteToTopLevel(NotificationEntryBuilder().build())) + } + + @Test + fun testInPeopleSection() { + whenever(peopleNotificationIdentifier.getPeopleNotificationType( + entry.sbn, entry.ranking)).thenReturn(TYPE_PERSON) + + // only put people notifications in this section + assertTrue(peopleSection.isInSection(entry)) + assertFalse(peopleSection.isInSection(NotificationEntryBuilder().build())) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java index 85acbe6d440b..5f10f38b2ee8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RankingCoordinatorTest.java @@ -36,6 +36,8 @@ 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.listbuilder.pluggable.NotifSection; +import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider; import org.junit.Before; import org.junit.Test; @@ -50,6 +52,7 @@ import org.mockito.MockitoAnnotations; public class RankingCoordinatorTest extends SysuiTestCase { @Mock private StatusBarStateController mStatusBarStateController; + @Mock private HighPriorityProvider mHighPriorityProvider; @Mock private NotifPipeline mNotifPipeline; @Captor private ArgumentCaptor<NotifFilter> mNotifFilterCaptor; @@ -58,16 +61,23 @@ public class RankingCoordinatorTest extends SysuiTestCase { private NotifFilter mCapturedSuspendedFilter; private NotifFilter mCapturedDozingFilter; + private NotifSection mAlertingSection; + private NotifSection mSilentSection; + @Before public void setup() { MockitoAnnotations.initMocks(this); - RankingCoordinator rankingCoordinator = new RankingCoordinator(mStatusBarStateController); + RankingCoordinator rankingCoordinator = + new RankingCoordinator(mStatusBarStateController, mHighPriorityProvider); mEntry = new NotificationEntryBuilder().build(); rankingCoordinator.attach(mNotifPipeline); verify(mNotifPipeline, times(2)).addPreGroupFilter(mNotifFilterCaptor.capture()); mCapturedSuspendedFilter = mNotifFilterCaptor.getAllValues().get(0); mCapturedDozingFilter = mNotifFilterCaptor.getAllValues().get(1); + + mAlertingSection = rankingCoordinator.getAlertingSection(); + mSilentSection = rankingCoordinator.getSilentSection(); } @Test @@ -130,6 +140,26 @@ public class RankingCoordinatorTest extends SysuiTestCase { assertTrue(mCapturedDozingFilter.shouldFilterOut(mEntry, 0)); } + @Test + public void testIncludeInSectionAlerting() { + // GIVEN the entry is high priority + when(mHighPriorityProvider.isHighPriority(mEntry)).thenReturn(true); + + // THEN entry is in the alerting section + assertTrue(mAlertingSection.isInSection(mEntry)); + assertFalse(mSilentSection.isInSection(mEntry)); + } + + @Test + public void testIncludeInSectionSilent() { + // GIVEN the entry isn't high priority + when(mHighPriorityProvider.isHighPriority(mEntry)).thenReturn(false); + + // THEN entry is in the silent section + assertFalse(mAlertingSection.isInSection(mEntry)); + assertTrue(mSilentSection.isInSection(mEntry)); + } + private RankingBuilder getRankingForUnfilteredNotif() { return new RankingBuilder() .setKey(mEntry.getKey()) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarContextTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarContextTest.java index 6433376cd2a9..b5060ee416f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarContextTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarContextTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -190,13 +191,13 @@ public class NavigationBarContextTest extends SysuiTestCase { kbd2.setDarkIntensity(0f); // Update icon returns the drawable intensity to half - doReturn(kbd1).when(button).getNewDrawable(); - button.updateIcon(); + doReturn(kbd1).when(button).getNewDrawable(anyInt(), anyInt()); + button.updateIcon(0, 0); assertEquals(TEST_DARK_INTENSITY, kbd1.getDarkIntensity(), DARK_INTENSITY_ERR); // Return old dark intensity on new drawable after update icon - doReturn(kbd2).when(button).getNewDrawable(); - button.updateIcon(); + doReturn(kbd2).when(button).getNewDrawable(anyInt(), anyInt()); + button.updateIcon(0, 0); assertEquals(TEST_DARK_INTENSITY, kbd2.getDarkIntensity(), DARK_INTENSITY_ERR); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarRotationContextTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarRotationContextTest.java index d6b38ff4936f..f21235c12cde 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarRotationContextTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarRotationContextTest.java @@ -59,8 +59,8 @@ public class NavigationBarRotationContextTest extends SysuiTestCase { final View view = new View(mContext); mRotationButton = mock(RotationButton.class); - mRotationButtonController = spy( - new RotationButtonController(mContext, RES_UNDEF, mRotationButton)); + mRotationButtonController = spy(new RotationButtonController(mContext, 0, 0, + mRotationButton)); final KeyButtonDrawable kbd = mock(KeyButtonDrawable.class); doReturn(view).when(mRotationButton).getCurrentView(); doReturn(true).when(mRotationButton).acceptRotationProposal(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackControllerTest.java index fa711f1cf9a2..a16fb5e8dc17 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackControllerTest.java @@ -23,10 +23,12 @@ import static org.mockito.Mockito.verify; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; +import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle.Event; import androidx.lifecycle.LifecycleEventObserver; import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; @@ -76,6 +78,34 @@ public class CallbackControllerTest extends SysuiTestCase { verify(controller).removeCallback(eq(callback)); } + @Test + public void testCallbackIsRemovedOnDestroy() { + SimpleLifecycleOwner owner = new SimpleLifecycleOwner(); + + Object callback = new Object(); + Controller controller = mock(Controller.class); + controller.observe(owner, callback); + + owner.setState(Lifecycle.State.RESUMED); + verify(controller).addCallback(callback); + + owner.setState(Lifecycle.State.DESTROYED); + verify(controller).removeCallback(callback); + } + + private static class SimpleLifecycleOwner implements LifecycleOwner { + LifecycleRegistry mLifecycle = new LifecycleRegistry(this); + @NonNull + @Override + public Lifecycle getLifecycle() { + return mLifecycle; + } + + public void setState(Lifecycle.State state) { + mLifecycle.setCurrentState(state); + } + } + private static class Controller implements CallbackController<Object> { @Override public void addCallback(Object listener) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java index 8ec4cb8b927b..50c1e73f6aac 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBatteryController.java @@ -25,6 +25,8 @@ import java.io.PrintWriter; public class FakeBatteryController extends BaseLeakChecker<BatteryStateChangeCallback> implements BatteryController { + private boolean mWirelessCharging; + public FakeBatteryController(LeakCheck test) { super(test, "battery"); } @@ -58,4 +60,13 @@ public class FakeBatteryController extends BaseLeakChecker<BatteryStateChangeCal public boolean isAodPowerSave() { return false; } + + @Override + public boolean isWirelessCharging() { + return mWirelessCharging; + } + + public void setWirelessCharging(boolean wirelessCharging) { + mWirelessCharging = wirelessCharging; + } } diff --git a/packages/Tethering/tests/privileged/Android.bp b/packages/Tethering/tests/privileged/Android.bp new file mode 100644 index 000000000000..a0fb24603a93 --- /dev/null +++ b/packages/Tethering/tests/privileged/Android.bp @@ -0,0 +1,30 @@ +// +// 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. +// + +android_test { + name: "TetheringPrivilegedTests", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], + certificate: "networkstack", + platform_apis: true, + test_suites: [ + "general-tests", + "mts", + ], + compile_multilib: "both", +} diff --git a/packages/Tethering/tests/privileged/AndroidManifest.xml b/packages/Tethering/tests/privileged/AndroidManifest.xml new file mode 100644 index 000000000000..49eba15d13d4 --- /dev/null +++ b/packages/Tethering/tests/privileged/AndroidManifest.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. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.networkstack.tethering.tests.privileged" + android:sharedUserId="android.uid.networkstack"> + + <!-- Note: do not add any privileged or signature permissions that are granted + to the network stack and its shared uid apps. Otherwise, the test APK will + install, but when the device is rebooted, it will bootloop because this + test APK is not in the privileged permission allow list --> + + <application android:debuggable="true"> + <uses-library android:name="android.test.runner" /> + </application> + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.networkstack.tethering.tests.privileged" + android:label="Tethering privileged tests"> + </instrumentation> +</manifest> diff --git a/packages/WAPPushManager/AndroidManifest.xml b/packages/WAPPushManager/AndroidManifest.xml index 14e6e91e3a25..a75fb2d47bbd 100644 --- a/packages/WAPPushManager/AndroidManifest.xml +++ b/packages/WAPPushManager/AndroidManifest.xml @@ -23,6 +23,8 @@ <permission android:name="com.android.smspush.WAPPUSH_MANAGER_BIND" android:protectionLevel="signatureOrSystem" /> + <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> + <original-package android:name="com.android.smspush" /> <application android:allowClearUserData="false"> diff --git a/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl b/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl index 4e54aba5c3bf..1bbc90d604f9 100644 --- a/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl +++ b/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl @@ -21,7 +21,4 @@ interface IProxyService String resolvePacFile(String host, String url); oneway void setPacFile(String scriptContents); - - oneway void startPacSystem(); - oneway void stopPacSystem(); } diff --git a/packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java b/packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java index 7aea721617b9..5a7de9f70b49 100644 --- a/packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java +++ b/packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java @@ -88,15 +88,5 @@ public class PacService extends Service { } mLibpac.setCurrentProxyScript(script); } - - @Override - public void startPacSystem() throws RemoteException { - //TODO: remove - } - - @Override - public void stopPacSystem() throws RemoteException { - //TODO: remove - } } } diff --git a/services/autofill/java/com/android/server/autofill/AutofillInlineSessionController.java b/services/autofill/java/com/android/server/autofill/AutofillInlineSessionController.java index 19248ca54611..c25dd37bc7d9 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillInlineSessionController.java +++ b/services/autofill/java/com/android/server/autofill/AutofillInlineSessionController.java @@ -31,9 +31,16 @@ import com.android.server.inputmethod.InputMethodManagerInternal; import java.util.Optional; import java.util.function.Consumer; - /** - * Controls the interaction with the IME for the inline suggestion sessions. + * Controls the interaction with the IME for the {@link AutofillInlineSuggestionsRequestSession}s. + * + * <p>The class maintains the inline suggestion session with the autofill service. There is at most + * one active inline suggestion session at any given corresponding to one focused view. + * New sessions are created only when {@link #onCreateInlineSuggestionsRequestLocked} is called.</p> + * + * <p>The class manages the interaction between the {@link com.android.server.autofill.Session} and + * the inline suggestion session whenever inline suggestions can be provided. All calls to the + * inline suggestion session must be made through this controller.</p> */ final class AutofillInlineSessionController { @NonNull @@ -66,7 +73,6 @@ final class AutofillInlineSessionController { mUiCallback = callback; } - /** * Requests the IME to create an {@link InlineSuggestionsRequest} for {@code autofillId}. * diff --git a/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java b/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java index b2daae48bb0e..84fbe9a75a18 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java +++ b/services/autofill/java/com/android/server/autofill/AutofillInlineSuggestionsRequestSession.java @@ -364,6 +364,9 @@ final class AutofillInlineSuggestionsRequestSession { } } + /** + * Internal implementation of {@link IInlineSuggestionsRequestCallback}. + */ private static final class InlineSuggestionsRequestCallbackImpl extends IInlineSuggestionsRequestCallback.Stub { diff --git a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java index 2241569afe18..e80a6d9e0907 100644 --- a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java +++ b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java @@ -33,7 +33,7 @@ import android.os.ParcelFileDescriptor; import android.util.Slog; import com.android.server.LocalServices; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -134,10 +134,11 @@ public class PackageManagerBackupAgent extends BackupAgent { init(packageMgr, packages, userId); } - public PackageManagerBackupAgent(PackageManager packageMgr, int userId) { + public PackageManagerBackupAgent(PackageManager packageMgr, int userId, + BackupEligibilityRules backupEligibilityRules) { init(packageMgr, null, userId); - evaluateStorablePackages(); + evaluateStorablePackages(backupEligibilityRules); } private void init(PackageManager packageMgr, List<PackageInfo> packages, int userId) { @@ -153,18 +154,19 @@ public class PackageManagerBackupAgent extends BackupAgent { // We will need to refresh our understanding of what is eligible for // backup periodically; this entry point serves that purpose. - public void evaluateStorablePackages() { - mAllPackages = getStorableApplications(mPackageManager, mUserId); + public void evaluateStorablePackages(BackupEligibilityRules backupEligibilityRules) { + mAllPackages = getStorableApplications(mPackageManager, mUserId, backupEligibilityRules); } /** Gets all packages installed on user {@code userId} eligible for backup. */ - public static List<PackageInfo> getStorableApplications(PackageManager pm, int userId) { + public static List<PackageInfo> getStorableApplications(PackageManager pm, int userId, + BackupEligibilityRules backupEligibilityRules) { List<PackageInfo> pkgs = pm.getInstalledPackagesAsUser(PackageManager.GET_SIGNING_CERTIFICATES, userId); int N = pkgs.size(); for (int a = N-1; a >= 0; a--) { PackageInfo pkg = pkgs.get(a); - if (!AppBackupUtils.appIsEligibleForBackup(pkg.applicationInfo, userId)) { + if (!backupEligibilityRules.appIsEligibleForBackup(pkg.applicationInfo)) { pkgs.remove(a); } } diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index d6a075f18141..ff21a733223c 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -68,6 +68,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManagerInternal; import android.database.ContentObserver; import android.net.Uri; import android.os.Binder; @@ -127,7 +128,7 @@ import com.android.server.backup.restore.ActiveRestoreSession; import com.android.server.backup.restore.PerformUnifiedRestoreTask; import com.android.server.backup.transport.TransportClient; import com.android.server.backup.transport.TransportNotRegisteredException; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import com.android.server.backup.utils.BackupManagerMonitorUtils; import com.android.server.backup.utils.BackupObserverUtils; import com.android.server.backup.utils.SparseArrayUtils; @@ -336,6 +337,7 @@ public class UserBackupManagerService { private final BackupManagerConstants mConstants; private final BackupWakeLock mWakelock; private final BackupHandler mBackupHandler; + private final BackupEligibilityRules mScheduledBackupEligibility; private final IBackupManager mBackupManagerBinder; @@ -563,6 +565,7 @@ public class UserBackupManagerService { mActivityManager = null; mStorageManager = null; mBackupManagerBinder = null; + mScheduledBackupEligibility = null; } private UserBackupManagerService( @@ -579,6 +582,8 @@ public class UserBackupManagerService { mPackageManagerBinder = AppGlobals.getPackageManager(); mActivityManager = ActivityManager.getService(); mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); + mScheduledBackupEligibility = getEligibilityRules(mPackageManager, userId, + OperationType.BACKUP); mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); @@ -914,7 +919,13 @@ public class UserBackupManagerService { * non-lifecycle agent instance, so we manually set up the context topology for it. */ public BackupAgent makeMetadataAgent() { - PackageManagerBackupAgent pmAgent = new PackageManagerBackupAgent(mPackageManager, mUserId); + return makeMetadataAgentWithEligibilityRules(mScheduledBackupEligibility); + } + + public BackupAgent makeMetadataAgentWithEligibilityRules( + BackupEligibilityRules backupEligibilityRules) { + PackageManagerBackupAgent pmAgent = new PackageManagerBackupAgent(mPackageManager, mUserId, + backupEligibilityRules); pmAgent.attach(mContext); pmAgent.onCreate(UserHandle.of(mUserId)); return pmAgent; @@ -996,7 +1007,8 @@ public class UserBackupManagerService { boolean changed = false; ArrayList<FullBackupEntry> schedule = null; List<PackageInfo> apps = - PackageManagerBackupAgent.getStorableApplications(mPackageManager, mUserId); + PackageManagerBackupAgent.getStorableApplications(mPackageManager, mUserId, + mScheduledBackupEligibility); if (mFullBackupScheduleFile.exists()) { try (FileInputStream fstream = new FileInputStream(mFullBackupScheduleFile); @@ -1026,9 +1038,9 @@ public class UserBackupManagerService { foundApps.add(pkgName); // all apps that we've addressed already try { PackageInfo pkg = mPackageManager.getPackageInfoAsUser(pkgName, 0, mUserId); - if (AppBackupUtils.appGetsFullBackup(pkg) - && AppBackupUtils.appIsEligibleForBackup(pkg.applicationInfo, - mUserId)) { + if (mScheduledBackupEligibility.appGetsFullBackup(pkg) + && mScheduledBackupEligibility.appIsEligibleForBackup( + pkg.applicationInfo)) { schedule.add(new FullBackupEntry(pkgName, lastBackup)); } else { if (DEBUG) { @@ -1047,9 +1059,9 @@ public class UserBackupManagerService { // New apps can arrive "out of band" via OTA and similar, so we also need to // scan to make sure that we're tracking all full-backup candidates properly for (PackageInfo app : apps) { - if (AppBackupUtils.appGetsFullBackup(app) - && AppBackupUtils.appIsEligibleForBackup(app.applicationInfo, - mUserId)) { + if (mScheduledBackupEligibility.appGetsFullBackup(app) + && mScheduledBackupEligibility.appIsEligibleForBackup( + app.applicationInfo)) { if (!foundApps.contains(app.packageName)) { if (MORE_DEBUG) { Slog.i( @@ -1080,8 +1092,9 @@ public class UserBackupManagerService { changed = true; schedule = new ArrayList<>(apps.size()); for (PackageInfo info : apps) { - if (AppBackupUtils.appGetsFullBackup(info) && AppBackupUtils.appIsEligibleForBackup( - info.applicationInfo, mUserId)) { + if (mScheduledBackupEligibility.appGetsFullBackup(info) + && mScheduledBackupEligibility.appIsEligibleForBackup( + info.applicationInfo)) { schedule.add(new FullBackupEntry(info.packageName, 0)); } } @@ -1381,9 +1394,9 @@ public class UserBackupManagerService { PackageInfo app = mPackageManager.getPackageInfoAsUser( packageName, /* flags */ 0, mUserId); - if (AppBackupUtils.appGetsFullBackup(app) - && AppBackupUtils.appIsEligibleForBackup( - app.applicationInfo, mUserId)) { + if (mScheduledBackupEligibility.appGetsFullBackup(app) + && mScheduledBackupEligibility.appIsEligibleForBackup( + app.applicationInfo)) { enqueueFullBackup(packageName, now); scheduleNextFullBackupJob(0); } else { @@ -1881,9 +1894,11 @@ public class UserBackupManagerService { OnTaskFinishedListener listener = caller -> mTransportManager.disposeOfTransportClient(transportClient, caller); + BackupEligibilityRules backupEligibilityRules = getEligibilityRulesForOperation( + operationType); Message msg = mBackupHandler.obtainMessage(MSG_REQUEST_BACKUP); - msg.obj = getRequestBackupParams(packages, observer, monitor, flags, operationType, + msg.obj = getRequestBackupParams(packages, observer, monitor, flags, backupEligibilityRules, transportClient, transportDirName, listener); mBackupHandler.sendMessage(msg); return BackupManager.SUCCESS; @@ -1891,7 +1906,7 @@ public class UserBackupManagerService { @VisibleForTesting BackupParams getRequestBackupParams(String[] packages, IBackupObserver observer, - IBackupManagerMonitor monitor, int flags, @OperationType int operationType, + IBackupManagerMonitor monitor, int flags, BackupEligibilityRules backupEligibilityRules, TransportClient transportClient, String transportDirName, OnTaskFinishedListener listener) { ArrayList<String> fullBackupList = new ArrayList<>(); @@ -1904,13 +1919,12 @@ public class UserBackupManagerService { try { PackageInfo packageInfo = mPackageManager.getPackageInfoAsUser(packageName, PackageManager.GET_SIGNING_CERTIFICATES, mUserId); - if (!appIsEligibleForBackup(packageInfo.applicationInfo, mUserId, - operationType)) { + if (!backupEligibilityRules.appIsEligibleForBackup(packageInfo.applicationInfo)) { BackupObserverUtils.sendBackupOnPackageResult(observer, packageName, BackupManager.ERROR_BACKUP_NOT_ALLOWED); continue; } - if (appGetsFullBackup(packageInfo, operationType)) { + if (backupEligibilityRules.appGetsFullBackup(packageInfo)) { fullBackupList.add(packageInfo.packageName); } else { kvBackupList.add(packageInfo.packageName); @@ -1941,18 +1955,7 @@ public class UserBackupManagerService { return new BackupParams(transportClient, transportDirName, kvBackupList, fullBackupList, observer, monitor, listener, /* userInitiated */ true, nonIncrementalBackup, - operationType); - } - - @VisibleForTesting - boolean appIsEligibleForBackup(ApplicationInfo applicationInfo, int userId, - @OperationType int operationType) { - return AppBackupUtils.appIsEligibleForBackup(applicationInfo, userId, operationType); - } - - @VisibleForTesting - boolean appGetsFullBackup(PackageInfo packageInfo, @OperationType int operationType) { - return AppBackupUtils.appGetsFullBackup(packageInfo, operationType); + backupEligibilityRules); } /** Cancel all running backups. */ @@ -2481,7 +2484,7 @@ public class UserBackupManagerService { try { PackageInfo appInfo = mPackageManager.getPackageInfoAsUser( entry.packageName, 0, mUserId); - if (!AppBackupUtils.appGetsFullBackup(appInfo)) { + if (!mScheduledBackupEligibility.appGetsFullBackup(appInfo)) { // The head app isn't supposed to get full-data backups [any more]; // so we cull it and force a loop around to consider the new head // app. @@ -2562,7 +2565,8 @@ public class UserBackupManagerService { /* backupObserver */ null, /* monitor */ null, /* userInitiated */ false, - "BMS.beginFullBackup()"); + "BMS.beginFullBackup()", + getEligibilityRulesForOperation(OperationType.BACKUP)); // Acquiring wakelock for PerformFullTransportBackupTask before its start. mWakelock.acquire(); (new Thread(mRunningFullBackupTask)).start(); @@ -3001,7 +3005,7 @@ public class UserBackupManagerService { AdbBackupParams params = new AdbBackupParams(fd, includeApks, includeObbs, includeShared, doWidgets, doAllApps, includeSystem, compress, doKeyValue, - pkgList); + pkgList, mScheduledBackupEligibility); final int token = generateRandomIntegerToken(); synchronized (mAdbBackupRestoreConfirmations) { mAdbBackupRestoreConfirmations.put(token, params); @@ -3086,7 +3090,8 @@ public class UserBackupManagerService { /* backupObserver */ null, /* monitor */ null, /* userInitiated */ false, - "BMS.fullTransportBackup()"); + "BMS.fullTransportBackup()", + getEligibilityRulesForOperation(OperationType.BACKUP)); // Acquiring wakelock for PerformFullTransportBackupTask before its start. mWakelock.acquire(); (new Thread(task, "full-transport-master")).start(); @@ -4137,8 +4142,8 @@ public class UserBackupManagerService { TransportClient transportClient = mTransportManager.getCurrentTransportClient(callerLogString); boolean eligible = - AppBackupUtils.appIsRunningAndEligibleForBackupWithTransport( - transportClient, packageName, mPackageManager, mUserId); + mScheduledBackupEligibility.appIsRunningAndEligibleForBackupWithTransport( + transportClient, packageName); if (transportClient != null) { mTransportManager.disposeOfTransportClient(transportClient, callerLogString); } @@ -4160,9 +4165,8 @@ public class UserBackupManagerService { mTransportManager.getCurrentTransportClient(callerLogString); List<String> eligibleApps = new LinkedList<>(); for (String packageName : packages) { - if (AppBackupUtils - .appIsRunningAndEligibleForBackupWithTransport( - transportClient, packageName, mPackageManager, mUserId)) { + if (mScheduledBackupEligibility.appIsRunningAndEligibleForBackupWithTransport( + transportClient, packageName)) { eligibleApps.add(packageName); } } @@ -4175,6 +4179,17 @@ public class UserBackupManagerService { } } + public BackupEligibilityRules getEligibilityRulesForOperation( + @OperationType int operationType) { + return getEligibilityRules(mPackageManager, mUserId, operationType); + } + + private static BackupEligibilityRules getEligibilityRules(PackageManager packageManager, + int userId, @OperationType int operationType) { + return new BackupEligibilityRules(packageManager, + LocalServices.getService(PackageManagerInternal.class), userId, operationType); + } + /** Prints service state for 'dumpsys backup'. */ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { long identityToken = Binder.clearCallingIdentity(); diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java index 0a7159bfe1b7..a69bd6b62264 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java @@ -24,6 +24,8 @@ import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_HEA import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_VERSION; import static com.android.server.backup.UserBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import android.app.backup.BackupManager; +import android.app.backup.BackupManager.OperationType; import android.app.backup.IFullBackupRestoreObserver; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -38,7 +40,7 @@ import com.android.server.AppWidgetBackupBridge; import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.KeyValueAdbBackupEngine; import com.android.server.backup.UserBackupManagerService; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import com.android.server.backup.utils.PasswordUtils; import java.io.ByteArrayOutputStream; @@ -83,12 +85,14 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor private final String mCurrentPassword; private final String mEncryptPassword; private final int mCurrentOpToken; + private final BackupEligibilityRules mBackupEligibilityRules; public PerformAdbBackupTask(UserBackupManagerService backupManagerService, ParcelFileDescriptor fd, IFullBackupRestoreObserver observer, boolean includeApks, boolean includeObbs, boolean includeShared, boolean doWidgets, String curPassword, String encryptPassword, boolean doAllApps, boolean doSystem, - boolean doCompress, boolean doKeyValue, String[] packages, AtomicBoolean latch) { + boolean doCompress, boolean doKeyValue, String[] packages, AtomicBoolean latch, + BackupEligibilityRules backupEligibilityRules) { super(observer); mUserBackupManagerService = backupManagerService; mCurrentOpToken = backupManagerService.generateRandomIntegerToken(); @@ -119,6 +123,7 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor } mCompress = doCompress; mKeyValue = doKeyValue; + mBackupEligibilityRules = backupEligibilityRules; } private void addPackagesToSet(TreeMap<String, PackageInfo> set, List<String> pkgNames) { @@ -286,15 +291,14 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor Iterator<Entry<String, PackageInfo>> iter = packagesToBackup.entrySet().iterator(); while (iter.hasNext()) { PackageInfo pkg = iter.next().getValue(); - if (!AppBackupUtils.appIsEligibleForBackup(pkg.applicationInfo, - mUserBackupManagerService.getUserId()) - || AppBackupUtils.appIsStopped(pkg.applicationInfo)) { + if (!mBackupEligibilityRules.appIsEligibleForBackup(pkg.applicationInfo) + || mBackupEligibilityRules.appIsStopped(pkg.applicationInfo)) { iter.remove(); if (DEBUG) { Slog.i(TAG, "Package " + pkg.packageName + " is not eligible for backup, removing."); } - } else if (AppBackupUtils.appIsKeyValueOnly(pkg)) { + } else if (mBackupEligibilityRules.appIsKeyValueOnly(pkg)) { iter.remove(); if (DEBUG) { Slog.i(TAG, "Package " + pkg.packageName diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 738dd9bf0f0d..1fa88920ca74 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -53,7 +53,7 @@ import com.android.server.backup.internal.Operation; import com.android.server.backup.remote.RemoteCall; import com.android.server.backup.transport.TransportClient; import com.android.server.backup.transport.TransportNotAvailableException; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import com.android.server.backup.utils.BackupManagerMonitorUtils; import com.android.server.backup.utils.BackupObserverUtils; @@ -107,7 +107,8 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba IBackupObserver backupObserver, IBackupManagerMonitor monitor, boolean userInitiated, - String caller) { + String caller, + BackupEligibilityRules backupEligibilityRules) { TransportManager transportManager = backupManagerService.getTransportManager(); TransportClient transportClient = transportManager.getCurrentTransportClient(caller); OnTaskFinishedListener listener = @@ -124,7 +125,8 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba backupObserver, monitor, listener, - userInitiated); + userInitiated, + backupEligibilityRules); } private static final String TAG = "PFTBT"; @@ -151,6 +153,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba private volatile boolean mCancelAll; private final int mCurrentOpToken; private final BackupAgentTimeoutParameters mAgentTimeoutParameters; + private final BackupEligibilityRules mBackupEligibilityRules; public PerformFullTransportBackupTask(UserBackupManagerService backupManagerService, TransportClient transportClient, @@ -158,7 +161,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba String[] whichPackages, boolean updateSchedule, FullBackupJob runningJob, CountDownLatch latch, IBackupObserver backupObserver, @Nullable IBackupManagerMonitor monitor, @Nullable OnTaskFinishedListener listener, - boolean userInitiated) { + boolean userInitiated, BackupEligibilityRules backupEligibilityRules) { super(observer); this.mUserBackupManagerService = backupManagerService; mTransportClient = transportClient; @@ -176,6 +179,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba backupManagerService.getAgentTimeoutParameters(), "Timeout parameters cannot be null"); mUserId = backupManagerService.getUserId(); + mBackupEligibilityRules = backupEligibilityRules; if (backupManagerService.isBackupOperationInProgress()) { if (DEBUG) { @@ -193,7 +197,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba PackageInfo info = pm.getPackageInfoAsUser(pkg, PackageManager.GET_SIGNING_CERTIFICATES, mUserId); mCurrentPackage = info; - if (!AppBackupUtils.appIsEligibleForBackup(info.applicationInfo, mUserId)) { + if (!mBackupEligibilityRules.appIsEligibleForBackup(info.applicationInfo)) { // Cull any packages that have indicated that backups are not permitted, // that run as system-domain uids but do not define their own backup agents, // as well as any explicit mention of the 'special' shared-storage agent @@ -209,7 +213,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba BackupObserverUtils.sendBackupOnPackageResult(mBackupObserver, pkg, BackupManager.ERROR_BACKUP_NOT_ALLOWED); continue; - } else if (!AppBackupUtils.appGetsFullBackup(info)) { + } else if (!mBackupEligibilityRules.appGetsFullBackup(info)) { // Cull any packages that are found in the queue but now aren't supposed // to get full-data backup operations. if (MORE_DEBUG) { @@ -224,7 +228,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba BackupObserverUtils.sendBackupOnPackageResult(mBackupObserver, pkg, BackupManager.ERROR_BACKUP_NOT_ALLOWED); continue; - } else if (AppBackupUtils.appIsStopped(info.applicationInfo)) { + } else if (mBackupEligibilityRules.appIsStopped(info.applicationInfo)) { // Cull any packages in the 'stopped' state: they've either just been // installed or have explicitly been force-stopped by the user. In both // cases we do not want to launch them for backup. diff --git a/services/backup/java/com/android/server/backup/internal/BackupHandler.java b/services/backup/java/com/android/server/backup/internal/BackupHandler.java index 87a8e4982529..1bb434950563 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java +++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java @@ -20,6 +20,8 @@ import static com.android.server.backup.BackupManagerService.DEBUG; import static com.android.server.backup.BackupManagerService.MORE_DEBUG; import static com.android.server.backup.BackupManagerService.TAG; +import android.app.backup.BackupManager; +import android.app.backup.BackupManager.OperationType; import android.app.backup.RestoreSet; import android.os.Handler; import android.os.HandlerThread; @@ -222,7 +224,9 @@ public class BackupHandler extends Handler { listener, Collections.emptyList(), /* userInitiated */ false, - /* nonIncremental */ false); + /* nonIncremental */ false, + backupManagerService.getEligibilityRulesForOperation( + OperationType.BACKUP)); } catch (Exception e) { // unable to ask the transport its dir name -- transient failure, since // the above check succeeded. Try again next time. @@ -279,7 +283,8 @@ public class BackupHandler extends Handler { params.observer, params.includeApks, params.includeObbs, params.includeShared, params.doWidgets, params.curPassword, params.encryptPassword, params.allApps, params.includeSystem, - params.doCompress, params.includeKeyValue, params.packages, params.latch); + params.doCompress, params.includeKeyValue, params.packages, params.latch, + params.backupEligibilityRules); (new Thread(task, "adb-backup")).start(); break; } @@ -299,7 +304,9 @@ public class BackupHandler extends Handler { params.pmToken, params.isSystemRestore, params.filterSet, - params.listener); + params.listener, + backupManagerService.getEligibilityRulesForOperation( + OperationType.BACKUP)); synchronized (backupManagerService.getPendingRestores()) { if (backupManagerService.isRestoreInProgress()) { @@ -462,7 +469,8 @@ public class BackupHandler extends Handler { params.listener, params.fullPackages, /* userInitiated */ true, - params.nonIncrementalBackup); + params.nonIncrementalBackup, + params.mBackupEligibilityRules); break; } diff --git a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java index f146e491c488..6124171c7a0e 100644 --- a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java +++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java @@ -67,7 +67,7 @@ import com.android.server.backup.remote.RemoteCallable; import com.android.server.backup.remote.RemoteResult; import com.android.server.backup.transport.TransportClient; import com.android.server.backup.transport.TransportNotAvailableException; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import libcore.io.IoUtils; @@ -220,7 +220,8 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { OnTaskFinishedListener listener, List<String> pendingFullBackups, boolean userInitiated, - boolean nonIncremental) { + boolean nonIncremental, + BackupEligibilityRules backupEligibilityRules) { KeyValueBackupReporter reporter = new KeyValueBackupReporter(backupManagerService, observer, monitor); KeyValueBackupTask task = @@ -234,7 +235,8 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { listener, pendingFullBackups, userInitiated, - nonIncremental); + nonIncremental, + backupEligibilityRules); Thread thread = new Thread(task, "key-value-backup-" + THREAD_COUNT.incrementAndGet()); thread.start(); KeyValueBackupReporter.onNewThread(thread.getName()); @@ -258,6 +260,7 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { private final List<String> mPendingFullBackups; private final Object mQueueLock; @Nullable private final DataChangedJournal mJournal; + private final BackupEligibilityRules mBackupEligibilityRules; @Nullable private PerformFullTransportBackupTask mFullBackupTask; @Nullable private IBackupAgent mAgent; @@ -307,7 +310,8 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { OnTaskFinishedListener taskFinishedListener, List<String> pendingFullBackups, boolean userInitiated, - boolean nonIncremental) { + boolean nonIncremental, + BackupEligibilityRules backupEligibilityRules) { mBackupManagerService = backupManagerService; mPackageManager = backupManagerService.getPackageManager(); mTransportClient = transportClient; @@ -330,6 +334,7 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { mQueueLock = mBackupManagerService.getQueueLock(); mBlankStateFile = new File(mStateDirectory, BLANK_STATE_FILE_NAME); mUserId = backupManagerService.getUserId(); + mBackupEligibilityRules = backupEligibilityRules; } private void registerTask() { @@ -456,9 +461,9 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { /** Determine if a package is eligible to be backed up to the transport */ private boolean isEligibleForNoDataCall(PackageInfo packageInfo) { - return AppBackupUtils.appIsKeyValueOnly(packageInfo) - && AppBackupUtils.appIsRunningAndEligibleForBackupWithTransport(mTransportClient, - packageInfo.packageName, mPackageManager, mUserId); + return mBackupEligibilityRules.appIsKeyValueOnly(packageInfo) + && mBackupEligibilityRules.appIsRunningAndEligibleForBackupWithTransport( + mTransportClient, packageInfo.packageName); } /** Send the "no data changed" message to a transport for a specific package */ @@ -642,7 +647,8 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { mReporter.getObserver(), mReporter.getMonitor(), mTaskFinishedListener, - mUserInitiated); + mUserInitiated, + mBackupEligibilityRules); } private void backupPm() throws TaskException { @@ -704,15 +710,15 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { throw AgentException.permanent(e); } ApplicationInfo applicationInfo = packageInfo.applicationInfo; - if (!AppBackupUtils.appIsEligibleForBackup(applicationInfo, mUserId)) { + if (!mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo)) { mReporter.onPackageNotEligibleForBackup(packageName); throw AgentException.permanent(); } - if (AppBackupUtils.appGetsFullBackup(packageInfo)) { + if (mBackupEligibilityRules.appGetsFullBackup(packageInfo)) { mReporter.onPackageEligibleForFullBackup(packageName); throw AgentException.permanent(); } - if (AppBackupUtils.appIsStopped(applicationInfo)) { + if (mBackupEligibilityRules.appIsStopped(applicationInfo)) { mReporter.onPackageStopped(packageName); throw AgentException.permanent(); } @@ -843,7 +849,7 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { /** Same as {@link #extractAgentData(PackageInfo)}, but only for PM package. */ private void extractPmAgentData(PackageInfo packageInfo) throws AgentException, TaskException { Preconditions.checkArgument(packageInfo.packageName.equals(PM_PACKAGE)); - BackupAgent pmAgent = mBackupManagerService.makeMetadataAgent(); + BackupAgent pmAgent = mBackupManagerService.makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); mAgent = IBackupAgent.Stub.asInterface(pmAgent.onBind()); extractAgentData(packageInfo, mAgent); } diff --git a/services/backup/java/com/android/server/backup/params/AdbBackupParams.java b/services/backup/java/com/android/server/backup/params/AdbBackupParams.java index 5c1ba24ffbc2..f08c5fa3919b 100644 --- a/services/backup/java/com/android/server/backup/params/AdbBackupParams.java +++ b/services/backup/java/com/android/server/backup/params/AdbBackupParams.java @@ -18,6 +18,8 @@ package com.android.server.backup.params; import android.os.ParcelFileDescriptor; +import com.android.server.backup.utils.BackupEligibilityRules; + public class AdbBackupParams extends AdbParams { public boolean includeApks; @@ -29,10 +31,12 @@ public class AdbBackupParams extends AdbParams { public boolean doCompress; public boolean includeKeyValue; public String[] packages; + public BackupEligibilityRules backupEligibilityRules; public AdbBackupParams(ParcelFileDescriptor output, boolean saveApks, boolean saveObbs, boolean saveShared, boolean alsoWidgets, boolean doAllApps, boolean doSystem, - boolean compress, boolean doKeyValue, String[] pkgList) { + boolean compress, boolean doKeyValue, String[] pkgList, + BackupEligibilityRules eligibilityRules) { fd = output; includeApks = saveApks; includeObbs = saveObbs; @@ -43,5 +47,6 @@ public class AdbBackupParams extends AdbParams { doCompress = compress; includeKeyValue = doKeyValue; packages = pkgList; + backupEligibilityRules = eligibilityRules; } } diff --git a/services/backup/java/com/android/server/backup/params/BackupParams.java b/services/backup/java/com/android/server/backup/params/BackupParams.java index 514434ec9d39..800257002f01 100644 --- a/services/backup/java/com/android/server/backup/params/BackupParams.java +++ b/services/backup/java/com/android/server/backup/params/BackupParams.java @@ -16,12 +16,12 @@ package com.android.server.backup.params; -import android.app.backup.BackupManager.OperationType; import android.app.backup.IBackupManagerMonitor; import android.app.backup.IBackupObserver; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.transport.TransportClient; +import com.android.server.backup.utils.BackupEligibilityRules; import java.util.ArrayList; @@ -36,12 +36,12 @@ public class BackupParams { public OnTaskFinishedListener listener; public boolean userInitiated; public boolean nonIncrementalBackup; - @OperationType public int operationType; + public BackupEligibilityRules mBackupEligibilityRules; public BackupParams(TransportClient transportClient, String dirName, ArrayList<String> kvPackages, ArrayList<String> fullPackages, IBackupObserver observer, IBackupManagerMonitor monitor, OnTaskFinishedListener listener, boolean userInitiated, - boolean nonIncrementalBackup, int operationType) { + boolean nonIncrementalBackup, BackupEligibilityRules backupEligibilityRules) { this.transportClient = transportClient; this.dirName = dirName; this.kvPackages = kvPackages; @@ -51,6 +51,6 @@ public class BackupParams { this.listener = listener; this.userInitiated = userInitiated; this.nonIncrementalBackup = nonIncrementalBackup; - this.operationType = operationType; + this.mBackupEligibilityRules = backupEligibilityRules; } } diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 12113fea12a4..a7e360403ccc 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -66,7 +66,7 @@ import com.android.server.backup.TransportManager; import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.transport.TransportClient; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import com.android.server.backup.utils.BackupManagerMonitorUtils; import libcore.io.IoUtils; @@ -186,7 +186,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { int pmToken, boolean isFullSystemRestore, @Nullable String[] filterSet, - OnTaskFinishedListener listener) { + OnTaskFinishedListener listener, + BackupEligibilityRules backupEligibilityRules) { this.backupManagerService = backupManagerService; mUserId = backupManagerService.getUserId(); mTransportManager = backupManagerService.getTransportManager(); @@ -218,7 +219,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // We want everything and a pony List<PackageInfo> apps = PackageManagerBackupAgent.getStorableApplications( - backupManagerService.getPackageManager(), mUserId); + backupManagerService.getPackageManager(), mUserId, + backupEligibilityRules); filterSet = packagesToNames(apps); if (DEBUG) { Slog.i(TAG, "Full restore; asking about " + filterSet.length + " apps"); @@ -245,7 +247,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { continue; } - if (AppBackupUtils.appIsEligibleForBackup(info.applicationInfo, mUserId)) { + if (backupEligibilityRules.appIsEligibleForBackup(info.applicationInfo)) { mAcceptSet.add(info); } } catch (NameNotFoundException e) { diff --git a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java b/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java index a616e0e9a1c6..162921528e95 100644 --- a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java +++ b/services/backup/java/com/android/server/backup/utils/BackupEligibilityRules.java @@ -47,12 +47,34 @@ import java.util.Set; /** * Utility methods wrapping operations on ApplicationInfo and PackageInfo. */ -public class AppBackupUtils { +public class BackupEligibilityRules { private static final boolean DEBUG = false; // Whitelist of system packages that are eligible for backup in non-system users. private static final Set<String> systemPackagesWhitelistedForAllUsers = Sets.newArraySet(PACKAGE_MANAGER_SENTINEL, PLATFORM_PACKAGE_NAME); + private final PackageManager mPackageManager; + private final PackageManagerInternal mPackageManagerInternal; + private final int mUserId; + @OperationType private final int mOperationType; + + public static BackupEligibilityRules forBackup(PackageManager packageManager, + PackageManagerInternal packageManagerInternal, + int userId) { + return new BackupEligibilityRules(packageManager, packageManagerInternal, userId, + OperationType.BACKUP); + } + + public BackupEligibilityRules(PackageManager packageManager, + PackageManagerInternal packageManagerInternal, + int userId, + @OperationType int operationType) { + mPackageManager = packageManager; + mPackageManagerInternal = packageManagerInternal; + mUserId = userId; + mOperationType = operationType; + } + /** * Returns whether app is eligible for backup. * @@ -65,32 +87,18 @@ public class AppBackupUtils { * <li>it is the special shared-storage backup package used for 'adb backup' * </ol> */ - public static boolean appIsEligibleForBackup(ApplicationInfo app, int userId) { - return appIsEligibleForBackup( - app, LocalServices.getService(PackageManagerInternal.class), userId, - OperationType.BACKUP); - } - - public static boolean appIsEligibleForBackup(ApplicationInfo app, int userId, - @OperationType int operationType) { - return appIsEligibleForBackup( - app, LocalServices.getService(PackageManagerInternal.class), userId, operationType); - } - @VisibleForTesting - static boolean appIsEligibleForBackup( - ApplicationInfo app, PackageManagerInternal packageManager, int userId, - @OperationType int operationType) { + public boolean appIsEligibleForBackup(ApplicationInfo app) { // 1. their manifest states android:allowBackup="false" boolean appAllowsBackup = (app.flags & ApplicationInfo.FLAG_ALLOW_BACKUP) != 0; - if (!appAllowsBackup && !forceFullBackup(app.uid, operationType)) { + if (!appAllowsBackup && !forceFullBackup(app.uid, mOperationType)) { return false; } // 2. they run as a system-level uid if (UserHandle.isCore(app.uid)) { // and the backup is happening for non-system user on a non-whitelisted package. - if (userId != UserHandle.USER_SYSTEM + if (mUserId != UserHandle.USER_SYSTEM && !systemPackagesWhitelistedForAllUsers.contains(app.packageName)) { return false; } @@ -111,7 +119,7 @@ public class AppBackupUtils { return false; } - return !appIsDisabled(app, packageManager, userId); + return !appIsDisabled(app); } /** @@ -124,18 +132,16 @@ public class AppBackupUtils { * {@link BackupTransport#isAppEligibleForBackup(PackageInfo, boolean)} * </ol> */ - public static boolean appIsRunningAndEligibleForBackupWithTransport( + public boolean appIsRunningAndEligibleForBackupWithTransport( @Nullable TransportClient transportClient, - String packageName, - PackageManager pm, - int userId) { + String packageName) { try { - PackageInfo packageInfo = pm.getPackageInfoAsUser(packageName, - PackageManager.GET_SIGNING_CERTIFICATES, userId); + PackageInfo packageInfo = mPackageManager.getPackageInfoAsUser(packageName, + PackageManager.GET_SIGNING_CERTIFICATES, mUserId); ApplicationInfo applicationInfo = packageInfo.applicationInfo; - if (!appIsEligibleForBackup(applicationInfo, userId) + if (!appIsEligibleForBackup(applicationInfo) || appIsStopped(applicationInfo) - || appIsDisabled(applicationInfo, userId)) { + || appIsDisabled(applicationInfo)) { return false; } if (transportClient != null) { @@ -144,7 +150,7 @@ public class AppBackupUtils { transportClient.connectOrThrow( "AppBackupUtils.appIsRunningAndEligibleForBackupWithTransport"); return transport.isAppEligibleForBackup( - packageInfo, AppBackupUtils.appGetsFullBackup(packageInfo)); + packageInfo, appGetsFullBackup(packageInfo)); } catch (Exception e) { Slog.e(TAG, "Unable to ask about eligibility: " + e.getMessage()); } @@ -157,14 +163,11 @@ public class AppBackupUtils { } /** Avoid backups of 'disabled' apps. */ - static boolean appIsDisabled(ApplicationInfo app, int userId) { - return appIsDisabled(app, LocalServices.getService(PackageManagerInternal.class), userId); - } - @VisibleForTesting - static boolean appIsDisabled( - ApplicationInfo app, PackageManagerInternal packageManager, int userId) { - int enabledSetting = packageManager.getApplicationEnabledState(app.packageName, userId); + boolean appIsDisabled( + ApplicationInfo app) { + int enabledSetting = mPackageManagerInternal.getApplicationEnabledState(app.packageName, + mUserId); switch (enabledSetting) { case PackageManager.COMPONENT_ENABLED_STATE_DISABLED: @@ -190,7 +193,7 @@ public class AppBackupUtils { * <li>The app has just been installed. * </ul> */ - public static boolean appIsStopped(ApplicationInfo app) { + public boolean appIsStopped(ApplicationInfo app) { return ((app.flags & ApplicationInfo.FLAG_STOPPED) != 0); } @@ -198,13 +201,9 @@ public class AppBackupUtils { * Returns whether the app can get full backup. Does *not* check overall backup eligibility * policy! */ - public static boolean appGetsFullBackup(PackageInfo pkg) { - return appGetsFullBackup(pkg, OperationType.BACKUP); - } - @VisibleForTesting - public static boolean appGetsFullBackup(PackageInfo pkg, @OperationType int operationType) { - if (forceFullBackup(pkg.applicationInfo.uid, operationType)) { + public boolean appGetsFullBackup(PackageInfo pkg) { + if (forceFullBackup(pkg.applicationInfo.uid, mOperationType)) { // If this is a migration, all non-system packages get full backup. return true; } @@ -218,12 +217,11 @@ public class AppBackupUtils { return true; } - public static boolean appIgnoresIncludeExcludeRules(ApplicationInfo app, - @OperationType int operationType) { - return forceFullBackup(app.uid, operationType); + public boolean appIgnoresIncludeExcludeRules(ApplicationInfo app) { + return forceFullBackup(app.uid, mOperationType); } - private static boolean forceFullBackup(int appUid, @OperationType int operationType) { + private boolean forceFullBackup(int appUid, @OperationType int operationType) { return operationType == OperationType.MIGRATION && !UserHandle.isCore(appUid); } @@ -232,7 +230,7 @@ public class AppBackupUtils { * Returns whether the app is only capable of doing key/value. We say it's not if it allows full * backup, and it is otherwise. */ - public static boolean appIsKeyValueOnly(PackageInfo pkg) { + public boolean appIsKeyValueOnly(PackageInfo pkg) { return !appGetsFullBackup(pkg); } @@ -254,8 +252,7 @@ public class AppBackupUtils { * * Note that if {@param target} is null we return false. */ - public static boolean signaturesMatch(Signature[] storedSigs, PackageInfo target, - PackageManagerInternal pmi) { + public boolean signaturesMatch(Signature[] storedSigs, PackageInfo target) { if (target == null || target.packageName == null) { return false; } @@ -296,7 +293,7 @@ public class AppBackupUtils { // TODO(b/73988180): address the case that app has declared restoreAnyVersion and is // restoring from higher version to lower after having rotated the key (i.e. higher // version has different sig than lower version that we want to restore to) - return pmi.isDataRestoreSafe(storedSigs[0], target.packageName); + return mPackageManagerInternal.isDataRestoreSafe(storedSigs[0], target.packageName); } else { // the app couldn't have rotated keys, since it was signed with multiple sigs - do // a check to see if we find a match for all stored sigs diff --git a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java index 97bde9c03440..8e8bac435503 100644 --- a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java +++ b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java @@ -159,7 +159,9 @@ public class RestoreUtils { Signature[] sigs = manifestSignatures.get(info.packageName); PackageManagerInternal pmi = LocalServices.getService( PackageManagerInternal.class); - if (AppBackupUtils.signaturesMatch(sigs, pkg, pmi)) { + BackupEligibilityRules eligibilityRules = + BackupEligibilityRules.forBackup(packageManager, pmi, userId); + if (eligibilityRules.signaturesMatch(sigs, pkg)) { // If this is a system-uid app without a declared backup agent, // don't restore any of the file data. if (UserHandle.isCore(pkg.applicationInfo.uid) diff --git a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java index d2d382dfc14d..bf8e9c8512ae 100644 --- a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java +++ b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java @@ -394,7 +394,8 @@ public class TarBackupReader { } RestorePolicy policy = RestorePolicy.IGNORE; - + BackupEligibilityRules eligibilityRules = BackupEligibilityRules.forBackup(packageManager, + pmi, userId); // Okay, got the manifest info we need... try { PackageInfo pkgInfo = packageManager.getPackageInfoAsUser( @@ -413,7 +414,7 @@ public class TarBackupReader { // such packages are signed with the platform cert instead of // the app developer's cert, so they're different on every // device. - if (AppBackupUtils.signaturesMatch(signatures, pkgInfo, pmi)) { + if (eligibilityRules.signaturesMatch(signatures, pkgInfo)) { if ((pkgInfo.applicationInfo.flags & ApplicationInfo.FLAG_RESTORE_ANY_VERSION) != 0) { Slog.i(TAG, "Package has restoreAnyVersion; taking data"); diff --git a/services/core/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java index 028d41234dd0..886bfb8f4736 100644 --- a/services/core/java/com/android/server/DropBoxManagerService.java +++ b/services/core/java/com/android/server/DropBoxManagerService.java @@ -16,6 +16,7 @@ package com.android.server; +import android.annotation.Nullable; import android.app.ActivityManager; import android.app.AppOpsManager; import android.content.BroadcastReceiver; @@ -159,7 +160,14 @@ public final class DropBoxManagerService extends SystemService { @Override public DropBoxManager.Entry getNextEntry(String tag, long millis, String callingPackage) { - return DropBoxManagerService.this.getNextEntry(tag, millis, callingPackage); + return getNextEntryWithAttribution(tag, millis, callingPackage, null); + } + + @Override + public DropBoxManager.Entry getNextEntryWithAttribution(String tag, long millis, + String callingPackage, String callingAttributionTag) { + return DropBoxManagerService.this.getNextEntry(tag, millis, callingPackage, + callingAttributionTag); } @Override @@ -470,7 +478,8 @@ public final class DropBoxManagerService extends SystemService { } } - private boolean checkPermission(int callingUid, String callingPackage) { + private boolean checkPermission(int callingUid, String callingPackage, + @Nullable String callingAttributionTag) { // If callers have this permission, then we don't need to check // USAGE_STATS, because they are part of the system and have agreed to // check USAGE_STATS before passing the data along. @@ -484,8 +493,9 @@ public final class DropBoxManagerService extends SystemService { android.Manifest.permission.READ_LOGS, TAG); // Callers also need the ability to read usage statistics - switch (getContext().getSystemService(AppOpsManager.class) - .noteOp(AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage)) { + switch (getContext().getSystemService(AppOpsManager.class).noteOp( + AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage, callingAttributionTag, + null)) { case AppOpsManager.MODE_ALLOWED: return true; case AppOpsManager.MODE_DEFAULT: @@ -498,8 +508,8 @@ public final class DropBoxManagerService extends SystemService { } public synchronized DropBoxManager.Entry getNextEntry(String tag, long millis, - String callingPackage) { - if (!checkPermission(Binder.getCallingUid(), callingPackage)) { + String callingPackage, @Nullable String callingAttributionTag) { + if (!checkPermission(Binder.getCallingUid(), callingPackage, callingAttributionTag)) { return null; } diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index de96aaa1d940..7f6dc14f3793 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -127,6 +127,12 @@ public class GestureLauncherService extends SystemService { * Whether camera double tap power button gesture is currently enabled; */ private boolean mCameraDoubleTapPowerEnabled; + + /** + * Whether panic button gesture is currently enabled + */ + private boolean mPanicButtonGestureEnabled; + private long mLastPowerDown; private int mPowerButtonConsecutiveTaps; @@ -141,10 +147,12 @@ public class GestureLauncherService extends SystemService { mMetricsLogger = metricsLogger; } + @Override public void onStart() { LocalServices.addService(GestureLauncherService.class, this); } + @Override public void onBootPhase(int phase) { if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) { Resources resources = mContext.getResources(); @@ -160,6 +168,7 @@ public class GestureLauncherService extends SystemService { "GestureLauncherService"); updateCameraRegistered(); updateCameraDoubleTapPowerEnabled(); + updatePanicButtonGestureEnabled(); mUserId = ActivityManager.getCurrentUser(); mContext.registerReceiver(mUserReceiver, new IntentFilter(Intent.ACTION_USER_SWITCHED)); @@ -177,6 +186,9 @@ public class GestureLauncherService extends SystemService { mContext.getContentResolver().registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED), false, mSettingObserver, mUserId); + mContext.getContentResolver().registerContentObserver( + Settings.Secure.getUriFor(Settings.Secure.PANIC_GESTURE_ENABLED), + false, mSettingObserver, mUserId); } private void updateCameraRegistered() { @@ -202,6 +214,14 @@ public class GestureLauncherService extends SystemService { } } + @VisibleForTesting + void updatePanicButtonGestureEnabled() { + boolean enabled = isPanicButtonGestureEnabled(mContext, mUserId); + synchronized (this) { + mPanicButtonGestureEnabled = enabled; + } + } + private void unregisterCameraLaunchGesture() { if (mCameraLaunchRegistered) { mCameraLaunchRegistered = false; @@ -327,6 +347,15 @@ public class GestureLauncherService extends SystemService { } /** + * Whether to enable panic button gesture. + */ + public static boolean isPanicButtonGestureEnabled(Context context, int userId) { + return isCameraLaunchEnabled(context.getResources()) + && (Settings.Secure.getIntForUser(context.getContentResolver(), + Settings.Secure.PANIC_GESTURE_ENABLED, 0, userId) != 0); + } + + /** * Whether to enable the camera launch gesture. */ public static boolean isCameraLaunchEnabled(Resources resources) { @@ -445,6 +474,7 @@ public class GestureLauncherService extends SystemService { registerContentObservers(); updateCameraRegistered(); updateCameraDoubleTapPowerEnabled(); + updatePanicButtonGestureEnabled(); } } }; @@ -454,6 +484,7 @@ public class GestureLauncherService extends SystemService { if (userId == mUserId) { updateCameraRegistered(); updateCameraDoubleTapPowerEnabled(); + updatePanicButtonGestureEnabled(); } } }; diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index fd7abfa65c86..1689656479a5 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -23,6 +23,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; import android.annotation.Nullable; import android.content.Context; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.VersionedPackage; import android.net.ConnectivityModuleConnector; @@ -306,6 +307,8 @@ public class PackageWatchdog { MonitoredPackage pkg = newMonitoredPackage(packageNames.get(i), durationMs, false); if (pkg != null) { packages.add(pkg); + } else { + Slog.w(TAG, "Failed to create MonitoredPackage for pkg=" + packageNames.get(i)); } } @@ -861,6 +864,25 @@ public class PackageWatchdog { }); } + /** + * Gets PackageInfo for the given package. Matches any user and apex. + * + * @throws PackageManager.NameNotFoundException if no such package is installed. + */ + private PackageInfo getPackageInfo(String packageName) + throws PackageManager.NameNotFoundException { + PackageManager pm = mContext.getPackageManager(); + try { + // The MATCH_ANY_USER flag doesn't mix well with the MATCH_APEX + // flag, so make two separate attempts to get the package info. + // We don't need both flags at the same time because we assume + // apex files are always installed for all users. + return pm.getPackageInfo(packageName, PackageManager.MATCH_ANY_USER); + } catch (PackageManager.NameNotFoundException e) { + return pm.getPackageInfo(packageName, PackageManager.MATCH_APEX); + } + } + @Nullable private VersionedPackage getVersionedPackage(String packageName) { final PackageManager pm = mContext.getPackageManager(); @@ -868,8 +890,7 @@ public class PackageWatchdog { return null; } try { - final long versionCode = pm.getPackageInfo( - packageName, 0 /* flags */).getLongVersionCode(); + final long versionCode = getPackageInfo(packageName).getLongVersionCode(); return new VersionedPackage(packageName, versionCode); } catch (PackageManager.NameNotFoundException e) { return null; diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING index 1cb7c4d18326..dd485fe3342f 100644 --- a/services/core/java/com/android/server/TEST_MAPPING +++ b/services/core/java/com/android/server/TEST_MAPPING @@ -25,6 +25,21 @@ { "name": "CtsScopedStorageHostTest", "file_patterns": ["StorageManagerService\\.java"] + }, + { + "name": "FrameworksMockingServicesTests", + "file_patterns": ["AppStateTracker\\.java"], + "options": [ + { + "include-filter": "com.android.server.AppStateTrackerTest" + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] } ] } diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 49676ded1d4e..1815dac4c3a8 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.hidl.manager.V1_0.IServiceManager; import android.os.Binder; -import android.os.Build; import android.os.Debug; import android.os.Handler; import android.os.IPowerManager; @@ -32,10 +31,6 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; -import android.system.ErrnoException; -import android.system.Os; -import android.system.OsConstants; -import android.system.StructRlimit; import android.util.EventLog; import android.util.Log; import android.util.Slog; @@ -51,13 +46,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -143,7 +133,6 @@ public class Watchdog { private IActivityController mController; private boolean mAllowRestart = true; - private final OpenFdMonitor mOpenFdMonitor; private final List<Integer> mInterestingJavaPids = new ArrayList<>(); /** @@ -349,8 +338,6 @@ public class Watchdog { // Initialize monitor for Binder threads. addMonitor(new BinderThreadMonitor()); - mOpenFdMonitor = OpenFdMonitor.create(); - mInterestingJavaPids.add(Process.myPid()); // See the notes on DEFAULT_TIMEOUT. @@ -602,40 +589,30 @@ public class Watchdog { timeout = CHECK_INTERVAL - (SystemClock.uptimeMillis() - start); } - boolean fdLimitTriggered = false; - if (mOpenFdMonitor != null) { - fdLimitTriggered = mOpenFdMonitor.monitor(); - } - - if (!fdLimitTriggered) { - final int waitState = evaluateCheckerCompletionLocked(); - if (waitState == COMPLETED) { - // The monitors have returned; reset - waitedHalf = false; - continue; - } else if (waitState == WAITING) { - // still waiting but within their configured intervals; back off and recheck - continue; - } else if (waitState == WAITED_HALF) { - if (!waitedHalf) { - Slog.i(TAG, "WAITED_HALF"); - // We've waited half the deadlock-detection interval. Pull a stack - // trace and wait another half. - ArrayList<Integer> pids = new ArrayList<>(mInterestingJavaPids); - ActivityManagerService.dumpStackTraces(pids, null, null, - getInterestingNativePids(), null); - waitedHalf = true; - } - continue; + final int waitState = evaluateCheckerCompletionLocked(); + if (waitState == COMPLETED) { + // The monitors have returned; reset + waitedHalf = false; + continue; + } else if (waitState == WAITING) { + // still waiting but within their configured intervals; back off and recheck + continue; + } else if (waitState == WAITED_HALF) { + if (!waitedHalf) { + Slog.i(TAG, "WAITED_HALF"); + // We've waited half the deadlock-detection interval. Pull a stack + // trace and wait another half. + ArrayList<Integer> pids = new ArrayList<>(mInterestingJavaPids); + ActivityManagerService.dumpStackTraces(pids, null, null, + getInterestingNativePids(), null); + waitedHalf = true; } - - // something is overdue! - blockedCheckers = getBlockedCheckersLocked(); - subject = describeCheckersLocked(blockedCheckers); - } else { - blockedCheckers = Collections.emptyList(); - subject = "Open FD high water mark reached"; + continue; } + + // something is overdue! + blockedCheckers = getBlockedCheckersLocked(); + subject = describeCheckersLocked(blockedCheckers); allowRestart = mAllowRestart; } @@ -738,94 +715,4 @@ public class Watchdog { Slog.w(TAG, "Failed to write to /proc/sysrq-trigger", e); } } - - public static final class OpenFdMonitor { - /** - * Number of FDs below the soft limit that we trigger a runtime restart at. This was - * chosen arbitrarily, but will need to be at least 6 in order to have a sufficient number - * of FDs in reserve to complete a dump. - */ - private static final int FD_HIGH_WATER_MARK = 12; - - private final File mDumpDir; - private final File mFdHighWaterMark; - - public static OpenFdMonitor create() { - // Only run the FD monitor on debuggable builds (such as userdebug and eng builds). - if (!Build.IS_DEBUGGABLE) { - return null; - } - - final StructRlimit rlimit; - try { - rlimit = android.system.Os.getrlimit(OsConstants.RLIMIT_NOFILE); - } catch (ErrnoException errno) { - Slog.w(TAG, "Error thrown from getrlimit(RLIMIT_NOFILE)", errno); - return null; - } - - // The assumption we're making here is that FD numbers are allocated (more or less) - // sequentially, which is currently (and historically) true since open is currently - // specified to always return the lowest-numbered non-open file descriptor for the - // current process. - // - // We do this to avoid having to enumerate the contents of /proc/self/fd in order to - // count the number of descriptors open in the process. - final File fdThreshold = new File("/proc/self/fd/" + (rlimit.rlim_cur - FD_HIGH_WATER_MARK)); - return new OpenFdMonitor(new File("/data/anr"), fdThreshold); - } - - OpenFdMonitor(File dumpDir, File fdThreshold) { - mDumpDir = dumpDir; - mFdHighWaterMark = fdThreshold; - } - - /** - * Dumps open file descriptors and their full paths to a temporary file in {@code mDumpDir}. - */ - private void dumpOpenDescriptors() { - // We cannot exec lsof to get more info about open file descriptors because a newly - // forked process will not have the permissions to readlink. Instead list all open - // descriptors from /proc/pid/fd and resolve them. - List<String> dumpInfo = new ArrayList<>(); - String fdDirPath = String.format("/proc/%d/fd/", Process.myPid()); - File[] fds = new File(fdDirPath).listFiles(); - if (fds == null) { - dumpInfo.add("Unable to list " + fdDirPath); - } else { - for (File f : fds) { - String fdSymLink = f.getAbsolutePath(); - String resolvedPath = ""; - try { - resolvedPath = Os.readlink(fdSymLink); - } catch (ErrnoException ex) { - resolvedPath = ex.getMessage(); - } - dumpInfo.add(fdSymLink + "\t" + resolvedPath); - } - } - - // Dump the fds & paths to a temp file. - try { - File dumpFile = File.createTempFile("anr_fd_", "", mDumpDir); - Path out = Paths.get(dumpFile.getAbsolutePath()); - Files.write(out, dumpInfo, StandardCharsets.UTF_8); - } catch (IOException ex) { - Slog.w(TAG, "Unable to write open descriptors to file: " + ex); - } - } - - /** - * @return {@code true} if the high water mark was breached and a dump was written, - * {@code false} otherwise. - */ - public boolean monitor() { - if (mFdHighWaterMark.exists()) { - dumpOpenDescriptors(); - return true; - } - - return false; - } - } } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 56953708e383..3f867f656c24 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -18,7 +18,6 @@ package com.android.server.am; import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION; import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST; import static android.os.Process.NFC_UID; import static android.os.Process.ROOT_UID; @@ -1361,13 +1360,12 @@ public final class ActiveServices { + String.format("0x%08X", manifestType) + " in service element of manifest file"); } - if ((foregroundServiceType & FOREGROUND_SERVICE_TYPE_LOCATION) != 0 - && !r.mAllowWhileInUsePermissionInFgs) { - // If the foreground service is not started from TOP process, do not allow it to - // have location capability, this prevents BG started FGS to have while-in-use - // location permission. + // If the foreground service is not started from TOP process, do not allow it to + // have while-in-use location/camera/microphone access. + if (!r.mAllowWhileInUsePermissionInFgs) { Slog.w(TAG, - "BG started FGS can not have location capability: service " + "Foreground service started from background can not have " + + "location/camera/microphone access: service " + r.shortInstanceName); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index fa18ccb53408..57250d52b2ab 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4900,7 +4900,13 @@ public class ActivityManagerService extends IActivityManager.Stub mAppErrors.resetProcessCrashTimeLocked(packageName == null, appId, userId); } - boolean didSomething = mProcessList.killPackageProcessesLocked(packageName, appId, userId, + // Notify first that the package is stopped, so its process won't be restarted unexpectedly + // if there is an activity of the package without attached process becomes visible when + // killing its other processes with visible activities. + boolean didSomething = + mAtmInternal.onForceStopPackage(packageName, doit, evenPersistent, userId); + + didSomething |= mProcessList.killPackageProcessesLocked(packageName, appId, userId, ProcessList.INVALID_ADJ, callerWillRestart, false /* allowRestart */, doit, evenPersistent, true /* setRemoved */, packageName == null ? ApplicationExitInfo.REASON_USER_STOPPED @@ -4909,9 +4915,6 @@ public class ActivityManagerService extends IActivityManager.Stub (packageName == null ? ("stop user " + userId) : ("stop " + packageName)) + " due to " + reason); - didSomething |= - mAtmInternal.onForceStopPackage(packageName, doit, evenPersistent, userId); - if (mServices.bringDownDisabledPackageServicesLocked( packageName, null /* filterByClasses */, userId, evenPersistent, doit)) { if (!doit) { diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java index 02fb34e73f7f..374c215fc6d0 100644 --- a/services/core/java/com/android/server/am/AppExitInfoTracker.java +++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java @@ -522,7 +522,7 @@ public final class AppExitInfoTracker { AppExitInfoContainer container = records.get(filterUid); if (container != null) { mTmpInfoList.clear(); - results.addAll(container.toListLocked(mTmpInfoList, filterPid)); + list.addAll(container.toListLocked(mTmpInfoList, filterPid)); } return AppExitInfoTracker.FOREACH_ACTION_NONE; }); diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index a2eea1348d5c..1fa62c6c40ba 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -604,7 +604,7 @@ public final class BroadcastQueue { } private void deliverToRegisteredReceiverLocked(BroadcastRecord r, - BroadcastFilter filter, boolean ordered, int index) { + BroadcastFilter filter, boolean ordered, int index, boolean skipOomAdj) { boolean skip = false; if (!mService.validateAssociationAllowedLocked(r.callerPackage, r.callingUid, filter.packageName, filter.owningUid)) { @@ -788,8 +788,10 @@ public final class BroadcastQueue { // are already core system stuff so don't matter for this. r.curApp = filter.receiverList.app; filter.receiverList.app.curReceivers.add(r); - mService.updateOomAdjLocked(r.curApp, true, - OomAdjuster.OOM_ADJ_REASON_START_RECEIVER); + if (!skipOomAdj) { + mService.updateOomAdjLocked(r.curApp, true, + OomAdjuster.OOM_ADJ_REASON_START_RECEIVER); + } } } try { @@ -985,7 +987,8 @@ public final class BroadcastQueue { if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Delivering non-ordered on [" + mQueueName + "] to registered " + target + ": " + r); - deliverToRegisteredReceiverLocked(r, (BroadcastFilter)target, false, i); + deliverToRegisteredReceiverLocked(r, + (BroadcastFilter) target, false, i, skipOomAdj); } addBroadcastToHistoryLocked(r); if (DEBUG_BROADCAST_LIGHT) Slog.v(TAG_BROADCAST, "Done with parallel broadcast [" @@ -1037,7 +1040,7 @@ public final class BroadcastQueue { // No more broadcasts are deliverable right now, so all done! mDispatcher.scheduleDeferralCheckLocked(false); mService.scheduleAppGcsLocked(); - if (looped) { + if (looped && !skipOomAdj) { // If we had finished the last ordered broadcast, then // make sure all processes have correct oom and sched // adjustments. @@ -1283,7 +1286,7 @@ public final class BroadcastQueue { "Delivering ordered [" + mQueueName + "] to registered " + filter + ": " + r); - deliverToRegisteredReceiverLocked(r, filter, r.ordered, recIdx); + deliverToRegisteredReceiverLocked(r, filter, r.ordered, recIdx, skipOomAdj); if (r.receiver == null || !r.ordered) { // The receiver has already finished, so schedule to // process the next one. diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index b3231909e4b7..433317b038b3 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -6020,7 +6020,7 @@ public class AppOpsService extends IAppOpsService.Stub { private void resampleAppOpForPackageLocked(@NonNull String packageName, boolean pickOp) { mMessagesCollectedCount = 0.0f; mSampledAppOpCode = pickOp ? ThreadLocalRandom.current().nextInt(_NUM_OP) : OP_NONE; - mAcceptableLeftDistance = _NUM_OP; + mAcceptableLeftDistance = _NUM_OP - 1; mSampledPackage = packageName; } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index c8e4ee02e603..2d77d6f8add8 100755 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -283,6 +283,7 @@ public class AudioService extends IAudioService.Stub private static final int MSG_HDMI_VOLUME_CHECK = 28; private static final int MSG_PLAYBACK_CONFIG_CHANGE = 29; private static final int MSG_BROADCAST_MICROPHONE_MUTE = 30; + private static final int MSG_CHECK_MODE_FOR_UID = 31; // start of messages handled under wakelock // these messages can only be queued, i.e. sent with queueMsgUnderWakeLock(), // and not with sendMsg(..., ..., SENDMSG_QUEUE, ...) @@ -2956,11 +2957,10 @@ public class AudioService extends IAudioService.Stub // Don't show volume UI when: // - Hdmi-CEC system audio mode is on and we are a TV panel - // - CEC volume control enabled on a set-top box private int updateFlagsForTvPlatform(int flags) { synchronized (mHdmiClientLock) { - if ((mHdmiTvClient != null && mHdmiSystemAudioSupported && mHdmiCecVolumeControlEnabled) - || (mHdmiPlaybackClient != null && mHdmiCecVolumeControlEnabled)) { + if (mHdmiTvClient != null && mHdmiSystemAudioSupported + && mHdmiCecVolumeControlEnabled) { flags &= ~AudioManager.FLAG_SHOW_UI; } } @@ -3684,12 +3684,14 @@ public class AudioService extends IAudioService.Stub private final IBinder mCb; // To be notified of client's death private final int mPid; private final int mUid; + private String mPackage; private int mMode = AudioSystem.MODE_NORMAL; // Current mode set by this client - SetModeDeathHandler(IBinder cb, int pid, int uid) { + SetModeDeathHandler(IBinder cb, int pid, int uid, String caller) { mCb = cb; mPid = pid; mUid = uid; + mPackage = caller; } public void binderDied() { @@ -3727,6 +3729,10 @@ public class AudioService extends IAudioService.Stub public int getUid() { return mUid; } + + public String getPackage() { + return mPackage; + } } /** @see AudioManager#setMode(int) */ @@ -3808,6 +3814,9 @@ public class AudioService extends IAudioService.Stub hdlr = h; // Remove from client list so that it is re-inserted at top of list iter.remove(); + if (hdlr.getMode() == AudioSystem.MODE_IN_COMMUNICATION) { + mAudioHandler.removeEqualMessages(MSG_CHECK_MODE_FOR_UID, hdlr); + } try { hdlr.getBinder().unlinkToDeath(hdlr, 0); if (cb != hdlr.getBinder()){ @@ -3838,7 +3847,7 @@ public class AudioService extends IAudioService.Stub } } else { if (hdlr == null) { - hdlr = new SetModeDeathHandler(cb, pid, uid); + hdlr = new SetModeDeathHandler(cb, pid, uid, caller); } // Register for client death notification try { @@ -3885,6 +3894,7 @@ public class AudioService extends IAudioService.Stub // Note: newModeOwnerPid is always 0 when actualMode is MODE_NORMAL mModeLogger.log( new PhoneStateEvent(caller, pid, mode, newModeOwnerPid, actualMode)); + int streamType = getActiveStreamType(AudioManager.USE_DEFAULT_STREAM_TYPE); int device = getDeviceForStream(streamType); int index = mStreamStates[mStreamVolumeAlias[streamType]].getIndex(device); @@ -3895,6 +3905,16 @@ public class AudioService extends IAudioService.Stub // change of mode may require volume to be re-applied on some devices updateAbsVolumeMultiModeDevices(oldMode, actualMode); + + if (actualMode == AudioSystem.MODE_IN_COMMUNICATION) { + sendMsg(mAudioHandler, + MSG_CHECK_MODE_FOR_UID, + SENDMSG_QUEUE, + 0, + 0, + hdlr, + CHECK_MODE_FOR_UID_PERIOD_MS); + } } return newModeOwnerPid; } @@ -6403,6 +6423,35 @@ public class AudioService extends IAudioService.Stub case MSG_BROADCAST_MICROPHONE_MUTE: mSystemServer.sendMicrophoneMuteChangedIntent(); break; + + case MSG_CHECK_MODE_FOR_UID: + synchronized (mDeviceBroker.mSetModeLock) { + if (msg.obj == null) { + break; + } + // If the app corresponding to this mode death handler object is not + // capturing or playing audio anymore after 3 seconds, remove it + // from the stack. Otherwise, check again in 3 seconds. + SetModeDeathHandler h = (SetModeDeathHandler) msg.obj; + if (mSetModeDeathHandlers.indexOf(h) < 0) { + break; + } + if (mRecordMonitor.isRecordingActiveForUid(h.getUid()) + || mPlaybackMonitor.isPlaybackActiveForUid(h.getUid())) { + sendMsg(mAudioHandler, + MSG_CHECK_MODE_FOR_UID, + SENDMSG_QUEUE, + 0, + 0, + h, + CHECK_MODE_FOR_UID_PERIOD_MS); + break; + } + // For now just log the fact that an app is hogging the audio mode. + // TODO(b/160260850): remove abusive app from audio mode stack. + mModeLogger.log(new PhoneStateEvent(h.getPackage(), h.getPid())); + } + break; } } } @@ -7046,6 +7095,8 @@ public class AudioService extends IAudioService.Stub private static final int UNSAFE_VOLUME_MUSIC_ACTIVE_MS_MAX = (20 * 3600 * 1000); // 20 hours private static final int MUSIC_ACTIVE_POLL_PERIOD_MS = 60000; // 1 minute polling interval private static final int SAFE_VOLUME_CONFIGURE_TIMEOUT_MS = 30000; // 30s after boot completed + // check playback or record activity every 3 seconds for UIDs owning mode IN_COMMUNICATION + private static final int CHECK_MODE_FOR_UID_PERIOD_MS = 3000; private int safeMediaVolumeIndex(int device) { if (!mSafeMediaVolumeDevices.contains(device)) { diff --git a/services/core/java/com/android/server/audio/AudioServiceEvents.java b/services/core/java/com/android/server/audio/AudioServiceEvents.java index f3ff02f3aedc..0eb5a5d1fb48 100644 --- a/services/core/java/com/android/server/audio/AudioServiceEvents.java +++ b/services/core/java/com/android/server/audio/AudioServiceEvents.java @@ -27,28 +27,82 @@ import com.android.server.audio.AudioDeviceInventory.WiredDeviceConnectionState; public class AudioServiceEvents { final static class PhoneStateEvent extends AudioEventLogger.Event { + static final int MODE_SET = 0; + static final int MODE_IN_COMMUNICATION_TIMEOUT = 1; + + final int mOp; final String mPackage; final int mOwnerPid; final int mRequesterPid; final int mRequestedMode; final int mActualMode; + /** used for MODE_SET */ PhoneStateEvent(String callingPackage, int requesterPid, int requestedMode, int ownerPid, int actualMode) { + mOp = MODE_SET; mPackage = callingPackage; mRequesterPid = requesterPid; mRequestedMode = requestedMode; mOwnerPid = ownerPid; mActualMode = actualMode; + logMetricEvent(); + } + + /** used for MODE_IN_COMMUNICATION_TIMEOUT */ + PhoneStateEvent(String callingPackage, int ownerPid) { + mOp = MODE_IN_COMMUNICATION_TIMEOUT; + mPackage = callingPackage; + mOwnerPid = ownerPid; + mRequesterPid = 0; + mRequestedMode = 0; + mActualMode = 0; + logMetricEvent(); } @Override public String eventToString() { - return new StringBuilder("setMode(").append(AudioSystem.modeToString(mRequestedMode)) - .append(") from package=").append(mPackage) - .append(" pid=").append(mRequesterPid) - .append(" selected mode=").append(AudioSystem.modeToString(mActualMode)) - .append(" by pid=").append(mOwnerPid).toString(); + switch (mOp) { + case MODE_SET: + return new StringBuilder("setMode(") + .append(AudioSystem.modeToString(mRequestedMode)) + .append(") from package=").append(mPackage) + .append(" pid=").append(mRequesterPid) + .append(" selected mode=") + .append(AudioSystem.modeToString(mActualMode)) + .append(" by pid=").append(mOwnerPid).toString(); + case MODE_IN_COMMUNICATION_TIMEOUT: + return new StringBuilder("mode IN COMMUNICATION timeout") + .append(" for package=").append(mPackage) + .append(" pid=").append(mOwnerPid).toString(); + default: return new StringBuilder("FIXME invalid op:").append(mOp).toString(); + } + } + + /** + * Audio Analytics unique Id. + */ + private static final String mMetricsId = MediaMetrics.Name.AUDIO_MODE; + + private void logMetricEvent() { + switch (mOp) { + case MODE_SET: + new MediaMetrics.Item(mMetricsId) + .set(MediaMetrics.Property.EVENT, "set") + .set(MediaMetrics.Property.REQUESTED_MODE, + AudioSystem.modeToString(mRequestedMode)) + .set(MediaMetrics.Property.MODE, AudioSystem.modeToString(mActualMode)) + .set(MediaMetrics.Property.CALLING_PACKAGE, mPackage) + .record(); + return; + case MODE_IN_COMMUNICATION_TIMEOUT: + new MediaMetrics.Item(mMetricsId) + .set(MediaMetrics.Property.EVENT, "inCommunicationTimeout") + .set(MediaMetrics.Property.CALLING_PACKAGE, mPackage) + .record(); + return; + default: return; + } } } diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 98f409ea98e7..a5778836aa6e 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -366,6 +366,23 @@ public final class PlaybackActivityMonitor releasePlayer(piid, 0); } + /** + * Returns true if a player belonging to the app with given uid is active. + * + * @param uid the app uid + * @return true if a player is active, false otherwise + */ + public boolean isPlaybackActiveForUid(int uid) { + synchronized (mPlayerLock) { + for (AudioPlaybackConfiguration apc : mPlayers.values()) { + if (apc.isActive() && apc.getClientUid() == uid) { + return true; + } + } + } + return false; + } + protected void dump(PrintWriter pw) { // players pw.println("\nPlaybackActivityMonitor dump time: " diff --git a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java index 32c6cc32a78d..ea0107ecfd23 100644 --- a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java +++ b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java @@ -215,6 +215,25 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin dispatchCallbacks(updateSnapshot(AudioManager.RECORD_CONFIG_EVENT_RELEASE, riid, null)); } + /** + * Returns true if a recorder belonging to the app with given uid is active. + * + * @param uid the app uid + * @return true if a recorder is active, false otherwise + */ + public boolean isRecordingActiveForUid(int uid) { + synchronized (mRecordStates) { + for (RecordingState state : mRecordStates) { + // Note: isActiveConfiguration() == true => state.getConfig() != null + if (state.isActiveConfiguration() + && state.getConfig().getClientUid() == uid) { + return true; + } + } + } + return false; + } + private void dispatchCallbacks(List<AudioRecordingConfiguration> configs) { if (configs == null) { // null means "no changes" return; diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java index b8c639ceb8ba..a47904c40cc3 100644 --- a/services/core/java/com/android/server/biometrics/AuthService.java +++ b/services/core/java/com/android/server/biometrics/AuthService.java @@ -28,6 +28,7 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRIN import static android.hardware.biometrics.BiometricAuthenticator.TYPE_IRIS; import static android.hardware.biometrics.BiometricManager.Authenticators; +import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.biometrics.IAuthService; @@ -127,6 +128,11 @@ public class AuthService extends SystemService { return IIrisService.Stub.asInterface( ServiceManager.getService(Context.IRIS_SERVICE)); } + + @VisibleForTesting + public AppOpsManager getAppOps(Context context) { + return context.getSystemService(AppOpsManager.class); + } } private final class AuthServiceImpl extends IAuthService.Stub { @@ -137,6 +143,8 @@ public class AuthService extends SystemService { // Only allow internal clients to authenticate with a different userId. final int callingUserId = UserHandle.getCallingUserId(); + final int callingUid = Binder.getCallingUid(); + final int callingPid = Binder.getCallingPid(); if (userId == callingUserId) { checkPermission(); } else { @@ -145,6 +153,16 @@ public class AuthService extends SystemService { checkInternalPermission(); } + if (!checkAppOps(callingUid, opPackageName, "authenticate()")) { + Slog.e(TAG, "Denied by app ops: " + opPackageName); + return; + } + + if (!Utils.isForeground(callingUid, callingPid)) { + Slog.e(TAG, "Caller is not foreground: " + opPackageName); + return; + } + if (token == null || receiver == null || opPackageName == null || promptInfo == null) { Slog.e(TAG, "Unable to authenticate, one or more null arguments"); return; @@ -155,8 +173,6 @@ public class AuthService extends SystemService { checkInternalPermission(); } - final int callingUid = Binder.getCallingUid(); - final int callingPid = Binder.getCallingPid(); final long identity = Binder.clearCallingIdentity(); try { mBiometricService.authenticate( @@ -370,4 +386,9 @@ public class AuthService extends SystemService { "Must have USE_BIOMETRIC permission"); } } + + private boolean checkAppOps(int uid, String opPackageName, String reason) { + return mInjector.getAppOps(getContext()).noteOp(AppOpsManager.OP_USE_BIOMETRIC, uid, + opPackageName, null /* attributionTag */, reason) == AppOpsManager.MODE_ALLOWED; + } } diff --git a/services/core/java/com/android/server/biometrics/Utils.java b/services/core/java/com/android/server/biometrics/Utils.java index 03ca8fa28a9c..88fd44456ff6 100644 --- a/services/core/java/com/android/server/biometrics/Utils.java +++ b/services/core/java/com/android/server/biometrics/Utils.java @@ -17,8 +17,12 @@ package com.android.server.biometrics; import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; +import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE; import static android.hardware.biometrics.BiometricManager.Authenticators; +import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT; +import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW; +import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; import static com.android.server.biometrics.PreAuthInfo.AUTHENTICATOR_OK; import static com.android.server.biometrics.PreAuthInfo.BIOMETRIC_DISABLED_BY_DEVICE_POLICY; import static com.android.server.biometrics.PreAuthInfo.BIOMETRIC_HARDWARE_NOT_DETECTED; @@ -31,6 +35,7 @@ import static com.android.server.biometrics.PreAuthInfo.BIOMETRIC_NOT_ENROLLED; import static com.android.server.biometrics.PreAuthInfo.BIOMETRIC_NO_HARDWARE; import static com.android.server.biometrics.PreAuthInfo.CREDENTIAL_NOT_ENROLLED; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.content.ComponentName; @@ -53,8 +58,11 @@ import android.provider.Settings; import android.util.Slog; import com.android.internal.R; +import com.android.internal.widget.LockPatternUtils; import com.android.server.biometrics.sensors.ClientMonitor; +import java.util.List; + public class Utils { private static final String TAG = "BiometricUtils"; @@ -401,4 +409,39 @@ public class Utils { public static String getClientName(@Nullable ClientMonitor<?> client) { return client != null ? client.getClass().getSimpleName() : "null"; } + + private static boolean containsFlag(int haystack, int needle) { + return (haystack & needle) != 0; + } + + public static boolean isUserEncryptedOrLockdown(@NonNull LockPatternUtils lpu, int user) { + final int strongAuth = lpu.getStrongAuthForUser(user); + final boolean isEncrypted = containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_BOOT); + final boolean isLockDown = containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW) + || containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + Slog.d(TAG, "isEncrypted: " + isEncrypted + " isLockdown: " + isLockDown); + return isEncrypted || isLockDown; + } + + public static boolean isForeground(int callingUid, int callingPid) { + try { + final List<ActivityManager.RunningAppProcessInfo> procs = + ActivityManager.getService().getRunningAppProcesses(); + if (procs == null) { + Slog.e(TAG, "No running app processes found, defaulting to true"); + return true; + } + + for (int i = 0; i < procs.size(); i++) { + ActivityManager.RunningAppProcessInfo proc = procs.get(i); + if (proc.pid == callingPid && proc.uid == callingUid + && proc.importance <= IMPORTANCE_FOREGROUND_SERVICE) { + return true; + } + } + } catch (RemoteException e) { + Slog.w(TAG, "am.getRunningAppProcesses() failed"); + } + return false; + } } diff --git a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java index f8e8dd979e4d..ab48fdb0fd6e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java @@ -46,13 +46,14 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> implements I private final VibrationEffect mSuccessVibrationEffect; private final VibrationEffect mErrorVibrationEffect; private boolean mShouldSendErrorToClient; + private boolean mAlreadyCancelled; /** * Stops the HAL operation specific to the ClientMonitor subclass. */ protected abstract void stopHalOperation(); - AcquisitionClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon, + public AcquisitionClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon, @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId, @NonNull String owner, int cookie, int sensorId, int statsModality, int statsAction, int statsClient) { @@ -102,6 +103,17 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> implements I } @Override + public void cancel() { + if (mAlreadyCancelled) { + Slog.w(TAG, "Cancel was already requested"); + return; + } + + stopHalOperation(); + mAlreadyCancelled = true; + } + + @Override public void cancelWithoutStarting(@NonNull FinishCallback finishCallback) { final int errorCode = BiometricConstants.BIOMETRIC_ERROR_CANCELED; try { @@ -153,7 +165,7 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> implements I } - final void vibrateSuccess() { + protected final void vibrateSuccess() { Vibrator vibrator = getContext().getSystemService(Vibrator.class); if (vibrator != null) { vibrator.vibrate(mSuccessVibrationEffect, VIBRATION_SONFICATION_ATTRIBUTES); diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java index fdc3def93d06..cb2321f524f6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -35,7 +35,8 @@ import java.util.ArrayList; /** * A class to keep track of the authentication state for a given client. */ -public abstract class AuthenticationClient<T> extends AcquisitionClient<T> { +public abstract class AuthenticationClient<T> extends AcquisitionClient<T> + implements AuthenticationConsumer { private static final String TAG = "Biometrics/AuthenticationClient"; @@ -49,7 +50,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> { protected final long mOperationId; private long mStartTimeMs; - private boolean mAlreadyCancelled; protected boolean mAuthAttempted; @@ -104,6 +104,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> { return mOperationId != 0; } + @Override public void onAuthenticated(BiometricAuthenticator.Identifier identifier, boolean authenticated, ArrayList<Byte> hardwareAuthToken) { super.logOnAuthenticated(getContext(), authenticated, mRequireConfirmation, @@ -241,10 +242,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> { @Override public void cancel() { - if (mAlreadyCancelled) { - Slog.w(TAG, "stopAuthentication: already cancelled!"); - return; - } + super.cancel(); if (mTaskStackListener != null) { try { @@ -253,10 +251,5 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> { Slog.e(TAG, "Could not unregister task stack listener", e); } } - - if (DEBUG) Slog.w(TAG, "Requesting cancel for " + getOwnerString()); - - stopHalOperation(); - mAlreadyCancelled = true; } } diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationConsumer.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationConsumer.java new file mode 100644 index 000000000000..09a577eb2825 --- /dev/null +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationConsumer.java @@ -0,0 +1,29 @@ +/* + * 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.server.biometrics.sensors; + +import android.hardware.biometrics.BiometricAuthenticator; + +import java.util.ArrayList; + +/** + * Interface that clients interested/eligible for authentication events should implement. + */ +public interface AuthenticationConsumer { + void onAuthenticated(BiometricAuthenticator.Identifier identifier, boolean authenticated, + ArrayList<Byte> hardwareAuthToken); +} diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java index 6bdd7834c000..0aeb7abe706e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java +++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java @@ -424,7 +424,7 @@ public class BiometricScheduler { return; } final boolean isAuthenticating = - mCurrentOperation.clientMonitor instanceof AuthenticationClient; + mCurrentOperation.clientMonitor instanceof AuthenticationConsumer; final boolean tokenMatches = mCurrentOperation.clientMonitor.getToken() == token; if (!isAuthenticating || !tokenMatches) { Slog.w(getTag(), "Not cancelling authentication, isEnrolling: " + isAuthenticating diff --git a/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallbackConverter.java b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallbackConverter.java index ad14531a9001..3cef6667b644 100644 --- a/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallbackConverter.java +++ b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallbackConverter.java @@ -101,6 +101,15 @@ public final class ClientMonitorCallbackConverter { // The following only apply to IFingerprintServiceReceiver and IFaceServiceReceiver + public void onDetected(int sensorId, int userId, boolean isStrongBiometric) + throws RemoteException { + if (mFaceServiceReceiver != null) { + mFaceServiceReceiver.onFaceDetected(sensorId, userId, isStrongBiometric); + } else if (mFingerprintServiceReceiver != null) { + mFingerprintServiceReceiver.onFingerprintDetected(sensorId, userId, isStrongBiometric); + } + } + void onEnrollResult(BiometricAuthenticator.Identifier identifier, int remaining) throws RemoteException { if (mFaceServiceReceiver != null) { diff --git a/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java index 163f29ea5184..add5829c1342 100644 --- a/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java @@ -39,7 +39,6 @@ public abstract class EnrollClient<T> extends AcquisitionClient<T> { private final boolean mShouldVibrate; private long mEnrollmentStartTimeMs; - private boolean mAlreadyCancelled; /** * @return true if the user has already enrolled the maximum number of templates. @@ -97,17 +96,6 @@ public abstract class EnrollClient<T> extends AcquisitionClient<T> { startHalOperation(); } - @Override - public void cancel() { - if (mAlreadyCancelled) { - Slog.w(TAG, "stopEnroll: already cancelled!"); - return; - } - - stopHalOperation(); - mAlreadyCancelled = true; - } - /** * Called when we get notification from the biometric's HAL that an error has occurred with the * current operation. diff --git a/services/core/java/com/android/server/biometrics/sensors/PerformanceTracker.java b/services/core/java/com/android/server/biometrics/sensors/PerformanceTracker.java index 9fdba4b6d1bc..42b22b0fb519 100644 --- a/services/core/java/com/android/server/biometrics/sensors/PerformanceTracker.java +++ b/services/core/java/com/android/server/biometrics/sensors/PerformanceTracker.java @@ -65,7 +65,7 @@ public class PerformanceTracker { } } - void incrementAuthForUser(int userId, boolean accepted) { + public void incrementAuthForUser(int userId, boolean accepted) { createUserEntryIfNecessary(userId); if (accepted) { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/Face10.java b/services/core/java/com/android/server/biometrics/sensors/face/Face10.java index c4ea0a8f8fc7..6c57208c1e84 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/Face10.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/Face10.java @@ -29,6 +29,7 @@ import android.hardware.biometrics.BiometricsProtoEnums; import android.hardware.biometrics.face.V1_0.IBiometricsFace; import android.hardware.biometrics.face.V1_0.IBiometricsFaceClientCallback; import android.hardware.face.Face; +import android.hardware.face.FaceSensorProperties; import android.hardware.face.IFaceServiceReceiver; import android.os.Build; import android.os.Handler; @@ -46,6 +47,7 @@ import android.util.Slog; import com.android.internal.util.FrameworkStatsLog; import com.android.server.biometrics.Utils; import com.android.server.biometrics.sensors.AcquisitionClient; +import com.android.server.biometrics.sensors.AuthenticationConsumer; import com.android.server.biometrics.sensors.BiometricScheduler; import com.android.server.biometrics.sensors.ClientMonitor; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -82,6 +84,7 @@ class Face10 implements IHwBinder.DeathRecipient { static final String NOTIFICATION_TAG = "FaceService"; static final int NOTIFICATION_ID = 1; + @NonNull private final FaceSensorProperties mFaceSensorProperties; @NonNull private final Context mContext; @NonNull private final BiometricScheduler mScheduler; @NonNull private final Handler mHandler; @@ -128,17 +131,17 @@ class Face10 implements IHwBinder.DeathRecipient { public void onAuthenticated(long deviceId, int faceId, int userId, ArrayList<Byte> token) { mHandler.post(() -> { final ClientMonitor<?> client = mScheduler.getCurrentClient(); - if (!(client instanceof FaceAuthenticationClient)) { - Slog.e(TAG, "onAuthenticated for non-authentication client: " + if (!(client instanceof AuthenticationConsumer)) { + Slog.e(TAG, "onAuthenticated for non-authentication consumer: " + Utils.getClientName(client)); return; } - final FaceAuthenticationClient authenticationClient = - (FaceAuthenticationClient) client; + final AuthenticationConsumer authenticationConsumer = + (AuthenticationConsumer) client; final boolean authenticated = faceId != 0; final Face face = new Face("", faceId, deviceId); - authenticationClient.onAuthenticated(face, authenticated, token); + authenticationConsumer.onAuthenticated(face, authenticated, token); }); } @@ -266,6 +269,7 @@ class Face10 implements IHwBinder.DeathRecipient { Face10(@NonNull Context context, int sensorId, @NonNull LockoutResetDispatcher lockoutResetDispatcher) { + mFaceSensorProperties = new FaceSensorProperties(sensorId, false /* supportsFaceDetect */); mContext = context; mSensorId = sensorId; mScheduler = new BiometricScheduler(TAG, null /* gestureAvailabilityTracker */); @@ -555,6 +559,10 @@ class Face10 implements IHwBinder.DeathRecipient { return daemon != null; } + @NonNull FaceSensorProperties getFaceSensorProperties() { + return mFaceSensorProperties; + } + List<Face> getEnrolledFaces(int userId) { return FaceUtils.getInstance().getBiometricsForUser(mContext, userId); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java index 1c81fe1b484b..b832a09f8f88 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java @@ -27,6 +27,7 @@ import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.face.Face; import android.hardware.face.IFaceService; import android.hardware.face.IFaceServiceReceiver; +import android.hardware.face.FaceSensorProperties; import android.os.Binder; import android.os.IBinder; import android.os.NativeHandle; @@ -34,6 +35,7 @@ import android.util.Slog; import android.view.Surface; import com.android.internal.util.DumpUtils; +import com.android.internal.widget.LockPatternUtils; import com.android.server.SystemService; import com.android.server.biometrics.Utils; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -42,6 +44,7 @@ import com.android.server.biometrics.sensors.LockoutTracker; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -56,12 +59,27 @@ public class FaceService extends SystemService { private Face10 mFace10; private final LockoutResetDispatcher mLockoutResetDispatcher; + private final LockPatternUtils mLockPatternUtils; /** * Receives the incoming binder calls from FaceManager. */ private final class FaceServiceWrapper extends IFaceService.Stub { @Override // Binder call + public List<FaceSensorProperties> getSensorProperties(String opPackageName) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + final List<FaceSensorProperties> properties = new ArrayList<>(); + + if (mFace10 != null) { + properties.add(mFace10.getFaceSensorProperties()); + } + + Slog.d(TAG, "Retrieved sensor properties for: " + opPackageName + + ", sensors: " + properties.size()); + return properties; + } + + @Override // Binder call public void generateChallenge(IBinder token, IFaceServiceReceiver receiver, String opPackageName) { Utils.checkPermission(getContext(), MANAGE_BIOMETRIC); @@ -102,6 +120,9 @@ public class FaceService extends SystemService { final IFaceServiceReceiver receiver, final String opPackageName) { Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + // TODO(b/152413782): If the sensor supports face detect and the device is encrypted or + // lockdown, something wrong happened. See similar path in FingerprintService. + final boolean restricted = false; // Face APIs are private final int statsClient = Utils.isKeyguard(getContext(), opPackageName) ? BiometricsProtoEnums.CLIENT_KEYGUARD @@ -112,6 +133,25 @@ public class FaceService extends SystemService { } @Override // Binder call + public void detectFace(final IBinder token, final int userId, + final IFaceServiceReceiver receiver, final String opPackageName) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + if (!Utils.isKeyguard(getContext(), opPackageName)) { + Slog.w(TAG, "detectFace called from non-sysui package: " + opPackageName); + return; + } + + if (!Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) { + // If this happens, something in KeyguardUpdateMonitor is wrong. This should only + // ever be invoked when the user is encrypted or lockdown. + Slog.e(TAG, "detectFace invoked when user is not encrypted or lockdown"); + return; + } + + // TODO(b/152413782): Implement this once it's supported in the HAL + } + + @Override // Binder call public void prepareForAuthentication(boolean requireConfirmation, IBinder token, long operationId, int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName, int cookie, int callingUid, int callingPid, @@ -137,6 +177,18 @@ public class FaceService extends SystemService { } @Override // Binder call + public void cancelFaceDetect(final IBinder token, final String opPackageName) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + if (!Utils.isKeyguard(getContext(), opPackageName)) { + Slog.w(TAG, "cancelFaceDetect called from non-sysui package: " + + opPackageName); + return; + } + + // TODO(b/152413782): Implement this once it's supported in the HAL + } + + @Override // Binder call public void cancelAuthenticationFromService(final IBinder token, final String opPackageName, int callingUid, int callingPid, int callingUserId) { Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); @@ -246,6 +298,7 @@ public class FaceService extends SystemService { public FaceService(Context context) { super(context); mLockoutResetDispatcher = new LockoutResetDispatcher(context); + mLockPatternUtils = new LockPatternUtils(context); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/Fingerprint21.java index 9f94c88193ff..dad038626762 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/Fingerprint21.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/Fingerprint21.java @@ -31,6 +31,7 @@ import android.hardware.biometrics.BiometricsProtoEnums; import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint; import android.hardware.biometrics.fingerprint.V2_2.IBiometricsFingerprintClientCallback; import android.hardware.fingerprint.Fingerprint; +import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.IFingerprintServiceReceiver; import android.hardware.fingerprint.IUdfpsOverlayController; import android.os.Handler; @@ -51,6 +52,7 @@ import com.android.server.biometrics.fingerprint.FingerprintUserStatsProto; import com.android.server.biometrics.fingerprint.PerformanceStatsProto; import com.android.server.biometrics.sensors.AcquisitionClient; import com.android.server.biometrics.sensors.AuthenticationClient; +import com.android.server.biometrics.sensors.AuthenticationConsumer; import com.android.server.biometrics.sensors.BiometricScheduler; import com.android.server.biometrics.sensors.ClientMonitor; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -84,7 +86,7 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { private final Context mContext; private final IActivityTaskManager mActivityTaskManager; - private final SensorProperties mSensorProperties; + private final FingerprintSensorProperties mSensorProperties; private final BiometricScheduler mScheduler; private final Handler mHandler; private final LockoutResetDispatcher mLockoutResetDispatcher; @@ -97,19 +99,6 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { @Nullable private IUdfpsOverlayController mUdfpsOverlayController; private int mCurrentUserId = UserHandle.USER_NULL; - /** - * Static properties that never change for a given sensor. - */ - private static final class SensorProperties { - final int sensorId; - final boolean isUdfps; - - SensorProperties(int sensorId, boolean isUdfps) { - this.sensorId = sensorId; - this.isUdfps = isUdfps; - } - } - private final class BiometricTaskStackListener extends TaskStackListener { @Override public void onTaskStackChanged() { @@ -203,17 +192,17 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { ArrayList<Byte> token) { mHandler.post(() -> { final ClientMonitor<?> client = mScheduler.getCurrentClient(); - if (!(client instanceof FingerprintAuthenticationClient)) { - Slog.e(TAG, "onAuthenticated for non-authentication client: " + if (!(client instanceof AuthenticationConsumer)) { + Slog.e(TAG, "onAuthenticated for non-authentication consumer: " + Utils.getClientName(client)); return; } - final FingerprintAuthenticationClient authenticationClient = - (FingerprintAuthenticationClient) client; + final AuthenticationConsumer authenticationConsumer = + (AuthenticationConsumer) client; final boolean authenticated = fingerId != 0; final Fingerprint fp = new Fingerprint("", groupId, fingerId, deviceId); - authenticationClient.onAuthenticated(fp, authenticated, token); + authenticationConsumer.onAuthenticated(fp, authenticated, token); }); } @@ -307,7 +296,11 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { isUdfps = false; } } - mSensorProperties = new SensorProperties(sensorId, isUdfps); + + final @FingerprintSensorProperties.SensorType int sensorType = + isUdfps ? FingerprintSensorProperties.TYPE_UDFPS + : FingerprintSensorProperties.TYPE_REAR; + mSensorProperties = new FingerprintSensorProperties(sensorId, sensorType); } @Override @@ -475,6 +468,21 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { }); } + void scheduleFingerDetect(@NonNull IBinder token, int userId, + @NonNull ClientMonitorCallbackConverter listener, @NonNull String opPackageName, + @Nullable Surface surface, int statsClient) { + mHandler.post(() -> { + scheduleUpdateActiveUserWithoutHandler(userId); + + final boolean isStrongBiometric = Utils.isStrongBiometric(mSensorProperties.sensorId); + final FingerprintDetectClient client = new FingerprintDetectClient(mContext, + mLazyDaemon, token, listener, userId, opPackageName, + mSensorProperties.sensorId, mUdfpsOverlayController, isStrongBiometric, + statsClient); + mScheduler.scheduleClientMonitor(client); + }); + } + void scheduleAuthenticate(@NonNull IBinder token, long operationId, int userId, int cookie, @NonNull ClientMonitorCallbackConverter listener, @NonNull String opPackageName, @Nullable Surface surface, boolean restricted, int statsClient) { @@ -534,6 +542,10 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { return daemon != null; } + @NonNull FingerprintSensorProperties getFingerprintSensorProperties() { + return mSensorProperties; + } + void rename(int fingerId, int userId, String name) { mHandler.post(() -> { FingerprintUtils.getInstance().renameBiometricForUser(mContext, userId, fingerId, name); @@ -568,10 +580,6 @@ class Fingerprint21 implements IHwBinder.DeathRecipient { udfps.onFingerUp(); } - boolean isUdfps() { - return mSensorProperties.isUdfps; - } - void setUdfpsOverlayController(IUdfpsOverlayController controller) { mUdfpsOverlayController = controller; } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticationClient.java index 1999a0f0c9d2..1564056cfdbd 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintAuthenticationClient.java @@ -66,26 +66,6 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi mUdfpsOverlayController = udfpsOverlayController; } - private void showUdfpsOverlay() { - if (mUdfpsOverlayController != null) { - try { - mUdfpsOverlayController.showUdfpsOverlay(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception when showing the UDFPS overlay", e); - } - } - } - - private void hideUdfpsOverlay() { - if (mUdfpsOverlayController != null) { - try { - mUdfpsOverlayController.hideUdfpsOverlay(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception when hiding the UDFPS overlay", e); - } - } - } - @Override public void onAuthenticated(BiometricAuthenticator.Identifier identifier, boolean authenticated, ArrayList<Byte> token) { @@ -98,7 +78,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi if (authenticated) { resetFailedAttempts(getTargetUserId()); - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); mFinishCallback.onClientFinished(this, true /* success */); } else { final @LockoutTracker.LockoutMode int lockoutMode = @@ -111,7 +91,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi // Send the error, but do not invoke the FinishCallback yet. Since lockout is not // controlled by the HAL, the framework must stop the sensor before finishing the // client. - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); onErrorInternal(errorCode, 0 /* vendorCode */, false /* finish */); cancel(); } @@ -130,7 +110,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi @Override protected void startHalOperation() { - showUdfpsOverlay(); + UdfpsHelper.showUdfpsOverlay(mUdfpsOverlayController); try { // GroupId was never used. In fact, groupId is always the same as userId. getFreshDaemon().authenticate(mOperationId, getTargetUserId()); @@ -138,14 +118,14 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi Slog.e(TAG, "Remote exception when requesting auth", e); onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */); - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); mFinishCallback.onClientFinished(this, false /* success */); } } @Override protected void stopHalOperation() { - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); try { getFreshDaemon().cancel(); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintDetectClient.java new file mode 100644 index 000000000000..8b295f8f4931 --- /dev/null +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintDetectClient.java @@ -0,0 +1,123 @@ +/* + * 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.server.biometrics.sensors.fingerprint; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.Context; +import android.hardware.biometrics.BiometricAuthenticator; +import android.hardware.biometrics.BiometricFingerprintConstants; +import android.hardware.biometrics.BiometricsProtoEnums; +import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint; +import android.hardware.fingerprint.IUdfpsOverlayController; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Slog; + +import com.android.server.biometrics.sensors.AcquisitionClient; +import com.android.server.biometrics.sensors.AuthenticationConsumer; +import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; +import com.android.server.biometrics.sensors.PerformanceTracker; + +import java.util.ArrayList; + +/** + * Performs fingerprint detection without exposing any matching information (e.g. accept/reject + * have the same haptic, lockout counter is not increased). + */ +class FingerprintDetectClient extends AcquisitionClient<IBiometricsFingerprint> + implements AuthenticationConsumer, Udfps { + + private static final String TAG = "FingerprintDetectClient"; + + private final boolean mIsStrongBiometric; + @Nullable private final IUdfpsOverlayController mUdfpsOverlayController; + + public FingerprintDetectClient(@NonNull Context context, + @NonNull LazyDaemon<IBiometricsFingerprint> lazyDaemon, @NonNull IBinder token, + @NonNull ClientMonitorCallbackConverter listener, int userId, @NonNull String owner, + int sensorId, @Nullable IUdfpsOverlayController udfpsOverlayController, + boolean isStrongBiometric, int statsClient) { + super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId, + BiometricsProtoEnums.MODALITY_FINGERPRINT, BiometricsProtoEnums.ACTION_AUTHENTICATE, + statsClient); + mUdfpsOverlayController = udfpsOverlayController; + mIsStrongBiometric = isStrongBiometric; + } + + @Override + protected void stopHalOperation() { + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); + try { + getFreshDaemon().cancel(); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception when requesting cancel", e); + onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, + 0 /* vendorCode */); + mFinishCallback.onClientFinished(this, false /* success */); + } + } + + @Override + public void start(@NonNull FinishCallback finishCallback) { + super.start(finishCallback); + startHalOperation(); + } + + @Override + protected void startHalOperation() { + UdfpsHelper.showUdfpsOverlay(mUdfpsOverlayController); + try { + getFreshDaemon().authenticate(0 /* operationId */, getTargetUserId()); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception when requesting auth", e); + onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, + 0 /* vendorCode */); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); + mFinishCallback.onClientFinished(this, false /* success */); + } + } + + @Override + public void onFingerDown(int x, int y, float minor, float major) { + UdfpsHelper.onFingerDown(getFreshDaemon(), x, y, minor, major); + } + + @Override + public void onFingerUp() { + UdfpsHelper.onFingerUp(getFreshDaemon()); + } + + @Override + public void onAuthenticated(BiometricAuthenticator.Identifier identifier, boolean authenticated, + ArrayList<Byte> hardwareAuthToken) { + logOnAuthenticated(getContext(), authenticated, false /* requireConfirmation */, + getTargetUserId(), false /* isBiometricPrompt */); + + // Do not distinguish between success/failures. + vibrateSuccess(); + + final PerformanceTracker pm = PerformanceTracker.getInstanceForSensorId(getSensorId()); + pm.incrementAuthForUser(getTargetUserId(), authenticated); + + try { + getListener().onDetected(getSensorId(), getTargetUserId(), mIsStrongBiometric); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception when sending onDetected", e); + } + } +} diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintEnrollClient.java index 25e949a6fa60..32f8b8fe8b26 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintEnrollClient.java @@ -55,26 +55,6 @@ public class FingerprintEnrollClient extends EnrollClient<IBiometricsFingerprint mUdfpsOverlayController = udfpsOverlayController; } - private void showUdfpsOverlay() { - if (mUdfpsOverlayController != null) { - try { - mUdfpsOverlayController.showUdfpsOverlay(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception when showing the UDFPS overlay", e); - } - } - } - - private void hideUdfpsOverlay() { - if (mUdfpsOverlayController != null) { - try { - mUdfpsOverlayController.hideUdfpsOverlay(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception when hiding the UDFPS overlay", e); - } - } - } - @Override protected boolean hasReachedEnrollmentLimit() { final int limit = getContext().getResources().getInteger( @@ -90,7 +70,7 @@ public class FingerprintEnrollClient extends EnrollClient<IBiometricsFingerprint @Override protected void startHalOperation() { - showUdfpsOverlay(); + UdfpsHelper.showUdfpsOverlay(mUdfpsOverlayController); try { // GroupId was never used. In fact, groupId is always the same as userId. getFreshDaemon().enroll(mHardwareAuthToken, getTargetUserId(), mTimeoutSec); @@ -98,14 +78,14 @@ public class FingerprintEnrollClient extends EnrollClient<IBiometricsFingerprint Slog.e(TAG, "Remote exception when requesting enroll", e); onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */); - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); mFinishCallback.onClientFinished(this, false /* success */); } } @Override protected void stopHalOperation() { - hideUdfpsOverlay(); + UdfpsHelper.hideUdfpsOverlay(mUdfpsOverlayController); try { getFreshDaemon().cancel(); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java index ce9565ac0f7d..e4387c9e2b81 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java @@ -23,10 +23,8 @@ import static android.Manifest.permission.RESET_FINGERPRINT_LOCKOUT; import static android.Manifest.permission.USE_BIOMETRIC; import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; import static android.Manifest.permission.USE_FINGERPRINT; -import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE; import android.annotation.NonNull; -import android.app.ActivityManager; import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; @@ -34,6 +32,7 @@ import android.hardware.biometrics.BiometricsProtoEnums; import android.hardware.biometrics.IBiometricSensorReceiver; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.fingerprint.Fingerprint; +import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.IFingerprintClientActiveCallback; import android.hardware.fingerprint.IFingerprintService; import android.hardware.fingerprint.IFingerprintServiceReceiver; @@ -42,12 +41,13 @@ import android.os.Binder; import android.os.IBinder; import android.os.NativeHandle; import android.os.Process; -import android.os.RemoteException; import android.os.UserHandle; +import android.util.EventLog; import android.util.Slog; import android.view.Surface; import com.android.internal.util.DumpUtils; +import com.android.internal.widget.LockPatternUtils; import com.android.server.SystemService; import com.android.server.biometrics.Utils; import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter; @@ -56,6 +56,7 @@ import com.android.server.biometrics.sensors.LockoutTracker; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -71,6 +72,7 @@ public class FingerprintService extends SystemService { private final AppOpsManager mAppOps; private final LockoutResetDispatcher mLockoutResetDispatcher; private final GestureAvailabilityDispatcher mGestureAvailabilityDispatcher; + private final LockPatternUtils mLockPatternUtils; private Fingerprint21 mFingerprint21; /** @@ -78,6 +80,20 @@ public class FingerprintService extends SystemService { */ private final class FingerprintServiceWrapper extends IFingerprintService.Stub { @Override // Binder call + public List<FingerprintSensorProperties> getSensorProperties(String opPackageName) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + final List<FingerprintSensorProperties> properties = new ArrayList<>(); + + if (mFingerprint21 != null) { + properties.add(mFingerprint21.getFingerprintSensorProperties()); + } + + Slog.d(TAG, "Retrieved sensor properties for: " + opPackageName + + ", sensors: " + properties.size()); + return properties; + } + + @Override // Binder call public void generateChallenge(IBinder token, IFingerprintServiceReceiver receiver, String opPackageName) { Utils.checkPermission(getContext(), MANAGE_FINGERPRINT); @@ -108,7 +124,7 @@ public class FingerprintService extends SystemService { @Override // Binder call public void authenticate(final IBinder token, final long operationId, final int userId, final IFingerprintServiceReceiver receiver, final String opPackageName, - Surface surface) { + final Surface surface) { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); final int callingUserId = UserHandle.getCallingUserId(); @@ -119,16 +135,55 @@ public class FingerprintService extends SystemService { return; } + // Keyguard check must be done on the caller's binder identity, since it also checks + // permission. + final boolean isKeyguard = Utils.isKeyguard(getContext(), opPackageName); + + // Clear calling identity when checking LockPatternUtils for StrongAuth flags. + final long identity = Binder.clearCallingIdentity(); + try { + if (isKeyguard && Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) { + // If this happens, something in KeyguardUpdateMonitor is wrong. + // SafetyNet for b/79776455 + EventLog.writeEvent(0x534e4554, "79776455"); + Slog.e(TAG, "Authenticate invoked when user is encrypted or lockdown"); + return; + } + } finally { + Binder.restoreCallingIdentity(identity); + } + final boolean restricted = getContext().checkCallingPermission(MANAGE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED; - final int statsClient = Utils.isKeyguard(getContext(), opPackageName) - ? BiometricsProtoEnums.CLIENT_KEYGUARD + final int statsClient = isKeyguard ? BiometricsProtoEnums.CLIENT_KEYGUARD : BiometricsProtoEnums.CLIENT_FINGERPRINT_MANAGER; mFingerprint21.scheduleAuthenticate(token, operationId, userId, 0 /* cookie */, new ClientMonitorCallbackConverter(receiver), opPackageName, surface, restricted, statsClient); } + @Override + public void detectFingerprint(final IBinder token, final int userId, + final IFingerprintServiceReceiver receiver, final String opPackageName, + final Surface surface) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + if (!Utils.isKeyguard(getContext(), opPackageName)) { + Slog.w(TAG, "detectFingerprint called from non-sysui package: " + opPackageName); + return; + } + + if (!Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) { + // If this happens, something in KeyguardUpdateMonitor is wrong. This should only + // ever be invoked when the user is encrypted or lockdown. + Slog.e(TAG, "detectFingerprint invoked when user is not encrypted or lockdown"); + return; + } + + mFingerprint21.scheduleFingerDetect(token, userId, + new ClientMonitorCallbackConverter(receiver), opPackageName, surface, + BiometricsProtoEnums.CLIENT_KEYGUARD); + } + @Override // Binder call public void prepareForAuthentication(IBinder token, long operationId, int userId, IBiometricSensorReceiver sensorReceiver, String opPackageName, @@ -165,6 +220,20 @@ public class FingerprintService extends SystemService { } @Override // Binder call + public void cancelFingerprintDetect(final IBinder token, final String opPackageName) { + Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); + if (!Utils.isKeyguard(getContext(), opPackageName)) { + Slog.w(TAG, "cancelFingerprintDetect called from non-sysui package: " + + opPackageName); + return; + } + + // For IBiometricsFingerprint2.1, cancelling fingerprint detect is the same as + // cancelling authentication. + mFingerprint21.cancelAuthentication(token); + } + + @Override // Binder call public void cancelAuthenticationFromService(final IBinder token, final String opPackageName, int callingUid, int callingPid, int callingUserId) { Utils.checkPermission(getContext(), MANAGE_BIOMETRIC); @@ -214,7 +283,7 @@ public class FingerprintService extends SystemService { final long token = Binder.clearCallingIdentity(); try { if (mFingerprint21 == null) { - Slog.e(TAG, "No HAL"); + Slog.e(TAG, "No HAL, caller: " + opPackageName); return false; } return mFingerprint21.isHardwareDetected(); @@ -317,12 +386,6 @@ public class FingerprintService extends SystemService { } @Override - public boolean isUdfps() { - Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); - return mFingerprint21.isUdfps(); - } - - @Override public void setUdfpsOverlayController(IUdfpsOverlayController controller) { Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); mFingerprint21.setUdfpsOverlayController(controller); @@ -334,6 +397,7 @@ public class FingerprintService extends SystemService { mAppOps = context.getSystemService(AppOpsManager.class); mGestureAvailabilityDispatcher = new GestureAvailabilityDispatcher(); mLockoutResetDispatcher = new LockoutResetDispatcher(context); + mLockPatternUtils = new LockPatternUtils(context); } @Override @@ -366,7 +430,7 @@ public class FingerprintService extends SystemService { Slog.w(TAG, "Rejecting " + opPackageName + "; permission denied"); return false; } - if (requireForeground && !(isForegroundActivity(uid, pid))) { + if (requireForeground && !Utils.isForeground(uid, pid)) { Slog.w(TAG, "Rejecting " + opPackageName + "; not in foreground"); return false; } @@ -385,28 +449,5 @@ public class FingerprintService extends SystemService { return appOpsOk; } - private boolean isForegroundActivity(int uid, int pid) { - try { - final List<ActivityManager.RunningAppProcessInfo> procs = - ActivityManager.getService().getRunningAppProcesses(); - if (procs == null) { - Slog.e(TAG, "Processes null, defaulting to true"); - return true; - } - - int N = procs.size(); - for (int i = 0; i < N; i++) { - ActivityManager.RunningAppProcessInfo proc = procs.get(i); - if (proc.pid == pid && proc.uid == uid - && proc.importance <= IMPORTANCE_FOREGROUND_SERVICE) { - return true; - } - } - } catch (RemoteException e) { - Slog.w(TAG, "am.getRunningAppProcesses() failed"); - } - return false; - } - private native NativeHandle convertSurfaceToNativeHandle(Surface surface); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java index e6e15337d062..5e521d2fe46c 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java @@ -16,7 +16,9 @@ package com.android.server.biometrics.sensors.fingerprint; +import android.annotation.Nullable; import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint; +import android.hardware.fingerprint.IUdfpsOverlayController; import android.os.RemoteException; import android.util.Slog; @@ -59,4 +61,26 @@ public class UdfpsHelper { Slog.e(TAG, "onFingerUp | RemoteException: ", e); } } + + static void showUdfpsOverlay(@Nullable IUdfpsOverlayController udfpsOverlayController) { + if (udfpsOverlayController == null) { + return; + } + try { + udfpsOverlayController.showUdfpsOverlay(); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception when showing the UDFPS overlay", e); + } + } + + static void hideUdfpsOverlay(@Nullable IUdfpsOverlayController udfpsOverlayController) { + if (udfpsOverlayController == null) { + return; + } + try { + udfpsOverlayController.hideUdfpsOverlay(); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception when hiding the UDFPS overlay", e); + } + } } diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java index f6ce2dc68b99..de302fc01f2d 100644 --- a/services/core/java/com/android/server/connectivity/PacManager.java +++ b/services/core/java/com/android/server/connectivity/PacManager.java @@ -196,13 +196,7 @@ public class PacManager { mPacUrl = Uri.EMPTY; mCurrentPac = null; if (mProxyService != null) { - try { - mProxyService.stopPacSystem(); - } catch (RemoteException e) { - Log.w(TAG, "Failed to stop PAC service", e); - } finally { - unbind(); - } + unbind(); } } return DO_SEND_BROADCAST; @@ -327,11 +321,6 @@ public class PacManager { if (mProxyService == null) { Log.e(TAG, "No proxy service"); } else { - try { - mProxyService.startPacSystem(); - } catch (RemoteException e) { - Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e); - } mNetThreadHandler.post(mPacDownloader); } } diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java index f812a05fd06f..26cc3ee165f1 100644 --- a/services/core/java/com/android/server/connectivity/ProxyTracker.java +++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java @@ -163,7 +163,7 @@ public class ProxyTracker { if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) { ProxyInfo proxyProperties; if (!TextUtils.isEmpty(pacFileUrl)) { - proxyProperties = new ProxyInfo(pacFileUrl); + proxyProperties = new ProxyInfo(Uri.parse(pacFileUrl)); } else { proxyProperties = new ProxyInfo(host, port, exclList); } diff --git a/services/core/java/com/android/server/media/MediaResourceMonitorService.java b/services/core/java/com/android/server/media/MediaResourceMonitorService.java index 8ed32f09e23a..6669b8cec143 100644 --- a/services/core/java/com/android/server/media/MediaResourceMonitorService.java +++ b/services/core/java/com/android/server/media/MediaResourceMonitorService.java @@ -26,9 +26,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; import android.util.Slog; -import com.android.server.SystemService; -import java.util.List; +import com.android.server.SystemService; /** This class provides a system service that monitors media resource usage. */ public class MediaResourceMonitorService extends SystemService { @@ -62,8 +61,7 @@ public class MediaResourceMonitorService extends SystemService { if (pkgNames == null) { return; } - UserManager manager = (UserManager) getContext().getSystemService( - Context.USER_SERVICE); + UserManager manager = getContext().getSystemService(UserManager.class); int[] userIds = manager.getEnabledProfileIds(ActivityManager.getCurrentUser()); if (userIds == null || userIds.length == 0) { return; @@ -81,15 +79,11 @@ public class MediaResourceMonitorService extends SystemService { } private String[] getPackageNamesFromPid(int pid) { - try { - for (ActivityManager.RunningAppProcessInfo proc : - ActivityManager.getService().getRunningAppProcesses()) { - if (proc.pid == pid) { - return proc.pkgList; - } + ActivityManager manager = getContext().getSystemService(ActivityManager.class); + for (ActivityManager.RunningAppProcessInfo proc : manager.getRunningAppProcesses()) { + if (proc.pid == pid) { + return proc.pkgList; } - } catch (RemoteException e) { - Slog.w(TAG, "ActivityManager.getRunningAppProcesses() failed"); } return null; } diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index e3e02e32ad50..f0bf5c0975f2 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java @@ -24,6 +24,7 @@ import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.RouteInfo; import android.net.StaticIpConfiguration; +import android.net.Uri; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; @@ -372,7 +373,7 @@ public class IpConfigStore { config.httpProxy = proxyInfo; break; case PAC: - ProxyInfo proxyPacProperties = new ProxyInfo(pacFileUrl); + ProxyInfo proxyPacProperties = new ProxyInfo(Uri.parse(pacFileUrl)); config.proxySettings = proxySettings; config.httpProxy = proxyPacProperties; break; diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 87f0fb14ee33..d6557f6410ec 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -3910,11 +3910,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private void updateRulesForAppIdleParoleUL() { final boolean paroled = mAppStandby.isInParole(); final boolean enableChain = !paroled; - enableFirewallChainUL(FIREWALL_CHAIN_STANDBY, enableChain); int ruleCount = mUidFirewallStandbyRules.size(); + final SparseIntArray blockedUids = new SparseIntArray(); for (int i = 0; i < ruleCount; i++) { final int uid = mUidFirewallStandbyRules.keyAt(i); + if (!isUidValidForBlacklistRulesUL(uid)) { + continue; + } int oldRules = mUidRules.get(uid); if (enableChain) { // Chain wasn't enabled before and the other power-related @@ -3926,13 +3929,24 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { // Skip if it had no restrictions to begin with if ((oldRules & MASK_ALL_NETWORKS) == 0) continue; } - final int newUidRules = updateRulesForPowerRestrictionsUL(uid, oldRules, paroled); + final boolean isUidIdle = !paroled && isUidIdle(uid); + if (isUidIdle && !mPowerSaveTempWhitelistAppIds.get(UserHandle.getAppId(uid)) + && !isUidForegroundOnRestrictPowerUL(uid)) { + mUidFirewallStandbyRules.put(uid, FIREWALL_RULE_DENY); + blockedUids.put(uid, FIREWALL_RULE_DENY); + } else { + mUidFirewallStandbyRules.put(uid, FIREWALL_RULE_DEFAULT); + } + final int newUidRules = updateRulesForPowerRestrictionsUL(uid, oldRules, + isUidIdle); if (newUidRules == RULE_NONE) { mUidRules.delete(uid); } else { mUidRules.put(uid, newUidRules); } } + setUidFirewallRulesUL(FIREWALL_CHAIN_STANDBY, blockedUids, + enableChain ? CHAIN_TOGGLE_ENABLE : CHAIN_TOGGLE_DISABLE); } /** @@ -4400,7 +4414,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private void updateRulesForPowerRestrictionsUL(int uid) { final int oldUidRules = mUidRules.get(uid, RULE_NONE); - final int newUidRules = updateRulesForPowerRestrictionsUL(uid, oldUidRules, false); + final int newUidRules = updateRulesForPowerRestrictionsUL(uid, oldUidRules, + isUidIdle(uid)); if (newUidRules == RULE_NONE) { mUidRules.delete(uid); @@ -4414,33 +4429,33 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { * * @param uid the uid of the app to update rules for * @param oldUidRules the current rules for the uid, in order to determine if there's a change - * @param paroled whether to ignore idle state of apps and only look at other restrictions + * @param isUidIdle whether uid is idle or not * * @return the new computed rules for the uid */ @GuardedBy("mUidRulesFirstLock") - private int updateRulesForPowerRestrictionsUL(int uid, int oldUidRules, boolean paroled) { + private int updateRulesForPowerRestrictionsUL(int uid, int oldUidRules, boolean isUidIdle) { if (Trace.isTagEnabled(Trace.TRACE_TAG_NETWORK)) { Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForPowerRestrictionsUL: " + uid + "/" + oldUidRules + "/" - + (paroled ? "P" : "-")); + + (isUidIdle ? "I" : "-")); } try { - return updateRulesForPowerRestrictionsULInner(uid, oldUidRules, paroled); + return updateRulesForPowerRestrictionsULInner(uid, oldUidRules, isUidIdle); } finally { Trace.traceEnd(Trace.TRACE_TAG_NETWORK); } } @GuardedBy("mUidRulesFirstLock") - private int updateRulesForPowerRestrictionsULInner(int uid, int oldUidRules, boolean paroled) { + private int updateRulesForPowerRestrictionsULInner(int uid, int oldUidRules, + boolean isUidIdle) { if (!isUidValidForBlacklistRulesUL(uid)) { if (LOGD) Slog.d(TAG, "no need to update restrict power rules for uid " + uid); return RULE_NONE; } - final boolean isIdle = !paroled && isUidIdle(uid); - final boolean restrictMode = isIdle || mRestrictPower || mDeviceIdleMode; + final boolean restrictMode = isUidIdle || mRestrictPower || mDeviceIdleMode; final boolean isForeground = isUidForegroundOnRestrictPowerUL(uid); final boolean isWhitelisted = isWhitelistedFromPowerSaveUL(uid, mDeviceIdleMode); @@ -4463,7 +4478,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (LOGV) { Log.v(TAG, "updateRulesForPowerRestrictionsUL(" + uid + ")" - + ", isIdle: " + isIdle + + ", isIdle: " + isUidIdle + ", mRestrictPower: " + mRestrictPower + ", mDeviceIdleMode: " + mDeviceIdleMode + ", isForeground=" + isForeground @@ -5273,6 +5288,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @Override public void onTempPowerSaveWhitelistChange(int appId, boolean added) { synchronized (mUidRulesFirstLock) { + if (!mSystemReady) { + return; + } mLogger.tempPowerSaveWlChanged(appId, added); if (added) { mPowerSaveTempWhitelistAppIds.put(appId, true); diff --git a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java index db553ee79555..0575ac6315a1 100644 --- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java +++ b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java @@ -16,12 +16,14 @@ package com.android.server.net; +import static android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA; import static android.net.NetworkTemplate.getCollapsedRatType; import android.annotation.NonNull; import android.content.Context; import android.os.Looper; import android.telephony.Annotation; +import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -196,7 +198,18 @@ public class NetworkStatsSubscriptionsMonitor extends @Override public void onServiceStateChanged(@NonNull ServiceState ss) { - final int networkType = ss.getDataNetworkType(); + // In 5G SA (Stand Alone) mode, the primary cell itself will be 5G hence telephony + // would report RAT = 5G_NR. + // However, in 5G NSA (Non Stand Alone) mode, the primary cell is still LTE and + // network allocates a secondary 5G cell so telephony reports RAT = LTE along with + // NR state as connected. In such case, attributes the data usage to NR. + // See b/160727498. + final boolean is5GNsa = (ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE + || ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE_CA) + && ss.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED; + + final int networkType = + (is5GNsa ? NETWORK_TYPE_5G_NSA : ss.getDataNetworkType()); final int collapsedRatType = getCollapsedRatType(networkType); if (collapsedRatType == mLastCollapsedRatType) return; diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 592db83b8721..249b6801758b 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -563,76 +563,85 @@ public abstract class ApexManager { @Override @Nullable - public PackageInfo getPackageInfo(String packageName, - @PackageInfoFlags int flags) { - Preconditions.checkState(mAllPackagesCache != null, - "APEX packages have not been scanned"); - boolean matchActive = (flags & MATCH_ACTIVE_PACKAGE) != 0; - boolean matchFactory = (flags & MATCH_FACTORY_PACKAGE) != 0; - for (int i = 0, size = mAllPackagesCache.size(); i < size; i++) { - final PackageInfo packageInfo = mAllPackagesCache.get(i); - if (!packageInfo.packageName.equals(packageName)) { - continue; - } - if ((matchActive && isActive(packageInfo)) - || (matchFactory && isFactory(packageInfo))) { - return packageInfo; + public PackageInfo getPackageInfo(String packageName, @PackageInfoFlags int flags) { + synchronized (mLock) { + Preconditions.checkState(mAllPackagesCache != null, + "APEX packages have not been scanned"); + boolean matchActive = (flags & MATCH_ACTIVE_PACKAGE) != 0; + boolean matchFactory = (flags & MATCH_FACTORY_PACKAGE) != 0; + for (int i = 0, size = mAllPackagesCache.size(); i < size; i++) { + final PackageInfo packageInfo = mAllPackagesCache.get(i); + if (!packageInfo.packageName.equals(packageName)) { + continue; + } + if ((matchActive && isActive(packageInfo)) + || (matchFactory && isFactory(packageInfo))) { + return packageInfo; + } } + return null; } - return null; } @Override List<PackageInfo> getActivePackages() { - Preconditions.checkState(mAllPackagesCache != null, - "APEX packages have not been scanned"); - final List<PackageInfo> activePackages = new ArrayList<>(); - for (int i = 0; i < mAllPackagesCache.size(); i++) { - final PackageInfo packageInfo = mAllPackagesCache.get(i); - if (isActive(packageInfo)) { - activePackages.add(packageInfo); + synchronized (mLock) { + Preconditions.checkState(mAllPackagesCache != null, + "APEX packages have not been scanned"); + final List<PackageInfo> activePackages = new ArrayList<>(); + for (int i = 0; i < mAllPackagesCache.size(); i++) { + final PackageInfo packageInfo = mAllPackagesCache.get(i); + if (isActive(packageInfo)) { + activePackages.add(packageInfo); + } } + return activePackages; } - return activePackages; } @Override List<PackageInfo> getFactoryPackages() { - Preconditions.checkState(mAllPackagesCache != null, - "APEX packages have not been scanned"); - final List<PackageInfo> factoryPackages = new ArrayList<>(); - for (int i = 0; i < mAllPackagesCache.size(); i++) { - final PackageInfo packageInfo = mAllPackagesCache.get(i); - if (isFactory(packageInfo)) { - factoryPackages.add(packageInfo); + synchronized (mLock) { + Preconditions.checkState(mAllPackagesCache != null, + "APEX packages have not been scanned"); + final List<PackageInfo> factoryPackages = new ArrayList<>(); + for (int i = 0; i < mAllPackagesCache.size(); i++) { + final PackageInfo packageInfo = mAllPackagesCache.get(i); + if (isFactory(packageInfo)) { + factoryPackages.add(packageInfo); + } } + return factoryPackages; } - return factoryPackages; } @Override List<PackageInfo> getInactivePackages() { - Preconditions.checkState(mAllPackagesCache != null, - "APEX packages have not been scanned"); - final List<PackageInfo> inactivePackages = new ArrayList<>(); - for (int i = 0; i < mAllPackagesCache.size(); i++) { - final PackageInfo packageInfo = mAllPackagesCache.get(i); - if (!isActive(packageInfo)) { - inactivePackages.add(packageInfo); + synchronized (mLock) { + Preconditions.checkState(mAllPackagesCache != null, + "APEX packages have not been scanned"); + final List<PackageInfo> inactivePackages = new ArrayList<>(); + for (int i = 0; i < mAllPackagesCache.size(); i++) { + final PackageInfo packageInfo = mAllPackagesCache.get(i); + if (!isActive(packageInfo)) { + inactivePackages.add(packageInfo); + } } + return inactivePackages; } - return inactivePackages; } @Override boolean isApexPackage(String packageName) { if (!isApexSupported()) return false; - Preconditions.checkState(mAllPackagesCache != null, - "APEX packages have not been scanned"); - for (int i = 0, size = mAllPackagesCache.size(); i < size; i++) { - final PackageInfo packageInfo = mAllPackagesCache.get(i); - if (packageInfo.packageName.equals(packageName)) { - return true; + synchronized (mLock) { + Preconditions.checkState(mAllPackagesCache != null, + "APEX packages have not been scanned"); + for (int i = 0, size = mAllPackagesCache.size(); i < size; i++) { + final PackageInfo packageInfo = mAllPackagesCache.get(i); + if (packageInfo.packageName.equals(packageName)) { + return true; + } } } return false; @@ -640,14 +649,11 @@ public abstract class ApexManager { @Override @Nullable - public String getActiveApexPackageNameContainingPackage( - @NonNull AndroidPackage containedPackage) { - Preconditions.checkState(mPackageNameToApexModuleName != null, - "APEX packages have not been scanned"); - + public String getActiveApexPackageNameContainingPackage(AndroidPackage containedPackage) { Objects.requireNonNull(containedPackage); - synchronized (mLock) { + Preconditions.checkState(mPackageNameToApexModuleName != null, + "APEX packages have not been scanned"); int numApksInApex = mApksInApex.size(); for (int apkInApexNum = 0; apkInApexNum < numApksInApex; apkInApexNum++) { if (mApksInApex.valueAt(apkInApexNum).contains( @@ -982,9 +988,11 @@ public abstract class ApexManager { } ipw.decreaseIndent(); ipw.println(); - if (mAllPackagesCache == null) { - ipw.println("APEX packages have not been scanned"); - return; + synchronized (mLock) { + if (mAllPackagesCache == null) { + ipw.println("APEX packages have not been scanned"); + return; + } } ipw.println("Active APEX packages:"); dumpFromPackagesCache(getActivePackages(), packageName, ipw); @@ -1023,12 +1031,17 @@ public abstract class ApexManager { if (files != null) { for (File file : files) { if (file.isDirectory() && !file.getName().contains("@")) { + boolean skip = false; for (String skipDir : skipDirs) { if (file.getName().equals(skipDir)) { - continue; + skip = true; + break; } } - result.add(new ActiveApexInfo(file, Environment.getRootDirectory())); + if (!skip) { + result.add( + new ActiveApexInfo(file, Environment.getRootDirectory())); + } } } } diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index a864aa65fe4a..00cb22e9d4b5 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -459,8 +459,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { final int returnCode = args.argi1; args.recycle(); + final boolean showNotification; + synchronized (mLock) { + showNotification = isInstallerDeviceOwnerOrAffiliatedProfileOwnerLocked(); + } sendOnPackageInstalled(mContext, statusReceiver, sessionId, - isInstallerDeviceOwnerOrAffiliatedProfileOwnerLocked(), userId, + showNotification, userId, packageName, returnCode, message, extras); break; @@ -888,6 +892,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { return markerName; } + @GuardedBy("mLock") private void createRemoveSplitMarkerLocked(String splitName) throws IOException { try { final File target = new File(stageDir, getRemoveMarkerName(splitName)); @@ -1058,6 +1063,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } + @GuardedBy("mLock") private ParcelFileDescriptor openReadInternalLocked(String name) throws IOException { try { if (!FileUtils.isValidExtFilename(name)) { @@ -2023,7 +2029,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } final File targetFile = new File(stageDir, targetName); - resolveAndStageFile(addedFile, targetFile); + resolveAndStageFileLocked(addedFile, targetFile); mResolvedBaseFile = targetFile; // Populate package name of the apex session @@ -2139,7 +2145,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } final File targetFile = new File(stageDir, targetName); - resolveAndStageFile(addedFile, targetFile); + resolveAndStageFileLocked(addedFile, targetFile); // Base is coming from session if (apk.splitName == null) { @@ -2156,7 +2162,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } final File targetDexMetadataFile = new File(stageDir, DexMetadataHelper.buildDexMetadataPathForApk(targetName)); - resolveAndStageFile(dexMetadataFile, targetDexMetadataFile); + resolveAndStageFileLocked(dexMetadataFile, targetDexMetadataFile); } } @@ -2236,12 +2242,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { // Inherit base if not overridden if (mResolvedBaseFile == null) { mResolvedBaseFile = new File(appInfo.getBaseCodePath()); - resolveInheritedFile(mResolvedBaseFile); + resolveInheritedFileLocked(mResolvedBaseFile); // Inherit the dex metadata if present. final File baseDexMetadataFile = DexMetadataHelper.findDexMetadataForFile(mResolvedBaseFile); if (baseDexMetadataFile != null) { - resolveInheritedFile(baseDexMetadataFile); + resolveInheritedFileLocked(baseDexMetadataFile); } baseApk = existingBase; } @@ -2253,12 +2259,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { final File splitFile = new File(existing.splitCodePaths[i]); final boolean splitRemoved = removeSplitList.contains(splitName); if (!stagedSplits.contains(splitName) && !splitRemoved) { - resolveInheritedFile(splitFile); + resolveInheritedFileLocked(splitFile); // Inherit the dex metadata if present. final File splitDexMetadataFile = DexMetadataHelper.findDexMetadataForFile(splitFile); if (splitDexMetadataFile != null) { - resolveInheritedFile(splitDexMetadataFile); + resolveInheritedFileLocked(splitDexMetadataFile); } } } @@ -2359,7 +2365,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } - private void resolveAndStageFile(File origFile, File targetFile) + @GuardedBy("mLock") + private void resolveAndStageFileLocked(File origFile, File targetFile) throws PackageManagerException { mResolvedStagedFiles.add(targetFile); maybeRenameFile(origFile, targetFile); @@ -2392,7 +2399,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { mResolvedStagedFiles.add(stagedSignature); } - private void resolveInheritedFile(File origFile) { + @GuardedBy("mLock") + private void resolveInheritedFileLocked(File origFile) { mResolvedInheritedFiles.add(origFile); // Inherit the fsverity signature file if present. diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 265ef1925cec..bd12fd5f5d9a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -6490,7 +6490,7 @@ public class PackageManagerService extends IPackageManager.Stub intent, resolvedType, flags, query, 0, false, true, false, userId); // Add the new activity as the last chosen for this filter addPreferredActivityInternal(filter, match, null, activity, false, userId, - "Setting last chosen"); + "Setting last chosen", false); } @Override @@ -19610,14 +19610,14 @@ public class PackageManagerService extends IPackageManager.Stub @Override public void addPreferredActivity(IntentFilter filter, int match, - ComponentName[] set, ComponentName activity, int userId) { + ComponentName[] set, ComponentName activity, int userId, boolean removeExisting) { addPreferredActivityInternal(filter, match, set, activity, true, userId, - "Adding preferred"); + "Adding preferred", removeExisting); } private void addPreferredActivityInternal(IntentFilter filter, int match, ComponentName[] set, ComponentName activity, boolean always, int userId, - String opname) { + String opname, boolean removeExisting) { // writer int callingUid = Binder.getCallingUid(); mPermissionManager.enforceCrossUserPermission(callingUid, userId, @@ -19645,6 +19645,10 @@ public class PackageManagerService extends IPackageManager.Stub } synchronized (mLock) { final PreferredIntentResolver pir = mSettings.editPreferredActivitiesLPw(userId); + final ArrayList<PreferredActivity> existing = pir.findFilters(filter); + if (removeExisting && existing != null) { + removeFiltersLocked(pir, filter, existing); + } pir.addFilter(new PreferredActivity(filter, match, set, activity, always)); scheduleWritePackageRestrictionsLocked(userId); } @@ -19744,24 +19748,28 @@ public class PackageManagerService extends IPackageManager.Stub } } if (existing != null) { - if (DEBUG_PREFERRED) { - Slog.i(TAG, existing.size() + " existing preferred matches for:"); - filter.dump(new LogPrinter(Log.INFO, TAG), " "); - } - for (int i = existing.size() - 1; i >= 0; --i) { - final PreferredActivity pa = existing.get(i); - if (DEBUG_PREFERRED) { - Slog.i(TAG, "Removing existing preferred activity " - + pa.mPref.mComponent + ":"); - pa.dump(new LogPrinter(Log.INFO, TAG), " "); - } - pir.removeFilter(pa); - } + removeFiltersLocked(pir, filter, existing); } } } addPreferredActivityInternal(filter, match, set, activity, true, userId, - "Replacing preferred"); + "Replacing preferred", false); + } + + private void removeFiltersLocked(@NonNull PreferredIntentResolver pir, + @NonNull IntentFilter filter, @NonNull List<PreferredActivity> existing) { + if (DEBUG_PREFERRED) { + Slog.i(TAG, existing.size() + " preferred matches for:"); + filter.dump(new LogPrinter(Log.INFO, TAG), " "); + } + for (int i = existing.size() - 1; i >= 0; --i) { + final PreferredActivity pa = existing.get(i); + if (DEBUG_PREFERRED) { + Slog.i(TAG, "Removing preferred activity " + pa.mPref.mComponent + ":"); + pa.dump(new LogPrinter(Log.INFO, TAG), " "); + } + pir.removeFilter(pa); + } } @Override @@ -25546,7 +25554,8 @@ public class PackageManagerService extends IPackageManager.Stub private void applyMimeGroupChanges(String packageName, String mimeGroup) { if (mComponentResolver.updateMimeGroup(packageName, mimeGroup)) { - clearPackagePreferredActivities(packageName, UserHandle.USER_ALL); + Binder.withCleanCallingIdentity(() -> + clearPackagePreferredActivities(packageName, UserHandle.USER_ALL)); } mPmInternal.writeSettings(false); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 0472b821d3cc..13b927e7d9f4 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -1407,7 +1407,7 @@ public final class Settings { if (pa.mPref.getParseError() == null) { final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId); ArrayList<PreferredActivity> pal = resolver.findFilters(pa); - if (pal == null || pal.size() == 0) { + if (pal == null || pal.size() == 0 || pa.mPref.mAlways) { resolver.addFilter(pa); } } else { diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 14da9aa14470..616e5d13f990 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -738,7 +738,6 @@ public class StagingManager { PackageInstaller.SessionParams params = originalSession.params.copy(); params.isStaged = false; params.installFlags |= PackageManager.INSTALL_STAGED; - // TODO(b/129744602): use the userid from the original session. if (preReboot) { params.installFlags &= ~PackageManager.INSTALL_ENABLE_ROLLBACK; params.installFlags |= PackageManager.INSTALL_DRY_RUN; @@ -748,7 +747,7 @@ public class StagingManager { try { int apkSessionId = mPi.createSession( params, originalSession.getInstallerPackageName(), - originalSession.getInstallerAttributionTag(), 0 /* UserHandle.SYSTEM */); + originalSession.getInstallerAttributionTag(), originalSession.userId); PackageInstallerSession apkSession = mPi.getSession(apkSessionId); apkSession.open(); for (int i = 0, size = apkFilePaths.size(); i < size; i++) { @@ -806,10 +805,9 @@ public class StagingManager { if (preReboot) { params.installFlags &= ~PackageManager.INSTALL_ENABLE_ROLLBACK; } - // TODO(b/129744602): use the userid from the original session. final int apkParentSessionId = mPi.createSession( params, session.getInstallerPackageName(), session.getInstallerAttributionTag(), - 0 /* UserHandle.SYSTEM */); + session.userId); final PackageInstallerSession apkParentSession = mPi.getSession(apkParentSessionId); try { apkParentSession.open(); diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index e75dab73478e..03868e922bdd 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -209,7 +209,6 @@ import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback; import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.vr.VrManagerInternal; import com.android.server.wm.ActivityTaskManagerInternal; -import com.android.server.wm.ActivityTaskManagerInternal.SleepToken; import com.android.server.wm.AppTransition; import com.android.server.wm.DisplayPolicy; import com.android.server.wm.DisplayRotation; @@ -491,7 +490,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean mPendingKeyguardOccluded; private boolean mKeyguardOccludedChanged; - SleepToken mScreenOffSleepToken; + private ActivityTaskManagerInternal.SleepTokenAcquirer mScreenOffSleepTokenAcquirer; volatile boolean mKeyguardOccluded; Intent mHomeIntent; Intent mCarDockIntent; @@ -1741,6 +1740,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId); mLogger = new MetricsLogger(); + mScreenOffSleepTokenAcquirer = mActivityTaskManagerInternal + .createSleepTokenAcquirer("ScreenOff"); + Resources res = mContext.getResources(); mWakeOnDpadKeyPress = res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress); @@ -4984,15 +4986,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { // TODO (multidisplay): Support multiple displays in WindowManagerPolicy. private void updateScreenOffSleepToken(boolean acquire) { if (acquire) { - if (mScreenOffSleepToken == null) { - mScreenOffSleepToken = mActivityTaskManagerInternal.acquireSleepToken( - "ScreenOff", DEFAULT_DISPLAY); - } + mScreenOffSleepTokenAcquirer.acquire(DEFAULT_DISPLAY); } else { - if (mScreenOffSleepToken != null) { - mScreenOffSleepToken.release(); - mScreenOffSleepToken = null; - } + mScreenOffSleepTokenAcquirer.release(DEFAULT_DISPLAY); } } diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 710185db7fbd..651eafd77fe7 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -140,6 +140,10 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { @IntDef({NAV_BAR_LEFT, NAV_BAR_RIGHT, NAV_BAR_BOTTOM}) @interface NavigationBarPosition {} + @Retention(SOURCE) + @IntDef({ALT_BAR_UNKNOWN, ALT_BAR_LEFT, ALT_BAR_RIGHT, ALT_BAR_BOTTOM, ALT_BAR_TOP}) + @interface AltBarPosition {} + /** * Pass this event to the user / app. To be returned from * {@link #interceptKeyBeforeQueueing}. @@ -395,14 +399,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { return false; } - /** - * Returns true if the window has a letterbox and any part of that letterbox overlaps with - * the given {@code rect}. - */ - default boolean isLetterboxedOverlappingWith(Rect rect) { - return false; - } - /** @return the current windowing mode of this window. */ int getWindowingMode(); 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 2a4a69ddde4f..4a2dfdcaac7a 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java @@ -49,6 +49,7 @@ import com.android.server.power.batterysaver.BatterySaverPolicy.Policy; import com.android.server.power.batterysaver.BatterySavingStats.BatterySaverState; import com.android.server.power.batterysaver.BatterySavingStats.DozeState; import com.android.server.power.batterysaver.BatterySavingStats.InteractiveState; +import com.android.server.power.batterysaver.BatterySavingStats.PlugState; import java.util.ArrayList; import java.util.Objects; @@ -551,17 +552,14 @@ public class BatterySaverController implements BatterySaverPolicyListener { : DozeState.NOT_DOZING; synchronized (mLock) { - if (mIsPluggedIn) { - mBatterySavingStats.startCharging(); - return; - } mBatterySavingStats.transitionState( getFullEnabledLocked() ? BatterySaverState.ON : (getAdaptiveEnabledLocked() ? BatterySaverState.ADAPTIVE : BatterySaverState.OFF), isInteractive ? InteractiveState.INTERACTIVE : InteractiveState.NON_INTERACTIVE, - dozeMode); + dozeMode, + mIsPluggedIn ? PlugState.PLUGGED : PlugState.UNPLUGGED); } } diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java b/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java index 3dbc0072f8b4..05695d919910 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java @@ -17,8 +17,8 @@ package com.android.server.power.batterysaver; import android.os.BatteryManagerInternal; import android.os.SystemClock; -import android.util.ArrayMap; import android.util.Slog; +import android.util.SparseArray; import android.util.TimeUtils; import com.android.internal.annotations.GuardedBy; @@ -93,6 +93,20 @@ public class BatterySavingStats { } } + /** Whether the device is plugged in or not. */ + interface PlugState { + int UNPLUGGED = 0; + int PLUGGED = 1; + + int SHIFT = DozeState.SHIFT + DozeState.BITS; + int BITS = 1; + int MASK = (1 << BITS) - 1; + + static int fromIndex(int index) { + return (index >> SHIFT) & MASK; + } + } + /** * Various stats in each state. */ @@ -140,7 +154,6 @@ public class BatterySavingStats { private BatteryManagerInternal mBatteryManagerInternal; private static final int STATE_NOT_INITIALIZED = -1; - private static final int STATE_CHARGING = -2; /** * Current state, one of STATE_* or values returned by {@link #statesToIndex}. @@ -153,20 +166,26 @@ public class BatterySavingStats { */ @VisibleForTesting @GuardedBy("mLock") - final ArrayMap<Integer, Stat> mStats = new ArrayMap<>(); + final SparseArray<Stat> mStats = new SparseArray<>(); @GuardedBy("mLock") private int mBatterySaverEnabledCount = 0; @GuardedBy("mLock") - private boolean mIsBatterySaverEnabled; - - @GuardedBy("mLock") private long mLastBatterySaverEnabledTime = 0; @GuardedBy("mLock") private long mLastBatterySaverDisabledTime = 0; + @GuardedBy("mLock") + private int mAdaptiveBatterySaverEnabledCount = 0; + + @GuardedBy("mLock") + private long mLastAdaptiveBatterySaverEnabledTime = 0; + + @GuardedBy("mLock") + private long mLastAdaptiveBatterySaverDisabledTime = 0; + /** Visible for unit tests */ @VisibleForTesting public BatterySavingStats(Object lock) { @@ -189,10 +208,11 @@ public class BatterySavingStats { */ @VisibleForTesting static int statesToIndex( - int batterySaverState, int interactiveState, int dozeState) { + int batterySaverState, int interactiveState, int dozeState, int plugState) { int ret = batterySaverState & BatterySaverState.MASK; ret |= (interactiveState & InteractiveState.MASK) << InteractiveState.SHIFT; ret |= (dozeState & DozeState.MASK) << DozeState.SHIFT; + ret |= (plugState & PlugState.MASK) << PlugState.SHIFT; return ret; } @@ -204,12 +224,11 @@ public class BatterySavingStats { switch (state) { case STATE_NOT_INITIALIZED: return "NotInitialized"; - case STATE_CHARGING: - return "Charging"; } return "BS=" + BatterySaverState.fromIndex(state) + ",I=" + InteractiveState.fromIndex(state) - + ",D=" + DozeState.fromIndex(state); + + ",D=" + DozeState.fromIndex(state) + + ",P=" + PlugState.fromIndex(state); } /** @@ -230,8 +249,9 @@ public class BatterySavingStats { /** * @return {@link Stat} fo a given state triplet. */ - private Stat getStat(int batterySaverState, int interactiveState, int dozeState) { - return getStat(statesToIndex(batterySaverState, interactiveState, dozeState)); + private Stat getStat(int batterySaverState, int interactiveState, int dozeState, + int plugState) { + return getStat(statesToIndex(batterySaverState, interactiveState, dozeState, plugState)); } @VisibleForTesting @@ -258,26 +278,17 @@ public class BatterySavingStats { } /** - * Called from the outside whenever any of the states changes, when the device is not plugged - * in. + * Called from the outside whenever any of the states change. */ - public void transitionState(int batterySaverState, int interactiveState, int dozeState) { + void transitionState(int batterySaverState, int interactiveState, int dozeState, + int plugState) { synchronized (mLock) { final int newState = statesToIndex( - batterySaverState, interactiveState, dozeState); + batterySaverState, interactiveState, dozeState, plugState); transitionStateLocked(newState); } } - /** - * Called from the outside when the device is plugged in. - */ - public void startCharging() { - synchronized (mLock) { - transitionStateLocked(STATE_CHARGING); - } - } - @GuardedBy("mLock") private void transitionStateLocked(int newState) { if (mCurrentState == newState) { @@ -287,17 +298,33 @@ public class BatterySavingStats { final int batteryLevel = injectBatteryLevel(); final int batteryPercent = injectBatteryPercent(); - final boolean oldBatterySaverEnabled = - BatterySaverState.fromIndex(mCurrentState) != BatterySaverState.OFF; - final boolean newBatterySaverEnabled = - BatterySaverState.fromIndex(newState) != BatterySaverState.OFF; - if (oldBatterySaverEnabled != newBatterySaverEnabled) { - mIsBatterySaverEnabled = newBatterySaverEnabled; - if (newBatterySaverEnabled) { - mBatterySaverEnabledCount++; - mLastBatterySaverEnabledTime = injectCurrentTime(); - } else { - mLastBatterySaverDisabledTime = injectCurrentTime(); + final int oldBatterySaverState = mCurrentState < 0 + ? BatterySaverState.OFF : BatterySaverState.fromIndex(mCurrentState); + final int newBatterySaverState = newState < 0 + ? BatterySaverState.OFF : BatterySaverState.fromIndex(newState); + if (oldBatterySaverState != newBatterySaverState) { + switch (newBatterySaverState) { + case BatterySaverState.ON: + mBatterySaverEnabledCount++; + mLastBatterySaverEnabledTime = now; + if (oldBatterySaverState == BatterySaverState.ADAPTIVE) { + mLastAdaptiveBatterySaverDisabledTime = now; + } + break; + case BatterySaverState.OFF: + if (oldBatterySaverState == BatterySaverState.ON) { + mLastBatterySaverDisabledTime = now; + } else { + mLastAdaptiveBatterySaverDisabledTime = now; + } + break; + case BatterySaverState.ADAPTIVE: + mAdaptiveBatterySaverEnabledCount++; + mLastAdaptiveBatterySaverEnabledTime = now; + if (oldBatterySaverState == BatterySaverState.ON) { + mLastBatterySaverDisabledTime = now; + } + break; } } @@ -377,7 +404,18 @@ public class BatterySavingStats { pw.print(indent); pw.print("Battery Saver is currently: "); - pw.println(mIsBatterySaverEnabled ? "ON" : "OFF"); + switch (BatterySaverState.fromIndex(mCurrentState)) { + case BatterySaverState.OFF: + pw.println("OFF"); + break; + case BatterySaverState.ON: + pw.println("ON"); + break; + case BatterySaverState.ADAPTIVE: + pw.println("ADAPTIVE"); + break; + } + if (mLastBatterySaverEnabledTime > 0) { pw.print(indent); pw.print(" "); @@ -400,9 +438,34 @@ public class BatterySavingStats { pw.print(indent); pw.print(" "); - pw.print("Times enabled: "); + pw.print("Times full enabled: "); pw.println(mBatterySaverEnabledCount); + if (mLastAdaptiveBatterySaverEnabledTime > 0) { + pw.print(indent); + pw.print(" "); + pw.print("Last ADAPTIVE ON time: "); + pw.print(sdf.format( + new Date(now - nowElapsed + mLastAdaptiveBatterySaverEnabledTime))); + pw.print(" "); + TimeUtils.formatDuration(mLastAdaptiveBatterySaverEnabledTime, nowElapsed, pw); + pw.println(); + } + if (mLastAdaptiveBatterySaverDisabledTime > 0) { + pw.print(indent); + pw.print(" "); + pw.print("Last ADAPTIVE OFF time: "); + pw.print(sdf.format( + new Date(now - nowElapsed + mLastAdaptiveBatterySaverDisabledTime))); + pw.print(" "); + TimeUtils.formatDuration(mLastAdaptiveBatterySaverDisabledTime, nowElapsed, pw); + pw.println(); + } + pw.print(indent); + pw.print(" "); + pw.print("Times adaptive enabled: "); + pw.println(mAdaptiveBatterySaverEnabledCount); + pw.println(); pw.print(indent); @@ -436,8 +499,10 @@ public class BatterySavingStats { pw.print(interactiveLabel); pw.print(": "); - final Stat offStat = getStat(BatterySaverState.OFF, interactiveState, dozeState); - final Stat onStat = getStat(BatterySaverState.ON, interactiveState, dozeState); + final Stat offStat = getStat(BatterySaverState.OFF, interactiveState, dozeState, + PlugState.UNPLUGGED); + final Stat onStat = getStat(BatterySaverState.ON, interactiveState, dozeState, + PlugState.UNPLUGGED); pw.println(String.format("%6dm %6dmAh(%3d%%) %8.1fmAh/h %6dm %6dmAh(%3d%%) %8.1fmAh/h", offStat.totalMinutes(), diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 4f18d07a843f..6ba675db0aed 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -640,7 +640,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba } for (String apexPackageName : apexPackageNames) { - // We will not recieve notifications when an apex is updated, + // We will not receive notifications when an apex is updated, // so check now in case any rollbacks ought to be expired. The // onPackagedReplace function is safe to call if the package // hasn't actually been updated. @@ -827,7 +827,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba } /** - * Do code and userdata backups to enable rollback of the given session. + * Do code and user-data backups to enable rollback of the given session. * In case of multiPackage sessions, <code>session</code> should be one of * the child sessions, not the parent session. * @@ -915,7 +915,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba } } - /** + /* * The order is important here! Always enable the embedded apk-in-apex (if any) before * enabling the embedding apex. Otherwise the rollback object might be in an inconsistent * state where an embedding apex is successfully enabled while one of its embedded @@ -1323,7 +1323,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba assertInWorkerThread(); int rollbackId = allocateRollbackId(); final int userId; - if (parentSession.getUser() == UserHandle.ALL) { + if (parentSession.getUser().equals(UserHandle.ALL)) { userId = UserHandle.SYSTEM.getIdentifier(); } else { userId = parentSession.getUser().getIdentifier(); diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index dbdef2368c7c..f74cd611e9d0 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -39,8 +39,6 @@ import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID; import static android.util.MathUtils.constrain; import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; -import static com.android.internal.util.FrameworkStatsLog.ANNOTATION_ID_IS_UID; -import static com.android.internal.util.FrameworkStatsLog.ANNOTATION_ID_TRUNCATE_TIMESTAMP; import static com.android.internal.util.FrameworkStatsLog.DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__NOT_OPPORTUNISTIC; import static com.android.internal.util.FrameworkStatsLog.DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__OPPORTUNISTIC; import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem; @@ -1100,25 +1098,21 @@ public class StatsPullAtomService extends SystemService { final NetworkStats.Entry entry = new NetworkStats.Entry(); // For recycling for (int j = 0; j < size; j++) { statsExt.stats.getValues(j, entry); - StatsEvent.Builder e = StatsEvent.newBuilder(); - e.setAtomId(atomTag); - switch (atomTag) { - case FrameworkStatsLog.MOBILE_BYTES_TRANSFER: - case FrameworkStatsLog.MOBILE_BYTES_TRANSFER_BY_FG_BG: - e.addBooleanAnnotation(ANNOTATION_ID_TRUNCATE_TIMESTAMP, true); - break; - default: - } - e.writeInt(entry.uid); - e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); + StatsEvent statsEvent; + if (statsExt.slicedByFgbg) { - e.writeInt(entry.set); + // MobileBytesTransferByFgBg atom or WifiBytesTransferByFgBg atom. + statsEvent = FrameworkStatsLog.buildStatsEvent( + atomTag, entry.uid, + (entry.set > 0), entry.rxBytes, entry.rxPackets, entry.txBytes, + entry.txPackets); + } else { + // MobileBytesTransfer atom or WifiBytesTransfer atom. + statsEvent = FrameworkStatsLog.buildStatsEvent( + atomTag, entry.uid, entry.rxBytes, + entry.rxPackets, entry.txBytes, entry.txPackets); } - e.writeLong(entry.rxBytes); - e.writeLong(entry.rxPackets); - e.writeLong(entry.txBytes); - e.writeLong(entry.txPackets); - ret.add(e.build()); + ret.add(statsEvent); } } @@ -1127,46 +1121,38 @@ public class StatsPullAtomService extends SystemService { final NetworkStats.Entry entry = new NetworkStats.Entry(); // for recycling for (int i = 0; i < statsExt.stats.size(); i++) { statsExt.stats.getValues(i, entry); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(FrameworkStatsLog.BYTES_TRANSFER_BY_TAG_AND_METERED) - .addBooleanAnnotation(ANNOTATION_ID_TRUNCATE_TIMESTAMP, true) - .writeInt(entry.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeBoolean(entry.metered == NetworkStats.METERED_YES) - .writeInt(entry.tag) - .writeLong(entry.rxBytes) - .writeLong(entry.rxPackets) - .writeLong(entry.txBytes) - .writeLong(entry.txPackets) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.BYTES_TRANSFER_BY_TAG_AND_METERED, entry.uid, + entry.metered == NetworkStats.METERED_YES, entry.tag, entry.rxBytes, + entry.rxPackets, entry.txBytes, entry.txPackets)); } } private void addDataUsageBytesTransferAtoms(@NonNull NetworkStatsExt statsExt, @NonNull List<StatsEvent> pulledData) { + + // Workaround for 5G NSA mode, see {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}. + // 5G NSA mode means the primary cell is LTE with a secondary connection to an + // NR cell. To mitigate risk, NetworkStats is currently storing this state as + // a fake RAT type rather than storing the boolean separately. + final boolean is5GNsa = statsExt.ratType == NetworkTemplate.NETWORK_TYPE_5G_NSA; + // Report NR connected in 5G non-standalone mode, or if the RAT type is NR to begin with. + final boolean isNR = is5GNsa || statsExt.ratType == TelephonyManager.NETWORK_TYPE_NR; + final NetworkStats.Entry entry = new NetworkStats.Entry(); // for recycling for (int i = 0; i < statsExt.stats.size(); i++) { statsExt.stats.getValues(i, entry); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(FrameworkStatsLog.DATA_USAGE_BYTES_TRANSFER) - .addBooleanAnnotation(ANNOTATION_ID_TRUNCATE_TIMESTAMP, true) - .writeInt(entry.set) - .writeLong(entry.rxBytes) - .writeLong(entry.rxPackets) - .writeLong(entry.txBytes) - .writeLong(entry.txPackets) - .writeInt(statsExt.ratType) + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.DATA_USAGE_BYTES_TRANSFER, entry.set, entry.rxBytes, + entry.rxPackets, entry.txBytes, entry.txPackets, + is5GNsa ? TelephonyManager.NETWORK_TYPE_LTE : statsExt.ratType, // Fill information about subscription, these cannot be null since invalid data // would be filtered when adding into subInfo list. - .writeString(statsExt.subInfo.mcc) - .writeString(statsExt.subInfo.mnc) - .writeInt(statsExt.subInfo.carrierId) - .writeInt(statsExt.subInfo.isOpportunistic + statsExt.subInfo.mcc, statsExt.subInfo.mnc, statsExt.subInfo.carrierId, + statsExt.subInfo.isOpportunistic ? DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__OPPORTUNISTIC - : DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__NOT_OPPORTUNISTIC) - .build(); - pulledData.add(e); + : DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__NOT_OPPORTUNISTIC, + isNR)); } } @@ -1427,14 +1413,8 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } for (UidTraffic traffic : info.getUidTraffic()) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(traffic.getUid()) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeLong(traffic.getRxBytes()) - .writeLong(traffic.getTxBytes()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, traffic.getUid(), traffic.getRxBytes(), traffic.getTxBytes())); } return StatsManager.PULL_SUCCESS; } @@ -1455,14 +1435,8 @@ public class StatsPullAtomService extends SystemService { for (Map.Entry<String, KernelWakelockStats.Entry> ent : wakelockStats.entrySet()) { String name = ent.getKey(); KernelWakelockStats.Entry kws = ent.getValue(); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeString(name) - .writeInt(kws.mCount) - .writeInt(kws.mVersion) - .writeLong(kws.mTotalTime) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, name, kws.mCount, kws.mVersion, kws.mTotalTime)); } return StatsManager.PULL_SUCCESS; } @@ -1485,13 +1459,8 @@ public class StatsPullAtomService extends SystemService { long[] clusterTimeMs = mKernelCpuSpeedReaders[cluster].readAbsolute(); if (clusterTimeMs != null) { for (int speed = clusterTimeMs.length - 1; speed >= 0; --speed) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(cluster) - .writeInt(speed) - .writeLong(clusterTimeMs[speed]) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, cluster, speed, clusterTimeMs[speed])); } } } @@ -1514,14 +1483,8 @@ public class StatsPullAtomService extends SystemService { int pullCpuTimePerUidLocked(int atomTag, List<StatsEvent> pulledData) { mCpuUidUserSysTimeReader.readAbsolute((uid, timesUs) -> { long userTimeUs = timesUs[0], systemTimeUs = timesUs[1]; - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeLong(userTimeUs) - .writeLong(systemTimeUs) - .build(); - pulledData.add(e); + pulledData.add( + FrameworkStatsLog.buildStatsEvent(atomTag, uid, userTimeUs, systemTimeUs)); }); return StatsManager.PULL_SUCCESS; } @@ -1545,14 +1508,8 @@ public class StatsPullAtomService extends SystemService { mCpuUidFreqTimeReader.readAbsolute((uid, cpuFreqTimeMs) -> { for (int freqIndex = 0; freqIndex < cpuFreqTimeMs.length; ++freqIndex) { if (cpuFreqTimeMs[freqIndex] != 0) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeInt(freqIndex) - .writeLong(cpuFreqTimeMs[freqIndex]) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, uid, freqIndex, cpuFreqTimeMs[freqIndex])); } } }); @@ -1576,13 +1533,7 @@ public class StatsPullAtomService extends SystemService { int pullCpuActiveTimeLocked(int atomTag, List<StatsEvent> pulledData) { mCpuUidActiveTimeReader.readAbsolute((uid, cpuActiveTimesMs) -> { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeLong(cpuActiveTimesMs) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, uid, cpuActiveTimesMs)); }); return StatsManager.PULL_SUCCESS; } @@ -1605,14 +1556,8 @@ public class StatsPullAtomService extends SystemService { int pullCpuClusterTimeLocked(int atomTag, List<StatsEvent> pulledData) { mCpuUidClusterTimeReader.readAbsolute((uid, cpuClusterTimesMs) -> { for (int i = 0; i < cpuClusterTimesMs.length; i++) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeInt(i) - .writeLong(cpuClusterTimesMs[i]) - .build(); - pulledData.add(e); + pulledData.add( + FrameworkStatsLog.buildStatsEvent(atomTag, uid, i, cpuClusterTimesMs[i])); } }); return StatsManager.PULL_SUCCESS; @@ -1651,16 +1596,12 @@ public class StatsPullAtomService extends SystemService { if (wifiInfo == null) { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(wifiInfo.getTimeSinceBootMillis()) - .writeInt(wifiInfo.getStackState()) - .writeLong(wifiInfo.getControllerTxDurationMillis()) - .writeLong(wifiInfo.getControllerRxDurationMillis()) - .writeLong(wifiInfo.getControllerIdleDurationMillis()) - .writeLong(wifiInfo.getControllerEnergyUsedMicroJoules()) - .build(); - pulledData.add(e); + pulledData.add( + FrameworkStatsLog.buildStatsEvent(atomTag, wifiInfo.getTimeSinceBootMillis(), + wifiInfo.getStackState(), wifiInfo.getControllerTxDurationMillis(), + wifiInfo.getControllerRxDurationMillis(), + wifiInfo.getControllerIdleDurationMillis(), + wifiInfo.getControllerEnergyUsedMicroJoules())); } catch (RuntimeException e) { Slog.e(TAG, "failed to getWifiActivityEnergyInfoAsync", e); return StatsManager.PULL_SKIP; @@ -1689,19 +1630,15 @@ public class StatsPullAtomService extends SystemService { if (modemInfo == null) { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(modemInfo.getTimestamp()) - .writeLong(modemInfo.getSleepTimeMillis()) - .writeLong(modemInfo.getIdleTimeMillis()) - .writeLong(modemInfo.getTransmitPowerInfo().get(0).getTimeInMillis()) - .writeLong(modemInfo.getTransmitPowerInfo().get(1).getTimeInMillis()) - .writeLong(modemInfo.getTransmitPowerInfo().get(2).getTimeInMillis()) - .writeLong(modemInfo.getTransmitPowerInfo().get(3).getTimeInMillis()) - .writeLong(modemInfo.getTransmitPowerInfo().get(4).getTimeInMillis()) - .writeLong(modemInfo.getReceiveTimeMillis()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, modemInfo.getTimestamp(), + modemInfo.getSleepTimeMillis(), modemInfo.getIdleTimeMillis(), + modemInfo.getTransmitPowerInfo().get(0).getTimeInMillis(), + modemInfo.getTransmitPowerInfo().get(1).getTimeInMillis(), + modemInfo.getTransmitPowerInfo().get(2).getTimeInMillis(), + modemInfo.getTransmitPowerInfo().get(3).getTimeInMillis(), + modemInfo.getTransmitPowerInfo().get(4).getTimeInMillis(), + modemInfo.getReceiveTimeMillis(), + -1 /*`energy_used` field name deprecated, use -1 to indicate as unused.*/)); } finally { Binder.restoreCallingIdentity(token); } @@ -1723,16 +1660,10 @@ public class StatsPullAtomService extends SystemService { if (info == null) { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(info.getTimeStamp()) - .writeInt(info.getBluetoothStackState()) - .writeLong(info.getControllerTxTimeMillis()) - .writeLong(info.getControllerRxTimeMillis()) - .writeLong(info.getControllerIdleTimeMillis()) - .writeLong(info.getControllerEnergyUsed()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, info.getTimeStamp(), + info.getBluetoothStackState(), info.getControllerTxTimeMillis(), + info.getControllerRxTimeMillis(), info.getControllerIdleTimeMillis(), + info.getControllerEnergyUsed())); return StatsManager.PULL_SUCCESS; } @@ -1751,11 +1682,7 @@ public class StatsPullAtomService extends SystemService { } int pullSystemElapsedRealtimeLocked(int atomTag, List<StatsEvent> pulledData) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(SystemClock.elapsedRealtime()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, SystemClock.elapsedRealtime())); return StatsManager.PULL_SUCCESS; } @@ -1770,11 +1697,7 @@ public class StatsPullAtomService extends SystemService { } int pullSystemUptimeLocked(int atomTag, List<StatsEvent> pulledData) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(SystemClock.uptimeMillis()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, SystemClock.uptimeMillis())); return StatsManager.PULL_SUCCESS; } @@ -1801,22 +1724,10 @@ public class StatsPullAtomService extends SystemService { if (memoryStat == null) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(processMemoryState.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(processMemoryState.processName) - .writeInt(processMemoryState.oomScore) - .writeLong(memoryStat.pgfault) - .writeLong(memoryStat.pgmajfault) - .writeLong(memoryStat.rssInBytes) - .writeLong(memoryStat.cacheInBytes) - .writeLong(memoryStat.swapInBytes) - .writeLong(-1) // unused - .writeLong(-1) // unused - .writeInt(-1) // unused - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, processMemoryState.uid, + processMemoryState.processName, processMemoryState.oomScore, memoryStat.pgfault, + memoryStat.pgmajfault, memoryStat.rssInBytes, memoryStat.cacheInBytes, + memoryStat.swapInBytes, -1 /*unused*/, -1 /*unused*/, -1 /*unused*/)); } return StatsManager.PULL_SUCCESS; } @@ -1840,16 +1751,11 @@ public class StatsPullAtomService extends SystemService { if (snapshot == null) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(managedProcess.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(managedProcess.processName) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, managedProcess.uid, + managedProcess.processName, // RSS high-water mark in bytes. - .writeLong(snapshot.rssHighWaterMarkInKilobytes * 1024L) - .writeInt(snapshot.rssHighWaterMarkInKilobytes) - .build(); - pulledData.add(e); + snapshot.rssHighWaterMarkInKilobytes * 1024L, + snapshot.rssHighWaterMarkInKilobytes)); } // Complement the data with native system processes SparseArray<String> processCmdlines = getProcessCmdlines(); @@ -1860,16 +1766,11 @@ public class StatsPullAtomService extends SystemService { if (snapshot == null) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(snapshot.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(processCmdlines.valueAt(i)) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, snapshot.uid, + processCmdlines.valueAt(i), // RSS high-water mark in bytes. - .writeLong(snapshot.rssHighWaterMarkInKilobytes * 1024L) - .writeInt(snapshot.rssHighWaterMarkInKilobytes) - .build(); - pulledData.add(e); + snapshot.rssHighWaterMarkInKilobytes * 1024L, + snapshot.rssHighWaterMarkInKilobytes)); } // Invoke rss_hwm_reset binary to reset RSS HWM counters for all processes. SystemProperties.set("sys.rss_hwm_reset.on", "1"); @@ -1895,19 +1796,10 @@ public class StatsPullAtomService extends SystemService { if (snapshot == null) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(managedProcess.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(managedProcess.processName) - .writeInt(managedProcess.pid) - .writeInt(managedProcess.oomScore) - .writeInt(snapshot.rssInKilobytes) - .writeInt(snapshot.anonRssInKilobytes) - .writeInt(snapshot.swapInKilobytes) - .writeInt(snapshot.anonRssInKilobytes + snapshot.swapInKilobytes) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, managedProcess.uid, + managedProcess.processName, managedProcess.pid, managedProcess.oomScore, + snapshot.rssInKilobytes, snapshot.anonRssInKilobytes, snapshot.swapInKilobytes, + snapshot.anonRssInKilobytes + snapshot.swapInKilobytes)); } // Complement the data with native system processes. Given these measurements can be taken // in response to LMKs happening, we want to first collect the managed app stats (to @@ -1921,19 +1813,11 @@ public class StatsPullAtomService extends SystemService { if (snapshot == null) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(snapshot.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(processCmdlines.valueAt(i)) - .writeInt(pid) - .writeInt(-1001) // Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1. - .writeInt(snapshot.rssInKilobytes) - .writeInt(snapshot.anonRssInKilobytes) - .writeInt(snapshot.swapInKilobytes) - .writeInt(snapshot.anonRssInKilobytes + snapshot.swapInKilobytes) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, snapshot.uid, + processCmdlines.valueAt(i), pid, + -1001 /*Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1.*/, + snapshot.rssInKilobytes, snapshot.anonRssInKilobytes, snapshot.swapInKilobytes, + snapshot.anonRssInKilobytes + snapshot.swapInKilobytes)); } return StatsManager.PULL_SUCCESS; } @@ -1950,11 +1834,7 @@ public class StatsPullAtomService extends SystemService { int pullSystemIonHeapSizeLocked(int atomTag, List<StatsEvent> pulledData) { final long systemIonHeapSizeInBytes = readSystemIonHeapSizeFromDebugfs(); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(systemIonHeapSizeInBytes) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, systemIonHeapSizeInBytes)); return StatsManager.PULL_SUCCESS; } @@ -1973,11 +1853,7 @@ public class StatsPullAtomService extends SystemService { int pullIonHeapSizeLocked(int atomTag, List<StatsEvent> pulledData) { int ionHeapSizeInKilobytes = (int) getIonHeapsSizeKb(); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(ionHeapSizeInKilobytes) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, ionHeapSizeInKilobytes)); return StatsManager.PULL_SUCCESS; } @@ -1994,16 +1870,10 @@ public class StatsPullAtomService extends SystemService { int pullProcessSystemIonHeapSizeLocked(int atomTag, List<StatsEvent> pulledData) { List<IonAllocations> result = readProcessSystemIonHeapSizesFromDebugfs(); for (IonAllocations allocations : result) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(getUidForPid(allocations.pid)) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(readCmdlineFromProcfs(allocations.pid)) - .writeInt((int) (allocations.totalSizeInBytes / 1024)) - .writeInt(allocations.count) - .writeInt((int) (allocations.maxSizeInBytes / 1024)) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, getUidForPid(allocations.pid), + readCmdlineFromProcfs(allocations.pid), + (int) (allocations.totalSizeInBytes / 1024), allocations.count, + (int) (allocations.maxSizeInBytes / 1024))); } return StatsManager.PULL_SUCCESS; } @@ -2027,14 +1897,8 @@ public class StatsPullAtomService extends SystemService { try { Temperature temperatures[] = thermalService.getCurrentTemperatures(); for (Temperature temp : temperatures) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(temp.getType()) - .writeString(temp.getName()) - .writeInt((int) (temp.getValue() * 10)) - .writeInt(temp.getStatus()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, temp.getType(), + temp.getName(), (int) (temp.getValue() * 10), temp.getStatus())); } } catch (RemoteException e) { // Should not happen. @@ -2065,13 +1929,8 @@ public class StatsPullAtomService extends SystemService { try { CoolingDevice devices[] = thermalService.getCurrentCoolingDevices(); for (CoolingDevice device : devices) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(device.getType()) - .writeString(device.getName()) - .writeInt((int) (device.getValue())) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, device.getType(), device.getName(), (int) (device.getValue()))); } } catch (RemoteException e) { // Should not happen. @@ -2107,25 +1966,12 @@ public class StatsPullAtomService extends SystemService { List<ExportedCallStat> callStats = binderStats.getExportedCallStats(); binderStats.reset(); for (ExportedCallStat callStat : callStats) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(callStat.workSourceUid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(callStat.className) - .writeString(callStat.methodName) - .writeLong(callStat.callCount) - .writeLong(callStat.exceptionCount) - .writeLong(callStat.latencyMicros) - .writeLong(callStat.maxLatencyMicros) - .writeLong(callStat.cpuTimeMicros) - .writeLong(callStat.maxCpuTimeMicros) - .writeLong(callStat.maxReplySizeBytes) - .writeLong(callStat.maxRequestSizeBytes) - .writeLong(callStat.recordedCallCount) - .writeInt(callStat.screenInteractive ? 1 : 0) - .writeInt(callStat.callingUid) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, callStat.workSourceUid, + callStat.className, callStat.methodName, callStat.callCount, + callStat.exceptionCount, callStat.latencyMicros, callStat.maxLatencyMicros, + callStat.cpuTimeMicros, callStat.maxCpuTimeMicros, callStat.maxReplySizeBytes, + callStat.maxRequestSizeBytes, callStat.recordedCallCount, + callStat.screenInteractive, callStat.callingUid)); } return StatsManager.PULL_SUCCESS; } @@ -2152,12 +1998,8 @@ public class StatsPullAtomService extends SystemService { // TODO: decouple binder calls exceptions with the rest of the binder calls data so that we // can reset the exception stats. for (Map.Entry<String, Integer> entry : exceptionStats.entrySet()) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeString(entry.getKey()) - .writeInt(entry.getValue()) - .build(); - pulledData.add(e); + pulledData.add( + FrameworkStatsLog.buildStatsEvent(atomTag, entry.getKey(), entry.getValue())); } return StatsManager.PULL_SUCCESS; } @@ -2184,26 +2026,12 @@ public class StatsPullAtomService extends SystemService { List<LooperStats.ExportedEntry> entries = looperStats.getEntries(); looperStats.reset(); for (LooperStats.ExportedEntry entry : entries) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(entry.workSourceUid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(entry.handlerClassName) - .writeString(entry.threadName) - .writeString(entry.messageName) - .writeLong(entry.messageCount) - .writeLong(entry.exceptionCount) - .writeLong(entry.recordedMessageCount) - .writeLong(entry.totalLatencyMicros) - .writeLong(entry.cpuUsageMicros) - .writeBoolean(entry.isInteractive) - .writeLong(entry.maxCpuUsageMicros) - .writeLong(entry.maxLatencyMicros) - .writeLong(entry.recordedDelayMessageCount) - .writeLong(entry.delayMillis) - .writeLong(entry.maxDelayMillis) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, entry.workSourceUid, + entry.handlerClassName, entry.threadName, entry.messageName, entry.messageCount, + entry.exceptionCount, entry.recordedMessageCount, entry.totalLatencyMicros, + entry.cpuUsageMicros, entry.isInteractive, entry.maxCpuUsageMicros, + entry.maxLatencyMicros, entry.recordedDelayMessageCount, entry.delayMillis, + entry.maxDelayMillis)); } return StatsManager.PULL_SUCCESS; } @@ -2264,13 +2092,7 @@ public class StatsPullAtomService extends SystemService { } // Add info pulledData. - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(latency) - .writeBoolean(fileBased) - .writeInt(writeSpeed) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, latency, fileBased, writeSpeed)); return StatsManager.PULL_SUCCESS; } @@ -2289,29 +2111,17 @@ public class StatsPullAtomService extends SystemService { StatFs statFsSystem = new StatFs(Environment.getRootDirectory().getAbsolutePath()); StatFs statFsCache = new StatFs(Environment.getDownloadCacheDirectory().getAbsolutePath()); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__DATA) - .writeLong(statFsData.getAvailableBytes()) - .writeLong(statFsData.getTotalBytes()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__DATA, statFsData.getAvailableBytes(), + statFsData.getTotalBytes())); - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__CACHE) - .writeLong(statFsCache.getAvailableBytes()) - .writeLong(statFsCache.getTotalBytes()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__CACHE, + statFsCache.getAvailableBytes(), statFsCache.getTotalBytes())); - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__SYSTEM) - .writeLong(statFsSystem.getAvailableBytes()) - .writeLong(statFsSystem.getTotalBytes()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__SYSTEM, + statFsSystem.getAvailableBytes(), statFsSystem.getTotalBytes())); return StatsManager.PULL_SUCCESS; } @@ -2342,15 +2152,10 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } for (int i = 0; i < length; i++) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeString(pkg_names.getString(i)) - .writeLong(app_sizes.optLong(i, /* fallback */ -1L)) - .writeLong(app_data_sizes.optLong(i, /* fallback */ -1L)) - .writeLong(app_cache_sizes.optLong(i, /* fallback */ -1L)) - .writeLong(cache_time) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, pkg_names.getString(i), + app_sizes.optLong(i, /* fallback */ -1L), + app_data_sizes.optLong(i, /* fallback */ -1L), + app_cache_sizes.optLong(i, /* fallback */ -1L), cache_time)); } } catch (IOException | JSONException e) { Slog.w(TAG, "Unable to read diskstats cache file within pullAppSize"); @@ -2376,86 +2181,45 @@ public class StatsPullAtomService extends SystemService { long cacheTime = json.optLong( DiskStatsFileLogger.LAST_QUERY_TIMESTAMP_KEY, /* fallback */ -1L); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_SIZE) - .writeLong(json.optLong( - DiskStatsFileLogger.APP_SIZE_AGG_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_DATA_SIZE) - .writeLong(json.optLong( - DiskStatsFileLogger.APP_DATA_SIZE_AGG_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_CACHE_SIZE) - .writeLong(json.optLong( - DiskStatsFileLogger.APP_CACHE_AGG_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__PHOTOS) - .writeLong(json.optLong( - DiskStatsFileLogger.PHOTOS_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__VIDEOS) - .writeLong( - json.optLong(DiskStatsFileLogger.VIDEOS_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__AUDIO) - .writeLong(json.optLong( - DiskStatsFileLogger.AUDIO_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__DOWNLOADS) - .writeLong( - json.optLong(DiskStatsFileLogger.DOWNLOADS_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__SYSTEM) - .writeLong(json.optLong( - DiskStatsFileLogger.SYSTEM_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); - - e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__OTHER) - .writeLong(json.optLong( - DiskStatsFileLogger.MISC_KEY, /* fallback */ -1L)) - .writeLong(cacheTime) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_SIZE, + json.optLong(DiskStatsFileLogger.APP_SIZE_AGG_KEY, /* fallback */ -1L), + cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_DATA_SIZE, + json.optLong(DiskStatsFileLogger.APP_DATA_SIZE_AGG_KEY, /* fallback */ -1L), + cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__APP_CACHE_SIZE, + json.optLong(DiskStatsFileLogger.APP_CACHE_AGG_KEY, /* fallback */ -1L), + cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__PHOTOS, + json.optLong(DiskStatsFileLogger.PHOTOS_KEY, /* fallback */ -1L), cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__VIDEOS, + json.optLong(DiskStatsFileLogger.VIDEOS_KEY, /* fallback */ -1L), cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__AUDIO, + json.optLong(DiskStatsFileLogger.AUDIO_KEY, /* fallback */ -1L), cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__DOWNLOADS, + json.optLong(DiskStatsFileLogger.DOWNLOADS_KEY, /* fallback */ -1L), + cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__SYSTEM, + json.optLong(DiskStatsFileLogger.SYSTEM_KEY, /* fallback */ -1L), cacheTime)); + + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + FrameworkStatsLog.CATEGORY_SIZE__CATEGORY__OTHER, + json.optLong(DiskStatsFileLogger.MISC_KEY, /* fallback */ -1L), cacheTime)); } catch (IOException | JSONException e) { Slog.w(TAG, "Unable to read diskstats cache file within pullCategorySize"); return StatsManager.PULL_SKIP; @@ -2519,12 +2283,7 @@ public class StatsPullAtomService extends SystemService { } else { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(userId) - .writeInt(numEnrolled) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, userId, numEnrolled)); } } finally { Binder.restoreCallingIdentity(token); @@ -2578,16 +2337,12 @@ public class StatsPullAtomService extends SystemService { for (int i = 0; i < protoStreams.length; i++) { byte[] bytes = protoStreams[i].getBytes(); // cache the value if (bytes.length > 0) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeByteArray(bytes) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, bytes, // This is a shard ID, and is specified in the metric definition to be // a dimension. This will result in statsd using RANDOM_ONE_SAMPLE to // keep all the shards, as it thinks each shard is a different dimension // of data. - .writeInt(i) - .build(); - pulledData.add(e); + i)); } } @@ -2640,26 +2395,13 @@ public class StatsPullAtomService extends SystemService { } int pullDiskIOLocked(int atomTag, List<StatsEvent> pulledData) { - mStoragedUidIoStatsReader.readAbsolute((uid, fgCharsRead, fgCharsWrite, fgBytesRead, - fgBytesWrite, bgCharsRead, bgCharsWrite, bgBytesRead, bgBytesWrite, - fgFsync, bgFsync) -> { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeLong(fgCharsRead) - .writeLong(fgCharsWrite) - .writeLong(fgBytesRead) - .writeLong(fgBytesWrite) - .writeLong(bgCharsRead) - .writeLong(bgCharsWrite) - .writeLong(bgBytesRead) - .writeLong(bgBytesWrite) - .writeLong(fgFsync) - .writeLong(bgFsync) - .build(); - pulledData.add(e); - }); + mStoragedUidIoStatsReader.readAbsolute( + (uid, fgCharsRead, fgCharsWrite, fgBytesRead, fgBytesWrite, bgCharsRead, + bgCharsWrite, bgBytesRead, bgBytesWrite, fgFsync, bgFsync) -> { + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, uid, fgCharsRead, + fgCharsWrite, fgBytesRead, fgBytesWrite, bgCharsRead, bgCharsWrite, + bgBytesRead, bgBytesWrite, fgFsync, bgFsync)); + }); return StatsManager.PULL_SUCCESS; } @@ -2678,11 +2420,7 @@ public class StatsPullAtomService extends SystemService { ProtoOutputStream proto = new ProtoOutputStream(); powerProfile.dumpDebug(proto); proto.flush(); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeByteArray(proto.getBytes()) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, proto.getBytes())); return StatsManager.PULL_SUCCESS; } @@ -2708,15 +2446,8 @@ public class StatsPullAtomService extends SystemService { mProcessCpuTracker.update(); for (int i = 0; i < mProcessCpuTracker.countStats(); i++) { ProcessCpuTracker.Stats st = mProcessCpuTracker.getStats(i); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(st.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(st.name) - .writeLong(st.base_utime) - .writeLong(st.base_stime) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, st.uid, st.name, st.base_utime, st.base_stime)); } return StatsManager.PULL_SUCCESS; } @@ -2766,27 +2497,27 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } - StatsEvent.Builder e = StatsEvent.newBuilder(); - e.setAtomId(atomTag); - e.writeInt(processCpuUsage.uid); - e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); - e.writeInt(processCpuUsage.processId); - e.writeInt(threadCpuUsage.threadId); - e.writeString(processCpuUsage.processName); - e.writeString(threadCpuUsage.threadName); + int[] frequencies = new int[CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES]; + int[] usageTimesMillis = new int[CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES]; for (int k = 0; k < CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES; k++) { if (k < cpuFrequencies.length) { - e.writeInt(cpuFrequencies[k]); - e.writeInt(threadCpuUsage.usageTimesMillis[k]); + frequencies[k] = cpuFrequencies[k]; + usageTimesMillis[k] = threadCpuUsage.usageTimesMillis[k]; } else { // If we have no more frequencies to write, we still must write empty data. // We know that this data is empty (and not just zero) because all // frequencies are expected to be greater than zero - e.writeInt(0); - e.writeInt(0); + frequencies[k] = 0; + usageTimesMillis[k] = 0; } } - pulledData.add(e.build()); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, processCpuUsage.uid, + processCpuUsage.processId, threadCpuUsage.threadId, + processCpuUsage.processName, threadCpuUsage.threadName, frequencies[0], + usageTimesMillis[0], frequencies[1], usageTimesMillis[1], frequencies[2], + usageTimesMillis[2], frequencies[3], usageTimesMillis[3], frequencies[4], + usageTimesMillis[4], frequencies[5], usageTimesMillis[5], frequencies[6], + usageTimesMillis[6], frequencies[7], usageTimesMillis[7])); } } return StatsManager.PULL_SUCCESS; @@ -2834,11 +2565,8 @@ public class StatsPullAtomService extends SystemService { int pullDeviceCalculatedPowerUseLocked(int atomTag, List<StatsEvent> pulledData) { BatteryStatsHelper bsHelper = getBatteryStatsHelper(); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(milliAmpHrsToNanoAmpSecs(bsHelper.getComputedPower())) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, milliAmpHrsToNanoAmpSecs(bsHelper.getComputedPower()))); return StatsManager.PULL_SUCCESS; } @@ -2862,13 +2590,8 @@ public class StatsPullAtomService extends SystemService { if (bs.drainType != bs.drainType.APP) { continue; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(bs.uidObj.getUid()) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeLong(milliAmpHrsToNanoAmpSecs(bs.totalPowerMah)) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, bs.uidObj.getUid(), milliAmpHrsToNanoAmpSecs(bs.totalPowerMah))); } return StatsManager.PULL_SUCCESS; } @@ -2896,12 +2619,8 @@ public class StatsPullAtomService extends SystemService { if (bs.drainType == bs.drainType.USER) { continue; // This is not supported. We purposefully calculate over USER_ALL. } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(bs.drainType.ordinal()) - .writeLong(milliAmpHrsToNanoAmpSecs(bs.totalPowerMah)) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, bs.drainType.ordinal(), milliAmpHrsToNanoAmpSecs(bs.totalPowerMah))); } return StatsManager.PULL_SUCCESS; } @@ -2924,28 +2643,16 @@ public class StatsPullAtomService extends SystemService { final long clockDiffMillis = mDebugElapsedClockPreviousValue == 0 ? 0 : elapsedMillis - mDebugElapsedClockPreviousValue; - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mDebugElapsedClockPullCount) - .writeLong(elapsedMillis) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, mDebugElapsedClockPullCount, + elapsedMillis, // Log it twice to be able to test multi-value aggregation from ValueMetric. - .writeLong(elapsedMillis) - .writeLong(clockDiffMillis) - .writeInt(1 /* always set */) - .build(); - pulledData.add(e); + elapsedMillis, clockDiffMillis, 1 /* always set */)); if (mDebugElapsedClockPullCount % 2 == 1) { - StatsEvent e2 = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mDebugElapsedClockPullCount) - .writeLong(elapsedMillis) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, mDebugElapsedClockPullCount, + elapsedMillis, // Log it twice to be able to test multi-value aggregation from ValueMetric. - .writeLong(elapsedMillis) - .writeLong(clockDiffMillis) - .writeInt(2 /* set on odd pulls */) - .build(); - pulledData.add(e2); + elapsedMillis, clockDiffMillis, 2 /* set on odd pulls */)); } mDebugElapsedClockPullCount++; @@ -2975,16 +2682,13 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeLong(mDebugFailingElapsedClockPullCount) - .writeLong(elapsedMillis) + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + mDebugFailingElapsedClockPullCount, elapsedMillis, // Log it twice to be able to test multi-value aggregation from ValueMetric. - .writeLong(elapsedMillis) - .writeLong(mDebugFailingElapsedClockPreviousValue == 0 - ? 0 : elapsedMillis - mDebugFailingElapsedClockPreviousValue) - .build(); - pulledData.add(e); + elapsedMillis, + mDebugFailingElapsedClockPreviousValue == 0 + ? 0 + : elapsedMillis - mDebugFailingElapsedClockPreviousValue)); mDebugFailingElapsedClockPreviousValue = elapsedMillis; return StatsManager.PULL_SUCCESS; @@ -3001,19 +2705,9 @@ public class StatsPullAtomService extends SystemService { } int pullBuildInformationLocked(int atomTag, List<StatsEvent> pulledData) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeString(Build.FINGERPRINT) - .writeString(Build.BRAND) - .writeString(Build.PRODUCT) - .writeString(Build.DEVICE) - .writeString(Build.VERSION.RELEASE_OR_CODENAME) - .writeString(Build.ID) - .writeString(Build.VERSION.INCREMENTAL) - .writeString(Build.TYPE) - .writeString(Build.TAGS) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, Build.FINGERPRINT, Build.BRAND, + Build.PRODUCT, Build.DEVICE, Build.VERSION.RELEASE_OR_CODENAME, Build.ID, + Build.VERSION.INCREMENTAL, Build.TYPE, Build.TAGS)); return StatsManager.PULL_SUCCESS; } @@ -3059,14 +2753,8 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(pkg.applicationInfo.uid) - .addBooleanAnnotation(ANNOTATION_ID_IS_UID, true) - .writeString(holderName) - .writeString(roleName) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, pkg.applicationInfo.uid, holderName, roleName)); } } } @@ -3144,19 +2832,24 @@ public class StatsPullAtomService extends SystemService { permName = permName.substring(COMMON_PERMISSION_PREFIX.length()); } - StatsEvent.Builder e = StatsEvent.newBuilder(); - e.setAtomId(atomTag); - e.writeString(permName); - e.writeInt(pkg.applicationInfo.uid); - e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); + StatsEvent e; if (atomTag == FrameworkStatsLog.DANGEROUS_PERMISSION_STATE) { - e.writeString(""); + e = FrameworkStatsLog.buildStatsEvent(atomTag, permName, + pkg.applicationInfo.uid, "", + (pkg.requestedPermissionsFlags[permNum] + & REQUESTED_PERMISSION_GRANTED) + != 0, + permissionFlags); + } else { + // DangerousPermissionStateSampled atom. + e = FrameworkStatsLog.buildStatsEvent(atomTag, permName, + pkg.applicationInfo.uid, + (pkg.requestedPermissionsFlags[permNum] + & REQUESTED_PERMISSION_GRANTED) + != 0, + permissionFlags); } - e.writeBoolean((pkg.requestedPermissionsFlags[permNum] - & REQUESTED_PERMISSION_GRANTED) != 0); - e.writeInt(permissionFlags); - - pulledData.add(e.build()); + pulledData.add(e); } } } @@ -3188,11 +2881,7 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SKIP; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeString(tzDbVersion) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, tzDbVersion)); return StatsManager.PULL_SUCCESS; } @@ -3234,13 +2923,8 @@ public class StatsPullAtomService extends SystemService { externalStorageType = StorageEnums.OTHER; } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(externalStorageType) - .writeInt(volumeType) - .writeLong(diskInfo.size) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, externalStorageType, volumeType, diskInfo.size)); } } return StatsManager.PULL_SUCCESS; @@ -3291,12 +2975,8 @@ public class StatsPullAtomService extends SystemService { // App is installed on external storage. if (externalStorageType != -1) { - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(externalStorageType) - .writeString(appInfo.packageName) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + atomTag, externalStorageType, appInfo.packageName)); } } return StatsManager.PULL_SUCCESS; @@ -3339,16 +3019,10 @@ public class StatsPullAtomService extends SystemService { mContext.getContentResolver(), Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED, 1, userId); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeBoolean(unlockKeyguardEnabled != 0) - .writeBoolean(unlockDismissesKeyguard != 0) - .writeBoolean(unlockAttentionRequired != 0) - .writeBoolean(unlockAppEnabled != 0) - .writeBoolean(unlockAlwaysRequireConfirmation != 0) - .writeBoolean(unlockDiversityRequired != 0) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, + unlockKeyguardEnabled != 0, unlockDismissesKeyguard != 0, + unlockAttentionRequired != 0, unlockAppEnabled != 0, + unlockAlwaysRequireConfirmation != 0, unlockDiversityRequired != 0)); } } finally { Binder.restoreCallingIdentity(callingToken); @@ -3429,27 +3103,29 @@ public class StatsPullAtomService extends SystemService { if (entry.mHash >= samplingRate) { continue; } - StatsEvent.Builder e = StatsEvent.newBuilder(); - e.setAtomId(atomTag); - e.writeInt(entry.mUid); - e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); - e.writeString(entry.mPackageName); + StatsEvent e; if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) { - e.writeString(entry.mAttributionTag); - } - e.writeInt(entry.mOp.getOpCode()); - e.writeLong(entry.mOp.getForegroundAccessCount(OP_FLAGS_PULLED)); - e.writeLong(entry.mOp.getBackgroundAccessCount(OP_FLAGS_PULLED)); - e.writeLong(entry.mOp.getForegroundRejectCount(OP_FLAGS_PULLED)); - e.writeLong(entry.mOp.getBackgroundRejectCount(OP_FLAGS_PULLED)); - e.writeLong(entry.mOp.getForegroundAccessDuration(OP_FLAGS_PULLED)); - e.writeLong(entry.mOp.getBackgroundAccessDuration(OP_FLAGS_PULLED)); - e.writeBoolean(mDangerousAppOpsList.contains(entry.mOp.getOpCode())); - - if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) { - e.writeInt(samplingRate); + e = FrameworkStatsLog.buildStatsEvent(atomTag, entry.mUid, entry.mPackageName, + entry.mAttributionTag, entry.mOp.getOpCode(), + entry.mOp.getForegroundAccessCount(OP_FLAGS_PULLED), + entry.mOp.getBackgroundAccessCount(OP_FLAGS_PULLED), + entry.mOp.getForegroundRejectCount(OP_FLAGS_PULLED), + entry.mOp.getBackgroundRejectCount(OP_FLAGS_PULLED), + entry.mOp.getForegroundAccessDuration(OP_FLAGS_PULLED), + entry.mOp.getBackgroundAccessDuration(OP_FLAGS_PULLED), + mDangerousAppOpsList.contains(entry.mOp.getOpCode()), samplingRate); + } else { + // AppOps atom. + e = FrameworkStatsLog.buildStatsEvent(atomTag, entry.mUid, entry.mPackageName, + entry.mOp.getOpCode(), entry.mOp.getForegroundAccessCount(OP_FLAGS_PULLED), + entry.mOp.getBackgroundAccessCount(OP_FLAGS_PULLED), + entry.mOp.getForegroundRejectCount(OP_FLAGS_PULLED), + entry.mOp.getBackgroundRejectCount(OP_FLAGS_PULLED), + entry.mOp.getForegroundAccessDuration(OP_FLAGS_PULLED), + entry.mOp.getBackgroundAccessDuration(OP_FLAGS_PULLED), + mDangerousAppOpsList.contains(entry.mOp.getOpCode())); } - pulledData.add(e.build()); + pulledData.add(e); } if (pulledData.size() > DIMENSION_KEY_SIZE_HARD_LIMIT) { int adjustedSamplingRate = constrain( @@ -3610,22 +3286,11 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } - StatsEvent.Builder e = StatsEvent.newBuilder(); - e.setAtomId(atomTag); - e.writeInt(message.getUid()); - e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); - e.writeString(message.getPackageName()); - e.writeString(""); - if (message.getAttributionTag() == null) { - e.writeString(""); - } else { - e.writeString(message.getAttributionTag()); - } - e.writeString(message.getMessage()); - e.writeInt(message.getSamplingStrategy()); - e.writeInt(AppOpsManager.strOpToOp(message.getOp())); - - pulledData.add(e.build()); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, message.getUid(), + message.getPackageName(), "", + message.getAttributionTag() == null ? "" : message.getAttributionTag(), + message.getMessage(), message.getSamplingStrategy(), + AppOpsManager.strOpToOp(message.getOp()))); } catch (Throwable t) { // TODO: catch exceptions at a more granular level Slog.e(TAG, "Could not read runtime appop access message", t); @@ -3641,11 +3306,7 @@ public class StatsPullAtomService extends SystemService { InputStream stream = new ParcelFileDescriptor.AutoCloseInputStream(statsFiles.get(0)); int[] len = new int[1]; byte[] stats = readFully(stream, len); - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeByteArray(Arrays.copyOf(stats, len[0])) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, Arrays.copyOf(stats, len[0]))); } static byte[] readFully(InputStream stream, int[] outLen) throws IOException { @@ -3808,11 +3469,7 @@ public class StatsPullAtomService extends SystemService { throw new IllegalStateException("Invalid atomTag in healthHal puller: " + atomTag); } - StatsEvent e = StatsEvent.newBuilder() - .setAtomId(atomTag) - .writeInt(pulledValue) - .build(); - pulledData.add(e); + pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, pulledValue)); }); } catch (RemoteException | IllegalStateException e) { return StatsManager.PULL_SKIP; diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java index d9415ce81636..3ec61fdda917 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java @@ -49,6 +49,7 @@ import com.android.server.timezonedetector.TimeZoneDetectorStrategy.StrategyList import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Iterator; import java.util.Objects; /** @@ -188,20 +189,14 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub int userId = UserHandle.getCallingUserId(); ConfigListenerInfo listenerInfo = new ConfigListenerInfo(userId, listener); - final IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() { - @Override - public void binderDied() { - synchronized (mConfigurationListeners) { - Slog.i(TAG, "Configuration listener died: " + listenerInfo); - mConfigurationListeners.remove(listenerInfo); - } - } - }; synchronized (mConfigurationListeners) { + if (mConfigurationListeners.contains(listenerInfo)) { + return; + } try { - // Remove the record of the listener if the client process dies. - listener.asBinder().linkToDeath(deathRecipient, 0 /* flags */); + // Ensure the reference to the listener is removed if the client process dies. + listenerInfo.linkToDeath(); // Only add the listener if we can linkToDeath(). mConfigurationListeners.add(listenerInfo); @@ -211,6 +206,31 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub } } + @Override + public void removeConfigurationListener(@NonNull ITimeZoneConfigurationListener listener) { + enforceManageTimeZoneDetectorConfigurationPermission(); + Objects.requireNonNull(listener); + int userId = UserHandle.getCallingUserId(); + + synchronized (mConfigurationListeners) { + ConfigListenerInfo toRemove = new ConfigListenerInfo(userId, listener); + Iterator<ConfigListenerInfo> listenerIterator = mConfigurationListeners.iterator(); + while (listenerIterator.hasNext()) { + ConfigListenerInfo currentListenerInfo = listenerIterator.next(); + if (currentListenerInfo.equals(toRemove)) { + listenerIterator.remove(); + + // Stop listening for the client process to die. + try { + currentListenerInfo.unlinkToDeath(); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to unlinkToDeath() for listener=" + listener, e); + } + } + } + } + } + void handleConfigurationChanged() { // Note: we could trigger an async time zone detection operation here via a call to // handleAutoTimeZoneDetectionChanged(), but that is triggered in response to the underlying @@ -319,7 +339,7 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub this, in, out, err, args, callback, resultReceiver); } - private static class ConfigListenerInfo { + private class ConfigListenerInfo implements IBinder.DeathRecipient { private final @UserIdInt int mUserId; private final ITimeZoneConfigurationListener mListener; @@ -337,6 +357,40 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub return mListener; } + void linkToDeath() throws RemoteException { + mListener.asBinder().linkToDeath(this, 0 /* flags */); + } + + void unlinkToDeath() throws RemoteException { + mListener.asBinder().unlinkToDeath(this, 0 /* flags */); + } + + @Override + public void binderDied() { + synchronized (mConfigurationListeners) { + Slog.i(TAG, "Configuration listener client died: " + this); + mConfigurationListeners.remove(this); + } + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ConfigListenerInfo that = (ConfigListenerInfo) o; + return mUserId == that.mUserId + && mListener.equals(that.mListener); + } + + @Override + public int hashCode() { + return Objects.hash(mUserId, mListener); + } + @Override public String toString() { return "ConfigListenerInfo{" diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 189b21fb81a6..7565d8f9647c 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -396,8 +396,7 @@ class ActivityMetricsLogger { mLastLogTimeSecs = now; mWindowState = WINDOW_STATE_INVALID; - ActivityStack stack = - mSupervisor.mRootWindowContainer.getTopDisplayFocusedStack(); + Task stack = mSupervisor.mRootWindowContainer.getTopDisplayFocusedStack(); if (stack == null) { return; } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index bec0ce944e3f..63ece0465993 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -136,18 +136,6 @@ import static com.android.server.wm.ActivityRecordProto.VISIBLE; import static com.android.server.wm.ActivityRecordProto.VISIBLE_REQUESTED; import static com.android.server.wm.ActivityRecordProto.VISIBLE_SET_FROM_TRANSFERRED_STARTING_WINDOW; import static com.android.server.wm.ActivityRecordProto.WINDOW_TOKEN; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; -import static com.android.server.wm.ActivityStack.ActivityState.FINISHING; -import static com.android.server.wm.ActivityStack.ActivityState.INITIALIZING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESTARTING_PROCESS; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STARTED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE; import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_APP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; @@ -192,6 +180,18 @@ import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION; +import static com.android.server.wm.Task.ActivityState.DESTROYED; +import static com.android.server.wm.Task.ActivityState.DESTROYING; +import static com.android.server.wm.Task.ActivityState.FINISHING; +import static com.android.server.wm.Task.ActivityState.INITIALIZING; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESTARTING_PROCESS; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STARTED; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE; import static com.android.server.wm.TaskPersister.DEBUG; import static com.android.server.wm.TaskPersister.IMAGE_EXTENSION; import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN; @@ -309,8 +309,8 @@ import com.android.server.protolog.common.ProtoLog; import com.android.server.uri.NeededUriGrants; import com.android.server.uri.UriPermissionOwner; import com.android.server.wm.ActivityMetricsLogger.TransitionInfoSnapshot; -import com.android.server.wm.ActivityStack.ActivityState; import com.android.server.wm.SurfaceAnimator.AnimationType; +import com.android.server.wm.Task.ActivityState; import com.android.server.wm.WindowManagerService.H; import com.android.server.wm.utils.InsetUtils; @@ -658,6 +658,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // TODO: Have a WindowContainer state for tracking exiting/deferred removal. boolean mIsExiting; + // Force an app transition to be ran in the case the visibility of the app did not change. + // We use this for the case of moving a Root Task to the back with multiple activities, and the + // top activity enters PIP; the bottom activity's visibility stays the same, but we need to + // run the transition. + boolean mRequestForceTransition; boolean mEnteringAnimation; @@ -1150,7 +1155,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } void updateMultiWindowMode() { - if (task == null || task.getStack() == null || !attachedToProcess()) { + if (task == null || task.getRootTask() == null || !attachedToProcess()) { return; } @@ -1175,7 +1180,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } void updatePictureInPictureMode(Rect targetStackBounds, boolean forceUpdate) { - if (task == null || task.getStack() == null || !attachedToProcess()) { + if (task == null || task.getRootTask() == null || !attachedToProcess()) { return; } @@ -1216,8 +1221,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A this.task = task; } - ActivityStack getStack() { - return task != null ? task.getStack() : null; + Task getStack() { + return task != null ? task.getRootTask() : null; } @Override @@ -1264,10 +1269,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (getDisplayContent() != null) { getDisplayContent().mClosingApps.remove(this); } - } else if (mLastParent != null && mLastParent.getStack() != null) { - task.getStack().mExitingActivities.remove(this); + } else if (mLastParent != null && mLastParent.getRootTask() != null) { + task.getRootTask().mExitingActivities.remove(this); } - final ActivityStack stack = getStack(); + final Task stack = getStack(); // If we reparent, make sure to remove ourselves from the old animation registry. if (mAnimatingActivityRegistry != null) { @@ -1394,6 +1399,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } /** + * @see Letterbox#notIntersectsOrFullyContains(Rect) + */ + boolean letterboxNotIntersectsOrFullyContains(Rect rect) { + return mLetterbox == null || mLetterbox.notIntersectsOrFullyContains(rect); + } + + /** * @return {@code true} if there is a letterbox and any part of that letterbox overlaps with * the given {@code rect}. */ @@ -2113,8 +2125,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } /** @return Root task of this activity, null if there is no task. */ - ActivityStack getRootTask() { - return task != null ? (ActivityStack) task.getRootTask() : null; + Task getRootTask() { + return task != null ? task.getRootTask() : null; } int getRootTaskId() { @@ -2122,7 +2134,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } DisplayContent getDisplay() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); return stack != null ? stack.getDisplay() : null; } @@ -2192,7 +2204,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } boolean isInStackLocked() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); return stack != null && stack.isInTask(this) != null; } @@ -2402,7 +2414,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { Slog.w(TAG, "moveActivityStackToFront: invalid task or stack: activity=" + this + " task=" + task); @@ -2534,7 +2546,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return FINISH_RESULT_CANCELLED; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); final boolean mayAdjustTop = (isState(RESUMED) || stack.mResumedActivity == null) && stack.isFocusedStackOnDisplay(); final boolean shouldAdjustGlobalFocus = mayAdjustTop @@ -2564,7 +2576,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // We are finishing the top focused activity and its task has nothing to be focused so // the next focusable task should be focused. - if (mayAdjustTop && ((ActivityStack) task).topRunningActivity(true /* focusableOnly */) + if (mayAdjustTop && task.topRunningActivity(true /* focusableOnly */) == null) { task.adjustFocusToNextFocusableTask("finish-top", false /* allowFocusSelf */, shouldAdjustGlobalFocus); @@ -2693,7 +2705,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A final boolean isCurrentVisible = mVisibleRequested || isState(PAUSED); if (isCurrentVisible) { - final ActivityStack stack = getStack(); + final Task stack = getStack(); final ActivityRecord activity = stack.mResumedActivity; boolean ensureVisibility = false; if (activity != null && !activity.occludesParent()) { @@ -2763,7 +2775,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Make sure the record is cleaned out of other places. mStackSupervisor.mStoppingActivities.remove(this); - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); final TaskDisplayArea taskDisplayArea = getDisplayArea(); // TODO(b/137329632): Exclude current activity when looking for the next one with // DisplayContent#topRunningActivity(). @@ -2923,7 +2935,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A boolean safelyDestroy(String reason) { if (isDestroyable()) { if (DEBUG_SWITCH) { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); Slog.v(TAG_SWITCH, "Safely destroying " + this + " in state " + getState() + " resumed=" + stack.mResumedActivity + " pausing=" + stack.mPausingActivity @@ -2940,8 +2952,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A null /* resultData */, null /* resultGrants */); makeFinishingLocked(); if (ActivityTaskManagerDebugConfig.DEBUG_ADD_REMOVE) { - Slog.i(TAG_ADD_REMOVE, "Removing activity " + this + " from stack callers=" - + Debug.getCallers(5)); + Slog.i(TAG_ADD_REMOVE, "Removing activity " + this + " from stack, reason=" + + reason + ", callers=" + Debug.getCallers(5)); } takeFromHistory(); @@ -3217,7 +3229,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A getDisplayContent().mNoAnimationNotifyOnTransitionFinished.add(token); } - final ActivityStack stack = getStack(); + final Task stack = getStack(); if (delayed && !isEmpty()) { // set the token aside because it has an active animation to be finished ProtoLog.v(WM_DEBUG_ADD_REMOVE, @@ -3731,7 +3743,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } final boolean isSleeping() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); return stack != null ? stack.shouldSleepActivities() : mAtmService.isSleepingLocked(); } @@ -4199,6 +4211,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mUseTransferredAnimation) { return false; } + // If it was set to true, reset the last request to force the transition. + mRequestForceTransition = false; return super.applyAnimation(lp, transit, enter, isVoiceInteraction, sources); } @@ -4342,7 +4356,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // transition animation // * or this is an opening app and windows are being replaced (e.g. freeform window to // normal window). - return isVisible() != visible || (!isVisible() && mIsExiting) + return isVisible() != visible || mRequestForceTransition || (!isVisible() && mIsExiting) || (visible && forAllWindows(WindowState::waitingForReplacement, true)); } @@ -4564,7 +4578,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return visibleIgnoringKeyguard; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return false; } @@ -4601,7 +4615,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } boolean shouldBeVisible() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return false; } @@ -4622,7 +4636,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // If this activity is paused, tell it to now show its window. if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Making visible and scheduling visibility: " + this); - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); try { if (stack.mTranslucentActivityWaiting != null) { updateOptionsLocked(returningOptions); @@ -4899,7 +4913,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mStackSupervisor.reportResumedActivityLocked(this); resumeKeyDispatchingLocked(); - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); mStackSupervisor.mNoAnimActivities.clear(); // Mark the point when the activity is resuming @@ -4927,7 +4941,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Activity paused: token=" + appToken + ", timeout=" + timeout); - final ActivityStack stack = getStack(); + final Task stack = getStack(); if (stack != null) { removePauseTimeout(); @@ -4992,7 +5006,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void stopIfPossible() { if (DEBUG_SWITCH) Slog.d(TAG_SWITCH, "Stopping: " + this); - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (isNoHistory()) { if (!finishing) { if (!stack.shouldSleepActivities()) { @@ -5049,7 +5063,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void activityStopped(Bundle newIcicle, PersistableBundle newPersistentState, CharSequence description) { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); final boolean isStopping = mState == STOPPING; if (!isStopping && mState != RESTARTING_PROCESS) { Slog.i(TAG, "Activity reported stop, but no longer stopping: " + this); @@ -5099,7 +5113,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mStackSupervisor.mStoppingActivities.add(this); } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); // If we already have a few activities waiting to stop, then give up on things going idle // and start clearing them out. Or if r is the last of activity of the last task the stack // will be empty and must be cleared immediately. @@ -5135,7 +5149,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return false; } @@ -5151,7 +5165,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void finishLaunchTickingLocked() { launchTickTime = 0; - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return; } @@ -5582,7 +5596,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // First find the real culprit... if this activity has stopped, then the key dispatching // timeout should not be caused by this. if (stopped) { - final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task stack = mRootWindowContainer.getTopDisplayFocusedStack(); if (stack == null) { return this; } @@ -5646,7 +5660,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return (r != null) ? r.getRootTask().isInTask(r) : null; } - static ActivityStack getStackLocked(IBinder token) { + static Task getStackLocked(IBinder token) { final ActivityRecord r = ActivityRecord.isInStackLocked(token); if (r != null) { return r.getRootTask(); @@ -5659,7 +5673,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * {@link android.view.Display#INVALID_DISPLAY} if not attached. */ int getDisplayId() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return INVALID_DISPLAY; } @@ -5671,7 +5685,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // This would be redundant. return false; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (isState(RESUMED) || stack == null || this == stack.mPausingActivity || !mHaveState || !stopped) { // We're not ready for this kind of thing. @@ -5993,7 +6007,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A getTransit(), task)) { task.getBounds(mTmpRect); } else { - final ActivityStack stack = getStack(); + final Task stack = getStack(); if (stack == null) { return; } @@ -6816,7 +6830,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A private void applyAspectRatio(Rect outBounds, Rect containingAppBounds, Rect containingBounds) { final float maxAspectRatio = info.maxAspectRatio; - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); final float minAspectRatio = info.minAspectRatio; if (task == null || stack == null || (inMultiWindowMode() && !shouldUseSizeCompatMode()) @@ -6922,7 +6936,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A */ boolean ensureActivityConfiguration(int globalChanges, boolean preserveWindow, boolean ignoreVisibility) { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack.mConfigWillChange) { if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, "Skipping config check (will change): " + this); @@ -7473,7 +7487,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (!getTurnScreenOnFlag()) { return false; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); return stack != null && !stack.inMultiWindowMode() && stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, diff --git a/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java b/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java index 5dfc261480f2..8540fa7cf347 100644 --- a/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java +++ b/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java @@ -16,10 +16,10 @@ package com.android.server.wm; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESUMED; import android.util.ArraySet; import android.util.Slog; diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java deleted file mode 100644 index 686e016f1d35..000000000000 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ /dev/null @@ -1,3266 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.wm; - -import static android.app.ActivityTaskManager.INVALID_TASK_ID; -import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; -import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; -import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; -import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; -import static android.app.WindowConfiguration.activityTypeToString; -import static android.app.WindowConfiguration.windowingModeToString; -import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT; -import static android.content.pm.ActivityInfo.FLAG_RESUME_WHILE_PAUSING; -import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; -import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.Display.FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD; -import static android.view.Display.INVALID_DISPLAY; -import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; -import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN; -import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE; -import static android.view.WindowManager.TRANSIT_NONE; -import static android.view.WindowManager.TRANSIT_SHOW_SINGLE_TASK_DISPLAY; -import static android.view.WindowManager.TRANSIT_TASK_CLOSE; -import static android.view.WindowManager.TRANSIT_TASK_OPEN; -import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND; -import static android.view.WindowManager.TRANSIT_TASK_TO_BACK; -import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT; - -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STARTED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; -import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; -import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS; -import static com.android.server.wm.ActivityStackSupervisor.dumpHistoryList; -import static com.android.server.wm.ActivityStackSupervisor.printThisActivity; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ADD_REMOVE; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_APP; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_PAUSE; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RESULTS; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_STATES; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TRANSITION; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_USER_LEAVING; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ADD_REMOVE; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_APP; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_CLEANUP; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_PAUSE; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RELEASE; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RESULTS; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STACK; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STATES; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TASKS; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TRANSITION; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_USER_LEAVING; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_VISIBILITY; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME; -import static com.android.server.wm.ActivityTaskManagerService.H.FIRST_ACTIVITY_STACK_MSG; -import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE; -import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE; -import static com.android.server.wm.TaskProto.ACTIVITY_TYPE; -import static com.android.server.wm.TaskProto.ANIMATING_BOUNDS; -import static com.android.server.wm.TaskProto.BOUNDS; -import static com.android.server.wm.TaskProto.CREATED_BY_ORGANIZER; -import static com.android.server.wm.TaskProto.DISPLAY_ID; -import static com.android.server.wm.TaskProto.FILLS_PARENT; -import static com.android.server.wm.TaskProto.LAST_NON_FULLSCREEN_BOUNDS; -import static com.android.server.wm.TaskProto.MIN_HEIGHT; -import static com.android.server.wm.TaskProto.MIN_WIDTH; -import static com.android.server.wm.TaskProto.ORIG_ACTIVITY; -import static com.android.server.wm.TaskProto.REAL_ACTIVITY; -import static com.android.server.wm.TaskProto.RESIZE_MODE; -import static com.android.server.wm.TaskProto.RESUMED_ACTIVITY; -import static com.android.server.wm.TaskProto.ROOT_TASK_ID; -import static com.android.server.wm.TaskProto.SURFACE_HEIGHT; -import static com.android.server.wm.TaskProto.SURFACE_WIDTH; -import static com.android.server.wm.TaskProto.WINDOW_CONTAINER; -import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN; -import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; -import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; - -import static java.lang.Integer.MAX_VALUE; - -import android.annotation.IntDef; -import android.annotation.Nullable; -import android.app.Activity; -import android.app.ActivityManager; -import android.app.ActivityManagerInternal; -import android.app.ActivityOptions; -import android.app.AppGlobals; -import android.app.IActivityController; -import android.app.RemoteAction; -import android.app.ResultInfo; -import android.app.servertransaction.ActivityResultItem; -import android.app.servertransaction.ClientTransaction; -import android.app.servertransaction.NewIntentItem; -import android.app.servertransaction.PauseActivityItem; -import android.app.servertransaction.ResumeActivityItem; -import android.content.ComponentName; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.graphics.Point; -import android.graphics.Rect; -import android.os.Binder; -import android.os.Debug; -import android.os.Handler; -import android.os.IBinder; -import android.os.Looper; -import android.os.Message; -import android.os.RemoteException; -import android.os.SystemClock; -import android.os.Trace; -import android.os.UserHandle; -import android.service.voice.IVoiceInteractionSession; -import android.util.Log; -import android.util.Slog; -import android.util.proto.ProtoOutputStream; -import android.view.Display; -import android.view.DisplayInfo; - -import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.app.IVoiceInteractor; -import com.android.internal.os.logging.MetricsLoggerWrapper; -import com.android.internal.util.function.pooled.PooledConsumer; -import com.android.internal.util.function.pooled.PooledFunction; -import com.android.internal.util.function.pooled.PooledLambda; -import com.android.server.Watchdog; -import com.android.server.am.ActivityManagerService; -import com.android.server.am.ActivityManagerService.ItemMatcher; -import com.android.server.am.AppTimeTracker; -import com.android.server.uri.NeededUriGrants; - -import java.io.FileDescriptor; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; - -/** - * State and management of a single stack of activities. - */ -class ActivityStack extends Task { - private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityStack" : TAG_ATM; - static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE; - private static final String TAG_APP = TAG + POSTFIX_APP; - static final String TAG_CLEANUP = TAG + POSTFIX_CLEANUP; - private static final String TAG_PAUSE = TAG + POSTFIX_PAUSE; - private static final String TAG_RELEASE = TAG + POSTFIX_RELEASE; - private static final String TAG_RESULTS = TAG + POSTFIX_RESULTS; - private static final String TAG_STACK = TAG + POSTFIX_STACK; - private static final String TAG_STATES = TAG + POSTFIX_STATES; - private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH; - static final String TAG_TASKS = TAG + POSTFIX_TASKS; - private static final String TAG_TRANSITION = TAG + POSTFIX_TRANSITION; - private static final String TAG_USER_LEAVING = TAG + POSTFIX_USER_LEAVING; - static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY; - - // Set to false to disable the preview that is shown while a new activity - // is being started. - private static final boolean SHOW_APP_STARTING_PREVIEW = true; - - // How long to wait for all background Activities to redraw following a call to - // convertToTranslucent(). - private static final long TRANSLUCENT_CONVERSION_TIMEOUT = 2000; - - @IntDef(prefix = {"STACK_VISIBILITY"}, value = { - STACK_VISIBILITY_VISIBLE, - STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT, - STACK_VISIBILITY_INVISIBLE, - }) - @interface StackVisibility {} - - /** Stack is visible. No other stacks on top that fully or partially occlude it. */ - static final int STACK_VISIBILITY_VISIBLE = 0; - - /** Stack is partially occluded by other translucent stack(s) on top of it. */ - static final int STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT = 1; - - /** Stack is completely invisible. */ - static final int STACK_VISIBILITY_INVISIBLE = 2; - - enum ActivityState { - INITIALIZING, - STARTED, - RESUMED, - PAUSING, - PAUSED, - STOPPING, - STOPPED, - FINISHING, - DESTROYING, - DESTROYED, - RESTARTING_PROCESS - } - - // The topmost Activity passed to convertToTranslucent(). When non-null it means we are - // waiting for all Activities in mUndrawnActivitiesBelowTopTranslucent to be removed as they - // are drawn. When the last member of mUndrawnActivitiesBelowTopTranslucent is removed the - // Activity in mTranslucentActivityWaiting is notified via - // Activity.onTranslucentConversionComplete(false). If a timeout occurs prior to the last - // background activity being drawn then the same call will be made with a true value. - ActivityRecord mTranslucentActivityWaiting = null; - ArrayList<ActivityRecord> mUndrawnActivitiesBelowTopTranslucent = new ArrayList<>(); - - /** - * Set when we know we are going to be calling updateConfiguration() - * soon, so want to skip intermediate config checks. - */ - boolean mConfigWillChange; - - /** - * Used to keep resumeTopActivityUncheckedLocked() from being entered recursively - */ - boolean mInResumeTopActivity = false; - - int mCurrentUser; - - /** For comparison with DisplayContent bounds. */ - private Rect mTmpRect = new Rect(); - private Rect mTmpRect2 = new Rect(); - - // If this is true, we are in the bounds animating mode. The task will be down or upscaled to - // perfectly fit the region it would have been cropped to. We may also avoid certain logic we - // would otherwise apply while resizing, while resizing in the bounds animating mode. - private boolean mBoundsAnimating = false; - // Set when an animation has been requested but has not yet started from the UI thread. This is - // cleared when the animation actually starts. - private boolean mBoundsAnimatingRequested = false; - private Rect mBoundsAnimationTarget = new Rect(); - private Rect mBoundsAnimationSourceHintBounds = new Rect(); - - Rect mPreAnimationBounds = new Rect(); - - private final AnimatingActivityRegistry mAnimatingActivityRegistry = - new AnimatingActivityRegistry(); - - private boolean mTopActivityOccludesKeyguard; - private ActivityRecord mTopDismissingKeyguardActivity; - - private static final int TRANSLUCENT_TIMEOUT_MSG = FIRST_ACTIVITY_STACK_MSG + 1; - - private final Handler mHandler; - - private class ActivityStackHandler extends Handler { - - ActivityStackHandler(Looper looper) { - super(looper); - } - - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case TRANSLUCENT_TIMEOUT_MSG: { - synchronized (mAtmService.mGlobalLock) { - notifyActivityDrawnLocked(null); - } - } break; - } - } - } - - private static final ResetTargetTaskHelper sResetTargetTaskHelper = new ResetTargetTaskHelper(); - private final EnsureActivitiesVisibleHelper mEnsureActivitiesVisibleHelper = - new EnsureActivitiesVisibleHelper(this); - private final EnsureVisibleActivitiesConfigHelper mEnsureVisibleActivitiesConfigHelper = - new EnsureVisibleActivitiesConfigHelper(); - private class EnsureVisibleActivitiesConfigHelper { - private boolean mUpdateConfig; - private boolean mPreserveWindow; - private boolean mBehindFullscreen; - - void reset(boolean preserveWindow) { - mPreserveWindow = preserveWindow; - mUpdateConfig = false; - mBehindFullscreen = false; - } - - void process(ActivityRecord start, boolean preserveWindow) { - if (start == null || !start.mVisibleRequested) { - return; - } - reset(preserveWindow); - - final PooledFunction f = PooledLambda.obtainFunction( - EnsureVisibleActivitiesConfigHelper::processActivity, this, - PooledLambda.__(ActivityRecord.class)); - forAllActivities(f, start, true /*includeBoundary*/, true /*traverseTopToBottom*/); - f.recycle(); - - if (mUpdateConfig) { - // Ensure the resumed state of the focus activity if we updated the configuration of - // any activity. - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - } - - boolean processActivity(ActivityRecord r) { - mUpdateConfig |= r.ensureActivityConfiguration(0 /*globalChanges*/, mPreserveWindow); - mBehindFullscreen |= r.occludesParent(); - return mBehindFullscreen; - } - } - - // TODO: Can we just loop through WindowProcessController#mActivities instead of doing this? - private final RemoveHistoryRecordsForApp mRemoveHistoryRecordsForApp = - new RemoveHistoryRecordsForApp(); - private class RemoveHistoryRecordsForApp { - private boolean mHasVisibleActivities; - private boolean mIsProcessRemoved; - private WindowProcessController mApp; - private ArrayList<ActivityRecord> mToRemove = new ArrayList<>(); - - boolean process(WindowProcessController app) { - mToRemove.clear(); - mHasVisibleActivities = false; - mApp = app; - mIsProcessRemoved = app.isRemoved(); - if (mIsProcessRemoved) { - // The package of the died process should be force-stopped, so make its activities - // as finishing to prevent the process from being started again if the next top - // (or being visible) activity also resides in the same process. - app.makeFinishingForProcessRemoved(); - } - - final PooledConsumer c = PooledLambda.obtainConsumer( - RemoveHistoryRecordsForApp::addActivityToRemove, this, - PooledLambda.__(ActivityRecord.class)); - forAllActivities(c); - c.recycle(); - - while (!mToRemove.isEmpty()) { - processActivity(mToRemove.remove(0)); - } - - mApp = null; - return mHasVisibleActivities; - } - - private void addActivityToRemove(ActivityRecord r) { - if (r.app == mApp) { - mToRemove.add(r); - } - } - - private void processActivity(ActivityRecord r) { - if (DEBUG_CLEANUP) Slog.v(TAG_CLEANUP, "Record " + r + ": app=" + r.app); - - if (r.app != mApp) { - return; - } - if (r.isVisible() || r.mVisibleRequested) { - // While an activity launches a new activity, it's possible that the old - // activity is already requested to be hidden (mVisibleRequested=false), but - // this visibility is not yet committed, so isVisible()=true. - mHasVisibleActivities = true; - } - final boolean remove; - if ((r.mRelaunchReason == RELAUNCH_REASON_WINDOWING_MODE_RESIZE - || r.mRelaunchReason == RELAUNCH_REASON_FREE_RESIZE) - && r.launchCount < 3 && !r.finishing) { - // If the process crashed during a resize, always try to relaunch it, unless - // it has failed more than twice. Skip activities that's already finishing - // cleanly by itself. - remove = false; - } else if ((!r.hasSavedState() && !r.stateNotNeeded - && !r.isState(ActivityState.RESTARTING_PROCESS)) || r.finishing) { - // Don't currently have state for the activity, or - // it is finishing -- always remove it. - remove = true; - } else if (!r.mVisibleRequested && r.launchCount > 2 - && r.lastLaunchTime > (SystemClock.uptimeMillis() - 60000)) { - // We have launched this activity too many times since it was - // able to run, so give up and remove it. - // (Note if the activity is visible, we don't remove the record. - // We leave the dead window on the screen but the process will - // not be restarted unless user explicitly tap on it.) - remove = true; - } else { - // The process may be gone, but the activity lives on! - remove = false; - } - if (remove) { - if (DEBUG_ADD_REMOVE || DEBUG_CLEANUP) Slog.i(TAG_ADD_REMOVE, - "Removing activity " + r + " from stack " - + ": hasSavedState=" + r.hasSavedState() - + " stateNotNeeded=" + r.stateNotNeeded - + " finishing=" + r.finishing - + " state=" + r.getState() + " callers=" + Debug.getCallers(5)); - if (!r.finishing || mIsProcessRemoved) { - Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); - EventLogTags.writeWmFinishActivity(r.mUserId, - System.identityHashCode(r), r.getTask().mTaskId, - r.shortComponentName, "proc died without state saved"); - } - } else { - // We have the current state for this activity, so - // it can be restarted later when needed. - if (DEBUG_ALL) Slog.v(TAG, "Keeping entry, setting app to null"); - if (DEBUG_APP) Slog.v(TAG_APP, - "Clearing app during removeHistory for activity " + r); - r.app = null; - // Set nowVisible to previous visible state. If the app was visible while - // it died, we leave the dead window on screen so it's basically visible. - // This is needed when user later tap on the dead window, we need to stop - // other apps when user transfers focus to the restarted activity. - r.nowVisible = r.mVisibleRequested; - } - r.cleanUp(true /* cleanServices */, true /* setState */); - if (remove) { - r.removeFromHistory("appDied"); - } - } - } - - ActivityStack(ActivityTaskManagerService atmService, int id, int activityType, - ActivityInfo info, Intent intent, boolean createdByOrganizer) { - this(atmService, id, info, intent, null /*voiceSession*/, null /*voiceInteractor*/, - null /*taskDescription*/, null /*stack*/); - mCreatedByOrganizer = createdByOrganizer; - setActivityType(activityType); - } - - ActivityStack(ActivityTaskManagerService atmService, int id, ActivityInfo info, Intent _intent, - IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor, - ActivityManager.TaskDescription _taskDescription, ActivityStack stack) { - this(atmService, id, _intent, null /*_affinityIntent*/, null /*_affinity*/, - null /*_rootAffinity*/, null /*_realActivity*/, null /*_origActivity*/, - false /*_rootWasReset*/, false /*_autoRemoveRecents*/, false /*_askedCompatMode*/, - UserHandle.getUserId(info.applicationInfo.uid), 0 /*_effectiveUid*/, - null /*_lastDescription*/, System.currentTimeMillis(), - true /*neverRelinquishIdentity*/, - _taskDescription != null ? _taskDescription : new ActivityManager.TaskDescription(), - id, INVALID_TASK_ID, INVALID_TASK_ID, - info.applicationInfo.uid, info.packageName, null, info.resizeMode, - info.supportsPictureInPicture(), false /*_realActivitySuspended*/, - false /*userSetupComplete*/, INVALID_MIN_SIZE, INVALID_MIN_SIZE, info, - _voiceSession, _voiceInteractor, stack); - } - - ActivityStack(ActivityTaskManagerService atmService, int id, Intent _intent, - Intent _affinityIntent, String _affinity, String _rootAffinity, - ComponentName _realActivity, ComponentName _origActivity, boolean _rootWasReset, - boolean _autoRemoveRecents, boolean _askedCompatMode, int _userId, int _effectiveUid, - String _lastDescription, long lastTimeMoved, boolean neverRelinquishIdentity, - ActivityManager.TaskDescription _lastTaskDescription, int taskAffiliation, - int prevTaskId, int nextTaskId, int callingUid, - String callingPackage, @Nullable String callingFeatureId, int resizeMode, - boolean supportsPictureInPicture, boolean _realActivitySuspended, - boolean userSetupComplete, int minWidth, int minHeight, - ActivityInfo info, IVoiceInteractionSession _voiceSession, - IVoiceInteractor _voiceInteractor, ActivityStack stack) { - super(atmService, id, _intent, _affinityIntent, _affinity, _rootAffinity, - _realActivity, _origActivity, _rootWasReset, _autoRemoveRecents, _askedCompatMode, - _userId, _effectiveUid, _lastDescription, lastTimeMoved, neverRelinquishIdentity, - _lastTaskDescription, taskAffiliation, prevTaskId, nextTaskId, - callingUid, callingPackage, callingFeatureId, resizeMode, supportsPictureInPicture, - _realActivitySuspended, userSetupComplete, minWidth, minHeight, info, _voiceSession, - _voiceInteractor, stack); - - EventLogTags.writeWmStackCreated(id); - mHandler = new ActivityStackHandler(mStackSupervisor.mLooper); - mCurrentUser = mAtmService.mAmInternal.getCurrentUserId(); - } - - @Override - public void onConfigurationChanged(Configuration newParentConfig) { - // Calling Task#onConfigurationChanged() for leaf task since the ops in this method are - // particularly for ActivityStack, like preventing bounds changes when inheriting certain - // windowing mode. - if (!isRootTask()) { - super.onConfigurationChanged(newParentConfig); - return; - } - - final int prevWindowingMode = getWindowingMode(); - final boolean prevIsAlwaysOnTop = isAlwaysOnTop(); - final int prevRotation = getWindowConfiguration().getRotation(); - final Rect newBounds = mTmpRect; - // Initialize the new bounds by previous bounds as the input and output for calculating - // override bounds in pinned (pip) or split-screen mode. - getBounds(newBounds); - - super.onConfigurationChanged(newParentConfig); - - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - if (taskDisplayArea == null) { - return; - } - - if (prevWindowingMode != getWindowingMode()) { - taskDisplayArea.onStackWindowingModeChanged(this); - } - - final DisplayContent display = getDisplay(); - if (display == null ) { - return; - } - - final boolean windowingModeChanged = prevWindowingMode != getWindowingMode(); - final int overrideWindowingMode = getRequestedOverrideWindowingMode(); - // Update bounds if applicable - boolean hasNewOverrideBounds = false; - // Use override windowing mode to prevent extra bounds changes if inheriting the mode. - if ((overrideWindowingMode != WINDOWING_MODE_PINNED) - && !getRequestedOverrideBounds().isEmpty()) { - // If the parent (display) has rotated, rotate our bounds to best-fit where their - // bounds were on the pre-rotated display. - final int newRotation = getWindowConfiguration().getRotation(); - final boolean rotationChanged = prevRotation != newRotation; - if (rotationChanged) { - display.mDisplayContent.rotateBounds( - newParentConfig.windowConfiguration.getBounds(), prevRotation, newRotation, - newBounds); - hasNewOverrideBounds = true; - } - } - - if (windowingModeChanged) { - taskDisplayArea.onStackWindowingModeChanged(this); - } - if (hasNewOverrideBounds) { - if (inSplitScreenWindowingMode()) { - setBounds(newBounds); - } else if (overrideWindowingMode != WINDOWING_MODE_PINNED) { - // For pinned stack, resize is now part of the {@link WindowContainerTransaction} - resize(new Rect(newBounds), PRESERVE_WINDOWS, true /* deferResume */); - } - } - if (prevIsAlwaysOnTop != isAlwaysOnTop()) { - // Since always on top is only on when the stack is freeform or pinned, the state - // can be toggled when the windowing mode changes. We must make sure the stack is - // placed properly when always on top state changes. - taskDisplayArea.positionStackAtTop(this, false /* includingParents */); - } - } - - @Override - public void setWindowingMode(int windowingMode) { - // Reset the cached result of toString() - stringName = null; - - // Calling Task#setWindowingMode() for leaf task since this is the a specialization of - // {@link #setWindowingMode(int)} for ActivityStack. - if (!isRootTask()) { - super.setWindowingMode(windowingMode); - return; - } - - setWindowingMode(windowingMode, false /* creating */); - } - - /** - * Specialization of {@link #setWindowingMode(int)} for this subclass. - * - * @param preferredWindowingMode the preferred windowing mode. This may not be honored depending - * on the state of things. For example, WINDOWING_MODE_UNDEFINED will resolve to the - * previous non-transient mode if this stack is currently in a transient mode. - * @param creating {@code true} if this is being run during ActivityStack construction. - */ - void setWindowingMode(int preferredWindowingMode, boolean creating) { - mWmService.inSurfaceTransaction(() -> setWindowingModeInSurfaceTransaction( - preferredWindowingMode, creating)); - } - - private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode, - boolean creating) { - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - if (taskDisplayArea == null) { - Slog.d(TAG, "taskDisplayArea is null, bail early"); - return; - } - final int currentMode = getWindowingMode(); - final int currentOverrideMode = getRequestedOverrideWindowingMode(); - final Task topTask = getTopMostTask(); - int windowingMode = preferredWindowingMode; - - // Need to make sure windowing mode is supported. If we in the process of creating the stack - // no need to resolve the windowing mode again as it is already resolved to the right mode. - if (!creating) { - if (!taskDisplayArea.isValidWindowingMode(windowingMode, null /* ActivityRecord */, - topTask, getActivityType())) { - windowingMode = WINDOWING_MODE_UNDEFINED; - } - } - - final boolean alreadyInSplitScreenMode = taskDisplayArea.isSplitScreenModeActivated(); - - if (creating && alreadyInSplitScreenMode && windowingMode == WINDOWING_MODE_FULLSCREEN - && isActivityTypeStandardOrUndefined()) { - // If the stack is being created explicitly in fullscreen mode, dismiss split-screen - // and display a warning toast about it. - mAtmService.getTaskChangeNotificationController() - .notifyActivityDismissingDockedStack(); - taskDisplayArea.onSplitScreenModeDismissed(this); - } - - if (currentMode == windowingMode) { - // You are already in the window mode, so we can skip most of the work below. However, - // it's possible that we have inherited the current windowing mode from a parent. So, - // fulfill this method's contract by setting the override mode directly. - getRequestedOverrideConfiguration().windowConfiguration.setWindowingMode(windowingMode); - return; - } - - final ActivityRecord topActivity = getTopNonFinishingActivity(); - - // For now, assume that the Stack's windowing mode is what will actually be used - // by it's activities. In the future, there may be situations where this doesn't - // happen; so at that point, this message will need to handle that. - int likelyResolvedMode = windowingMode; - if (windowingMode == WINDOWING_MODE_UNDEFINED) { - final ConfigurationContainer parent = getParent(); - likelyResolvedMode = parent != null ? parent.getWindowingMode() - : WINDOWING_MODE_FULLSCREEN; - } - if (currentMode == WINDOWING_MODE_PINNED) { - mAtmService.getTaskChangeNotificationController().notifyActivityUnpinned(); - } - if (likelyResolvedMode == WINDOWING_MODE_PINNED - && taskDisplayArea.getRootPinnedTask() != null) { - // Can only have 1 pip at a time, so replace an existing pip - taskDisplayArea.getRootPinnedTask().dismissPip(); - } - if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN - && topActivity != null && !topActivity.noDisplay - && topActivity.isNonResizableOrForcedResizable(likelyResolvedMode)) { - // Inform the user that they are starting an app that may not work correctly in - // multi-window mode. - final String packageName = topActivity.info.applicationInfo.packageName; - mAtmService.getTaskChangeNotificationController().notifyActivityForcedResizable( - topTask.mTaskId, FORCED_RESIZEABLE_REASON_SPLIT_SCREEN, packageName); - } - - mAtmService.deferWindowLayout(); - try { - if (topActivity != null) { - mStackSupervisor.mNoAnimActivities.add(topActivity); - } - super.setWindowingMode(windowingMode); - // setWindowingMode triggers an onConfigurationChanged cascade which can result in a - // different resolved windowing mode (usually when preferredWindowingMode is UNDEFINED). - windowingMode = getWindowingMode(); - - if (creating) { - // Nothing else to do if we don't have a window container yet. E.g. call from ctor. - return; - } - - if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY && alreadyInSplitScreenMode) { - // We already have a split-screen stack in this display, so just move the tasks over. - // TODO: Figure-out how to do all the stuff in - // AMS.setTaskWindowingModeSplitScreenPrimary - throw new IllegalArgumentException("Setting primary split-screen windowing mode" - + " while there is already one isn't currently supported"); - //return; - } - } finally { - mAtmService.continueWindowLayout(); - } - - mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS); - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - - @Override - public boolean isCompatible(int windowingMode, int activityType) { - // TODO: Should we just move this to ConfigurationContainer? - if (activityType == ACTIVITY_TYPE_UNDEFINED) { - // Undefined activity types end up in a standard stack once the stack is created on a - // display, so they should be considered compatible. - activityType = ACTIVITY_TYPE_STANDARD; - } - return super.isCompatible(windowingMode, activityType); - } - - /** Resume next focusable stack after reparenting to another display. */ - void postReparent() { - adjustFocusToNextFocusableTask("reparent", true /* allowFocusSelf */, - true /* moveDisplayToTop */); - mRootWindowContainer.resumeFocusedStacksTopActivities(); - // Update visibility of activities before notifying WM. This way it won't try to resize - // windows that are no longer visible. - mRootWindowContainer.ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, - !PRESERVE_WINDOWS); - } - - DisplayContent getDisplay() { - return getDisplayContent(); - } - - /** @return true if the stack can only contain one task */ - boolean isSingleTaskInstance() { - final DisplayContent display = getDisplay(); - return display != null && display.isSingleTaskInstance(); - } - - final boolean isHomeOrRecentsStack() { - return isActivityTypeHome() || isActivityTypeRecents(); - } - - final boolean isOnHomeDisplay() { - return getDisplayId() == DEFAULT_DISPLAY; - } - - void moveToFront(String reason) { - moveToFront(reason, null); - } - - /** - * @param reason The reason for moving the stack to the front. - * @param task If non-null, the task will be moved to the top of the stack. - * */ - void moveToFront(String reason, Task task) { - if (!isAttached()) { - return; - } - - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - - if (inSplitScreenSecondaryWindowingMode()) { - // If the stack is in split-screen secondary mode, we need to make sure we move the - // primary split-screen stack forward in the case it is currently behind a fullscreen - // stack so both halves of the split-screen appear on-top and the fullscreen stack isn't - // cutting between them. - // TODO(b/70677280): This is a workaround until we can fix as part of b/70677280. - final ActivityStack topFullScreenStack = - taskDisplayArea.getTopStackInWindowingMode(WINDOWING_MODE_FULLSCREEN); - if (topFullScreenStack != null) { - final ActivityStack primarySplitScreenStack = - taskDisplayArea.getRootSplitScreenPrimaryTask(); - if (primarySplitScreenStack != null - && taskDisplayArea.getIndexOf(topFullScreenStack) - > taskDisplayArea.getIndexOf(primarySplitScreenStack)) { - primarySplitScreenStack.moveToFront(reason + " splitScreenToTop"); - } - } - } - - if (!isActivityTypeHome() && returnsToHomeStack()) { - // Make sure the home stack is behind this stack since that is where we should return to - // when this stack is no longer visible. - taskDisplayArea.moveHomeStackToFront(reason + " returnToHome"); - } - - if (isRootTask()) { - taskDisplayArea.positionStackAtTop(this, false /* includingParents */, reason); - } - if (task == null) { - task = this; - } - task.getParent().positionChildAt(POSITION_TOP, task, true /* includingParents */); - } - - /** - * This moves 'task' to the back of this task and also recursively moves this task to the back - * of its parents (if applicable). - * - * @param reason The reason for moving the stack to the back. - * @param task If non-null, the task will be moved to the bottom of the stack. - **/ - void moveToBack(String reason, Task task) { - if (!isAttached()) { - return; - } - final TaskDisplayArea displayArea = getDisplayArea(); - if (!mCreatedByOrganizer) { - // If this is just a normal task, so move to back of parent and then move 'task' to - // back of this. - final WindowContainer parent = getParent(); - final Task parentTask = parent != null ? parent.asTask() : null; - if (parentTask != null) { - ((ActivityStack) parentTask).moveToBack(reason, this); - } else { - displayArea.positionStackAtBottom(this, reason); - } - if (task != null && task != this) { - positionChildAtBottom(task); - } - return; - } - if (task == null || task == this) { - return; - } - // This is a created-by-organizer task. In this case, let the organizer deal with this - // task's ordering. However, we still need to move 'task' to back. The intention is that - // this ends up behind the home-task so that it is made invisible; so, if the home task - // is not a child of this, reparent 'task' to the back of the home task's actual parent. - displayArea.positionTaskBehindHome((ActivityStack) task); - } - - // TODO: Should each user have there own stacks? - @Override - void switchUser(int userId) { - if (mCurrentUser == userId) { - return; - } - mCurrentUser = userId; - - super.switchUser(userId); - forAllLeafTasks((t) -> { - if (t.showToCurrentUser() && t != this) { - mChildren.remove(t); - mChildren.add(t); - } - }, true /* traverseTopToBottom */); - } - - void minimalResumeActivityLocked(ActivityRecord r) { - if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + r + " (starting new instance)" - + " callers=" + Debug.getCallers(5)); - r.setState(RESUMED, "minimalResumeActivityLocked"); - r.completeResumeLocked(); - } - - private void clearLaunchTime(ActivityRecord r) { - // Make sure that there is no activity waiting for this to launch. - if (!mStackSupervisor.mWaitingActivityLaunched.isEmpty()) { - mStackSupervisor.removeIdleTimeoutForActivity(r); - mStackSupervisor.scheduleIdleTimeout(r); - } - } - - void awakeFromSleepingLocked() { - // Ensure activities are no longer sleeping. - forAllActivities((Consumer<ActivityRecord>) (r) -> r.setSleeping(false)); - if (mPausingActivity != null) { - Slog.d(TAG, "awakeFromSleepingLocked: previously pausing activity didn't pause"); - mPausingActivity.activityPaused(true); - } - } - - void checkReadyForSleep() { - if (shouldSleepActivities() && goToSleepIfPossible(false /* shuttingDown */)) { - mStackSupervisor.checkReadyForSleepLocked(true /* allowDelay */); - } - } - - /** - * Tries to put the activities in the stack to sleep. - * - * If the stack is not in a state where its activities can be put to sleep, this function will - * start any necessary actions to move the stack into such a state. It is expected that this - * function get called again when those actions complete. - * - * @param shuttingDown true when the called because the device is shutting down. - * @return true if the stack finished going to sleep, false if the stack only started the - * process of going to sleep (checkReadyForSleep will be called when that process finishes). - */ - boolean goToSleepIfPossible(boolean shuttingDown) { - boolean shouldSleep = true; - - if (mResumedActivity != null) { - // Still have something resumed; can't sleep until it is paused. - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep needs to pause " + mResumedActivity); - if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING, - "Sleep => pause with userLeaving=false"); - - startPausingLocked(false /* userLeaving */, true /* uiSleeping */, null /* resuming */); - shouldSleep = false ; - } else if (mPausingActivity != null) { - // Still waiting for something to pause; can't sleep yet. - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity); - shouldSleep = false; - } - - if (!shuttingDown) { - if (containsActivityFromStack(mStackSupervisor.mStoppingActivities)) { - // Still need to tell some activities to stop; can't sleep yet. - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still need to stop " - + mStackSupervisor.mStoppingActivities.size() + " activities"); - - mStackSupervisor.scheduleIdle(); - shouldSleep = false; - } - } - - if (shouldSleep) { - goToSleep(); - } - - return shouldSleep; - } - - void goToSleep() { - // Make sure all visible activities are now sleeping. This will update the activity's - // visibility and onStop() will be called. - forAllActivities((r) -> { - if (r.isState(STARTED, RESUMED, PAUSING, PAUSED, STOPPING, STOPPED)) { - r.setSleeping(true); - } - }); - - // Ensure visibility after updating sleep states without updating configuration, - // as activities are about to be sent to sleep. - ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, - !PRESERVE_WINDOWS); - } - - private boolean containsActivityFromStack(List<ActivityRecord> rs) { - for (ActivityRecord r : rs) { - if (r.getRootTask() == this) { - return true; - } - } - return false; - } - - /** - * Start pausing the currently resumed activity. It is an error to call this if there - * is already an activity being paused or there is no resumed activity. - * - * @param userLeaving True if this should result in an onUserLeaving to the current activity. - * @param uiSleeping True if this is happening with the user interface going to sleep (the - * screen turning off). - * @param resuming The activity we are currently trying to resume or null if this is not being - * called as part of resuming the top activity, so we shouldn't try to instigate - * a resume here if not null. - * @return Returns true if an activity now is in the PAUSING state, and we are waiting for - * it to tell us when it is done. - */ - final boolean startPausingLocked(boolean userLeaving, boolean uiSleeping, - ActivityRecord resuming) { - if (mPausingActivity != null) { - Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity - + " state=" + mPausingActivity.getState()); - if (!shouldSleepActivities()) { - // Avoid recursion among check for sleep and complete pause during sleeping. - // Because activity will be paused immediately after resume, just let pause - // be completed by the order of activity paused from clients. - completePauseLocked(false, resuming); - } - } - ActivityRecord prev = mResumedActivity; - - if (prev == null) { - if (resuming == null) { - Slog.wtf(TAG, "Trying to pause when nothing is resumed"); - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - return false; - } - - if (prev == resuming) { - Slog.wtf(TAG, "Trying to pause activity that is in process of being resumed"); - return false; - } - - if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to PAUSING: " + prev); - else if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Start pausing: " + prev); - mPausingActivity = prev; - mLastPausedActivity = prev; - mLastNoHistoryActivity = prev.isNoHistory() ? prev : null; - prev.setState(PAUSING, "startPausingLocked"); - prev.getTask().touchActiveTime(); - clearLaunchTime(prev); - - mAtmService.updateCpuStats(); - - boolean pauseImmediately = false; - if (resuming != null && (resuming.info.flags & FLAG_RESUME_WHILE_PAUSING) != 0) { - // If the flag RESUME_WHILE_PAUSING is set, then continue to schedule the previous - // activity to be paused, while at the same time resuming the new resume activity - // only if the previous activity can't go into Pip since we want to give Pip - // activities a chance to enter Pip before resuming the next activity. - final boolean lastResumedCanPip = prev != null && prev.checkEnterPictureInPictureState( - "shouldResumeWhilePausing", userLeaving); - if (!lastResumedCanPip) { - pauseImmediately = true; - } - } - - if (prev.attachedToProcess()) { - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueueing pending pause: " + prev); - try { - EventLogTags.writeWmPauseActivity(prev.mUserId, System.identityHashCode(prev), - prev.shortComponentName, "userLeaving=" + userLeaving); - - mAtmService.getLifecycleManager().scheduleTransaction(prev.app.getThread(), - prev.appToken, PauseActivityItem.obtain(prev.finishing, userLeaving, - prev.configChangeFlags, pauseImmediately)); - } catch (Exception e) { - // Ignore exception, if process died other code will cleanup. - Slog.w(TAG, "Exception thrown during pause", e); - mPausingActivity = null; - mLastPausedActivity = null; - mLastNoHistoryActivity = null; - } - } else { - mPausingActivity = null; - mLastPausedActivity = null; - mLastNoHistoryActivity = null; - } - - // If we are not going to sleep, we want to ensure the device is - // awake until the next activity is started. - if (!uiSleeping && !mAtmService.isSleepingOrShuttingDownLocked()) { - mStackSupervisor.acquireLaunchWakelock(); - } - - if (mPausingActivity != null) { - // Have the window manager pause its key dispatching until the new - // activity has started. If we're pausing the activity just because - // the screen is being turned off and the UI is sleeping, don't interrupt - // key dispatch; the same activity will pick it up again on wakeup. - if (!uiSleeping) { - prev.pauseKeyDispatchingLocked(); - } else if (DEBUG_PAUSE) { - Slog.v(TAG_PAUSE, "Key dispatch not paused for screen off"); - } - - if (pauseImmediately) { - // If the caller said they don't want to wait for the pause, then complete - // the pause now. - completePauseLocked(false, resuming); - return false; - - } else { - prev.schedulePauseTimeout(); - return true; - } - - } else { - // This activity failed to schedule the - // pause, so just treat it as being paused now. - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Activity not running, resuming next."); - if (resuming == null) { - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - return false; - } - } - - @VisibleForTesting - void completePauseLocked(boolean resumeNext, ActivityRecord resuming) { - ActivityRecord prev = mPausingActivity; - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Complete pause: " + prev); - - if (prev != null) { - prev.setWillCloseOrEnterPip(false); - final boolean wasStopping = prev.isState(STOPPING); - prev.setState(PAUSED, "completePausedLocked"); - if (prev.finishing) { - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Executing finish of activity: " + prev); - prev = prev.completeFinishing("completePausedLocked"); - } else if (prev.hasProcess()) { - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueue pending stop if needed: " + prev - + " wasStopping=" + wasStopping - + " visibleRequested=" + prev.mVisibleRequested); - if (prev.deferRelaunchUntilPaused) { - // Complete the deferred relaunch that was waiting for pause to complete. - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Re-launching after pause: " + prev); - prev.relaunchActivityLocked(prev.preserveWindowOnDeferredRelaunch); - } else if (wasStopping) { - // We are also stopping, the stop request must have gone soon after the pause. - // We can't clobber it, because the stop confirmation will not be handled. - // We don't need to schedule another stop, we only need to let it happen. - prev.setState(STOPPING, "completePausedLocked"); - } else if (!prev.mVisibleRequested || shouldSleepOrShutDownActivities()) { - // Clear out any deferred client hide we might currently have. - prev.setDeferHidingClient(false); - // If we were visible then resumeTopActivities will release resources before - // stopping. - prev.addToStopping(true /* scheduleIdle */, false /* idleDelayed */, - "completePauseLocked"); - } - } else { - if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "App died during pause, not stopping: " + prev); - prev = null; - } - // It is possible the activity was freezing the screen before it was paused. - // In that case go ahead and remove the freeze this activity has on the screen - // since it is no longer visible. - if (prev != null) { - prev.stopFreezingScreenLocked(true /*force*/); - } - mPausingActivity = null; - } - - if (resumeNext) { - final ActivityStack topStack = mRootWindowContainer.getTopDisplayFocusedStack(); - if (topStack != null && !topStack.shouldSleepOrShutDownActivities()) { - mRootWindowContainer.resumeFocusedStacksTopActivities(topStack, prev, null); - } else { - checkReadyForSleep(); - final ActivityRecord top = topStack != null ? topStack.topRunningActivity() : null; - if (top == null || (prev != null && top != prev)) { - // If there are no more activities available to run, do resume anyway to start - // something. Also if the top activity on the stack is not the just paused - // activity, we need to go ahead and resume it to ensure we complete an - // in-flight app switch. - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - } - } - - if (prev != null) { - prev.resumeKeyDispatchingLocked(); - - if (prev.hasProcess() && prev.cpuTimeAtResume > 0) { - final long diff = prev.app.getCpuTime() - prev.cpuTimeAtResume; - if (diff > 0) { - final Runnable r = PooledLambda.obtainRunnable( - ActivityManagerInternal::updateForegroundTimeIfOnBattery, - mAtmService.mAmInternal, prev.info.packageName, - prev.info.applicationInfo.uid, - diff); - mAtmService.mH.post(r); - } - } - prev.cpuTimeAtResume = 0; // reset it - } - - mRootWindowContainer.ensureActivitiesVisible(resuming, 0, !PRESERVE_WINDOWS); - - // Notify when the task stack has changed, but only if visibilities changed (not just - // focus). Also if there is an active pinned stack - we always want to notify it about - // task stack changes, because its positioning may depend on it. - if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause - || (getDisplayArea() != null && getDisplayArea().hasPinnedTask())) { - mAtmService.getTaskChangeNotificationController().notifyTaskStackChanged(); - mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = false; - } - } - - boolean isTopStackInDisplayArea() { - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - return taskDisplayArea != null && taskDisplayArea.isTopStack(this); - } - - /** - * @return {@code true} if this is the focused stack on its current display, {@code false} - * otherwise. - */ - boolean isFocusedStackOnDisplay() { - final DisplayContent display = getDisplay(); - return display != null && this == display.getFocusedStack(); - } - - /** - * Make sure that all activities that need to be visible in the stack (that is, they - * currently can be seen by the user) actually are and update their configuration. - * @param starting The top most activity in the task. - * The activity is either starting or resuming. - * Caller should ensure starting activity is visible. - * @param preserveWindows Flag indicating whether windows should be preserved when updating - * configuration in {@link mEnsureActivitiesVisibleHelper}. - * @param configChanges Parts of the configuration that changed for this activity for evaluating - * if the screen should be frozen as part of - * {@link mEnsureActivitiesVisibleHelper}. - * - */ - void ensureActivitiesVisible(@Nullable ActivityRecord starting, int configChanges, - boolean preserveWindows) { - ensureActivitiesVisible(starting, configChanges, preserveWindows, true /* notifyClients */); - } - - /** - * Ensure visibility with an option to also update the configuration of visible activities. - * @see #ensureActivitiesVisible(ActivityRecord, int, boolean) - * @see RootWindowContainer#ensureActivitiesVisible(ActivityRecord, int, boolean) - * @param starting The top most activity in the task. - * The activity is either starting or resuming. - * Caller should ensure starting activity is visible. - * @param notifyClients Flag indicating whether the visibility updates should be sent to the - * clients in {@link mEnsureActivitiesVisibleHelper}. - * @param preserveWindows Flag indicating whether windows should be preserved when updating - * configuration in {@link mEnsureActivitiesVisibleHelper}. - * @param configChanges Parts of the configuration that changed for this activity for evaluating - * if the screen should be frozen as part of - * {@link mEnsureActivitiesVisibleHelper}. - */ - // TODO: Should be re-worked based on the fact that each task as a stack in most cases. - void ensureActivitiesVisible(@Nullable ActivityRecord starting, int configChanges, - boolean preserveWindows, boolean notifyClients) { - mTopActivityOccludesKeyguard = false; - mTopDismissingKeyguardActivity = null; - mStackSupervisor.beginActivityVisibilityUpdate(); - try { - mEnsureActivitiesVisibleHelper.process( - starting, configChanges, preserveWindows, notifyClients); - - if (mTranslucentActivityWaiting != null && - mUndrawnActivitiesBelowTopTranslucent.isEmpty()) { - // Nothing is getting drawn or everything was already visible, don't wait for timeout. - notifyActivityDrawnLocked(null); - } - } finally { - mStackSupervisor.endActivityVisibilityUpdate(); - } - } - - /** - * @return true if the top visible activity wants to occlude the Keyguard, false otherwise - */ - boolean topActivityOccludesKeyguard() { - return mTopActivityOccludesKeyguard; - } - - /** - * Returns true if this stack should be resized to match the bounds specified by - * {@link ActivityOptions#setLaunchBounds} when launching an activity into the stack. - */ - boolean shouldResizeStackWithLaunchBounds() { - return inPinnedWindowingMode(); - } - - // TODO(NOW!) - /** - * Returns {@code true} if this is the top-most split-screen-primary or - * split-screen-secondary stack, {@code false} otherwise. - */ - boolean isTopSplitScreenStack() { - return inSplitScreenWindowingMode() - && this == getDisplayArea().getTopStackInWindowingMode(getWindowingMode()); - } - - /** - * @return the top most visible activity that wants to dismiss Keyguard - */ - ActivityRecord getTopDismissingKeyguardActivity() { - return mTopDismissingKeyguardActivity; - } - - /** - * Checks whether {@param r} should be visible depending on Keyguard state and updates - * {@link #mTopActivityOccludesKeyguard} and {@link #mTopDismissingKeyguardActivity} if - * necessary. - * - * @return true if {@param r} is visible taken Keyguard state into account, false otherwise - */ - boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, boolean isTop) { - int displayId = getDisplayId(); - if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY; - - final boolean keyguardOrAodShowing = mStackSupervisor.getKeyguardController() - .isKeyguardOrAodShowing(displayId); - final boolean keyguardLocked = mStackSupervisor.getKeyguardController().isKeyguardLocked(); - final boolean showWhenLocked = r.canShowWhenLocked(); - final boolean dismissKeyguard = r.containsDismissKeyguardWindow(); - if (shouldBeVisible) { - if (dismissKeyguard && mTopDismissingKeyguardActivity == null) { - mTopDismissingKeyguardActivity = r; - } - - // Only the top activity may control occluded, as we can't occlude the Keyguard if the - // top app doesn't want to occlude it. - if (isTop) { - mTopActivityOccludesKeyguard |= showWhenLocked; - } - - final boolean canShowWithKeyguard = canShowWithInsecureKeyguard() - && mStackSupervisor.getKeyguardController().canDismissKeyguard(); - if (canShowWithKeyguard) { - return true; - } - } - if (keyguardOrAodShowing) { - // If keyguard is showing, nothing is visible, except if we are able to dismiss Keyguard - // right away and AOD isn't visible. - return shouldBeVisible && mStackSupervisor.getKeyguardController() - .canShowActivityWhileKeyguardShowing(r, dismissKeyguard); - } else if (keyguardLocked) { - return shouldBeVisible && mStackSupervisor.getKeyguardController().canShowWhileOccluded( - dismissKeyguard, showWhenLocked); - } else { - return shouldBeVisible; - } - } - - /** - * Check if the display to which this stack is attached has - * {@link Display#FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD} applied. - */ - boolean canShowWithInsecureKeyguard() { - final DisplayContent displayContent = getDisplay(); - if (displayContent == null) { - throw new IllegalStateException("Stack is not attached to any display, stackId=" - + getRootTaskId()); - } - - final int flags = displayContent.mDisplay.getFlags(); - return (flags & FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD) != 0; - } - - void checkTranslucentActivityWaiting(ActivityRecord top) { - if (mTranslucentActivityWaiting != top) { - mUndrawnActivitiesBelowTopTranslucent.clear(); - if (mTranslucentActivityWaiting != null) { - // Call the callback with a timeout indication. - notifyActivityDrawnLocked(null); - mTranslucentActivityWaiting = null; - } - mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG); - } - } - - void convertActivityToTranslucent(ActivityRecord r) { - mTranslucentActivityWaiting = r; - mUndrawnActivitiesBelowTopTranslucent.clear(); - mHandler.sendEmptyMessageDelayed(TRANSLUCENT_TIMEOUT_MSG, TRANSLUCENT_CONVERSION_TIMEOUT); - } - - /** - * Called as activities below the top translucent activity are redrawn. When the last one is - * redrawn notify the top activity by calling - * {@link Activity#onTranslucentConversionComplete}. - * - * @param r The most recent background activity to be drawn. Or, if r is null then a timeout - * occurred and the activity will be notified immediately. - */ - void notifyActivityDrawnLocked(ActivityRecord r) { - if ((r == null) - || (mUndrawnActivitiesBelowTopTranslucent.remove(r) && - mUndrawnActivitiesBelowTopTranslucent.isEmpty())) { - // The last undrawn activity below the top has just been drawn. If there is an - // opaque activity at the top, notify it that it can become translucent safely now. - final ActivityRecord waitingActivity = mTranslucentActivityWaiting; - mTranslucentActivityWaiting = null; - mUndrawnActivitiesBelowTopTranslucent.clear(); - mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG); - - if (waitingActivity != null) { - mWmService.setWindowOpaqueLocked(waitingActivity.appToken, false); - if (waitingActivity.attachedToProcess()) { - try { - waitingActivity.app.getThread().scheduleTranslucentConversionComplete( - waitingActivity.appToken, r != null); - } catch (RemoteException e) { - } - } - } - } - } - - /** - * Ensure that the top activity in the stack is resumed. - * - * @param prev The previously resumed activity, for when in the process - * of pausing; can be null to call from elsewhere. - * @param options Activity options. - * - * @return Returns true if something is being resumed, or false if - * nothing happened. - * - * NOTE: It is not safe to call this method directly as it can cause an activity in a - * non-focused stack to be resumed. - * Use {@link RootWindowContainer#resumeFocusedStacksTopActivities} to resume the - * right activity for the current system state. - */ - @GuardedBy("mService") - boolean resumeTopActivityUncheckedLocked(ActivityRecord prev, ActivityOptions options) { - if (mInResumeTopActivity) { - // Don't even start recursing. - return false; - } - - boolean result = false; - try { - // Protect against recursion. - mInResumeTopActivity = true; - result = resumeTopActivityInnerLocked(prev, options); - - // When resuming the top activity, it may be necessary to pause the top activity (for - // example, returning to the lock screen. We suppress the normal pause logic in - // {@link #resumeTopActivityUncheckedLocked}, since the top activity is resumed at the - // end. We call the {@link ActivityStackSupervisor#checkReadyForSleepLocked} again here - // to ensure any necessary pause logic occurs. In the case where the Activity will be - // shown regardless of the lock screen, the call to - // {@link ActivityStackSupervisor#checkReadyForSleepLocked} is skipped. - final ActivityRecord next = topRunningActivity(true /* focusableOnly */); - if (next == null || !next.canTurnScreenOn()) { - checkReadyForSleep(); - } - } finally { - mInResumeTopActivity = false; - } - - return result; - } - - @GuardedBy("mService") - private boolean resumeTopActivityInnerLocked(ActivityRecord prev, ActivityOptions options) { - if (!mAtmService.isBooting() && !mAtmService.isBooted()) { - // Not ready yet! - return false; - } - - // Find the next top-most activity to resume in this stack that is not finishing and is - // focusable. If it is not focusable, we will fall into the case below to resume the - // top activity in the next focusable task. - ActivityRecord next = topRunningActivity(true /* focusableOnly */); - - final boolean hasRunningActivity = next != null; - - // TODO: Maybe this entire condition can get removed? - if (hasRunningActivity && !isAttached()) { - return false; - } - - mRootWindowContainer.cancelInitializingActivities(); - - // Remember how we'll process this pause/resume situation, and ensure - // that the state is reset however we wind up proceeding. - boolean userLeaving = mStackSupervisor.mUserLeaving; - mStackSupervisor.mUserLeaving = false; - - if (!hasRunningActivity) { - // There are no activities left in the stack, let's look somewhere else. - return resumeNextFocusableActivityWhenStackIsEmpty(prev, options); - } - - next.delayedResume = false; - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - - // If the top activity is the resumed one, nothing to do. - if (mResumedActivity == next && next.isState(RESUMED) - && taskDisplayArea.allResumedActivitiesComplete()) { - // Make sure we have executed any pending transitions, since there - // should be nothing left to do at this point. - executeAppTransition(options); - if (DEBUG_STATES) Slog.d(TAG_STATES, - "resumeTopActivityLocked: Top activity resumed " + next); - return false; - } - - if (!next.canResumeByCompat()) { - return false; - } - - // If we are currently pausing an activity, then don't do anything until that is done. - final boolean allPausedComplete = mRootWindowContainer.allPausedActivitiesComplete(); - if (!allPausedComplete) { - if (DEBUG_SWITCH || DEBUG_PAUSE || DEBUG_STATES) { - Slog.v(TAG_PAUSE, "resumeTopActivityLocked: Skip resume: some activity pausing."); - } - return false; - } - - // If we are sleeping, and there is no resumed activity, and the top activity is paused, - // well that is the state we want. - if (shouldSleepOrShutDownActivities() - && mLastPausedActivity == next - && mRootWindowContainer.allPausedActivitiesComplete()) { - // If the current top activity may be able to occlude keyguard but the occluded state - // has not been set, update visibility and check again if we should continue to resume. - boolean nothingToResume = true; - if (!mAtmService.mShuttingDown) { - final boolean canShowWhenLocked = !mTopActivityOccludesKeyguard - && next.canShowWhenLocked(); - final boolean mayDismissKeyguard = mTopDismissingKeyguardActivity != next - && next.containsDismissKeyguardWindow(); - - if (canShowWhenLocked || mayDismissKeyguard) { - ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, - !PRESERVE_WINDOWS); - nothingToResume = shouldSleepActivities(); - } else if (next.currentLaunchCanTurnScreenOn() && next.canTurnScreenOn()) { - nothingToResume = false; - } - } - if (nothingToResume) { - // Make sure we have executed any pending transitions, since there - // should be nothing left to do at this point. - executeAppTransition(options); - if (DEBUG_STATES) Slog.d(TAG_STATES, - "resumeTopActivityLocked: Going to sleep and all paused"); - return false; - } - } - - // Make sure that the user who owns this activity is started. If not, - // we will just leave it as is because someone should be bringing - // another user's activities to the top of the stack. - if (!mAtmService.mAmInternal.hasStartedUserState(next.mUserId)) { - Slog.w(TAG, "Skipping resume of top activity " + next - + ": user " + next.mUserId + " is stopped"); - return false; - } - - // The activity may be waiting for stop, but that is no longer - // appropriate for it. - mStackSupervisor.mStoppingActivities.remove(next); - next.setSleeping(false); - - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resuming " + next); - - // If we are currently pausing an activity, then don't do anything until that is done. - if (!mRootWindowContainer.allPausedActivitiesComplete()) { - if (DEBUG_SWITCH || DEBUG_PAUSE || DEBUG_STATES) Slog.v(TAG_PAUSE, - "resumeTopActivityLocked: Skip resume: some activity pausing."); - - return false; - } - - mStackSupervisor.setLaunchSource(next.info.applicationInfo.uid); - - ActivityRecord lastResumed = null; - final ActivityStack lastFocusedStack = taskDisplayArea.getLastFocusedStack(); - if (lastFocusedStack != null && lastFocusedStack != this) { - // So, why aren't we using prev here??? See the param comment on the method. prev doesn't - // represent the last resumed activity. However, the last focus stack does if it isn't null. - lastResumed = lastFocusedStack.mResumedActivity; - if (userLeaving && inMultiWindowMode() && lastFocusedStack.shouldBeVisible(next)) { - // The user isn't leaving if this stack is the multi-window mode and the last - // focused stack should still be visible. - if(DEBUG_USER_LEAVING) Slog.i(TAG_USER_LEAVING, "Overriding userLeaving to false" - + " next=" + next + " lastResumed=" + lastResumed); - userLeaving = false; - } - } - - boolean pausing = taskDisplayArea.pauseBackStacks(userLeaving, next); - if (mResumedActivity != null) { - if (DEBUG_STATES) Slog.d(TAG_STATES, - "resumeTopActivityLocked: Pausing " + mResumedActivity); - pausing |= startPausingLocked(userLeaving, false /* uiSleeping */, next); - } - if (pausing) { - if (DEBUG_SWITCH || DEBUG_STATES) Slog.v(TAG_STATES, - "resumeTopActivityLocked: Skip resume: need to start pausing"); - // At this point we want to put the upcoming activity's process - // at the top of the LRU list, since we know we will be needing it - // very soon and it would be a waste to let it get killed if it - // happens to be sitting towards the end. - if (next.attachedToProcess()) { - next.app.updateProcessInfo(false /* updateServiceConnectionActivities */, - true /* activityChange */, false /* updateOomAdj */, - false /* addPendingTopUid */); - } else if (!next.isProcessRunning()) { - // Since the start-process is asynchronous, if we already know the process of next - // activity isn't running, we can start the process earlier to save the time to wait - // for the current activity to be paused. - final boolean isTop = this == taskDisplayArea.getFocusedStack(); - mAtmService.startProcessAsync(next, false /* knownToBeDead */, isTop, - isTop ? "pre-top-activity" : "pre-activity"); - } - if (lastResumed != null) { - lastResumed.setWillCloseOrEnterPip(true); - } - return true; - } else if (mResumedActivity == next && next.isState(RESUMED) - && taskDisplayArea.allResumedActivitiesComplete()) { - // It is possible for the activity to be resumed when we paused back stacks above if the - // next activity doesn't have to wait for pause to complete. - // So, nothing else to-do except: - // Make sure we have executed any pending transitions, since there - // should be nothing left to do at this point. - executeAppTransition(options); - if (DEBUG_STATES) Slog.d(TAG_STATES, - "resumeTopActivityLocked: Top activity resumed (dontWaitForPause) " + next); - return true; - } - - // If the most recent activity was noHistory but was only stopped rather - // than stopped+finished because the device went to sleep, we need to make - // sure to finish it as we're making a new activity topmost. - if (shouldSleepActivities() && mLastNoHistoryActivity != null && - !mLastNoHistoryActivity.finishing) { - if (DEBUG_STATES) Slog.d(TAG_STATES, - "no-history finish of " + mLastNoHistoryActivity + " on new resume"); - mLastNoHistoryActivity.finishIfPossible("resume-no-history", false /* oomAdj */); - mLastNoHistoryActivity = null; - } - - if (prev != null && prev != next && next.nowVisible) { - - // The next activity is already visible, so hide the previous - // activity's windows right now so we can show the new one ASAP. - // We only do this if the previous is finishing, which should mean - // it is on top of the one being resumed so hiding it quickly - // is good. Otherwise, we want to do the normal route of allowing - // the resumed activity to be shown so we can decide if the - // previous should actually be hidden depending on whether the - // new one is found to be full-screen or not. - if (prev.finishing) { - prev.setVisibility(false); - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, - "Not waiting for visible to hide: " + prev - + ", nowVisible=" + next.nowVisible); - } else { - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, - "Previous already visible but still waiting to hide: " + prev - + ", nowVisible=" + next.nowVisible); - } - - } - - // Launching this app's activity, make sure the app is no longer - // considered stopped. - try { - mAtmService.getPackageManager().setPackageStoppedState( - next.packageName, false, next.mUserId); /* TODO: Verify if correct userid */ - } catch (RemoteException e1) { - } catch (IllegalArgumentException e) { - Slog.w(TAG, "Failed trying to unstop package " - + next.packageName + ": " + e); - } - - // We are starting up the next activity, so tell the window manager - // that the previous one will be hidden soon. This way it can know - // to ignore it when computing the desired screen orientation. - boolean anim = true; - final DisplayContent dc = taskDisplayArea.mDisplayContent; - if (prev != null) { - if (prev.finishing) { - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, - "Prepare close transition: prev=" + prev); - if (mStackSupervisor.mNoAnimActivities.contains(prev)) { - anim = false; - dc.prepareAppTransition(TRANSIT_NONE, false); - } else { - dc.prepareAppTransition( - prev.getTask() == next.getTask() ? TRANSIT_ACTIVITY_CLOSE - : TRANSIT_TASK_CLOSE, false); - } - prev.setVisibility(false); - } else { - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, - "Prepare open transition: prev=" + prev); - if (mStackSupervisor.mNoAnimActivities.contains(next)) { - anim = false; - dc.prepareAppTransition(TRANSIT_NONE, false); - } else { - dc.prepareAppTransition( - prev.getTask() == next.getTask() ? TRANSIT_ACTIVITY_OPEN - : next.mLaunchTaskBehind ? TRANSIT_TASK_OPEN_BEHIND - : TRANSIT_TASK_OPEN, false); - } - } - } else { - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare open transition: no previous"); - if (mStackSupervisor.mNoAnimActivities.contains(next)) { - anim = false; - dc.prepareAppTransition(TRANSIT_NONE, false); - } else { - dc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false); - } - } - - if (anim) { - next.applyOptionsLocked(); - } else { - next.clearOptionsLocked(); - } - - mStackSupervisor.mNoAnimActivities.clear(); - - if (next.attachedToProcess()) { - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resume running: " + next - + " stopped=" + next.stopped - + " visibleRequested=" + next.mVisibleRequested); - - // If the previous activity is translucent, force a visibility update of - // the next activity, so that it's added to WM's opening app list, and - // transition animation can be set up properly. - // For example, pressing Home button with a translucent activity in focus. - // Launcher is already visible in this case. If we don't add it to opening - // apps, maybeUpdateTransitToWallpaper() will fail to identify this as a - // TRANSIT_WALLPAPER_OPEN animation, and run some funny animation. - final boolean lastActivityTranslucent = lastFocusedStack != null - && (lastFocusedStack.inMultiWindowMode() - || (lastFocusedStack.mLastPausedActivity != null - && !lastFocusedStack.mLastPausedActivity.occludesParent())); - - // This activity is now becoming visible. - if (!next.mVisibleRequested || next.stopped || lastActivityTranslucent) { - next.setVisibility(true); - } - - // schedule launch ticks to collect information about slow apps. - next.startLaunchTickingLocked(); - - ActivityRecord lastResumedActivity = - lastFocusedStack == null ? null : lastFocusedStack.mResumedActivity; - final ActivityState lastState = next.getState(); - - mAtmService.updateCpuStats(); - - if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + next - + " (in existing)"); - - next.setState(RESUMED, "resumeTopActivityInnerLocked"); - - next.app.updateProcessInfo(false /* updateServiceConnectionActivities */, - true /* activityChange */, true /* updateOomAdj */, - true /* addPendingTopUid */); - - // Have the window manager re-evaluate the orientation of - // the screen based on the new activity order. - boolean notUpdated = true; - - // Activity should also be visible if set mLaunchTaskBehind to true (see - // ActivityRecord#shouldBeVisibleIgnoringKeyguard()). - if (shouldBeVisible(next)) { - // We have special rotation behavior when here is some active activity that - // requests specific orientation or Keyguard is locked. Make sure all activity - // visibilities are set correctly as well as the transition is updated if needed - // to get the correct rotation behavior. Otherwise the following call to update - // the orientation may cause incorrect configurations delivered to client as a - // result of invisible window resize. - // TODO: Remove this once visibilities are set correctly immediately when - // starting an activity. - notUpdated = !mRootWindowContainer.ensureVisibilityAndConfig(next, getDisplayId(), - true /* markFrozenIfConfigChanged */, false /* deferResume */); - } - - if (notUpdated) { - // The configuration update wasn't able to keep the existing - // instance of the activity, and instead started a new one. - // We should be all done, but let's just make sure our activity - // is still at the top and schedule another run if something - // weird happened. - ActivityRecord nextNext = topRunningActivity(); - if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG_STATES, - "Activity config changed during resume: " + next - + ", new next: " + nextNext); - if (nextNext != next) { - // Do over! - mStackSupervisor.scheduleResumeTopActivities(); - } - if (!next.mVisibleRequested || next.stopped) { - next.setVisibility(true); - } - next.completeResumeLocked(); - return true; - } - - try { - final ClientTransaction transaction = - ClientTransaction.obtain(next.app.getThread(), next.appToken); - // Deliver all pending results. - ArrayList<ResultInfo> a = next.results; - if (a != null) { - final int N = a.size(); - if (!next.finishing && N > 0) { - if (DEBUG_RESULTS) Slog.v(TAG_RESULTS, - "Delivering results to " + next + ": " + a); - transaction.addCallback(ActivityResultItem.obtain(a)); - } - } - - if (next.newIntents != null) { - transaction.addCallback( - NewIntentItem.obtain(next.newIntents, true /* resume */)); - } - - // Well the app will no longer be stopped. - // Clear app token stopped state in window manager if needed. - next.notifyAppResumed(next.stopped); - - EventLogTags.writeWmResumeActivity(next.mUserId, System.identityHashCode(next), - next.getTask().mTaskId, next.shortComponentName); - - next.setSleeping(false); - mAtmService.getAppWarningsLocked().onResumeActivity(next); - next.app.setPendingUiCleanAndForceProcessStateUpTo(mAtmService.mTopProcessState); - next.clearOptionsLocked(); - transaction.setLifecycleStateRequest( - ResumeActivityItem.obtain(next.app.getReportedProcState(), - dc.isNextTransitionForward())); - mAtmService.getLifecycleManager().scheduleTransaction(transaction); - - if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Resumed " - + next); - } catch (Exception e) { - // Whoops, need to restart this activity! - if (DEBUG_STATES) Slog.v(TAG_STATES, "Resume failed; resetting state to " - + lastState + ": " + next); - next.setState(lastState, "resumeTopActivityInnerLocked"); - - // lastResumedActivity being non-null implies there is a lastStack present. - if (lastResumedActivity != null) { - lastResumedActivity.setState(RESUMED, "resumeTopActivityInnerLocked"); - } - - Slog.i(TAG, "Restarting because process died: " + next); - if (!next.hasBeenLaunched) { - next.hasBeenLaunched = true; - } else if (SHOW_APP_STARTING_PREVIEW && lastFocusedStack != null - && lastFocusedStack.isTopStackInDisplayArea()) { - next.showStartingWindow(null /* prev */, false /* newTask */, - false /* taskSwitch */); - } - mStackSupervisor.startSpecificActivity(next, true, false); - return true; - } - - // From this point on, if something goes wrong there is no way - // to recover the activity. - try { - next.completeResumeLocked(); - } catch (Exception e) { - // If any exception gets thrown, toss away this - // activity and try the next one. - Slog.w(TAG, "Exception thrown during resume of " + next, e); - next.finishIfPossible("resume-exception", true /* oomAdj */); - return true; - } - } else { - // Whoops, need to restart this activity! - if (!next.hasBeenLaunched) { - next.hasBeenLaunched = true; - } else { - if (SHOW_APP_STARTING_PREVIEW) { - next.showStartingWindow(null /* prev */, false /* newTask */, - false /* taskSwich */); - } - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Restarting: " + next); - } - if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Restarting " + next); - mStackSupervisor.startSpecificActivity(next, true, true); - } - - return true; - } - - /** - * Resume the next eligible activity in a focusable stack when this one does not have any - * running activities left. The focus will be adjusted to the next focusable stack and - * top running activities will be resumed in all focusable stacks. However, if the current stack - * is a home stack - we have to keep it focused, start and resume a home activity on the current - * display instead to make sure that the display is not empty. - */ - private boolean resumeNextFocusableActivityWhenStackIsEmpty(ActivityRecord prev, - ActivityOptions options) { - final String reason = "noMoreActivities"; - - if (!isActivityTypeHome()) { - final ActivityStack nextFocusedStack = adjustFocusToNextFocusableTask(reason); - if (nextFocusedStack != null) { - // Try to move focus to the next visible stack with a running activity if this - // stack is not covering the entire screen or is on a secondary display with no home - // stack. - return mRootWindowContainer.resumeFocusedStacksTopActivities(nextFocusedStack, - prev, null /* targetOptions */); - } - } - - // If the current stack is a home stack, or if focus didn't switch to a different stack - - // just start up the Launcher... - ActivityOptions.abort(options); - if (DEBUG_STATES) Slog.d(TAG_STATES, - "resumeNextFocusableActivityWhenStackIsEmpty: " + reason + ", go home"); - return mRootWindowContainer.resumeHomeActivity(prev, reason, getDisplayArea()); - } - - void startActivityLocked(ActivityRecord r, ActivityRecord focusedTopActivity, - boolean newTask, boolean keepCurTransition, ActivityOptions options) { - Task rTask = r.getTask(); - final boolean allowMoveToFront = options == null || !options.getAvoidMoveToFront(); - final boolean isOrhasTask = rTask == this || hasChild(rTask); - // mLaunchTaskBehind tasks get placed at the back of the task stack. - if (!r.mLaunchTaskBehind && allowMoveToFront && (!isOrhasTask || newTask)) { - // Last activity in task had been removed or ActivityManagerService is reusing task. - // Insert or replace. - // Might not even be in. - positionChildAtTop(rTask); - } - Task task = null; - if (!newTask && isOrhasTask) { - // Starting activity cannot be occluding activity, otherwise starting window could be - // remove immediately without transferring to starting activity. - final ActivityRecord occludingActivity = getOccludingActivityAbove(r); - if (occludingActivity != null) { - // Here it is! Now, if this is not yet visible (occluded by another task) to the - // user, then just add it without starting; it will get started when the user - // navigates back to it. - if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to task " + task, - new RuntimeException("here").fillInStackTrace()); - rTask.positionChildAtTop(r); - ActivityOptions.abort(options); - return; - } - } - - // Place a new activity at top of stack, so it is next to interact with the user. - - // If we are not placing the new activity frontmost, we do not want to deliver the - // onUserLeaving callback to the actual frontmost activity - final Task activityTask = r.getTask(); - if (task == activityTask && mChildren.indexOf(task) != (getChildCount() - 1)) { - mStackSupervisor.mUserLeaving = false; - if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING, - "startActivity() behind front, mUserLeaving=false"); - } - - task = activityTask; - - // Slot the activity into the history stack and proceed - if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to stack to task " + task, - new RuntimeException("here").fillInStackTrace()); - task.positionChildAtTop(r); - - // The transition animation and starting window are not needed if {@code allowMoveToFront} - // is false, because the activity won't be visible. - if ((!isHomeOrRecentsStack() || hasActivity()) && allowMoveToFront) { - final DisplayContent dc = getDisplay().mDisplayContent; - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, - "Prepare open transition: starting " + r); - if ((r.intent.getFlags() & Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) { - dc.prepareAppTransition(TRANSIT_NONE, keepCurTransition); - mStackSupervisor.mNoAnimActivities.add(r); - } else { - int transit = TRANSIT_ACTIVITY_OPEN; - if (newTask) { - if (r.mLaunchTaskBehind) { - transit = TRANSIT_TASK_OPEN_BEHIND; - } else if (getDisplay().isSingleTaskInstance()) { - // If a new task is being launched in a single task display, we don't need - // to play normal animation, but need to trigger a callback when an app - // transition is actually handled. So ignore already prepared activity, and - // override it. - transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY; - keepCurTransition = false; - } else { - // If a new task is being launched, then mark the existing top activity as - // supporting picture-in-picture while pausing only if the starting activity - // would not be considered an overlay on top of the current activity - // (eg. not fullscreen, or the assistant) - if (canEnterPipOnTaskSwitch(focusedTopActivity, - null /* toFrontTask */, r, options)) { - focusedTopActivity.supportsEnterPipOnTaskSwitch = true; - } - transit = TRANSIT_TASK_OPEN; - } - } - dc.prepareAppTransition(transit, keepCurTransition); - mStackSupervisor.mNoAnimActivities.remove(r); - } - boolean doShow = true; - if (newTask) { - // Even though this activity is starting fresh, we still need - // to reset it to make sure we apply affinities to move any - // existing activities from other tasks in to it. - // If the caller has requested that the target task be - // reset, then do so. - if ((r.intent.getFlags() & Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) != 0) { - resetTaskIfNeeded(r, r); - doShow = topRunningNonDelayedActivityLocked(null) == r; - } - } else if (options != null && options.getAnimationType() - == ActivityOptions.ANIM_SCENE_TRANSITION) { - doShow = false; - } - if (r.mLaunchTaskBehind) { - // Don't do a starting window for mLaunchTaskBehind. More importantly make sure we - // tell WindowManager that r is visible even though it is at the back of the stack. - r.setVisibility(true); - ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); - // Go ahead to execute app transition for this activity since the app transition - // will not be triggered through the resume channel. - getDisplay().mDisplayContent.executeAppTransition(); - } else if (SHOW_APP_STARTING_PREVIEW && doShow) { - // Figure out if we are transitioning from another activity that is - // "has the same starting icon" as the next one. This allows the - // window manager to keep the previous window it had previously - // created, if it still had one. - Task prevTask = r.getTask(); - ActivityRecord prev = prevTask.topActivityWithStartingWindow(); - if (prev != null) { - // We don't want to reuse the previous starting preview if: - // (1) The current activity is in a different task. - if (prev.getTask() != prevTask) { - prev = null; - } - // (2) The current activity is already displayed. - else if (prev.nowVisible) { - prev = null; - } - } - r.showStartingWindow(prev, newTask, isTaskSwitch(r, focusedTopActivity)); - } - } else { - // If this is the first activity, don't do any fancy animations, - // because there is nothing for it to animate on top of. - ActivityOptions.abort(options); - } - } - - /** - * @return Whether the switch to another task can trigger the currently running activity to - * enter PiP while it is pausing (if supported). Only one of {@param toFrontTask} or - * {@param toFrontActivity} should be set. - */ - private boolean canEnterPipOnTaskSwitch(ActivityRecord pipCandidate, - Task toFrontTask, ActivityRecord toFrontActivity, ActivityOptions opts) { - if (opts != null && opts.disallowEnterPictureInPictureWhileLaunching()) { - // Ensure the caller has requested not to trigger auto-enter PiP - return false; - } - if (pipCandidate == null || pipCandidate.inPinnedWindowingMode()) { - // Ensure that we do not trigger entering PiP an activity on the pinned stack - return false; - } - final ActivityStack targetStack = toFrontTask != null - ? toFrontTask.getStack() : toFrontActivity.getRootTask(); - if (targetStack != null && targetStack.isActivityTypeAssistant()) { - // Ensure the task/activity being brought forward is not the assistant - return false; - } - return true; - } - - private boolean isTaskSwitch(ActivityRecord r, ActivityRecord topFocusedActivity) { - return topFocusedActivity != null && r.getTask() != topFocusedActivity.getTask(); - } - - /** - * Reset the task by reparenting the activities that have same affinity to the task or - * reparenting the activities that have different affinityies out of the task, while these - * activities allow task reparenting. - * - * @param taskTop Top activity of the task might be reset. - * @param newActivity The activity that going to be started. - * @return The non-finishing top activity of the task after reset or the original task top - * activity if all activities within the task are finishing. - */ - ActivityRecord resetTaskIfNeeded(ActivityRecord taskTop, ActivityRecord newActivity) { - final boolean forceReset = - (newActivity.info.flags & ActivityInfo.FLAG_CLEAR_TASK_ON_LAUNCH) != 0; - final Task task = taskTop.getTask(); - - // If ActivityOptions are moved out and need to be aborted or moved to taskTop. - final ActivityOptions topOptions = sResetTargetTaskHelper.process(task, forceReset); - - if (mChildren.contains(task)) { - final ActivityRecord newTop = task.getTopNonFinishingActivity(); - if (newTop != null) { - taskTop = newTop; - } - } - - if (topOptions != null) { - // If we got some ActivityOptions from an activity on top that - // was removed from the task, propagate them to the new real top. - taskTop.updateOptionsLocked(topOptions); - } - - return taskTop; - } - - /** - * Finish the topmost activity that belongs to the crashed app. We may also finish the activity - * that requested launch of the crashed one to prevent launch-crash loop. - * @param app The app that crashed. - * @param reason Reason to perform this action. - * @return The task that was finished in this stack, {@code null} if top running activity does - * not belong to the crashed app. - */ - final Task finishTopCrashedActivityLocked(WindowProcessController app, String reason) { - final ActivityRecord r = topRunningActivity(); - if (r == null || r.app != app) { - return null; - } - if (r.isActivityTypeHome() && mAtmService.mHomeProcess == app) { - // Home activities should not be force-finished as we have nothing else to go - // back to. AppErrors will get to it after two crashes in MIN_CRASH_INTERVAL. - Slog.w(TAG, " Not force finishing home activity " - + r.intent.getComponent().flattenToShortString()); - return null; - } - Slog.w(TAG, " Force finishing activity " - + r.intent.getComponent().flattenToShortString()); - Task finishedTask = r.getTask(); - getDisplay().mDisplayContent.prepareAppTransition( - TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */); - r.finishIfPossible(reason, false /* oomAdj */); - - // Also terminate any activities below it that aren't yet stopped, to avoid a situation - // where one will get re-start our crashing activity once it gets resumed again. - final ActivityRecord activityBelow = getActivityBelow(r); - if (activityBelow != null) { - if (activityBelow.isState(STARTED, RESUMED, PAUSING, PAUSED)) { - if (!activityBelow.isActivityTypeHome() - || mAtmService.mHomeProcess != activityBelow.app) { - Slog.w(TAG, " Force finishing activity " - + activityBelow.intent.getComponent().flattenToShortString()); - activityBelow.finishIfPossible(reason, false /* oomAdj */); - } - } - } - - return finishedTask; - } - - void finishVoiceTask(IVoiceInteractionSession session) { - final PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::finishIfVoiceTask, - PooledLambda.__(Task.class), session.asBinder()); - forAllLeafTasks(c, true /* traverseTopToBottom */); - c.recycle(); - } - - private static void finishIfVoiceTask(Task tr, IBinder binder) { - if (tr.voiceSession != null && tr.voiceSession.asBinder() == binder) { - tr.forAllActivities((r) -> { - if (r.finishing) return; - r.finishIfPossible("finish-voice", false /* oomAdj */); - tr.mAtmService.updateOomAdj(); - }); - } else { - // Check if any of the activities are using voice - final PooledFunction f = PooledLambda.obtainFunction( - ActivityStack::finishIfVoiceActivity, PooledLambda.__(ActivityRecord.class), - binder); - tr.forAllActivities(f); - f.recycle(); - } - } - - private static boolean finishIfVoiceActivity(ActivityRecord r, IBinder binder) { - if (r.voiceSession == null || r.voiceSession.asBinder() != binder) return false; - // Inform of cancellation - r.clearVoiceSessionLocked(); - try { - r.app.getThread().scheduleLocalVoiceInteractionStarted(r.appToken, null); - } catch (RemoteException re) { - // Ok Boomer... - } - r.mAtmService.finishRunningVoiceLocked(); - return true; - } - - /** Finish all activities in the stack without waiting. */ - void finishAllActivitiesImmediately() { - if (!hasChild()) { - removeIfPossible(); - return; - } - forAllActivities((r) -> { - Slog.d(TAG, "finishAllActivitiesImmediatelyLocked: finishing " + r); - r.destroyIfPossible("finishAllActivitiesImmediately"); - }); - } - - /** @return true if the stack behind this one is a standard activity type. */ - private boolean inFrontOfStandardStack() { - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - if (taskDisplayArea == null) { - return false; - } - final int index = taskDisplayArea.getIndexOf(this); - if (index == 0) { - return false; - } - final ActivityStack stackBehind = taskDisplayArea.getChildAt(index - 1); - return stackBehind.isActivityTypeStandard(); - } - - boolean shouldUpRecreateTaskLocked(ActivityRecord srec, String destAffinity) { - // Basic case: for simple app-centric recents, we need to recreate - // the task if the affinity has changed. - - final String affinity = ActivityRecord.getTaskAffinityWithUid(destAffinity, srec.getUid()); - if (srec == null || srec.getTask().affinity == null - || !srec.getTask().affinity.equals(affinity)) { - return true; - } - // Document-centric case: an app may be split in to multiple documents; - // they need to re-create their task if this current activity is the root - // of a document, unless simply finishing it will return them to the the - // correct app behind. - final Task task = srec.getTask(); - if (srec.isRootOfTask() && task.getBaseIntent() != null - && task.getBaseIntent().isDocument()) { - // Okay, this activity is at the root of its task. What to do, what to do... - if (!inFrontOfStandardStack()) { - // Finishing won't return to an application, so we need to recreate. - return true; - } - // We now need to get the task below it to determine what to do. - final Task prevTask = getTaskBelow(task); - if (prevTask == null) { - Slog.w(TAG, "shouldUpRecreateTask: task not in history for " + srec); - return false; - } - if (!task.affinity.equals(prevTask.affinity)) { - // These are different apps, so need to recreate. - return true; - } - } - return false; - } - - boolean navigateUpTo(ActivityRecord srec, Intent destIntent, NeededUriGrants destGrants, - int resultCode, Intent resultData, NeededUriGrants resultGrants) { - if (!srec.attachedToProcess()) { - // Nothing to do if the caller is not attached, because this method should be called - // from an alive activity. - return false; - } - final Task task = srec.getTask(); - if (!srec.isDescendantOf(this)) { - return false; - } - - ActivityRecord parent = task.getActivityBelow(srec); - boolean foundParentInTask = false; - final ComponentName dest = destIntent.getComponent(); - if (task.getBottomMostActivity() != srec && dest != null) { - final ActivityRecord candidate = task.getActivity((ar) -> - ar.info.packageName.equals(dest.getPackageName()) && - ar.info.name.equals(dest.getClassName()), srec, false /*includeBoundary*/, - true /*traverseTopToBottom*/); - if (candidate != null) { - parent = candidate; - foundParentInTask = true; - } - } - - // TODO: There is a dup. of this block of code in ActivityTaskManagerService.finishActivity - // We should consolidate. - IActivityController controller = mAtmService.mController; - if (controller != null) { - ActivityRecord next = topRunningActivity(srec.appToken, INVALID_TASK_ID); - if (next != null) { - // ask watcher if this is allowed - boolean resumeOK = true; - try { - resumeOK = controller.activityResuming(next.packageName); - } catch (RemoteException e) { - mAtmService.mController = null; - Watchdog.getInstance().setActivityController(null); - } - - if (!resumeOK) { - return false; - } - } - } - final long origId = Binder.clearCallingIdentity(); - - final int[] resultCodeHolder = new int[1]; - resultCodeHolder[0] = resultCode; - final Intent[] resultDataHolder = new Intent[1]; - resultDataHolder[0] = resultData; - final NeededUriGrants[] resultGrantsHolder = new NeededUriGrants[1]; - resultGrantsHolder[0] = resultGrants; - final ActivityRecord finalParent = parent; - task.forAllActivities((ar) -> { - if (ar == finalParent) return true; - - ar.finishIfPossible(resultCodeHolder[0], resultDataHolder[0], resultGrantsHolder[0], - "navigate-up", true /* oomAdj */); - // Only return the supplied result for the first activity finished - resultCodeHolder[0] = Activity.RESULT_CANCELED; - resultDataHolder[0] = null; - return false; - }, srec, true, true); - resultCode = resultCodeHolder[0]; - resultData = resultDataHolder[0]; - - if (parent != null && foundParentInTask) { - final int callingUid = srec.info.applicationInfo.uid; - final int parentLaunchMode = parent.info.launchMode; - final int destIntentFlags = destIntent.getFlags(); - if (parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE || - parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK || - parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP || - (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { - parent.deliverNewIntentLocked(callingUid, destIntent, destGrants, srec.packageName); - } else { - try { - ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo( - destIntent.getComponent(), ActivityManagerService.STOCK_PM_FLAGS, - srec.mUserId); - // TODO(b/64750076): Check if calling pid should really be -1. - final int res = mAtmService.getActivityStartController() - .obtainStarter(destIntent, "navigateUpTo") - .setCaller(srec.app.getThread()) - .setActivityInfo(aInfo) - .setResultTo(parent.appToken) - .setCallingPid(-1) - .setCallingUid(callingUid) - .setCallingPackage(srec.packageName) - .setCallingFeatureId(parent.launchedFromFeatureId) - .setRealCallingPid(-1) - .setRealCallingUid(callingUid) - .setComponentSpecified(true) - .execute(); - foundParentInTask = res == ActivityManager.START_SUCCESS; - } catch (RemoteException e) { - foundParentInTask = false; - } - parent.finishIfPossible(resultCode, resultData, resultGrants, - "navigate-top", true /* oomAdj */); - } - } - Binder.restoreCallingIdentity(origId); - return foundParentInTask; - } - - void removeLaunchTickMessages() { - forAllActivities(ActivityRecord::removeLaunchTickRunnable); - } - - private void updateTransitLocked(int transit, ActivityOptions options, boolean forceOverride) { - if (options != null) { - ActivityRecord r = topRunningActivity(); - if (r != null && !r.isState(RESUMED)) { - r.updateOptionsLocked(options); - } else { - ActivityOptions.abort(options); - } - } - getDisplay().mDisplayContent.prepareAppTransition(transit, false, - 0 /* flags */, forceOverride); - } - - final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options, - AppTimeTracker timeTracker, String reason) { - moveTaskToFront(tr, noAnimation, options, timeTracker, !DEFER_RESUME, reason); - } - - final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options, - AppTimeTracker timeTracker, boolean deferResume, String reason) { - if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "moveTaskToFront: " + tr); - - final ActivityStack topStack = getDisplayArea().getTopStack(); - final ActivityRecord topActivity = topStack != null - ? topStack.getTopNonFinishingActivity() : null; - - if (tr != this && !tr.isDescendantOf(this)) { - // nothing to do! - if (noAnimation) { - ActivityOptions.abort(options); - } else if (isSingleTaskInstance()) { - // When a task is moved front on the display which can only contain one task, start - // a special transition. - // {@link AppTransitionController#handleAppTransitionReady} later picks up the - // transition, and schedules - // {@link ITaskStackListener#onSingleTaskDisplayDrawn} callback which is triggered - // after contents are drawn on the display. - updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options, - true /* forceOverride */); - } else { - updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */); - } - return; - } - - if (timeTracker != null) { - // The caller wants a time tracker associated with this task. - final PooledConsumer c = PooledLambda.obtainConsumer(ActivityRecord::setAppTimeTracker, - PooledLambda.__(ActivityRecord.class), timeTracker); - tr.forAllActivities(c); - c.recycle(); - } - - try { - // Defer updating the IME target since the new IME target will try to get computed - // before updating all closing and opening apps, which can cause the ime target to - // get calculated incorrectly. - getDisplay().deferUpdateImeTarget(); - - // Shift all activities with this task up to the top - // of the stack, keeping them in the same internal order. - positionChildAtTop(tr); - - // Don't refocus if invisible to current user - final ActivityRecord top = tr.getTopNonFinishingActivity(); - if (top == null || !top.okToShowLocked()) { - if (top != null) { - mStackSupervisor.mRecentTasks.add(top.getTask()); - } - ActivityOptions.abort(options); - return; - } - - // Set focus to the top running activity of this stack. - final ActivityRecord r = topRunningActivity(); - if (r != null) { - r.moveFocusableActivityToTop(reason); - } - - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to front transition: task=" + tr); - if (noAnimation) { - getDisplay().mDisplayContent.prepareAppTransition(TRANSIT_NONE, false); - if (r != null) { - mStackSupervisor.mNoAnimActivities.add(r); - } - ActivityOptions.abort(options); - } else if (isSingleTaskInstance()) { - updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options, - true /* forceOverride */); - } else { - updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */); - } - - // If a new task is moved to the front, then mark the existing top activity as - // supporting - - // picture-in-picture while paused only if the task would not be considered an oerlay - // on top - // of the current activity (eg. not fullscreen, or the assistant) - if (canEnterPipOnTaskSwitch(topActivity, tr, null /* toFrontActivity */, - options)) { - topActivity.supportsEnterPipOnTaskSwitch = true; - } - - if (!deferResume) { - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - EventLogTags.writeWmTaskToFront(tr.mUserId, tr.mTaskId); - mAtmService.getTaskChangeNotificationController() - .notifyTaskMovedToFront(tr.getTaskInfo()); - } finally { - getDisplay().continueUpdateImeTarget(); - } - } - - /** - * Worker method for rearranging history stack. Implements the function of moving all - * activities for a specific task (gathering them if disjoint) into a single group at the - * bottom of the stack. - * - * If a watcher is installed, the action is preflighted and the watcher has an opportunity - * to premeptively cancel the move. - * - * @param tr The task to collect and move to the bottom. - * @return Returns true if the move completed, false if not. - */ - boolean moveTaskToBack(Task tr) { - Slog.i(TAG, "moveTaskToBack: " + tr); - - // In LockTask mode, moving a locked task to the back of the stack may expose unlocked - // ones. Therefore we need to check if this operation is allowed. - if (!mAtmService.getLockTaskController().canMoveTaskToBack(tr)) { - return false; - } - - // If we have a watcher, preflight the move before committing to it. First check - // for *other* available tasks, but if none are available, then try again allowing the - // current task to be selected. - if (isTopStackInDisplayArea() && mAtmService.mController != null) { - ActivityRecord next = topRunningActivity(null, tr.mTaskId); - if (next == null) { - next = topRunningActivity(null, INVALID_TASK_ID); - } - if (next != null) { - // ask watcher if this is allowed - boolean moveOK = true; - try { - moveOK = mAtmService.mController.activityResuming(next.packageName); - } catch (RemoteException e) { - mAtmService.mController = null; - Watchdog.getInstance().setActivityController(null); - } - if (!moveOK) { - return false; - } - } - } - - if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" - + tr.mTaskId); - - getDisplay().mDisplayContent.prepareAppTransition(TRANSIT_TASK_TO_BACK, false); - moveToBack("moveTaskToBackLocked", tr); - - if (inPinnedWindowingMode()) { - mStackSupervisor.removeStack(this); - return true; - } - - ActivityRecord topActivity = getDisplayArea().topRunningActivity(); - ActivityStack topStack = topActivity.getRootTask(); - if (topStack != null && topStack != this && topActivity.isState(RESUMED)) { - // The new top activity is already resumed, so there's a good chance that nothing will - // get resumed below. So, update visibility now in case the transition is closed - // prematurely. - mRootWindowContainer.ensureVisibilityAndConfig(null /* starting */, - getDisplay().mDisplayId, false /* markFrozenIfConfigChanged */, - false /* deferResume */); - // Usually resuming a top activity triggers the next app transition, but nothing's got - // resumed in this case, so we need to execute it explicitly. - getDisplay().mDisplayContent.executeAppTransition(); - } else { - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - return true; - } - - /** - * Ensures all visible activities at or below the input activity have the right configuration. - */ - void ensureVisibleActivitiesConfiguration(ActivityRecord start, boolean preserveWindow) { - mEnsureVisibleActivitiesConfigHelper.process(start, preserveWindow); - } - - // TODO: Can only be called from special methods in ActivityStackSupervisor. - // Need to consolidate those calls points into this resize method so anyone can call directly. - void resize(Rect displayedBounds, boolean preserveWindows, boolean deferResume) { - Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "stack.resize_" + getRootTaskId()); - mAtmService.deferWindowLayout(); - try { - // TODO: Why not just set this on the stack directly vs. on each tasks? - // Update override configurations of all tasks in the stack. - final PooledConsumer c = PooledLambda.obtainConsumer( - ActivityStack::processTaskResizeBounds, PooledLambda.__(Task.class), - displayedBounds); - forAllTasks(c, true /* traverseTopToBottom */); - c.recycle(); - - if (mBoundsAnimating) { - // Force to update task surface bounds and relayout windows, since configBounds - // remains unchanged during bounds animation. - updateSurfaceBounds(); - getDisplay().setLayoutNeeded(); - mWmService.requestTraversal(); - } - - if (!deferResume) { - ensureVisibleActivitiesConfiguration(topRunningActivity(), preserveWindows); - } - } finally { - mAtmService.continueWindowLayout(); - Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); - } - } - - private static void processTaskResizeBounds(Task task, Rect displayedBounds) { - if (!task.isResizeable()) return; - - task.setBounds(displayedBounds); - } - - /** - * Until we can break this "set task bounds to same as stack bounds" behavior, this - * basically resizes both stack and task bounds to the same bounds. - */ - private void setTaskBounds(Rect bounds) { - final PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::setTaskBounds, - PooledLambda.__(Task.class), bounds); - forAllLeafTasks(c, true /* traverseTopToBottom */); - c.recycle(); - } - - private static void setTaskBounds(Task task, Rect bounds) { - task.setBounds(task.isResizeable() ? bounds : null); - } - - boolean willActivityBeVisible(IBinder token) { - final ActivityRecord r = ActivityRecord.forTokenLocked(token); - if (r == null) { - return false; - } - - // See if there is an occluding activity on-top of this one. - final ActivityRecord occludingActivity = getOccludingActivityAbove(r); - if (occludingActivity != null) return false; - - if (r.finishing) Slog.e(TAG, "willActivityBeVisible: Returning false," - + " would have returned true for r=" + r); - return !r.finishing; - } - - void unhandledBackLocked() { - final ActivityRecord topActivity = getTopMostActivity(); - if (DEBUG_SWITCH) Slog.d(TAG_SWITCH, - "Performing unhandledBack(): top activity: " + topActivity); - if (topActivity != null) { - topActivity.finishIfPossible("unhandled-back", true /* oomAdj */); - } - } - - /** - * Reset local parameters because an app's activity died. - * @param app The app of the activity that died. - * @return result from removeHistoryRecordsForAppLocked. - */ - boolean handleAppDied(WindowProcessController app) { - if (mPausingActivity != null && mPausingActivity.app == app) { - if (DEBUG_PAUSE || DEBUG_CLEANUP) Slog.v(TAG_PAUSE, - "App died while pausing: " + mPausingActivity); - mPausingActivity = null; - } - if (mLastPausedActivity != null && mLastPausedActivity.app == app) { - mLastPausedActivity = null; - mLastNoHistoryActivity = null; - } - - mStackSupervisor.removeHistoryRecords(app); - return mRemoveHistoryRecordsForApp.process(app); - } - - boolean dump(FileDescriptor fd, PrintWriter pw, boolean dumpAll, boolean dumpClient, - String dumpPackage, final boolean needSep) { - Runnable headerPrinter = () -> { - if (needSep) { - pw.println(); - } - pw.println(" Stack #" + getRootTaskId() - + ": type=" + activityTypeToString(getActivityType()) - + " mode=" + windowingModeToString(getWindowingMode())); - pw.println(" isSleeping=" + shouldSleepActivities()); - pw.println(" mBounds=" + getRequestedOverrideBounds()); - }; - - boolean printed = false; - - if (dumpPackage == null) { - // If we are not filtering by package, we want to print absolutely everything, - // so always print the header even if there are no tasks/activities inside. - headerPrinter.run(); - headerPrinter = null; - printed = true; - } - - printed |= printThisActivity(pw, mPausingActivity, dumpPackage, false, - " mPausingActivity: ", null); - printed |= printThisActivity(pw, getResumedActivity(), dumpPackage, false, - " mResumedActivity: ", null); - if (dumpAll) { - printed |= printThisActivity(pw, mLastPausedActivity, dumpPackage, false, - " mLastPausedActivity: ", null); - printed |= printThisActivity(pw, mLastNoHistoryActivity, dumpPackage, - false, " mLastNoHistoryActivity: ", null); - } - - printed |= dumpActivities(fd, pw, dumpAll, dumpClient, dumpPackage, false, headerPrinter); - - return printed; - } - - private boolean dumpActivities(FileDescriptor fd, PrintWriter pw, boolean dumpAll, - boolean dumpClient, String dumpPackage, boolean needSep, Runnable header) { - if (!hasChild()) { - return false; - } - final AtomicBoolean printedHeader = new AtomicBoolean(false); - final AtomicBoolean printed = new AtomicBoolean(false); - forAllLeafTasks((task) -> { - final String prefix = " "; - Runnable headerPrinter = () -> { - printed.set(true); - if (!printedHeader.get()) { - if (needSep) { - pw.println(""); - } - if (header != null) { - header.run(); - } - printedHeader.set(true); - } - pw.print(prefix); pw.print("* "); pw.println(task); - pw.print(prefix); pw.print(" mBounds="); - pw.println(task.getRequestedOverrideBounds()); - pw.print(prefix); pw.print(" mMinWidth="); pw.print(task.mMinWidth); - pw.print(" mMinHeight="); pw.println(task.mMinHeight); - if (mLastNonFullscreenBounds != null) { - pw.print(prefix); - pw.print(" mLastNonFullscreenBounds="); - pw.println(task.mLastNonFullscreenBounds); - } - task.dump(pw, prefix + " "); - }; - if (dumpPackage == null) { - // If we are not filtering by package, we want to print absolutely everything, - // so always print the header even if there are no activities inside. - headerPrinter.run(); - headerPrinter = null; - } - final ArrayList<ActivityRecord> activities = new ArrayList<>(); - // Add activities by traversing the hierarchy from bottom to top, since activities - // are dumped in reverse order in {@link ActivityStackSupervisor#dumpHistoryList()}. - task.forAllActivities((Consumer<ActivityRecord>) activities::add, - false /* traverseTopToBottom */); - dumpHistoryList(fd, pw, activities, prefix, "Hist", true, !dumpAll, dumpClient, - dumpPackage, false, headerPrinter, task); - }, true /* traverseTopToBottom */); - return printed.get(); - } - - ArrayList<ActivityRecord> getDumpActivitiesLocked(String name) { - ArrayList<ActivityRecord> activities = new ArrayList<>(); - - if ("all".equals(name)) { - forAllActivities((Consumer<ActivityRecord>) activities::add); - } else if ("top".equals(name)) { - final ActivityRecord topActivity = getTopMostActivity(); - if (topActivity != null) { - activities.add(topActivity); - } - } else { - ItemMatcher matcher = new ItemMatcher(); - matcher.build(name); - - forAllActivities((r) -> { - if (matcher.match(r, r.intent.getComponent())) { - activities.add(r); - } - }); - } - - return activities; - } - - ActivityRecord restartPackage(String packageName) { - ActivityRecord starting = topRunningActivity(); - - // All activities that came from the package must be - // restarted as if there was a config change. - PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::restartPackage, - PooledLambda.__(ActivityRecord.class), starting, packageName); - forAllActivities(c); - c.recycle(); - - return starting; - } - - private static void restartPackage( - ActivityRecord r, ActivityRecord starting, String packageName) { - if (r.info.packageName.equals(packageName)) { - r.forceNewConfig = true; - if (starting != null && r == starting && r.mVisibleRequested) { - r.startFreezingScreenLocked(CONFIG_SCREEN_LAYOUT); - } - } - } - - Task reuseOrCreateTask(ActivityInfo info, Intent intent, boolean toTop) { - return reuseOrCreateTask(info, intent, null /*voiceSession*/, null /*voiceInteractor*/, - toTop, null /*activity*/, null /*source*/, null /*options*/); - } - // TODO: Can be removed once we change callpoints creating stacks to be creating tasks. - /** Either returns this current task to be re-used or creates a new child task. */ - Task reuseOrCreateTask(ActivityInfo info, Intent intent, IVoiceInteractionSession voiceSession, - IVoiceInteractor voiceInteractor, boolean toTop, ActivityRecord activity, - ActivityRecord source, ActivityOptions options) { - - Task task; - if (DisplayContent.alwaysCreateStack(getWindowingMode(), getActivityType())) { - // This stack will only contain one task, so just return itself since all stacks ara now - // tasks and all tasks are now stacks. - task = reuseAsLeafTask(voiceSession, voiceInteractor, intent, info, activity); - } else { - // Create child task since this stack can contain multiple tasks. - final int taskId = activity != null - ? mStackSupervisor.getNextTaskIdForUser(activity.mUserId) - : mStackSupervisor.getNextTaskIdForUser(); - task = new ActivityStack(mAtmService, taskId, info, intent, voiceSession, - voiceInteractor, null /* taskDescription */, this); - - // add the task to stack first, mTaskPositioner might need the stack association - addChild(task, toTop, (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0); - } - - int displayId = getDisplayId(); - if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY; - final boolean isLockscreenShown = mAtmService.mStackSupervisor.getKeyguardController() - .isKeyguardOrAodShowing(displayId); - if (!mStackSupervisor.getLaunchParamsController() - .layoutTask(task, info.windowLayout, activity, source, options) - && !getRequestedOverrideBounds().isEmpty() - && task.isResizeable() && !isLockscreenShown) { - task.setBounds(getRequestedOverrideBounds()); - } - - return task; - } - - void addChild(WindowContainer child, final boolean toTop, boolean showForAllUsers) { - if (isSingleTaskInstance() && hasChild()) { - throw new IllegalStateException("Can only have one child on stack=" + this); - } - - Task task = child.asTask(); - try { - if (task != null) { - task.setForceShowForAllUsers(showForAllUsers); - } - // We only want to move the parents to the parents if we are creating this task at the - // top of its stack. - addChild(child, toTop ? MAX_VALUE : 0, toTop /*moveParents*/); - } finally { - if (task != null) { - task.setForceShowForAllUsers(false); - } - } - } - - void positionChildAt(Task task, int position) { - if (task.getStack() != this) { - throw new IllegalArgumentException("AS.positionChildAt: task=" + task - + " is not a child of stack=" + this + " current parent=" + task.getStack()); - } - - task.updateOverrideConfigurationForStack(this); - - final ActivityRecord topRunningActivity = task.topRunningActivityLocked(); - final boolean wasResumed = topRunningActivity == task.getStack().mResumedActivity; - - boolean toTop = position >= getChildCount(); - boolean includingParents = toTop || getDisplayArea().getNextFocusableStack(this, - true /* ignoreCurrent */) == null; - if (WindowManagerDebugConfig.DEBUG_STACK) { - Slog.i(TAG_WM, "positionChildAt: positioning task=" + task + " at " + position); - } - positionChildAt(position, task, includingParents); - task.updateTaskMovement(toTop); - getDisplayContent().layoutAndAssignWindowLayersIfNeeded(); - - - // TODO: Investigate if this random code is really needed. - if (task.voiceSession != null) { - try { - task.voiceSession.taskStarted(task.intent, task.mTaskId); - } catch (RemoteException e) { - } - } - - if (wasResumed) { - if (mResumedActivity != null) { - Log.wtf(TAG, "mResumedActivity was already set when moving mResumedActivity from" - + " other stack to this stack mResumedActivity=" + mResumedActivity - + " other mResumedActivity=" + topRunningActivity); - } - topRunningActivity.setState(RESUMED, "positionChildAt"); - } - - // The task might have already been running and its visibility needs to be synchronized with - // the visibility of the stack / windows. - ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); - mRootWindowContainer.resumeFocusedStacksTopActivities(); - } - - public void setAlwaysOnTop(boolean alwaysOnTop) { - if (isAlwaysOnTop() == alwaysOnTop) { - return; - } - super.setAlwaysOnTop(alwaysOnTop); - final TaskDisplayArea taskDisplayArea = getDisplayArea(); - // positionChildAtTop() must be called even when always on top gets turned off because we - // need to make sure that the stack is moved from among always on top windows to below other - // always on top windows. Since the position the stack should be inserted into is calculated - // properly in {@link DisplayContent#getTopInsertPosition()} in both cases, we can just - // request that the stack is put at top here. - taskDisplayArea.positionStackAtTop(this, false /* includingParents */); - } - - /** NOTE: Should only be called from {@link Task#reparent}. */ - void moveToFrontAndResumeStateIfNeeded(ActivityRecord r, boolean moveToFront, boolean setResume, - boolean setPause, String reason) { - if (!moveToFront) { - return; - } - - final ActivityState origState = r.getState(); - // If the activity owns the last resumed activity, transfer that together, - // so that we don't resume the same activity again in the new stack. - // Apps may depend on onResume()/onPause() being called in pairs. - if (setResume) { - r.setState(RESUMED, "moveToFrontAndResumeStateIfNeeded"); - } - // If the activity was previously pausing, then ensure we transfer that as well - if (setPause) { - mPausingActivity = r; - r.schedulePauseTimeout(); - } - // Move the stack in which we are placing the activity to the front. - moveToFront(reason); - // If the original state is resumed, there is no state change to update focused app. - // So here makes sure the activity focus is set if it is the top. - if (origState == RESUMED && r == mRootWindowContainer.getTopResumedActivity()) { - mAtmService.setResumedActivityUncheckLocked(r, reason); - } - } - - void dismissPip() { - if (!isActivityTypeStandardOrUndefined()) { - throw new IllegalArgumentException( - "You can't move tasks from non-standard stacks."); - } - if (getWindowingMode() != WINDOWING_MODE_PINNED) { - throw new IllegalArgumentException( - "Can't exit pinned mode if it's not pinned already."); - } - - mWmService.inSurfaceTransaction(() -> { - final Task task = getBottomMostTask(); - setWindowingMode(WINDOWING_MODE_UNDEFINED); - - getDisplayArea().positionStackAtTop(this, false /* includingParents */); - - mStackSupervisor.scheduleUpdatePictureInPictureModeIfNeeded(task, this); - MetricsLoggerWrapper.logPictureInPictureFullScreen(mAtmService.mContext, - task.effectiveUid, task.realActivity.flattenToString()); - }); - } - - void prepareFreezingTaskBounds() { - forAllLeafTasks(Task::prepareFreezingBounds, true /* traverseTopToBottom */); - } - - @Override - public int setBounds(Rect bounds) { - // Calling Task#setBounds() for leaf task since this is the a specialization of - // {@link #setBounds(int)} for ActivityStack. - if (!isRootTask()) { - return super.setBounds(bounds); - } else { - return setBounds(getRequestedOverrideBounds(), bounds); - } - } - - private int setBounds(Rect existing, Rect bounds) { - if (equivalentBounds(existing, bounds)) { - return BOUNDS_CHANGE_NONE; - } - - final int result = super.setBounds(!inMultiWindowMode() ? null : bounds); - - updateSurfaceBounds(); - return result; - } - - /** Bounds of the stack without adjusting for other factors in the system like visibility - * of docked stack. - * Most callers should be using {@link ConfigurationContainer#getRequestedOverrideBounds} a - * it takes into consideration other system factors. */ - void getRawBounds(Rect out) { - out.set(getRawBounds()); - } - - private Rect getRawBounds() { - return super.getBounds(); - } - - @Override - public void getBounds(Rect bounds) { - bounds.set(getBounds()); - } - - /** - * @return the final bounds for the bounds animation. - */ - void getFinalAnimationBounds(Rect outBounds) { - outBounds.set(mBoundsAnimationTarget); - } - - /** - * @return the final source bounds for the bounds animation. - */ - void getFinalAnimationSourceHintBounds(Rect outBounds) { - outBounds.set(mBoundsAnimationSourceHintBounds); - } - - /** Bounds of the stack with other system factors taken into consideration. */ - void getDimBounds(Rect out) { - getBounds(out); - } - - /** - * Put a Task in this stack. Used for adding only. - * When task is added to top of the stack, the entire branch of the hierarchy (including stack - * and display) will be brought to top. - * @param child The child to add. - * @param position Target position to add the task to. - */ - private void addChild(WindowContainer child, int position, boolean moveParents) { - // Add child task. - addChild(child, null); - - // Move child to a proper position, as some restriction for position might apply. - positionChildAt(position, child, moveParents /* includingParents */); - } - - void positionChildAtTop(Task child) { - if (child == null) { - // TODO: Fix the call-points that cause this to happen. - return; - } - - if (child == this) { - // TODO: Fix call-points - moveToFront("positionChildAtTop"); - return; - } - - positionChildAt(POSITION_TOP, child, true /* includingParents */); - child.updateTaskMovement(true); - - final DisplayContent displayContent = getDisplayContent(); - displayContent.layoutAndAssignWindowLayersIfNeeded(); - } - - void positionChildAtBottom(Task child) { - // If there are other focusable stacks on the display, the z-order of the display should not - // be changed just because a task was placed at the bottom. E.g. if it is moving the topmost - // task to bottom, the next focusable stack on the same display should be focused. - final ActivityStack nextFocusableStack = getDisplayArea().getNextFocusableStack( - child.getStack(), true /* ignoreCurrent */); - positionChildAtBottom(child, nextFocusableStack == null /* includingParents */); - child.updateTaskMovement(true); - } - - @VisibleForTesting - void positionChildAtBottom(Task child, boolean includingParents) { - if (child == null) { - // TODO: Fix the call-points that cause this to happen. - return; - } - - positionChildAt(POSITION_BOTTOM, child, includingParents); - getDisplayContent().layoutAndAssignWindowLayersIfNeeded(); - } - - @Override - void onChildPositionChanged(WindowContainer child) { - if (isOrganized()) { - mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(this, false /* force */); - } - - if (!mChildren.contains(child)) { - return; - } - - final boolean isTop = getTopChild() == child; - - final Task task = child.asTask(); - if (task != null) { - task.updateTaskMovement(isTop); - } - - if (isTop) { - final DisplayContent displayContent = getDisplayContent(); - displayContent.layoutAndAssignWindowLayersIfNeeded(); - } - } - - @Override - void onParentChanged(ConfigurationContainer newParent, ConfigurationContainer oldParent) { - final DisplayContent display = newParent != null - ? ((WindowContainer) newParent).getDisplayContent() : null; - final DisplayContent oldDisplay = oldParent != null - ? ((WindowContainer) oldParent).getDisplayContent() : null; - super.onParentChanged(newParent, oldParent); - - // Resume next focusable stack after reparenting to another display if we aren't removing - // the prevous display. - if (oldDisplay != null && oldDisplay.isRemoving()) { - postReparent(); - } - } - - void reparent(TaskDisplayArea newParent, boolean onTop) { - reparent(newParent, onTop ? POSITION_TOP : POSITION_BOTTOM); - } - - private void updateSurfaceBounds() { - updateSurfaceSize(getSyncTransaction()); - updateSurfacePosition(); - scheduleAnimation(); - } - - @Override - void getRelativePosition(Point outPos) { - super.getRelativePosition(outPos); - final int outset = getTaskOutset(); - outPos.x -= outset; - outPos.y -= outset; - } - - @Override - void onDisplayChanged(DisplayContent dc) { - super.onDisplayChanged(dc); - if (isRootTask()) { - updateSurfaceBounds(); - } - } - - boolean shouldIgnoreInput() { - if (inSplitScreenPrimaryWindowingMode() && !isFocusable()) { - return true; - } - if (mAtmService.mHasLeanbackFeature && inPinnedWindowingMode() - && !isFocusedStackOnDisplay()) { - // Preventing Picture-in-Picture stack from receiving input on TVs. - return true; - } - return false; - } - - @Override - void dump(PrintWriter pw, String prefix, boolean dumpAll) { - super.dump(pw, prefix, dumpAll); - if (!mExitingActivities.isEmpty()) { - pw.println(); - pw.println(prefix + "Exiting application tokens:"); - final String doublePrefix = prefix + " "; - for (int i = mExitingActivities.size() - 1; i >= 0; i--) { - WindowToken token = mExitingActivities.get(i); - pw.print(doublePrefix + "Exiting App #" + i); - pw.print(' '); pw.print(token); - pw.println(':'); - token.dump(pw, doublePrefix, dumpAll); - } - pw.println(); - } - mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix); - } - - /** - * Sets the current picture-in-picture aspect ratio. - */ - void setPictureInPictureAspectRatio(float aspectRatio) { - if (!mWmService.mAtmService.mSupportsPictureInPicture) { - return; - } - - final DisplayContent displayContent = getDisplayContent(); - if (displayContent == null) { - return; - } - - if (!inPinnedWindowingMode()) { - return; - } - - final PinnedStackController pinnedStackController = - getDisplayContent().getPinnedStackController(); - - if (Float.compare(aspectRatio, pinnedStackController.getAspectRatio()) == 0) { - return; - } - - // Notify the pinned stack controller about aspect ratio change. - // This would result a callback delivered from SystemUI to WM to start animation, - // if the bounds are ought to be altered due to aspect ratio change. - pinnedStackController.setAspectRatio( - pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio) - ? aspectRatio : -1f); - } - - /** - * Sets the current picture-in-picture actions. - */ - void setPictureInPictureActions(List<RemoteAction> actions) { - if (!mWmService.mAtmService.mSupportsPictureInPicture) { - return; - } - - if (!inPinnedWindowingMode()) { - return; - } - - getDisplayContent().getPinnedStackController().setActions(actions); - } - - public boolean isForceScaled() { - return mBoundsAnimating; - } - - /** Returns true if a removal action is still being deferred. */ - boolean handleCompleteDeferredRemoval() { - if (isAnimating(TRANSITION | CHILDREN)) { - return true; - } - - return super.handleCompleteDeferredRemoval(); - } - - public DisplayInfo getDisplayInfo() { - return mDisplayContent.getDisplayInfo(); - } - - AnimatingActivityRegistry getAnimatingActivityRegistry() { - return mAnimatingActivityRegistry; - } - - void executeAppTransition(ActivityOptions options) { - getDisplay().mDisplayContent.executeAppTransition(); - ActivityOptions.abort(options); - } - - boolean shouldSleepActivities() { - final DisplayContent display = getDisplay(); - - // Do not sleep activities in this stack if we're marked as focused and the keyguard - // is in the process of going away. - if (isFocusedStackOnDisplay() - && mStackSupervisor.getKeyguardController().isKeyguardGoingAway()) { - return false; - } - - return display != null ? display.isSleeping() : mAtmService.isSleepingLocked(); - } - - boolean shouldSleepOrShutDownActivities() { - return shouldSleepActivities() || mAtmService.mShuttingDown; - } - - @Override - public void dumpDebug(ProtoOutputStream proto, long fieldId, - @WindowTraceLogLevel int logLevel) { - if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) { - return; - } - - final long token = proto.start(fieldId); - super.dumpDebug(proto, WINDOW_CONTAINER, logLevel); - - proto.write(TaskProto.ID, mTaskId); - proto.write(DISPLAY_ID, getDisplayId()); - proto.write(ROOT_TASK_ID, getRootTaskId()); - - if (mResumedActivity != null) { - mResumedActivity.writeIdentifierToProto(proto, RESUMED_ACTIVITY); - } - if (realActivity != null) { - proto.write(REAL_ACTIVITY, realActivity.flattenToShortString()); - } - if (origActivity != null) { - proto.write(ORIG_ACTIVITY, origActivity.flattenToShortString()); - } - proto.write(ACTIVITY_TYPE, getActivityType()); - proto.write(RESIZE_MODE, mResizeMode); - proto.write(MIN_WIDTH, mMinWidth); - proto.write(MIN_HEIGHT, mMinHeight); - - proto.write(FILLS_PARENT, matchParentBounds()); - getRawBounds().dumpDebug(proto, BOUNDS); - - if (mLastNonFullscreenBounds != null) { - mLastNonFullscreenBounds.dumpDebug(proto, LAST_NON_FULLSCREEN_BOUNDS); - } - - proto.write(ANIMATING_BOUNDS, mBoundsAnimating); - - if (mSurfaceControl != null) { - proto.write(SURFACE_WIDTH, mSurfaceControl.getWidth()); - proto.write(SURFACE_HEIGHT, mSurfaceControl.getHeight()); - } - - proto.write(CREATED_BY_ORGANIZER, mCreatedByOrganizer); - - proto.end(token); - } -} diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index 8666a9efaeeb..0cd7ffce2ed4 100644 --- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java @@ -46,9 +46,6 @@ import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.TYPE_VIRTUAL; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.TAG_CLEANUP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_IDLE; @@ -74,11 +71,14 @@ import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_ 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.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; 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; import static com.android.server.wm.Task.LOCK_TASK_AUTH_WHITELISTED; import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT; +import static com.android.server.wm.Task.TAG_CLEANUP; import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; import static com.android.server.wm.WindowContainer.POSITION_TOP; @@ -380,12 +380,12 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { final ActivityRecord r; final ActivityRecord sourceRecord; final int startFlags; - final ActivityStack stack; + final Task stack; final WindowProcessController callerApp; final NeededUriGrants intentGrants; PendingActivityLaunch(ActivityRecord r, ActivityRecord sourceRecord, - int startFlags, ActivityStack stack, WindowProcessController callerApp, + int startFlags, Task stack, WindowProcessController callerApp, NeededUriGrants intentGrants) { this.r = r; this.sourceRecord = sourceRecord; @@ -493,7 +493,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { } void moveRecentsStackToFront(String reason) { - final ActivityStack recentsStack = mRootWindowContainer.getDefaultTaskDisplayArea() + final Task recentsStack = mRootWindowContainer.getDefaultTaskDisplayArea() .getStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_RECENTS); if (recentsStack != null) { recentsStack.moveToFront(reason); @@ -729,7 +729,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { } final Task task = r.getTask(); - final ActivityStack stack = task.getStack(); + final Task rootTask = task.getRootTask(); beginDeferResume(); @@ -905,7 +905,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { if (andResume && readyToResume()) { // As part of the process of launching, ActivityThread also performs // a resume. - stack.minimalResumeActivityLocked(r); + rootTask.minimalResumeActivityLocked(r); } else { // This activity is not starting in the resumed state... which should look like we asked // it to pause+stop (but remain visible), and it has done so and reported back the @@ -923,7 +923,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // launching the initial activity (that is, home), so that it can have // a chance to initialize itself while in the background, making the // switch back to it faster and look better. - if (mRootWindowContainer.isTopDisplayFocusedStack(stack)) { + if (mRootWindowContainer.isTopDisplayFocusedStack(rootTask)) { mService.getActivityStartController().startSetupActivity(); } @@ -990,7 +990,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { int requestCode, int callingPid, int callingUid, String callingPackage, @Nullable String callingFeatureId, boolean ignoreTargetSecurity, boolean launchingInTask, WindowProcessController callerApp, ActivityRecord resultRecord, - ActivityStack resultStack) { + Task resultStack) { final boolean isCallerRecents = mService.getRecentTasks() != null && mService.getRecentTasks().isCallerRecents(callingUid); final int startAnyPerm = mService.checkPermission(START_ANY_ACTIVITY, callingPid, @@ -1332,7 +1332,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { /** This doesn't just find a task, it also moves the task to front. */ void findTaskToMoveToFront(Task task, int flags, ActivityOptions options, String reason, boolean forceNonResizeable) { - ActivityStack currentStack = task.getStack(); + Task currentStack = task.getRootTask(); if (currentStack == null) { Slog.e(TAG, "findTaskToMoveToFront: can't move task=" + task + " to front. Stack is null"); @@ -1349,7 +1349,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { final Rect bounds = options.getLaunchBounds(); task.setBounds(bounds); - ActivityStack stack = + Task stack = mRootWindowContainer.getLaunchStack(null, options, task, ON_TOP); if (stack != currentStack) { @@ -1388,7 +1388,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { private void moveHomeStackToFrontIfNeeded(int flags, TaskDisplayArea taskDisplayArea, String reason) { - final ActivityStack focusedStack = taskDisplayArea.getFocusedStack(); + final Task focusedStack = taskDisplayArea.getFocusedStack(); if ((taskDisplayArea.getWindowingMode() == WINDOWING_MODE_FULLSCREEN && (flags & ActivityManager.MOVE_TASK_WITH_HOME) != 0) @@ -1423,7 +1423,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { mWindowManager.setDockedStackResizing(resizing); } - private void removePinnedStackInSurfaceTransaction(ActivityStack stack) { + private void removePinnedStackInSurfaceTransaction(Task stack) { /** * Workaround: Force-stop all the activities in the pinned stack before we reparent them * to the fullscreen stack. This is to guarantee that when we are removing a stack, @@ -1459,7 +1459,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { } } - private void removeStackInSurfaceTransaction(ActivityStack stack) { + private void removeStackInSurfaceTransaction(Task stack) { if (stack.getWindowingMode() == WINDOWING_MODE_PINNED) { removePinnedStackInSurfaceTransaction(stack); } else { @@ -1479,7 +1479,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { * pinned stack, then its tasks are not explicitly removed when the stack is destroyed, but * instead moved back onto the fullscreen stack. */ - void removeStack(ActivityStack stack) { + void removeStack(Task stack) { mWindowManager.inSurfaceTransaction(() -> removeStackInSurfaceTransaction(stack)); } @@ -1597,7 +1597,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { * @return true if the task has been restored successfully. */ boolean restoreRecentTaskLocked(Task task, ActivityOptions aOptions, boolean onTop) { - final ActivityStack stack = + final Task stack = mRootWindowContainer.getLaunchStack(null, aOptions, task, onTop); final WindowContainer parent = task.getParent(); @@ -1639,8 +1639,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { * the various checks on tasks that are going to be reparented from one stack to another. */ // TODO: Look into changing users to this method to DisplayContent.resolveWindowingMode() - ActivityStack getReparentTargetStack(Task task, ActivityStack stack, boolean toTop) { - final ActivityStack prevStack = task.getStack(); + Task getReparentTargetStack(Task task, Task stack, boolean toTop) { + final Task prevStack = task.getRootTask(); final int rootTaskId = stack.mTaskId; final boolean inMultiWindowMode = stack.inMultiWindowMode(); @@ -1769,7 +1769,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // A resumed activity cannot be stopping. remove from list mStoppingActivities.remove(r); - final ActivityStack stack = r.getRootTask(); + final Task stack = r.getRootTask(); if (stack.getDisplayArea().allResumedActivitiesComplete()) { mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); // Make sure activity & window visibility should be identical @@ -1783,15 +1783,15 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // Called when WindowManager has finished animating the launchingBehind activity to the back. private void handleLaunchTaskBehindCompleteLocked(ActivityRecord r) { final Task task = r.getTask(); - final ActivityStack stack = task.getStack(); + final Task rootTask = task.getRootTask(); mRecentTasks.add(task); mService.getTaskChangeNotificationController().notifyTaskStackChanged(); - stack.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); + rootTask.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); // When launching tasks behind, update the last active time of the top task after the new // task has been shown briefly - final ActivityRecord top = stack.getTopNonFinishingActivity(); + final ActivityRecord top = rootTask.getTopNonFinishingActivity(); if (top != null) { top.getTask().touchActiveTime(); } @@ -2028,7 +2028,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { */ void updateTopResumedActivityIfNeeded() { final ActivityRecord prevTopActivity = mTopResumedActivity; - final ActivityStack topStack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task topStack = mRootWindowContainer.getTopDisplayFocusedStack(); if (topStack == null || topStack.mResumedActivity == prevTopActivity) { return; } @@ -2124,13 +2124,13 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { } void handleNonResizableTaskIfNeeded(Task task, int preferredWindowingMode, - TaskDisplayArea preferredTaskDisplayArea, ActivityStack actualStack) { + TaskDisplayArea preferredTaskDisplayArea, Task actualStack) { handleNonResizableTaskIfNeeded(task, preferredWindowingMode, preferredTaskDisplayArea, actualStack, false /* forceNonResizable */); } void handleNonResizableTaskIfNeeded(Task task, int preferredWindowingMode, - TaskDisplayArea preferredTaskDisplayArea, ActivityStack actualStack, + TaskDisplayArea preferredTaskDisplayArea, Task actualStack, boolean forceNonResizable) { final boolean isSecondaryDisplayPreferred = preferredTaskDisplayArea != null && preferredTaskDisplayArea.getDisplayId() != DEFAULT_DISPLAY; @@ -2186,7 +2186,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // split-screen in split-screen. mService.getTaskChangeNotificationController() .notifyActivityDismissingDockedStack(); - taskDisplayArea.onSplitScreenModeDismissed((ActivityStack) task); + taskDisplayArea.onSplitScreenModeDismissed(task); taskDisplayArea.mDisplayContent.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS, true /* notifyClients */); } @@ -2242,14 +2242,14 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { } } - void scheduleUpdatePictureInPictureModeIfNeeded(Task task, ActivityStack prevStack) { - final ActivityStack stack = task.getStack(); - if ((prevStack == null || (prevStack != stack - && !prevStack.inPinnedWindowingMode() && !stack.inPinnedWindowingMode()))) { + void scheduleUpdatePictureInPictureModeIfNeeded(Task task, Task prevStack) { + final Task rootTask = task.getRootTask(); + if ((prevStack == null || (prevStack != rootTask + && !prevStack.inPinnedWindowingMode() && !rootTask.inPinnedWindowingMode()))) { return; } - scheduleUpdatePictureInPictureModeIfNeeded(task, stack.getRequestedOverrideBounds()); + scheduleUpdatePictureInPictureModeIfNeeded(task, rootTask.getRequestedOverrideBounds()); } private void scheduleUpdatePictureInPictureModeIfNeeded(Task task, Rect targetStackBounds) { @@ -2281,7 +2281,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { final PooledConsumer c = PooledLambda.obtainConsumer( ActivityRecord::updatePictureInPictureMode, PooledLambda.__(ActivityRecord.class), targetStackBounds, forceUpdate); - task.getStack().setBounds(targetStackBounds); + task.getRootTask().setBounds(targetStackBounds); task.forAllActivities(c); c.recycle(); } @@ -2349,7 +2349,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { int uid = 0; synchronized (mService.mGlobalLock) { if (r.attachedToProcess() - && r.isState(ActivityStack.ActivityState.RESTARTING_PROCESS)) { + && r.isState(Task.ActivityState.RESTARTING_PROCESS)) { processName = r.app.mName; uid = r.app.mUid; } @@ -2516,7 +2516,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { mService.getActivityStartController().postStartActivityProcessingForLastStarter( task.getTopNonFinishingActivity(), ActivityManager.START_TASK_TO_FRONT, - task.getStack()); + task.getRootTask()); return ActivityManager.START_TASK_TO_FRONT; } callingPackage = task.mCallingPackage; diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java index 16ca60d1519b..e944faed6494 100644 --- a/services/core/java/com/android/server/wm/ActivityStartController.java +++ b/services/core/java/com/android/server/wm/ActivityStartController.java @@ -164,7 +164,7 @@ public class ActivityStartController { * last starter for an arbitrary task record. Re-evaluate whether we can remove. */ void postStartActivityProcessingForLastStarter(ActivityRecord r, int result, - ActivityStack targetStack) { + Task targetStack) { if (mLastStarter == null) { return; } @@ -190,7 +190,7 @@ public class ActivityStartController { // The home activity will be started later, defer resuming to avoid unneccerary operations // (e.g. start home recursively) when creating home stack. mSupervisor.beginDeferResume(); - final ActivityStack homeStack; + final Task homeStack; try { // Make sure home stack exists on display area. homeStack = taskDisplayArea.getOrCreateRootHomeTask(ON_TOP); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index a8818b2775e2..751d0c8be24a 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -56,7 +56,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.os.Process.INVALID_UID; import static android.view.Display.DEFAULT_DISPLAY; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS; @@ -76,6 +75,7 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS import static com.android.server.wm.ActivityTaskManagerService.ANIMATE; import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_BOUNDS; import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_DISPLAY; +import static com.android.server.wm.Task.ActivityState.RESUMED; import static com.android.server.wm.Task.REPARENT_MOVE_STACK_TO_FRONT; import static com.android.server.wm.WindowContainer.POSITION_TOP; @@ -180,8 +180,8 @@ class ActivityStarter { private ActivityInfo mNewTaskInfo; private Intent mNewTaskIntent; - private ActivityStack mSourceStack; - private ActivityStack mTargetStack; + private Task mSourceStack; + private Task mTargetStack; // The task that the last activity was started into. We currently reset the actual start // activity's task and as a result may not have a reference to the task in all cases private Task mTargetTask; @@ -651,7 +651,7 @@ class ActivityStarter { synchronized (mService.mGlobalLock) { final boolean globalConfigWillChange = mRequest.globalConfig != null && mService.getGlobalConfiguration().diff(mRequest.globalConfig) != 0; - final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task stack = mRootWindowContainer.getTopDisplayFocusedStack(); if (stack != null) { stack.mConfigWillChange = globalConfigWillChange; } @@ -984,7 +984,7 @@ class ActivityStarter { } } - final ActivityStack resultStack = resultRecord == null + final Task resultStack = resultRecord == null ? null : resultRecord.getRootTask(); if (err != START_SUCCESS) { @@ -1122,7 +1122,7 @@ class ActivityStarter { null /*profilerInfo*/); if (DEBUG_PERMISSIONS_REVIEW) { - final ActivityStack focusedStack = + final Task focusedStack = mRootWindowContainer.getTopDisplayFocusedStack(); Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true, true, false) + "} from uid " + callingUid + " on display " @@ -1163,7 +1163,7 @@ class ActivityStarter { r.appTimeTracker = sourceRecord.appTimeTracker; } - final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task stack = mRootWindowContainer.getTopDisplayFocusedStack(); // If we are starting an activity that is not from the same uid as the currently resumed // one, check whether app switches are allowed. @@ -1445,7 +1445,7 @@ class ActivityStarter { } void postStartActivityProcessing(ActivityRecord r, int result, - ActivityStack startedActivityStack) { + Task startedActivityStack) { if (!ActivityManager.isStartResultSuccessful(result)) { if (mFrozeTaskList) { // If we specifically froze the task list as part of starting an activity, then @@ -1479,7 +1479,7 @@ class ActivityStarter { // The activity was already running so it wasn't started, but either brought to the // front or the new intent was delivered to it since it was already in front. Notify // anyone interested in this piece of information. - final ActivityStack homeStack = targetTask.getDisplayArea().getRootHomeTask(); + final Task homeStack = targetTask.getDisplayArea().getRootHomeTask(); final boolean homeTaskVisible = homeStack != null && homeStack.shouldBeVisible(null); mService.getTaskChangeNotificationController().notifyActivityRestartAttempt( targetTask.getTaskInfo(), homeTaskVisible, clearedTask, @@ -1514,7 +1514,7 @@ class ActivityStarter { int startFlags, boolean doResume, ActivityOptions options, Task inTask, boolean restrictedBgActivity, NeededUriGrants intentGrants) { int result = START_CANCELED; - final ActivityStack startedActivityStack; + final Task startedActivityStack; try { mService.deferWindowLayout(); Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner"); @@ -1537,9 +1537,9 @@ class ActivityStarter { * * @return the stack where the successful started activity resides. */ - private @Nullable ActivityStack handleStartResult(@NonNull ActivityRecord started, int result) { - final ActivityStack currentStack = started.getRootTask(); - ActivityStack startedActivityStack = currentStack != null ? currentStack : mTargetStack; + private @Nullable Task handleStartResult(@NonNull ActivityRecord started, int result) { + final Task currentStack = started.getRootTask(); + Task startedActivityStack = currentStack != null ? currentStack : mTargetStack; if (ActivityManager.isStartResultSuccessful(result)) { if (startedActivityStack != null) { @@ -1559,7 +1559,7 @@ class ActivityStarter { // If we are not able to proceed, disassociate the activity from the task. Leaving an // activity in an incomplete state can lead to issues, such as performing operations // without a window container. - final ActivityStack stack = mStartActivity.getRootTask(); + final Task stack = mStartActivity.getRootTask(); if (stack != null) { mStartActivity.finishIfPossible("startActivity", true /* oomAdj */); } @@ -1634,7 +1634,7 @@ class ActivityStarter { // If the activity being launched is the same as the one currently at the top, then // we need to check if it should only be launched once. - final ActivityStack topStack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task topStack = mRootWindowContainer.getTopDisplayFocusedStack(); if (topStack != null) { startResult = deliverToCurrentTopIfNeeded(topStack, intentGrants); if (startResult != START_SUCCESS) { @@ -1659,7 +1659,7 @@ class ActivityStarter { } if (!mAvoidMoveToFront && mDoResume) { - mTargetStack.getStack().moveToFront("reuseOrNewTask", targetTask); + mTargetStack.getRootTask().moveToFront("reuseOrNewTask", targetTask); if (mOptions != null) { if (mOptions.getTaskAlwaysOnTop()) { mTargetStack.setAlwaysOnTop(true); @@ -1752,7 +1752,7 @@ class ActivityStarter { } else if (mInTask != null) { return mInTask; } else { - final ActivityStack stack = getLaunchStack(mStartActivity, mLaunchFlags, + final Task stack = getLaunchStack(mStartActivity, mLaunchFlags, null /* task */, mOptions); final ActivityRecord top = stack.getTopNonFinishingActivity(); if (top != null) { @@ -1767,7 +1767,7 @@ class ActivityStarter { private void computeLaunchParams(ActivityRecord r, ActivityRecord sourceRecord, Task targetTask) { - final ActivityStack sourceStack = mSourceStack != null ? mSourceStack + final Task sourceStack = mSourceStack != null ? mSourceStack : mRootWindowContainer.getTopDisplayFocusedStack(); if (sourceStack != null && sourceStack.inSplitScreenWindowingMode() && (mOptions == null @@ -1851,7 +1851,7 @@ class ActivityStarter { // Should not recycle task which is from a different user, just adding the starting // activity to the task. if (targetTask.mUserId != mStartActivity.mUserId) { - mTargetStack = targetTask.getStack(); + mTargetStack = targetTask.getRootTask(); mAddingToTask = true; return START_SUCCESS; } @@ -1949,7 +1949,7 @@ class ActivityStarter { * Check if the activity being launched is the same as the one currently at the top and it * should only be launched once. */ - private int deliverToCurrentTopIfNeeded(ActivityStack topStack, NeededUriGrants intentGrants) { + private int deliverToCurrentTopIfNeeded(Task topStack, NeededUriGrants intentGrants) { final ActivityRecord top = topStack.topRunningNonDelayedActivityLocked(mNotTop); final boolean dontStart = top != null && mStartActivity.resultTo == null && top.mActivityComponent.equals(mStartActivity.mActivityComponent) @@ -2042,7 +2042,7 @@ class ActivityStarter { // running, and the caller has asked to clear the current task to have this // activity at the top. mAddingToTask = true; - if (targetTask.getStack() == null) { + if (targetTask.getRootTask() == null) { // Target stack got cleared when we all activities were removed above. // Go ahead and reset it. mTargetStack = @@ -2262,7 +2262,7 @@ class ActivityStarter { if ((startFlags & START_FLAG_ONLY_IF_NEEDED) != 0) { ActivityRecord checkedCaller = sourceRecord; if (checkedCaller == null) { - ActivityStack topFocusedStack = mRootWindowContainer.getTopDisplayFocusedStack(); + Task topFocusedStack = mRootWindowContainer.getTopDisplayFocusedStack(); if (topFocusedStack != null) { checkedCaller = topFocusedStack.topRunningNonDelayedActivityLocked(mNotTop); } @@ -2299,7 +2299,7 @@ class ActivityStarter { private void computeLaunchingTaskFlags() { // If the caller is not coming from another activity, but has given us an explicit task into // which they would like us to launch the new activity, then let's see about doing that. - if (mSourceRecord == null && mInTask != null && mInTask.getStack() != null) { + if (mSourceRecord == null && mInTask != null && mInTask.getRootTask() != null) { final Intent baseIntent = mInTask.getBaseIntent(); final ActivityRecord root = mInTask.getRootActivity(); if (baseIntent == null) { @@ -2482,7 +2482,7 @@ class ActivityStarter { // to the front if the caller is not itself in the front. final boolean differentTopTask; if (mTargetStack.getDisplayArea() == mPreferredTaskDisplayArea) { - final ActivityStack focusStack = mTargetStack.getDisplay().getFocusedStack(); + final Task focusStack = mTargetStack.getDisplay().getFocusedStack(); final ActivityRecord curTop = (focusStack == null) ? null : focusStack.topRunningNonDelayedActivityLocked(mNotTop); final Task topTask = curTop != null ? curTop.getTask() : null; @@ -2503,7 +2503,7 @@ class ActivityStarter { intentActivity.setTaskToAffiliateWith(mSourceRecord.getTask()); } - final ActivityStack launchStack = + final Task launchStack = getLaunchStack(mStartActivity, mLaunchFlags, intentTask, mOptions); if (launchStack == null || launchStack == mTargetStack) { // Do not set mMovedToFront to true below for split-screen-top stack, or @@ -2616,11 +2616,11 @@ class ActivityStarter { return launchFlags; } - private ActivityStack getLaunchStack(ActivityRecord r, int launchFlags, Task task, + private Task getLaunchStack(ActivityRecord r, int launchFlags, Task task, ActivityOptions aOptions) { // We are reusing a task, keep the stack! if (mReuseTask != null) { - return mReuseTask.getStack(); + return mReuseTask.getRootTask(); } final boolean onTop = diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index d5df9068e81d..a903bcd3d728 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -125,20 +125,30 @@ public abstract class ActivityTaskManagerInternal { * Sleep tokens cause the activity manager to put the top activity to sleep. * They are used by components such as dreams that may hide and block interaction * with underlying activities. + * The Acquirer provides an interface that encapsulates the underlying work, so the user does + * not need to handle the token by him/herself. */ - public static abstract class SleepToken { + public interface SleepTokenAcquirer { - /** Releases the sleep token. */ - public abstract void release(); + /** + * Acquires a sleep token. + * @param displayId The display to apply to. + */ + void acquire(int displayId); + + /** + * Releases the sleep token. + * @param displayId The display to apply to. + */ + void release(int displayId); } /** - * Acquires a sleep token for the specified display with the specified tag. + * Creates a sleep token acquirer for the specified display with the specified tag. * - * @param tag A string identifying the purpose of the token (eg. "Dream"). - * @param displayId The display to apply the sleep token to. + * @param tag A string identifying the purpose (eg. "Dream"). */ - public abstract SleepToken acquireSleepToken(@NonNull String tag, int displayId); + public abstract SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag); /** * Returns home activity for the specified user. diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 4e1d789bebd8..029b5547ae29 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -86,8 +86,6 @@ import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.Scr import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.PACKAGE; import static com.android.server.am.EventLogTags.writeBootProgressEnableScreen; import static com.android.server.am.EventLogTags.writeConfigurationChanged; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS; @@ -120,6 +118,8 @@ import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_P import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION; import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_ONLY; import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS; +import static com.android.server.wm.Task.ActivityState.DESTROYED; +import static com.android.server.wm.Task.ActivityState.DESTROYING; import static com.android.server.wm.Task.LOCK_TASK_AUTH_DONT_LOCK; import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT; import static com.android.server.wm.Task.REPARENT_LEAVE_STACK_IN_PLACE; @@ -1119,7 +1119,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { synchronized (mGlobalLock) { // If this is coming from the currently resumed activity, it is // effectively saying that app switches are allowed at this point. - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); if (stack != null && stack.mResumedActivity != null && stack.mResumedActivity.info.applicationInfo.uid == Binder.getCallingUid()) { mAppSwitchesAllowedTime = 0; @@ -1868,7 +1868,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { r = ActivityRecord.isInStackLocked(token); if (r != null) { if (r.attachedToProcess() - && r.isState(ActivityStack.ActivityState.RESTARTING_PROCESS)) { + && r.isState(Task.ActivityState.RESTARTING_PROCESS)) { // The activity was requested to restart from // {@link #restartActivityProcessIfVisible}. restartingName = r.app.mName; @@ -1996,7 +1996,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public boolean isTopActivityImmersive() { enforceNotIsolatedCaller("isTopActivityImmersive"); synchronized (mGlobalLock) { - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); if (topFocusedStack == null) { return false; } @@ -2018,7 +2018,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final long origId = Binder.clearCallingIdentity(); if (self.isState( - ActivityStack.ActivityState.RESUMED, ActivityStack.ActivityState.PAUSING)) { + Task.ActivityState.RESUMED, Task.ActivityState.PAUSING)) { self.getDisplay().mDisplayContent.mAppTransition.overridePendingAppTransition( packageName, enterAnim, exitAnim, null, null); } @@ -2031,7 +2031,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public int getFrontActivityScreenCompatMode() { enforceNotIsolatedCaller("getFrontActivityScreenCompatMode"); synchronized (mGlobalLock) { - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); final ActivityRecord r = stack != null ? stack.topRunningActivity() : null; if (r == null) { return ActivityManager.COMPAT_MODE_UNKNOWN; @@ -2046,7 +2046,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { "setFrontActivityScreenCompatMode"); ApplicationInfo ai; synchronized (mGlobalLock) { - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); final ActivityRecord r = stack != null ? stack.topRunningActivity() : null; if (r == null) { Slog.w(TAG, "setFrontActivityScreenCompatMode failed: no top activity"); @@ -2143,7 +2143,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public int getDisplayId(IBinder activityToken) throws RemoteException { synchronized (mGlobalLock) { - final ActivityStack stack = ActivityRecord.getStackLocked(activityToken); + final Task stack = ActivityRecord.getStackLocked(activityToken); if (stack != null) { final int displayId = stack.getDisplayId(); return displayId != INVALID_DISPLAY ? displayId : DEFAULT_DISPLAY; @@ -2158,7 +2158,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { long ident = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { - ActivityStack focusedStack = getTopDisplayFocusedStack(); + Task focusedStack = getTopDisplayFocusedStack(); if (focusedStack != null) { return mRootWindowContainer.getStackInfo(focusedStack.mTaskId); } @@ -2176,7 +2176,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final long callingId = Binder.clearCallingIdentity(); try { synchronized (mGlobalLock) { - final ActivityStack stack = mRootWindowContainer.getStack(stackId); + final Task stack = mRootWindowContainer.getStack(stackId); if (stack == null) { Slog.w(TAG, "setFocusedStack: No stack with id=" + stackId); return; @@ -2393,7 +2393,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + windowingMode); } - final ActivityStack stack = task.getStack(); + final Task stack = task.getRootTask(); if (toTop) { stack.moveToFront("setTaskWindowingMode", task); } @@ -2453,7 +2453,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { synchronized (mGlobalLock) { final long origId = Binder.clearCallingIdentity(); try { - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); if (topFocusedStack != null) { topFocusedStack.unhandledBackLocked(); } @@ -2470,7 +2470,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (r == null) { return; } - ActivityStack stack = r.getRootTask(); + Task stack = r.getRootTask(); final TaskOrganizerController taskOrgController = mWindowOrganizerController.mTaskOrganizerController; if (taskOrgController.handleInterceptBackPressedOnTaskRoot(stack)) { @@ -2727,7 +2727,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public boolean willActivityBeVisible(IBinder token) { synchronized (mGlobalLock) { - ActivityStack stack = ActivityRecord.getStackLocked(token); + Task stack = ActivityRecord.getStackLocked(token); if (stack != null) { return stack.willActivityBeVisible(token); } @@ -2750,7 +2750,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (DEBUG_STACK) Slog.d(TAG_STACK, "moveTaskToStack: moving task=" + taskId + " to stackId=" + stackId + " toTop=" + toTop); - final ActivityStack stack = mRootWindowContainer.getStack(stackId); + final Task stack = mRootWindowContainer.getStack(stackId); if (stack == null) { throw new IllegalStateException( "moveTaskToStack: No stack for stackId=" + stackId); @@ -2829,7 +2829,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { void moveTaskToSplitScreenPrimaryTask(Task task, boolean toTop) { final TaskDisplayArea taskDisplayArea = task.getDisplayArea(); - final ActivityStack primarySplitTask = taskDisplayArea.getRootSplitScreenPrimaryTask(); + final Task primarySplitTask = taskDisplayArea.getRootSplitScreenPrimaryTask(); if (primarySplitTask == null) { throw new IllegalStateException("Can't enter split without associated organized task"); } @@ -2841,8 +2841,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { WindowContainerTransaction wct = new WindowContainerTransaction(); // Clear out current windowing mode before reparenting to split taks. wct.setWindowingMode( - task.getStack().mRemoteToken.toWindowContainerToken(), WINDOWING_MODE_UNDEFINED); - wct.reparent(task.getStack().mRemoteToken.toWindowContainerToken(), + task.getRootTask().mRemoteToken.toWindowContainerToken(), WINDOWING_MODE_UNDEFINED); + wct.reparent(task.getRootTask().mRemoteToken.toWindowContainerToken(), primarySplitTask.mRemoteToken.toWindowContainerToken(), toTop); mWindowOrganizerController.applyTransaction(wct); } @@ -2990,7 +2990,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } // When starting lock task mode the stack must be in front and focused - task.getStack().moveToFront("startSystemLockTaskMode"); + task.getRootTask().moveToFront("startSystemLockTaskMode"); startLockTaskModeLocked(task, true /* isSystemCaller */); } } finally { @@ -3025,7 +3025,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return; } - final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task stack = mRootWindowContainer.getTopDisplayFocusedStack(); if (stack == null || task != stack.getTopMostTask()) { throw new IllegalArgumentException("Invalid task, not in foreground"); } @@ -3299,7 +3299,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + ainfo.applicationInfo.uid + ", calling uid=" + callingUid); } - final ActivityStack stack = r.getRootTask(); + final Task stack = r.getRootTask(); final Task task = stack.getDisplayArea().createStack(stack.getWindowingMode(), stack.getActivityType(), !ON_TOP, ainfo, intent, false /* createdByOrganizer */); @@ -3460,7 +3460,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { synchronized (mGlobalLock) { final long ident = Binder.clearCallingIdentity(); try { - final ActivityStack stack = mRootWindowContainer.getStack(stackId); + final Task stack = mRootWindowContainer.getStack(stackId); if (stack == null) { Slog.w(TAG, "removeStack: No stack with id=" + stackId); return; @@ -3504,7 +3504,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + token); } - final ActivityStack stack = r.getRootTask(); + final Task stack = r.getRootTask(); if (stack == null) { throw new IllegalStateException("toggleFreeformWindowingMode: the activity " + "doesn't have a stack"); @@ -3668,7 +3668,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { "enqueueAssistContext()"); synchronized (mGlobalLock) { - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); ActivityRecord activity = stack != null ? stack.getTopNonFinishingActivity() : null; if (activity == null) { Slog.w(TAG, "getAssistContextExtras failed: no top activity"); @@ -3797,7 +3797,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { public boolean isAssistDataAllowedOnCurrentActivity() { int userId; synchronized (mGlobalLock) { - final ActivityStack focusedStack = getTopDisplayFocusedStack(); + final Task focusedStack = getTopDisplayFocusedStack(); if (focusedStack == null || focusedStack.isActivityTypeAssistant()) { return false; } @@ -3970,7 +3970,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + taskId); } - final ActivityStack stack = mRootWindowContainer.getStack(stackId); + final Task stack = mRootWindowContainer.getStack(stackId); if (stack == null) { throw new IllegalArgumentException("positionTaskInStack: no stack for id=" @@ -3983,7 +3983,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // TODO: Have the callers of this API call a separate reparent method if that is // what they intended to do vs. having this method also do reparenting. - if (task.getStack() == stack) { + if (task.getRootTask() == stack) { // Change position in current stack. stack.positionChildAt(task, position); } else { @@ -4089,7 +4089,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final List<RemoteAction> actions = r.pictureInPictureArgs.getActions(); mRootWindowContainer.moveActivityToPinnedStack( r, "enterPictureInPictureMode"); - final ActivityStack stack = r.getRootTask(); + final Task stack = r.getRootTask(); stack.setPictureInPictureAspectRatio(aspectRatio); stack.setPictureInPictureActions(actions); MetricsLoggerWrapper.logPictureInPictureEnter(mContext, @@ -4134,7 +4134,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // If the activity is already in picture-in-picture, update the pinned stack now // if it is not already expanding to fullscreen. Otherwise, the arguments will // be used the next time the activity enters PiP - final ActivityStack stack = r.getRootTask(); + final Task stack = r.getRootTask(); stack.setPictureInPictureAspectRatio( r.pictureInPictureArgs.getAspectRatio()); stack.setPictureInPictureActions(r.pictureInPictureArgs.getActions()); @@ -4798,7 +4798,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } } - ActivityStack getTopDisplayFocusedStack() { + Task getTopDisplayFocusedStack() { return mRootWindowContainer.getTopDisplayFocusedStack(); } @@ -5070,7 +5070,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS); proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS, PowerManagerInternal.wakefulnessToProtoEnum(wakeFullness)); - for (ActivityTaskManagerInternal.SleepToken st : mRootWindowContainer.mSleepTokens) { + final int tokenSize = mRootWindowContainer.mSleepTokens.size(); + for (int i = 0; i < tokenSize; i++) { + final RootWindowContainer.SleepToken st = + mRootWindowContainer.mSleepTokens.valueAt(i); proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEP_TOKENS, st.toString()); } @@ -5504,12 +5507,35 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { reason); } - ActivityTaskManagerInternal.SleepToken acquireSleepToken(String tag, int displayId) { - synchronized (mGlobalLock) { - final ActivityTaskManagerInternal.SleepToken token = - mRootWindowContainer.createSleepToken(tag, displayId); - updateSleepIfNeededLocked(); - return token; + final class SleepTokenAcquirerImpl implements ActivityTaskManagerInternal.SleepTokenAcquirer { + private final String mTag; + private final SparseArray<RootWindowContainer.SleepToken> mSleepTokens = + new SparseArray<>(); + + SleepTokenAcquirerImpl(@NonNull String tag) { + mTag = tag; + } + + @Override + public void acquire(int displayId) { + synchronized (mGlobalLock) { + if (!mSleepTokens.contains(displayId)) { + mSleepTokens.append(displayId, + mRootWindowContainer.createSleepToken(mTag, displayId)); + updateSleepIfNeededLocked(); + } + } + } + + @Override + public void release(int displayId) { + synchronized (mGlobalLock) { + final RootWindowContainer.SleepToken token = mSleepTokens.get(displayId); + if (token != null) { + mRootWindowContainer.removeSleepToken(token); + mSleepTokens.remove(displayId); + } + } } } @@ -5769,7 +5795,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { /** Applies latest configuration and/or visibility updates if needed. */ boolean ensureConfigAndVisibilityAfterUpdate(ActivityRecord starting, int changes) { boolean kept = true; - final ActivityStack mainStack = mRootWindowContainer.getTopDisplayFocusedStack(); + final Task mainStack = mRootWindowContainer.getTopDisplayFocusedStack(); // mainStack is null during startup. if (mainStack != null) { if (changes != 0 && starting == null) { @@ -6068,9 +6094,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final class LocalService extends ActivityTaskManagerInternal { @Override - public SleepToken acquireSleepToken(String tag, int displayId) { + public SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag) { Objects.requireNonNull(tag); - return ActivityTaskManagerService.this.acquireSleepToken(tag, displayId); + return new SleepTokenAcquirerImpl(tag); } @Override @@ -6820,7 +6846,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { synchronized (mGlobalLock) { // Clean-up disabled activities. if (mRootWindowContainer.finishDisabledPackageActivities( - packageName, disabledClasses, true, false, userId) && booted) { + packageName, disabledClasses, true /* doit */, false /* evenPersistent */, + userId, false /* onlyRemoveNoProcess */) && booted) { mRootWindowContainer.resumeFocusedStacksTopActivities(); mStackSupervisor.scheduleIdle(); } @@ -6839,7 +6866,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { boolean didSomething = getActivityStartController().clearPendingActivityLaunches(packageName); didSomething |= mRootWindowContainer.finishDisabledPackageActivities(packageName, - null, doit, evenPersistent, userId); + null /* filterByClasses */, doit, evenPersistent, userId, + // Only remove the activities without process because the activities with + // attached process will be removed when handling process died with + // WindowProcessController#isRemoved == true. + true /* onlyRemoveNoProcess */); return didSomething; } } @@ -7024,7 +7055,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { mRootWindowContainer.dumpDisplayConfigs(pw, " "); } if (dumpAll) { - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); if (dumpPackage == null && topFocusedStack != null) { pw.println(" mConfigWillChange: " + topFocusedStack.mConfigWillChange); } @@ -7107,7 +7138,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { synchronized (mGlobalLock) { if (dumpPackage == null) { getGlobalConfiguration().dumpDebug(proto, GLOBAL_CONFIGURATION); - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); if (topFocusedStack != null) { proto.write(CONFIG_WILL_CHANGE, topFocusedStack.mConfigWillChange); } diff --git a/services/core/java/com/android/server/wm/BarController.java b/services/core/java/com/android/server/wm/BarController.java index 123fb6c9d8e3..c1447553ba31 100644 --- a/services/core/java/com/android/server/wm/BarController.java +++ b/services/core/java/com/android/server/wm/BarController.java @@ -19,6 +19,7 @@ package com.android.server.wm; import static com.android.server.wm.BarControllerProto.STATE; import static com.android.server.wm.BarControllerProto.TRANSIENT_STATE; +import android.annotation.NonNull; import android.app.StatusBarManager; import android.graphics.Rect; import android.os.Handler; @@ -169,13 +170,23 @@ public class BarController { return vis; } + private Rect getContentFrame(@NonNull WindowState win) { + final Rect rotatedContentFrame = win.mToken.getFixedRotationBarContentFrame(mWindowType); + return rotatedContentFrame != null ? rotatedContentFrame : mContentFrame; + } + + boolean isLightAppearanceAllowed(WindowState win) { + if (win == null) { + return true; + } + return !win.isLetterboxedOverlappingWith(getContentFrame(win)); + } + boolean isTransparentAllowed(WindowState win) { if (win == null) { return true; } - final Rect rotatedContentFrame = win.mToken.getFixedRotationBarContentFrame(mWindowType); - final Rect contentFrame = rotatedContentFrame != null ? rotatedContentFrame : mContentFrame; - return !win.isLetterboxedOverlappingWith(contentFrame); + return win.letterboxNotIntersectsOrFullyContains(getContentFrame(win)); } boolean setBarShowingLw(final boolean show) { diff --git a/services/core/java/com/android/server/wm/CompatModePackages.java b/services/core/java/com/android/server/wm/CompatModePackages.java index 320ca65d215b..167afab9db0e 100644 --- a/services/core/java/com/android/server/wm/CompatModePackages.java +++ b/services/core/java/com/android/server/wm/CompatModePackages.java @@ -22,20 +22,6 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_CONFI import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; - -import com.android.internal.util.FastXmlSerializer; - import android.app.ActivityManager; import android.app.AppGlobals; import android.content.pm.ApplicationInfo; @@ -51,6 +37,20 @@ import android.util.Slog; import android.util.SparseArray; import android.util.Xml; +import com.android.internal.util.FastXmlSerializer; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + public final class CompatModePackages { private static final String TAG = TAG_WITH_CLASS_NAME ? "CompatModePackages" : TAG_ATM; private static final String TAG_CONFIGURATION = TAG + POSTFIX_CONFIGURATION; @@ -321,7 +321,7 @@ public final class CompatModePackages { scheduleWrite(); - final ActivityStack stack = mService.getTopDisplayFocusedStack(); + final Task stack = mService.getTopDisplayFocusedStack(); ActivityRecord starting = stack.restartPackage(packageName); // Tell all processes that loaded this package about the change. diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index fbb2fcb15aee..546c5d4c29de 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -93,7 +93,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { // Verify that we have proper ordering Type.checkChild(mType, Type.typeOf(child)); - if (child instanceof ActivityStack) { + if (child instanceof Task) { // TODO(display-area): ActivityStacks are type ANY, but are allowed to have siblings. // They might need a separate type. return; @@ -487,7 +487,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { return ((DisplayArea) c).mType; } else if (c instanceof WindowToken && !(c instanceof ActivityRecord)) { return typeOf((WindowToken) c); - } else if (c instanceof ActivityStack) { + } else if (c instanceof Task) { return ANY; } else { throw new IllegalArgumentException("Unknown container: " + c); diff --git a/services/core/java/com/android/server/wm/DisplayAreaPolicy.java b/services/core/java/com/android/server/wm/DisplayAreaPolicy.java index 59c32045000b..33eb3ce57373 100644 --- a/services/core/java/com/android/server/wm/DisplayAreaPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayAreaPolicy.java @@ -17,12 +17,19 @@ package com.android.server.wm; import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; +import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER; +import static android.window.DisplayAreaOrganizer.FEATURE_FULLSCREEN_MAGNIFICATION; import static android.window.DisplayAreaOrganizer.FEATURE_ONE_HANDED; import static android.window.DisplayAreaOrganizer.FEATURE_WINDOWED_MAGNIFICATION; +import static com.android.server.wm.DisplayAreaPolicyBuilder.Feature; +import static com.android.server.wm.DisplayAreaPolicyBuilder.HierarchyBuilder; + import android.content.res.Resources; import android.text.TextUtils; @@ -81,21 +88,27 @@ public abstract class DisplayAreaPolicy { // Define the features that will be supported under the root of the whole logical // display. The policy will build the DisplayArea hierarchy based on this. - DisplayAreaPolicyBuilder.HierarchyBuilder rootHierarchy = - new DisplayAreaPolicyBuilder.HierarchyBuilder(root) - .addFeature(new DisplayAreaPolicyBuilder.Feature.Builder(wmService.mPolicy, - "WindowedMagnification", FEATURE_WINDOWED_MAGNIFICATION) + HierarchyBuilder rootHierarchy = new HierarchyBuilder(root) + .addFeature(new Feature.Builder(wmService.mPolicy, "WindowedMagnification", + FEATURE_WINDOWED_MAGNIFICATION) .upTo(TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY) .except(TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY) // Make the DA dimmable so that the magnify window also mirrors the dim // layer .setNewDisplayAreaSupplier(DisplayArea.Dimmable::new) .build()) - .addFeature(new DisplayAreaPolicyBuilder.Feature.Builder(wmService.mPolicy, - "OneHanded", FEATURE_ONE_HANDED) + .addFeature(new Feature.Builder(wmService.mPolicy, "OneHanded", + FEATURE_ONE_HANDED) .all() .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL) .build()) + .addFeature(new Feature.Builder(wmService.mPolicy, "FullscreenMagnification", + FEATURE_FULLSCREEN_MAGNIFICATION) + .all() + .except(TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY, TYPE_INPUT_METHOD, + TYPE_INPUT_METHOD_DIALOG, TYPE_MAGNIFICATION_OVERLAY, + TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL) + .build()) .setImeContainer(imeContainer) .setTaskDisplayAreas(tdaList); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index de91af752512..127e10a6966b 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -78,7 +78,6 @@ import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_A import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STACK; import static com.android.server.wm.DisplayContentProto.APP_TRANSITION; import static com.android.server.wm.DisplayContentProto.CLOSING_APPS; @@ -103,6 +102,7 @@ import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_IME; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_SCREEN_ON; import static com.android.server.wm.ProtoLogGroup.WM_SHOW_TRANSACTIONS; +import static com.android.server.wm.Task.ActivityState.RESUMED; import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; import static com.android.server.wm.WindowContainerChildProto.DISPLAY_CONTENT; @@ -585,9 +585,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp private IntArray mDisplayAccessUIDs = new IntArray(); /** All tokens used to put activities on this stack to sleep (including mOffToken) */ - final ArrayList<ActivityTaskManagerInternal.SleepToken> mAllSleepTokens = new ArrayList<>(); - /** The token acquired by ActivityStackSupervisor to put stacks on the display to sleep */ - ActivityTaskManagerInternal.SleepToken mOffToken; + final ArrayList<RootWindowContainer.SleepToken> mAllSleepTokens = new ArrayList<>(); + /** The token acquirer to put stacks on the display to sleep */ + private final ActivityTaskManagerInternal.SleepTokenAcquirer mOffTokenAcquirer; private boolean mSleeping; @@ -923,6 +923,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mAtmService = mWmService.mAtmService; mDisplay = display; mDisplayId = display.getDisplayId(); + mOffTokenAcquirer = mRootWindowContainer.mDisplayOffTokenAcquirer; mWallpaperController = new WallpaperController(mWmService, this); display.getDisplayInfo(mDisplayInfo); display.getMetrics(mDisplayMetrics); @@ -2193,13 +2194,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp * activity type. Null is no compatible stack on the display. */ @Nullable - ActivityStack getStack(int windowingMode, int activityType) { + Task getStack(int windowingMode, int activityType) { return getItemFromTaskDisplayAreas(taskDisplayArea -> taskDisplayArea.getStack(windowingMode, activityType)); } @Nullable - ActivityStack getStack(int rootTaskId) { + Task getStack(int rootTaskId) { return getItemFromTaskDisplayAreas(taskDisplayArea -> taskDisplayArea.getStack(rootTaskId)); } @@ -2211,7 +2212,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @VisibleForTesting @Nullable - ActivityStack getTopStack() { + Task getTopStack() { return getItemFromTaskDisplayAreas(TaskDisplayArea::getTopStack); } @@ -2831,7 +2832,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } proto.write(SINGLE_TASK_INSTANCE, mSingleTaskInstance); - final ActivityStack focusedStack = getFocusedStack(); + final Task focusedStack = getFocusedStack(); if (focusedStack != null) { proto.write(FOCUSED_ROOT_TASK_ID, focusedStack.getRootTaskId()); final ActivityRecord focusedActivity = focusedStack.getDisplayArea() @@ -2956,26 +2957,26 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp pw.println(); // Dump stack references - final ActivityStack homeStack = getDefaultTaskDisplayArea().getRootHomeTask(); + final Task homeStack = getDefaultTaskDisplayArea().getRootHomeTask(); if (homeStack != null) { pw.println(prefix + "homeStack=" + homeStack.getName()); } - final ActivityStack pinnedStack = getDefaultTaskDisplayArea().getRootPinnedTask(); + final Task pinnedStack = getDefaultTaskDisplayArea().getRootPinnedTask(); if (pinnedStack != null) { pw.println(prefix + "pinnedStack=" + pinnedStack.getName()); } - final ActivityStack splitScreenPrimaryStack = getDefaultTaskDisplayArea() + final Task splitScreenPrimaryStack = getDefaultTaskDisplayArea() .getRootSplitScreenPrimaryTask(); if (splitScreenPrimaryStack != null) { pw.println(prefix + "splitScreenPrimaryStack=" + splitScreenPrimaryStack.getName()); } // TODO: Support recents on non-default task containers - final ActivityStack recentsStack = getDefaultTaskDisplayArea().getStack( + final Task recentsStack = getDefaultTaskDisplayArea().getStack( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_RECENTS); if (recentsStack != null) { pw.println(prefix + "recentsStack=" + recentsStack.getName()); } - final ActivityStack dreamStack = + final Task dreamStack = getStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_DREAM); if (dreamStack != null) { pw.println(prefix + "dreamStack=" + dreamStack.getName()); @@ -4042,36 +4043,16 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp return null; } - int dw = mDisplayInfo.logicalWidth; - int dh = mDisplayInfo.logicalHeight; - - if (dw <= 0 || dh <= 0) { - return null; - } - - final Rect frame = new Rect(0, 0, dw, dh); - - // The screenshot API does not apply the current screen rotation. - int rot = mDisplay.getRotation(); - - if (rot == ROTATION_90 || rot == ROTATION_270) { - rot = (rot == ROTATION_90) ? ROTATION_270 : ROTATION_90; - } - - // SurfaceFlinger is not aware of orientation, so convert our logical - // crop to SurfaceFlinger's portrait orientation. - convertCropForSurfaceFlinger(frame, rot, dw, dh); - final ScreenRotationAnimation screenRotationAnimation = mWmService.mRoot.getDisplayContent(DEFAULT_DISPLAY).getRotationAnimation(); final boolean inRotation = screenRotationAnimation != null && screenRotationAnimation.isAnimating(); if (DEBUG_SCREENSHOT && inRotation) Slog.v(TAG_WM, "Taking screenshot while rotating"); - // TODO(b/68392460): We should screenshot Task controls directly - // but it's difficult at the moment as the Task doesn't have the - // correct size set. - final Bitmap bitmap = SurfaceControl.screenshot(frame, dw, dh, inRotation, rot); + // Send invalid rect and no width and height since it will screenshot the entire display. + Rect frame = new Rect(0, 0, -1, -1); + final Bitmap bitmap = SurfaceControl.screenshot(frame, 0, 0, inRotation, + mDisplay.getRotation()); if (bitmap == null) { Slog.w(TAG_WM, "Failed to take screenshot"); return null; @@ -4086,30 +4067,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp return ret; } - // TODO: Can this use createRotationMatrix()? - private static void convertCropForSurfaceFlinger(Rect crop, int rot, int dw, int dh) { - if (rot == Surface.ROTATION_90) { - final int tmp = crop.top; - crop.top = dw - crop.right; - crop.right = crop.bottom; - crop.bottom = dw - crop.left; - crop.left = tmp; - } else if (rot == Surface.ROTATION_180) { - int tmp = crop.top; - crop.top = dh - crop.bottom; - crop.bottom = dh - tmp; - tmp = crop.right; - crop.right = dw - crop.left; - crop.left = dw - tmp; - } else if (rot == Surface.ROTATION_270) { - final int tmp = crop.top; - crop.top = crop.left; - crop.left = dh - crop.bottom; - crop.bottom = crop.right; - crop.right = dh - tmp; - } - } - void setExitingTokensHasVisible(boolean hasVisible) { for (int i = mExitingTokens.size() - 1; i >= 0; i--) { mExitingTokens.get(i).hasVisible = hasVisible; @@ -4183,7 +4140,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } private boolean processTask(Task task) { - if (!task.getStack().getWindowConfiguration().canResizeTask()) { + if (!task.getRootTask().getWindowConfiguration().canResizeTask()) { return true; } @@ -4975,11 +4932,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final int displayId = mDisplay.getDisplayId(); if (displayId != DEFAULT_DISPLAY) { final int displayState = mDisplay.getState(); - if (displayState == Display.STATE_OFF && mOffToken == null) { - mOffToken = mAtmService.acquireSleepToken("Display-off", displayId); - } else if (displayState == Display.STATE_ON && mOffToken != null) { - mOffToken.release(); - mOffToken = null; + if (displayState == Display.STATE_OFF) { + mOffTokenAcquirer.acquire(mDisplayId); + } else if (displayState == Display.STATE_ON) { + mOffTokenAcquirer.release(mDisplayId); } } mWmService.requestTraversal(); @@ -4997,7 +4953,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } @Nullable - ActivityStack getFocusedStack() { + Task getFocusedStack() { return getItemFromTaskDisplayAreas(TaskDisplayArea::getFocusedStack); } @@ -5194,12 +5150,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp void remove() { mRemoving = true; - ActivityStack lastReparentedStack; + Task lastReparentedStack; mRootWindowContainer.mStackSupervisor.beginDeferResume(); try { lastReparentedStack = reduceOnAllTaskDisplayAreas((taskDisplayArea, stack) -> { - final ActivityStack lastReparentedStackFromArea = taskDisplayArea.remove(); + final Task lastReparentedStackFromArea = taskDisplayArea.remove(); if (lastReparentedStackFromArea != null) { return lastReparentedStackFromArea; } @@ -5219,7 +5175,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mDisplayPolicy.release(); if (!mAllSleepTokens.isEmpty()) { - mRootWindowContainer.mSleepTokens.removeAll(mAllSleepTokens); + mAllSleepTokens.forEach(token -> + mRootWindowContainer.mSleepTokens.remove(token.mHashKey)); mAllSleepTokens.clear(); mAtmService.updateSleepIfNeededLocked(); } @@ -5235,7 +5192,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp if (taskDisplayArea.getStackCount() != 1) { return true; } - final ActivityStack stack = taskDisplayArea.getStackAt(0); + final Task stack = taskDisplayArea.getStackAt(0); return !stack.isActivityTypeHome() || stack.hasChild(); }); if (!hasNonEmptyHomeStack) { @@ -5338,7 +5295,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp + this); } if (stackCount > 0) { - final ActivityStack stack = getDefaultTaskDisplayArea().getStackAt(0); + final Task stack = getDefaultTaskDisplayArea().getStackAt(0); if (stack.getChildCount() > 1) { throw new IllegalArgumentException("Display stack already has multiple tasks." + " display=" + this + " stack=" + stack); @@ -5355,7 +5312,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @VisibleForTesting void removeAllTasks() { - forAllTasks((t) -> { t.getStack().removeChild(t, "removeAllTasks"); }); + forAllTasks((t) -> { t.getRootTask().removeChild(t, "removeAllTasks"); }); } /** diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index b4ead8eccf02..53f16a7241fc 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -102,6 +102,11 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManagerGlobal.ADD_OKAY; import static android.view.WindowManagerPolicyConstants.ACTION_HDMI_PLUGGED; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_BOTTOM; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_LEFT; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_RIGHT; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_TOP; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_UNKNOWN; import static android.view.WindowManagerPolicyConstants.EXTRA_HDMI_PLUGGED_STATE; import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM; import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT; @@ -314,6 +319,17 @@ public class DisplayPolicy { private int[] mNavigationBarHeightForRotationInCarMode = new int[4]; private int[] mNavigationBarWidthForRotationInCarMode = new int[4]; + // Alternative status bar for when flexible insets mapping is used to place the status bar on + // another side of the screen. + private WindowState mStatusBarAlt = null; + @WindowManagerPolicy.AltBarPosition + private int mStatusBarAltPosition = ALT_BAR_UNKNOWN; + // Alternative navigation bar for when flexible insets mapping is used to place the navigation + // bar elsewhere on the screen. + private WindowState mNavigationBarAlt = null; + @WindowManagerPolicy.AltBarPosition + private int mNavigationBarAltPosition = ALT_BAR_UNKNOWN; + /** See {@link #getNavigationBarFrameHeight} */ private int[] mNavigationBarFrameHeightForRotationDefault = new int[4]; @@ -373,7 +389,10 @@ public class DisplayPolicy { private static final Rect sTmpDisplayCutoutSafeExceptMaybeBarsRect = new Rect(); private static final Rect sTmpRect = new Rect(); private static final Rect sTmpNavFrame = new Rect(); + private static final Rect sTmpStatusFrame = new Rect(); + private static final Rect sTmpScreenDecorFrame = new Rect(); private static final Rect sTmpLastParentFrame = new Rect(); + private static final Rect sTmpDisplayFrameBounds = new Rect(); private WindowState mTopFullscreenOpaqueWindowState; private WindowState mTopFullscreenOpaqueOrDimmingWindowState; @@ -431,7 +450,7 @@ public class DisplayPolicy { case MSG_REQUEST_TRANSIENT_BARS: synchronized (mLock) { WindowState targetBar = (msg.arg1 == MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS) - ? mStatusBar : mNavigationBar; + ? getStatusBar() : getNavigationBar(); if (targetBar != null) { requestTransientBars(targetBar); } @@ -494,6 +513,7 @@ public class DisplayPolicy { if (mStatusBar != null) { requestTransientBars(mStatusBar); } + checkAltBarSwipeForTransientBars(ALT_BAR_TOP); } } @@ -504,6 +524,7 @@ public class DisplayPolicy { && mNavigationBarPosition == NAV_BAR_BOTTOM) { requestTransientBars(mNavigationBar); } + checkAltBarSwipeForTransientBars(ALT_BAR_BOTTOM); } } @@ -520,6 +541,7 @@ public class DisplayPolicy { excludedRegion)) { requestTransientBars(mNavigationBar); } + checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT); } excludedRegion.recycle(); } @@ -537,6 +559,7 @@ public class DisplayPolicy { excludedRegion)) { requestTransientBars(mNavigationBar); } + checkAltBarSwipeForTransientBars(ALT_BAR_LEFT); } excludedRegion.recycle(); } @@ -638,6 +661,15 @@ public class DisplayPolicy { mHandler.post(mGestureNavigationSettingsObserver::register); } + private void checkAltBarSwipeForTransientBars(@WindowManagerPolicy.AltBarPosition int pos) { + if (mStatusBarAlt != null && mStatusBarAltPosition == pos) { + requestTransientBars(mStatusBarAlt); + } + if (mNavigationBarAlt != null && mNavigationBarAltPosition == pos) { + requestTransientBars(mNavigationBarAlt); + } + } + void systemReady() { mSystemGestures.systemReady(); if (mService.mPointerLocationEnabled) { @@ -899,6 +931,14 @@ public class DisplayPolicy { } break; } + + // Check if alternate bars positions were updated. + if (mStatusBarAlt == win) { + mStatusBarAltPosition = getAltBarPosition(attrs); + } + if (mNavigationBarAlt == win) { + mNavigationBarAltPosition = getAltBarPosition(attrs); + } } /** @@ -943,10 +983,9 @@ public class DisplayPolicy { mContext.enforcePermission( android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid, "DisplayPolicy"); - if (mStatusBar != null) { - if (mStatusBar.isAlive()) { - return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; - } + if ((mStatusBar != null && mStatusBar.isAlive()) + || (mStatusBarAlt != null && mStatusBarAlt.isAlive())) { + return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; } break; case TYPE_NOTIFICATION_SHADE: @@ -963,10 +1002,9 @@ public class DisplayPolicy { mContext.enforcePermission( android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid, "DisplayPolicy"); - if (mNavigationBar != null) { - if (mNavigationBar.isAlive()) { - return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; - } + if ((mNavigationBar != null && mNavigationBar.isAlive()) + || (mNavigationBarAlt != null && mNavigationBarAlt.isAlive())) { + return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; } break; case TYPE_NAVIGATION_BAR_PANEL: @@ -993,10 +1031,43 @@ public class DisplayPolicy { android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid, "DisplayPolicy"); enforceSingleInsetsTypeCorrespondingToWindowType(attrs.providesInsetsTypes); + + for (@InternalInsetsType int insetType : attrs.providesInsetsTypes) { + switch (insetType) { + case ITYPE_STATUS_BAR: + if ((mStatusBar != null && mStatusBar.isAlive()) + || (mStatusBarAlt != null && mStatusBarAlt.isAlive())) { + return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; + } + break; + case ITYPE_NAVIGATION_BAR: + if ((mNavigationBar != null && mNavigationBar.isAlive()) + || (mNavigationBarAlt != null && mNavigationBarAlt.isAlive())) { + return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON; + } + break; + } + } } return ADD_OKAY; } + private void getRotatedWindowBounds(DisplayFrames displayFrames, WindowState windowState, + Rect outBounds) { + outBounds.set(windowState.getBounds()); + + int windowRotation = windowState.getWindowConfiguration().getRotation(); + if (windowRotation == displayFrames.mRotation) { + return; + } + + // Get displayFrames bounds + sTmpDisplayFrameBounds.set(0, 0, displayFrames.mDisplayWidth, displayFrames.mDisplayHeight); + // Rotate the WindowState's bounds based on the displayFrames rotation + mDisplayContent.rotateBounds(sTmpDisplayFrameBounds, windowRotation, + displayFrames.mRotation, outBounds); + } + /** * Called when a window is being added to the system. Must not throw an exception. * @@ -1020,7 +1091,6 @@ public class DisplayPolicy { mStatusBarController.setWindow(win); final TriConsumer<DisplayFrames, WindowState, Rect> frameProvider = (displayFrames, windowState, rect) -> { - rect.set(windowState.getFrameLw()); rect.bottom = rect.top + getStatusBarHeight(displayFrames); }; mDisplayContent.setInsetProvider(ITYPE_STATUS_BAR, win, frameProvider); @@ -1041,7 +1111,7 @@ public class DisplayPolicy { displayFrames.mDisplayHeight, displayFrames.mRotation) == NAV_BAR_BOTTOM && !mNavButtonForcedVisible) { - sTmpRect.set(windowState.getFrameLw()); + sTmpRect.set(inOutFrame); sTmpRect.intersectUnchecked(displayFrames.mDisplayCutoutSafe); inOutFrame.top = sTmpRect.bottom - getNavigationBarHeight(displayFrames.mRotation, @@ -1083,7 +1153,19 @@ public class DisplayPolicy { break; default: if (attrs.providesInsetsTypes != null) { - for (int insetsType : attrs.providesInsetsTypes) { + for (@InternalInsetsType int insetsType : attrs.providesInsetsTypes) { + switch (insetsType) { + case ITYPE_STATUS_BAR: + mStatusBarAlt = win; + mStatusBarController.setWindow(mStatusBarAlt); + mStatusBarAltPosition = getAltBarPosition(attrs); + break; + case ITYPE_NAVIGATION_BAR: + mNavigationBarAlt = win; + mNavigationBarController.setWindow(mNavigationBarAlt); + mNavigationBarAltPosition = getAltBarPosition(attrs); + break; + } mDisplayContent.setInsetProvider(insetsType, win, null); } } @@ -1091,6 +1173,22 @@ public class DisplayPolicy { } } + @WindowManagerPolicy.AltBarPosition + private int getAltBarPosition(WindowManager.LayoutParams params) { + switch (params.gravity) { + case Gravity.LEFT: + return ALT_BAR_LEFT; + case Gravity.RIGHT: + return ALT_BAR_RIGHT; + case Gravity.BOTTOM: + return ALT_BAR_BOTTOM; + case Gravity.TOP: + return ALT_BAR_TOP; + default: + return ALT_BAR_UNKNOWN; + } + } + TriConsumer<DisplayFrames, WindowState, Rect> getImeSourceFrameProvider() { return (displayFrames, windowState, inOutFrame) -> { if (mNavigationBar != null && navigationBarPosition(displayFrames.mDisplayWidth, @@ -1131,12 +1229,14 @@ public class DisplayPolicy { * @param win The window being removed. */ void removeWindowLw(WindowState win) { - if (mStatusBar == win) { + if (mStatusBar == win || mStatusBarAlt == win) { mStatusBar = null; + mStatusBarAlt = null; mStatusBarController.setWindow(null); mDisplayContent.setInsetProvider(ITYPE_STATUS_BAR, null, null); - } else if (mNavigationBar == win) { + } else if (mNavigationBar == win || mNavigationBarAlt == win) { mNavigationBar = null; + mNavigationBarAlt = null; mNavigationBarController.setWindow(null); mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, null, null); } else if (mNotificationShade == win) { @@ -1162,7 +1262,7 @@ public class DisplayPolicy { } WindowState getStatusBar() { - return mStatusBar; + return mStatusBar != null ? mStatusBar : mStatusBarAlt; } WindowState getNotificationShade() { @@ -1170,7 +1270,7 @@ public class DisplayPolicy { } WindowState getNavigationBar() { - return mNavigationBar; + return mNavigationBar != null ? mNavigationBar : mNavigationBarAlt; } /** @@ -1232,6 +1332,46 @@ public class DisplayPolicy { return R.anim.dock_left_enter; } } + } else if (win == mStatusBarAlt || win == mNavigationBarAlt) { + if (win.getAttrs().windowAnimations != 0) { + return ANIMATION_STYLEABLE; + } + + int pos = (win == mStatusBarAlt) ? mStatusBarAltPosition : mNavigationBarAltPosition; + + boolean isExitOrHide = transit == TRANSIT_EXIT || transit == TRANSIT_HIDE; + boolean isEnterOrShow = transit == TRANSIT_ENTER || transit == TRANSIT_SHOW; + + switch (pos) { + case ALT_BAR_LEFT: + if (isExitOrHide) { + return R.anim.dock_left_exit; + } else if (isEnterOrShow) { + return R.anim.dock_left_enter; + } + break; + case ALT_BAR_RIGHT: + if (isExitOrHide) { + return R.anim.dock_right_exit; + } else if (isEnterOrShow) { + return R.anim.dock_right_enter; + } + break; + case ALT_BAR_BOTTOM: + if (isExitOrHide) { + return R.anim.dock_bottom_exit; + } else if (isEnterOrShow) { + return R.anim.dock_bottom_enter; + } + break; + case ALT_BAR_TOP: + if (isExitOrHide) { + return R.anim.dock_top_exit; + } else if (isEnterOrShow) { + return R.anim.dock_top_enter; + } + break; + } } if (transit == TRANSIT_PREVIEW_DONE) { @@ -1590,7 +1730,7 @@ public class DisplayPolicy { mInputConsumer = null; Slog.v(TAG, INPUT_CONSUMER_NAVIGATION + " dismissed."); } - } else if (mInputConsumer == null && mStatusBar != null && canHideNavigationBar()) { + } else if (mInputConsumer == null && getStatusBar() != null && canHideNavigationBar()) { mInputConsumer = mDisplayContent.getInputMonitor().createInputConsumer( mHandler.getLooper(), INPUT_CONSUMER_NAVIGATION, @@ -1669,11 +1809,13 @@ public class DisplayPolicy { if (isSimulatedLayout) { w.setSimulatedWindowFrames(simulatedFrames); } - Rect bounds = w.getBounds(); + getRotatedWindowBounds(displayFrames, w, sTmpScreenDecorFrame); final WindowFrames windowFrames = w.getLayoutingWindowFrames(); - windowFrames.setFrames(bounds /* parentFrame */, bounds /* displayFrame */, - bounds /* contentFrame */, bounds /* visibleFrame */, sTmpRect /* decorFrame */, - bounds /* stableFrame */); + windowFrames.setFrames(sTmpScreenDecorFrame /* parentFrame */, + sTmpScreenDecorFrame /* displayFrame */, + sTmpScreenDecorFrame /* contentFrame */, + sTmpScreenDecorFrame /* visibleFrame */, sTmpRect /* decorFrame */, + sTmpScreenDecorFrame /* stableFrame */); try { w.computeFrame(displayFrames); } finally { @@ -1731,12 +1873,13 @@ public class DisplayPolicy { return false; } // apply any status bar insets - Rect bounds = mStatusBar.getBounds(); + getRotatedWindowBounds(displayFrames, mStatusBar, sTmpStatusFrame); sTmpRect.setEmpty(); final WindowFrames windowFrames = mStatusBar.getLayoutingWindowFrames(); - windowFrames.setFrames(bounds /* parentFrame */, bounds /* displayFrame */, - bounds /* contentFrame */, bounds /* visibleFrame */, sTmpRect /* decorFrame */, - bounds /* stableFrame */); + windowFrames.setFrames(sTmpStatusFrame /* parentFrame */, + sTmpStatusFrame /* displayFrame */, sTmpStatusFrame /* contentFrame */, + sTmpStatusFrame /* visibleFrame */, sTmpRect /* decorFrame */, + sTmpStatusFrame /* stableFrame */); // Let the status bar determine its size. mStatusBar.computeFrame(displayFrames); @@ -1807,7 +1950,7 @@ public class DisplayPolicy { final Rect dockFrame = displayFrames.mDock; final int navBarPosition = navigationBarPosition(displayWidth, displayHeight, rotation); - navigationFrame.set(mNavigationBar.getBounds()); + getRotatedWindowBounds(displayFrames, mNavigationBar, navigationFrame); final Rect cutoutSafeUnrestricted = sTmpRect; cutoutSafeUnrestricted.set(displayFrames.mUnrestricted); @@ -2047,7 +2190,8 @@ public class DisplayPolicy { final @InsetsType int typesToFit = attrs.getFitInsetsTypes(); final @InsetsSide int sidesToFit = attrs.getFitInsetsSides(); final ArraySet<Integer> types = InsetsState.toInternalType(typesToFit); - final Rect dfu = win.getBounds(); + getRotatedWindowBounds(displayFrames, win, sTmpRect); + final Rect dfu = sTmpRect; Insets insets = Insets.of(0, 0, 0, 0); for (int i = types.size() - 1; i >= 0; i--) { final InsetsSource source = mDisplayContent.getInsetsPolicy() @@ -2062,7 +2206,7 @@ public class DisplayPolicy { final int top = (sidesToFit & Side.TOP) != 0 ? insets.top : 0; final int right = (sidesToFit & Side.RIGHT) != 0 ? insets.right : 0; final int bottom = (sidesToFit & Side.BOTTOM) != 0 ? insets.bottom : 0; - df.set(left, top, dfu.right - right, dfu.bottom - bottom); + df.set(dfu.left + left, dfu.top + top, dfu.right - right, dfu.bottom - bottom); if (attached == null) { pf.set(df); vf.set(adjust != SOFT_INPUT_ADJUST_NOTHING @@ -2676,10 +2820,10 @@ public class DisplayPolicy { mDreamingLockscreen = mService.mPolicy.isKeyguardShowingAndNotOccluded(); } - if (mStatusBar != null) { + if (getStatusBar() != null) { if (DEBUG_LAYOUT) Slog.i(TAG, "force=" + mForceStatusBar + " top=" + mTopFullscreenOpaqueWindowState); - final boolean forceShowStatusBar = (mStatusBar.getAttrs().privateFlags + final boolean forceShowStatusBar = (getStatusBar().getAttrs().privateFlags & PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR) != 0; final boolean notificationShadeForcesShowingNavigation = mNotificationShade != null @@ -3165,6 +3309,16 @@ public class DisplayPolicy { return mNavigationBarPosition; } + @WindowManagerPolicy.AltBarPosition + int getAlternateStatusBarPosition() { + return mStatusBarAltPosition; + } + + @WindowManagerPolicy.AltBarPosition + int getAlternateNavBarPosition() { + return mNavigationBarAltPosition; + } + /** * A new window has been focused. */ @@ -3274,7 +3428,7 @@ public class DisplayPolicy { // keys, we let it keep controlling the visibility. final boolean lastFocusCanReceiveKeys = (mLastFocusedWindow != null && mLastFocusedWindow.canReceiveKeys()); - winCandidate = isKeyguardShowing() ? mNotificationShade + winCandidate = isKeyguardShowing() && !isKeyguardOccluded() ? mNotificationShade : lastFocusCanReceiveKeys ? mLastFocusedWindow : mTopFullscreenOpaqueWindowState; if (winCandidate == null) { @@ -3326,8 +3480,8 @@ public class DisplayPolicy { final boolean isFullscreen = (visibility & (View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION)) != 0 || (PolicyControl.getWindowFlags(win, win.mAttrs) & FLAG_FULLSCREEN) != 0 - || (mStatusBar != null && insetsPolicy.isHidden(ITYPE_STATUS_BAR)) - || (mNavigationBar != null && insetsPolicy.isHidden( + || (getStatusBar() != null && insetsPolicy.isHidden(ITYPE_STATUS_BAR)) + || (getNavigationBar() != null && insetsPolicy.isHidden( ITYPE_NAVIGATION_BAR)); final int behavior = win.mAttrs.insetsFlags.behavior; final boolean isImmersive = (visibility & (View.SYSTEM_UI_FLAG_IMMERSIVE @@ -3419,17 +3573,22 @@ public class DisplayPolicy { WindowState opaqueOrDimming) { final boolean onKeyguard = isKeyguardShowing() && !isKeyguardOccluded(); final WindowState statusColorWin = onKeyguard ? mNotificationShade : opaqueOrDimming; - if (statusColorWin != null && (statusColorWin == opaque || onKeyguard)) { - // If the top fullscreen-or-dimming window is also the top fullscreen, respect - // its light flag. - appearance &= ~APPEARANCE_LIGHT_STATUS_BARS; - final int legacyAppearance = InsetsFlags.getAppearance( - PolicyControl.getSystemUiVisibility(statusColorWin, null)); - appearance |= (statusColorWin.mAttrs.insetsFlags.appearance | legacyAppearance) - & APPEARANCE_LIGHT_STATUS_BARS; - } else if (statusColorWin != null && statusColorWin.isDimming()) { - // Otherwise if it's dimming, clear the light flag. - appearance &= ~APPEARANCE_LIGHT_STATUS_BARS; + if (statusColorWin != null) { + if (statusColorWin == opaque || onKeyguard) { + // If the top fullscreen-or-dimming window is also the top fullscreen, respect + // its light flag. + appearance &= ~APPEARANCE_LIGHT_STATUS_BARS; + final int legacyAppearance = InsetsFlags.getAppearance( + PolicyControl.getSystemUiVisibility(statusColorWin, null)); + appearance |= (statusColorWin.mAttrs.insetsFlags.appearance | legacyAppearance) + & APPEARANCE_LIGHT_STATUS_BARS; + } else if (statusColorWin.isDimming()) { + // Otherwise if it's dimming, clear the light flag. + appearance &= ~APPEARANCE_LIGHT_STATUS_BARS; + } + if (!mStatusBarController.isLightAppearanceAllowed(statusColorWin)) { + appearance &= ~APPEARANCE_LIGHT_STATUS_BARS; + } } return appearance; } @@ -3494,8 +3653,7 @@ public class DisplayPolicy { return vis; } - @VisibleForTesting - static int updateLightNavigationBarAppearanceLw(int appearance, WindowState opaque, + private int updateLightNavigationBarAppearanceLw(int appearance, WindowState opaque, WindowState opaqueOrDimming, WindowState imeWindow, WindowState navColorWin) { if (navColorWin != null) { @@ -3508,6 +3666,9 @@ public class DisplayPolicy { // Clear the light flag for dimming window. appearance &= ~APPEARANCE_LIGHT_NAVIGATION_BARS; } + if (!mNavigationBarController.isLightAppearanceAllowed(navColorWin)) { + appearance &= ~APPEARANCE_LIGHT_NAVIGATION_BARS; + } } return appearance; } @@ -3582,7 +3743,7 @@ public class DisplayPolicy { final boolean hideNavBarSysui = (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0; - final boolean transientStatusBarAllowed = mStatusBar != null + final boolean transientStatusBarAllowed = getStatusBar() != null && (notificationShadeHasFocus || (!mForceShowSystemBars && (hideStatusBarWM || (hideStatusBarSysui && immersiveSticky)))); @@ -3740,7 +3901,7 @@ public class DisplayPolicy { // TODO(b/118118435): Remove this after migration private boolean isImmersiveMode(int vis) { final int flags = View.SYSTEM_UI_FLAG_IMMERSIVE | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - return mNavigationBar != null + return getNavigationBar() != null && (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0 && (vis & flags) != 0 && canHideNavigationBar(); @@ -3748,7 +3909,7 @@ public class DisplayPolicy { private boolean isImmersiveMode(WindowState win) { final int behavior = win.mAttrs.insetsFlags.behavior; - return mNavigationBar != null + return getNavigationBar() != null && canHideNavigationBar() && (behavior == BEHAVIOR_SHOW_BARS_BY_SWIPE || behavior == BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE) @@ -3829,8 +3990,8 @@ public class DisplayPolicy { public void takeScreenshot(int screenshotType, int source) { if (mScreenshotHelper != null) { mScreenshotHelper.takeScreenshot(screenshotType, - mStatusBar != null && mStatusBar.isVisibleLw(), - mNavigationBar != null && mNavigationBar.isVisibleLw(), + getStatusBar() != null && getStatusBar().isVisibleLw(), + getNavigationBar() != null && getNavigationBar().isVisibleLw(), source, mHandler, null /* completionConsumer */); } } @@ -3868,6 +4029,11 @@ public class DisplayPolicy { if (mStatusBar != null) { pw.print(prefix); pw.print("mStatusBar="); pw.print(mStatusBar); } + if (mStatusBarAlt != null) { + pw.print(prefix); pw.print("mStatusBarAlt="); pw.print(mStatusBarAlt); + pw.print(prefix); pw.print("mStatusBarAltPosition="); + pw.println(mStatusBarAltPosition); + } if (mNotificationShade != null) { pw.print(prefix); pw.print("mExpandedPanel="); pw.print(mNotificationShade); } @@ -3879,6 +4045,11 @@ public class DisplayPolicy { pw.print(prefix); pw.print("mNavigationBarPosition="); pw.println(mNavigationBarPosition); } + if (mNavigationBarAlt != null) { + pw.print(prefix); pw.print("mNavigationBarAlt="); pw.println(mNavigationBarAlt); + pw.print(prefix); pw.print("mNavigationBarAltPosition="); + pw.println(mNavigationBarAltPosition); + } if (mFocusedWindow != null) { pw.print(prefix); pw.print("mFocusedWindow="); pw.println(mFocusedWindow); } diff --git a/services/core/java/com/android/server/wm/DragResizeMode.java b/services/core/java/com/android/server/wm/DragResizeMode.java index 71beb5032914..eb27b046b9ab 100644 --- a/services/core/java/com/android/server/wm/DragResizeMode.java +++ b/services/core/java/com/android/server/wm/DragResizeMode.java @@ -35,7 +35,7 @@ class DragResizeMode { */ static final int DRAG_RESIZE_MODE_DOCKED_DIVIDER = 1; - static boolean isModeAllowedForStack(ActivityStack stack, int mode) { + static boolean isModeAllowedForStack(Task stack, int mode) { switch (mode) { case DRAG_RESIZE_MODE_FREEFORM: return stack.getWindowingMode() == WINDOWING_MODE_FREEFORM; diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java index c4e03f5c65f5..c7cba77f6797 100644 --- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java +++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java @@ -18,8 +18,8 @@ package com.android.server.wm; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; -import static com.android.server.wm.ActivityStack.TAG_VISIBILITY; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_VISIBILITY; +import static com.android.server.wm.Task.TAG_VISIBILITY; import android.annotation.Nullable; import android.util.Slog; @@ -29,7 +29,7 @@ import com.android.internal.util.function.pooled.PooledLambda; /** Helper class to ensure activities are in the right visible state for a container. */ class EnsureActivitiesVisibleHelper { - private final ActivityStack mContiner; + private final Task mContiner; private ActivityRecord mTop; private ActivityRecord mStarting; private boolean mAboveTop; @@ -39,7 +39,7 @@ class EnsureActivitiesVisibleHelper { private boolean mPreserveWindows; private boolean mNotifyClients; - EnsureActivitiesVisibleHelper(ActivityStack container) { + EnsureActivitiesVisibleHelper(Task container) { mContiner = container; } @@ -69,7 +69,7 @@ class EnsureActivitiesVisibleHelper { /** * Ensure visibility with an option to also update the configuration of visible activities. - * @see ActivityStack#ensureActivitiesVisible(ActivityRecord, int, boolean) + * @see Task#ensureActivitiesVisible(ActivityRecord, int, boolean) * @see RootWindowContainer#ensureActivitiesVisible(ActivityRecord, int, boolean) * @param starting The top most activity in the task. * The activity is either starting or resuming. diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 76f236534b69..c36a75b01293 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -50,7 +50,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.server.policy.WindowManagerPolicy; -import com.android.server.wm.ActivityTaskManagerInternal.SleepToken; import java.io.PrintWriter; @@ -74,11 +73,14 @@ class KeyguardController { private final SparseArray<KeyguardDisplayState> mDisplayStates = new SparseArray<>(); private final ActivityTaskManagerService mService; private RootWindowContainer mRootWindowContainer; + private final ActivityTaskManagerInternal.SleepTokenAcquirer mSleepTokenAcquirer; + KeyguardController(ActivityTaskManagerService service, ActivityStackSupervisor stackSupervisor) { mService = service; mStackSupervisor = stackSupervisor; + mSleepTokenAcquirer = mService.new SleepTokenAcquirerImpl("keyguard"); } void setWindowManager(WindowManagerService windowManager) { @@ -412,17 +414,17 @@ class KeyguardController { private void updateKeyguardSleepToken(int displayId) { final KeyguardDisplayState state = getDisplay(displayId); - if (isKeyguardUnoccludedOrAodShowing(displayId) && state.mSleepToken == null) { - state.acquiredSleepToken(); - } else if (!isKeyguardUnoccludedOrAodShowing(displayId) && state.mSleepToken != null) { - state.releaseSleepToken(); + if (isKeyguardUnoccludedOrAodShowing(displayId)) { + state.mSleepTokenAcquirer.acquire(displayId); + } else if (!isKeyguardUnoccludedOrAodShowing(displayId)) { + state.mSleepTokenAcquirer.release(displayId); } } private KeyguardDisplayState getDisplay(int displayId) { KeyguardDisplayState state = mDisplayStates.get(displayId); if (state == null) { - state = new KeyguardDisplayState(mService, displayId); + state = new KeyguardDisplayState(mService, displayId, mSleepTokenAcquirer); mDisplayStates.append(displayId, state); } return state; @@ -443,29 +445,18 @@ class KeyguardController { private ActivityRecord mDismissingKeyguardActivity; private boolean mRequestDismissKeyguard; private final ActivityTaskManagerService mService; - private SleepToken mSleepToken; + private final ActivityTaskManagerInternal.SleepTokenAcquirer mSleepTokenAcquirer; - KeyguardDisplayState(ActivityTaskManagerService service, int displayId) { + KeyguardDisplayState(ActivityTaskManagerService service, int displayId, + ActivityTaskManagerInternal.SleepTokenAcquirer acquirer) { mService = service; mDisplayId = displayId; + mSleepTokenAcquirer = acquirer; } void onRemoved() { mDismissingKeyguardActivity = null; - releaseSleepToken(); - } - - void acquiredSleepToken() { - if (mSleepToken == null) { - mSleepToken = mService.acquireSleepToken("keyguard", mDisplayId); - } - } - - void releaseSleepToken() { - if (mSleepToken != null) { - mSleepToken.release(); - mSleepToken = null; - } + mSleepTokenAcquirer.release(mDisplayId); } void visibilitiesUpdated(KeyguardController controller, DisplayContent display) { @@ -475,7 +466,7 @@ class KeyguardController { mOccluded = false; mDismissingKeyguardActivity = null; - final ActivityStack stack = getStackForControllingOccluding(display); + final Task stack = getStackForControllingOccluding(display); if (stack != null) { final ActivityRecord topDismissing = stack.getTopDismissingKeyguardActivity(); mOccluded = stack.topActivityOccludesKeyguard() || (topDismissing != null @@ -516,10 +507,10 @@ class KeyguardController { * occlusion state. */ @Nullable - private ActivityStack getStackForControllingOccluding(DisplayContent display) { + private Task getStackForControllingOccluding(DisplayContent display) { return display.getItemFromTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (stack != null && stack.isFocusableAndVisible() && !stack.inPinnedWindowingMode()) { return stack; diff --git a/services/core/java/com/android/server/wm/LaunchParamsController.java b/services/core/java/com/android/server/wm/LaunchParamsController.java index 513be7a6becc..56e1187d51da 100644 --- a/services/core/java/com/android/server/wm/LaunchParamsController.java +++ b/services/core/java/com/android/server/wm/LaunchParamsController.java @@ -145,10 +145,10 @@ class LaunchParamsController { } if (mTmpParams.hasWindowingMode() - && mTmpParams.mWindowingMode != task.getStack().getWindowingMode()) { + && mTmpParams.mWindowingMode != task.getRootTask().getWindowingMode()) { final int activityType = activity != null ? activity.getActivityType() : task.getActivityType(); - task.getStack().setWindowingMode(task.getDisplayArea().validateWindowingMode( + task.getRootTask().setWindowingMode(task.getDisplayArea().validateWindowingMode( mTmpParams.mWindowingMode, activity, task, activityType)); } @@ -156,7 +156,7 @@ class LaunchParamsController { return false; } - if (task.getStack().inFreeformWindowingMode()) { + if (task.getRootTask().inFreeformWindowingMode()) { // Only set bounds if it's in freeform mode. task.setBounds(mTmpParams.mBounds); return true; diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java index a685886da032..28dcbcdf3cc7 100644 --- a/services/core/java/com/android/server/wm/Letterbox.java +++ b/services/core/java/com/android/server/wm/Letterbox.java @@ -77,10 +77,10 @@ public class Letterbox { mOuter.set(outer); mInner.set(inner); - mTop.layout(outer.left, outer.top, inner.right, inner.top, surfaceOrigin); - mLeft.layout(outer.left, inner.top, inner.left, outer.bottom, surfaceOrigin); - mBottom.layout(inner.left, inner.bottom, outer.right, outer.bottom, surfaceOrigin); - mRight.layout(inner.right, outer.top, outer.right, inner.bottom, surfaceOrigin); + mTop.layout(outer.left, outer.top, outer.right, inner.top, surfaceOrigin); + mLeft.layout(outer.left, outer.top, inner.left, outer.bottom, surfaceOrigin); + mBottom.layout(outer.left, inner.bottom, outer.right, outer.bottom, surfaceOrigin); + mRight.layout(inner.right, outer.top, outer.right, outer.bottom, surfaceOrigin); } @@ -101,6 +101,31 @@ public class Letterbox { } /** + * Returns {@code true} if the letterbox does not overlap with the bar, or the letterbox can + * fully cover the window frame. + * + * @param rect The area of the window frame. + */ + boolean notIntersectsOrFullyContains(Rect rect) { + int emptyCount = 0; + int noOverlappingCount = 0; + for (LetterboxSurface surface : mSurfaces) { + final Rect surfaceRect = surface.mLayoutFrameGlobal; + if (surfaceRect.isEmpty()) { + // empty letterbox + emptyCount++; + } else if (!Rect.intersects(surfaceRect, rect)) { + // no overlapping + noOverlappingCount++; + } else if (surfaceRect.contains(rect)) { + // overlapping and covered + return true; + } + } + return (emptyCount + noOverlappingCount) == mSurfaces.length; + } + + /** * Returns true if any part of the letterbox overlaps with the given {@code rect}. */ public boolean isOverlappingWith(Rect rect) { diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java index 892ee717e21f..c7a438d527ad 100644 --- a/services/core/java/com/android/server/wm/LockTaskController.java +++ b/services/core/java/com/android/server/wm/LockTaskController.java @@ -151,7 +151,7 @@ public class LockTaskController { * The first task in the list, which started the current LockTask session, is called the root * task. It coincides with the Home task in a typical multi-app kiosk deployment. When there are * more than one locked tasks, the root task can't be finished. Nor can it be moved to the back - * of the stack by {@link ActivityStack#moveTaskToBack(Task)}; + * of the stack by {@link Task#moveTaskToBack(Task)}; * * Calling {@link Activity#stopLockTask()} on the root task will finish all tasks but itself in * this list, and the device will exit LockTask mode. @@ -252,7 +252,7 @@ public class LockTaskController { /** * @return whether the given task can be moved to the back of the stack with - * {@link ActivityStack#moveTaskToBack(Task)} + * {@link Task#moveTaskToBack(Task)} * @see #mLockTaskModeTasks */ boolean canMoveTaskToBack(Task task) { @@ -617,14 +617,14 @@ public class LockTaskController { mSupervisor.findTaskToMoveToFront(task, 0, null, reason, lockTaskModeState != LOCK_TASK_MODE_NONE); mSupervisor.mRootWindowContainer.resumeFocusedStacksTopActivities(); - final ActivityStack stack = task.getStack(); - if (stack != null) { - stack.getDisplay().mDisplayContent.executeAppTransition(); + final Task rootTask = task.getRootTask(); + if (rootTask != null) { + rootTask.getDisplay().mDisplayContent.executeAppTransition(); } } else if (lockTaskModeState != LOCK_TASK_MODE_NONE) { mSupervisor.handleNonResizableTaskIfNeeded(task, WINDOWING_MODE_UNDEFINED, mSupervisor.mRootWindowContainer.getDefaultTaskDisplayArea(), - task.getStack(), true /* forceNonResizable */); + task.getRootTask(), true /* forceNonResizable */); } } diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index 851b533a550d..ba2c0b6dc0ac 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -215,7 +215,7 @@ class RecentTasks { final RootWindowContainer rac = mService.mRootWindowContainer; final DisplayContent dc = rac.getDisplayContent(displayId).mDisplayContent; if (dc.pointWithinAppWindow(x, y)) { - final ActivityStack stack = mService.getTopDisplayFocusedStack(); + final Task stack = mService.getTopDisplayFocusedStack(); final Task topTask = stack != null ? stack.getTopMostTask() : null; resetFreezeTaskListReordering(topTask); } @@ -323,7 +323,7 @@ class RecentTasks { @VisibleForTesting void resetFreezeTaskListReorderingOnTimeout() { synchronized (mService.mGlobalLock) { - final ActivityStack focusedStack = mService.getTopDisplayFocusedStack(); + final Task focusedStack = mService.getTopDisplayFocusedStack(); final Task topTask = focusedStack != null ? focusedStack.getTopMostTask() : null; resetFreezeTaskListReordering(topTask); } @@ -520,9 +520,9 @@ class RecentTasks { * Kicks off the task persister to write any pending tasks to disk. */ void notifyTaskPersisterLocked(Task task, boolean flush) { - final ActivityStack stack = task != null ? task.getStack() : null; - if (stack != null && stack.isHomeOrRecentsStack()) { - // Never persist the home or recents stack. + final Task rootTask = task != null ? task.getRootTask() : null; + if (rootTask != null && rootTask.isHomeOrRecentsStack()) { + // Never persist the home or recents task. return; } syncPersistentTaskIdsLocked(); @@ -554,8 +554,8 @@ class RecentTasks { } private static boolean shouldPersistTaskLocked(Task task) { - final ActivityStack stack = task.getStack(); - return task.isPersistable && (stack == null || !stack.isHomeOrRecentsStack()); + final Task rootTask = task.getRootTask(); + return task.isPersistable && (rootTask == null || !rootTask.isHomeOrRecentsStack()); } void onSystemReadyLocked() { @@ -975,9 +975,9 @@ class RecentTasks { final Task task = mTasks.get(i); if (TaskPersister.DEBUG) Slog.d(TAG, "LazyTaskWriter: task=" + task + " persistable=" + task.isPersistable); - final ActivityStack stack = task.getStack(); + final Task rootTask = task.getRootTask(); if ((task.isPersistable || task.inRecents) - && (stack == null || !stack.isHomeOrRecentsStack())) { + && (rootTask == null || !rootTask.isHomeOrRecentsStack())) { if (TaskPersister.DEBUG) Slog.d(TAG, "adding to persistentTaskIds task=" + task); persistentTaskIds.add(task.mTaskId); } else { @@ -1325,10 +1325,10 @@ class RecentTasks { return false; case WINDOWING_MODE_SPLIT_SCREEN_PRIMARY: if (DEBUG_RECENTS_TRIM_TASKS) { - Slog.d(TAG, "\ttop=" + task.getStack().getTopMostTask()); + Slog.d(TAG, "\ttop=" + task.getRootTask().getTopMostTask()); } - final ActivityStack stack = task.getStack(); - if (stack != null && stack.getTopMostTask() == task) { + final Task rootTask = task.getRootTask(); + if (rootTask != null && rootTask.getTopMostTask() == task) { // Only the non-top task of the primary split screen mode is visible return false; } @@ -1344,9 +1344,9 @@ class RecentTasks { // Tasks managed by/associated with an ActivityView should be excluded from recents. // singleTaskInstance is set on the VirtualDisplay managed by ActivityView // TODO(b/126185105): Find a different signal to use besides isSingleTaskInstance - final ActivityStack stack = task.getStack(); - if (stack != null) { - DisplayContent display = stack.getDisplay(); + final Task rootTask = task.getRootTask(); + if (rootTask != null) { + DisplayContent display = rootTask.getDisplay(); if (display != null && display.isSingleTaskInstance()) { return false; } @@ -1400,21 +1400,21 @@ class RecentTasks { /** @return whether the given task can be trimmed even if it is outside the visible range. */ protected boolean isTrimmable(Task task) { - final ActivityStack stack = task.getStack(); + final Task rootTask = task.getRootTask(); // No stack for task, just trim it - if (stack == null) { + if (rootTask == null) { return true; } // Ignore tasks from different displays // TODO (b/115289124): No Recents on non-default displays. - if (!stack.isOnHomeDisplay()) { + if (!rootTask.isOnHomeDisplay()) { return false; } - final ActivityStack rootHomeTask = stack.getDisplayArea().getRootHomeTask(); - // Home stack does not exist. Don't trim the task. + final Task rootHomeTask = rootTask.getDisplayArea().getRootHomeTask(); + // Home task does not exist. Don't trim the task. if (rootHomeTask == null) { return false; } diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java index 00272ad57be4..d7b43bc5537d 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimation.java +++ b/services/core/java/com/android/server/wm/RecentsAnimation.java @@ -76,7 +76,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, private ActivityRecord mLaunchedTargetActivity; // The stack to restore the target stack behind when the animation is finished - private ActivityStack mRestoreTargetBehindStack; + private Task mRestoreTargetBehindStack; RecentsAnimation(ActivityTaskManagerService atm, ActivityStackSupervisor stackSupervisor, ActivityStartController activityStartController, WindowManagerService wm, @@ -107,7 +107,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, void preloadRecentsActivity() { ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "Preload recents with %s", mTargetIntent); - ActivityStack targetStack = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, + Task targetStack = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, mTargetActivityType); ActivityRecord targetActivity = getTargetActivity(targetStack); if (targetActivity != null) { @@ -150,8 +150,8 @@ class RecentsAnimation implements RecentsAnimationCallbacks, // Invisible activity should be stopped. If the recents activity is alive and its doesn't // need to relaunch by current configuration, then it may be already in stopped state. - if (!targetActivity.isState(ActivityStack.ActivityState.STOPPING, - ActivityStack.ActivityState.STOPPED)) { + if (!targetActivity.isState(Task.ActivityState.STOPPING, + Task.ActivityState.STOPPED)) { // Add to stopping instead of stop immediately. So the client has the chance to perform // traversal in non-stopped state (ViewRootImpl.mStopped) that would initialize more // things (e.g. the measure can be done earlier). The actual stop will be performed when @@ -166,7 +166,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "RecentsAnimation#startRecentsActivity"); // If the activity is associated with the recents stack, then try and get that first - ActivityStack targetStack = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, + Task targetStack = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, mTargetActivityType); ActivityRecord targetActivity = getTargetActivity(targetStack); final boolean hasExistingActivity = targetActivity != null; @@ -299,7 +299,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, try { mWindowManager.cleanupRecentsAnimation(reorderMode); - final ActivityStack targetStack = mDefaultTaskDisplayArea.getStack( + final Task targetStack = mDefaultTaskDisplayArea.getStack( WINDOWING_MODE_UNDEFINED, mTargetActivityType); // Prefer to use the original target activity instead of top activity because // we may have moved another task to top (starting 3p launcher). @@ -333,7 +333,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, } if (WM_DEBUG_RECENTS_ANIMATIONS.isLogToAny()) { - final ActivityStack topStack = getTopNonAlwaysOnTopStack(); + final Task topStack = getTopNonAlwaysOnTopStack(); if (topStack != targetStack) { ProtoLog.w(WM_DEBUG_RECENTS_ANIMATIONS, "Expected target stack=%s" @@ -347,7 +347,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, taskDisplayArea.moveStackBehindStack(targetStack, mRestoreTargetBehindStack); if (WM_DEBUG_RECENTS_ANIMATIONS.isLogToAny()) { - final ActivityStack aboveTargetStack = getStackAbove(targetStack); + final Task aboveTargetStack = getStackAbove(targetStack); if (mRestoreTargetBehindStack != null && aboveTargetStack != mRestoreTargetBehindStack) { ProtoLog.w(WM_DEBUG_RECENTS_ANIMATIONS, @@ -411,7 +411,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, } @Override - public void onStackOrderChanged(ActivityStack stack) { + public void onStackOrderChanged(Task stack) { ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "onStackOrderChanged(): stack=%s", stack); if (mDefaultTaskDisplayArea.getIndexOf(stack) == -1 || !stack.shouldBeVisible(null)) { // The stack is not visible, so ignore this change @@ -466,9 +466,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks, /** * @return The top stack that is not always-on-top. */ - private ActivityStack getTopNonAlwaysOnTopStack() { + private Task getTopNonAlwaysOnTopStack() { for (int i = mDefaultTaskDisplayArea.getStackCount() - 1; i >= 0; i--) { - final ActivityStack s = mDefaultTaskDisplayArea.getStackAt(i); + final Task s = mDefaultTaskDisplayArea.getStackAt(i); if (s.getWindowConfiguration().isAlwaysOnTop()) { continue; } @@ -481,7 +481,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, * @return the top activity in the {@param targetStack} matching the {@param component}, or just * the top activity of the top task if no task matches the component. */ - private ActivityRecord getTargetActivity(ActivityStack targetStack) { + private ActivityRecord getTargetActivity(Task targetStack) { if (targetStack == null) { return null; } diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java index 55bca2ee2791..f5bd4cd866a6 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java @@ -362,7 +362,7 @@ public class RecentsAnimationController implements DeathRecipient { // TODO(b/153090560): Support Recents on multiple task display areas final ArrayList<Task> visibleTasks = mDisplayContent.getDefaultTaskDisplayArea() .getVisibleTasks(); - final ActivityStack targetStack = mDisplayContent.getDefaultTaskDisplayArea() + final Task targetStack = mDisplayContent.getDefaultTaskDisplayArea() .getStack(WINDOWING_MODE_UNDEFINED, targetActivityType); if (targetStack != null) { final PooledConsumer c = PooledLambda.obtainConsumer((t, outList) -> @@ -406,7 +406,7 @@ public class RecentsAnimationController implements DeathRecipient { } // Save the minimized home height - final ActivityStack rootHomeTask = + final Task rootHomeTask = mDisplayContent.getDefaultTaskDisplayArea().getRootHomeTask(); mMinimizedHomeBounds = rootHomeTask != null ? rootHomeTask.getBounds() : null; diff --git a/services/core/java/com/android/server/wm/ResetTargetTaskHelper.java b/services/core/java/com/android/server/wm/ResetTargetTaskHelper.java index 32de699eaae9..cc5ed36e0f47 100644 --- a/services/core/java/com/android/server/wm/ResetTargetTaskHelper.java +++ b/services/core/java/com/android/server/wm/ResetTargetTaskHelper.java @@ -16,10 +16,10 @@ package com.android.server.wm; -import static com.android.server.wm.ActivityStack.TAG_ADD_REMOVE; -import static com.android.server.wm.ActivityStack.TAG_TASKS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TASKS; +import static com.android.server.wm.Task.TAG_ADD_REMOVE; +import static com.android.server.wm.Task.TAG_TASKS; import android.app.ActivityOptions; import android.content.Intent; @@ -37,7 +37,7 @@ import java.util.ArrayList; class ResetTargetTaskHelper { private Task mTask; private Task mTargetTask; - private ActivityStack mTargetStack; + private Task mTargetStack; private ActivityRecord mRoot; private boolean mForceReset; private boolean mCanMoveOptions; @@ -61,7 +61,7 @@ class ResetTargetTaskHelper { mForceReset = forceReset; mTargetTask = targetTask; mTargetTaskFound = false; - mTargetStack = targetTask.getStack(); + mTargetStack = targetTask.getRootTask(); mActivityReparentPosition = -1; final PooledConsumer c = PooledLambda.obtainConsumer( diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index f3e23169fee0..b7ee27e1609e 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -39,15 +39,11 @@ import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE; import static android.view.WindowManager.TRANSIT_NONE; import static android.view.WindowManager.TRANSIT_SHOW_SINGLE_TASK_DISPLAY; +import static android.view.WindowManager.TRANSIT_TASK_TO_BACK; import static com.android.server.policy.PhoneWindowManager.SYSTEM_DIALOG_REASON_ASSIST; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; -import static com.android.server.wm.ActivityStack.ActivityState.FINISHING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; import static com.android.server.wm.ActivityStackSupervisor.dumpHistoryList; @@ -73,6 +69,11 @@ import static com.android.server.wm.RootWindowContainerProto.IS_HOME_RECENTS_COM import static com.android.server.wm.RootWindowContainerProto.KEYGUARD_CONTROLLER; import static com.android.server.wm.RootWindowContainerProto.PENDING_ACTIVITIES; import static com.android.server.wm.RootWindowContainerProto.WINDOW_CONTAINER; +import static com.android.server.wm.Task.ActivityState.FINISHING; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; import static com.android.server.wm.Task.REPARENT_LEAVE_STACK_IN_PLACE; import static com.android.server.wm.Task.REPARENT_MOVE_STACK_TO_FRONT; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS; @@ -219,6 +220,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // transaction from the global transaction. private final SurfaceControl.Transaction mDisplayTransaction; + /** The token acquirer to put stacks on the displays to sleep */ + final ActivityTaskManagerInternal.SleepTokenAcquirer mDisplayOffTokenAcquirer; + /** * The modes which affect which tasks are returned when calling * {@link RootWindowContainer#anyTaskForId(int)}. @@ -258,7 +262,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * They are used by components that may hide and block interaction with underlying * activities. */ - final ArrayList<ActivityTaskManagerInternal.SleepToken> mSleepTokens = new ArrayList<>(); + final SparseArray<SleepToken> mSleepTokens = new SparseArray<>(); /** Set when a power mode launch has started, but not ended. */ private boolean mPowerModeLaunchStarted; @@ -313,7 +317,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * Returns the top activity in any existing task matching the given Intent in the input * result. Returns null if no such task is found. */ - void process(ActivityRecord target, ActivityStack parent) { + void process(ActivityRecord target, Task parent) { mTarget = target; intent = target.intent; @@ -443,6 +447,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mService = service.mAtmService; mStackSupervisor = mService.mStackSupervisor; mStackSupervisor.mRootWindowContainer = this; + mDisplayOffTokenAcquirer = mService.new SleepTokenAcquirerImpl("Display-off"); } boolean updateFocusedWindowLocked(int mode, boolean updateInputWindows) { @@ -1474,7 +1479,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> boolean fromHomeKey) { // Fallback to top focused display or default display if the displayId is invalid. if (displayId == INVALID_DISPLAY) { - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); displayId = stack != null ? stack.getDisplayId() : DEFAULT_DISPLAY; } @@ -1500,7 +1505,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> boolean allowInstrumenting, boolean fromHomeKey) { // Fallback to top focused display area if the provided one is invalid. if (taskDisplayArea == null) { - final ActivityStack stack = getTopDisplayFocusedStack(); + final Task stack = getTopDisplayFocusedStack(); taskDisplayArea = stack != null ? stack.getDisplayArea() : getDefaultTaskDisplayArea(); } @@ -1817,12 +1822,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent> */ List<IBinder> getTopVisibleActivities() { final ArrayList<IBinder> topActivityTokens = new ArrayList<>(); - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); // Traverse all displays. forAllTaskDisplayAreas(taskDisplayArea -> { // Traverse all stacks on a display area. for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); // Get top activity from a visible stack and add it to the list. if (stack.shouldBeVisible(null /* starting */)) { final ActivityRecord top = stack.getTopNonFinishingActivity(); @@ -1840,9 +1845,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } @Nullable - ActivityStack getTopDisplayFocusedStack() { + Task getTopDisplayFocusedStack() { for (int i = getChildCount() - 1; i >= 0; --i) { - final ActivityStack focusedStack = getChildAt(i).getFocusedStack(); + final Task focusedStack = getChildAt(i).getFocusedStack(); if (focusedStack != null) { return focusedStack; } @@ -1852,7 +1857,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> @Nullable ActivityRecord getTopResumedActivity() { - final ActivityStack focusedStack = getTopDisplayFocusedStack(); + final Task focusedStack = getTopDisplayFocusedStack(); if (focusedStack == null) { return null; } @@ -1865,7 +1870,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return getItemFromTaskDisplayAreas(TaskDisplayArea::getFocusedActivity); } - boolean isTopDisplayFocusedStack(ActivityStack stack) { + boolean isTopDisplayFocusedStack(Task stack) { return stack != null && stack == getTopDisplayFocusedStack(); } @@ -1878,7 +1883,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // foreground. WindowProcessController fgApp = reduceOnAllTaskDisplayAreas((taskDisplayArea, app) -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (isTopDisplayFocusedStack(stack)) { final ActivityRecord resumedActivity = stack.getResumedActivity(); if (resumedActivity != null) { @@ -1906,7 +1911,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> boolean didSomething = false; for (int displayNdx = getChildCount() - 1; displayNdx >= 0; --displayNdx) { final DisplayContent display = getChildAt(displayNdx); - final ActivityStack stack = display.getFocusedStack(); + final Task stack = display.getFocusedStack(); if (stack == null) { continue; } @@ -1983,7 +1988,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } boolean switchUser(int userId, UserState uss) { - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); final int focusStackId = topFocusedStack != null ? topFocusedStack.getRootTaskId() : INVALID_TASK_ID; // We dismiss the docked stack whenever we switch users. @@ -2001,13 +2006,13 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mStackSupervisor.mStartingUsers.add(uss); forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); stack.switchUser(userId); } }); final int restoreStackId = mUserStackInFront.get(userId); - ActivityStack stack = getStack(restoreStackId); + Task stack = getStack(restoreStackId); if (stack == null) { stack = getDefaultTaskDisplayArea().getOrCreateRootHomeTask(); } @@ -2029,7 +2034,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * Update the last used stack id for non-current user (current user's last * used stack is the focused stack) */ - void updateUserStack(int userId, ActivityStack stack) { + void updateUserStack(int userId, Task stack) { if (userId != mCurrentUser) { if (stack == null) { stack = getDefaultTaskDisplayArea().getOrCreateRootHomeTask(); @@ -2046,7 +2051,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * @param onTop Indicates whether container should be place on top or on bottom. */ void moveStackToTaskDisplayArea(int stackId, TaskDisplayArea taskDisplayArea, boolean onTop) { - final ActivityStack stack = getStack(stackId); + final Task stack = getStack(stackId); if (stack == null) { throw new IllegalArgumentException("moveStackToTaskDisplayArea: Unknown stackId=" + stackId); @@ -2095,7 +2100,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } boolean moveTopStackActivityToPinnedStack(int stackId) { - final ActivityStack stack = getStack(stackId); + final Task stack = getStack(stackId); if (stack == null) { throw new IllegalArgumentException( "moveTopStackActivityToPinnedStack: Unknown stackId=" + stackId); @@ -2125,7 +2130,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> try { final Task task = r.getTask(); - final ActivityStack pinnedStack = taskDisplayArea.getRootPinnedTask(); + final Task pinnedStack = taskDisplayArea.getRootPinnedTask(); // This will change the pinned stack's windowing mode to its original mode, ensuring // we only have one stack that is in pinned mode. @@ -2138,9 +2143,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> r.getDisplayContent().prepareAppTransition(TRANSIT_NONE, false); final boolean singleActivity = task.getChildCount() == 1; - final ActivityStack stack; + final Task stack; if (singleActivity) { - stack = (ActivityStack) task; + stack = task; } else { // In the case of multiple activities, we will create a new task for it and then // move the PIP activity into the task. @@ -2156,6 +2161,20 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // On the other hand, ActivityRecord#onParentChanged takes care of setting the // up-to-dated pinned stack information on this newly created stack. r.reparent(stack, MAX_VALUE, reason); + + // In the case of this activity entering PIP due to it being moved to the back, + // the old activity would have a TRANSIT_TASK_TO_BACK transition that needs to be + // ran. But, since its visibility did not change (note how it was STOPPED/not + // visible, and with it now at the back stack, it remains not visible), the logic to + // add the transition is automatically skipped. We then add this activity manually + // to the list of apps being closed, and request its transition to be ran. + final ActivityRecord oldTopActivity = task.getTopMostActivity(); + if (oldTopActivity != null && oldTopActivity.isState(STOPPED) + && task.getDisplayContent().mAppTransition.getAppTransition() + == TRANSIT_TASK_TO_BACK) { + task.getDisplayContent().mClosingApps.add(oldTopActivity); + oldTopActivity.mRequestForceTransition = true; + } } // The intermediate windowing mode to be set on the ActivityRecord later. // This needs to happen before the re-parenting, otherwise we will always set the @@ -2233,13 +2252,13 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * @return The task id that was finished in this stack, or INVALID_TASK_ID if none was finished. */ int finishTopCrashedActivities(WindowProcessController app, String reason) { - ActivityStack focusedStack = getTopDisplayFocusedStack(); + Task focusedStack = getTopDisplayFocusedStack(); Task finishedTask = reduceOnAllTaskDisplayAreas((taskDisplayArea, task) -> { // It is possible that request to finish activity might also remove its task and // stack, so we need to be careful with indexes in the loop and check child count // every time. for (int stackNdx = 0; stackNdx < taskDisplayArea.getStackCount(); ++stackNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(stackNdx); + final Task stack = taskDisplayArea.getStackAt(stackNdx); final Task t = stack.finishTopCrashedActivityLocked(app, reason); if (stack == focusedStack || task == null) { task = t; @@ -2255,7 +2274,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } boolean resumeFocusedStacksTopActivities( - ActivityStack targetStack, ActivityRecord target, ActivityOptions targetOptions) { + Task targetStack, ActivityRecord target, ActivityOptions targetOptions) { if (!mStackSupervisor.readyToResume()) { return false; @@ -2277,7 +2296,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> boolean resumedOnDisplay = display.reduceOnAllTaskDisplayAreas( (taskDisplayArea, resumed) -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); final ActivityRecord topRunningActivity = stack.topRunningActivity(); if (!stack.isFocusableAndVisible() || topRunningActivity == null) { continue; @@ -2307,7 +2326,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // crashed) it's possible that nothing was resumed on a display. Requesting resume // of top activity in focused stack explicitly will make sure that at least home // activity is started and resumed, and no recursion occurs. - final ActivityStack focusedStack = display.getFocusedStack(); + final Task focusedStack = display.getFocusedStack(); if (focusedStack != null) { result |= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions); } else if (targetStack == null) { @@ -2337,7 +2356,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // Set the sleeping state of the stacks on the display. display.forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (displayShouldSleep) { stack.goToSleepIfPossible(false /* shuttingDown */); } else { @@ -2378,9 +2397,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } } - protected ActivityStack getStack(int stackId) { + protected Task getStack(int stackId) { for (int i = getChildCount() - 1; i >= 0; --i) { - final ActivityStack stack = getChildAt(i).getStack(stackId); + final Task stack = getChildAt(i).getStack(stackId); if (stack != null) { return stack; } @@ -2389,9 +2408,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } /** @see DisplayContent#getStack(int, int) */ - ActivityStack getStack(int windowingMode, int activityType) { + Task getStack(int windowingMode, int activityType) { for (int i = getChildCount() - 1; i >= 0; --i) { - final ActivityStack stack = getChildAt(i).getStack(windowingMode, activityType); + final Task stack = getChildAt(i).getStack(windowingMode, activityType); if (stack != null) { return stack; } @@ -2399,7 +2418,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return null; } - private ActivityStack getStack(int windowingMode, int activityType, + private Task getStack(int windowingMode, int activityType, int displayId) { DisplayContent display = getDisplayContent(displayId); if (display == null) { @@ -2408,7 +2427,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return display.getStack(windowingMode, activityType); } - private ActivityManager.StackInfo getStackInfo(ActivityStack stack) { + private ActivityManager.StackInfo getStackInfo(Task stack) { final TaskDisplayArea taskDisplayArea = stack.getDisplayArea(); ActivityManager.StackInfo info = new ActivityManager.StackInfo(); stack.getBounds(info.bounds); @@ -2454,7 +2473,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } ActivityManager.StackInfo getStackInfo(int stackId) { - ActivityStack stack = getStack(stackId); + Task stack = getStack(stackId); if (stack != null) { return getStackInfo(stack); } @@ -2462,12 +2481,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } ActivityManager.StackInfo getStackInfo(int windowingMode, int activityType) { - final ActivityStack stack = getStack(windowingMode, activityType); + final Task stack = getStack(windowingMode, activityType); return (stack != null) ? getStackInfo(stack) : null; } ActivityManager.StackInfo getStackInfo(int windowingMode, int activityType, int displayId) { - final ActivityStack stack = getStack(windowingMode, activityType, displayId); + final Task stack = getStack(windowingMode, activityType, displayId); return (stack != null) ? getStackInfo(stack) : null; } @@ -2477,7 +2496,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (displayId == INVALID_DISPLAY) { forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); list.add(getStackInfo(stack)); } }); @@ -2489,7 +2508,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } display.forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); list.add(getStackInfo(stack)); } }); @@ -2561,7 +2580,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mDisplayManagerInternal.setDisplayAccessUIDs(mDisplayAccessUIDs); } - ActivityStack findStackBehind(ActivityStack stack) { + Task findStackBehind(Task stack) { final TaskDisplayArea taskDisplayArea = stack.getDisplayArea(); if (taskDisplayArea != null) { for (int i = taskDisplayArea.getStackCount() - 1; i >= 0; i--) { @@ -2604,20 +2623,29 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } } - ActivityTaskManagerInternal.SleepToken createSleepToken(String tag, int displayId) { + SleepToken createSleepToken(String tag, int displayId) { final DisplayContent display = getDisplayContent(displayId); if (display == null) { throw new IllegalArgumentException("Invalid display: " + displayId); } - final SleepTokenImpl token = new SleepTokenImpl(tag, displayId); - mSleepTokens.add(token); - display.mAllSleepTokens.add(token); + final int tokenKey = makeSleepTokenKey(tag, displayId); + SleepToken token = mSleepTokens.get(tokenKey); + if (token == null) { + token = new SleepToken(tag, displayId); + mSleepTokens.put(tokenKey, token); + display.mAllSleepTokens.add(token); + } else { + throw new RuntimeException("Create the same sleep token twice: " + token); + } return token; } - private void removeSleepToken(SleepTokenImpl token) { - mSleepTokens.remove(token); + void removeSleepToken(SleepToken token) { + if (!mSleepTokens.contains(token.mHashKey)) { + Slog.d(TAG, "Remove non-exist sleep token: " + token + " from " + Debug.getCallers(6)); + } + mSleepTokens.remove(token.mHashKey); final DisplayContent display = getDisplayContent(token.mDisplayId); if (display != null) { @@ -2701,7 +2729,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (sNdx >= taskDisplayArea.getStackCount()) { continue; } - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (allowDelay) { result &= stack.goToSleepIfPossible(shuttingDown); } else { @@ -2772,7 +2800,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return false; } - ActivityStack getLaunchStack(@Nullable ActivityRecord r, + Task getLaunchStack(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task candidateTask, boolean onTop) { return getLaunchStack(r, options, candidateTask, onTop, null /* launchParams */, -1 /* no realCallingPid */, -1 /* no realCallingUid */); @@ -2790,7 +2818,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * * @return The stack to use for the launch or INVALID_STACK_ID. */ - ActivityStack getLaunchStack(@Nullable ActivityRecord r, + Task getLaunchStack(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task candidateTask, boolean onTop, @Nullable LaunchParamsController.LaunchParams launchParams, int realCallingPid, int realCallingUid) { @@ -2816,12 +2844,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent> MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE, options, onTop); options.setLaunchTaskId(taskId); if (task != null) { - return task.getStack(); + return task.getRootTask(); } } final int activityType = resolveActivityType(r, options, candidateTask); - ActivityStack stack = null; + Task stack = null; // Next preference for stack goes to the taskDisplayArea candidate. if (launchParams != null && launchParams.mPreferredTaskDisplayArea != null) { @@ -2843,7 +2871,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> realCallingPid, realCallingUid, r.info); if (canLaunchOnDisplayFromStartRequest || canLaunchOnDisplay(r, tdaDisplayId)) { if (r != null) { - final ActivityStack result = getValidLaunchStackInTaskDisplayArea( + final Task result = getValidLaunchStackInTaskDisplayArea( taskDisplayArea, r, candidateTask, options, launchParams); if (result != null) { return result; @@ -2863,7 +2891,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // mode we want to launch into. TaskDisplayArea container = null; if (candidateTask != null) { - stack = candidateTask.getStack(); + stack = candidateTask.getRootTask(); } if (stack == null && r != null) { stack = r.getRootTask(); @@ -2925,7 +2953,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * @return Existing stack if there is a valid one, new dynamic stack if it is valid or null. */ @VisibleForTesting - ActivityStack getValidLaunchStackInTaskDisplayArea(@NonNull TaskDisplayArea taskDisplayArea, + Task getValidLaunchStackInTaskDisplayArea(@NonNull TaskDisplayArea taskDisplayArea, @NonNull ActivityRecord r, @Nullable Task candidateTask, @Nullable ActivityOptions options, @Nullable LaunchParamsController.LaunchParams launchParams) { @@ -2941,12 +2969,12 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final TaskDisplayArea attachedTaskDisplayArea = r.getTask() != null ? r.getTask().getDisplayArea() : r.getDisplayArea(); if (attachedTaskDisplayArea == null || attachedTaskDisplayArea == taskDisplayArea) { - return candidateTask.getStack(); + return candidateTask.getRootTask(); } // Or the candidate task is already a root task that can be reused by reparenting // it to the target display. if (candidateTask.isRootTask()) { - final ActivityStack stack = candidateTask.getStack(); + final Task stack = candidateTask.getRootTask(); stack.reparent(taskDisplayArea, true /* onTop */); return stack; } @@ -2967,7 +2995,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // Return the topmost valid stack on the display. for (int i = taskDisplayArea.getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = taskDisplayArea.getStackAt(i); + final Task stack = taskDisplayArea.getStackAt(i); if (isValidLaunchStack(stack, r, windowingMode)) { return stack; } @@ -2987,7 +3015,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } // TODO: Can probably be consolidated into getLaunchStack()... - private boolean isValidLaunchStack(ActivityStack stack, ActivityRecord r, int windowingMode) { + private boolean isValidLaunchStack(Task stack, ActivityRecord r, int windowingMode) { switch (stack.getActivityType()) { case ACTIVITY_TYPE_HOME: return r.isActivityTypeHome(); case ACTIVITY_TYPE_RECENTS: return r.isActivityTypeRecents(); @@ -3035,9 +3063,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> * @param currentFocus The stack that previously had focus. * @param ignoreCurrent If we should ignore {@param currentFocus} when searching for next * candidate. - * @return Next focusable {@link ActivityStack}, {@code null} if not found. + * @return Next focusable {@link Task}, {@code null} if not found. */ - ActivityStack getNextFocusableStack(@NonNull ActivityStack currentFocus, + Task getNextFocusableStack(@NonNull Task currentFocus, boolean ignoreCurrent) { // First look for next focusable stack on the same display TaskDisplayArea preferredDisplayArea = currentFocus.getDisplayArea(); @@ -3047,7 +3075,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> preferredDisplayArea = getDisplayContent(currentFocus.mPrevDisplayId) .getDefaultTaskDisplayArea(); } - final ActivityStack preferredFocusableStack = preferredDisplayArea.getNextFocusableStack( + final Task preferredFocusableStack = preferredDisplayArea.getNextFocusableStack( currentFocus, ignoreCurrent); if (preferredFocusableStack != null) { return preferredFocusableStack; @@ -3066,7 +3094,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // We've already checked this one continue; } - final ActivityStack nextFocusableStack = display.getDefaultTaskDisplayArea() + final Task nextFocusableStack = display.getDefaultTaskDisplayArea() .getNextFocusableStack(currentFocus, ignoreCurrent); if (nextFocusableStack != null) { return nextFocusableStack; @@ -3077,9 +3105,15 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } boolean handleAppDied(WindowProcessController app) { + if (app.isRemoved()) { + // The package of the died process should be force-stopped, so make its activities as + // finishing to prevent the process from being started again if the next top (or being + // visible) activity also resides in the same process. + app.makeFinishingForProcessRemoved(); + } return reduceOnAllTaskDisplayAreas((taskDisplayArea, result) -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); result |= stack.handleAppDied(app); } return result; @@ -3114,24 +3148,26 @@ class RootWindowContainer extends WindowContainer<DisplayContent> private boolean mDoit; private boolean mEvenPersistent; private int mUserId; + private boolean mOnlyRemoveNoProcess; private Task mLastTask; private ComponentName mHomeActivity; private void reset(String packageName, Set<String> filterByClasses, - boolean doit, boolean evenPersistent, int userId) { + boolean doit, boolean evenPersistent, int userId, boolean onlyRemoveNoProcess) { mDidSomething = false; mPackageName = packageName; mFilterByClasses = filterByClasses; mDoit = doit; mEvenPersistent = evenPersistent; mUserId = userId; + mOnlyRemoveNoProcess = onlyRemoveNoProcess; mLastTask = null; mHomeActivity = null; } boolean process(String packageName, Set<String> filterByClasses, - boolean doit, boolean evenPersistent, int userId) { - reset(packageName, filterByClasses, doit, evenPersistent, userId); + boolean doit, boolean evenPersistent, int userId, boolean onlyRemoveNoProcess) { + reset(packageName, filterByClasses, doit, evenPersistent, userId, onlyRemoveNoProcess); final PooledFunction f = PooledLambda.obtainFunction( FinishDisabledPackageActivitiesHelper::processActivity, this, @@ -3146,9 +3182,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> (r.packageName.equals(mPackageName) && (mFilterByClasses == null || mFilterByClasses.contains(r.mActivityComponent.getClassName()))) || (mPackageName == null && r.mUserId == mUserId); + final boolean noProcess = !r.hasProcess(); if ((mUserId == UserHandle.USER_ALL || r.mUserId == mUserId) && (sameComponent || r.getTask() == mLastTask) - && (r.app == null || mEvenPersistent || !r.app.isPersistent())) { + && (noProcess || mEvenPersistent || !r.app.isPersistent())) { if (!mDoit) { if (r.finishing) { // If this activity is just finishing, then it is not @@ -3165,10 +3202,19 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mHomeActivity = r.mActivityComponent; } } - mDidSomething = true; - Slog.i(TAG, " Force finishing activity " + r); + if (mOnlyRemoveNoProcess) { + if (noProcess) { + mDidSomething = true; + Slog.i(TAG, " Force removing " + r); + r.cleanUp(false /* cleanServices */, false /* setState */); + r.removeFromHistory("force-stop"); + } + } else { + mDidSomething = true; + Slog.i(TAG, " Force finishing " + r); + r.finishIfPossible("force-stop", true /* oomAdj */); + } mLastTask = r.getTask(); - r.finishIfPossible("force-stop", true); } return false; @@ -3177,9 +3223,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> /** @return true if some activity was finished (or would have finished if doit were true). */ boolean finishDisabledPackageActivities(String packageName, Set<String> filterByClasses, - boolean doit, boolean evenPersistent, int userId) { + boolean doit, boolean evenPersistent, int userId, boolean onlyRemoveNoProcess) { return mFinishDisabledPackageActivitiesHelper.process(packageName, filterByClasses, doit, - evenPersistent, userId); + evenPersistent, userId, onlyRemoveNoProcess); } void updateActivityApplicationInfo(ApplicationInfo aInfo) { @@ -3203,7 +3249,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> forAllTaskDisplayAreas(taskDisplayArea -> { final int numStacks = taskDisplayArea.getStackCount(); for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(stackNdx); + final Task stack = taskDisplayArea.getStackAt(stackNdx); stack.finishVoiceTask(session); } }); @@ -3246,7 +3292,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // If the focused stack is not null or not empty, there should have some activities // resuming or resumed. Make sure these activities are idle. - final ActivityStack stack = display.getFocusedStack(); + final Task stack = display.getFocusedStack(); if (stack == null || !stack.hasActivity()) { continue; } @@ -3269,7 +3315,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final boolean foundInvisibleResumedActivity = forAllTaskDisplayAreas( taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); final ActivityRecord r = stack.getResumedActivity(); if (r != null) { if (!r.nowVisible) { @@ -3291,7 +3337,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final boolean hasActivityNotCompleted = forAllTaskDisplayAreas( taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); final ActivityRecord r = stack.mPausingActivity; if (r != null && !r.isState(PAUSED, STOPPED, STOPPING, FINISHING)) { if (DEBUG_STATES) { @@ -3397,9 +3443,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (aOptions != null) { // Resolve the stack the task should be placed in now based on options // and reparent if needed. - final ActivityStack launchStack = + final Task launchStack = getLaunchStack(null, aOptions, task, onTop); - if (launchStack != null && task.getStack() != launchStack) { + if (launchStack != null && task.getRootTask() != launchStack) { final int reparentMode = onTop ? REPARENT_MOVE_STACK_TO_FRONT : REPARENT_LEAVE_STACK_IN_PLACE; task.reparent(launchStack, onTop, reparentMode, ANIMATE, DEFER_RESUME, @@ -3511,7 +3557,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> ArrayList<ActivityRecord> getDumpActivities(String name, boolean dumpVisibleStacksOnly, boolean dumpFocusedStackOnly) { if (dumpFocusedStackOnly) { - final ActivityStack topFocusedStack = getTopDisplayFocusedStack(); + final Task topFocusedStack = getTopDisplayFocusedStack(); if (topFocusedStack != null) { return topFocusedStack.getDumpActivitiesLocked(name); } else { @@ -3521,7 +3567,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> ArrayList<ActivityRecord> activities = new ArrayList<>(); forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (!dumpVisibleStacksOnly || stack.shouldBeVisible(null)) { activities.addAll(stack.getDumpActivitiesLocked(name)); } @@ -3570,7 +3616,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> pw.println(" (activities from top to bottom):"); displayContent.forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (needSep[0]) { pw.println(); } @@ -3598,22 +3644,22 @@ class RootWindowContainer extends WindowContainer<DisplayContent> return printed[0]; } - private final class SleepTokenImpl extends ActivityTaskManagerInternal.SleepToken { + private static int makeSleepTokenKey(String tag, int displayId) { + final String tokenKey = tag + displayId; + return tokenKey.hashCode(); + } + + static final class SleepToken { private final String mTag; private final long mAcquireTime; private final int mDisplayId; + final int mHashKey; - public SleepTokenImpl(String tag, int displayId) { + SleepToken(String tag, int displayId) { mTag = tag; mDisplayId = displayId; mAcquireTime = SystemClock.uptimeMillis(); - } - - @Override - public void release() { - synchronized (mService.mGlobalLock) { - removeSleepToken(this); - } + mHashKey = makeSleepTokenKey(mTag, mDisplayId); } @Override diff --git a/services/core/java/com/android/server/wm/RunningTasks.java b/services/core/java/com/android/server/wm/RunningTasks.java index 3509ba72d058..6cf9432089b4 100644 --- a/services/core/java/com/android/server/wm/RunningTasks.java +++ b/services/core/java/com/android/server/wm/RunningTasks.java @@ -48,7 +48,7 @@ class RunningTasks { private ArraySet<Integer> mProfileIds; private boolean mAllowed; private boolean mFilterOnlyVisibleRecents; - private ActivityStack mTopDisplayFocusStack; + private Task mTopDisplayFocusStack; private RecentTasks mRecentTasks; void getTasks(int maxNum, List<RunningTaskInfo> list, boolean filterOnlyVisibleRecents, @@ -114,7 +114,7 @@ class RunningTasks { return; } - final ActivityStack stack = task.getStack(); + final Task stack = task.getRootTask(); if (stack == mTopDisplayFocusStack && stack.getTopMostTask() == task) { // For the focused stack top task, update the last stack active time so that it can be // used to determine the order of the tasks (it may not be set for newly created tasks) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 970520aff81f..49fafbb3907c 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -19,6 +19,7 @@ package com.android.server.wm; import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.ActivityTaskManager.RESIZE_MODE_FORCED; import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION; +import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN; import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; @@ -28,6 +29,7 @@ import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; @@ -37,7 +39,10 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME; +import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT; import static android.content.pm.ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY; +import static android.content.pm.ActivityInfo.FLAG_RESUME_WHILE_PAUSING; +import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED; @@ -55,36 +60,91 @@ import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.content.res.Configuration.ORIENTATION_UNDEFINED; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.Display.FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD; import static android.view.Display.INVALID_DISPLAY; import static android.view.SurfaceControl.METADATA_TASK_ID; +import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; +import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN; +import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE; +import static android.view.WindowManager.TRANSIT_NONE; +import static android.view.WindowManager.TRANSIT_SHOW_SINGLE_TASK_DISPLAY; import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE; +import static android.view.WindowManager.TRANSIT_TASK_CLOSE; +import static android.view.WindowManager.TRANSIT_TASK_OPEN; +import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND; +import static android.view.WindowManager.TRANSIT_TASK_TO_BACK; +import static android.view.WindowManager.TRANSIT_TASK_TO_FRONT; import static com.android.internal.policy.DecorView.DECOR_SHADOW_FOCUSED_HEIGHT_IN_DIP; import static com.android.internal.policy.DecorView.DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP; import static com.android.server.wm.ActivityRecord.STARTING_WINDOW_SHOWN; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT; +import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS; import static com.android.server.wm.ActivityStackSupervisor.REMOVE_FROM_RECENTS; +import static com.android.server.wm.ActivityStackSupervisor.dumpHistoryList; +import static com.android.server.wm.ActivityStackSupervisor.printThisActivity; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ADD_REMOVE; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_APP; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_LOCKTASK; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_PAUSE; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RESULTS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_STATES; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TASKS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TRANSITION; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_USER_LEAVING; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ADD_REMOVE; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_APP; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_CLEANUP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_LOCKTASK; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_PAUSE; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RECENTS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RESULTS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STACK; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_STATES; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_SWITCH; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TASKS; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_TRANSITION; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_USER_LEAVING; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_VISIBILITY; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME; -import static com.android.server.wm.ActivityTaskManagerService.TAG_STACK; +import static com.android.server.wm.ActivityTaskManagerService.H.FIRST_ACTIVITY_STACK_MSG; +import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE; +import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE; import static com.android.server.wm.IdentifierProto.HASH_CODE; import static com.android.server.wm.IdentifierProto.TITLE; import static com.android.server.wm.IdentifierProto.USER_ID; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_RECENTS_ANIMATIONS; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STARTED; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; +import static com.android.server.wm.TaskProto.ACTIVITY_TYPE; +import static com.android.server.wm.TaskProto.ANIMATING_BOUNDS; +import static com.android.server.wm.TaskProto.BOUNDS; +import static com.android.server.wm.TaskProto.CREATED_BY_ORGANIZER; +import static com.android.server.wm.TaskProto.DISPLAY_ID; +import static com.android.server.wm.TaskProto.FILLS_PARENT; +import static com.android.server.wm.TaskProto.LAST_NON_FULLSCREEN_BOUNDS; +import static com.android.server.wm.TaskProto.MIN_HEIGHT; +import static com.android.server.wm.TaskProto.MIN_WIDTH; +import static com.android.server.wm.TaskProto.ORIG_ACTIVITY; +import static com.android.server.wm.TaskProto.REAL_ACTIVITY; +import static com.android.server.wm.TaskProto.RESIZE_MODE; +import static com.android.server.wm.TaskProto.RESUMED_ACTIVITY; +import static com.android.server.wm.TaskProto.ROOT_TASK_ID; +import static com.android.server.wm.TaskProto.SURFACE_HEIGHT; +import static com.android.server.wm.TaskProto.SURFACE_WIDTH; +import static com.android.server.wm.TaskProto.WINDOW_CONTAINER; import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN; import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; import static com.android.server.wm.WindowContainerChildProto.TASK; @@ -103,11 +163,20 @@ import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.TaskDescription; import android.app.ActivityManager.TaskSnapshot; +import android.app.ActivityManagerInternal; import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.app.AppGlobals; +import android.app.IActivityController; +import android.app.RemoteAction; +import android.app.ResultInfo; import android.app.TaskInfo; import android.app.WindowConfiguration; +import android.app.servertransaction.ActivityResultItem; +import android.app.servertransaction.ClientTransaction; +import android.app.servertransaction.NewIntentItem; +import android.app.servertransaction.PauseActivityItem; +import android.app.servertransaction.ResumeActivityItem; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -117,8 +186,12 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; +import android.os.Binder; import android.os.Debug; +import android.os.Handler; import android.os.IBinder; +import android.os.Looper; +import android.os.Message; import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; @@ -127,8 +200,10 @@ import android.provider.Settings; import android.service.voice.IVoiceInteractionSession; import android.util.ArraySet; import android.util.DisplayMetrics; +import android.util.Log; import android.util.Slog; import android.util.proto.ProtoOutputStream; +import android.view.Display; import android.view.DisplayInfo; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; @@ -137,36 +212,54 @@ import android.view.SurfaceControl; import android.view.WindowManager; import android.window.ITaskOrganizer; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IVoiceInteractor; +import com.android.internal.os.logging.MetricsLoggerWrapper; import com.android.internal.util.XmlUtils; import com.android.internal.util.function.pooled.PooledConsumer; import com.android.internal.util.function.pooled.PooledFunction; import com.android.internal.util.function.pooled.PooledLambda; import com.android.internal.util.function.pooled.PooledPredicate; +import com.android.server.Watchdog; +import com.android.server.am.ActivityManagerService; +import com.android.server.am.AppTimeTracker; import com.android.server.protolog.common.ProtoLog; -import com.android.server.wm.ActivityStack.ActivityState; +import com.android.server.uri.NeededUriGrants; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; +import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.List; import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; class Task extends WindowContainer<WindowContainer> { private static final String TAG = TAG_WITH_CLASS_NAME ? "Task" : TAG_ATM; - private static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE; + static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE; private static final String TAG_RECENTS = TAG + POSTFIX_RECENTS; private static final String TAG_LOCKTASK = TAG + POSTFIX_LOCKTASK; - private static final String TAG_TASKS = TAG + POSTFIX_TASKS; + static final String TAG_TASKS = TAG + POSTFIX_TASKS; + private static final String TAG_APP = TAG + POSTFIX_APP; + static final String TAG_CLEANUP = TAG + POSTFIX_CLEANUP; + private static final String TAG_PAUSE = TAG + POSTFIX_PAUSE; + private static final String TAG_RESULTS = TAG + POSTFIX_RESULTS; + private static final String TAG_STACK = TAG + POSTFIX_STACK; + private static final String TAG_STATES = TAG + POSTFIX_STATES; + private static final String TAG_SWITCH = TAG + POSTFIX_SWITCH; + private static final String TAG_TRANSITION = TAG + POSTFIX_TRANSITION; + private static final String TAG_USER_LEAVING = TAG + POSTFIX_USER_LEAVING; + static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY; private static final String ATTR_TASKID = "task_id"; private static final String TAG_INTENT = "intent"; @@ -202,6 +295,14 @@ class Task extends WindowContainer<WindowContainer> { private static final String ATTR_PERSIST_TASK_VERSION = "persist_task_version"; private static final String ATTR_WINDOW_LAYOUT_AFFINITY = "window_layout_affinity"; + // Set to false to disable the preview that is shown while a new activity + // is being started. + private static final boolean SHOW_APP_STARTING_PREVIEW = true; + + // How long to wait for all background Activities to redraw following a call to + // convertToTranslucent(). + private static final long TRANSLUCENT_CONVERSION_TIMEOUT = 2000; + // Current version of the task record we persist. Used to check if we need to run any upgrade // code. static final int PERSIST_TASK_VERSION = 1; @@ -226,6 +327,58 @@ class Task extends WindowContainer<WindowContainer> { // Do not move the stack as a part of reparenting static final int REPARENT_LEAVE_STACK_IN_PLACE = 2; + @IntDef(prefix = {"STACK_VISIBILITY"}, value = { + STACK_VISIBILITY_VISIBLE, + STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT, + STACK_VISIBILITY_INVISIBLE, + }) + @interface StackVisibility {} + + /** Stack is visible. No other stacks on top that fully or partially occlude it. */ + static final int STACK_VISIBILITY_VISIBLE = 0; + + /** Stack is partially occluded by other translucent stack(s) on top of it. */ + static final int STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT = 1; + + /** Stack is completely invisible. */ + static final int STACK_VISIBILITY_INVISIBLE = 2; + + enum ActivityState { + INITIALIZING, + STARTED, + RESUMED, + PAUSING, + PAUSED, + STOPPING, + STOPPED, + FINISHING, + DESTROYING, + DESTROYED, + RESTARTING_PROCESS + } + + // The topmost Activity passed to convertToTranslucent(). When non-null it means we are + // waiting for all Activities in mUndrawnActivitiesBelowTopTranslucent to be removed as they + // are drawn. When the last member of mUndrawnActivitiesBelowTopTranslucent is removed the + // Activity in mTranslucentActivityWaiting is notified via + // Activity.onTranslucentConversionComplete(false). If a timeout occurs prior to the last + // background activity being drawn then the same call will be made with a true value. + ActivityRecord mTranslucentActivityWaiting = null; + ArrayList<ActivityRecord> mUndrawnActivitiesBelowTopTranslucent = new ArrayList<>(); + + /** + * Set when we know we are going to be calling updateConfiguration() + * soon, so want to skip intermediate config checks. + */ + boolean mConfigWillChange; + + /** + * Used to keep resumeTopActivityUncheckedLocked() from being entered recursively + */ + boolean mInResumeTopActivity = false; + + int mCurrentUser; + String affinity; // The affinity name for this task, or null; may change identity. String rootAffinity; // Initial base affinity, or null; does not change from initial root. String mWindowLayoutAffinity; // Launch param affinity of this task or null. Used when saving @@ -447,6 +600,268 @@ class Task extends WindowContainer<WindowContainer> { SurfaceControl.Transaction mMainWindowSizeChangeTransaction; Task mMainWindowSizeChangeTask; + // If this is true, we are in the bounds animating mode. The task will be down or upscaled to + // perfectly fit the region it would have been cropped to. We may also avoid certain logic we + // would otherwise apply while resizing, while resizing in the bounds animating mode. + private boolean mBoundsAnimating = false; + // Set when an animation has been requested but has not yet started from the UI thread. This is + // cleared when the animation actually starts. + private boolean mBoundsAnimatingRequested = false; + private Rect mBoundsAnimationTarget = new Rect(); + private Rect mBoundsAnimationSourceHintBounds = new Rect(); + + Rect mPreAnimationBounds = new Rect(); + + private final AnimatingActivityRegistry mAnimatingActivityRegistry = + new AnimatingActivityRegistry(); + + private boolean mTopActivityOccludesKeyguard; + private ActivityRecord mTopDismissingKeyguardActivity; + + private static final int TRANSLUCENT_TIMEOUT_MSG = FIRST_ACTIVITY_STACK_MSG + 1; + + private final Handler mHandler; + + private class ActivityStackHandler extends Handler { + + ActivityStackHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case TRANSLUCENT_TIMEOUT_MSG: { + synchronized (mAtmService.mGlobalLock) { + notifyActivityDrawnLocked(null); + } + } break; + } + } + } + + private static final ResetTargetTaskHelper sResetTargetTaskHelper = new ResetTargetTaskHelper(); + private final EnsureActivitiesVisibleHelper mEnsureActivitiesVisibleHelper = + new EnsureActivitiesVisibleHelper(this); + private final EnsureVisibleActivitiesConfigHelper mEnsureVisibleActivitiesConfigHelper = + new EnsureVisibleActivitiesConfigHelper(); + private class EnsureVisibleActivitiesConfigHelper { + private boolean mUpdateConfig; + private boolean mPreserveWindow; + private boolean mBehindFullscreen; + + void reset(boolean preserveWindow) { + mPreserveWindow = preserveWindow; + mUpdateConfig = false; + mBehindFullscreen = false; + } + + void process(ActivityRecord start, boolean preserveWindow) { + if (start == null || !start.mVisibleRequested) { + return; + } + reset(preserveWindow); + + final PooledFunction f = PooledLambda.obtainFunction( + EnsureVisibleActivitiesConfigHelper::processActivity, this, + PooledLambda.__(ActivityRecord.class)); + forAllActivities(f, start, true /*includeBoundary*/, true /*traverseTopToBottom*/); + f.recycle(); + + if (mUpdateConfig) { + // Ensure the resumed state of the focus activity if we updated the configuration of + // any activity. + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + } + + boolean processActivity(ActivityRecord r) { + mUpdateConfig |= r.ensureActivityConfiguration(0 /*globalChanges*/, mPreserveWindow); + mBehindFullscreen |= r.occludesParent(); + return mBehindFullscreen; + } + } + + private final CheckBehindFullscreenActivityHelper mCheckBehindFullscreenActivityHelper = + new CheckBehindFullscreenActivityHelper(); + private class CheckBehindFullscreenActivityHelper { + private boolean mAboveTop; + private boolean mBehindFullscreenActivity; + private ActivityRecord mToCheck; + private Consumer<ActivityRecord> mHandleBehindFullscreenActivity; + private boolean mHandlingOccluded; + + private void reset(ActivityRecord toCheck, + Consumer<ActivityRecord> handleBehindFullscreenActivity) { + mToCheck = toCheck; + mHandleBehindFullscreenActivity = handleBehindFullscreenActivity; + mAboveTop = true; + mBehindFullscreenActivity = false; + + if (!shouldBeVisible(null)) { + // The stack is not visible, so no activity in it should be displaying a starting + // window. Mark all activities below top and behind fullscreen. + mAboveTop = false; + mBehindFullscreenActivity = true; + } + + mHandlingOccluded = mToCheck == null && mHandleBehindFullscreenActivity != null; + } + + boolean process(ActivityRecord toCheck, + Consumer<ActivityRecord> handleBehindFullscreenActivity) { + reset(toCheck, handleBehindFullscreenActivity); + + if (!mHandlingOccluded && mBehindFullscreenActivity) { + return true; + } + + final ActivityRecord topActivity = topRunningActivity(); + final PooledFunction f = PooledLambda.obtainFunction( + CheckBehindFullscreenActivityHelper::processActivity, this, + PooledLambda.__(ActivityRecord.class), topActivity); + forAllActivities(f); + f.recycle(); + + return mBehindFullscreenActivity; + } + + /** Returns {@code true} to stop the outer loop and indicate the result is computed. */ + private boolean processActivity(ActivityRecord r, ActivityRecord topActivity) { + if (mAboveTop) { + if (r == topActivity) { + if (r == mToCheck) { + // It is the top activity in a visible stack. + mBehindFullscreenActivity = false; + return true; + } + mAboveTop = false; + } + mBehindFullscreenActivity |= r.occludesParent(); + return false; + } + + if (mHandlingOccluded) { + // Iterating through all occluded activities. + if (mBehindFullscreenActivity) { + mHandleBehindFullscreenActivity.accept(r); + } + } else if (r == mToCheck) { + return true; + } else if (mBehindFullscreenActivity) { + // It is occluded before {@param toCheck} is found. + return true; + } + mBehindFullscreenActivity |= r.occludesParent(); + return false; + } + } + + // TODO: Can we just loop through WindowProcessController#mActivities instead of doing this? + private final RemoveHistoryRecordsForApp mRemoveHistoryRecordsForApp = + new RemoveHistoryRecordsForApp(); + private class RemoveHistoryRecordsForApp { + private boolean mHasVisibleActivities; + private boolean mIsProcessRemoved; + private WindowProcessController mApp; + private ArrayList<ActivityRecord> mToRemove = new ArrayList<>(); + + boolean process(WindowProcessController app) { + mToRemove.clear(); + mHasVisibleActivities = false; + mApp = app; + mIsProcessRemoved = app.isRemoved(); + + final PooledConsumer c = PooledLambda.obtainConsumer( + RemoveHistoryRecordsForApp::addActivityToRemove, this, + PooledLambda.__(ActivityRecord.class)); + forAllActivities(c); + c.recycle(); + + while (!mToRemove.isEmpty()) { + processActivity(mToRemove.remove(0)); + } + + mApp = null; + return mHasVisibleActivities; + } + + private void addActivityToRemove(ActivityRecord r) { + if (r.app == mApp) { + mToRemove.add(r); + } + } + + private void processActivity(ActivityRecord r) { + if (DEBUG_CLEANUP) Slog.v(TAG_CLEANUP, "Record " + r + ": app=" + r.app); + + if (r.app != mApp) { + return; + } + if (r.isVisible() || r.mVisibleRequested) { + // While an activity launches a new activity, it's possible that the old + // activity is already requested to be hidden (mVisibleRequested=false), but + // this visibility is not yet committed, so isVisible()=true. + mHasVisibleActivities = true; + } + final boolean remove; + if ((r.mRelaunchReason == RELAUNCH_REASON_WINDOWING_MODE_RESIZE + || r.mRelaunchReason == RELAUNCH_REASON_FREE_RESIZE) + && r.launchCount < 3 && !r.finishing) { + // If the process crashed during a resize, always try to relaunch it, unless + // it has failed more than twice. Skip activities that's already finishing + // cleanly by itself. + remove = false; + } else if ((!r.hasSavedState() && !r.stateNotNeeded + && !r.isState(ActivityState.RESTARTING_PROCESS)) || r.finishing) { + // Don't currently have state for the activity, or + // it is finishing -- always remove it. + remove = true; + } else if (!r.mVisibleRequested && r.launchCount > 2 + && r.lastLaunchTime > (SystemClock.uptimeMillis() - 60000)) { + // We have launched this activity too many times since it was + // able to run, so give up and remove it. + // (Note if the activity is visible, we don't remove the record. + // We leave the dead window on the screen but the process will + // not be restarted unless user explicitly tap on it.) + remove = true; + } else { + // The process may be gone, but the activity lives on! + remove = false; + } + if (remove) { + if (DEBUG_ADD_REMOVE || DEBUG_CLEANUP) Slog.i(TAG_ADD_REMOVE, + "Removing activity " + r + " from stack " + + ": hasSavedState=" + r.hasSavedState() + + " stateNotNeeded=" + r.stateNotNeeded + + " finishing=" + r.finishing + + " state=" + r.getState() + " callers=" + Debug.getCallers(5)); + if (!r.finishing || mIsProcessRemoved) { + Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); + EventLogTags.writeWmFinishActivity(r.mUserId, + System.identityHashCode(r), r.getTask().mTaskId, + r.shortComponentName, "proc died without state saved"); + } + } else { + // We have the current state for this activity, so + // it can be restarted later when needed. + if (DEBUG_ALL) Slog.v(TAG, "Keeping entry, setting app to null"); + if (DEBUG_APP) Slog.v(TAG_APP, + "Clearing app during removeHistory for activity " + r); + r.app = null; + // Set nowVisible to previous visible state. If the app was visible while + // it died, we leave the dead window on screen so it's basically visible. + // This is needed when user later tap on the dead window, we need to stop + // other apps when user transfers focus to the restarted activity. + r.nowVisible = r.mVisibleRequested; + } + r.cleanUp(true /* cleanServices */, true /* setState */); + if (remove) { + r.removeFromHistory("appDied"); + } + } + } + private final FindRootHelper mFindRootHelper = new FindRootHelper(); private class FindRootHelper { private ActivityRecord mRoot; @@ -507,12 +922,22 @@ class Task extends WindowContainer<WindowContainer> { boolean mCreatedByOrganizer; /** - * Don't use constructor directly. Use {@link #create(ActivityTaskManagerService, int, - * ActivityInfo, Intent, TaskDescription)} instead. + * Don't use constructor directly. Use {@link TaskDisplayArea#createStackUnchecked()} instead. + */ + Task(ActivityTaskManagerService atmService, int id, int activityType, + ActivityInfo info, Intent intent, boolean createdByOrganizer) { + this(atmService, id, info, intent, null /*voiceSession*/, null /*voiceInteractor*/, + null /*taskDescription*/, null /*stack*/); + mCreatedByOrganizer = createdByOrganizer; + setActivityType(activityType); + } + + /** + * Don't use constructor directly. Use {@link Task#reuseOrCreateTask()} instead. */ Task(ActivityTaskManagerService atmService, int _taskId, ActivityInfo info, Intent _intent, IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor, - TaskDescription _taskDescription, ActivityStack stack) { + TaskDescription _taskDescription, Task stack) { this(atmService, _taskId, _intent, null /*_affinityIntent*/, null /*_affinity*/, null /*_rootAffinity*/, null /*_realActivity*/, null /*_origActivity*/, false /*_rootWasReset*/, false /*_autoRemoveRecents*/, false /*_askedCompatMode*/, @@ -538,7 +963,7 @@ class Task extends WindowContainer<WindowContainer> { @Nullable String callingFeatureId, int resizeMode, boolean supportsPictureInPicture, boolean _realActivitySuspended, boolean userSetupComplete, int minWidth, int minHeight, ActivityInfo info, IVoiceInteractionSession _voiceSession, - IVoiceInteractor _voiceInteractor, ActivityStack stack) { + IVoiceInteractor _voiceInteractor, Task stack) { super(atmService.mWindowManager); EventLogTags.writeWmTaskCreated(_taskId, stack != null ? getRootTaskId() : INVALID_TASK_ID); @@ -587,6 +1012,8 @@ class Task extends WindowContainer<WindowContainer> { mMinHeight = minHeight; } mAtmService.getTaskChangeNotificationController().notifyTaskCreated(_taskId, realActivity); + mHandler = new ActivityStackHandler(mStackSupervisor.mLooper); + mCurrentUser = mAtmService.mAmInternal.getCurrentUserId(); } Task reuseAsLeafTask(IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor, @@ -727,7 +1154,7 @@ class Task extends WindowContainer<WindowContainer> { } /** Convenience method to reparent a task to the top or bottom position of the stack. */ - boolean reparent(ActivityStack preferredStack, boolean toTop, + boolean reparent(Task preferredStack, boolean toTop, @ReparentMoveStackMode int moveStackMode, boolean animate, boolean deferResume, String reason) { return reparent(preferredStack, toTop ? MAX_VALUE : 0, moveStackMode, animate, deferResume, @@ -738,7 +1165,7 @@ class Task extends WindowContainer<WindowContainer> { * Convenience method to reparent a task to the top or bottom position of the stack, with * an option to skip scheduling the picture-in-picture mode change. */ - boolean reparent(ActivityStack preferredStack, boolean toTop, + boolean reparent(Task preferredStack, boolean toTop, @ReparentMoveStackMode int moveStackMode, boolean animate, boolean deferResume, boolean schedulePictureInPictureModeChange, String reason) { return reparent(preferredStack, toTop ? MAX_VALUE : 0, moveStackMode, animate, @@ -746,7 +1173,7 @@ class Task extends WindowContainer<WindowContainer> { } /** Convenience method to reparent a task to a specific position of the stack. */ - boolean reparent(ActivityStack preferredStack, int position, + boolean reparent(Task preferredStack, int position, @ReparentMoveStackMode int moveStackMode, boolean animate, boolean deferResume, String reason) { return reparent(preferredStack, position, moveStackMode, animate, deferResume, @@ -772,14 +1199,14 @@ class Task extends WindowContainer<WindowContainer> { */ // TODO: Inspect all call sites and change to just changing windowing mode of the stack vs. // re-parenting the task. Can only be done when we are no longer using static stack Ids. - boolean reparent(ActivityStack preferredStack, int position, + boolean reparent(Task preferredStack, int position, @ReparentMoveStackMode int moveStackMode, boolean animate, boolean deferResume, boolean schedulePictureInPictureModeChange, String reason) { final ActivityStackSupervisor supervisor = mStackSupervisor; final RootWindowContainer root = mRootWindowContainer; final WindowManagerService windowManager = mAtmService.mWindowManager; - final ActivityStack sourceStack = getStack(); - final ActivityStack toStack = supervisor.getReparentTargetStack(this, preferredStack, + final Task sourceStack = getRootTask(); + final Task toStack = supervisor.getReparentTargetStack(this, preferredStack, position == MAX_VALUE); if (toStack == sourceStack) { return false; @@ -1172,6 +1599,12 @@ class Task extends WindowContainer<WindowContainer> { } mRootWindowContainer.updateUIDsPresentOnDisplay(); + + // Resume next focusable stack after reparenting to another display if we aren't removing + // the prevous display. + if (oldDisplay != null && oldDisplay.isRemoving()) { + postReparent(); + } } void cleanUpActivityReferences(ActivityRecord r) { @@ -1370,7 +1803,7 @@ class Task extends WindowContainer<WindowContainer> { // A rootable task that is now being added to be the child of an organized task. Making // sure the stack references is keep updated. if (mTaskOrganizer != null && mCreatedByOrganizer && child.asTask() != null) { - getDisplayArea().addStackReferenceIfNeeded((ActivityStack) child); + getDisplayArea().addStackReferenceIfNeeded((Task) child); } // Make sure the list of display UID whitelists is updated @@ -1420,7 +1853,7 @@ class Task extends WindowContainer<WindowContainer> { // A rootable child task that is now being removed from an organized task. Making sure // the stack references is keep updated. if (mCreatedByOrganizer && r.asTask() != null) { - getDisplayArea().removeStackReferenceIfNeeded((ActivityStack) r); + getDisplayArea().removeStackReferenceIfNeeded((Task) r); } if (!mChildren.contains(r)) { Slog.e(TAG, "removeChild: r=" + r + " not found in t=" + this); @@ -1460,7 +1893,7 @@ class Task extends WindowContainer<WindowContainer> { // Remove entire task if it doesn't have any activity left and it isn't marked for reuse // or created by task organizer. if (!isRootTask()) { - getStack().removeChild(this, reason); + getRootTask().removeChild(this, reason); } EventLogTags.writeWmTaskRemoved(mTaskId, "removeChild: last r=" + r + " in t=" + this); @@ -1502,7 +1935,7 @@ class Task extends WindowContainer<WindowContainer> { /** Completely remove all activities associated with an existing task. */ void performClearTask(String reason) { // Broken down into to cases to avoid object create due to capturing mStack. - if (getStack() == null) { + if (getRootTask() == null) { forAllActivities((r) -> { if (r.finishing) return; // Task was restored from persistent storage. @@ -1881,8 +2314,7 @@ class Task extends WindowContainer<WindowContainer> { } } - @Override - public void onConfigurationChanged(Configuration newParentConfig) { + private void onConfigurationChangedInner(Configuration newParentConfig) { // Check if the new configuration supports persistent bounds (eg. is Freeform) and if so // restore the last recorded non-fullscreen bounds. final boolean prevPersistTaskBounds = getWindowConfiguration().persistTaskBounds(); @@ -1910,7 +2342,7 @@ class Task extends WindowContainer<WindowContainer> { final boolean pipChanging = wasInPictureInPicture != inPinnedWindowingMode(); if (pipChanging) { - mStackSupervisor.scheduleUpdatePictureInPictureModeIfNeeded(this, getStack()); + mStackSupervisor.scheduleUpdatePictureInPictureModeIfNeeded(this, getRootTask()); } else if (wasInMultiWindowMode != inMultiWindowMode()) { mStackSupervisor.scheduleUpdateMultiWindowMode(this); } @@ -1959,6 +2391,78 @@ class Task extends WindowContainer<WindowContainer> { } } + @Override + public void onConfigurationChanged(Configuration newParentConfig) { + // Calling Task#onConfigurationChanged() for leaf task since the ops in this method are + // particularly for ActivityStack, like preventing bounds changes when inheriting certain + // windowing mode. + if (!isRootTask()) { + onConfigurationChangedInner(newParentConfig); + return; + } + + final int prevWindowingMode = getWindowingMode(); + final boolean prevIsAlwaysOnTop = isAlwaysOnTop(); + final int prevRotation = getWindowConfiguration().getRotation(); + final Rect newBounds = mTmpRect; + // Initialize the new bounds by previous bounds as the input and output for calculating + // override bounds in pinned (pip) or split-screen mode. + getBounds(newBounds); + + onConfigurationChangedInner(newParentConfig); + + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + if (taskDisplayArea == null) { + return; + } + + if (prevWindowingMode != getWindowingMode()) { + taskDisplayArea.onStackWindowingModeChanged(this); + } + + final DisplayContent display = getDisplay(); + if (display == null ) { + return; + } + + final boolean windowingModeChanged = prevWindowingMode != getWindowingMode(); + final int overrideWindowingMode = getRequestedOverrideWindowingMode(); + // Update bounds if applicable + boolean hasNewOverrideBounds = false; + // Use override windowing mode to prevent extra bounds changes if inheriting the mode. + if ((overrideWindowingMode != WINDOWING_MODE_PINNED) + && !getRequestedOverrideBounds().isEmpty()) { + // If the parent (display) has rotated, rotate our bounds to best-fit where their + // bounds were on the pre-rotated display. + final int newRotation = getWindowConfiguration().getRotation(); + final boolean rotationChanged = prevRotation != newRotation; + if (rotationChanged) { + display.mDisplayContent.rotateBounds( + newParentConfig.windowConfiguration.getBounds(), prevRotation, newRotation, + newBounds); + hasNewOverrideBounds = true; + } + } + + if (windowingModeChanged) { + taskDisplayArea.onStackWindowingModeChanged(this); + } + if (hasNewOverrideBounds) { + if (inSplitScreenWindowingMode()) { + setBounds(newBounds); + } else if (overrideWindowingMode != WINDOWING_MODE_PINNED) { + // For pinned stack, resize is now part of the {@link WindowContainerTransaction} + resize(new Rect(newBounds), PRESERVE_WINDOWS, true /* deferResume */); + } + } + if (prevIsAlwaysOnTop != isAlwaysOnTop()) { + // Since always on top is only on when the stack is freeform or pinned, the state + // can be toggled when the windowing mode changes. We must make sure the stack is + // placed properly when always on top state changes. + taskDisplayArea.positionStackAtTop(this, false /* includingParents */); + } + } + /** * Initializes a change transition. See {@link SurfaceFreezer} for more information. */ @@ -2191,10 +2695,11 @@ class Task extends WindowContainer<WindowContainer> { DisplayInfo displayInfo) { outNonDecorBounds.set(bounds); outStableBounds.set(bounds); - if (getStack() == null || getStack().getDisplay() == null) { + final Task rootTask = getRootTask(); + if (rootTask == null || rootTask.getDisplay() == null) { return; } - DisplayPolicy policy = getStack().getDisplay().mDisplayContent.getDisplayPolicy(); + DisplayPolicy policy = rootTask.getDisplay().mDisplayContent.getDisplayPolicy(); if (policy == null) { return; } @@ -2533,8 +3038,8 @@ class Task extends WindowContainer<WindowContainer> { /** Updates the task's bounds and override configuration to match what is expected for the * input stack. */ - void updateOverrideConfigurationForStack(ActivityStack inStack) { - final ActivityStack stack = getStack(); + void updateOverrideConfigurationForStack(Task inStack) { + final Task stack = getRootTask(); if (stack != null && stack == inStack) { return; @@ -2547,7 +3052,7 @@ class Task extends WindowContainer<WindowContainer> { /** Returns the bounds that should be used to launch this task. */ Rect getLaunchBounds() { - final ActivityStack stack = getStack(); + final Task stack = getRootTask(); if (stack == null) { return null; } @@ -2582,7 +3087,7 @@ class Task extends WindowContainer<WindowContainer> { @Override DisplayContent getDisplayContent() { // TODO: Why aren't we just using our own display content vs. parent's??? - final ActivityStack stack = getStack(); + final Task stack = getRootTask(); return stack != null && stack != this ? stack.getDisplayContent() : super.getDisplayContent(); } @@ -2592,11 +3097,6 @@ class Task extends WindowContainer<WindowContainer> { return dc != null ? dc.mDisplayId : INVALID_DISPLAY; } - // TODO: Migrate callers to getRootTask() - ActivityStack getStack() { - return (ActivityStack) getRootTask(); - } - /** @return Id of root task. */ int getRootTaskId() { return getRootTask().mTaskId; @@ -2637,7 +3137,7 @@ class Task extends WindowContainer<WindowContainer> { * Find next proper focusable stack and make it focused. * @return The stack that now got the focus, {@code null} if none found. */ - ActivityStack adjustFocusToNextFocusableTask(String reason) { + Task adjustFocusToNextFocusableTask(String reason) { return adjustFocusToNextFocusableTask(reason, false /* allowFocusSelf */, true /* moveDisplayToTop */); } @@ -2650,7 +3150,7 @@ class Task extends WindowContainer<WindowContainer> { } final Task focusableTask = parent.getTask((task) -> (allowFocusSelf || task != this) - && ((ActivityStack) task).isFocusableAndVisible()); + && ((Task) task).isFocusableAndVisible()); if (focusableTask == null && parent.asTask() != null) { return parent.asTask().getNextFocusableTask(allowFocusSelf); } else { @@ -2665,18 +3165,17 @@ class Task extends WindowContainer<WindowContainer> { * @param moveDisplayToTop Whether to move display to top while making the task focused. * @return The root task that now got the focus, {@code null} if none found. */ - ActivityStack adjustFocusToNextFocusableTask(String reason, boolean allowFocusSelf, + Task adjustFocusToNextFocusableTask(String reason, boolean allowFocusSelf, boolean moveDisplayToTop) { - ActivityStack focusableTask = (ActivityStack) getNextFocusableTask(allowFocusSelf); + Task focusableTask = getNextFocusableTask(allowFocusSelf); if (focusableTask == null) { - focusableTask = mRootWindowContainer.getNextFocusableStack((ActivityStack) this, - !allowFocusSelf); + focusableTask = mRootWindowContainer.getNextFocusableStack(this, !allowFocusSelf); } if (focusableTask == null) { return null; } - final ActivityStack rootTask = (ActivityStack) focusableTask.getRootTask(); + final Task rootTask = focusableTask.getRootTask(); if (!moveDisplayToTop) { // There may be multiple task layers above this task, so when relocating the task to the // top, we should move this task and each of its parent task that below display area to @@ -2807,7 +3306,7 @@ class Task extends WindowContainer<WindowContainer> { // No reason to defer removal of a Task that doesn't have any child. return false; } - return hasWindowsAlive() && getStack().isAnimating(TRANSITION | CHILDREN); + return hasWindowsAlive() && getRootTask().isAnimating(TRANSITION | CHILDREN); } @Override @@ -2826,9 +3325,9 @@ class Task extends WindowContainer<WindowContainer> { } // TODO: Consolidate this with Task.reparent() - void reparent(ActivityStack stack, int position, boolean moveParents, String reason) { + void reparent(Task stack, int position, boolean moveParents, String reason) { if (DEBUG_STACK) Slog.i(TAG, "reParentTask: removing taskId=" + mTaskId - + " from stack=" + getStack()); + + " from stack=" + getRootTask()); EventLogTags.writeWmTaskRemoved(mTaskId, "reParentTask:" + reason); reparent(stack, position); @@ -2855,9 +3354,13 @@ class Task extends WindowContainer<WindowContainer> { /** Set the task bounds. Passing in null sets the bounds to fullscreen. */ @Override public int setBounds(Rect bounds) { + if (isRootTask()) { + return setBounds(getRequestedOverrideBounds(), bounds); + } + int rotation = Surface.ROTATION_0; - final DisplayContent displayContent = getStack() != null - ? getStack().getDisplayContent() : null; + final DisplayContent displayContent = getRootTask() != null + ? getRootTask().getDisplayContent() : null; if (displayContent != null) { rotation = displayContent.getDisplayInfo().rotation; } @@ -2869,6 +3372,17 @@ class Task extends WindowContainer<WindowContainer> { } @Override + public boolean isCompatible(int windowingMode, int activityType) { + // TODO: Should we just move this to ConfigurationContainer? + if (activityType == ACTIVITY_TYPE_UNDEFINED) { + // Undefined activity types end up in a standard stack once the stack is created on a + // display, so they should be considered compatible. + activityType = ACTIVITY_TYPE_STANDARD; + } + return super.isCompatible(windowingMode, activityType); + } + + @Override public boolean onDescendantOrientationChanged(IBinder freezeDisplayToken, ConfigurationContainer requestingContainer) { if (super.onDescendantOrientationChanged(freezeDisplayToken, requestingContainer)) { @@ -2902,6 +3416,9 @@ class Task extends WindowContainer<WindowContainer> { mWmService.mAtmService.getTaskChangeNotificationController().notifyTaskDisplayChanged( mTaskId, displayId); } + if (isRootTask()) { + updateSurfaceBounds(); + } } boolean isResizeable(boolean checkSupportsPip) { @@ -2992,7 +3509,13 @@ class Task extends WindowContainer<WindowContainer> { /** Bounds of the task to be used for dimming, as well as touch related tests. */ void getDimBounds(Rect out) { - final DisplayContent displayContent = getStack().getDisplayContent(); + if (isRootTask()) { + getBounds(out); + return; + } + + final Task rootTask = getRootTask(); + final DisplayContent displayContent = rootTask.getDisplayContent(); // It doesn't matter if we in particular are part of the resize, since we couldn't have // a DimLayer anyway if we weren't visible. final boolean dockedResizing = displayContent != null @@ -3016,9 +3539,9 @@ class Task extends WindowContainer<WindowContainer> { // stack bounds and so we don't even want to use them. Even if the app should not be // resized the Dim should keep up with the divider. if (dockedResizing) { - getStack().getBounds(out); + rootTask.getBounds(out); } else { - getStack().getBounds(mTmpRect); + rootTask.getBounds(mTmpRect); mTmpRect.intersect(getBounds()); out.set(mTmpRect); } @@ -3031,7 +3554,8 @@ class Task extends WindowContainer<WindowContainer> { void setDragResizing(boolean dragResizing, int dragResizeMode) { if (mDragResizing != dragResizing) { // No need to check if the mode is allowed if it's leaving dragResize - if (dragResizing && !DragResizeMode.isModeAllowedForStack(getStack(), dragResizeMode)) { + if (dragResizing + && !DragResizeMode.isModeAllowedForStack(getRootTask(), dragResizeMode)) { throw new IllegalArgumentException("Drag resize mode not allow for stack stackId=" + getRootTaskId() + " dragResizeMode=" + dragResizeMode); } @@ -3221,9 +3745,9 @@ class Task extends WindowContainer<WindowContainer> { @Override Rect getAnimationBounds(int appStackClipMode) { // TODO(b/131661052): we should remove appStackClipMode with hierarchical animations. - if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getStack() != null) { + if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getRootTask() != null) { // Using the stack bounds here effectively applies the clipping before animation. - return getStack().getBounds(); + return getRootTask().getBounds(); } return super.getAnimationBounds(appStackClipMode); } @@ -3573,6 +4097,20 @@ class Task extends WindowContainer<WindowContainer> { child.dump(pw, doublePrefix, dumpAll); } } + + if (!mExitingActivities.isEmpty()) { + pw.println(); + pw.println(prefix + "Exiting application tokens:"); + for (int i = mExitingActivities.size() - 1; i >= 0; i--) { + WindowToken token = mExitingActivities.get(i); + pw.print(doublePrefix + "Exiting App #" + i); + pw.print(' '); pw.print(token); + pw.println(':'); + token.dump(pw, doublePrefix, dumpAll); + } + pw.println(); + } + mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix); } @@ -3668,7 +4206,7 @@ class Task extends WindowContainer<WindowContainer> { * * @param starting The currently starting activity or null if there is none. */ - @ActivityStack.StackVisibility + @Task.StackVisibility int getVisibility(ActivityRecord starting) { if (!isAttached() || isForceHidden()) { return STACK_VISIBILITY_INVISIBLE; @@ -4289,7 +4827,7 @@ class Task extends WindowContainer<WindowContainer> { } } - final Task task = new ActivityStack(stackSupervisor.mService, taskId, intent, + final Task task = new Task(stackSupervisor.mService, taskId, intent, affinityIntent, affinity, rootAffinity, realActivity, origActivity, rootHasReset, autoRemoveRecents, askedCompatMode, userId, effectiveUid, lastDescription, lastTimeOnTop, neverRelinquishIdentity, taskDescription, taskAffiliation, @@ -4604,4 +5142,2656 @@ class Task extends WindowContainer<WindowContainer> { return TASK; } + @Override + public void setWindowingMode(int windowingMode) { + // Reset the cached result of toString() + stringName = null; + + // Calling Task#setWindowingMode() for leaf task since this is the a specialization of + // {@link #setWindowingMode(int)} for ActivityStack. + if (!isRootTask()) { + super.setWindowingMode(windowingMode); + return; + } + + setWindowingMode(windowingMode, false /* creating */); + } + + /** + * Specialization of {@link #setWindowingMode(int)} for this subclass. + * + * @param preferredWindowingMode the preferred windowing mode. This may not be honored depending + * on the state of things. For example, WINDOWING_MODE_UNDEFINED will resolve to the + * previous non-transient mode if this stack is currently in a transient mode. + * @param creating {@code true} if this is being run during ActivityStack construction. + */ + void setWindowingMode(int preferredWindowingMode, boolean creating) { + mWmService.inSurfaceTransaction(() -> setWindowingModeInSurfaceTransaction( + preferredWindowingMode, creating)); + } + + private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode, + boolean creating) { + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + if (taskDisplayArea == null) { + Slog.d(TAG, "taskDisplayArea is null, bail early"); + return; + } + final int currentMode = getWindowingMode(); + final int currentOverrideMode = getRequestedOverrideWindowingMode(); + final Task topTask = getTopMostTask(); + int windowingMode = preferredWindowingMode; + + // Need to make sure windowing mode is supported. If we in the process of creating the stack + // no need to resolve the windowing mode again as it is already resolved to the right mode. + if (!creating) { + if (!taskDisplayArea.isValidWindowingMode(windowingMode, null /* ActivityRecord */, + topTask, getActivityType())) { + windowingMode = WINDOWING_MODE_UNDEFINED; + } + } + + final boolean alreadyInSplitScreenMode = taskDisplayArea.isSplitScreenModeActivated(); + + if (creating && alreadyInSplitScreenMode && windowingMode == WINDOWING_MODE_FULLSCREEN + && isActivityTypeStandardOrUndefined()) { + // If the stack is being created explicitly in fullscreen mode, dismiss split-screen + // and display a warning toast about it. + mAtmService.getTaskChangeNotificationController() + .notifyActivityDismissingDockedStack(); + taskDisplayArea.onSplitScreenModeDismissed(this); + } + + if (currentMode == windowingMode) { + // You are already in the window mode, so we can skip most of the work below. However, + // it's possible that we have inherited the current windowing mode from a parent. So, + // fulfill this method's contract by setting the override mode directly. + getRequestedOverrideConfiguration().windowConfiguration.setWindowingMode(windowingMode); + return; + } + + final ActivityRecord topActivity = getTopNonFinishingActivity(); + + // For now, assume that the Stack's windowing mode is what will actually be used + // by it's activities. In the future, there may be situations where this doesn't + // happen; so at that point, this message will need to handle that. + int likelyResolvedMode = windowingMode; + if (windowingMode == WINDOWING_MODE_UNDEFINED) { + final ConfigurationContainer parent = getParent(); + likelyResolvedMode = parent != null ? parent.getWindowingMode() + : WINDOWING_MODE_FULLSCREEN; + } + if (currentMode == WINDOWING_MODE_PINNED) { + mAtmService.getTaskChangeNotificationController().notifyActivityUnpinned(); + } + if (likelyResolvedMode == WINDOWING_MODE_PINNED + && taskDisplayArea.getRootPinnedTask() != null) { + // Can only have 1 pip at a time, so replace an existing pip + taskDisplayArea.getRootPinnedTask().dismissPip(); + } + if (likelyResolvedMode != WINDOWING_MODE_FULLSCREEN + && topActivity != null && !topActivity.noDisplay + && topActivity.isNonResizableOrForcedResizable(likelyResolvedMode)) { + // Inform the user that they are starting an app that may not work correctly in + // multi-window mode. + final String packageName = topActivity.info.applicationInfo.packageName; + mAtmService.getTaskChangeNotificationController().notifyActivityForcedResizable( + topTask.mTaskId, FORCED_RESIZEABLE_REASON_SPLIT_SCREEN, packageName); + } + + mAtmService.deferWindowLayout(); + try { + if (topActivity != null) { + mStackSupervisor.mNoAnimActivities.add(topActivity); + } + super.setWindowingMode(windowingMode); + // setWindowingMode triggers an onConfigurationChanged cascade which can result in a + // different resolved windowing mode (usually when preferredWindowingMode is UNDEFINED). + windowingMode = getWindowingMode(); + + if (creating) { + // Nothing else to do if we don't have a window container yet. E.g. call from ctor. + return; + } + + if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY && alreadyInSplitScreenMode) { + // We already have a split-screen stack in this display, so just move the tasks over. + // TODO: Figure-out how to do all the stuff in + // AMS.setTaskWindowingModeSplitScreenPrimary + throw new IllegalArgumentException("Setting primary split-screen windowing mode" + + " while there is already one isn't currently supported"); + //return; + } + } finally { + mAtmService.continueWindowLayout(); + } + + mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS); + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + + /** Resume next focusable stack after reparenting to another display. */ + void postReparent() { + adjustFocusToNextFocusableTask("reparent", true /* allowFocusSelf */, + true /* moveDisplayToTop */); + mRootWindowContainer.resumeFocusedStacksTopActivities(); + // Update visibility of activities before notifying WM. This way it won't try to resize + // windows that are no longer visible. + mRootWindowContainer.ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, + !PRESERVE_WINDOWS); + } + + DisplayContent getDisplay() { + return getDisplayContent(); + } + + /** @return true if the stack can only contain one task */ + boolean isSingleTaskInstance() { + final DisplayContent display = getDisplay(); + return display != null && display.isSingleTaskInstance(); + } + + final boolean isHomeOrRecentsStack() { + return isActivityTypeHome() || isActivityTypeRecents(); + } + + final boolean isOnHomeDisplay() { + return getDisplayId() == DEFAULT_DISPLAY; + } + + void moveToFront(String reason) { + moveToFront(reason, null); + } + + /** + * @param reason The reason for moving the stack to the front. + * @param task If non-null, the task will be moved to the top of the stack. + */ + void moveToFront(String reason, Task task) { + if (!isAttached()) { + return; + } + + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + + if (inSplitScreenSecondaryWindowingMode()) { + // If the stack is in split-screen secondary mode, we need to make sure we move the + // primary split-screen stack forward in the case it is currently behind a fullscreen + // stack so both halves of the split-screen appear on-top and the fullscreen stack isn't + // cutting between them. + // TODO(b/70677280): This is a workaround until we can fix as part of b/70677280. + final Task topFullScreenStack = + taskDisplayArea.getTopStackInWindowingMode(WINDOWING_MODE_FULLSCREEN); + if (topFullScreenStack != null) { + final Task primarySplitScreenStack = + taskDisplayArea.getRootSplitScreenPrimaryTask(); + if (primarySplitScreenStack != null + && taskDisplayArea.getIndexOf(topFullScreenStack) + > taskDisplayArea.getIndexOf(primarySplitScreenStack)) { + primarySplitScreenStack.moveToFront(reason + " splitScreenToTop"); + } + } + } + + if (!isActivityTypeHome() && returnsToHomeStack()) { + // Make sure the home stack is behind this stack since that is where we should return to + // when this stack is no longer visible. + taskDisplayArea.moveHomeStackToFront(reason + " returnToHome"); + } + + if (isRootTask()) { + taskDisplayArea.positionStackAtTop(this, false /* includingParents */, reason); + } + if (task == null) { + task = this; + } + task.getParent().positionChildAt(POSITION_TOP, task, true /* includingParents */); + } + + /** + * This moves 'task' to the back of this task and also recursively moves this task to the back + * of its parents (if applicable). + * + * @param reason The reason for moving the stack to the back. + * @param task If non-null, the task will be moved to the bottom of the stack. + **/ + void moveToBack(String reason, Task task) { + if (!isAttached()) { + return; + } + final TaskDisplayArea displayArea = getDisplayArea(); + if (!mCreatedByOrganizer) { + // If this is just a normal task, so move to back of parent and then move 'task' to + // back of this. + final WindowContainer parent = getParent(); + final Task parentTask = parent != null ? parent.asTask() : null; + if (parentTask != null) { + parentTask.moveToBack(reason, this); + } else { + displayArea.positionStackAtBottom(this, reason); + } + if (task != null && task != this) { + positionChildAtBottom(task); + } + return; + } + if (task == null || task == this) { + return; + } + // This is a created-by-organizer task. In this case, let the organizer deal with this + // task's ordering. However, we still need to move 'task' to back. The intention is that + // this ends up behind the home-task so that it is made invisible; so, if the home task + // is not a child of this, reparent 'task' to the back of the home task's actual parent. + displayArea.positionTaskBehindHome(task); + } + + // TODO: Should each user have there own stacks? + @Override + void switchUser(int userId) { + if (mCurrentUser == userId) { + return; + } + mCurrentUser = userId; + + super.switchUser(userId); + forAllLeafTasks((t) -> { + if (t.showToCurrentUser() && t != this) { + mChildren.remove(t); + mChildren.add(t); + } + }, true /* traverseTopToBottom */); + } + + void minimalResumeActivityLocked(ActivityRecord r) { + if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + r + " (starting new instance)" + + " callers=" + Debug.getCallers(5)); + r.setState(RESUMED, "minimalResumeActivityLocked"); + r.completeResumeLocked(); + } + + private void clearLaunchTime(ActivityRecord r) { + // Make sure that there is no activity waiting for this to launch. + if (!mStackSupervisor.mWaitingActivityLaunched.isEmpty()) { + mStackSupervisor.removeIdleTimeoutForActivity(r); + mStackSupervisor.scheduleIdleTimeout(r); + } + } + + void awakeFromSleepingLocked() { + // Ensure activities are no longer sleeping. + forAllActivities((Consumer<ActivityRecord>) (r) -> r.setSleeping(false)); + if (mPausingActivity != null) { + Slog.d(TAG, "awakeFromSleepingLocked: previously pausing activity didn't pause"); + mPausingActivity.activityPaused(true); + } + } + + void checkReadyForSleep() { + if (shouldSleepActivities() && goToSleepIfPossible(false /* shuttingDown */)) { + mStackSupervisor.checkReadyForSleepLocked(true /* allowDelay */); + } + } + + /** + * Tries to put the activities in the stack to sleep. + * + * If the stack is not in a state where its activities can be put to sleep, this function will + * start any necessary actions to move the stack into such a state. It is expected that this + * function get called again when those actions complete. + * + * @param shuttingDown true when the called because the device is shutting down. + * @return true if the stack finished going to sleep, false if the stack only started the + * process of going to sleep (checkReadyForSleep will be called when that process finishes). + */ + boolean goToSleepIfPossible(boolean shuttingDown) { + boolean shouldSleep = true; + + if (mResumedActivity != null) { + // Still have something resumed; can't sleep until it is paused. + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep needs to pause " + mResumedActivity); + if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING, + "Sleep => pause with userLeaving=false"); + + startPausingLocked(false /* userLeaving */, true /* uiSleeping */, null /* resuming */); + shouldSleep = false ; + } else if (mPausingActivity != null) { + // Still waiting for something to pause; can't sleep yet. + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity); + shouldSleep = false; + } + + if (!shuttingDown) { + if (containsActivityFromStack(mStackSupervisor.mStoppingActivities)) { + // Still need to tell some activities to stop; can't sleep yet. + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still need to stop " + + mStackSupervisor.mStoppingActivities.size() + " activities"); + + mStackSupervisor.scheduleIdle(); + shouldSleep = false; + } + } + + if (shouldSleep) { + goToSleep(); + } + + return shouldSleep; + } + + void goToSleep() { + // Make sure all visible activities are now sleeping. This will update the activity's + // visibility and onStop() will be called. + forAllActivities((r) -> { + if (r.isState(STARTED, RESUMED, PAUSING, PAUSED, STOPPING, STOPPED)) { + r.setSleeping(true); + } + }); + + // Ensure visibility after updating sleep states without updating configuration, + // as activities are about to be sent to sleep. + ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, + !PRESERVE_WINDOWS); + } + + private boolean containsActivityFromStack(List<ActivityRecord> rs) { + for (ActivityRecord r : rs) { + if (r.getRootTask() == this) { + return true; + } + } + return false; + } + + /** + * Start pausing the currently resumed activity. It is an error to call this if there + * is already an activity being paused or there is no resumed activity. + * + * @param userLeaving True if this should result in an onUserLeaving to the current activity. + * @param uiSleeping True if this is happening with the user interface going to sleep (the + * screen turning off). + * @param resuming The activity we are currently trying to resume or null if this is not being + * called as part of resuming the top activity, so we shouldn't try to instigate + * a resume here if not null. + * @return Returns true if an activity now is in the PAUSING state, and we are waiting for + * it to tell us when it is done. + */ + final boolean startPausingLocked(boolean userLeaving, boolean uiSleeping, + ActivityRecord resuming) { + if (mPausingActivity != null) { + Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity + + " state=" + mPausingActivity.getState()); + if (!shouldSleepActivities()) { + // Avoid recursion among check for sleep and complete pause during sleeping. + // Because activity will be paused immediately after resume, just let pause + // be completed by the order of activity paused from clients. + completePauseLocked(false, resuming); + } + } + ActivityRecord prev = mResumedActivity; + + if (prev == null) { + if (resuming == null) { + Slog.wtf(TAG, "Trying to pause when nothing is resumed"); + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + return false; + } + + if (prev == resuming) { + Slog.wtf(TAG, "Trying to pause activity that is in process of being resumed"); + return false; + } + + if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to PAUSING: " + prev); + else if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Start pausing: " + prev); + mPausingActivity = prev; + mLastPausedActivity = prev; + mLastNoHistoryActivity = prev.isNoHistory() ? prev : null; + prev.setState(PAUSING, "startPausingLocked"); + prev.getTask().touchActiveTime(); + clearLaunchTime(prev); + + mAtmService.updateCpuStats(); + + boolean pauseImmediately = false; + if (resuming != null && (resuming.info.flags & FLAG_RESUME_WHILE_PAUSING) != 0) { + // If the flag RESUME_WHILE_PAUSING is set, then continue to schedule the previous + // activity to be paused, while at the same time resuming the new resume activity + // only if the previous activity can't go into Pip since we want to give Pip + // activities a chance to enter Pip before resuming the next activity. + final boolean lastResumedCanPip = prev != null && prev.checkEnterPictureInPictureState( + "shouldResumeWhilePausing", userLeaving); + if (!lastResumedCanPip) { + pauseImmediately = true; + } + } + + if (prev.attachedToProcess()) { + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueueing pending pause: " + prev); + try { + EventLogTags.writeWmPauseActivity(prev.mUserId, System.identityHashCode(prev), + prev.shortComponentName, "userLeaving=" + userLeaving); + + mAtmService.getLifecycleManager().scheduleTransaction(prev.app.getThread(), + prev.appToken, PauseActivityItem.obtain(prev.finishing, userLeaving, + prev.configChangeFlags, pauseImmediately)); + } catch (Exception e) { + // Ignore exception, if process died other code will cleanup. + Slog.w(TAG, "Exception thrown during pause", e); + mPausingActivity = null; + mLastPausedActivity = null; + mLastNoHistoryActivity = null; + } + } else { + mPausingActivity = null; + mLastPausedActivity = null; + mLastNoHistoryActivity = null; + } + + // If we are not going to sleep, we want to ensure the device is + // awake until the next activity is started. + if (!uiSleeping && !mAtmService.isSleepingOrShuttingDownLocked()) { + mStackSupervisor.acquireLaunchWakelock(); + } + + if (mPausingActivity != null) { + // Have the window manager pause its key dispatching until the new + // activity has started. If we're pausing the activity just because + // the screen is being turned off and the UI is sleeping, don't interrupt + // key dispatch; the same activity will pick it up again on wakeup. + if (!uiSleeping) { + prev.pauseKeyDispatchingLocked(); + } else if (DEBUG_PAUSE) { + Slog.v(TAG_PAUSE, "Key dispatch not paused for screen off"); + } + + if (pauseImmediately) { + // If the caller said they don't want to wait for the pause, then complete + // the pause now. + completePauseLocked(false, resuming); + return false; + + } else { + prev.schedulePauseTimeout(); + return true; + } + + } else { + // This activity failed to schedule the + // pause, so just treat it as being paused now. + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Activity not running, resuming next."); + if (resuming == null) { + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + return false; + } + } + + @VisibleForTesting + void completePauseLocked(boolean resumeNext, ActivityRecord resuming) { + ActivityRecord prev = mPausingActivity; + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Complete pause: " + prev); + + if (prev != null) { + prev.setWillCloseOrEnterPip(false); + final boolean wasStopping = prev.isState(STOPPING); + prev.setState(PAUSED, "completePausedLocked"); + if (prev.finishing) { + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Executing finish of activity: " + prev); + prev = prev.completeFinishing("completePausedLocked"); + } else if (prev.hasProcess()) { + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueue pending stop if needed: " + prev + + " wasStopping=" + wasStopping + + " visibleRequested=" + prev.mVisibleRequested); + if (prev.deferRelaunchUntilPaused) { + // Complete the deferred relaunch that was waiting for pause to complete. + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Re-launching after pause: " + prev); + prev.relaunchActivityLocked(prev.preserveWindowOnDeferredRelaunch); + } else if (wasStopping) { + // We are also stopping, the stop request must have gone soon after the pause. + // We can't clobber it, because the stop confirmation will not be handled. + // We don't need to schedule another stop, we only need to let it happen. + prev.setState(STOPPING, "completePausedLocked"); + } else if (!prev.mVisibleRequested || shouldSleepOrShutDownActivities()) { + // Clear out any deferred client hide we might currently have. + prev.setDeferHidingClient(false); + // If we were visible then resumeTopActivities will release resources before + // stopping. + prev.addToStopping(true /* scheduleIdle */, false /* idleDelayed */, + "completePauseLocked"); + } + } else { + if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "App died during pause, not stopping: " + prev); + prev = null; + } + // It is possible the activity was freezing the screen before it was paused. + // In that case go ahead and remove the freeze this activity has on the screen + // since it is no longer visible. + if (prev != null) { + prev.stopFreezingScreenLocked(true /*force*/); + } + mPausingActivity = null; + } + + if (resumeNext) { + final Task topStack = mRootWindowContainer.getTopDisplayFocusedStack(); + if (topStack != null && !topStack.shouldSleepOrShutDownActivities()) { + mRootWindowContainer.resumeFocusedStacksTopActivities(topStack, prev, null); + } else { + checkReadyForSleep(); + final ActivityRecord top = topStack != null ? topStack.topRunningActivity() : null; + if (top == null || (prev != null && top != prev)) { + // If there are no more activities available to run, do resume anyway to start + // something. Also if the top activity on the stack is not the just paused + // activity, we need to go ahead and resume it to ensure we complete an + // in-flight app switch. + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + } + } + + if (prev != null) { + prev.resumeKeyDispatchingLocked(); + + if (prev.hasProcess() && prev.cpuTimeAtResume > 0) { + final long diff = prev.app.getCpuTime() - prev.cpuTimeAtResume; + if (diff > 0) { + final Runnable r = PooledLambda.obtainRunnable( + ActivityManagerInternal::updateForegroundTimeIfOnBattery, + mAtmService.mAmInternal, prev.info.packageName, + prev.info.applicationInfo.uid, + diff); + mAtmService.mH.post(r); + } + } + prev.cpuTimeAtResume = 0; // reset it + } + + mRootWindowContainer.ensureActivitiesVisible(resuming, 0, !PRESERVE_WINDOWS); + + // Notify when the task stack has changed, but only if visibilities changed (not just + // focus). Also if there is an active pinned stack - we always want to notify it about + // task stack changes, because its positioning may depend on it. + if (mStackSupervisor.mAppVisibilitiesChangedSinceLastPause + || (getDisplayArea() != null && getDisplayArea().hasPinnedTask())) { + mAtmService.getTaskChangeNotificationController().notifyTaskStackChanged(); + mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = false; + } + } + + boolean isTopStackInDisplayArea() { + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + return taskDisplayArea != null && taskDisplayArea.isTopStack(this); + } + + /** + * @return {@code true} if this is the focused stack on its current display, {@code false} + * otherwise. + */ + boolean isFocusedStackOnDisplay() { + final DisplayContent display = getDisplay(); + return display != null && this == display.getFocusedStack(); + } + + /** + * Make sure that all activities that need to be visible in the stack (that is, they + * currently can be seen by the user) actually are and update their configuration. + * @param starting The top most activity in the task. + * The activity is either starting or resuming. + * Caller should ensure starting activity is visible. + * @param preserveWindows Flag indicating whether windows should be preserved when updating + * configuration in {@link mEnsureActivitiesVisibleHelper}. + * @param configChanges Parts of the configuration that changed for this activity for evaluating + * if the screen should be frozen as part of + * {@link mEnsureActivitiesVisibleHelper}. + * + */ + void ensureActivitiesVisible(@Nullable ActivityRecord starting, int configChanges, + boolean preserveWindows) { + ensureActivitiesVisible(starting, configChanges, preserveWindows, true /* notifyClients */); + } + + /** + * Ensure visibility with an option to also update the configuration of visible activities. + * @see #ensureActivitiesVisible(ActivityRecord, int, boolean) + * @see RootWindowContainer#ensureActivitiesVisible(ActivityRecord, int, boolean) + * @param starting The top most activity in the task. + * The activity is either starting or resuming. + * Caller should ensure starting activity is visible. + * @param notifyClients Flag indicating whether the visibility updates should be sent to the + * clients in {@link mEnsureActivitiesVisibleHelper}. + * @param preserveWindows Flag indicating whether windows should be preserved when updating + * configuration in {@link mEnsureActivitiesVisibleHelper}. + * @param configChanges Parts of the configuration that changed for this activity for evaluating + * if the screen should be frozen as part of + * {@link mEnsureActivitiesVisibleHelper}. + */ + // TODO: Should be re-worked based on the fact that each task as a stack in most cases. + void ensureActivitiesVisible(@Nullable ActivityRecord starting, int configChanges, + boolean preserveWindows, boolean notifyClients) { + mTopActivityOccludesKeyguard = false; + mTopDismissingKeyguardActivity = null; + mStackSupervisor.beginActivityVisibilityUpdate(); + try { + mEnsureActivitiesVisibleHelper.process( + starting, configChanges, preserveWindows, notifyClients); + + if (mTranslucentActivityWaiting != null && + mUndrawnActivitiesBelowTopTranslucent.isEmpty()) { + // Nothing is getting drawn or everything was already visible, don't wait for timeout. + notifyActivityDrawnLocked(null); + } + } finally { + mStackSupervisor.endActivityVisibilityUpdate(); + } + } + + /** + * @return true if the top visible activity wants to occlude the Keyguard, false otherwise + */ + boolean topActivityOccludesKeyguard() { + return mTopActivityOccludesKeyguard; + } + + /** + * Returns true if this stack should be resized to match the bounds specified by + * {@link ActivityOptions#setLaunchBounds} when launching an activity into the stack. + */ + boolean shouldResizeStackWithLaunchBounds() { + return inPinnedWindowingMode(); + } + + // TODO(NOW!) + /** + * Returns {@code true} if this is the top-most split-screen-primary or + * split-screen-secondary stack, {@code false} otherwise. + */ + boolean isTopSplitScreenStack() { + return inSplitScreenWindowingMode() + && this == getDisplayArea().getTopStackInWindowingMode(getWindowingMode()); + } + + /** + * @return the top most visible activity that wants to dismiss Keyguard + */ + ActivityRecord getTopDismissingKeyguardActivity() { + return mTopDismissingKeyguardActivity; + } + + /** + * Checks whether {@param r} should be visible depending on Keyguard state and updates + * {@link #mTopActivityOccludesKeyguard} and {@link #mTopDismissingKeyguardActivity} if + * necessary. + * + * @return true if {@param r} is visible taken Keyguard state into account, false otherwise + */ + boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, boolean isTop) { + int displayId = getDisplayId(); + if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY; + + final boolean keyguardOrAodShowing = mStackSupervisor.getKeyguardController() + .isKeyguardOrAodShowing(displayId); + final boolean keyguardLocked = mStackSupervisor.getKeyguardController().isKeyguardLocked(); + final boolean showWhenLocked = r.canShowWhenLocked(); + final boolean dismissKeyguard = r.containsDismissKeyguardWindow(); + if (shouldBeVisible) { + if (dismissKeyguard && mTopDismissingKeyguardActivity == null) { + mTopDismissingKeyguardActivity = r; + } + + // Only the top activity may control occluded, as we can't occlude the Keyguard if the + // top app doesn't want to occlude it. + if (isTop) { + mTopActivityOccludesKeyguard |= showWhenLocked; + } + + final boolean canShowWithKeyguard = canShowWithInsecureKeyguard() + && mStackSupervisor.getKeyguardController().canDismissKeyguard(); + if (canShowWithKeyguard) { + return true; + } + } + if (keyguardOrAodShowing) { + // If keyguard is showing, nothing is visible, except if we are able to dismiss Keyguard + // right away and AOD isn't visible. + return shouldBeVisible && mStackSupervisor.getKeyguardController() + .canShowActivityWhileKeyguardShowing(r, dismissKeyguard); + } else if (keyguardLocked) { + return shouldBeVisible && mStackSupervisor.getKeyguardController().canShowWhileOccluded( + dismissKeyguard, showWhenLocked); + } else { + return shouldBeVisible; + } + } + + /** + * Check if the display to which this stack is attached has + * {@link Display#FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD} applied. + */ + boolean canShowWithInsecureKeyguard() { + final DisplayContent displayContent = getDisplay(); + if (displayContent == null) { + throw new IllegalStateException("Stack is not attached to any display, stackId=" + + getRootTaskId()); + } + + final int flags = displayContent.mDisplay.getFlags(); + return (flags & FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD) != 0; + } + + void checkTranslucentActivityWaiting(ActivityRecord top) { + if (mTranslucentActivityWaiting != top) { + mUndrawnActivitiesBelowTopTranslucent.clear(); + if (mTranslucentActivityWaiting != null) { + // Call the callback with a timeout indication. + notifyActivityDrawnLocked(null); + mTranslucentActivityWaiting = null; + } + mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG); + } + } + + void convertActivityToTranslucent(ActivityRecord r) { + mTranslucentActivityWaiting = r; + mUndrawnActivitiesBelowTopTranslucent.clear(); + mHandler.sendEmptyMessageDelayed(TRANSLUCENT_TIMEOUT_MSG, TRANSLUCENT_CONVERSION_TIMEOUT); + } + + /** + * Called as activities below the top translucent activity are redrawn. When the last one is + * redrawn notify the top activity by calling + * {@link Activity#onTranslucentConversionComplete}. + * + * @param r The most recent background activity to be drawn. Or, if r is null then a timeout + * occurred and the activity will be notified immediately. + */ + void notifyActivityDrawnLocked(ActivityRecord r) { + if ((r == null) + || (mUndrawnActivitiesBelowTopTranslucent.remove(r) && + mUndrawnActivitiesBelowTopTranslucent.isEmpty())) { + // The last undrawn activity below the top has just been drawn. If there is an + // opaque activity at the top, notify it that it can become translucent safely now. + final ActivityRecord waitingActivity = mTranslucentActivityWaiting; + mTranslucentActivityWaiting = null; + mUndrawnActivitiesBelowTopTranslucent.clear(); + mHandler.removeMessages(TRANSLUCENT_TIMEOUT_MSG); + + if (waitingActivity != null) { + mWmService.setWindowOpaqueLocked(waitingActivity.appToken, false); + if (waitingActivity.attachedToProcess()) { + try { + waitingActivity.app.getThread().scheduleTranslucentConversionComplete( + waitingActivity.appToken, r != null); + } catch (RemoteException e) { + } + } + } + } + } + + /** @see ActivityRecord#cancelInitializing() */ + void cancelInitializingActivities() { + // We don't want to clear starting window for activities that aren't behind fullscreen + // activities as we need to display their starting window until they are done initializing. + checkBehindFullscreenActivity(null /* toCheck */, ActivityRecord::cancelInitializing); + } + + /** + * If an activity {@param toCheck} is given, this method returns {@code true} if the activity + * is occluded by any fullscreen activity. If there is no {@param toCheck} and the handling + * function {@param handleBehindFullscreenActivity} is given, this method will pass all occluded + * activities to the function. + */ + boolean checkBehindFullscreenActivity(ActivityRecord toCheck, + Consumer<ActivityRecord> handleBehindFullscreenActivity) { + return mCheckBehindFullscreenActivityHelper.process( + toCheck, handleBehindFullscreenActivity); + } + + /** + * Ensure that the top activity in the stack is resumed. + * + * @param prev The previously resumed activity, for when in the process + * of pausing; can be null to call from elsewhere. + * @param options Activity options. + * + * @return Returns true if something is being resumed, or false if + * nothing happened. + * + * NOTE: It is not safe to call this method directly as it can cause an activity in a + * non-focused stack to be resumed. + * Use {@link RootWindowContainer#resumeFocusedStacksTopActivities} to resume the + * right activity for the current system state. + */ + @GuardedBy("mService") + boolean resumeTopActivityUncheckedLocked(ActivityRecord prev, ActivityOptions options) { + if (mInResumeTopActivity) { + // Don't even start recursing. + return false; + } + + boolean result = false; + try { + // Protect against recursion. + mInResumeTopActivity = true; + result = resumeTopActivityInnerLocked(prev, options); + + // When resuming the top activity, it may be necessary to pause the top activity (for + // example, returning to the lock screen. We suppress the normal pause logic in + // {@link #resumeTopActivityUncheckedLocked}, since the top activity is resumed at the + // end. We call the {@link ActivityStackSupervisor#checkReadyForSleepLocked} again here + // to ensure any necessary pause logic occurs. In the case where the Activity will be + // shown regardless of the lock screen, the call to + // {@link ActivityStackSupervisor#checkReadyForSleepLocked} is skipped. + final ActivityRecord next = topRunningActivity(true /* focusableOnly */); + if (next == null || !next.canTurnScreenOn()) { + checkReadyForSleep(); + } + } finally { + mInResumeTopActivity = false; + } + + return result; + } + + @GuardedBy("mService") + private boolean resumeTopActivityInnerLocked(ActivityRecord prev, ActivityOptions options) { + if (!mAtmService.isBooting() && !mAtmService.isBooted()) { + // Not ready yet! + return false; + } + + // Find the next top-most activity to resume in this stack that is not finishing and is + // focusable. If it is not focusable, we will fall into the case below to resume the + // top activity in the next focusable task. + ActivityRecord next = topRunningActivity(true /* focusableOnly */); + + final boolean hasRunningActivity = next != null; + + // TODO: Maybe this entire condition can get removed? + if (hasRunningActivity && !isAttached()) { + return false; + } + + mRootWindowContainer.cancelInitializingActivities(); + + // Remember how we'll process this pause/resume situation, and ensure + // that the state is reset however we wind up proceeding. + boolean userLeaving = mStackSupervisor.mUserLeaving; + mStackSupervisor.mUserLeaving = false; + + if (!hasRunningActivity) { + // There are no activities left in the stack, let's look somewhere else. + return resumeNextFocusableActivityWhenStackIsEmpty(prev, options); + } + + next.delayedResume = false; + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + + // If the top activity is the resumed one, nothing to do. + if (mResumedActivity == next && next.isState(RESUMED) + && taskDisplayArea.allResumedActivitiesComplete()) { + // Make sure we have executed any pending transitions, since there + // should be nothing left to do at this point. + executeAppTransition(options); + if (DEBUG_STATES) Slog.d(TAG_STATES, + "resumeTopActivityLocked: Top activity resumed " + next); + return false; + } + + if (!next.canResumeByCompat()) { + return false; + } + + // If we are currently pausing an activity, then don't do anything until that is done. + final boolean allPausedComplete = mRootWindowContainer.allPausedActivitiesComplete(); + if (!allPausedComplete) { + if (DEBUG_SWITCH || DEBUG_PAUSE || DEBUG_STATES) { + Slog.v(TAG_PAUSE, "resumeTopActivityLocked: Skip resume: some activity pausing."); + } + return false; + } + + // If we are sleeping, and there is no resumed activity, and the top activity is paused, + // well that is the state we want. + if (shouldSleepOrShutDownActivities() + && mLastPausedActivity == next + && mRootWindowContainer.allPausedActivitiesComplete()) { + // If the current top activity may be able to occlude keyguard but the occluded state + // has not been set, update visibility and check again if we should continue to resume. + boolean nothingToResume = true; + if (!mAtmService.mShuttingDown) { + final boolean canShowWhenLocked = !mTopActivityOccludesKeyguard + && next.canShowWhenLocked(); + final boolean mayDismissKeyguard = mTopDismissingKeyguardActivity != next + && next.containsDismissKeyguardWindow(); + + if (canShowWhenLocked || mayDismissKeyguard) { + ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, + !PRESERVE_WINDOWS); + nothingToResume = shouldSleepActivities(); + } else if (next.currentLaunchCanTurnScreenOn() && next.canTurnScreenOn()) { + nothingToResume = false; + } + } + if (nothingToResume) { + // Make sure we have executed any pending transitions, since there + // should be nothing left to do at this point. + executeAppTransition(options); + if (DEBUG_STATES) Slog.d(TAG_STATES, + "resumeTopActivityLocked: Going to sleep and all paused"); + return false; + } + } + + // Make sure that the user who owns this activity is started. If not, + // we will just leave it as is because someone should be bringing + // another user's activities to the top of the stack. + if (!mAtmService.mAmInternal.hasStartedUserState(next.mUserId)) { + Slog.w(TAG, "Skipping resume of top activity " + next + + ": user " + next.mUserId + " is stopped"); + return false; + } + + // The activity may be waiting for stop, but that is no longer + // appropriate for it. + mStackSupervisor.mStoppingActivities.remove(next); + next.setSleeping(false); + + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resuming " + next); + + // If we are currently pausing an activity, then don't do anything until that is done. + if (!mRootWindowContainer.allPausedActivitiesComplete()) { + if (DEBUG_SWITCH || DEBUG_PAUSE || DEBUG_STATES) Slog.v(TAG_PAUSE, + "resumeTopActivityLocked: Skip resume: some activity pausing."); + + return false; + } + + mStackSupervisor.setLaunchSource(next.info.applicationInfo.uid); + + ActivityRecord lastResumed = null; + final Task lastFocusedStack = taskDisplayArea.getLastFocusedStack(); + if (lastFocusedStack != null && lastFocusedStack != this) { + // So, why aren't we using prev here??? See the param comment on the method. prev + // doesn't represent the last resumed activity. However, the last focus stack does if + // it isn't null. + lastResumed = lastFocusedStack.mResumedActivity; + if (userLeaving && inMultiWindowMode() && lastFocusedStack.shouldBeVisible(next)) { + // The user isn't leaving if this stack is the multi-window mode and the last + // focused stack should still be visible. + if(DEBUG_USER_LEAVING) Slog.i(TAG_USER_LEAVING, "Overriding userLeaving to false" + + " next=" + next + " lastResumed=" + lastResumed); + userLeaving = false; + } + } + + boolean pausing = taskDisplayArea.pauseBackStacks(userLeaving, next); + if (mResumedActivity != null) { + if (DEBUG_STATES) Slog.d(TAG_STATES, + "resumeTopActivityLocked: Pausing " + mResumedActivity); + pausing |= startPausingLocked(userLeaving, false /* uiSleeping */, next); + } + if (pausing) { + if (DEBUG_SWITCH || DEBUG_STATES) Slog.v(TAG_STATES, + "resumeTopActivityLocked: Skip resume: need to start pausing"); + // At this point we want to put the upcoming activity's process + // at the top of the LRU list, since we know we will be needing it + // very soon and it would be a waste to let it get killed if it + // happens to be sitting towards the end. + if (next.attachedToProcess()) { + next.app.updateProcessInfo(false /* updateServiceConnectionActivities */, + true /* activityChange */, false /* updateOomAdj */, + false /* addPendingTopUid */); + } else if (!next.isProcessRunning()) { + // Since the start-process is asynchronous, if we already know the process of next + // activity isn't running, we can start the process earlier to save the time to wait + // for the current activity to be paused. + final boolean isTop = this == taskDisplayArea.getFocusedStack(); + mAtmService.startProcessAsync(next, false /* knownToBeDead */, isTop, + isTop ? "pre-top-activity" : "pre-activity"); + } + if (lastResumed != null) { + lastResumed.setWillCloseOrEnterPip(true); + } + return true; + } else if (mResumedActivity == next && next.isState(RESUMED) + && taskDisplayArea.allResumedActivitiesComplete()) { + // It is possible for the activity to be resumed when we paused back stacks above if the + // next activity doesn't have to wait for pause to complete. + // So, nothing else to-do except: + // Make sure we have executed any pending transitions, since there + // should be nothing left to do at this point. + executeAppTransition(options); + if (DEBUG_STATES) Slog.d(TAG_STATES, + "resumeTopActivityLocked: Top activity resumed (dontWaitForPause) " + next); + return true; + } + + // If the most recent activity was noHistory but was only stopped rather + // than stopped+finished because the device went to sleep, we need to make + // sure to finish it as we're making a new activity topmost. + if (shouldSleepActivities() && mLastNoHistoryActivity != null && + !mLastNoHistoryActivity.finishing) { + if (DEBUG_STATES) Slog.d(TAG_STATES, + "no-history finish of " + mLastNoHistoryActivity + " on new resume"); + mLastNoHistoryActivity.finishIfPossible("resume-no-history", false /* oomAdj */); + mLastNoHistoryActivity = null; + } + + if (prev != null && prev != next && next.nowVisible) { + + // The next activity is already visible, so hide the previous + // activity's windows right now so we can show the new one ASAP. + // We only do this if the previous is finishing, which should mean + // it is on top of the one being resumed so hiding it quickly + // is good. Otherwise, we want to do the normal route of allowing + // the resumed activity to be shown so we can decide if the + // previous should actually be hidden depending on whether the + // new one is found to be full-screen or not. + if (prev.finishing) { + prev.setVisibility(false); + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, + "Not waiting for visible to hide: " + prev + + ", nowVisible=" + next.nowVisible); + } else { + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, + "Previous already visible but still waiting to hide: " + prev + + ", nowVisible=" + next.nowVisible); + } + + } + + // Launching this app's activity, make sure the app is no longer + // considered stopped. + try { + mAtmService.getPackageManager().setPackageStoppedState( + next.packageName, false, next.mUserId); /* TODO: Verify if correct userid */ + } catch (RemoteException e1) { + } catch (IllegalArgumentException e) { + Slog.w(TAG, "Failed trying to unstop package " + + next.packageName + ": " + e); + } + + // We are starting up the next activity, so tell the window manager + // that the previous one will be hidden soon. This way it can know + // to ignore it when computing the desired screen orientation. + boolean anim = true; + final DisplayContent dc = taskDisplayArea.mDisplayContent; + if (prev != null) { + if (prev.finishing) { + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, + "Prepare close transition: prev=" + prev); + if (mStackSupervisor.mNoAnimActivities.contains(prev)) { + anim = false; + dc.prepareAppTransition(TRANSIT_NONE, false); + } else { + dc.prepareAppTransition( + prev.getTask() == next.getTask() ? TRANSIT_ACTIVITY_CLOSE + : TRANSIT_TASK_CLOSE, false); + } + prev.setVisibility(false); + } else { + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, + "Prepare open transition: prev=" + prev); + if (mStackSupervisor.mNoAnimActivities.contains(next)) { + anim = false; + dc.prepareAppTransition(TRANSIT_NONE, false); + } else { + dc.prepareAppTransition( + prev.getTask() == next.getTask() ? TRANSIT_ACTIVITY_OPEN + : next.mLaunchTaskBehind ? TRANSIT_TASK_OPEN_BEHIND + : TRANSIT_TASK_OPEN, false); + } + } + } else { + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare open transition: no previous"); + if (mStackSupervisor.mNoAnimActivities.contains(next)) { + anim = false; + dc.prepareAppTransition(TRANSIT_NONE, false); + } else { + dc.prepareAppTransition(TRANSIT_ACTIVITY_OPEN, false); + } + } + + if (anim) { + next.applyOptionsLocked(); + } else { + next.clearOptionsLocked(); + } + + mStackSupervisor.mNoAnimActivities.clear(); + + if (next.attachedToProcess()) { + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resume running: " + next + + " stopped=" + next.stopped + + " visibleRequested=" + next.mVisibleRequested); + + // If the previous activity is translucent, force a visibility update of + // the next activity, so that it's added to WM's opening app list, and + // transition animation can be set up properly. + // For example, pressing Home button with a translucent activity in focus. + // Launcher is already visible in this case. If we don't add it to opening + // apps, maybeUpdateTransitToWallpaper() will fail to identify this as a + // TRANSIT_WALLPAPER_OPEN animation, and run some funny animation. + final boolean lastActivityTranslucent = lastFocusedStack != null + && (lastFocusedStack.inMultiWindowMode() + || (lastFocusedStack.mLastPausedActivity != null + && !lastFocusedStack.mLastPausedActivity.occludesParent())); + + // This activity is now becoming visible. + if (!next.mVisibleRequested || next.stopped || lastActivityTranslucent) { + next.setVisibility(true); + } + + // schedule launch ticks to collect information about slow apps. + next.startLaunchTickingLocked(); + + ActivityRecord lastResumedActivity = + lastFocusedStack == null ? null : lastFocusedStack.mResumedActivity; + final ActivityState lastState = next.getState(); + + mAtmService.updateCpuStats(); + + if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to RESUMED: " + next + + " (in existing)"); + + next.setState(RESUMED, "resumeTopActivityInnerLocked"); + + next.app.updateProcessInfo(false /* updateServiceConnectionActivities */, + true /* activityChange */, true /* updateOomAdj */, + true /* addPendingTopUid */); + + // Have the window manager re-evaluate the orientation of + // the screen based on the new activity order. + boolean notUpdated = true; + + // Activity should also be visible if set mLaunchTaskBehind to true (see + // ActivityRecord#shouldBeVisibleIgnoringKeyguard()). + if (shouldBeVisible(next)) { + // We have special rotation behavior when here is some active activity that + // requests specific orientation or Keyguard is locked. Make sure all activity + // visibilities are set correctly as well as the transition is updated if needed + // to get the correct rotation behavior. Otherwise the following call to update + // the orientation may cause incorrect configurations delivered to client as a + // result of invisible window resize. + // TODO: Remove this once visibilities are set correctly immediately when + // starting an activity. + notUpdated = !mRootWindowContainer.ensureVisibilityAndConfig(next, getDisplayId(), + true /* markFrozenIfConfigChanged */, false /* deferResume */); + } + + if (notUpdated) { + // The configuration update wasn't able to keep the existing + // instance of the activity, and instead started a new one. + // We should be all done, but let's just make sure our activity + // is still at the top and schedule another run if something + // weird happened. + ActivityRecord nextNext = topRunningActivity(); + if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG_STATES, + "Activity config changed during resume: " + next + + ", new next: " + nextNext); + if (nextNext != next) { + // Do over! + mStackSupervisor.scheduleResumeTopActivities(); + } + if (!next.mVisibleRequested || next.stopped) { + next.setVisibility(true); + } + next.completeResumeLocked(); + return true; + } + + try { + final ClientTransaction transaction = + ClientTransaction.obtain(next.app.getThread(), next.appToken); + // Deliver all pending results. + ArrayList<ResultInfo> a = next.results; + if (a != null) { + final int N = a.size(); + if (!next.finishing && N > 0) { + if (DEBUG_RESULTS) Slog.v(TAG_RESULTS, + "Delivering results to " + next + ": " + a); + transaction.addCallback(ActivityResultItem.obtain(a)); + } + } + + if (next.newIntents != null) { + transaction.addCallback( + NewIntentItem.obtain(next.newIntents, true /* resume */)); + } + + // Well the app will no longer be stopped. + // Clear app token stopped state in window manager if needed. + next.notifyAppResumed(next.stopped); + + EventLogTags.writeWmResumeActivity(next.mUserId, System.identityHashCode(next), + next.getTask().mTaskId, next.shortComponentName); + + next.setSleeping(false); + mAtmService.getAppWarningsLocked().onResumeActivity(next); + next.app.setPendingUiCleanAndForceProcessStateUpTo(mAtmService.mTopProcessState); + next.clearOptionsLocked(); + transaction.setLifecycleStateRequest( + ResumeActivityItem.obtain(next.app.getReportedProcState(), + dc.isNextTransitionForward())); + mAtmService.getLifecycleManager().scheduleTransaction(transaction); + + if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Resumed " + + next); + } catch (Exception e) { + // Whoops, need to restart this activity! + if (DEBUG_STATES) Slog.v(TAG_STATES, "Resume failed; resetting state to " + + lastState + ": " + next); + next.setState(lastState, "resumeTopActivityInnerLocked"); + + // lastResumedActivity being non-null implies there is a lastStack present. + if (lastResumedActivity != null) { + lastResumedActivity.setState(RESUMED, "resumeTopActivityInnerLocked"); + } + + Slog.i(TAG, "Restarting because process died: " + next); + if (!next.hasBeenLaunched) { + next.hasBeenLaunched = true; + } else if (SHOW_APP_STARTING_PREVIEW && lastFocusedStack != null + && lastFocusedStack.isTopStackInDisplayArea()) { + next.showStartingWindow(null /* prev */, false /* newTask */, + false /* taskSwitch */); + } + mStackSupervisor.startSpecificActivity(next, true, false); + return true; + } + + // From this point on, if something goes wrong there is no way + // to recover the activity. + try { + next.completeResumeLocked(); + } catch (Exception e) { + // If any exception gets thrown, toss away this + // activity and try the next one. + Slog.w(TAG, "Exception thrown during resume of " + next, e); + next.finishIfPossible("resume-exception", true /* oomAdj */); + return true; + } + } else { + // Whoops, need to restart this activity! + if (!next.hasBeenLaunched) { + next.hasBeenLaunched = true; + } else { + if (SHOW_APP_STARTING_PREVIEW) { + next.showStartingWindow(null /* prev */, false /* newTask */, + false /* taskSwich */); + } + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Restarting: " + next); + } + if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Restarting " + next); + mStackSupervisor.startSpecificActivity(next, true, true); + } + + return true; + } + + /** + * Resume the next eligible activity in a focusable stack when this one does not have any + * running activities left. The focus will be adjusted to the next focusable stack and + * top running activities will be resumed in all focusable stacks. However, if the current stack + * is a home stack - we have to keep it focused, start and resume a home activity on the current + * display instead to make sure that the display is not empty. + */ + private boolean resumeNextFocusableActivityWhenStackIsEmpty(ActivityRecord prev, + ActivityOptions options) { + final String reason = "noMoreActivities"; + + if (!isActivityTypeHome()) { + final Task nextFocusedStack = adjustFocusToNextFocusableTask(reason); + if (nextFocusedStack != null) { + // Try to move focus to the next visible stack with a running activity if this + // stack is not covering the entire screen or is on a secondary display with no home + // stack. + return mRootWindowContainer.resumeFocusedStacksTopActivities(nextFocusedStack, + prev, null /* targetOptions */); + } + } + + // If the current stack is a home stack, or if focus didn't switch to a different stack - + // just start up the Launcher... + ActivityOptions.abort(options); + if (DEBUG_STATES) Slog.d(TAG_STATES, + "resumeNextFocusableActivityWhenStackIsEmpty: " + reason + ", go home"); + return mRootWindowContainer.resumeHomeActivity(prev, reason, getDisplayArea()); + } + + void startActivityLocked(ActivityRecord r, ActivityRecord focusedTopActivity, + boolean newTask, boolean keepCurTransition, ActivityOptions options) { + Task rTask = r.getTask(); + final boolean allowMoveToFront = options == null || !options.getAvoidMoveToFront(); + final boolean isOrhasTask = rTask == this || hasChild(rTask); + // mLaunchTaskBehind tasks get placed at the back of the task stack. + if (!r.mLaunchTaskBehind && allowMoveToFront && (!isOrhasTask || newTask)) { + // Last activity in task had been removed or ActivityManagerService is reusing task. + // Insert or replace. + // Might not even be in. + positionChildAtTop(rTask); + } + Task task = null; + if (!newTask && isOrhasTask) { + // Starting activity cannot be occluding activity, otherwise starting window could be + // remove immediately without transferring to starting activity. + final ActivityRecord occludingActivity = getOccludingActivityAbove(r); + if (occludingActivity != null) { + // Here it is! Now, if this is not yet visible (occluded by another task) to the + // user, then just add it without starting; it will get started when the user + // navigates back to it. + if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to task " + task, + new RuntimeException("here").fillInStackTrace()); + rTask.positionChildAtTop(r); + ActivityOptions.abort(options); + return; + } + } + + // Place a new activity at top of stack, so it is next to interact with the user. + + // If we are not placing the new activity frontmost, we do not want to deliver the + // onUserLeaving callback to the actual frontmost activity + final Task activityTask = r.getTask(); + if (task == activityTask && mChildren.indexOf(task) != (getChildCount() - 1)) { + mStackSupervisor.mUserLeaving = false; + if (DEBUG_USER_LEAVING) Slog.v(TAG_USER_LEAVING, + "startActivity() behind front, mUserLeaving=false"); + } + + task = activityTask; + + // Slot the activity into the history stack and proceed + if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to stack to task " + task, + new RuntimeException("here").fillInStackTrace()); + task.positionChildAtTop(r); + + // The transition animation and starting window are not needed if {@code allowMoveToFront} + // is false, because the activity won't be visible. + if ((!isHomeOrRecentsStack() || hasActivity()) && allowMoveToFront) { + final DisplayContent dc = getDisplay().mDisplayContent; + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, + "Prepare open transition: starting " + r); + if ((r.intent.getFlags() & Intent.FLAG_ACTIVITY_NO_ANIMATION) != 0) { + dc.prepareAppTransition(TRANSIT_NONE, keepCurTransition); + mStackSupervisor.mNoAnimActivities.add(r); + } else { + int transit = TRANSIT_ACTIVITY_OPEN; + if (newTask) { + if (r.mLaunchTaskBehind) { + transit = TRANSIT_TASK_OPEN_BEHIND; + } else if (getDisplay().isSingleTaskInstance()) { + // If a new task is being launched in a single task display, we don't need + // to play normal animation, but need to trigger a callback when an app + // transition is actually handled. So ignore already prepared activity, and + // override it. + transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY; + keepCurTransition = false; + } else { + // If a new task is being launched, then mark the existing top activity as + // supporting picture-in-picture while pausing only if the starting activity + // would not be considered an overlay on top of the current activity + // (eg. not fullscreen, or the assistant) + if (canEnterPipOnTaskSwitch(focusedTopActivity, + null /* toFrontTask */, r, options)) { + focusedTopActivity.supportsEnterPipOnTaskSwitch = true; + } + transit = TRANSIT_TASK_OPEN; + } + } + dc.prepareAppTransition(transit, keepCurTransition); + mStackSupervisor.mNoAnimActivities.remove(r); + } + boolean doShow = true; + if (newTask) { + // Even though this activity is starting fresh, we still need + // to reset it to make sure we apply affinities to move any + // existing activities from other tasks in to it. + // If the caller has requested that the target task be + // reset, then do so. + if ((r.intent.getFlags() & Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) != 0) { + resetTaskIfNeeded(r, r); + doShow = topRunningNonDelayedActivityLocked(null) == r; + } + } else if (options != null && options.getAnimationType() + == ActivityOptions.ANIM_SCENE_TRANSITION) { + doShow = false; + } + if (r.mLaunchTaskBehind) { + // Don't do a starting window for mLaunchTaskBehind. More importantly make sure we + // tell WindowManager that r is visible even though it is at the back of the stack. + r.setVisibility(true); + ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); + // Go ahead to execute app transition for this activity since the app transition + // will not be triggered through the resume channel. + getDisplay().mDisplayContent.executeAppTransition(); + } else if (SHOW_APP_STARTING_PREVIEW && doShow) { + // Figure out if we are transitioning from another activity that is + // "has the same starting icon" as the next one. This allows the + // window manager to keep the previous window it had previously + // created, if it still had one. + Task prevTask = r.getTask(); + ActivityRecord prev = prevTask.topActivityWithStartingWindow(); + if (prev != null) { + // We don't want to reuse the previous starting preview if: + // (1) The current activity is in a different task. + if (prev.getTask() != prevTask) { + prev = null; + } + // (2) The current activity is already displayed. + else if (prev.nowVisible) { + prev = null; + } + } + r.showStartingWindow(prev, newTask, isTaskSwitch(r, focusedTopActivity)); + } + } else { + // If this is the first activity, don't do any fancy animations, + // because there is nothing for it to animate on top of. + ActivityOptions.abort(options); + } + } + + /** + * @return Whether the switch to another task can trigger the currently running activity to + * enter PiP while it is pausing (if supported). Only one of {@param toFrontTask} or + * {@param toFrontActivity} should be set. + */ + private boolean canEnterPipOnTaskSwitch(ActivityRecord pipCandidate, + Task toFrontTask, ActivityRecord toFrontActivity, ActivityOptions opts) { + if (opts != null && opts.disallowEnterPictureInPictureWhileLaunching()) { + // Ensure the caller has requested not to trigger auto-enter PiP + return false; + } + if (pipCandidate == null || pipCandidate.inPinnedWindowingMode()) { + // Ensure that we do not trigger entering PiP an activity on the pinned stack + return false; + } + final Task targetStack = toFrontTask != null + ? toFrontTask.getRootTask() : toFrontActivity.getRootTask(); + if (targetStack != null && targetStack.isActivityTypeAssistant()) { + // Ensure the task/activity being brought forward is not the assistant + return false; + } + return true; + } + + private boolean isTaskSwitch(ActivityRecord r, ActivityRecord topFocusedActivity) { + return topFocusedActivity != null && r.getTask() != topFocusedActivity.getTask(); + } + + /** + * Reset the task by reparenting the activities that have same affinity to the task or + * reparenting the activities that have different affinityies out of the task, while these + * activities allow task reparenting. + * + * @param taskTop Top activity of the task might be reset. + * @param newActivity The activity that going to be started. + * @return The non-finishing top activity of the task after reset or the original task top + * activity if all activities within the task are finishing. + */ + ActivityRecord resetTaskIfNeeded(ActivityRecord taskTop, ActivityRecord newActivity) { + final boolean forceReset = + (newActivity.info.flags & ActivityInfo.FLAG_CLEAR_TASK_ON_LAUNCH) != 0; + final Task task = taskTop.getTask(); + + // If ActivityOptions are moved out and need to be aborted or moved to taskTop. + final ActivityOptions topOptions = sResetTargetTaskHelper.process(task, forceReset); + + if (mChildren.contains(task)) { + final ActivityRecord newTop = task.getTopNonFinishingActivity(); + if (newTop != null) { + taskTop = newTop; + } + } + + if (topOptions != null) { + // If we got some ActivityOptions from an activity on top that + // was removed from the task, propagate them to the new real top. + taskTop.updateOptionsLocked(topOptions); + } + + return taskTop; + } + + /** + * Finish the topmost activity that belongs to the crashed app. We may also finish the activity + * that requested launch of the crashed one to prevent launch-crash loop. + * @param app The app that crashed. + * @param reason Reason to perform this action. + * @return The task that was finished in this stack, {@code null} if top running activity does + * not belong to the crashed app. + */ + final Task finishTopCrashedActivityLocked(WindowProcessController app, String reason) { + final ActivityRecord r = topRunningActivity(); + if (r == null || r.app != app) { + return null; + } + if (r.isActivityTypeHome() && mAtmService.mHomeProcess == app) { + // Home activities should not be force-finished as we have nothing else to go + // back to. AppErrors will get to it after two crashes in MIN_CRASH_INTERVAL. + Slog.w(TAG, " Not force finishing home activity " + + r.intent.getComponent().flattenToShortString()); + return null; + } + Slog.w(TAG, " Force finishing activity " + + r.intent.getComponent().flattenToShortString()); + Task finishedTask = r.getTask(); + getDisplay().mDisplayContent.prepareAppTransition( + TRANSIT_CRASHING_ACTIVITY_CLOSE, false /* alwaysKeepCurrent */); + r.finishIfPossible(reason, false /* oomAdj */); + + // Also terminate any activities below it that aren't yet stopped, to avoid a situation + // where one will get re-start our crashing activity once it gets resumed again. + final ActivityRecord activityBelow = getActivityBelow(r); + if (activityBelow != null) { + if (activityBelow.isState(STARTED, RESUMED, PAUSING, PAUSED)) { + if (!activityBelow.isActivityTypeHome() + || mAtmService.mHomeProcess != activityBelow.app) { + Slog.w(TAG, " Force finishing activity " + + activityBelow.intent.getComponent().flattenToShortString()); + activityBelow.finishIfPossible(reason, false /* oomAdj */); + } + } + } + + return finishedTask; + } + + void finishVoiceTask(IVoiceInteractionSession session) { + final PooledConsumer c = PooledLambda.obtainConsumer(Task::finishIfVoiceTask, + PooledLambda.__(Task.class), session.asBinder()); + forAllLeafTasks(c, true /* traverseTopToBottom */); + c.recycle(); + } + + private static void finishIfVoiceTask(Task tr, IBinder binder) { + if (tr.voiceSession != null && tr.voiceSession.asBinder() == binder) { + tr.forAllActivities((r) -> { + if (r.finishing) return; + r.finishIfPossible("finish-voice", false /* oomAdj */); + tr.mAtmService.updateOomAdj(); + }); + } else { + // Check if any of the activities are using voice + final PooledFunction f = PooledLambda.obtainFunction( + Task::finishIfVoiceActivity, PooledLambda.__(ActivityRecord.class), + binder); + tr.forAllActivities(f); + f.recycle(); + } + } + + private static boolean finishIfVoiceActivity(ActivityRecord r, IBinder binder) { + if (r.voiceSession == null || r.voiceSession.asBinder() != binder) return false; + // Inform of cancellation + r.clearVoiceSessionLocked(); + try { + r.app.getThread().scheduleLocalVoiceInteractionStarted(r.appToken, null); + } catch (RemoteException re) { + // Ok Boomer... + } + r.mAtmService.finishRunningVoiceLocked(); + return true; + } + + /** Finish all activities in the stack without waiting. */ + void finishAllActivitiesImmediately() { + if (!hasChild()) { + removeIfPossible(); + return; + } + forAllActivities((r) -> { + Slog.d(TAG, "finishAllActivitiesImmediatelyLocked: finishing " + r); + r.destroyIfPossible("finishAllActivitiesImmediately"); + }); + } + + /** @return true if the stack behind this one is a standard activity type. */ + private boolean inFrontOfStandardStack() { + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + if (taskDisplayArea == null) { + return false; + } + final int index = taskDisplayArea.getIndexOf(this); + if (index == 0) { + return false; + } + final Task stackBehind = taskDisplayArea.getChildAt(index - 1); + return stackBehind.isActivityTypeStandard(); + } + + boolean shouldUpRecreateTaskLocked(ActivityRecord srec, String destAffinity) { + // Basic case: for simple app-centric recents, we need to recreate + // the task if the affinity has changed. + + final String affinity = ActivityRecord.getTaskAffinityWithUid(destAffinity, srec.getUid()); + if (srec == null || srec.getTask().affinity == null + || !srec.getTask().affinity.equals(affinity)) { + return true; + } + // Document-centric case: an app may be split in to multiple documents; + // they need to re-create their task if this current activity is the root + // of a document, unless simply finishing it will return them to the + // correct app behind. + final Task task = srec.getTask(); + if (srec.isRootOfTask() && task.getBaseIntent() != null + && task.getBaseIntent().isDocument()) { + // Okay, this activity is at the root of its task. What to do, what to do... + if (!inFrontOfStandardStack()) { + // Finishing won't return to an application, so we need to recreate. + return true; + } + // We now need to get the task below it to determine what to do. + final Task prevTask = getTaskBelow(task); + if (prevTask == null) { + Slog.w(TAG, "shouldUpRecreateTask: task not in history for " + srec); + return false; + } + if (!task.affinity.equals(prevTask.affinity)) { + // These are different apps, so need to recreate. + return true; + } + } + return false; + } + + boolean navigateUpTo(ActivityRecord srec, Intent destIntent, NeededUriGrants destGrants, + int resultCode, Intent resultData, NeededUriGrants resultGrants) { + if (!srec.attachedToProcess()) { + // Nothing to do if the caller is not attached, because this method should be called + // from an alive activity. + return false; + } + final Task task = srec.getTask(); + if (!srec.isDescendantOf(this)) { + return false; + } + + ActivityRecord parent = task.getActivityBelow(srec); + boolean foundParentInTask = false; + final ComponentName dest = destIntent.getComponent(); + if (task.getBottomMostActivity() != srec && dest != null) { + final ActivityRecord candidate = task.getActivity( + (ar) -> ar.info.packageName.equals(dest.getPackageName()) + && ar.info.name.equals(dest.getClassName()), srec, + false /*includeBoundary*/, true /*traverseTopToBottom*/); + if (candidate != null) { + parent = candidate; + foundParentInTask = true; + } + } + + // TODO: There is a dup. of this block of code in ActivityTaskManagerService.finishActivity + // We should consolidate. + IActivityController controller = mAtmService.mController; + if (controller != null) { + ActivityRecord next = topRunningActivity(srec.appToken, INVALID_TASK_ID); + if (next != null) { + // ask watcher if this is allowed + boolean resumeOK = true; + try { + resumeOK = controller.activityResuming(next.packageName); + } catch (RemoteException e) { + mAtmService.mController = null; + Watchdog.getInstance().setActivityController(null); + } + + if (!resumeOK) { + return false; + } + } + } + final long origId = Binder.clearCallingIdentity(); + + final int[] resultCodeHolder = new int[1]; + resultCodeHolder[0] = resultCode; + final Intent[] resultDataHolder = new Intent[1]; + resultDataHolder[0] = resultData; + final NeededUriGrants[] resultGrantsHolder = new NeededUriGrants[1]; + resultGrantsHolder[0] = resultGrants; + final ActivityRecord finalParent = parent; + task.forAllActivities((ar) -> { + if (ar == finalParent) return true; + + ar.finishIfPossible(resultCodeHolder[0], resultDataHolder[0], resultGrantsHolder[0], + "navigate-up", true /* oomAdj */); + // Only return the supplied result for the first activity finished + resultCodeHolder[0] = Activity.RESULT_CANCELED; + resultDataHolder[0] = null; + return false; + }, srec, true, true); + resultCode = resultCodeHolder[0]; + resultData = resultDataHolder[0]; + + if (parent != null && foundParentInTask) { + final int callingUid = srec.info.applicationInfo.uid; + final int parentLaunchMode = parent.info.launchMode; + final int destIntentFlags = destIntent.getFlags(); + if (parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TASK || + parentLaunchMode == ActivityInfo.LAUNCH_SINGLE_TOP || + (destIntentFlags & Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { + parent.deliverNewIntentLocked(callingUid, destIntent, destGrants, srec.packageName); + } else { + try { + ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo( + destIntent.getComponent(), ActivityManagerService.STOCK_PM_FLAGS, + srec.mUserId); + // TODO(b/64750076): Check if calling pid should really be -1. + final int res = mAtmService.getActivityStartController() + .obtainStarter(destIntent, "navigateUpTo") + .setCaller(srec.app.getThread()) + .setActivityInfo(aInfo) + .setResultTo(parent.appToken) + .setCallingPid(-1) + .setCallingUid(callingUid) + .setCallingPackage(srec.packageName) + .setCallingFeatureId(parent.launchedFromFeatureId) + .setRealCallingPid(-1) + .setRealCallingUid(callingUid) + .setComponentSpecified(true) + .execute(); + foundParentInTask = res == ActivityManager.START_SUCCESS; + } catch (RemoteException e) { + foundParentInTask = false; + } + parent.finishIfPossible(resultCode, resultData, resultGrants, + "navigate-top", true /* oomAdj */); + } + } + Binder.restoreCallingIdentity(origId); + return foundParentInTask; + } + + void removeLaunchTickMessages() { + forAllActivities(ActivityRecord::removeLaunchTickRunnable); + } + + private void updateTransitLocked(int transit, ActivityOptions options, boolean forceOverride) { + if (options != null) { + ActivityRecord r = topRunningActivity(); + if (r != null && !r.isState(RESUMED)) { + r.updateOptionsLocked(options); + } else { + ActivityOptions.abort(options); + } + } + getDisplay().mDisplayContent.prepareAppTransition(transit, false, + 0 /* flags */, forceOverride); + } + + final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options, + AppTimeTracker timeTracker, String reason) { + moveTaskToFront(tr, noAnimation, options, timeTracker, !DEFER_RESUME, reason); + } + + final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options, + AppTimeTracker timeTracker, boolean deferResume, String reason) { + if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "moveTaskToFront: " + tr); + + final Task topStack = getDisplayArea().getTopStack(); + final ActivityRecord topActivity = topStack != null + ? topStack.getTopNonFinishingActivity() : null; + + if (tr != this && !tr.isDescendantOf(this)) { + // nothing to do! + if (noAnimation) { + ActivityOptions.abort(options); + } else if (isSingleTaskInstance()) { + // When a task is moved front on the display which can only contain one task, start + // a special transition. + // {@link AppTransitionController#handleAppTransitionReady} later picks up the + // transition, and schedules + // {@link ITaskStackListener#onSingleTaskDisplayDrawn} callback which is triggered + // after contents are drawn on the display. + updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options, + true /* forceOverride */); + } else { + updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */); + } + return; + } + + if (timeTracker != null) { + // The caller wants a time tracker associated with this task. + final PooledConsumer c = PooledLambda.obtainConsumer(ActivityRecord::setAppTimeTracker, + PooledLambda.__(ActivityRecord.class), timeTracker); + tr.forAllActivities(c); + c.recycle(); + } + + try { + // Defer updating the IME target since the new IME target will try to get computed + // before updating all closing and opening apps, which can cause the ime target to + // get calculated incorrectly. + getDisplay().deferUpdateImeTarget(); + + // Shift all activities with this task up to the top + // of the stack, keeping them in the same internal order. + positionChildAtTop(tr); + + // Don't refocus if invisible to current user + final ActivityRecord top = tr.getTopNonFinishingActivity(); + if (top == null || !top.okToShowLocked()) { + if (top != null) { + mStackSupervisor.mRecentTasks.add(top.getTask()); + } + ActivityOptions.abort(options); + return; + } + + // Set focus to the top running activity of this stack. + final ActivityRecord r = topRunningActivity(); + if (r != null) { + r.moveFocusableActivityToTop(reason); + } + + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to front transition: task=" + tr); + if (noAnimation) { + getDisplay().mDisplayContent.prepareAppTransition(TRANSIT_NONE, false); + if (r != null) { + mStackSupervisor.mNoAnimActivities.add(r); + } + ActivityOptions.abort(options); + } else if (isSingleTaskInstance()) { + updateTransitLocked(TRANSIT_SHOW_SINGLE_TASK_DISPLAY, options, + true /* forceOverride */); + } else { + updateTransitLocked(TRANSIT_TASK_TO_FRONT, options, false /* forceOverride */); + } + + // If a new task is moved to the front, then mark the existing top activity as + // supporting + + // picture-in-picture while paused only if the task would not be considered an oerlay + // on top + // of the current activity (eg. not fullscreen, or the assistant) + if (canEnterPipOnTaskSwitch(topActivity, tr, null /* toFrontActivity */, + options)) { + topActivity.supportsEnterPipOnTaskSwitch = true; + } + + if (!deferResume) { + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + EventLogTags.writeWmTaskToFront(tr.mUserId, tr.mTaskId); + mAtmService.getTaskChangeNotificationController() + .notifyTaskMovedToFront(tr.getTaskInfo()); + } finally { + getDisplay().continueUpdateImeTarget(); + } + } + + /** + * Worker method for rearranging history stack. Implements the function of moving all + * activities for a specific task (gathering them if disjoint) into a single group at the + * bottom of the stack. + * + * If a watcher is installed, the action is preflighted and the watcher has an opportunity + * to premeptively cancel the move. + * + * @param tr The task to collect and move to the bottom. + * @return Returns true if the move completed, false if not. + */ + boolean moveTaskToBack(Task tr) { + Slog.i(TAG, "moveTaskToBack: " + tr); + + // In LockTask mode, moving a locked task to the back of the stack may expose unlocked + // ones. Therefore we need to check if this operation is allowed. + if (!mAtmService.getLockTaskController().canMoveTaskToBack(tr)) { + return false; + } + + // If we have a watcher, preflight the move before committing to it. First check + // for *other* available tasks, but if none are available, then try again allowing the + // current task to be selected. + if (isTopStackInDisplayArea() && mAtmService.mController != null) { + ActivityRecord next = topRunningActivity(null, tr.mTaskId); + if (next == null) { + next = topRunningActivity(null, INVALID_TASK_ID); + } + if (next != null) { + // ask watcher if this is allowed + boolean moveOK = true; + try { + moveOK = mAtmService.mController.activityResuming(next.packageName); + } catch (RemoteException e) { + mAtmService.mController = null; + Watchdog.getInstance().setActivityController(null); + } + if (!moveOK) { + return false; + } + } + } + + if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + + tr.mTaskId); + + getDisplay().mDisplayContent.prepareAppTransition(TRANSIT_TASK_TO_BACK, false); + moveToBack("moveTaskToBackLocked", tr); + + if (inPinnedWindowingMode()) { + mStackSupervisor.removeStack(this); + return true; + } + + mRootWindowContainer.ensureVisibilityAndConfig(null /* starting */, + getDisplay().mDisplayId, false /* markFrozenIfConfigChanged */, + false /* deferResume */); + + ActivityRecord topActivity = getDisplayArea().topRunningActivity(); + Task topStack = topActivity.getRootTask(); + if (topStack != null && topStack != this && topActivity.isState(RESUMED)) { + // Usually resuming a top activity triggers the next app transition, but nothing's got + // resumed in this case, so we need to execute it explicitly. + getDisplay().mDisplayContent.executeAppTransition(); + } else { + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + return true; + } + + /** + * Ensures all visible activities at or below the input activity have the right configuration. + */ + void ensureVisibleActivitiesConfiguration(ActivityRecord start, boolean preserveWindow) { + mEnsureVisibleActivitiesConfigHelper.process(start, preserveWindow); + } + + // TODO: Can only be called from special methods in ActivityStackSupervisor. + // Need to consolidate those calls points into this resize method so anyone can call directly. + void resize(Rect displayedBounds, boolean preserveWindows, boolean deferResume) { + Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "stack.resize_" + getRootTaskId()); + mAtmService.deferWindowLayout(); + try { + // TODO: Why not just set this on the stack directly vs. on each tasks? + // Update override configurations of all tasks in the stack. + final PooledConsumer c = PooledLambda.obtainConsumer( + Task::processTaskResizeBounds, PooledLambda.__(Task.class), + displayedBounds); + forAllTasks(c, true /* traverseTopToBottom */); + c.recycle(); + + if (mBoundsAnimating) { + // Force to update task surface bounds and relayout windows, since configBounds + // remains unchanged during bounds animation. + updateSurfaceBounds(); + getDisplay().setLayoutNeeded(); + mWmService.requestTraversal(); + } + + if (!deferResume) { + ensureVisibleActivitiesConfiguration(topRunningActivity(), preserveWindows); + } + } finally { + mAtmService.continueWindowLayout(); + Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); + } + } + + private static void processTaskResizeBounds(Task task, Rect displayedBounds) { + if (!task.isResizeable()) return; + + task.setBounds(displayedBounds); + } + + /** + * Until we can break this "set task bounds to same as stack bounds" behavior, this + * basically resizes both stack and task bounds to the same bounds. + */ + private void setTaskBounds(Rect bounds) { + final PooledConsumer c = PooledLambda.obtainConsumer(Task::setTaskBoundsInner, + PooledLambda.__(Task.class), bounds); + forAllLeafTasks(c, true /* traverseTopToBottom */); + c.recycle(); + } + + private static void setTaskBoundsInner(Task task, Rect bounds) { + task.setBounds(task.isResizeable() ? bounds : null); + } + + boolean willActivityBeVisible(IBinder token) { + final ActivityRecord r = ActivityRecord.forTokenLocked(token); + if (r == null) { + return false; + } + + // See if there is an occluding activity on-top of this one. + final ActivityRecord occludingActivity = getOccludingActivityAbove(r); + if (occludingActivity != null) return false; + + if (r.finishing) Slog.e(TAG, "willActivityBeVisible: Returning false," + + " would have returned true for r=" + r); + return !r.finishing; + } + + void unhandledBackLocked() { + final ActivityRecord topActivity = getTopMostActivity(); + if (DEBUG_SWITCH) Slog.d(TAG_SWITCH, + "Performing unhandledBack(): top activity: " + topActivity); + if (topActivity != null) { + topActivity.finishIfPossible("unhandled-back", true /* oomAdj */); + } + } + + /** + * Reset local parameters because an app's activity died. + * @param app The app of the activity that died. + * @return result from removeHistoryRecordsForAppLocked. + */ + boolean handleAppDied(WindowProcessController app) { + if (mPausingActivity != null && mPausingActivity.app == app) { + if (DEBUG_PAUSE || DEBUG_CLEANUP) Slog.v(TAG_PAUSE, + "App died while pausing: " + mPausingActivity); + mPausingActivity = null; + } + if (mLastPausedActivity != null && mLastPausedActivity.app == app) { + mLastPausedActivity = null; + mLastNoHistoryActivity = null; + } + + mStackSupervisor.removeHistoryRecords(app); + return mRemoveHistoryRecordsForApp.process(app); + } + + boolean dump(FileDescriptor fd, PrintWriter pw, boolean dumpAll, boolean dumpClient, + String dumpPackage, final boolean needSep) { + Runnable headerPrinter = () -> { + if (needSep) { + pw.println(); + } + pw.println(" Stack #" + getRootTaskId() + + ": type=" + activityTypeToString(getActivityType()) + + " mode=" + windowingModeToString(getWindowingMode())); + pw.println(" isSleeping=" + shouldSleepActivities()); + pw.println(" mBounds=" + getRequestedOverrideBounds()); + }; + + boolean printed = false; + + if (dumpPackage == null) { + // If we are not filtering by package, we want to print absolutely everything, + // so always print the header even if there are no tasks/activities inside. + headerPrinter.run(); + headerPrinter = null; + printed = true; + } + + printed |= printThisActivity(pw, mPausingActivity, dumpPackage, false, + " mPausingActivity: ", null); + printed |= printThisActivity(pw, getResumedActivity(), dumpPackage, false, + " mResumedActivity: ", null); + if (dumpAll) { + printed |= printThisActivity(pw, mLastPausedActivity, dumpPackage, false, + " mLastPausedActivity: ", null); + printed |= printThisActivity(pw, mLastNoHistoryActivity, dumpPackage, + false, " mLastNoHistoryActivity: ", null); + } + + printed |= dumpActivities(fd, pw, dumpAll, dumpClient, dumpPackage, false, headerPrinter); + + return printed; + } + + private boolean dumpActivities(FileDescriptor fd, PrintWriter pw, boolean dumpAll, + boolean dumpClient, String dumpPackage, boolean needSep, Runnable header) { + if (!hasChild()) { + return false; + } + final AtomicBoolean printedHeader = new AtomicBoolean(false); + final AtomicBoolean printed = new AtomicBoolean(false); + forAllLeafTasks((task) -> { + final String prefix = " "; + Runnable headerPrinter = () -> { + printed.set(true); + if (!printedHeader.get()) { + if (needSep) { + pw.println(""); + } + if (header != null) { + header.run(); + } + printedHeader.set(true); + } + pw.print(prefix); pw.print("* "); pw.println(task); + pw.print(prefix); pw.print(" mBounds="); + pw.println(task.getRequestedOverrideBounds()); + pw.print(prefix); pw.print(" mMinWidth="); pw.print(task.mMinWidth); + pw.print(" mMinHeight="); pw.println(task.mMinHeight); + if (mLastNonFullscreenBounds != null) { + pw.print(prefix); + pw.print(" mLastNonFullscreenBounds="); + pw.println(task.mLastNonFullscreenBounds); + } + task.dump(pw, prefix + " "); + }; + if (dumpPackage == null) { + // If we are not filtering by package, we want to print absolutely everything, + // so always print the header even if there are no activities inside. + headerPrinter.run(); + headerPrinter = null; + } + final ArrayList<ActivityRecord> activities = new ArrayList<>(); + // Add activities by traversing the hierarchy from bottom to top, since activities + // are dumped in reverse order in {@link ActivityStackSupervisor#dumpHistoryList()}. + task.forAllActivities((Consumer<ActivityRecord>) activities::add, + false /* traverseTopToBottom */); + dumpHistoryList(fd, pw, activities, prefix, "Hist", true, !dumpAll, dumpClient, + dumpPackage, false, headerPrinter, task); + }, true /* traverseTopToBottom */); + return printed.get(); + } + + ArrayList<ActivityRecord> getDumpActivitiesLocked(String name) { + ArrayList<ActivityRecord> activities = new ArrayList<>(); + + if ("all".equals(name)) { + forAllActivities((Consumer<ActivityRecord>) activities::add); + } else if ("top".equals(name)) { + final ActivityRecord topActivity = getTopMostActivity(); + if (topActivity != null) { + activities.add(topActivity); + } + } else { + ActivityManagerService.ItemMatcher matcher = new ActivityManagerService.ItemMatcher(); + matcher.build(name); + + forAllActivities((r) -> { + if (matcher.match(r, r.intent.getComponent())) { + activities.add(r); + } + }); + } + + return activities; + } + + ActivityRecord restartPackage(String packageName) { + ActivityRecord starting = topRunningActivity(); + + // All activities that came from the package must be + // restarted as if there was a config change. + PooledConsumer c = PooledLambda.obtainConsumer(Task::restartPackage, + PooledLambda.__(ActivityRecord.class), starting, packageName); + forAllActivities(c); + c.recycle(); + + return starting; + } + + private static void restartPackage( + ActivityRecord r, ActivityRecord starting, String packageName) { + if (r.info.packageName.equals(packageName)) { + r.forceNewConfig = true; + if (starting != null && r == starting && r.mVisibleRequested) { + r.startFreezingScreenLocked(CONFIG_SCREEN_LAYOUT); + } + } + } + + Task reuseOrCreateTask(ActivityInfo info, Intent intent, boolean toTop) { + return reuseOrCreateTask(info, intent, null /*voiceSession*/, null /*voiceInteractor*/, + toTop, null /*activity*/, null /*source*/, null /*options*/); + } + // TODO: Can be removed once we change callpoints creating stacks to be creating tasks. + /** Either returns this current task to be re-used or creates a new child task. */ + Task reuseOrCreateTask(ActivityInfo info, Intent intent, IVoiceInteractionSession voiceSession, + IVoiceInteractor voiceInteractor, boolean toTop, ActivityRecord activity, + ActivityRecord source, ActivityOptions options) { + + Task task; + if (DisplayContent.alwaysCreateStack(getWindowingMode(), getActivityType())) { + // This stack will only contain one task, so just return itself since all stacks ara now + // tasks and all tasks are now stacks. + task = reuseAsLeafTask(voiceSession, voiceInteractor, intent, info, activity); + } else { + // Create child task since this stack can contain multiple tasks. + final int taskId = activity != null + ? mStackSupervisor.getNextTaskIdForUser(activity.mUserId) + : mStackSupervisor.getNextTaskIdForUser(); + task = new Task(mAtmService, taskId, info, intent, voiceSession, + voiceInteractor, null /* taskDescription */, this); + + // add the task to stack first, mTaskPositioner might need the stack association + addChild(task, toTop, (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0); + } + + int displayId = getDisplayId(); + if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY; + final boolean isLockscreenShown = mAtmService.mStackSupervisor.getKeyguardController() + .isKeyguardOrAodShowing(displayId); + if (!mStackSupervisor.getLaunchParamsController() + .layoutTask(task, info.windowLayout, activity, source, options) + && !getRequestedOverrideBounds().isEmpty() + && task.isResizeable() && !isLockscreenShown) { + task.setBounds(getRequestedOverrideBounds()); + } + + return task; + } + + void addChild(WindowContainer child, final boolean toTop, boolean showForAllUsers) { + if (isSingleTaskInstance() && hasChild()) { + throw new IllegalStateException("Can only have one child on stack=" + this); + } + + Task task = child.asTask(); + try { + + if (task != null) { + task.setForceShowForAllUsers(showForAllUsers); + } + // We only want to move the parents to the parents if we are creating this task at the + // top of its stack. + addChild(child, toTop ? MAX_VALUE : 0, toTop /*moveParents*/); + } finally { + if (task != null) { + task.setForceShowForAllUsers(false); + } + } + } + + void positionChildAt(Task task, int position) { + if (task.getRootTask() != this) { + throw new IllegalArgumentException("AS.positionChildAt: task=" + task + + " is not a child of stack=" + this + " current parent=" + task.getRootTask()); + } + + task.updateOverrideConfigurationForStack(this); + + final ActivityRecord topRunningActivity = task.topRunningActivityLocked(); + final boolean wasResumed = topRunningActivity == task.getRootTask().mResumedActivity; + + boolean toTop = position >= getChildCount(); + boolean includingParents = toTop || getDisplayArea().getNextFocusableStack(this, + true /* ignoreCurrent */) == null; + if (WindowManagerDebugConfig.DEBUG_STACK) { + Slog.i(TAG_WM, "positionChildAt: positioning task=" + task + " at " + position); + } + positionChildAt(position, task, includingParents); + task.updateTaskMovement(toTop); + getDisplayContent().layoutAndAssignWindowLayersIfNeeded(); + + + // TODO: Investigate if this random code is really needed. + if (task.voiceSession != null) { + try { + task.voiceSession.taskStarted(task.intent, task.mTaskId); + } catch (RemoteException e) { + } + } + + if (wasResumed) { + if (mResumedActivity != null) { + Log.wtf(TAG, "mResumedActivity was already set when moving mResumedActivity from" + + " other stack to this stack mResumedActivity=" + mResumedActivity + + " other mResumedActivity=" + topRunningActivity); + } + topRunningActivity.setState(RESUMED, "positionChildAt"); + } + + // The task might have already been running and its visibility needs to be synchronized with + // the visibility of the stack / windows. + ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); + mRootWindowContainer.resumeFocusedStacksTopActivities(); + } + + public void setAlwaysOnTop(boolean alwaysOnTop) { + if (isAlwaysOnTop() == alwaysOnTop) { + return; + } + super.setAlwaysOnTop(alwaysOnTop); + final TaskDisplayArea taskDisplayArea = getDisplayArea(); + // positionChildAtTop() must be called even when always on top gets turned off because we + // need to make sure that the stack is moved from among always on top windows to below other + // always on top windows. Since the position the stack should be inserted into is calculated + // properly in {@link DisplayContent#getTopInsertPosition()} in both cases, we can just + // request that the stack is put at top here. + taskDisplayArea.positionStackAtTop(this, false /* includingParents */); + } + + /** NOTE: Should only be called from {@link Task#reparent}. */ + void moveToFrontAndResumeStateIfNeeded(ActivityRecord r, boolean moveToFront, boolean setResume, + boolean setPause, String reason) { + if (!moveToFront) { + return; + } + + final ActivityState origState = r.getState(); + // If the activity owns the last resumed activity, transfer that together, + // so that we don't resume the same activity again in the new stack. + // Apps may depend on onResume()/onPause() being called in pairs. + if (setResume) { + r.setState(RESUMED, "moveToFrontAndResumeStateIfNeeded"); + } + // If the activity was previously pausing, then ensure we transfer that as well + if (setPause) { + mPausingActivity = r; + r.schedulePauseTimeout(); + } + // Move the stack in which we are placing the activity to the front. + moveToFront(reason); + // If the original state is resumed, there is no state change to update focused app. + // So here makes sure the activity focus is set if it is the top. + if (origState == RESUMED && r == mRootWindowContainer.getTopResumedActivity()) { + mAtmService.setResumedActivityUncheckLocked(r, reason); + } + } + + void dismissPip() { + if (!isActivityTypeStandardOrUndefined()) { + throw new IllegalArgumentException( + "You can't move tasks from non-standard stacks."); + } + if (getWindowingMode() != WINDOWING_MODE_PINNED) { + throw new IllegalArgumentException( + "Can't exit pinned mode if it's not pinned already."); + } + + mWmService.inSurfaceTransaction(() -> { + final Task task = getBottomMostTask(); + setWindowingMode(WINDOWING_MODE_UNDEFINED); + + getDisplayArea().positionStackAtTop(this, false /* includingParents */); + + mStackSupervisor.scheduleUpdatePictureInPictureModeIfNeeded(task, this); + MetricsLoggerWrapper.logPictureInPictureFullScreen(mAtmService.mContext, + task.effectiveUid, task.realActivity.flattenToString()); + }); + } + + void prepareFreezingTaskBounds() { + forAllLeafTasks(Task::prepareFreezingBounds, true /* traverseTopToBottom */); + } + + private int setBounds(Rect existing, Rect bounds) { + if (equivalentBounds(existing, bounds)) { + return BOUNDS_CHANGE_NONE; + } + + final int result = super.setBounds(!inMultiWindowMode() ? null : bounds); + + updateSurfaceBounds(); + return result; + } + + @Override + public void getBounds(Rect bounds) { + bounds.set(getBounds()); + } + + /** + * @return the final bounds for the bounds animation. + */ + void getFinalAnimationBounds(Rect outBounds) { + outBounds.set(mBoundsAnimationTarget); + } + + /** + * @return the final source bounds for the bounds animation. + */ + void getFinalAnimationSourceHintBounds(Rect outBounds) { + outBounds.set(mBoundsAnimationSourceHintBounds); + } + + /** + * Put a Task in this stack. Used for adding only. + * When task is added to top of the stack, the entire branch of the hierarchy (including stack + * and display) will be brought to top. + * @param child The child to add. + * @param position Target position to add the task to. + */ + private void addChild(WindowContainer child, int position, boolean moveParents) { + // Add child task. + addChild(child, null); + + // Move child to a proper position, as some restriction for position might apply. + positionChildAt(position, child, moveParents /* includingParents */); + } + + void positionChildAtTop(Task child) { + if (child == null) { + // TODO: Fix the call-points that cause this to happen. + return; + } + + if (child == this) { + // TODO: Fix call-points + moveToFront("positionChildAtTop"); + return; + } + + positionChildAt(POSITION_TOP, child, true /* includingParents */); + child.updateTaskMovement(true); + + final DisplayContent displayContent = getDisplayContent(); + displayContent.layoutAndAssignWindowLayersIfNeeded(); + } + + void positionChildAtBottom(Task child) { + // If there are other focusable stacks on the display, the z-order of the display should not + // be changed just because a task was placed at the bottom. E.g. if it is moving the topmost + // task to bottom, the next focusable stack on the same display should be focused. + final Task nextFocusableStack = getDisplayArea().getNextFocusableStack( + child.getRootTask(), true /* ignoreCurrent */); + positionChildAtBottom(child, nextFocusableStack == null /* includingParents */); + child.updateTaskMovement(true); + } + + @VisibleForTesting + void positionChildAtBottom(Task child, boolean includingParents) { + if (child == null) { + // TODO: Fix the call-points that cause this to happen. + return; + } + + positionChildAt(POSITION_BOTTOM, child, includingParents); + getDisplayContent().layoutAndAssignWindowLayersIfNeeded(); + } + + @Override + void onChildPositionChanged(WindowContainer child) { + if (isOrganized()) { + mAtmService.mTaskOrganizerController.dispatchTaskInfoChanged(this, false /* force */); + } + + if (!mChildren.contains(child)) { + return; + } + + final boolean isTop = getTopChild() == child; + + final Task task = child.asTask(); + if (task != null) { + task.updateTaskMovement(isTop); + } + + if (isTop) { + final DisplayContent displayContent = getDisplayContent(); + displayContent.layoutAndAssignWindowLayersIfNeeded(); + } + } + + void reparent(TaskDisplayArea newParent, boolean onTop) { + reparent(newParent, onTop ? POSITION_TOP : POSITION_BOTTOM); + } + + private void updateSurfaceBounds() { + updateSurfaceSize(getSyncTransaction()); + updateSurfacePosition(); + scheduleAnimation(); + } + + @Override + void getRelativePosition(Point outPos) { + super.getRelativePosition(outPos); + final int outset = getTaskOutset(); + outPos.x -= outset; + outPos.y -= outset; + } + + boolean shouldIgnoreInput() { + if (inSplitScreenPrimaryWindowingMode() && !isFocusable()) { + return true; + } + if (mAtmService.mHasLeanbackFeature && inPinnedWindowingMode() + && !isFocusedStackOnDisplay()) { + // Preventing Picture-in-Picture stack from receiving input on TVs. + return true; + } + return false; + } + + /** + * Sets the current picture-in-picture aspect ratio. + */ + void setPictureInPictureAspectRatio(float aspectRatio) { + if (!mWmService.mAtmService.mSupportsPictureInPicture) { + return; + } + + final DisplayContent displayContent = getDisplayContent(); + if (displayContent == null) { + return; + } + + if (!inPinnedWindowingMode()) { + return; + } + + final PinnedStackController pinnedStackController = + getDisplayContent().getPinnedStackController(); + + if (Float.compare(aspectRatio, pinnedStackController.getAspectRatio()) == 0) { + return; + } + + // Notify the pinned stack controller about aspect ratio change. + // This would result a callback delivered from SystemUI to WM to start animation, + // if the bounds are ought to be altered due to aspect ratio change. + pinnedStackController.setAspectRatio( + pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio) + ? aspectRatio : -1f); + } + + /** + * Sets the current picture-in-picture actions. + */ + void setPictureInPictureActions(List<RemoteAction> actions) { + if (!mWmService.mAtmService.mSupportsPictureInPicture) { + return; + } + + if (!inPinnedWindowingMode()) { + return; + } + + getDisplayContent().getPinnedStackController().setActions(actions); + } + + public boolean isForceScaled() { + return mBoundsAnimating; + } + + /** Returns true if a removal action is still being deferred. */ + boolean handleCompleteDeferredRemoval() { + if (isAnimating(TRANSITION | CHILDREN)) { + return true; + } + + return super.handleCompleteDeferredRemoval(); + } + + public DisplayInfo getDisplayInfo() { + return mDisplayContent.getDisplayInfo(); + } + + AnimatingActivityRegistry getAnimatingActivityRegistry() { + return mAnimatingActivityRegistry; + } + + void executeAppTransition(ActivityOptions options) { + getDisplay().mDisplayContent.executeAppTransition(); + ActivityOptions.abort(options); + } + + boolean shouldSleepActivities() { + final DisplayContent display = getDisplay(); + + // Do not sleep activities in this stack if we're marked as focused and the keyguard + // is in the process of going away. + if (isFocusedStackOnDisplay() + && mStackSupervisor.getKeyguardController().isKeyguardGoingAway()) { + return false; + } + + return display != null ? display.isSleeping() : mAtmService.isSleepingLocked(); + } + + boolean shouldSleepOrShutDownActivities() { + return shouldSleepActivities() || mAtmService.mShuttingDown; + } + + /** Bounds of the stack without adjusting for other factors in the system like visibility + * of docked stack. + * Most callers should be using {@link ConfigurationContainer#getRequestedOverrideBounds} a + * it takes into consideration other system factors. */ + void getRawBounds(Rect out) { + out.set(getRawBounds()); + } + + private Rect getRawBounds() { + return super.getBounds(); + } + + @Override + public void dumpDebug(ProtoOutputStream proto, long fieldId, + @WindowTraceLogLevel int logLevel) { + if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) { + return; + } + + final long token = proto.start(fieldId); + super.dumpDebug(proto, WINDOW_CONTAINER, logLevel); + + proto.write(TaskProto.ID, mTaskId); + proto.write(DISPLAY_ID, getDisplayId()); + proto.write(ROOT_TASK_ID, getRootTaskId()); + + if (mResumedActivity != null) { + mResumedActivity.writeIdentifierToProto(proto, RESUMED_ACTIVITY); + } + if (realActivity != null) { + proto.write(REAL_ACTIVITY, realActivity.flattenToShortString()); + } + if (origActivity != null) { + proto.write(ORIG_ACTIVITY, origActivity.flattenToShortString()); + } + proto.write(ACTIVITY_TYPE, getActivityType()); + proto.write(RESIZE_MODE, mResizeMode); + proto.write(MIN_WIDTH, mMinWidth); + proto.write(MIN_HEIGHT, mMinHeight); + + proto.write(FILLS_PARENT, matchParentBounds()); + getRawBounds().dumpDebug(proto, BOUNDS); + + if (mLastNonFullscreenBounds != null) { + mLastNonFullscreenBounds.dumpDebug(proto, LAST_NON_FULLSCREEN_BOUNDS); + } + + proto.write(ANIMATING_BOUNDS, mBoundsAnimating); + + if (mSurfaceControl != null) { + proto.write(SURFACE_WIDTH, mSurfaceControl.getWidth()); + proto.write(SURFACE_HEIGHT, mSurfaceControl.getHeight()); + } + + proto.write(CREATED_BY_ORGANIZER, mCreatedByOrganizer); + + proto.end(token); + } } diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index aba5b99f7481..4473bd69681b 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -32,8 +32,6 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE; import static com.android.server.wm.ActivityStackSupervisor.TAG_TASKS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_STATES; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TASKS; @@ -42,6 +40,8 @@ import static com.android.server.wm.DisplayContent.alwaysCreateStack; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.wm.RootWindowContainer.TAG_STATES; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -73,7 +73,7 @@ import java.util.function.Function; /** * {@link DisplayArea} that represents a section of a screen that contains app window containers. */ -final class TaskDisplayArea extends DisplayArea<ActivityStack> { +final class TaskDisplayArea extends DisplayArea<Task> { DisplayContent mDisplayContent; @@ -100,16 +100,16 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Cached reference to some special tasks we tend to get a lot so we don't need to loop // through the list to find them. - private ActivityStack mRootHomeTask; - private ActivityStack mRootPinnedTask; - private ActivityStack mRootSplitScreenPrimaryTask; + private Task mRootHomeTask; + private Task mRootPinnedTask; + private Task mRootSplitScreenPrimaryTask; // TODO(b/159029784): Remove when getStack() behavior is cleaned-up - private ActivityStack mRootRecentsTask; + private Task mRootRecentsTask; - private final ArrayList<ActivityStack> mTmpAlwaysOnTopStacks = new ArrayList<>(); - private final ArrayList<ActivityStack> mTmpNormalStacks = new ArrayList<>(); - private final ArrayList<ActivityStack> mTmpHomeStacks = new ArrayList<>(); + private final ArrayList<Task> mTmpAlwaysOnTopStacks = new ArrayList<>(); + private final ArrayList<Task> mTmpNormalStacks = new ArrayList<>(); + private final ArrayList<Task> mTmpHomeStacks = new ArrayList<>(); private final IntArray mTmpNeedsZBoostIndexes = new IntArray(); private int mTmpLayerForSplitScreenDividerAnchor; private int mTmpLayerForAnimationLayer; @@ -128,7 +128,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * have the topmost index, it is used as a preferred candidate to prevent being unable to resume * target stack properly when there are other focusable always-on-top stacks. */ - ActivityStack mPreferredTopFocusableStack; + Task mPreferredTopFocusableStack; private final RootWindowContainer.FindTaskResult mTmpFindTaskResult = new RootWindowContainer.FindTaskResult(); @@ -138,7 +138,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * stack has been resumed. If stacks are changing position this will hold the old stack until * the new stack becomes resumed after which it will be set to current focused stack. */ - ActivityStack mLastFocusedStack; + Task mLastFocusedStack; /** * All of the stacks on this display. Order matters, topmost stack is in front of all other * stacks, bottommost behind. Accessed directly by ActivityManager package classes. Any calls @@ -164,7 +164,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Returns the topmost stack on the display that is compatible with the input windowing mode * and activity type. Null is no compatible stack on the display. */ - ActivityStack getStack(int windowingMode, int activityType) { + Task getStack(int windowingMode, int activityType) { if (activityType == ACTIVITY_TYPE_HOME) { return mRootHomeTask; } else if (activityType == ACTIVITY_TYPE_RECENTS) { @@ -176,7 +176,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return mRootSplitScreenPrimaryTask; } for (int i = getChildCount() - 1; i >= 0; --i) { - final ActivityStack stack = getChildAt(i); + final Task stack = getChildAt(i); if (activityType == ACTIVITY_TYPE_UNDEFINED && windowingMode == stack.getWindowingMode()) { // Passing in undefined type means we want to match the topmost stack with the @@ -191,33 +191,33 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } @VisibleForTesting - ActivityStack getTopStack() { + Task getTopStack() { final int count = getChildCount(); return count > 0 ? getChildAt(count - 1) : null; } // TODO: Figure-out a way to remove since it might be a source of confusion. - int getIndexOf(ActivityStack stack) { - return mChildren.indexOf(stack); + int getIndexOf(Task task) { + return mChildren.indexOf(task); } - @Nullable ActivityStack getRootHomeTask() { + @Nullable Task getRootHomeTask() { return mRootHomeTask; } - @Nullable ActivityStack getRootRecentsTask() { + @Nullable Task getRootRecentsTask() { return mRootRecentsTask; } - ActivityStack getRootPinnedTask() { + Task getRootPinnedTask() { return mRootPinnedTask; } - ActivityStack getRootSplitScreenPrimaryTask() { + Task getRootSplitScreenPrimaryTask() { return mRootSplitScreenPrimaryTask; } - ActivityStack getRootSplitScreenSecondaryTask() { + Task getRootSplitScreenSecondaryTask() { for (int i = mChildren.size() - 1; i >= 0; --i) { if (mChildren.get(i).inSplitScreenSecondaryWindowingMode()) { return mChildren.get(i); @@ -236,7 +236,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return visibleTasks; } - void onStackWindowingModeChanged(ActivityStack stack) { + void onStackWindowingModeChanged(Task stack) { removeStackReferenceIfNeeded(stack); addStackReferenceIfNeeded(stack); if (stack == mRootPinnedTask && getTopStack() != stack) { @@ -245,7 +245,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } } - void addStackReferenceIfNeeded(ActivityStack stack) { + void addStackReferenceIfNeeded(Task stack) { if (stack.isActivityTypeHome()) { if (mRootHomeTask != null) { if (!stack.isDescendantOf(mRootHomeTask)) { @@ -290,7 +290,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } } - void removeStackReferenceIfNeeded(ActivityStack stack) { + void removeStackReferenceIfNeeded(Task stack) { if (stack == mRootHomeTask) { mRootHomeTask = null; } else if (stack == mRootRecentsTask) { @@ -303,7 +303,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } @Override - void addChild(ActivityStack stack, int position) { + void addChild(Task stack, int position) { if (DEBUG_STACK) Slog.d(TAG_WM, "Set stack=" + stack + " on taskDisplayArea=" + this); addStackReferenceIfNeeded(stack); position = findPositionForStack(position, stack, true /* adding */); @@ -315,7 +315,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } @Override - protected void removeChild(ActivityStack stack) { + protected void removeChild(Task stack) { super.removeChild(stack); onStackRemoved(stack); mAtmService.updateSleepIfNeededLocked(); @@ -329,7 +329,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } @Override - void positionChildAt(int position, ActivityStack child, boolean includingParents) { + void positionChildAt(int position, Task child, boolean includingParents) { final boolean moveToTop = position >= getChildCount() - 1; final boolean moveToBottom = position <= 0; @@ -408,7 +408,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * * @return the priority of the stack */ - private int getPriority(ActivityStack stack) { + private int getPriority(Task stack) { if (mWmService.mAssistantOnTopOfDream && stack.isActivityTypeAssistant()) return 4; if (stack.isActivityTypeDream()) return 3; if (stack.inPinnedWindowingMode()) return 2; @@ -416,7 +416,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return 0; } - private int findMinPositionForStack(ActivityStack stack) { + private int findMinPositionForStack(Task stack) { int minPosition = POSITION_BOTTOM; for (int i = 0; i < mChildren.size(); ++i) { if (getPriority(getStackAt(i)) < getPriority(stack)) { @@ -438,9 +438,9 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return minPosition; } - private int findMaxPositionForStack(ActivityStack stack) { + private int findMaxPositionForStack(Task stack) { for (int i = mChildren.size() - 1; i >= 0; --i) { - final ActivityStack curr = getStackAt(i); + final Task curr = getStackAt(i); // Since a stack could be repositioned while still being one of the children, we check // if 'curr' is the same stack and skip it if so final boolean sameStack = curr == stack; @@ -470,7 +470,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * @param adding Flag indicates whether we're adding a new stack or positioning an existing. * @return The proper position for the stack. */ - private int findPositionForStack(int requestedPosition, ActivityStack stack, boolean adding) { + private int findPositionForStack(int requestedPosition, Task stack, boolean adding) { // The max possible position we can insert the stack at. int maxPosition = findMaxPositionForStack(stack); // The min possible position we can insert the stack at. @@ -632,7 +632,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { assignStackOrdering(t); for (int i = 0; i < mChildren.size(); i++) { - final ActivityStack s = mChildren.get(i); + final Task s = mChildren.get(i); s.assignChildLayers(t); } } @@ -645,7 +645,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { mTmpHomeStacks.clear(); mTmpNormalStacks.clear(); for (int i = 0; i < mChildren.size(); ++i) { - final ActivityStack s = mChildren.get(i); + final Task s = mChildren.get(i); if (s.isAlwaysOnTop()) { mTmpAlwaysOnTopStacks.add(s); } else if (s.isActivityTypeHome()) { @@ -675,7 +675,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { t.setLayer(mBoostedAppAnimationLayer, layerForBoostedAnimationLayer); } - private int adjustNormalStackLayer(ActivityStack s, int layer) { + private int adjustNormalStackLayer(Task s, int layer) { if (s.inSplitScreenWindowingMode()) { // The split screen divider anchor is located above the split screen window. mTmpLayerForSplitScreenDividerAnchor = layer++; @@ -696,12 +696,12 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * @param normalStacks Set {@code true} if this group is neither home nor always on top. * @return The adjusted layer value. */ - private int adjustRootTaskLayer(SurfaceControl.Transaction t, ArrayList<ActivityStack> stacks, + private int adjustRootTaskLayer(SurfaceControl.Transaction t, ArrayList<Task> stacks, int startLayer, boolean normalStacks) { mTmpNeedsZBoostIndexes.clear(); final int stackSize = stacks.size(); for (int i = 0; i < stackSize; i++) { - final ActivityStack stack = stacks.get(i); + final Task stack = stacks.get(i); if (!stack.needsZBoost()) { stack.assignLayer(t, startLayer++); if (normalStacks) { @@ -714,7 +714,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { final int zBoostSize = mTmpNeedsZBoostIndexes.size(); for (int i = 0; i < zBoostSize; i++) { - final ActivityStack stack = stacks.get(mTmpNeedsZBoostIndexes.get(i)); + final Task stack = stacks.get(mTmpNeedsZBoostIndexes.get(i)); stack.assignLayer(t, startLayer++); if (normalStacks) { startLayer = adjustNormalStackLayer(stack, startLayer); @@ -781,7 +781,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } } - void onStackRemoved(ActivityStack stack) { + void onStackRemoved(Task stack) { if (ActivityTaskManagerDebugConfig.DEBUG_STACK) { Slog.v(TAG_STACK, "removeStack: detaching " + stack + " from displayId=" + mDisplayContent.mDisplayId); @@ -800,40 +800,40 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } } - void positionStackAt(int position, ActivityStack child, boolean includingParents) { + void positionStackAt(int position, Task child, boolean includingParents) { positionChildAt(position, child, includingParents); mDisplayContent.layoutAndAssignWindowLayersIfNeeded(); } - void positionStackAtTop(ActivityStack stack, boolean includingParents) { + void positionStackAtTop(Task stack, boolean includingParents) { positionStackAtTop(stack, includingParents, null /* updateLastFocusedStackReason */); } - void positionStackAtTop(ActivityStack stack, boolean includingParents, + void positionStackAtTop(Task stack, boolean includingParents, String updateLastFocusedStackReason) { positionStackAt(stack, getStackCount(), includingParents, updateLastFocusedStackReason); } - void positionStackAtBottom(ActivityStack stack) { + void positionStackAtBottom(Task stack) { positionStackAtBottom(stack, null /* updateLastFocusedStackReason */); } - void positionStackAtBottom(ActivityStack stack, String updateLastFocusedStackReason) { + void positionStackAtBottom(Task stack, String updateLastFocusedStackReason) { positionStackAt(stack, 0, false /* includingParents */, updateLastFocusedStackReason); } - void positionStackAt(ActivityStack stack, int position) { + void positionStackAt(Task stack, int position) { positionStackAt(stack, position, false /* includingParents */, null /* updateLastFocusedStackReason */); } - void positionStackAt(ActivityStack stack, int position, boolean includingParents, + void positionStackAt(Task stack, int position, boolean includingParents, String updateLastFocusedStackReason) { // TODO: Keep in sync with WindowContainer.positionChildAt(), once we change that to adjust // the position internally, also update the logic here - final ActivityStack prevFocusedStack = updateLastFocusedStackReason != null + final Task prevFocusedStack = updateLastFocusedStackReason != null ? getFocusedStack() : null; final boolean wasContained = mChildren.contains(stack); if (mDisplayContent.mSingleTaskInstance && getStackCount() == 1 && !wasContained) { @@ -846,7 +846,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { positionStackAt(position, stack, includingParents); if (updateLastFocusedStackReason != null) { - final ActivityStack currentFocusedStack = getFocusedStack(); + final Task currentFocusedStack = getFocusedStack(); if (currentFocusedStack != prevFocusedStack) { mLastFocusedStack = prevFocusedStack; EventLogTags.writeWmFocusedStack(mRootWindowContainer.mCurrentUser, @@ -865,8 +865,8 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * when we just want to move a task to "the back" vs. a specific place. The primary use-case * is to make sure that moved-to-back apps go into secondary split when in split-screen mode. */ - void positionTaskBehindHome(ActivityStack task) { - final ActivityStack home = getOrCreateRootHomeTask(); + void positionTaskBehindHome(Task task) { + final Task home = getOrCreateRootHomeTask(); final WindowContainer homeParent = home.getParent(); final Task homeParentTask = homeParent != null ? homeParent.asTask() : null; if (homeParentTask == null) { @@ -878,17 +878,17 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } } else if (homeParentTask == task.getParent()) { // Apparently reparent early-outs if same stack, so we have to explicitly reorder. - ((ActivityStack) homeParentTask).positionChildAtBottom(task); + homeParentTask.positionChildAtBottom(task); } else { - task.reparent((ActivityStack) homeParentTask, false /* toTop */, + task.reparent(homeParentTask, false /* toTop */, Task.REPARENT_LEAVE_STACK_IN_PLACE, false /* animate */, false /* deferResume */, "positionTaskBehindHome"); } } - ActivityStack getStack(int rootTaskId) { + Task getStack(int rootTaskId) { for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); if (stack.getRootTaskId() == rootTaskId) { return stack; } @@ -901,7 +901,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * if a compatible stack doesn't exist. * @see #getOrCreateStack(int, int, boolean, Intent, Task) */ - ActivityStack getOrCreateStack(int windowingMode, int activityType, boolean onTop) { + Task getOrCreateStack(int windowingMode, int activityType, boolean onTop) { return getOrCreateStack(windowingMode, activityType, onTop, null /* intent */, null /* candidateTask */); } @@ -914,19 +914,19 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * @see #getStack(int, int) * @see #createStack(int, int, boolean) */ - ActivityStack getOrCreateStack(int windowingMode, int activityType, boolean onTop, + Task getOrCreateStack(int windowingMode, int activityType, boolean onTop, Intent intent, Task candidateTask) { // Need to pass in a determined windowing mode to see if a new stack should be created, // so use its parent's windowing mode if it is undefined. if (!alwaysCreateStack( windowingMode != WINDOWING_MODE_UNDEFINED ? windowingMode : getWindowingMode(), activityType)) { - ActivityStack stack = getStack(windowingMode, activityType); + Task stack = getStack(windowingMode, activityType); if (stack != null) { return stack; } } else if (candidateTask != null) { - final ActivityStack stack = (ActivityStack) candidateTask; + final Task stack = candidateTask; final int position = onTop ? POSITION_TOP : POSITION_BOTTOM; Task launchRootTask = updateLaunchRootTask(windowingMode); @@ -958,7 +958,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * if a compatible stack doesn't exist. * @see #getOrCreateStack(int, int, boolean) */ - ActivityStack getOrCreateStack(@Nullable ActivityRecord r, + Task getOrCreateStack(@Nullable ActivityRecord r, @Nullable ActivityOptions options, @Nullable Task candidateTask, int activityType, boolean onTop) { // First preference is the windowing mode in the activity options if set. @@ -977,7 +977,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return mAtmService.mStackSupervisor.getNextTaskIdForUser(); } - ActivityStack createStack(int windowingMode, int activityType, boolean onTop) { + Task createStack(int windowingMode, int activityType, boolean onTop) { return createStack(windowingMode, activityType, onTop, null /* info */, null /* intent */, false /* createdByOrganizer */); } @@ -997,7 +997,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * otherwise. * @return The newly created stack. */ - ActivityStack createStack(int windowingMode, int activityType, boolean onTop, ActivityInfo info, + Task createStack(int windowingMode, int activityType, boolean onTop, ActivityInfo info, Intent intent, boolean createdByOrganizer) { if (mDisplayContent.mSingleTaskInstance && getStackCount() > 0) { // Create stack on default display instead since this display can only contain 1 stack. @@ -1016,7 +1016,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { if (activityType != ACTIVITY_TYPE_STANDARD && activityType != ACTIVITY_TYPE_UNDEFINED) { // For now there can be only one stack of a particular non-standard activity type on a // display. So, get that ignoring whatever windowing mode it is currently in. - ActivityStack stack = getStack(WINDOWING_MODE_UNDEFINED, activityType); + Task stack = getStack(WINDOWING_MODE_UNDEFINED, activityType); if (stack != null) { throw new IllegalArgumentException("Stack=" + stack + " of activityType=" + activityType + " already on display=" + this + ". Can't have multiple."); @@ -1068,7 +1068,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } @VisibleForTesting - ActivityStack createStackUnchecked(int windowingMode, int activityType, int stackId, + Task createStackUnchecked(int windowingMode, int activityType, int stackId, boolean onTop, ActivityInfo info, Intent intent, boolean createdByOrganizer) { if (windowingMode == WINDOWING_MODE_PINNED && activityType != ACTIVITY_TYPE_STANDARD) { throw new IllegalArgumentException("Stack with windowing mode cannot with non standard " @@ -1086,12 +1086,12 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { windowingMode = WINDOWING_MODE_UNDEFINED; } - final ActivityStack stack = new ActivityStack(mAtmService, stackId, activityType, + final Task stack = new Task(mAtmService, stackId, activityType, info, intent, createdByOrganizer); if (launchRootTask != null) { launchRootTask.addChild(stack, onTop ? POSITION_TOP : POSITION_BOTTOM); if (onTop) { - positionStackAtTop((ActivityStack) launchRootTask, false /* includingParents */); + positionStackAtTop(launchRootTask, false /* includingParents */); } } else { addChild(stack, onTop ? POSITION_TOP : POSITION_BOTTOM); @@ -1104,13 +1104,13 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Get the preferred focusable stack in priority. If the preferred stack does not exist, find a * focusable and visible stack from the top of stacks in this display. */ - ActivityStack getFocusedStack() { + Task getFocusedStack() { if (mPreferredTopFocusableStack != null) { return mPreferredTopFocusableStack; } for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); if (stack.isFocusableAndVisible()) { return stack; } @@ -1119,13 +1119,13 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return null; } - ActivityStack getNextFocusableStack(ActivityStack currentFocus, boolean ignoreCurrent) { + Task getNextFocusableStack(Task currentFocus, boolean ignoreCurrent) { final int currentWindowingMode = currentFocus != null ? currentFocus.getWindowingMode() : WINDOWING_MODE_UNDEFINED; - ActivityStack candidate = null; + Task candidate = null; for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); if (ignoreCurrent && stack == currentFocus) { continue; } @@ -1155,7 +1155,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { } ActivityRecord getFocusedActivity() { - final ActivityStack focusedStack = getFocusedStack(); + final Task focusedStack = getFocusedStack(); if (focusedStack == null) { return null; } @@ -1175,7 +1175,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return resumedActivity; } - ActivityStack getLastFocusedStack() { + Task getLastFocusedStack() { return mLastFocusedStack; } @@ -1186,7 +1186,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return false; } } - final ActivityStack currentFocusedStack = getFocusedStack(); + final Task currentFocusedStack = getFocusedStack(); if (ActivityTaskManagerDebugConfig.DEBUG_STACK) { Slog.d(TAG_STACK, "allResumedActivitiesComplete: mLastFocusedStack changing from=" + mLastFocusedStack + " to=" + currentFocusedStack); @@ -1208,7 +1208,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { boolean pauseBackStacks(boolean userLeaving, ActivityRecord resuming) { boolean someActivityPaused = false; for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) { - final ActivityStack stack = getStackAt(stackNdx); + final Task stack = getStackAt(stackNdx); final ActivityRecord resumedActivity = stack.getResumedActivity(); if (resumedActivity != null && (stack.getVisibility(resuming) != STACK_VISIBILITY_VISIBLE @@ -1231,7 +1231,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { RootWindowContainer.FindTaskResult result) { mTmpFindTaskResult.clear(); for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) { - final ActivityStack stack = getStackAt(stackNdx); + final Task stack = getStackAt(stackNdx); if (!r.hasCompatibleActivityType(stack) && stack.isLeafTask()) { if (DEBUG_TASKS) { Slog.d(TAG_TASKS, "Skipping stack: (mismatch activity/stack) " + stack); @@ -1271,11 +1271,11 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Collect the stacks that are necessary to be removed instead of performing the removal // by looping mStacks, so that we don't miss any stacks after the stack size changed or // stacks reordered. - final ArrayList<ActivityStack> stacks = new ArrayList<>(); + final ArrayList<Task> stacks = new ArrayList<>(); for (int j = windowingModes.length - 1; j >= 0; --j) { final int windowingMode = windowingModes[j]; for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); if (!stack.isActivityTypeStandardOrUndefined()) { continue; } @@ -1299,15 +1299,15 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Collect the stacks that are necessary to be removed instead of performing the removal // by looping mStacks, so that we don't miss any stacks after the stack size changed or // stacks reordered. - final ArrayList<ActivityStack> stacks = new ArrayList<>(); + final ArrayList<Task> stacks = new ArrayList<>(); for (int j = activityTypes.length - 1; j >= 0; --j) { final int activityType = activityTypes[j]; for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); // Collect the root tasks that are currently being organized. if (stack.mCreatedByOrganizer) { for (int k = stack.getChildCount() - 1; k >= 0; --k) { - final ActivityStack childStack = (ActivityStack) stack.getChildAt(k); + final Task childStack = (Task) stack.getChildAt(k); if (childStack.getActivityType() == activityType) { stacks.add(childStack); } @@ -1327,15 +1327,15 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { onSplitScreenModeDismissed(null /* toTop */); } - void onSplitScreenModeDismissed(ActivityStack toTop) { + void onSplitScreenModeDismissed(Task toTop) { mAtmService.deferWindowLayout(); try { mLaunchRootTask = null; moveSplitScreenTasksToFullScreen(); } finally { - final ActivityStack topFullscreenStack = toTop != null + final Task topFullscreenStack = toTop != null ? toTop : getTopStackInWindowingMode(WINDOWING_MODE_FULLSCREEN); - final ActivityStack homeStack = getOrCreateRootHomeTask(); + final Task homeStack = getOrCreateRootHomeTask(); if (homeStack != null && ((topFullscreenStack != null && !isTopStack(homeStack)) || toTop != null)) { // Whenever split-screen is dismissed we want the home stack directly behind the @@ -1509,13 +1509,13 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return windowingMode; } - boolean isTopStack(ActivityStack stack) { + boolean isTopStack(Task stack) { return stack == getTopStack(); } - boolean isTopNotPinnedStack(ActivityStack stack) { + boolean isTopNotPinnedStack(Task stack) { for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack current = getStackAt(i); + final Task current = getStackAt(i); if (!current.inPinnedWindowingMode()) { return current == stack; } @@ -1538,7 +1538,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { */ ActivityRecord topRunningActivity(boolean considerKeyguardState) { ActivityRecord topRunning = null; - final ActivityStack focusedStack = getFocusedStack(); + final Task focusedStack = getFocusedStack(); if (focusedStack != null) { topRunning = focusedStack.topRunningActivity(); } @@ -1546,7 +1546,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Look in other focusable stacks. if (topRunning == null) { for (int i = getStackCount() - 1; i >= 0; --i) { - final ActivityStack stack = getStackAt(i); + final Task stack = getStackAt(i); // Only consider focusable stacks other than the current focused one. if (stack == focusedStack || !stack.isTopActivityFocusable()) { continue; @@ -1574,12 +1574,12 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { return mChildren.size(); } - protected ActivityStack getStackAt(int index) { + protected Task getStackAt(int index) { return mChildren.get(index); } @Nullable - ActivityStack getOrCreateRootHomeTask() { + Task getOrCreateRootHomeTask() { return getOrCreateRootHomeTask(false /* onTop */); } @@ -1590,8 +1590,8 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * be created at the top of the display, else at the bottom. */ @Nullable - ActivityStack getOrCreateRootHomeTask(boolean onTop) { - ActivityStack homeTask = getRootHomeTask(); + Task getOrCreateRootHomeTask(boolean onTop) { + Task homeTask = getRootHomeTask(); if (homeTask == null && mDisplayContent.supportsSystemDecorations()) { homeTask = createStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_HOME, onTop); } @@ -1607,12 +1607,12 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Returns the topmost stack on the display that is compatible with the input windowing mode. * Null is no compatible stack on the display. */ - ActivityStack getTopStackInWindowingMode(int windowingMode) { + Task getTopStackInWindowingMode(int windowingMode) { return getStack(windowingMode, ACTIVITY_TYPE_UNDEFINED); } void moveHomeStackToFront(String reason) { - final ActivityStack homeStack = getOrCreateRootHomeTask(); + final Task homeStack = getOrCreateRootHomeTask(); if (homeStack != null) { homeStack.moveToFront(reason); } @@ -1638,7 +1638,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { @Nullable ActivityRecord getHomeActivityForUser(int userId) { - final ActivityStack homeStack = getRootHomeTask(); + final Task homeStack = getRootHomeTask(); if (homeStack == null) { return null; } @@ -1660,7 +1660,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Generally used in conjunction with {@link #moveStackBehindStack}. */ // TODO(b/151575894): Remove special stack movement methods. - void moveStackBehindBottomMostVisibleStack(ActivityStack stack) { + void moveStackBehindBottomMostVisibleStack(Task stack) { if (stack.shouldBeVisible(null)) { // Skip if the stack is already visible return; @@ -1677,8 +1677,8 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { // Find the next position where the stack should be placed final int numStacks = isRootTask ? getStackCount() : stack.getParent().getChildCount(); for (int stackNdx = 0; stackNdx < numStacks; stackNdx++) { - final ActivityStack s = isRootTask ? getStackAt(stackNdx) - : (ActivityStack) stack.getParent().getChildAt(stackNdx); + final Task s = isRootTask ? getStackAt(stackNdx) + : (Task) stack.getParent().getChildAt(stackNdx); if (s == stack) { continue; } @@ -1703,7 +1703,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * {@param behindStack} is not currently in the display, then then the stack is moved to the * back. Generally used in conjunction with {@link #moveStackBehindBottomMostVisibleStack}. */ - void moveStackBehindStack(ActivityStack stack, ActivityStack behindStack) { + void moveStackBehindStack(Task stack, Task behindStack) { if (behindStack == null || behindStack == stack) { return; } @@ -1737,19 +1737,19 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * @return the stack currently above the {@param stack}. Can be null if the {@param stack} is * already top-most. */ - static ActivityStack getStackAbove(ActivityStack stack) { + static Task getStackAbove(Task stack) { final WindowContainer wc = stack.getParent(); final int index = wc.mChildren.indexOf(stack) + 1; - return (index < wc.mChildren.size()) ? (ActivityStack) wc.mChildren.get(index) : null; + return (index < wc.mChildren.size()) ? (Task) wc.mChildren.get(index) : null; } /** Returns true if the stack in the windowing mode is visible. */ boolean isStackVisible(int windowingMode) { - final ActivityStack stack = getTopStackInWindowingMode(windowingMode); + final Task stack = getTopStackInWindowingMode(windowingMode); return stack != null && stack.isVisible(); } - void removeStack(ActivityStack stack) { + void removeStack(Task stack) { removeChild(stack); } @@ -1783,7 +1783,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Notifies of a stack order change * @param stack The stack which triggered the order change */ - void onStackOrderChanged(ActivityStack stack) { + void onStackOrderChanged(Task stack) { for (int i = mStackOrderChangedCallbacks.size() - 1; i >= 0; i--) { mStackOrderChangedCallbacks.get(i).onStackOrderChanged(stack); } @@ -1798,7 +1798,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Callback for when the order of the stacks in the display changes. */ interface OnStackOrderChangedListener { - void onStackOrderChanged(ActivityStack stack); + void onStackOrderChanged(Task stack); } void ensureActivitiesVisible(ActivityRecord starting, int configChanges, @@ -1806,7 +1806,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { mAtmService.mStackSupervisor.beginActivityVisibilityUpdate(); try { for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) { - final ActivityStack stack = getStackAt(stackNdx); + final Task stack = getStackAt(stackNdx); stack.ensureActivitiesVisible(starting, configChanges, preserveWindows, notifyClients); } @@ -1817,7 +1817,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { void prepareFreezingTaskBounds() { for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) { - final ActivityStack stack = getChildAt(stackNdx); + final Task stack = getChildAt(stackNdx); stack.prepareFreezingTaskBounds(); } } @@ -1826,12 +1826,12 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { * Removes the stacks in the node applying the content removal node from the display. * @return last reparented stack, or {@code null} if the stacks had to be destroyed. */ - ActivityStack remove() { + Task remove() { mPreferredTopFocusableStack = null; // TODO(b/153090332): Allow setting content removal mode per task display area final boolean destroyContentOnRemoval = mDisplayContent.shouldDestroyContentOnRemove(); final TaskDisplayArea toDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack lastReparentedStack = null; + Task lastReparentedStack = null; // Stacks could be reparented from the removed display area to other display area. After // reparenting the last stack of the removed display area, the display area becomes ready to @@ -1842,10 +1842,10 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { int numStacks = getStackCount(); final boolean splitScreenActivated = toDisplayArea.isSplitScreenModeActivated(); - final ActivityStack rootStack = splitScreenActivated ? toDisplayArea + final Task rootStack = splitScreenActivated ? toDisplayArea .getTopStackInWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) : null; for (int stackNdx = 0; stackNdx < numStacks; stackNdx++) { - final ActivityStack stack = getStackAt(stackNdx); + final Task stack = getStackAt(stackNdx); // Always finish non-standard type stacks. if (destroyContentOnRemoval || !stack.isActivityTypeStandardOrUndefined()) { stack.finishAllActivitiesImmediately(); @@ -1895,7 +1895,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> { final String triplePrefix = doublePrefix + " "; pw.println(doublePrefix + "Application tokens in top down Z order:"); for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) { - final ActivityStack stack = getChildAt(stackNdx); + final Task stack = getChildAt(stackNdx); pw.println(doublePrefix + "* " + stack); stack.dump(pw, triplePrefix, dumpAll); } diff --git a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java index 00ddf82d2ba3..9a818ce80872 100644 --- a/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java +++ b/services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java @@ -341,8 +341,8 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { } } - ActivityStack stack = (taskDisplayArea == null && task != null) - ? task.getStack() : null; + Task stack = (taskDisplayArea == null && task != null) + ? task.getRootTask() : null; if (stack != null) { if (DEBUG) appendLog("display-from-task=" + stack.getDisplayId()); taskDisplayArea = stack.getDisplayArea(); @@ -744,13 +744,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { display.forAllTaskDisplayAreas(taskDisplayArea -> { int numStacks = taskDisplayArea.getStackCount(); for (int sNdx = 0; sNdx < numStacks; ++sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); - if (!stack.inFreeformWindowingMode()) { + final Task task = taskDisplayArea.getStackAt(sNdx); + if (!task.inFreeformWindowingMode()) { continue; } - for (int j = 0; j < stack.getChildCount(); ++j) { - taskBoundsToCheck.add(stack.getChildAt(j).getBounds()); + for (int j = 0; j < task.getChildCount(); ++j) { + taskBoundsToCheck.add(task.getChildAt(j).getBounds()); } } }, false /* traverseTopToBottom */); diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index f13dfdd1156f..68445f6970fb 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -615,8 +615,9 @@ class TaskSnapshotController { static Rect getSystemBarInsets(Rect frame, InsetsState state) { return state.calculateInsets(frame, null /* ignoringVisibilityState */, false /* isScreenRound */, false /* alwaysConsumeSystemBars */, - null /* displayCutout */, 0 /* legacySoftInputMode */, 0 /* legacySystemUiFlags */, - null /* typeSideMap */).getInsets(WindowInsets.Type.systemBars()).toRect(); + null /* displayCutout */, 0 /* legacySoftInputMode */, 0 /* legacyWindowFlags */, + 0 /* legacySystemUiFlags */, null /* typeSideMap */).getInsets( + WindowInsets.Type.systemBars()).toRect(); } void dump(PrintWriter pw, String prefix) { diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index f1e965ba7a14..d0785ff9a9ac 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -112,16 +112,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< private static final String TAG = TAG_WITH_CLASS_NAME ? "WindowContainer" : TAG_WM; - /** Animation layer that happens above all animating {@link ActivityStack}s. */ + /** Animation layer that happens above all animating {@link Task}s. */ static final int ANIMATION_LAYER_STANDARD = 0; - /** Animation layer that happens above all {@link ActivityStack}s. */ + /** Animation layer that happens above all {@link Task}s. */ static final int ANIMATION_LAYER_BOOSTED = 1; /** * Animation layer that is reserved for {@link WindowConfiguration#ACTIVITY_TYPE_HOME} * activities and all activities that are being controlled by the recents animation. This - * layer is generally below all {@link ActivityStack}s. + * layer is generally below all {@link Task}s. */ static final int ANIMATION_LAYER_HOME = 2; @@ -190,7 +190,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< /** * Sources which triggered a surface animation on this container. An animation target can be * promoted to higher level, for example, from a set of {@link ActivityRecord}s to - * {@link ActivityStack}. In this case, {@link ActivityRecord}s are set on this variable while + * {@link Task}. In this case, {@link ActivityRecord}s are set on this variable while * the animation is running, and reset after finishing it. */ private final ArraySet<WindowContainer> mSurfaceAnimationSources = new ArraySet<>(); diff --git a/services/core/java/com/android/server/wm/WindowFrames.java b/services/core/java/com/android/server/wm/WindowFrames.java index 97186b4e9cda..d96b6457f9db 100644 --- a/services/core/java/com/android/server/wm/WindowFrames.java +++ b/services/core/java/com/android/server/wm/WindowFrames.java @@ -57,7 +57,7 @@ public class WindowFrames { public final Rect mParentFrame = new Rect(); /** - * The entire screen area of the {@link ActivityStack} this window is in. Usually equal to the + * The entire screen area of the {@link Task} this window is in. Usually equal to the * screen area of the device. * * TODO(b/111611553): The name is unclear and most likely should be swapped with diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 4df48dc11636..2dd25c969d0d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -1478,9 +1478,14 @@ public class WindowManagerService extends IWindowManager.Stub rootType, attrs.token, attrs.packageName)) { return WindowManagerGlobal.ADD_BAD_APP_TOKEN; } - final IBinder binder = attrs.token != null ? attrs.token : client.asBinder(); - token = new WindowToken(this, binder, type, false, displayContent, - session.mCanAddInternalSystemWindow, isRoundedCornerOverlay); + if (hasParent) { + // Use existing parent window token for child windows. + token = parentWindow.mToken; + } else { + final IBinder binder = attrs.token != null ? attrs.token : client.asBinder(); + token = new WindowToken(this, binder, type, false, displayContent, + session.mCanAddInternalSystemWindow, isRoundedCornerOverlay); + } } else if (rootType >= FIRST_APPLICATION_WINDOW && rootType <= LAST_APPLICATION_WINDOW) { activity = token.asActivityRecord(); @@ -1945,7 +1950,7 @@ public class WindowManagerService extends IWindowManager.Stub // re-factor. activity.firstWindowDrawn = false; activity.clearAllDrawn(); - final ActivityStack stack = activity.getStack(); + final Task stack = activity.getStack(); if (stack != null) { stack.mExitingActivities.remove(activity); } @@ -2165,6 +2170,10 @@ public class WindowManagerService extends IWindowManager.Stub throw new IllegalArgumentException( "Window type can not be changed after the window is added."); } + if (!Arrays.equals(win.mAttrs.providesInsetsTypes, attrs.providesInsetsTypes)) { + throw new IllegalArgumentException( + "Insets types can not be changed after the window is added."); + } // Odd choice but less odd than embedding in copyFrom() if ((attrs.privateFlags & WindowManager.LayoutParams.PRIVATE_FLAG_PRESERVE_GEOMETRY) @@ -2859,7 +2868,7 @@ public class WindowManagerService extends IWindowManager.Stub } void getStackBounds(int windowingMode, int activityType, Rect bounds) { - final ActivityStack stack = mRoot.getStack(windowingMode, activityType); + final Task stack = mRoot.getStack(windowingMode, activityType); if (stack != null) { stack.getBounds(bounds); return; @@ -4583,7 +4592,7 @@ public class WindowManagerService extends IWindowManager.Stub return mRoot.getTopFocusedDisplayContent().mCurrentFocus; } - ActivityStack getImeFocusStackLocked() { + Task getImeFocusStackLocked() { // Don't use mCurrentFocus.getStack() because it returns home stack for system windows. // Also don't use mInputMethodTarget's stack, because some window with FLAG_NOT_FOCUSABLE // and FLAG_ALT_FOCUSABLE_IM flags both set might be set to IME target so they're moved @@ -4592,7 +4601,7 @@ public class WindowManagerService extends IWindowManager.Stub final DisplayContent topFocusedDisplay = mRoot.getTopFocusedDisplayContent(); final ActivityRecord focusedApp = topFocusedDisplay.mFocusedApp; return (focusedApp != null && focusedApp.getTask() != null) - ? focusedApp.getTask().getStack() : null; + ? focusedApp.getTask().getRootTask() : null; } public boolean detectSafeMode() { diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 24ad85356477..8912d584213e 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -317,7 +317,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub Slog.w(TAG, "Container is no longer attached: " + task); return 0; } - final ActivityStack as = (ActivityStack) task; + final Task as = task; if (hop.isReparent()) { final boolean isNonOrganizedRootableTask = @@ -337,12 +337,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub + " multi-window mode... newParent=" + newParent + " task=" + task); return 0; } else { - task.reparent((ActivityStack) newParent, + task.reparent((Task) newParent, hop.getToTop() ? POSITION_TOP : POSITION_BOTTOM, false /*moveParents*/, "sanitizeAndApplyHierarchyOp"); } } else { - final ActivityStack rootTask = (ActivityStack) ( + final Task rootTask = (Task) ( (newParent != null && !(newParent instanceof TaskDisplayArea)) ? newParent : task.getRootTask()); if (hop.getToTop()) { @@ -395,10 +395,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub private void resizePinnedStackIfNeeded(ConfigurationContainer container, int configMask, int windowMask, Configuration config) { - if ((container instanceof ActivityStack) + if ((container instanceof Task) && ((configMask & ActivityInfo.CONFIG_WINDOW_CONFIGURATION) != 0) && ((windowMask & WindowConfiguration.WINDOW_CONFIG_BOUNDS) != 0)) { - final ActivityStack stack = (ActivityStack) container; + final Task stack = (Task) container; if (stack.inPinnedWindowingMode()) { stack.resize(config.windowConfiguration.getBounds(), PRESERVE_WINDOWS, true /* deferResume */); diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index 29cf1776df9c..9a48154c7770 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -22,13 +22,6 @@ import static android.os.Build.VERSION_CODES.Q; import static android.view.Display.INVALID_DISPLAY; import static com.android.server.am.ActivityManagerService.MY_PID; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STARTED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ACTIVITY_STARTS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CONFIGURATION; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RELEASE; @@ -40,6 +33,13 @@ import static com.android.server.wm.ActivityTaskManagerService.ACTIVITY_BG_START import static com.android.server.wm.ActivityTaskManagerService.INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT_MS; import static com.android.server.wm.ActivityTaskManagerService.KEY_DISPATCHING_TIMEOUT_MS; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE; +import static com.android.server.wm.Task.ActivityState.DESTROYED; +import static com.android.server.wm.Task.ActivityState.DESTROYING; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STARTED; +import static com.android.server.wm.Task.ActivityState.STOPPING; import android.Manifest; import android.annotation.NonNull; @@ -690,7 +690,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio if (canUpdate) { // Make sure the previous top activity in the process no longer be resumed. if (mPreQTopResumedActivity != null && mPreQTopResumedActivity.isState(RESUMED)) { - final ActivityStack stack = mPreQTopResumedActivity.getRootTask(); + final Task stack = mPreQTopResumedActivity.getRootTask(); if (stack != null) { stack.startPausingLocked(false /* userLeaving */, false /* uiSleeping */, activity); @@ -924,7 +924,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio // Since there could be more than one activities in a process record, we don't need to // compute the OomAdj with each of them, just need to find out the activity with the // "best" state, the order would be visible, pausing, stopping... - ActivityStack.ActivityState best = DESTROYED; + Task.ActivityState best = DESTROYED; boolean finishing = true; boolean visible = false; synchronized (mAtm.mGlobalLockWithoutBoost) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 27c4bf42ac1b..1cbc95090bfd 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1566,10 +1566,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return mActivityRecord != null ? mActivityRecord.getTask() : null; } - @Nullable ActivityStack getRootTask() { + @Nullable Task getRootTask() { final Task task = getTask(); if (task != null) { - return (ActivityStack) task.getRootTask(); + return task.getRootTask(); } // Some system windows (e.g. "Power off" dialog) don't have a task, but we would still // associate them with some stack to enable dimming. @@ -1611,7 +1611,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP bounds.setEmpty(); mTmpRect.setEmpty(); if (intersectWithStackBounds) { - final ActivityStack stack = task.getStack(); + final Task stack = task.getRootTask(); if (stack != null) { stack.getDimBounds(mTmpRect); } else { @@ -1622,7 +1622,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // the secondary split, it means this is "minimized" and thus must prevent // overlapping with home. // TODO(b/158242495): get rid of this when drag/drop can use surface bounds. - final ActivityStack rootSecondary = + final Task rootSecondary = task.getDisplayArea().getRootSplitScreenSecondaryTask(); if (rootSecondary.isActivityTypeHome() || rootSecondary.isActivityTypeRecents()) { final WindowContainer topTask = rootSecondary.getTopChild(); @@ -2107,7 +2107,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP boolean isObscuringDisplay() { Task task = getTask(); - if (task != null && task.getStack() != null && !task.getStack().fillsParent()) { + if (task != null && task.getRootTask() != null && !task.getRootTask().fillsParent()) { return false; } return isOpaqueDrawn() && fillsDisplay(); @@ -2191,6 +2191,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (isInputMethodTarget()) { dc.computeImeTarget(true /* updateImeTarget */); } + if (dc.mInputMethodInputTarget == this) { + dc.setInputMethodInputTarget(null); + } if (dc.mInputMethodControlTarget == this) { dc.updateImeControlTarget(); } @@ -2415,7 +2418,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return false; } - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack != null && !stack.isFocusable()) { // Ignore when the stack shouldn't receive input event. // (i.e. the minimized stack in split screen mode.) @@ -2916,7 +2919,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return false; } - return mActivityRecord.getTask().getStack().shouldIgnoreInput() + return mActivityRecord.getTask().getRootTask().shouldIgnoreInput() || !mActivityRecord.mVisibleRequested || isRecentsAnimationConsumingAppInput(); } @@ -3486,7 +3489,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return; } - final ActivityStack stack = task.getStack(); + final Task stack = task.getRootTask(); if (stack == null || inFreeformWindowingMode()) { handle.setTouchableRegionCrop(null); return; @@ -3501,7 +3504,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return; } - final ActivityStack stack = task.getStack(); + final Task stack = task.getRootTask(); if (stack == null || stack.mCreatedByOrganizer) { return; } @@ -3745,7 +3748,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } private int getRootTaskId() { - final ActivityStack stack = getRootTask(); + final Task stack = getRootTask(); if (stack == null) { return INVALID_TASK_ID; } @@ -3819,7 +3822,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return mActivityRecord.getBounds().equals(mTmpRect); } - @Override + /** + * @see Letterbox#notIntersectsOrFullyContains(Rect) + */ + boolean letterboxNotIntersectsOrFullyContains(Rect rect) { + return mActivityRecord == null + || mActivityRecord.letterboxNotIntersectsOrFullyContains(rect); + } + public boolean isLetterboxedOverlappingWith(Rect rect) { return mActivityRecord != null && mActivityRecord.isLetterboxOverlappingWith(rect); } @@ -5441,7 +5451,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP outPoint.offset(-parentBounds.left, -parentBounds.top); } - ActivityStack stack = getRootTask(); + Task stack = getRootTask(); // If we have stack outsets, that means the top-left // will be outset, and we need to inset ourselves diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 508d2d477067..77fee851889e 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -924,15 +924,15 @@ class WindowStateAnimator { int posX = 0; int posY = 0; - task.getStack().getDimBounds(mTmpStackBounds); + task.getRootTask().getDimBounds(mTmpStackBounds); boolean allowStretching = false; - task.getStack().getFinalAnimationSourceHintBounds(mTmpSourceBounds); + task.getRootTask().getFinalAnimationSourceHintBounds(mTmpSourceBounds); // If we don't have source bounds, we can attempt to use the content insets // if we have content insets. if (mTmpSourceBounds.isEmpty() && (mWin.mLastRelayoutContentInsets.width() > 0 || mWin.mLastRelayoutContentInsets.height() > 0)) { - mTmpSourceBounds.set(task.getStack().mPreAnimationBounds); + mTmpSourceBounds.set(task.getRootTask().mPreAnimationBounds); mTmpSourceBounds.inset(mWin.mLastRelayoutContentInsets); allowStretching = true; } @@ -946,7 +946,7 @@ class WindowStateAnimator { if (!mTmpSourceBounds.isEmpty()) { // Get the final target stack bounds, if we are not animating, this is just the // current stack bounds - task.getStack().getFinalAnimationBounds(mTmpAnimatingBounds); + task.getRootTask().getFinalAnimationBounds(mTmpAnimatingBounds); // Calculate the current progress and interpolate the difference between the target // and source bounds @@ -1042,7 +1042,7 @@ class WindowStateAnimator { mSurfaceController.deferTransactionUntil(mWin.getClientViewRootSurface(), mWin.getFrameNumber()); } else { - final ActivityStack stack = mWin.getRootTask(); + final Task stack = mWin.getRootTask(); mTmpPos.x = 0; mTmpPos.y = 0; if (stack != null) { @@ -1576,7 +1576,7 @@ class WindowStateAnimator { */ boolean isForceScaled() { final Task task = mWin.getTask(); - if (task != null && task.getStack().isForceScaled()) { + if (task != null && task.getRootTask().isForceScaled()) { return true; } return mForceScaleUntilResize; @@ -1592,12 +1592,6 @@ class WindowStateAnimator { if (mSurfaceController != null) { mSurfaceController.detachChildren(); } - // If the children are detached, it means the app is exiting. We don't want to tear the - // content down too early, otherwise we could end up with a flicker. By preserving the - // current surface, we ensure the content remains on screen until the window is completely - // removed. It also ensures that the old surface is cleaned up when started again since it - // forces mSurfaceController to be set to null. - preserveSurfaceLocked(); } void setOffsetPositionForStackResize(boolean offsetPositionForStackResize) { diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index 3450c3ae9fb3..a5f0d045948c 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -1422,6 +1422,11 @@ static long elapsedMcs(Duration start, Duration end) { } // Extract lib files from zip, create new files in incfs and write data to them +// Lib files should be placed next to the APK file in the following matter: +// Example: +// /path/to/base.apk +// /path/to/lib/arm/first.so +// /path/to/lib/arm/second.so bool IncrementalService::configureNativeBinaries(StorageId storage, std::string_view apkFullPath, std::string_view libDirRelativePath, std::string_view abi, bool extractNativeLibs) { @@ -1433,9 +1438,13 @@ bool IncrementalService::configureNativeBinaries(StorageId storage, std::string_ return false; } + const auto targetLibPathRelativeToStorage = + path::join(path::dirname(normalizePathToStorage(*ifs, storage, apkFullPath)), + libDirRelativePath); + // First prepare target directories if they don't exist yet - if (auto res = makeDirs(*ifs, storage, libDirRelativePath, 0755)) { - LOG(ERROR) << "Failed to prepare target lib directory " << libDirRelativePath + if (auto res = makeDirs(*ifs, storage, targetLibPathRelativeToStorage, 0755)) { + LOG(ERROR) << "Failed to prepare target lib directory " << targetLibPathRelativeToStorage << " errno: " << res; return false; } @@ -1486,7 +1495,7 @@ bool IncrementalService::configureNativeBinaries(StorageId storage, std::string_ auto startFileTs = Clock::now(); const auto libName = path::basename(fileName); - auto targetLibPath = path::join(libDirRelativePath, libName); + auto targetLibPath = path::join(targetLibPathRelativeToStorage, libName); const auto targetLibPathAbsolute = normalizePathToStorage(*ifs, storage, targetLibPath); // If the extract file already exists, skip if (access(targetLibPathAbsolute.c_str(), F_OK) == 0) { diff --git a/services/robotests/Android.bp b/services/robotests/Android.bp index 25ab5d36169e..1ae2aec90ba3 100644 --- a/services/robotests/Android.bp +++ b/services/robotests/Android.bp @@ -43,6 +43,7 @@ android_robolectric_test { // Include the testing libraries libs: [ "platform-test-annotations", + "services.backup", "testng", ], static_libs: [ diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index dfe75ed50cd4..06d51a4be920 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -61,7 +61,7 @@ import com.android.server.backup.testing.BackupManagerServiceTestUtils; import com.android.server.backup.testing.TransportData; import com.android.server.backup.testing.TransportTestUtils.TransportMock; import com.android.server.backup.transport.TransportNotRegisteredException; -import com.android.server.testing.shadows.ShadowAppBackupUtils; +import com.android.server.testing.shadows.ShadowBackupEligibilityRules; import com.android.server.testing.shadows.ShadowApplicationPackageManager; import com.android.server.testing.shadows.ShadowBinder; import com.android.server.testing.shadows.ShadowKeyValueBackupJob; @@ -99,7 +99,7 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) @Config( shadows = { - ShadowAppBackupUtils.class, + ShadowBackupEligibilityRules.class, ShadowApplicationPackageManager.class, ShadowSystemServiceRegistry.class }) @@ -159,7 +159,7 @@ public class UserBackupManagerServiceTest { @After public void tearDown() throws Exception { mBackupThread.quit(); - ShadowAppBackupUtils.reset(); + ShadowBackupEligibilityRules.reset(); ShadowApplicationPackageManager.reset(); } @@ -236,7 +236,7 @@ public class UserBackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); TransportMock transportMock = setUpCurrentTransport(mTransportManager, backupTransport()); registerPackages(PACKAGE_1); - ShadowAppBackupUtils.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); + ShadowBackupEligibilityRules.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); boolean result = backupManagerService.isAppEligibleForBackup(PACKAGE_1); @@ -255,7 +255,7 @@ public class UserBackupManagerServiceTest { mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); setUpCurrentTransport(mTransportManager, mTransport); registerPackages(PACKAGE_1); - ShadowAppBackupUtils.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); + ShadowBackupEligibilityRules.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); expectThrows( @@ -273,7 +273,7 @@ public class UserBackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); TransportMock transportMock = setUpCurrentTransport(mTransportManager, mTransport); registerPackages(PACKAGE_1, PACKAGE_2); - ShadowAppBackupUtils.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); + ShadowBackupEligibilityRules.setAppRunningAndEligibleForBackupWithTransport(PACKAGE_1); UserBackupManagerService backupManagerService = createUserBackupManagerServiceAndRunTasks(); String[] filtered = @@ -801,7 +801,7 @@ public class UserBackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); for (String packageName : packages) { registerPackages(packageName); - ShadowAppBackupUtils.setAppRunningAndEligibleForBackupWithTransport(packageName); + ShadowBackupEligibilityRules.setAppRunningAndEligibleForBackupWithTransport(packageName); } setUpCurrentTransport(mTransportManager, mTransport); } @@ -962,7 +962,7 @@ public class UserBackupManagerServiceTest { @Config(shadows = ShadowKeyValueBackupTask.class) public void testRequestBackup_whenPackageIsFullBackup() throws Exception { setUpForRequestBackup(PACKAGE_1); - ShadowAppBackupUtils.setAppGetsFullBackup(PACKAGE_1); + ShadowBackupEligibilityRules.setAppGetsFullBackup(PACKAGE_1); UserBackupManagerService backupManagerService = createBackupManagerServiceForRequestBackup(); diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index b5c9375fcc0d..6184c4ed7f1a 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -115,6 +115,7 @@ import com.android.server.backup.testing.TestUtils.ThrowingRunnable; import com.android.server.backup.testing.TransportData; import com.android.server.backup.testing.TransportTestUtils; import com.android.server.backup.testing.TransportTestUtils.TransportMock; +import com.android.server.backup.utils.BackupEligibilityRules; import com.android.server.testing.shadows.FrameworkShadowLooper; import com.android.server.testing.shadows.ShadowApplicationPackageManager; import com.android.server.testing.shadows.ShadowBackupDataInput; @@ -176,6 +177,7 @@ public class KeyValueBackupTaskTest { private static final String BACKUP_AGENT_SHARED_PREFS_SYNCHRONIZER_CLASS = "android.app.backup.BackupAgent$SharedPrefsSynchronizer"; private static final int USER_ID = 10; + private static final int OPERATION_TYPE = BackupManager.OperationType.BACKUP; @Mock private TransportManager mTransportManager; @Mock private DataChangedJournal mOldJournal; @@ -183,6 +185,7 @@ public class KeyValueBackupTaskTest { @Mock private IBackupManagerMonitor mMonitor; @Mock private OnTaskFinishedListener mListener; @Mock private PackageManagerInternal mPackageManagerInternal; + private UserBackupManagerService mBackupManagerService; private TransportData mTransport; private ShadowLooper mShadowBackupLooper; @@ -198,6 +201,7 @@ public class KeyValueBackupTaskTest { private Looper mMainLooper; private FrameworkShadowLooper mShadowMainLooper; private Context mContext; + private BackupEligibilityRules mBackupEligibilityRules; @Before public void setUp() throws Exception { @@ -253,6 +257,8 @@ public class KeyValueBackupTaskTest { .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); LocalServices.removeServiceForTest(PackageManagerInternal.class); LocalServices.addService(PackageManagerInternal.class, mPackageManagerInternal); + mBackupEligibilityRules = new BackupEligibilityRules(mPackageManager, + LocalServices.getService(PackageManagerInternal.class), USER_ID, OPERATION_TYPE); } @After @@ -479,7 +485,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgentWithData(PACKAGE_1); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true, PACKAGE_1); runTask(task); @@ -492,7 +499,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgentWithData(PACKAGE_1); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, true, PACKAGE_1, PM_PACKAGE); @@ -506,7 +514,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgentWithData(PACKAGE_1); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, false, PACKAGE_1); runTask(task); @@ -742,7 +751,7 @@ public class KeyValueBackupTaskTest { verify(mBackupManagerService).setWorkSource(null); verify(mObserver).onResult(PACKAGE_1.packageName, ERROR_AGENT_FAILURE); - verify(mObserver).backupFinished(BackupManager.SUCCESS); + verify(mObserver).backupFinished(SUCCESS); assertBackupPendingFor(PACKAGE_1); } @@ -775,7 +784,7 @@ public class KeyValueBackupTaskTest { verify(mBackupManagerService).setWorkSource(null); verify(mObserver).onResult(PACKAGE_1.packageName, ERROR_AGENT_FAILURE); - verify(mObserver).backupFinished(BackupManager.SUCCESS); + verify(mObserver).backupFinished(SUCCESS); assertBackupPendingFor(PACKAGE_1); } @@ -792,7 +801,7 @@ public class KeyValueBackupTaskTest { verify(mBackupManagerService).setWorkSource(null); verify(mObserver).onResult(PACKAGE_1.packageName, ERROR_AGENT_FAILURE); - verify(mObserver).backupFinished(BackupManager.SUCCESS); + verify(mObserver).backupFinished(SUCCESS); assertBackupPendingFor(PACKAGE_1); } @@ -810,7 +819,7 @@ public class KeyValueBackupTaskTest { verify(mBackupManagerService).setWorkSource(null); verify(mObserver).onResult(PACKAGE_1.packageName, ERROR_AGENT_FAILURE); - verify(mObserver).backupFinished(BackupManager.SUCCESS); + verify(mObserver).backupFinished(SUCCESS); assertBackupPendingFor(PACKAGE_1); } @@ -1316,7 +1325,8 @@ public class KeyValueBackupTaskTest { argThat(packageInfo(PM_PACKAGE)), any(), anyInt())) .then(copyBackupDataTo(backupDataPath)); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); agentOnBackupDo( pmAgent, (oldState, dataOutput, newState) -> { @@ -1380,7 +1390,8 @@ public class KeyValueBackupTaskTest { setUpAgent(PACKAGE_1); when(transportMock.transport.finishBackup()).thenReturn(BackupTransport.TRANSPORT_OK); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); agentOnBackupDo( pmAgent, (oldState, dataOutput, newState) -> { @@ -1404,7 +1415,8 @@ public class KeyValueBackupTaskTest { setUpAgent(PACKAGE_1); when(transportMock.transport.finishBackup()).thenReturn(BackupTransport.TRANSPORT_OK); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); agentOnBackupDo( pmAgent, (oldState, dataOutput, newState) -> { @@ -1669,7 +1681,7 @@ public class KeyValueBackupTaskTest { verify(mReporter).onPackageBackupTransportFailure(PACKAGE_1.packageName); verify(mReporter).onTransportNotInitialized(mTransport.transportName); - verify(mReporter).onBackupFinished(BackupManager.ERROR_TRANSPORT_ABORTED); + verify(mReporter).onBackupFinished(ERROR_TRANSPORT_ABORTED); } @Test @@ -1686,7 +1698,7 @@ public class KeyValueBackupTaskTest { verify(mReporter).onPackageBackupTransportFailure(PM_PACKAGE.packageName); verify(mReporter).onTransportNotInitialized(mTransport.transportName); - verify(mReporter).onBackupFinished(BackupManager.ERROR_TRANSPORT_ABORTED); + verify(mReporter).onBackupFinished(ERROR_TRANSPORT_ABORTED); } @Test @@ -1983,7 +1995,8 @@ public class KeyValueBackupTaskTest { public void testRunTask_whenPmAgentFails_reportsCorrectly() throws Exception { TransportMock transportMock = setUpInitializedTransport(mTransport); BackupAgent pmAgent = createThrowingPmAgent(new RuntimeException()); - when(mBackupManagerService.makeMetadataAgent()).thenReturn(pmAgent); + when(mBackupManagerService.makeMetadataAgentWithEligibilityRules( + mBackupEligibilityRules)).thenReturn(pmAgent); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); runTask(task); @@ -2001,7 +2014,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgent(PACKAGE_1); BackupAgent pmAgent = createThrowingPmAgent(new RuntimeException()); - doReturn(pmAgent).when(mBackupManagerService).makeMetadataAgent(); + doReturn(pmAgent).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); runTask(task); @@ -2014,7 +2028,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgent(PACKAGE_1); BackupAgent pmAgent = createThrowingPmAgent(new RuntimeException()); - doReturn(pmAgent).when(mBackupManagerService).makeMetadataAgent(); + doReturn(pmAgent).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); runTask(task); @@ -2027,7 +2042,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgent(PACKAGE_1); BackupAgent pmAgent = createThrowingPmAgent(new RuntimeException()); - doReturn(pmAgent).when(mBackupManagerService).makeMetadataAgent(); + doReturn(pmAgent).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); runTask(task); @@ -2040,7 +2056,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgent(PACKAGE_1); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); agentOnBackupDo( pmAgent, (oldState, dataOutput, newState) -> runInWorkerThread(task::markCancel)); @@ -2055,7 +2072,8 @@ public class KeyValueBackupTaskTest { TransportMock transportMock = setUpInitializedTransport(mTransport); setUpAgent(PACKAGE_1); BackupAgent pmAgent = spy(createPmAgent()); - doReturn(forward(pmAgent)).when(mBackupManagerService).makeMetadataAgent(); + doReturn(forward(pmAgent)).when(mBackupManagerService) + .makeMetadataAgentWithEligibilityRules(mBackupEligibilityRules); KeyValueBackupTask task = createKeyValueBackupTask(transportMock, PACKAGE_1); agentOnBackupDo( pmAgent, (oldState, dataOutput, newState) -> runInWorkerThread(task::markCancel)); @@ -2652,14 +2670,16 @@ public class KeyValueBackupTaskTest { mListener, emptyList(), /* userInitiated */ false, - nonIncremental); + nonIncremental, + mBackupEligibilityRules); mBackupManager.setUp(mBackupHandler, task); return task; } private PackageManagerBackupAgent createPmAgent() { PackageManagerBackupAgent pmAgent = - new PackageManagerBackupAgent(mApplication.getPackageManager(), USER_ID); + new PackageManagerBackupAgent(mApplication.getPackageManager(), USER_ID, + mBackupEligibilityRules); pmAgent.attach(mApplication); pmAgent.onCreate(); return pmAgent; @@ -2671,7 +2691,8 @@ public class KeyValueBackupTaskTest { */ private PackageManagerBackupAgent createThrowingPmAgent(RuntimeException exception) { PackageManagerBackupAgent pmAgent = - new ThrowingPackageManagerBackupAgent(mApplication.getPackageManager(), exception); + new ThrowingPackageManagerBackupAgent(mApplication.getPackageManager(), exception, + mBackupEligibilityRules); pmAgent.attach(mApplication); pmAgent.onCreate(); return pmAgent; @@ -2985,8 +3006,9 @@ public class KeyValueBackupTaskTest { private final RuntimeException mException; ThrowingPackageManagerBackupAgent( - PackageManager packageManager, RuntimeException exception) { - super(packageManager, USER_ID); + PackageManager packageManager, RuntimeException exception, + BackupEligibilityRules backupEligibilityRules) { + super(packageManager, USER_ID, backupEligibilityRules); mException = exception; } diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowAppBackupUtils.java b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java index aa1c6688b01d..566b0e151402 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowAppBackupUtils.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowBackupEligibilityRules.java @@ -22,7 +22,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import com.android.server.backup.transport.TransportClient; -import com.android.server.backup.utils.AppBackupUtils; +import com.android.server.backup.utils.BackupEligibilityRules; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -31,8 +31,8 @@ import org.robolectric.annotation.Resetter; import java.util.HashSet; import java.util.Set; -@Implements(AppBackupUtils.class) -public class ShadowAppBackupUtils { +@Implements(BackupEligibilityRules.class) +public class ShadowBackupEligibilityRules { private static final Set<String> sAppsRunningAndEligibleForBackupWithTransport = new HashSet<>(); private static final Set<String> sAppsEligibleForBackup = new HashSet<>(); @@ -53,22 +53,19 @@ public class ShadowAppBackupUtils { } @Implementation - protected static boolean appIsRunningAndEligibleForBackupWithTransport( + protected boolean appIsRunningAndEligibleForBackupWithTransport( @Nullable TransportClient transportClient, - String packageName, - PackageManager pm, - int userId) { + String packageName) { return sAppsRunningAndEligibleForBackupWithTransport.contains(packageName); } @Implementation - protected static boolean appIsEligibleForBackup(ApplicationInfo app, int userId, - int operationType) { + protected boolean appIsEligibleForBackup(ApplicationInfo app) { return sAppsEligibleForBackup.contains(app.packageName); } @Implementation - protected static boolean appGetsFullBackup(PackageInfo packageInfo, int operationType) { + protected boolean appGetsFullBackup(PackageInfo packageInfo) { return sAppsGetFullBackup.contains(packageInfo.packageName); } diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java index ac5d2da9c3cf..fd51df7ab1f9 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java @@ -24,6 +24,7 @@ import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.keyvalue.KeyValueBackupReporter; import com.android.server.backup.keyvalue.KeyValueBackupTask; import com.android.server.backup.transport.TransportClient; +import com.android.server.backup.utils.BackupEligibilityRules; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -63,7 +64,8 @@ public class ShadowKeyValueBackupTask { OnTaskFinishedListener listener, List<String> pendingFullBackups, boolean userInitiated, - boolean nonIncremental) { + boolean nonIncremental, + BackupEligibilityRules backupEligibilityRules) { mListener = listener; mQueue = queue; mPendingFullBackups = pendingFullBackups; diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java index 8daef5fad032..5161070398d7 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java @@ -25,6 +25,7 @@ import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.restore.PerformUnifiedRestoreTask; import com.android.server.backup.transport.TransportClient; +import com.android.server.backup.utils.BackupEligibilityRules; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -67,7 +68,8 @@ public class ShadowPerformUnifiedRestoreTask { int pmToken, boolean isFullSystemRestore, @Nullable String[] filterSet, - OnTaskFinishedListener listener) { + OnTaskFinishedListener listener, + BackupEligibilityRules backupEligibilityRules) { mBackupManagerService = backupManagerService; mPackage = targetPackage; mIsFullSystemRestore = isFullSystemRestore; diff --git a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java index f0758dd3ef32..dcd7af31af93 100644 --- a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java @@ -57,6 +57,7 @@ import android.os.PowerSaveState; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; +import android.platform.test.annotations.Presubmit; import android.provider.Settings.Global; import android.test.mock.MockContentResolver; import android.util.ArraySet; @@ -94,6 +95,7 @@ import java.util.function.Consumer; * * Run with: atest com.android.server.AppStateTrackerTest */ +@Presubmit @SmallTest @RunWith(AndroidJUnit4.class) public class AppStateTrackerTest { @@ -130,6 +132,7 @@ public class AppStateTrackerTest { @Override AppStandbyInternal injectAppStandbyInternal() { + when(mMockAppStandbyInternal.isAppIdleEnabled()).thenReturn(true); return mMockAppStandbyInternal; } @@ -141,7 +144,9 @@ public class AppStateTrackerTest { } @Override - boolean isSmallBatteryDevice() { return mIsSmallBatteryDevice; }; + boolean isSmallBatteryDevice() { + return mIsSmallBatteryDevice; + } } private static final int UID_1 = Process.FIRST_APPLICATION_UID + 1; @@ -201,6 +206,13 @@ public class AppStateTrackerTest { mMainHandler = new Handler(Looper.getMainLooper()); } + /** + * Enqueues a message and waits for it to complete. This ensures that any messages posted until + * now have been executed. + * + * Note that these messages may have enqueued more messages, which may or may not have executed + * when this method returns. + */ private void waitUntilMainHandlerDrain() throws Exception { final CountDownLatch l = new CountDownLatch(1); mMainHandler.post(() -> { @@ -362,6 +374,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); areRestricted(instance, UID_1, PACKAGE_1, NONE); areRestricted(instance, UID_2, PACKAGE_2, JOBS_AND_ALARMS); areRestricted(instance, Process.SYSTEM_UID, PACKAGE_SYSTEM, NONE); @@ -370,6 +383,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidGone(UID_1, /*disable=*/ false); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); areRestricted(instance, UID_1, PACKAGE_1, JOBS_AND_ALARMS); areRestricted(instance, UID_2, PACKAGE_2, JOBS_AND_ALARMS); areRestricted(instance, Process.SYSTEM_UID, PACKAGE_SYSTEM, NONE); @@ -378,12 +392,14 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); areRestricted(instance, UID_1, PACKAGE_1, NONE); areRestricted(instance, UID_2, PACKAGE_2, JOBS_AND_ALARMS); areRestricted(instance, Process.SYSTEM_UID, PACKAGE_SYSTEM, NONE); mIUidObserver.onUidIdle(UID_1, /*disable=*/ false); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); areRestricted(instance, UID_1, PACKAGE_1, JOBS_AND_ALARMS); areRestricted(instance, UID_2, PACKAGE_2, JOBS_AND_ALARMS); areRestricted(instance, Process.SYSTEM_UID, PACKAGE_SYSTEM, NONE); @@ -499,6 +515,8 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertTrue(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -517,6 +535,8 @@ public class AppStateTrackerTest { ActivityManager.PROCESS_CAPABILITY_NONE); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertTrue(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -535,6 +555,8 @@ public class AppStateTrackerTest { ActivityManager.PROCESS_CAPABILITY_NONE); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertTrue(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -546,6 +568,8 @@ public class AppStateTrackerTest { mIUidObserver.onUidGone(UID_1, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertFalse(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -557,6 +581,8 @@ public class AppStateTrackerTest { mIUidObserver.onUidIdle(UID_2, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertFalse(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -570,6 +596,8 @@ public class AppStateTrackerTest { ActivityManager.PROCESS_CAPABILITY_NONE); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertFalse(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -583,6 +611,8 @@ public class AppStateTrackerTest { ActivityManager.PROCESS_CAPABILITY_NONE); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); + assertFalse(instance.isUidActive(UID_1)); assertFalse(instance.isUidActive(UID_2)); assertTrue(instance.isUidActive(Process.SYSTEM_UID)); @@ -1007,6 +1037,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_10_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1019,6 +1050,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidGone(UID_10_1, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1031,6 +1063,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_10_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1043,6 +1076,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidIdle(UID_10_1, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1069,6 +1103,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_10_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1081,6 +1116,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidGone(UID_10_1, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1093,6 +1129,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_10_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1105,6 +1142,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidIdle(UID_10_1, true); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); @@ -1124,6 +1162,7 @@ public class AppStateTrackerTest { mIUidObserver.onUidActive(UID_10_1); waitUntilMainHandlerDrain(); + waitUntilMainHandlerDrain(); setAppOps(UID_2, PACKAGE_2, true); setAppOps(UID_10_2, PACKAGE_2, true); diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java index 23381ffd4eaa..8db09b4f156c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java @@ -192,6 +192,7 @@ public class ApplicationExitInfoTest { final int app1Uid = 10123; final int app1Pid1 = 12345; final int app1Pid2 = 12346; + final int app1sPid1 = 13456; final int app1DefiningUid = 23456; final int app1ConnectiongGroup = 10; final int app1UidUser2 = 1010123; @@ -202,8 +203,12 @@ public class ApplicationExitInfoTest { final long app1Rss2 = 45679; final long app1Pss3 = 34569; final long app1Rss3 = 45680; + final long app1sPss1 = 56789; + final long app1sRss1 = 67890; final String app1ProcessName = "com.android.test.stub1:process"; final String app1PackageName = "com.android.test.stub1"; + final String app1sProcessName = "com.android.test.stub_shared:process"; + final String app1sPackageName = "com.android.test.stub_shared"; final byte[] app1Cookie1 = {(byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08}; final byte[] app1Cookie2 = {(byte) 0x08, (byte) 0x07, (byte) 0x06, (byte) 0x05, @@ -262,6 +267,29 @@ public class ApplicationExitInfoTest { app1Cookie1.length)); assertEquals(info.getTraceInputStream(), null); + // Now create a process record from a different package but shared UID. + sleep(1); + final long now1s = System.currentTimeMillis(); + app = makeProcessRecord( + app1sPid1, // pid + app1Uid, // uid + app1Uid, // packageUid + null, // definingUid + 0, // connectionGroup + PROCESS_STATE_BOUND_TOP, // procstate + app1sPss1, // pss + app1sRss1, // rss + app1sProcessName, // processName + app1sPackageName); // packageName + doReturn(new Pair<Long, Object>(now1s, Integer.valueOf(0))) + .when(mAppExitInfoTracker.mAppExitInfoSourceZygote) + .remove(anyInt(), anyInt()); + doReturn(null) + .when(mAppExitInfoTracker.mAppExitInfoSourceLmkd) + .remove(anyInt(), anyInt()); + noteAppKill(app, ApplicationExitInfo.REASON_USER_REQUESTED, + ApplicationExitInfo.SUBREASON_UNKNOWN, null); + // Case 2: create another app1 process record with a different pid sleep(1); final long now2 = System.currentTimeMillis(); @@ -290,8 +318,8 @@ public class ApplicationExitInfoTest { list.clear(); // Get all the records for app1Uid - mAppExitInfoTracker.getExitInfo(app1PackageName, app1Uid, 0, 0, list); - assertEquals(2, list.size()); + mAppExitInfoTracker.getExitInfo(null, app1Uid, 0, 0, list); + assertEquals(3, list.size()); info = list.get(0); @@ -315,7 +343,26 @@ public class ApplicationExitInfoTest { assertTrue(ArrayUtils.equals(info.getProcessStateSummary(), app1Cookie2, app1Cookie2.length)); + info = list.get(1); + verifyApplicationExitInfo( + info, // info + now1s, // timestamp + app1sPid1, // pid + app1Uid, // uid + app1Uid, // packageUid + null, // definingUid + app1sProcessName, // processName + 0, // connectionGroup + ApplicationExitInfo.REASON_USER_REQUESTED, // reason + null, // subReason + null, // status + app1sPss1, // pss + app1sRss1, // rss + IMPORTANCE_FOREGROUND, // importance + null); // description + + info = list.get(2); assertTrue(ArrayUtils.equals(info.getProcessStateSummary(), app1Cookie1, app1Cookie1.length)); @@ -808,7 +855,7 @@ public class ApplicationExitInfoTest { list.clear(); mAppExitInfoTracker.getExitInfo(null, app1Uid, 0, 0, list); - assertEquals(2, list.size()); + assertEquals(3, list.size()); info = list.get(0); @@ -831,6 +878,24 @@ public class ApplicationExitInfoTest { null); // description info = list.get(1); + verifyApplicationExitInfo( + info, // info + now1s, // timestamp + app1sPid1, // pid + app1Uid, // uid + app1Uid, // packageUid + null, // definingUid + app1sProcessName, // processName + 0, // connectionGroup + ApplicationExitInfo.REASON_USER_REQUESTED, // reason + null, // subReason + null, // status + app1sPss1, // pss + app1sRss1, // rss + IMPORTANCE_FOREGROUND, // importance + null); // description + + info = list.get(2); exitCode = 5; verifyApplicationExitInfo( info, // info diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java index 5d041b7c5757..3614763fecab 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java @@ -71,7 +71,6 @@ public class TimeControllerTest { private static final String SOURCE_PACKAGE = "com.android.frameworks.mockingservicestests"; private static final int SOURCE_USER_ID = 0; - private TimeController.TcConstants mConstants; private TimeController mTimeController; private MockitoSession mMockingSession; @@ -111,7 +110,6 @@ public class TimeControllerTest { // Initialize real objects. mTimeController = new TimeController(mJobSchedulerService); - mConstants = mTimeController.getTcConstants(); spyOn(mTimeController); } @@ -530,46 +528,6 @@ public class TimeControllerTest { } @Test - public void testJobDelayWakeupAlarmToggling() { - final long now = JobSchedulerService.sElapsedRealtimeClock.millis(); - - JobStatus job = createJobStatus( - "testMaybeStartTrackingJobLocked_DeadlineReverseOrder", - createJob().setMinimumLatency(HOUR_IN_MILLIS)); - - doReturn(true).when(mTimeController) - .wouldBeReadyWithConstraintLocked(eq(job), anyInt()); - - // Starting off with using a wakeup alarm. - mConstants.USE_NON_WAKEUP_ALARM_FOR_DELAY = false; - InOrder inOrder = inOrder(mAlarmManager); - - mTimeController.maybeStartTrackingJobLocked(job, null); - inOrder.verify(mAlarmManager, times(1)) - .set(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP), eq(now + HOUR_IN_MILLIS), anyLong(), - anyLong(), - eq(TAG_DELAY), any(), any(), any()); - - // Use a non wakeup alarm. - mConstants.USE_NON_WAKEUP_ALARM_FOR_DELAY = true; - - mTimeController.maybeStartTrackingJobLocked(job, null); - inOrder.verify(mAlarmManager, times(1)) - .set(eq(AlarmManager.ELAPSED_REALTIME), eq(now + HOUR_IN_MILLIS), anyLong(), - anyLong(), eq(TAG_DELAY), - any(), any(), any()); - - // Back off, use a wakeup alarm. - mConstants.USE_NON_WAKEUP_ALARM_FOR_DELAY = false; - - mTimeController.maybeStartTrackingJobLocked(job, null); - inOrder.verify(mAlarmManager, times(1)) - .set(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP), eq(now + HOUR_IN_MILLIS), anyLong(), - anyLong(), - eq(TAG_DELAY), any(), any(), any()); - } - - @Test public void testCheckExpiredDeadlinesAndResetAlarm_AllReady() { doReturn(true).when(mTimeController).wouldBeReadyWithConstraintLocked(any(), anyInt()); diff --git a/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java index ccb2ea3e46da..b98f0257d7b7 100644 --- a/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -18,6 +18,7 @@ package com.android.server.backup; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; @@ -36,6 +37,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.params.BackupParams; import com.android.server.backup.transport.TransportClient; +import com.android.server.backup.utils.BackupEligibilityRules; import org.junit.Before; import org.junit.Test; @@ -54,6 +56,7 @@ public class UserBackupManagerServiceTest { @Mock IBackupObserver mBackupObserver; @Mock PackageManager mPackageManager; @Mock TransportClient mTransportClient; + @Mock BackupEligibilityRules mBackupEligibilityRules; private TestBackupService mService; @@ -82,54 +85,51 @@ public class UserBackupManagerServiceTest { } @Test - public void getRequestBackupParams_isMigrationAndAppGetsFullBackup() throws Exception { + public void getRequestBackupParams_appIsEligibleForFullBackup() throws Exception { when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn( getPackageInfo(TEST_PACKAGE)); - mService.mAppIsEligibleForBackup = true; - mService.mAppGetsFullBackup = true; + when(mBackupEligibilityRules.appIsEligibleForBackup(any())).thenReturn(true); + when(mBackupEligibilityRules.appGetsFullBackup(any())).thenReturn(true); BackupParams params = mService.getRequestBackupParams(TEST_PACKAGES, mBackupObserver, - mBackupManagerMonitor, /* flags */ 0, OperationType.MIGRATION, + mBackupManagerMonitor, /* flags */ 0, mBackupEligibilityRules, mTransportClient, /* transportDirName */ "", OnTaskFinishedListener.NOP); assertThat(params.kvPackages).isEmpty(); assertThat(params.fullPackages).contains(TEST_PACKAGE); - assertThat(params.operationType).isEqualTo(OperationType.MIGRATION); - assertThat(mService.mOperationType).isEqualTo(OperationType.MIGRATION); + assertThat(params.mBackupEligibilityRules).isEqualTo(mBackupEligibilityRules); } @Test - public void getRequestBackupParams_isMigrationAndAppGetsKeyValueBackup() throws Exception { + public void getRequestBackupParams_appIsEligibleForKeyValueBackup() throws Exception { when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn( getPackageInfo(TEST_PACKAGE)); - mService.mAppIsEligibleForBackup = true; - mService.mAppGetsFullBackup = false; + when(mBackupEligibilityRules.appIsEligibleForBackup(any())).thenReturn(true); + when(mBackupEligibilityRules.appGetsFullBackup(any())).thenReturn(false); BackupParams params = mService.getRequestBackupParams(TEST_PACKAGES, mBackupObserver, - mBackupManagerMonitor, /* flags */ 0, OperationType.MIGRATION, + mBackupManagerMonitor, /* flags */ 0, mBackupEligibilityRules, mTransportClient, /* transportDirName */ "", OnTaskFinishedListener.NOP); assertThat(params.kvPackages).contains(TEST_PACKAGE); assertThat(params.fullPackages).isEmpty(); - assertThat(params.operationType).isEqualTo(OperationType.MIGRATION); - assertThat(mService.mOperationType).isEqualTo(OperationType.MIGRATION); + assertThat(params.mBackupEligibilityRules).isEqualTo(mBackupEligibilityRules); } @Test - public void getRequestBackupParams_isMigrationAndAppNotEligibleForBackup() throws Exception { + public void getRequestBackupParams_appIsNotEligibleForBackup() throws Exception { when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn( getPackageInfo(TEST_PACKAGE)); - mService.mAppIsEligibleForBackup = false; - mService.mAppGetsFullBackup = false; + when(mBackupEligibilityRules.appIsEligibleForBackup(any())).thenReturn(false); + when(mBackupEligibilityRules.appGetsFullBackup(any())).thenReturn(false); BackupParams params = mService.getRequestBackupParams(TEST_PACKAGES, mBackupObserver, - mBackupManagerMonitor, /* flags */ 0, OperationType.MIGRATION, + mBackupManagerMonitor, /* flags */ 0, mBackupEligibilityRules, mTransportClient, /* transportDirName */ "", OnTaskFinishedListener.NOP); assertThat(params.kvPackages).isEmpty(); assertThat(params.fullPackages).isEmpty(); - assertThat(params.operationType).isEqualTo(OperationType.MIGRATION); - assertThat(mService.mOperationType).isEqualTo(OperationType.MIGRATION); + assertThat(params.mBackupEligibilityRules).isEqualTo(mBackupEligibilityRules); } private static PackageInfo getPackageInfo(String packageName) { @@ -141,9 +141,6 @@ public class UserBackupManagerServiceTest { private static class TestBackupService extends UserBackupManagerService { boolean isEnabledStatePersisted = false; - boolean mAppIsEligibleForBackup = false; - boolean mAppGetsFullBackup = false; - int mOperationType = 0; TestBackupService(Context context, PackageManager packageManager) { super(context, packageManager); @@ -161,18 +158,5 @@ public class UserBackupManagerServiceTest { @Override void updateStateOnBackupEnabled(boolean wasEnabled, boolean enable) {} - - @Override - boolean appIsEligibleForBackup(ApplicationInfo applicationInfo, int userId, - @OperationType int operationType) { - mOperationType = operationType; - return mAppIsEligibleForBackup; - } - - @Override - boolean appGetsFullBackup(PackageInfo packageInfo, @OperationType int operationType) { - mOperationType = operationType; - return mAppGetsFullBackup; - } } } diff --git a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java b/services/tests/servicestests/src/com/android/server/backup/utils/BackupEligibilityRulesTest.java index 201211ef60bf..444155d12b3f 100644 --- a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/utils/BackupEligibilityRulesTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import android.app.backup.BackupManager; import android.app.backup.BackupManager.OperationType; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -43,11 +42,13 @@ import com.android.server.backup.UserBackupManagerService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; @SmallTest @Presubmit @RunWith(AndroidJUnit4.class) -public class AppBackupUtilsTest { +public class BackupEligibilityRulesTest { private static final String CUSTOM_BACKUP_AGENT_NAME = "custom.backup.agent"; private static final String TEST_PACKAGE_NAME = "test_package"; @@ -56,15 +57,18 @@ public class AppBackupUtilsTest { private static final Signature SIGNATURE_3 = generateSignature((byte) 3); private static final Signature SIGNATURE_4 = generateSignature((byte) 4); - private PackageManagerInternal mMockPackageManagerInternal; + @Mock private PackageManagerInternal mMockPackageManagerInternal; + @Mock private PackageManager mPackageManager; + private BackupEligibilityRules mBackupEligibilityRules; private int mUserId; @Before public void setUp() throws Exception { - mMockPackageManagerInternal = mock(PackageManagerInternal.class); + MockitoAnnotations.initMocks(this); mUserId = UserHandle.USER_SYSTEM; + mBackupEligibilityRules = getBackupEligibilityRules(OperationType.BACKUP); } @Test @@ -75,8 +79,7 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -90,8 +93,7 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = null; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -104,8 +106,7 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = UserBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -121,8 +122,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isTrue(); } @@ -138,8 +138,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isTrue(); } @@ -155,8 +154,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isTrue(); } @@ -172,8 +170,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -189,8 +186,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -206,8 +202,7 @@ public class AppBackupUtilsTest { when(mMockPackageManagerInternal.getApplicationEnabledState(TEST_PACKAGE_NAME, mUserId)) .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.BACKUP); + boolean isEligible = mBackupEligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -218,8 +213,9 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = getApplicationInfo(Process.FIRST_APPLICATION_UID, /* flags */ 0, CUSTOM_BACKUP_AGENT_NAME); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.MIGRATION); + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( + OperationType.MIGRATION); + boolean isEligible = eligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isTrue(); } @@ -230,8 +226,9 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = getApplicationInfo(Process.SYSTEM_UID, /* flags */ 0, CUSTOM_BACKUP_AGENT_NAME); - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, - mMockPackageManagerInternal, mUserId, OperationType.MIGRATION); + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( + OperationType.MIGRATION); + boolean isEligible = eligibilityRules.appIsEligibleForBackup(applicationInfo); assertThat(isEligible).isFalse(); } @@ -248,7 +245,7 @@ public class AppBackupUtilsTest { .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DEFAULT); boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isFalse(); } @@ -266,7 +263,7 @@ public class AppBackupUtilsTest { boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isTrue(); } @@ -283,7 +280,7 @@ public class AppBackupUtilsTest { boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isFalse(); } @@ -300,7 +297,7 @@ public class AppBackupUtilsTest { boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isTrue(); } @@ -316,7 +313,7 @@ public class AppBackupUtilsTest { .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER); boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isTrue(); } @@ -332,7 +329,7 @@ public class AppBackupUtilsTest { .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED); boolean isDisabled = - AppBackupUtils.appIsDisabled(applicationInfo, mMockPackageManagerInternal, mUserId); + mBackupEligibilityRules.appIsDisabled(applicationInfo); assertThat(isDisabled).isTrue(); } @@ -342,7 +339,7 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags |= ApplicationInfo.FLAG_STOPPED; - boolean isStopped = AppBackupUtils.appIsStopped(applicationInfo); + boolean isStopped = mBackupEligibilityRules.appIsStopped(applicationInfo); assertThat(isStopped).isTrue(); } @@ -352,7 +349,7 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags = ~ApplicationInfo.FLAG_STOPPED; - boolean isStopped = AppBackupUtils.appIsStopped(applicationInfo); + boolean isStopped = mBackupEligibilityRules.appIsStopped(applicationInfo); assertThat(isStopped).isFalse(); } @@ -363,7 +360,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo = new ApplicationInfo(); packageInfo.applicationInfo.backupAgentName = null; - boolean result = AppBackupUtils.appGetsFullBackup(packageInfo, OperationType.BACKUP); + boolean result = mBackupEligibilityRules.appGetsFullBackup(packageInfo); assertThat(result).isTrue(); } @@ -376,7 +373,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo.backupAgentName = "backup.agent"; packageInfo.applicationInfo.flags |= ApplicationInfo.FLAG_FULL_BACKUP_ONLY; - boolean result = AppBackupUtils.appGetsFullBackup(packageInfo, OperationType.BACKUP); + boolean result = mBackupEligibilityRules.appGetsFullBackup(packageInfo); assertThat(result).isTrue(); } @@ -389,7 +386,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo.backupAgentName = "backup.agent"; packageInfo.applicationInfo.flags = ~ApplicationInfo.FLAG_FULL_BACKUP_ONLY; - boolean result = AppBackupUtils.appGetsFullBackup(packageInfo, OperationType.BACKUP); + boolean result = mBackupEligibilityRules.appGetsFullBackup(packageInfo); assertThat(result).isFalse(); } @@ -401,7 +398,9 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo = getApplicationInfo(Process.FIRST_APPLICATION_UID, ~ApplicationInfo.FLAG_FULL_BACKUP_ONLY, CUSTOM_BACKUP_AGENT_NAME); - boolean result = AppBackupUtils.appGetsFullBackup(packageInfo, OperationType.MIGRATION); + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( + OperationType.MIGRATION); + boolean result = eligibilityRules.appGetsFullBackup(packageInfo); assertThat(result).isTrue(); } @@ -413,7 +412,9 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo = getApplicationInfo(Process.SYSTEM_UID, ~ApplicationInfo.FLAG_FULL_BACKUP_ONLY, CUSTOM_BACKUP_AGENT_NAME); - boolean result = AppBackupUtils.appGetsFullBackup(packageInfo, OperationType.MIGRATION); + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( + OperationType.MIGRATION); + boolean result = eligibilityRules.appGetsFullBackup(packageInfo); assertThat(result).isFalse(); } @@ -424,7 +425,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo = new ApplicationInfo(); packageInfo.applicationInfo.backupAgentName = null; - boolean result = AppBackupUtils.appIsKeyValueOnly(packageInfo); + boolean result = mBackupEligibilityRules.appIsKeyValueOnly(packageInfo); assertThat(result).isFalse(); } @@ -437,7 +438,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo.backupAgentName = "backup.agent"; packageInfo.applicationInfo.flags |= ApplicationInfo.FLAG_FULL_BACKUP_ONLY; - boolean result = AppBackupUtils.appIsKeyValueOnly(packageInfo); + boolean result = mBackupEligibilityRules.appIsKeyValueOnly(packageInfo); assertThat(result).isFalse(); } @@ -450,7 +451,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo.backupAgentName = "backup.agent"; packageInfo.applicationInfo.flags = ~ApplicationInfo.FLAG_FULL_BACKUP_ONLY; - boolean result = AppBackupUtils.appIsKeyValueOnly(packageInfo); + boolean result = mBackupEligibilityRules.appIsKeyValueOnly(packageInfo); assertThat(result).isTrue(); } @@ -460,8 +461,9 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.uid = Process.SYSTEM_UID; - boolean result = AppBackupUtils.appIgnoresIncludeExcludeRules(applicationInfo, + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( OperationType.MIGRATION); + boolean result = eligibilityRules.appIgnoresIncludeExcludeRules(applicationInfo); assertThat(result).isFalse(); } @@ -471,8 +473,9 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.uid = Process.SYSTEM_UID; - boolean result = AppBackupUtils.appIgnoresIncludeExcludeRules(applicationInfo, - OperationType.BACKUP); + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( + OperationType.MIGRATION); + boolean result = eligibilityRules.appIgnoresIncludeExcludeRules(applicationInfo); assertThat(result).isFalse(); } @@ -482,8 +485,9 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.uid = Process.FIRST_APPLICATION_UID; - boolean result = AppBackupUtils.appIgnoresIncludeExcludeRules(applicationInfo, + BackupEligibilityRules eligibilityRules = getBackupEligibilityRules( OperationType.MIGRATION); + boolean result = eligibilityRules.appIgnoresIncludeExcludeRules(applicationInfo); assertThat(result).isTrue(); } @@ -493,16 +497,14 @@ public class AppBackupUtilsTest { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.uid = Process.FIRST_APPLICATION_UID; - boolean result = AppBackupUtils.appIgnoresIncludeExcludeRules(applicationInfo, - OperationType.BACKUP); + boolean result = mBackupEligibilityRules.appIgnoresIncludeExcludeRules(applicationInfo); assertThat(result).isFalse(); } @Test public void signaturesMatch_targetIsNull_returnsFalse() throws Exception { - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {SIGNATURE_1}, null, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {SIGNATURE_1}, null); assertThat(result).isFalse(); } @@ -514,8 +516,7 @@ public class AppBackupUtilsTest { packageInfo.applicationInfo = new ApplicationInfo(); packageInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM; - boolean result = AppBackupUtils.signaturesMatch(new Signature[0], packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[0], packageInfo); assertThat(result).isTrue(); } @@ -533,8 +534,7 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(null, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(null, packageInfo); assertThat(result).isFalse(); } @@ -552,8 +552,7 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(new Signature[0], packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[0], packageInfo); assertThat(result).isFalse(); } @@ -568,8 +567,8 @@ public class AppBackupUtilsTest { packageInfo.signingInfo = null; packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {SIGNATURE_1}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {SIGNATURE_1}, + packageInfo); assertThat(result).isFalse(); } @@ -583,8 +582,8 @@ public class AppBackupUtilsTest { packageInfo.signingInfo = null; packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {SIGNATURE_1}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {SIGNATURE_1}, + packageInfo); assertThat(result).isFalse(); } @@ -596,8 +595,7 @@ public class AppBackupUtilsTest { packageInfo.signingInfo = null; packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(null, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(null, packageInfo); assertThat(result).isFalse(); } @@ -610,8 +608,7 @@ public class AppBackupUtilsTest { packageInfo.signingInfo = null; packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch(new Signature[0], packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[0], packageInfo); assertThat(result).isFalse(); } @@ -632,9 +629,8 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch( - new Signature[] {signature3Copy, signature1Copy, signature2Copy}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch( + new Signature[] {signature3Copy, signature1Copy, signature2Copy}, packageInfo); assertThat(result).isTrue(); } @@ -654,9 +650,8 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch( - new Signature[]{signature2Copy, signature1Copy}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch( + new Signature[]{signature2Copy, signature1Copy}, packageInfo); assertThat(result).isTrue(); } @@ -676,9 +671,8 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch( - new Signature[]{SIGNATURE_1, SIGNATURE_2, SIGNATURE_3}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch( + new Signature[]{SIGNATURE_1, SIGNATURE_2, SIGNATURE_3}, packageInfo); assertThat(result).isFalse(); } @@ -698,9 +692,8 @@ public class AppBackupUtilsTest { null)); packageInfo.applicationInfo = new ApplicationInfo(); - boolean result = AppBackupUtils.signaturesMatch( - new Signature[]{signature1Copy, signature2Copy, SIGNATURE_4}, packageInfo, - mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch( + new Signature[]{signature1Copy, signature2Copy, SIGNATURE_4}, packageInfo); assertThat(result).isFalse(); } @@ -723,8 +716,8 @@ public class AppBackupUtilsTest { doReturn(true).when(mMockPackageManagerInternal).isDataRestoreSafe(signature1Copy, packageInfo.packageName); - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {signature1Copy}, - packageInfo, mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {signature1Copy}, + packageInfo); assertThat(result).isTrue(); } @@ -749,8 +742,8 @@ public class AppBackupUtilsTest { doReturn(true).when(mMockPackageManagerInternal).isDataRestoreSafe(signature1Copy, packageInfo.packageName); - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {signature1Copy}, - packageInfo, mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {signature1Copy}, + packageInfo); assertThat(result).isTrue(); } @@ -776,12 +769,17 @@ public class AppBackupUtilsTest { doReturn(false).when(mMockPackageManagerInternal).isDataRestoreSafe(signature1Copy, packageInfo.packageName); - boolean result = AppBackupUtils.signaturesMatch(new Signature[] {signature1Copy}, - packageInfo, mMockPackageManagerInternal); + boolean result = mBackupEligibilityRules.signaturesMatch(new Signature[] {signature1Copy}, + packageInfo); assertThat(result).isFalse(); } + private BackupEligibilityRules getBackupEligibilityRules(@OperationType int operationType) { + return new BackupEligibilityRules(mPackageManager, mMockPackageManagerInternal, mUserId, + operationType); + } + private static Signature generateSignature(byte i) { byte[] signatureBytes = new byte[256]; signatureBytes[0] = i; diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java index 75e0d9144f57..a5df53205a36 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback; @@ -75,6 +76,8 @@ public class AuthServiceTest { IIrisService mIrisService; @Mock IFaceService mFaceService; + @Mock + AppOpsManager mAppOpsManager; @Before public void setUp() { @@ -93,6 +96,7 @@ public class AuthServiceTest { when(mInjector.getFingerprintService()).thenReturn(mFingerprintService); when(mInjector.getFaceService()).thenReturn(mFaceService); when(mInjector.getIrisService()).thenReturn(mIrisService); + when(mInjector.getAppOps(any())).thenReturn(mAppOpsManager); } @Test @@ -140,7 +144,9 @@ public class AuthServiceTest { // TODO(b/141025588): Check that an exception is thrown when the userId != callingUserId @Test - public void testAuthenticate_callsBiometricServiceAuthenticate() throws Exception { + public void testAuthenticate_appOpsOk_callsBiometricServiceAuthenticate() throws Exception { + when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_USE_BIOMETRIC), anyInt(), any(), any(), + any())).thenReturn(AppOpsManager.MODE_ALLOWED); mAuthService = new AuthService(mContext, mInjector); mAuthService.onStart(); @@ -170,6 +176,38 @@ public class AuthServiceTest { } @Test + public void testAuthenticate_appOpsDenied_doesNotCallBiometricService() throws Exception { + when(mAppOpsManager.noteOp(eq(AppOpsManager.OP_USE_BIOMETRIC), anyInt(), any(), any(), + any())).thenReturn(AppOpsManager.MODE_ERRORED); + mAuthService = new AuthService(mContext, mInjector); + mAuthService.onStart(); + + final Binder token = new Binder(); + final PromptInfo promptInfo = new PromptInfo(); + final long sessionId = 0; + final int userId = 0; + + mAuthService.mImpl.authenticate( + token, + sessionId, + userId, + mReceiver, + TEST_OP_PACKAGE_NAME, + promptInfo); + waitForIdle(); + verify(mBiometricService, never()).authenticate( + eq(token), + eq(sessionId), + eq(userId), + eq(mReceiver), + eq(TEST_OP_PACKAGE_NAME), + eq(promptInfo), + eq(Binder.getCallingUid()), + eq(Binder.getCallingPid()), + eq(UserHandle.getCallingUserId())); + } + + @Test public void testCanAuthenticate_callsBiometricServiceCanAuthenticate() throws Exception { mAuthService = new AuthService(mContext, mInjector); mAuthService.onStart(); diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java index 76239fcd9385..72d6caf1a5be 100644 --- a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java +++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java @@ -33,6 +33,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.server.power.batterysaver.BatterySavingStats.BatterySaverState; import com.android.server.power.batterysaver.BatterySavingStats.DozeState; import com.android.server.power.batterysaver.BatterySavingStats.InteractiveState; +import com.android.server.power.batterysaver.BatterySavingStats.PlugState; import org.junit.Test; import org.junit.runner.RunWith; @@ -118,7 +119,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(4); target.drainBattery(100); @@ -126,7 +128,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(2); target.drainBattery(500); @@ -134,7 +137,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(4); target.drainBattery(100); @@ -142,7 +146,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(2); target.drainBattery(500); @@ -150,7 +155,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(3); target.drainBattery(100); @@ -158,7 +164,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.LIGHT); + DozeState.LIGHT, + PlugState.UNPLUGGED); target.advanceClock(5); target.drainBattery(100); @@ -166,7 +173,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.DEEP); + DozeState.DEEP, + PlugState.UNPLUGGED); target.advanceClock(1); target.drainBattery(200); @@ -174,7 +182,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.ON, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(1); target.drainBattery(300); @@ -182,7 +191,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(3); target.drainBattery(500); @@ -190,12 +200,17 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.ON, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(3); target.drainBattery(500); - target.startCharging(); + target.transitionState( + BatterySaverState.ON, + InteractiveState.INTERACTIVE, + DozeState.NOT_DOZING, + PlugState.PLUGGED); target.advanceClock(5); target.drainBattery(1000); @@ -203,28 +218,34 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.ON, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); target.advanceClock(5); target.drainBattery(100); - target.startCharging(); + target.transitionState( + BatterySaverState.ON, + InteractiveState.INTERACTIVE, + DozeState.NOT_DOZING, + PlugState.PLUGGED); target.assertDumpable(); assertEquals( - "BS=0,I=0,D=0:{4m,1000,15000.00uA/H,1500.00%}\n" + - "BS=1,I=0,D=0:{0m,0,0.00uA/H,0.00%}\n" + - "BS=0,I=1,D=0:{14m,800,3428.57uA/H,342.86%}\n" + - "BS=1,I=1,D=0:{9m,900,6000.00uA/H,600.00%}\n" + - "BS=0,I=0,D=1:{5m,100,1200.00uA/H,120.00%}\n" + - "BS=1,I=0,D=1:{0m,0,0.00uA/H,0.00%}\n" + - "BS=0,I=1,D=1:{0m,0,0.00uA/H,0.00%}\n" + - "BS=1,I=1,D=1:{0m,0,0.00uA/H,0.00%}\n" + - "BS=0,I=0,D=2:{1m,200,12000.00uA/H,1200.00%}\n" + - "BS=1,I=0,D=2:{0m,0,0.00uA/H,0.00%}\n" + - "BS=0,I=1,D=2:{0m,0,0.00uA/H,0.00%}\n" + - "BS=1,I=1,D=2:{0m,0,0.00uA/H,0.00%}", + "BS=0,I=0,D=0,P=0:{4m,1000,15000.00uA/H,1500.00%}\n" + + "BS=1,I=0,D=0,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=0,I=1,D=0,P=0:{14m,800,3428.57uA/H,342.86%}\n" + + "BS=1,I=1,D=0,P=0:{9m,900,6000.00uA/H,600.00%}\n" + + "BS=0,I=0,D=1,P=0:{5m,100,1200.00uA/H,120.00%}\n" + + "BS=1,I=0,D=1,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=0,I=1,D=1,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=1,I=1,D=1,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=0,I=0,D=2,P=0:{1m,200,12000.00uA/H,1200.00%}\n" + + "BS=1,I=0,D=2,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=0,I=1,D=2,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=1,I=1,D=2,P=0:{0m,0,0.00uA/H,0.00%}\n" + + "BS=1,I=1,D=0,P=1:{5m,1000,12000.00uA/H,1200.00%}", target.toDebugString()); } @@ -242,7 +263,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); verify(mMetricsLogger, times(0)).count(anyString(), anyInt()); @@ -253,7 +275,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); assertLog(); @@ -264,7 +287,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.DEEP); + DozeState.DEEP, + PlugState.UNPLUGGED); target.advanceClock(1); target.drainBattery(2000); @@ -274,7 +298,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.OFF, InteractiveState.NON_INTERACTIVE, - DozeState.LIGHT); + DozeState.LIGHT, + PlugState.UNPLUGGED); target.advanceClock(1); target.drainBattery(2000); @@ -284,7 +309,8 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.ON, InteractiveState.INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); assertLog(); @@ -292,7 +318,11 @@ public class BatterySavingStatsTest { target.drainBattery(10000); reset(mMetricsLogger); - target.startCharging(); + target.transitionState( + BatterySaverState.ON, + InteractiveState.INTERACTIVE, + DozeState.NOT_DOZING, + PlugState.PLUGGED); assertLog(); @@ -303,14 +333,19 @@ public class BatterySavingStatsTest { target.transitionState( BatterySaverState.ON, InteractiveState.NON_INTERACTIVE, - DozeState.NOT_DOZING); + DozeState.NOT_DOZING, + PlugState.UNPLUGGED); verify(mMetricsLogger, times(0)).count(anyString(), anyInt()); target.advanceClock(1); target.drainBattery(2000); - target.startCharging(); + target.transitionState( + BatterySaverState.ON, + InteractiveState.NON_INTERACTIVE, + DozeState.NOT_DOZING, + PlugState.PLUGGED); assertLog(); } diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java index 971d2e28b14e..153634548c17 100644 --- a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java @@ -21,12 +21,16 @@ import static android.app.timezonedetector.TimeZoneCapabilities.CAPABILITY_POSSE import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.app.timezonedetector.ITimeZoneConfigurationListener; @@ -158,10 +162,24 @@ public class TimeZoneDetectorServiceTest { } } + @Test(expected = SecurityException.class) + public void testRemoveConfigurationListener_withoutPermission() { + doThrow(new SecurityException("Mock")) + .when(mMockContext).enforceCallingPermission(anyString(), any()); + + ITimeZoneConfigurationListener mockListener = mock(ITimeZoneConfigurationListener.class); + try { + mTimeZoneDetectorService.removeConfigurationListener(mockListener); + fail(); + } finally { + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), + anyString()); + } + } + @Test public void testConfigurationChangeListenerRegistrationAndCallbacks() throws Exception { - doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); - TimeZoneConfiguration autoDetectDisabledConfiguration = createTimeZoneConfiguration(false /* autoDetectionEnabled */); @@ -169,22 +187,69 @@ public class TimeZoneDetectorServiceTest { IBinder mockListenerBinder = mock(IBinder.class); ITimeZoneConfigurationListener mockListener = mock(ITimeZoneConfigurationListener.class); - when(mockListener.asBinder()).thenReturn(mockListenerBinder); - mTimeZoneDetectorService.addConfigurationListener(mockListener); + { + doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); + when(mockListener.asBinder()).thenReturn(mockListenerBinder); - verify(mMockContext).enforceCallingPermission( - eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), - anyString()); - verify(mockListenerBinder).linkToDeath(any(), eq(0)); + mTimeZoneDetectorService.addConfigurationListener(mockListener); - // Simulate the configuration being changed and verify the mockListener was notified. - TimeZoneConfiguration autoDetectEnabledConfiguration = - createTimeZoneConfiguration(true /* autoDetectionEnabled */); - mFakeTimeZoneDetectorStrategy.updateConfiguration( - ARBITRARY_USER_ID, autoDetectEnabledConfiguration); + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), + anyString()); + verify(mockListener).asBinder(); + verify(mockListenerBinder).linkToDeath(any(), anyInt()); + verifyNoMoreInteractions(mockListenerBinder, mockListener, mMockContext); + reset(mockListenerBinder, mockListener, mMockContext); + } + + { + doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); + + // Simulate the configuration being changed and verify the mockListener was notified. + TimeZoneConfiguration autoDetectEnabledConfiguration = + createTimeZoneConfiguration(true /* autoDetectionEnabled */); + + mTimeZoneDetectorService.updateConfiguration(autoDetectEnabledConfiguration); + + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), + anyString()); + verify(mockListener).onChange(autoDetectEnabledConfiguration); + verifyNoMoreInteractions(mockListenerBinder, mockListener, mMockContext); + reset(mockListenerBinder, mockListener, mMockContext); + } + + { + doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); + when(mockListener.asBinder()).thenReturn(mockListenerBinder); + when(mockListenerBinder.unlinkToDeath(any(), anyInt())).thenReturn(true); + + // Now remove the listener, change the config again, and verify the listener is not + // called. + mTimeZoneDetectorService.removeConfigurationListener(mockListener); - verify(mockListener).onChange(autoDetectEnabledConfiguration); + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), + anyString()); + verify(mockListener).asBinder(); + verify(mockListenerBinder).unlinkToDeath(any(), eq(0)); + verifyNoMoreInteractions(mockListenerBinder, mockListener, mMockContext); + reset(mockListenerBinder, mockListener, mMockContext); + } + + { + doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); + + mTimeZoneDetectorService.updateConfiguration(autoDetectDisabledConfiguration); + + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.WRITE_SECURE_SETTINGS), + anyString()); + verify(mockListener, never()).onChange(any()); + verifyNoMoreInteractions(mockListenerBinder, mockListener, mMockContext); + reset(mockListenerBinder, mockListener, mMockContext); + } } @Test(expected = SecurityException.class) diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java index 1a04d2ff8c29..4dec7a1a0ab9 100644 --- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java @@ -218,6 +218,10 @@ public class AppStandbyControllerTests { } @Override + void updatePowerWhitelistCache() { + } + + @Override boolean isRestrictedBucketEnabled() { return mIsRestrictedBucketEnabled; } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java index e3bb1b6ca9f3..c60abe8d51d1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java @@ -65,9 +65,9 @@ public class ActivityDisplayTests extends ActivityTestsBase { // Create a stack at bottom. final TaskDisplayArea taskDisplayAreas = mRootWindowContainer.getDefaultDisplay().getDefaultTaskDisplayArea(); - final ActivityStack stack = + final Task stack = new StackBuilder(mRootWindowContainer).setOnTop(!ON_TOP).build(); - final ActivityStack prevFocusedStack = taskDisplayAreas.getFocusedStack(); + final Task prevFocusedStack = taskDisplayAreas.getFocusedStack(); stack.moveToFront("moveStackToFront"); // After moving the stack to front, the previous focused should be the last focused. @@ -86,7 +86,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { @Test public void testFullscreenStackCanBeFocusedWhenFocusablePinnedStackExists() { // Create a pinned stack and move to front. - final ActivityStack pinnedStack = mRootWindowContainer.getDefaultTaskDisplayArea() + final Task pinnedStack = mRootWindowContainer.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, ON_TOP); final Task pinnedTask = new TaskBuilder(mService.mStackSupervisor) .setStack(pinnedStack).build(); @@ -98,7 +98,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { assertTrue(pinnedStack.isFocusedStackOnDisplay()); // Create a fullscreen stack and move to front. - final ActivityStack fullscreenStack = createFullscreenStackWithSimpleActivityAt( + final Task fullscreenStack = createFullscreenStackWithSimpleActivityAt( mRootWindowContainer.getDefaultDisplay()); fullscreenStack.moveToFront("moveFullscreenStackToFront"); @@ -114,8 +114,8 @@ public class ActivityDisplayTests extends ActivityTestsBase { public void testStackShouldNotBeFocusedAfterMovingToBackOrRemoving() { // Create a display which only contains 2 stacks. final DisplayContent display = addNewDisplayContentAt(DisplayContent.POSITION_TOP); - final ActivityStack stack1 = createFullscreenStackWithSimpleActivityAt(display); - final ActivityStack stack2 = createFullscreenStackWithSimpleActivityAt(display); + final Task stack1 = createFullscreenStackWithSimpleActivityAt(display); + final Task stack2 = createFullscreenStackWithSimpleActivityAt(display); // Put stack1 and stack2 on top. stack1.moveToFront("moveStack1ToFront"); @@ -143,11 +143,11 @@ public class ActivityDisplayTests extends ActivityTestsBase { doReturn(false).when(display).shouldDestroyContentOnRemove(); // Put home stack on the display. - final ActivityStack homeStack = new StackBuilder(mRootWindowContainer) + final Task homeStack = new StackBuilder(mRootWindowContainer) .setDisplay(display).setActivityType(ACTIVITY_TYPE_HOME).build(); // Put a finishing standard activity which will be reparented. - final ActivityStack stack = createFullscreenStackWithSimpleActivityAt(display); + final Task stack = createFullscreenStackWithSimpleActivityAt(display); stack.topRunningActivity().makeFinishingLocked(); clearInvocations(homeStack); @@ -158,8 +158,8 @@ public class ActivityDisplayTests extends ActivityTestsBase { verify(homeStack, never()).resumeTopActivityUncheckedLocked(any(), any()); } - private ActivityStack createFullscreenStackWithSimpleActivityAt(DisplayContent display) { - final ActivityStack fullscreenStack = display.getDefaultTaskDisplayArea().createStack( + private Task createFullscreenStackWithSimpleActivityAt(DisplayContent display) { + final Task fullscreenStack = display.getDefaultTaskDisplayArea().createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP); final Task fullscreenTask = new TaskBuilder(mService.mStackSupervisor) .setStack(fullscreenStack).build(); @@ -174,11 +174,11 @@ public class ActivityDisplayTests extends ActivityTestsBase { public void testTopRunningActivity() { final DisplayContent display = mRootWindowContainer.getDefaultDisplay(); final KeyguardController keyguard = mSupervisor.getKeyguardController(); - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord activity = stack.getTopNonFinishingActivity(); // Create empty stack on top. - final ActivityStack emptyStack = + final Task emptyStack = new StackBuilder(mRootWindowContainer).setCreateActivity(false).build(); // Make sure the top running activity is not affected when keyguard is not locked. @@ -223,7 +223,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { @Test public void testAlwaysOnTopStackLocation() { final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack alwaysOnTopStack = taskDisplayArea.createStack(WINDOWING_MODE_FREEFORM, + final Task alwaysOnTopStack = taskDisplayArea.createStack(WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); final ActivityRecord activity = new ActivityBuilder(mService).setCreateTask(true) .setStack(alwaysOnTopStack).build(); @@ -234,12 +234,12 @@ public class ActivityDisplayTests extends ActivityTestsBase { assertTrue(alwaysOnTopStack.getTopNonFinishingActivity().isAlwaysOnTop()); assertEquals(alwaysOnTopStack, taskDisplayArea.getTopStack()); - final ActivityStack pinnedStack = taskDisplayArea.createStack( + final Task pinnedStack = taskDisplayArea.createStack( WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(pinnedStack, taskDisplayArea.getRootPinnedTask()); assertEquals(pinnedStack, taskDisplayArea.getTopStack()); - final ActivityStack anotherAlwaysOnTopStack = taskDisplayArea.createStack( + final Task anotherAlwaysOnTopStack = taskDisplayArea.createStack( WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); anotherAlwaysOnTopStack.setAlwaysOnTop(true); taskDisplayArea.positionStackAtTop(anotherAlwaysOnTopStack, false /* includingParents */); @@ -249,7 +249,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { // existing alwaysOnTop stack. assertEquals(anotherAlwaysOnTopStack, taskDisplayArea.getStackAt(topPosition - 1)); - final ActivityStack nonAlwaysOnTopStack = taskDisplayArea.createStack( + final Task nonAlwaysOnTopStack = taskDisplayArea.createStack( WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(taskDisplayArea, nonAlwaysOnTopStack.getDisplayArea()); topPosition = taskDisplayArea.getStackCount() - 1; @@ -273,7 +273,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { assertTrue(anotherAlwaysOnTopStack.isAlwaysOnTop()); assertEquals(anotherAlwaysOnTopStack, taskDisplayArea.getStackAt(topPosition - 1)); - final ActivityStack dreamStack = taskDisplayArea.createStack( + final Task dreamStack = taskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_DREAM, true /* onTop */); assertEquals(taskDisplayArea, dreamStack.getDisplayArea()); assertTrue(dreamStack.isAlwaysOnTop()); @@ -282,7 +282,7 @@ public class ActivityDisplayTests extends ActivityTestsBase { assertEquals(dreamStack, taskDisplayArea.getTopStack()); assertEquals(pinnedStack, taskDisplayArea.getStackAt(topPosition - 1)); - final ActivityStack assistStack = taskDisplayArea.createStack( + final Task assistStack = taskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_ASSISTANT, true /* onTop */); assertEquals(taskDisplayArea, assistStack.getDisplayArea()); assertFalse(assistStack.isAlwaysOnTop()); @@ -310,13 +310,13 @@ public class ActivityDisplayTests extends ActivityTestsBase { private void removeStackTests(Runnable runnable) { final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack stack1 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task stack1 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP); - final ActivityStack stack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task stack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP); - final ActivityStack stack3 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task stack3 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP); - final ActivityStack stack4 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task stack4 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, ON_TOP); final Task task1 = new TaskBuilder(mService.mStackSupervisor).setStack(stack1).build(); final Task task2 = new TaskBuilder(mService.mStackSupervisor).setStack(stack2).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java index e1ce431fc97c..feac6dbe1051 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java @@ -341,7 +341,7 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { public void testConsecutiveLaunchOnDifferentDisplay() { onActivityLaunched(mTopActivity); - final ActivityStack stack = new StackBuilder(mRootWindowContainer) + final Task stack = new StackBuilder(mRootWindowContainer) .setDisplay(addNewDisplayContentAt(DisplayContent.POSITION_BOTTOM)) .setCreateActivity(false) .build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 76b1a4d69f05..e45ced64c5b6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -45,19 +45,19 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static com.android.server.wm.ActivityRecord.FINISH_RESULT_CANCELLED; import static com.android.server.wm.ActivityRecord.FINISH_RESULT_REMOVED; import static com.android.server.wm.ActivityRecord.FINISH_RESULT_REQUESTED; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; -import static com.android.server.wm.ActivityStack.ActivityState.FINISHING; -import static com.android.server.wm.ActivityStack.ActivityState.INITIALIZING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STARTED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT; +import static com.android.server.wm.Task.ActivityState.DESTROYED; +import static com.android.server.wm.Task.ActivityState.DESTROYING; +import static com.android.server.wm.Task.ActivityState.FINISHING; +import static com.android.server.wm.Task.ActivityState.INITIALIZING; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STARTED; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; +import static com.android.server.wm.Task.STACK_VISIBILITY_INVISIBLE; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT; import static com.google.common.truth.Truth.assertThat; @@ -106,7 +106,7 @@ import android.view.WindowManagerGlobal; import androidx.test.filters.MediumTest; import com.android.internal.R; -import com.android.server.wm.ActivityStack.ActivityState; +import com.android.server.wm.Task.ActivityState; import org.junit.Before; import org.junit.Test; @@ -123,7 +123,7 @@ import org.mockito.invocation.InvocationOnMock; @Presubmit @RunWith(WindowTestRunner.class) public class ActivityRecordTests extends ActivityTestsBase { - private ActivityStack mStack; + private Task mStack; private Task mTask; private ActivityRecord mActivity; @@ -292,7 +292,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testSetsRelaunchReason_NotDragResizing() { - mActivity.setState(ActivityStack.ActivityState.RESUMED, "Testing"); + mActivity.setState(Task.ActivityState.RESUMED, "Testing"); mTask.onRequestedOverrideConfigurationChanged(mTask.getConfiguration()); mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(), @@ -315,7 +315,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testSetsRelaunchReason_DragResizing() { - mActivity.setState(ActivityStack.ActivityState.RESUMED, "Testing"); + mActivity.setState(Task.ActivityState.RESUMED, "Testing"); mTask.onRequestedOverrideConfigurationChanged(mTask.getConfiguration()); mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(), @@ -340,7 +340,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testSetsRelaunchReason_NonResizeConfigChanges() { - mActivity.setState(ActivityStack.ActivityState.RESUMED, "Testing"); + mActivity.setState(Task.ActivityState.RESUMED, "Testing"); mTask.onRequestedOverrideConfigurationChanged(mTask.getConfiguration()); mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(), @@ -366,7 +366,7 @@ public class ActivityRecordTests extends ActivityTestsBase { .setTask(mTask) .setConfigChanges(CONFIG_ORIENTATION | CONFIG_SCREEN_LAYOUT) .build(); - mActivity.setState(ActivityStack.ActivityState.RESUMED, "Testing"); + mActivity.setState(Task.ActivityState.RESUMED, "Testing"); mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(), mActivity.getConfiguration())); @@ -489,7 +489,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testShouldMakeActive_deferredResume() { - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); mSupervisor.beginDeferResume(); assertEquals(false, mActivity.shouldMakeActive(null /* activeActivity */)); @@ -503,14 +503,14 @@ public class ActivityRecordTests extends ActivityTestsBase { ActivityRecord finishingActivity = new ActivityBuilder(mService).setTask(mTask).build(); finishingActivity.finishing = true; ActivityRecord topActivity = new ActivityBuilder(mService).setTask(mTask).build(); - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); assertEquals(false, mActivity.shouldMakeActive(null /* activeActivity */)); } @Test public void testShouldResume_stackVisibility() { - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); spyOn(mStack); doReturn(STACK_VISIBILITY_VISIBLE).when(mStack).getVisibility(null); @@ -525,7 +525,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testShouldResumeOrPauseWithResults() { - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); spyOn(mStack); ActivityRecord topActivity = new ActivityBuilder(mService).setTask(mTask).build(); @@ -544,9 +544,9 @@ public class ActivityRecordTests extends ActivityTestsBase { .setLaunchTaskBehind(true) .setConfigChanges(CONFIG_ORIENTATION) .build(); - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); try { doReturn(false).when(stack).isTranslucent(any()); assertFalse(mStack.shouldBeVisible(null /* starting */)); @@ -585,7 +585,7 @@ public class ActivityRecordTests extends ActivityTestsBase { public void testShouldStartWhenMakeClientActive() { ActivityRecord topActivity = new ActivityBuilder(mService).setTask(mTask).build(); topActivity.setOccludesParent(false); - mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing"); + mActivity.setState(Task.ActivityState.STOPPED, "Testing"); mActivity.setVisibility(true); mActivity.makeActiveIfNeeded(null /* activeActivity */); assertEquals(STARTED, mActivity.getState()); @@ -754,14 +754,14 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testFinishActivityIfPossible_adjustStackOrder() { // Prepare the stacks with order (top to bottom): mStack, stack1, stack2. - final ActivityStack stack1 = new StackBuilder(mRootWindowContainer).build(); + final Task stack1 = new StackBuilder(mRootWindowContainer).build(); mStack.moveToFront("test"); // The stack2 is needed here for moving back to simulate the // {@link DisplayContent#mPreferredTopFocusableStack} is cleared, so // {@link DisplayContent#getFocusedStack} will rely on the order of focusable-and-visible // stacks. Then when mActivity is finishing, its stack will be invisible (no running // activities in the stack) that is the key condition to verify. - final ActivityStack stack2 = new StackBuilder(mRootWindowContainer).build(); + final Task stack2 = new StackBuilder(mRootWindowContainer).build(); stack2.moveToBack("test", stack2.getBottomMostTask()); assertTrue(mStack.isTopStackInDisplayArea()); @@ -787,7 +787,7 @@ public class ActivityRecordTests extends ActivityTestsBase { .setCreateTask(true) .setStack(mStack) .build(); - ActivityStack topRootableTask = (ActivityStack) topActivity.getTask(); + Task topRootableTask = topActivity.getTask(); topRootableTask.moveToFront("test"); assertTrue(mStack.isTopStackInDisplayArea()); @@ -807,7 +807,7 @@ public class ActivityRecordTests extends ActivityTestsBase { public void testFinishActivityIfPossible_PreferredTopStackChanged() { final ActivityRecord topActivityOnNonTopDisplay = createActivityOnDisplay(true /* defaultDisplay */, null /* process */); - ActivityStack topRootableTask = topActivityOnNonTopDisplay.getRootTask(); + Task topRootableTask = topActivityOnNonTopDisplay.getRootTask(); topRootableTask.moveToFront("test"); assertTrue(topRootableTask.isTopStackInDisplayArea()); assertEquals(topRootableTask, topActivityOnNonTopDisplay.getDisplayArea() @@ -971,7 +971,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // Simulates that {@code currentTop} starts an existing activity from background (so its // state is stopped) and the starting flow just goes to place it at top. - final ActivityStack nextStack = new StackBuilder(mRootWindowContainer).build(); + final Task nextStack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord nextTop = nextStack.getTopNonFinishingActivity(); nextTop.setState(STOPPED, "test"); @@ -1093,7 +1093,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // Add another stack to become focused and make the activity there visible. This way it // simulates finishing in non-focused stack in split-screen. - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord focusedActivity = stack.getTopMostActivity(); focusedActivity.nowVisible = true; focusedActivity.mVisibleRequested = true; @@ -1199,7 +1199,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testDestroyIfPossible_lastActivityAboveEmptyHomeStack() { // Empty the home stack. - final ActivityStack homeStack = mActivity.getDisplayArea().getRootHomeTask(); + final Task homeStack = mActivity.getDisplayArea().getRootHomeTask(); homeStack.forAllLeafTasks((t) -> { homeStack.removeChild(t, "test"); }, true /* traverseTopToBottom */); @@ -1225,7 +1225,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testCompleteFinishing_lastActivityAboveEmptyHomeStack() { // Empty the home stack. - final ActivityStack homeStack = mActivity.getDisplayArea().getRootHomeTask(); + final Task homeStack = mActivity.getDisplayArea().getRootHomeTask(); homeStack.forAllLeafTasks((t) -> { homeStack.removeChild(t, "test"); }, true /* traverseTopToBottom */); @@ -1325,7 +1325,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testRemoveFromHistory() { - final ActivityStack stack = mActivity.getRootTask(); + final Task stack = mActivity.getRootTask(); final Task task = mActivity.getTask(); mActivity.removeFromHistory("test"); @@ -1334,7 +1334,7 @@ public class ActivityRecordTests extends ActivityTestsBase { assertNull(mActivity.app); assertNull(mActivity.getTask()); assertEquals(0, task.getChildCount()); - assertEquals(task.getStack(), task); + assertEquals(task.getRootTask(), task); assertEquals(0, stack.getChildCount()); } @@ -1576,7 +1576,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // Create a new task with custom config to reparent the activity to. final Task newTask = - new TaskBuilder(mSupervisor).setStack(initialTask.getStack()).build(); + new TaskBuilder(mSupervisor).setStack(initialTask.getRootTask()).build(); final Configuration newConfig = newTask.getConfiguration(); newConfig.densityDpi += 100; newTask.onRequestedOverrideConfigurationChanged(newConfig); @@ -1608,7 +1608,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // Create a new task with custom config to reparent the second activity to. final Task newTask = - new TaskBuilder(mSupervisor).setStack(initialTask.getStack()).build(); + new TaskBuilder(mSupervisor).setStack(initialTask.getRootTask()).build(); final Configuration newConfig = newTask.getConfiguration(); newConfig.densityDpi += 100; newTask.onRequestedOverrideConfigurationChanged(newConfig); @@ -1696,7 +1696,7 @@ public class ActivityRecordTests extends ActivityTestsBase { display = new TestDisplayContent.Builder(mService, 2000, 1000).setDensityDpi(300) .setPosition(DisplayContent.POSITION_TOP).build(); } - final ActivityStack stack = display.getDefaultTaskDisplayArea() + final Task stack = display.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, true /* onTop */); final Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); return new ActivityBuilder(mService).setTask(task).setUseProcess(process).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java index 5c6906cfa942..197c89a2d479 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; @Presubmit @RunWith(WindowTestRunner.class) public class ActivityStackSupervisorTests extends ActivityTestsBase { - private ActivityStack mFullscreenStack; + private Task mFullscreenStack; @Before public void setUp() throws Exception { @@ -113,7 +113,7 @@ public class ActivityStackSupervisorTests extends ActivityTestsBase { public void testHandleNonResizableTaskOnSecondaryDisplay() { // Create an unresizable task on secondary display. final DisplayContent newDisplay = addNewDisplayContentAt(DisplayContent.POSITION_TOP); - final ActivityStack stack = new StackBuilder(mRootWindowContainer) + final Task stack = new StackBuilder(mRootWindowContainer) .setDisplay(newDisplay).build(); final ActivityRecord unresizableActivity = stack.getTopNonFinishingActivity(); final Task task = unresizableActivity.getTask(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java index 373eed921580..5153af2b0d6b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java @@ -34,19 +34,19 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; -import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; -import static com.android.server.wm.ActivityStack.ActivityState.FINISHING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_INVISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE; -import static com.android.server.wm.ActivityStack.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE; +import static com.android.server.wm.Task.ActivityState.DESTROYING; +import static com.android.server.wm.Task.ActivityState.FINISHING; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; import static com.android.server.wm.Task.FLAG_FORCE_HIDDEN_FOR_TASK_ORG; import static com.android.server.wm.Task.REPARENT_MOVE_STACK_TO_FRONT; +import static com.android.server.wm.Task.STACK_VISIBILITY_INVISIBLE; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE; +import static com.android.server.wm.Task.STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT; import static com.android.server.wm.TaskDisplayArea.getStackAbove; import static com.android.server.wm.WindowContainer.POSITION_TOP; @@ -90,7 +90,7 @@ import java.util.function.Consumer; @RunWith(WindowTestRunner.class) public class ActivityStackTests extends ActivityTestsBase { private TaskDisplayArea mDefaultTaskDisplayArea; - private ActivityStack mStack; + private Task mStack; private Task mTask; @Before @@ -119,7 +119,7 @@ public class ActivityStackTests extends ActivityTestsBase { r.setState(RESUMED, "testResumedActivityFromTaskReparenting"); assertEquals(r, mStack.getResumedActivity()); - final ActivityStack destStack = mDefaultTaskDisplayArea.createStack( + final Task destStack = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); mTask.reparent(destStack, true /* toTop */, Task.REPARENT_KEEP_STACK_AT_FRONT, @@ -137,7 +137,7 @@ public class ActivityStackTests extends ActivityTestsBase { r.setState(RESUMED, "testResumedActivityFromActivityReparenting"); assertEquals(r, mStack.getResumedActivity()); - final ActivityStack destStack = mDefaultTaskDisplayArea.createStack( + final Task destStack = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); mTask.reparent(destStack, true /*toTop*/, REPARENT_MOVE_STACK_TO_FRONT, false, false, "testResumedActivityFromActivityReparenting"); @@ -153,7 +153,7 @@ public class ActivityStackTests extends ActivityTestsBase { organizer.setMoveToSecondaryOnEnter(false); // Create primary splitscreen stack. - final ActivityStack primarySplitScreen = mDefaultTaskDisplayArea.createStack( + final Task primarySplitScreen = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Assert windowing mode. @@ -178,10 +178,10 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveToPrimarySplitScreenThenMoveToBack() { TestSplitOrganizer organizer = new TestSplitOrganizer(mService); // This time, start with a fullscreen activitystack - final ActivityStack primarySplitScreen = mDefaultTaskDisplayArea.createStack( + final Task primarySplitScreen = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, true /* onTop */); - primarySplitScreen.reparent((ActivityStack) organizer.mPrimary, POSITION_TOP, + primarySplitScreen.reparent(organizer.mPrimary, POSITION_TOP, false /*moveParents*/, "test"); // Assert windowing mode. @@ -204,13 +204,13 @@ public class ActivityStackTests extends ActivityTestsBase { TestSplitOrganizer organizer = new TestSplitOrganizer(mService); // Set up split-screen with primary on top and secondary containing the home task below // another stack. - final ActivityStack primaryTask = mDefaultTaskDisplayArea.createStack( + final Task primaryTask = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack homeRoot = mDefaultTaskDisplayArea.getStack( + final Task homeRoot = mDefaultTaskDisplayArea.getStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME); - final ActivityStack secondaryTask = mDefaultTaskDisplayArea.createStack( + final Task secondaryTask = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); - mDefaultTaskDisplayArea.positionStackAtTop((ActivityStack) organizer.mPrimary, + mDefaultTaskDisplayArea.positionStackAtTop(organizer.mPrimary, false /* includingParents */); // Move primary to back. @@ -228,7 +228,7 @@ public class ActivityStackTests extends ActivityTestsBase { assertEquals(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, primaryTask.getWindowingMode()); // Move secondary to back via parent (should be equivalent) - ((ActivityStack) organizer.mSecondary).moveToBack("test", secondaryTask); + organizer.mSecondary.moveToBack("test", secondaryTask); // Assert that it is now in back but still in secondary split assertEquals(1, homeRoot.compareTo(primaryTask)); @@ -239,12 +239,12 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testRemoveOrganizedTask_UpdateStackReference() { - final ActivityStack rootHomeTask = mDefaultTaskDisplayArea.getRootHomeTask(); + final Task rootHomeTask = mDefaultTaskDisplayArea.getRootHomeTask(); final ActivityRecord homeActivity = new ActivityBuilder(mService) .setStack(rootHomeTask) .setCreateTask(true) .build(); - final ActivityStack secondaryStack = (ActivityStack) WindowContainer.fromBinder( + final Task secondaryStack = (Task) WindowContainer.fromBinder( mService.mTaskOrganizerController.createRootTask(rootHomeTask.getDisplayId(), WINDOWING_MODE_SPLIT_SCREEN_SECONDARY).token.asBinder()); @@ -258,7 +258,7 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testStackInheritsDisplayWindowingMode() { - final ActivityStack primarySplitScreen = mDefaultTaskDisplayArea.createStack( + final Task primarySplitScreen = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(WINDOWING_MODE_FULLSCREEN, primarySplitScreen.getWindowingMode()); @@ -273,7 +273,7 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testStackOverridesDisplayWindowingMode() { - final ActivityStack primarySplitScreen = mDefaultTaskDisplayArea.createStack( + final Task primarySplitScreen = mDefaultTaskDisplayArea.createStack( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(WINDOWING_MODE_FULLSCREEN, primarySplitScreen.getWindowingMode()); @@ -354,9 +354,9 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveStackToBackIncludingParent() { final TaskDisplayArea taskDisplayArea = addNewDisplayContentAt(DisplayContent.POSITION_TOP) .getDefaultTaskDisplayArea(); - final ActivityStack stack1 = createStackForShouldBeVisibleTest(taskDisplayArea, + final Task stack1 = createStackForShouldBeVisibleTest(taskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack stack2 = createStackForShouldBeVisibleTest(taskDisplayArea, + final Task stack2 = createStackForShouldBeVisibleTest(taskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Do not move display to back because there is still another stack. @@ -371,9 +371,9 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testShouldBeVisible_Fullscreen() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Add an activity to the pinned stack so it isn't considered empty for visibility check. final ActivityRecord pinnedActivity = new ActivityBuilder(mService) @@ -384,7 +384,7 @@ public class ActivityStackTests extends ActivityTestsBase { assertTrue(homeStack.shouldBeVisible(null /* starting */)); assertTrue(pinnedStack.shouldBeVisible(null /* starting */)); - final ActivityStack fullscreenStack = createStackForShouldBeVisibleTest( + final Task fullscreenStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Home stack shouldn't be visible behind an opaque fullscreen stack, but pinned stack @@ -402,14 +402,14 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testShouldBeVisible_SplitScreen() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); // Home stack should always be fullscreen for this test. doReturn(false).when(homeStack).supportsSplitScreenWindowingMode(); - final ActivityStack splitScreenPrimary = + final Task splitScreenPrimary = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack splitScreenSecondary = + final Task splitScreenSecondary = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -437,7 +437,7 @@ public class ActivityStackTests extends ActivityTestsBase { assertEquals(STACK_VISIBILITY_VISIBLE, splitScreenSecondary.getVisibility(null /* starting */)); - final ActivityStack splitScreenSecondary2 = + final Task splitScreenSecondary2 = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); // First split-screen secondary shouldn't be visible behind another opaque split-split @@ -460,7 +460,7 @@ public class ActivityStackTests extends ActivityTestsBase { assertEquals(STACK_VISIBILITY_VISIBLE, splitScreenSecondary2.getVisibility(null /* starting */)); - final ActivityStack assistantStack = createStackForShouldBeVisibleTest( + final Task assistantStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_ASSISTANT, true /* onTop */); @@ -531,13 +531,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_MultiLevel() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest( + final Task homeStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack splitPrimary = createStackForShouldBeVisibleTest( + final Task splitPrimary = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_UNDEFINED, true /* onTop */); - final ActivityStack splitSecondary = createStackForShouldBeVisibleTest( + final Task splitSecondary = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_UNDEFINED, true /* onTop */); @@ -556,7 +556,7 @@ public class ActivityStackTests extends ActivityTestsBase { // Add fullscreen translucent task that partially occludes split tasks - final ActivityStack translucentStack = createStandardStackForVisibilityTest( + final Task translucentStack = createStandardStackForVisibilityTest( WINDOWING_MODE_FULLSCREEN, true /* translucent */); // Fullscreen translucent task should be visible assertEquals(STACK_VISIBILITY_VISIBLE, translucentStack.getVisibility(null /* starting */)); @@ -580,10 +580,10 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenBehindTranslucent() { - final ActivityStack bottomStack = + final Task bottomStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); - final ActivityStack translucentStack = + final Task translucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); @@ -595,13 +595,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenBehindTranslucentAndOpaque() { - final ActivityStack bottomStack = + final Task bottomStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); - final ActivityStack translucentStack = + final Task translucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); - final ActivityStack opaqueStack = + final Task opaqueStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); @@ -613,13 +613,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenBehindOpaqueAndTranslucent() { - final ActivityStack bottomStack = + final Task bottomStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); - final ActivityStack opaqueStack = + final Task opaqueStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); - final ActivityStack translucentStack = + final Task translucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); @@ -632,10 +632,10 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenTranslucentBehindTranslucent() { - final ActivityStack bottomTranslucentStack = + final Task bottomTranslucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); - final ActivityStack translucentStack = + final Task translucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); @@ -647,10 +647,10 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenTranslucentBehindOpaque() { - final ActivityStack bottomTranslucentStack = + final Task bottomTranslucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); - final ActivityStack opaqueStack = + final Task opaqueStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); @@ -661,13 +661,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testGetVisibility_FullscreenBehindTranslucentAndPip() { - final ActivityStack bottomStack = + final Task bottomStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, false /* translucent */); - final ActivityStack translucentStack = + final Task translucentStack = createStandardStackForVisibilityTest(WINDOWING_MODE_FULLSCREEN, true /* translucent */); - final ActivityStack pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(STACK_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT, @@ -684,7 +684,7 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testShouldBeVisible_Finishing() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); ActivityRecord topRunningHomeActivity = homeStack.topRunningActivity(); if (topRunningHomeActivity == null) { @@ -694,7 +694,7 @@ public class ActivityStackTests extends ActivityTestsBase { .build(); } - final ActivityStack translucentStack = createStackForShouldBeVisibleTest( + final Task translucentStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); doReturn(true).when(translucentStack).isTranslucent(any()); @@ -717,7 +717,7 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testShouldBeVisible_FullscreenBehindTranslucentInHomeStack() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); final ActivityRecord firstActivity = new ActivityBuilder(mService) @@ -740,9 +740,9 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindBottomMostVisibleStack_NoMoveHomeBehindFullscreen() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack fullscreenStack = createStackForShouldBeVisibleTest( + final Task fullscreenStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -760,9 +760,9 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindBottomMostVisibleStack_NoMoveHomeBehindTranslucent() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack fullscreenStack = createStackForShouldBeVisibleTest( + final Task fullscreenStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -780,10 +780,10 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindBottomMostVisibleStack_NoMoveHomeOnTop() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack fullscreenStack = createStackForShouldBeVisibleTest( + final Task fullscreenStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); doReturn(false).when(homeStack).isTranslucent(any()); @@ -800,15 +800,15 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindBottomMostVisibleStack_MoveHomeBehindFullscreen() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack fullscreenStack1 = createStackForShouldBeVisibleTest( + final Task fullscreenStack1 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack2 = createStackForShouldBeVisibleTest( + final Task fullscreenStack2 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); doReturn(false).when(homeStack).isTranslucent(any()); @@ -827,12 +827,12 @@ public class ActivityStackTests extends ActivityTestsBase { testMoveHomeStackBehindBottomMostVisibleStack_MoveHomeBehindFullscreenAndTranslucent() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack fullscreenStack1 = createStackForShouldBeVisibleTest( + final Task fullscreenStack1 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack2 = createStackForShouldBeVisibleTest( + final Task fullscreenStack2 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -851,13 +851,13 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindStack_BehindHomeStack() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack fullscreenStack1 = createStackForShouldBeVisibleTest( + final Task fullscreenStack1 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack2 = createStackForShouldBeVisibleTest( + final Task fullscreenStack2 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); doReturn(false).when(homeStack).isTranslucent(any()); @@ -874,19 +874,19 @@ public class ActivityStackTests extends ActivityTestsBase { public void testMoveHomeStackBehindStack() { mDefaultTaskDisplayArea.removeStack(mStack); - final ActivityStack fullscreenStack1 = createStackForShouldBeVisibleTest( + final Task fullscreenStack1 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack2 = createStackForShouldBeVisibleTest( + final Task fullscreenStack2 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack3 = createStackForShouldBeVisibleTest( + final Task fullscreenStack3 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack fullscreenStack4 = createStackForShouldBeVisibleTest( + final Task fullscreenStack4 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); mDefaultTaskDisplayArea.moveStackBehindStack(homeStack, fullscreenStack1); @@ -901,13 +901,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testSetAlwaysOnTop() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); - final ActivityStack pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task pinnedStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); assertEquals(pinnedStack, getStackAbove(homeStack)); - final ActivityStack alwaysOnTopStack = createStackForShouldBeVisibleTest( + final Task alwaysOnTopStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); alwaysOnTopStack.setAlwaysOnTop(true); @@ -915,13 +915,13 @@ public class ActivityStackTests extends ActivityTestsBase { // Ensure (non-pinned) always on top stack is put below pinned stack. assertEquals(pinnedStack, getStackAbove(alwaysOnTopStack)); - final ActivityStack nonAlwaysOnTopStack = createStackForShouldBeVisibleTest( + final Task nonAlwaysOnTopStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Ensure non always on top stack is put below always on top stacks. assertEquals(alwaysOnTopStack, getStackAbove(nonAlwaysOnTopStack)); - final ActivityStack alwaysOnTopStack2 = createStackForShouldBeVisibleTest( + final Task alwaysOnTopStack2 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); alwaysOnTopStack2.setAlwaysOnTop(true); @@ -946,13 +946,13 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testSplitScreenMoveToFront() { - final ActivityStack splitScreenPrimary = createStackForShouldBeVisibleTest( + final Task splitScreenPrimary = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack splitScreenSecondary = createStackForShouldBeVisibleTest( + final Task splitScreenSecondary = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack assistantStack = createStackForShouldBeVisibleTest( + final Task assistantStack = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_ASSISTANT, true /* onTop */); @@ -977,18 +977,18 @@ public class ActivityStackTests extends ActivityTestsBase { } } - private ActivityStack createStandardStackForVisibilityTest(int windowingMode, + private Task createStandardStackForVisibilityTest(int windowingMode, boolean translucent) { - final ActivityStack stack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task stack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, windowingMode, ACTIVITY_TYPE_STANDARD, true /* onTop */); doReturn(translucent).when(stack).isTranslucent(any()); return stack; } @SuppressWarnings("TypeParameterUnusedInFormals") - private ActivityStack createStackForShouldBeVisibleTest( + private Task createStackForShouldBeVisibleTest( TaskDisplayArea taskDisplayArea, int windowingMode, int activityType, boolean onTop) { - final ActivityStack stack; + final Task stack; if (activityType == ACTIVITY_TYPE_HOME) { // Home stack and activity are created in ActivityTestsBase#setupActivityManagerService stack = mDefaultTaskDisplayArea.getStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME); @@ -1021,7 +1021,7 @@ public class ActivityStackTests extends ActivityTestsBase { // Note the activities have non-null ActivityRecord.app, so it won't remove directly. mRootWindowContainer.mFinishDisabledPackageActivitiesHelper.process( firstActivity.packageName, null /* filterByClasses */, true /* doit */, - true /* evenPersistent */, UserHandle.USER_ALL); + true /* evenPersistent */, UserHandle.USER_ALL, false /* onlyRemoveNoProcess */); // If the activity is disabled with {@link android.content.pm.PackageManager#DONT_KILL_APP} // the activity should still follow the normal flow to finish and destroy. @@ -1050,7 +1050,7 @@ public class ActivityStackTests extends ActivityTestsBase { mRootWindowContainer.mFinishDisabledPackageActivitiesHelper.process( activity.packageName, null /* filterByClasses */, true /* doit */, - true /* evenPersistent */, UserHandle.USER_ALL); + true /* evenPersistent */, UserHandle.USER_ALL, false /* onlyRemoveNoProcess */); // Although the overlay activity is in another package, the non-overlay activities are // removed from the task. Since the overlay activity should be removed as well, the task @@ -1152,7 +1152,7 @@ public class ActivityStackTests extends ActivityTestsBase { @Test public void testWontFinishHomeStackImmediately() { - final ActivityStack homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, + final Task homeStack = createStackForShouldBeVisibleTest(mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, true /* onTop */); ActivityRecord activity = homeStack.topRunningActivity(); @@ -1172,10 +1172,10 @@ public class ActivityStackTests extends ActivityTestsBase { public void testFinishCurrentActivity() { // Create 2 activities on a new display. final DisplayContent display = addNewDisplayContentAt(DisplayContent.POSITION_TOP); - final ActivityStack stack1 = createStackForShouldBeVisibleTest( + final Task stack1 = createStackForShouldBeVisibleTest( display.getDefaultTaskDisplayArea(), WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack stack2 = createStackForShouldBeVisibleTest( + final Task stack2 = createStackForShouldBeVisibleTest( display.getDefaultTaskDisplayArea(), WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -1194,7 +1194,7 @@ public class ActivityStackTests extends ActivityTestsBase { eq(display.mDisplayId), anyBoolean(), anyBoolean()); } - private ActivityRecord finishTopActivity(ActivityStack stack) { + private ActivityRecord finishTopActivity(Task stack) { final ActivityRecord activity = stack.topRunningActivity(); assertNotNull(activity); activity.setState(STOPPED, "finishTopActivity"); @@ -1252,7 +1252,7 @@ public class ActivityStackTests extends ActivityTestsBase { public void testStackOrderChangedOnPositionStack() { StackOrderChangedListener listener = new StackOrderChangedListener(); try { - final ActivityStack fullscreenStack1 = createStackForShouldBeVisibleTest( + final Task fullscreenStack1 = createStackForShouldBeVisibleTest( mDefaultTaskDisplayArea, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); mDefaultTaskDisplayArea.registerStackOrderChangedListener(listener); @@ -1382,7 +1382,7 @@ public class ActivityStackTests extends ActivityTestsBase { activities[i] = r; doReturn(null).when(mService).getProcessController( eq(r.processName), eq(r.info.applicationInfo.uid)); - r.setState(ActivityStack.ActivityState.INITIALIZING, "test"); + r.setState(Task.ActivityState.INITIALIZING, "test"); // Ensure precondition that the activity is opaque. assertTrue(r.occludesParent()); mSupervisor.startSpecificActivity(r, false /* andResume */, @@ -1443,7 +1443,7 @@ public class ActivityStackTests extends ActivityTestsBase { public boolean mChanged = false; @Override - public void onStackOrderChanged(ActivityStack stack) { + public void onStackOrderChanged(Task stack) { mChanged = true; } } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java index ca4456b7b926..c9a927901a37 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java @@ -77,7 +77,7 @@ public class ActivityStartControllerTests extends ActivityTestsBase { .setCreateTask(true) .build(); final int startFlags = random.nextInt(); - final ActivityStack stack = mService.mRootWindowContainer.getDefaultTaskDisplayArea() + final Task stack = mService.mRootWindowContainer.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); final WindowProcessController wpc = new WindowProcessController(mService, mService.mContext.getApplicationInfo(), "name", 12345, diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index e3b1d6306a81..f2f8a12b6ea9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -321,7 +321,7 @@ public class ActivityStarterTests extends ActivityTestsBase { if (mockGetLaunchStack) { // Instrument the stack and task used. - final ActivityStack stack = mRootWindowContainer.getDefaultTaskDisplayArea() + final Task stack = mRootWindowContainer.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); @@ -492,7 +492,7 @@ public class ActivityStarterTests extends ActivityTestsBase { private void assertNoTasks(DisplayContent display) { display.forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); assertFalse(stack.hasChild()); } }); @@ -741,7 +741,7 @@ public class ActivityStarterTests extends ActivityTestsBase { new TestDisplayContent.Builder(mService, 1000, 1500) .setPosition(POSITION_BOTTOM).build(); final TaskDisplayArea secondaryTaskContainer = secondaryDisplay.getDefaultTaskDisplayArea(); - final ActivityStack stack = secondaryTaskContainer.createStack( + final Task stack = secondaryTaskContainer.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Create an activity record on the top of secondary display. @@ -787,7 +787,7 @@ public class ActivityStarterTests extends ActivityTestsBase { ACTIVITY_TYPE_STANDARD, false /* onTop */)); // Create another activity on top of the secondary display. - final ActivityStack topStack = secondaryTaskContainer.createStack(WINDOWING_MODE_FULLSCREEN, + final Task topStack = secondaryTaskContainer.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); final Task topTask = new TaskBuilder(mSupervisor).setStack(topStack).build(); new ActivityBuilder(mService).setTask(topTask).build(); @@ -826,7 +826,7 @@ public class ActivityStarterTests extends ActivityTestsBase { Task task = topActivity.getTask(); starter.postStartActivityProcessing( - task.getTopNonFinishingActivity(), START_DELIVERED_TO_TOP, task.getStack()); + task.getTopNonFinishingActivity(), START_DELIVERED_TO_TOP, task.getRootTask()); verify(taskChangeNotifier).notifyActivityRestartAttempt( any(), anyBoolean(), anyBoolean(), anyBoolean()); @@ -835,14 +835,14 @@ public class ActivityStarterTests extends ActivityTestsBase { Task task2 = reusableActivity.getTask(); starter.postStartActivityProcessing( - task2.getTopNonFinishingActivity(), START_TASK_TO_FRONT, task.getStack()); + task2.getTopNonFinishingActivity(), START_TASK_TO_FRONT, task.getRootTask()); verify(taskChangeNotifier, times(2)).notifyActivityRestartAttempt( any(), anyBoolean(), anyBoolean(), anyBoolean()); verify(taskChangeNotifier).notifyActivityRestartAttempt( any(), anyBoolean(), anyBoolean(), eq(false)); } - private ActivityRecord createSingleTaskActivityOn(ActivityStack stack) { + private ActivityRecord createSingleTaskActivityOn(Task stack) { final ComponentName componentName = ComponentName.createRelative( DEFAULT_COMPONENT_PACKAGE_NAME, DEFAULT_COMPONENT_PACKAGE_NAME + ".SingleTaskActivity"); @@ -1046,7 +1046,7 @@ public class ActivityStarterTests extends ActivityTestsBase { targetRecord.setVisibility(false); final ActivityRecord sourceRecord = new ActivityBuilder(mService).build(); - final ActivityStack stack = spy( + final Task stack = spy( mRootWindowContainer.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, /* onTop */true)); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java index f65d6e0c82af..f8faae66c704 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java @@ -73,7 +73,7 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase { /** Verify that activity is finished correctly upon request. */ @Test public void testActivityFinish() { - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity(); assertTrue("Activity must be finished", mService.finishActivity(activity.appToken, 0 /* resultCode */, null /* resultData */, @@ -87,7 +87,7 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase { @Test public void testOnPictureInPictureRequested() throws RemoteException { - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity(); final ClientLifecycleManager mockLifecycleManager = mock(ClientLifecycleManager.class); doReturn(mockLifecycleManager).when(mService).getLifecycleManager(); @@ -106,7 +106,7 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase { @Test(expected = IllegalStateException.class) public void testOnPictureInPictureRequested_cannotEnterPip() throws RemoteException { - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity(); ClientLifecycleManager lifecycleManager = mService.getLifecycleManager(); doReturn(false).when(activity).inPinnedWindowingMode(); @@ -120,7 +120,7 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase { @Test(expected = IllegalStateException.class) public void testOnPictureInPictureRequested_alreadyInPIPMode() throws RemoteException { - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity(); ClientLifecycleManager lifecycleManager = mService.getLifecycleManager(); doReturn(true).when(activity).inPinnedWindowingMode(); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java index 9d0cd26bc040..5be2f0453bf4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java @@ -112,7 +112,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { private String mAffinity; private int mUid = 12345; private boolean mCreateTask; - private ActivityStack mStack; + private Task mStack; private int mActivityFlags; private int mLaunchMode; private int mResizeMode = RESIZE_MODE_RESIZEABLE; @@ -164,7 +164,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { return this; } - ActivityBuilder setStack(ActivityStack stack) { + ActivityBuilder setStack(Task stack) { mStack = stack; return this; } @@ -307,7 +307,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { wpc = mWpc; } else { wpc = new WindowProcessController(mService, - mService.mContext.getApplicationInfo(), mProcessName, mUid, + aInfo.applicationInfo, mProcessName, mUid, UserHandle.getUserId(12345), mock(Object.class), mock(WindowProcessListener.class)); wpc.setThread(mock(IApplicationThread.class)); @@ -338,7 +338,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { private IVoiceInteractionSession mVoiceSession; private boolean mCreateStack = true; - private ActivityStack mStack; + private Task mStack; private TaskDisplayArea mTaskDisplayArea; TaskBuilder(ActivityStackSupervisor supervisor) { @@ -384,7 +384,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { return this; } - TaskBuilder setStack(ActivityStack stack) { + TaskBuilder setStack(Task stack) { mStack = stack; return this; } @@ -418,7 +418,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { intent.setComponent(mComponent); intent.setFlags(mFlags); - final Task task = new ActivityStack(mSupervisor.mService, mTaskId, aInfo, + final Task task = new Task(mSupervisor.mService, mTaskId, aInfo, intent /*intent*/, mVoiceSession, null /*_voiceInteractor*/, null /*taskDescription*/, mStack); spyOn(task); @@ -503,11 +503,11 @@ class ActivityTestsBase extends SystemServiceTestsBase { return this; } - ActivityStack build() { + Task build() { SystemServicesTestRule.checkHoldsLock(mRootWindowContainer.mWmService.mGlobalLock); final int stackId = mStackId >= 0 ? mStackId : mTaskDisplayArea.getNextStackId(); - final ActivityStack stack = mTaskDisplayArea.createStackUnchecked( + final Task stack = mTaskDisplayArea.createStackUnchecked( mWindowingMode, mActivityType, stackId, mOnTop, mInfo, mIntent, false /* createdByOrganizer */); final ActivityStackSupervisor supervisor = mRootWindowContainer.mStackSupervisor; @@ -593,7 +593,7 @@ class ActivityTestsBase extends SystemServiceTestsBase { DisplayContent dc = mService.mRootWindowContainer.getDisplayContent(mDisplayId); dc.forAllTaskDisplayAreas(taskDisplayArea -> { for (int sNdx = taskDisplayArea.getStackCount() - 1; sNdx >= 0; --sNdx) { - final ActivityStack stack = taskDisplayArea.getStackAt(sNdx); + final Task stack = taskDisplayArea.getStackAt(sNdx); if (!WindowConfiguration.isSplitScreenWindowingMode(stack.getWindowingMode())) { stack.reparent(mSecondary, POSITION_BOTTOM); } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java index e8fab2b0243b..673feb260dd4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java @@ -53,14 +53,14 @@ import org.junit.runner.RunWith; @RunWith(WindowTestRunner.class) public class AppChangeTransitionTests extends WindowTestsBase { - private ActivityStack mStack; + private Task mStack; private Task mTask; private ActivityRecord mActivity; public void setUpOnDisplay(DisplayContent dc) { mActivity = createTestActivityRecord(dc, WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD); mTask = mActivity.getTask(); - mStack = mTask.getStack(); + mStack = mTask.getRootTask(); // Set a remote animator with snapshot disabled. Snapshots don't work in wmtests. RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java index 6b613cad4b82..d7baf8d05bd6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -134,12 +134,12 @@ public class AppTransitionControllerTest extends WindowTestsBase { // [DisplayContent] -+- [TaskStack1] - [Task1] - [ActivityRecord1] (opening, invisible) // +- [TaskStack2] - [Task2] - [ActivityRecord2] (closing, visible) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1); activity1.setVisible(false); activity1.mVisibleRequested = true; - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2); final ArraySet<ActivityRecord> opening = new ArraySet<>(); @@ -162,10 +162,10 @@ public class AppTransitionControllerTest extends WindowTestsBase { public void testGetAnimationTargets_visibilityAlreadyUpdated() { // [DisplayContent] -+- [TaskStack1] - [Task1] - [ActivityRecord1] (opening, visible) // +- [TaskStack2] - [Task2] - [ActivityRecord2] (closing, invisible) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1); - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2); activity2.setVisible(false); activity2.mVisibleRequested = false; @@ -199,11 +199,45 @@ public class AppTransitionControllerTest extends WindowTestsBase { } @Test + public void testGetAnimationTargets_visibilityAlreadyUpdated_butForcedTransitionRequested() { + // [DisplayContent] -+- [TaskStack1] - [Task1] - [ActivityRecord1] (closing, invisible) + // +- [TaskStack2] - [Task2] - [ActivityRecord2] (opening, visible) + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); + final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1); + activity1.setVisible(true); + activity1.mVisibleRequested = true; + activity1.mRequestForceTransition = true; + + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); + final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2); + activity2.setVisible(false); + activity2.mVisibleRequested = false; + activity2.mRequestForceTransition = true; + + final ArraySet<ActivityRecord> opening = new ArraySet<>(); + opening.add(activity1); + final ArraySet<ActivityRecord> closing = new ArraySet<>(); + closing.add(activity2); + + // The visibility are already updated, but since forced transition is requested, it will + // be included. + WindowManagerService.sHierarchicalAnimations = false; + assertEquals( + new ArraySet<>(new WindowContainer[]{activity1}), + AppTransitionController.getAnimationTargets( + opening, closing, true /* visible */)); + assertEquals( + new ArraySet<>(new WindowContainer[]{activity2}), + AppTransitionController.getAnimationTargets( + opening, closing, false /* visible */)); + } + + @Test public void testGetAnimationTargets_exitingBeforeTransition() { // Create another non-empty task so the animation target won't promote to task display area. WindowTestUtils.createTestActivityRecord( mDisplayContent.getDefaultTaskDisplayArea().getOrCreateRootHomeTask()); - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(stack); activity.setVisible(false); activity.mIsExiting = true; @@ -232,7 +266,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // +- [AppWindow1] (being-replaced) // +- [TaskStack2] - [Task2] - [ActivityRecord2] (closing, invisible) // +- [AppWindow2] (being-replaced) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(stack1); final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams( TYPE_BASE_APPLICATION); @@ -241,7 +275,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { appWindow1.mWillReplaceWindow = true; activity1.addWindow(appWindow1); - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(stack2); activity2.setVisible(false); activity2.mVisibleRequested = false; @@ -288,7 +322,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // | // +- [TaskStack2] - [Task2] -+- [ActivityRecord3] (closing, visible) // +- [ActivityRecord4] (invisible) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack1, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task1); @@ -299,7 +333,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { activity2.setVisible(false); activity2.mVisibleRequested = false; - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final Task task2 = createTaskInStack(stack2, 0 /* userId */); final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task2); @@ -331,7 +365,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // [DisplayContent] - [TaskStack] - [Task] -+- [ActivityRecord1] (opening, invisible) // +- [ActivityRecord2] (closing, visible) - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task); @@ -367,7 +401,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // +- [TaskStack2] - [Task2] -+- [ActivityRecord3] (closing, visible) // +- [ActivityRecord4] (visible) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack1, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task1); @@ -378,7 +412,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task1); - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final Task task2 = createTaskInStack(stack2, 0 /* userId */); final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task2); @@ -413,7 +447,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // +- [TaskStack2] - [Task2] -+- [ActivityRecord3] (closing, visible) // +- [ActivityRecord4] (closing, visible) - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack1, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task1); @@ -426,7 +460,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { activity2.setVisible(false); activity2.mVisibleRequested = true; - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final Task task2 = createTaskInStack(stack2, 0 /* userId */); final ActivityRecord activity3 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task2); @@ -459,7 +493,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { // [DisplayContent] - [TaskStack] -+- [Task1] - [ActivityRecord1] (opening, invisible) // +- [Task2] - [ActivityRecord2] (closing, visible) - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask( mDisplayContent, task1); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java index 8c8fd0516623..17914e7fb68c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java @@ -47,7 +47,6 @@ import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import android.view.WindowManager; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import org.junit.Before; @@ -150,7 +149,7 @@ public class AppTransitionTests extends WindowTestsBase { final DisplayContent dc1 = createNewDisplay(Display.STATE_ON); final DisplayContent dc2 = createNewDisplay(Display.STATE_ON); - final ActivityStack stack1 = createTaskStackOnDisplay(dc1); + final Task stack1 = createTaskStackOnDisplay(dc1); final Task task1 = createTaskInStack(stack1, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(dc1); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java index c8b668bac455..97a2ebe98abb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java @@ -82,7 +82,7 @@ import java.util.ArrayList; @RunWith(WindowTestRunner.class) public class AppWindowTokenTests extends WindowTestsBase { - ActivityStack mStack; + Task mStack; Task mTask; ActivityRecord mActivity; @@ -484,7 +484,7 @@ public class AppWindowTokenTests extends WindowTestsBase { } private ActivityRecord createIsolatedTestActivityRecord() { - final ActivityStack taskStack = createTaskStackOnDisplay(mDisplayContent); + final Task taskStack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(taskStack, 0 /* userId */); return createTestActivityRecordForGivenTask(task); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyBuilderTest.java b/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyBuilderTest.java index a8fc66da9bd0..4abb6059cc59 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyBuilderTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyBuilderTest.java @@ -26,9 +26,11 @@ import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManagerPolicyConstants.APPLICATION_LAYER; import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER; +import static android.window.DisplayAreaOrganizer.FEATURE_FULLSCREEN_MAGNIFICATION; import static android.window.DisplayAreaOrganizer.FEATURE_ONE_HANDED; import static android.window.DisplayAreaOrganizer.FEATURE_ROOT; import static android.window.DisplayAreaOrganizer.FEATURE_VENDOR_FIRST; +import static android.window.DisplayAreaOrganizer.FEATURE_WINDOWED_MAGNIFICATION; import static com.android.server.wm.DisplayArea.Type.ABOVE_TASKS; import static com.android.server.wm.DisplayAreaPolicyBuilder.Feature; @@ -178,6 +180,39 @@ public class DisplayAreaPolicyBuilderTest { } @Test + public void testBuilder_defaultPolicy_hasWindowedMagnificationFeature() { + final DisplayAreaPolicy.Provider defaultProvider = DisplayAreaPolicy.Provider.fromResources( + resourcesWithProvider("")); + final DisplayAreaPolicyBuilder.Result defaultPolicy = + (DisplayAreaPolicyBuilder.Result) defaultProvider.instantiate(mWms, mDisplayContent, + mRoot, mImeContainer); + final List<Feature> features = defaultPolicy.getFeatures(); + boolean hasWindowedMagnificationFeature = false; + for (Feature feature : features) { + hasWindowedMagnificationFeature |= feature.getId() == FEATURE_WINDOWED_MAGNIFICATION; + } + + assertThat(hasWindowedMagnificationFeature).isTrue(); + } + + @Test + public void testBuilder_defaultPolicy_hasFullscreenMagnificationFeature() { + final DisplayAreaPolicy.Provider defaultProvider = DisplayAreaPolicy.Provider.fromResources( + resourcesWithProvider("")); + final DisplayAreaPolicyBuilder.Result defaultPolicy = + (DisplayAreaPolicyBuilder.Result) defaultProvider.instantiate(mWms, mDisplayContent, + mRoot, mImeContainer); + final List<Feature> features = defaultPolicy.getFeatures(); + boolean hasFullscreenMagnificationFeature = false; + for (Feature feature : features) { + hasFullscreenMagnificationFeature |= + feature.getId() == FEATURE_FULLSCREEN_MAGNIFICATION; + } + + assertThat(hasFullscreenMagnificationFeature).isTrue(); + } + + @Test public void testBuilder_createCustomizedDisplayAreaForFeature() { final Feature dimmable; final Feature other; @@ -496,7 +531,7 @@ public class DisplayAreaPolicyBuilderTest { private Map<DisplayArea<?>, Set<Integer>> calculateZSets( DisplayAreaPolicyBuilder.Result policy, DisplayArea<WindowContainer> ime, - DisplayArea<ActivityStack> tasks) { + DisplayArea<Task> tasks) { Map<DisplayArea<?>, Set<Integer>> zSets = new HashMap<>(); int[] types = {TYPE_STATUS_BAR, TYPE_NAVIGATION_BAR, TYPE_PRESENTATION, TYPE_APPLICATION_OVERLAY}; diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyTests.java index d75b35a3db79..39bf8eb857b0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayAreaPolicyTests.java @@ -94,9 +94,9 @@ public class DisplayAreaPolicyTests { @Test public void testTaskDisplayArea_taskPositionChanged_updatesTaskDisplayAreaPosition() { - final ActivityStack stack1 = mTaskDisplayArea1.createStack( + final Task stack1 = mTaskDisplayArea1.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack stack2 = mTaskDisplayArea2.createStack( + final Task stack2 = mTaskDisplayArea2.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Initial order @@ -155,11 +155,11 @@ public class DisplayAreaPolicyTests { .addDisplayAreaGroupHierarchy(new DisplayAreaPolicyBuilder.HierarchyBuilder(group2) .setTaskDisplayAreas(Lists.newArrayList(taskDisplayArea5))) .build(wms); - final ActivityStack stack1 = taskDisplayArea1.createStack( + final Task stack1 = taskDisplayArea1.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack stack3 = taskDisplayArea3.createStack( + final Task stack3 = taskDisplayArea3.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack stack4 = taskDisplayArea4.createStack( + final Task stack4 = taskDisplayArea4.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Initial order 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 792b597d23d2..a7e0dd4e674e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -144,7 +144,7 @@ public class DisplayContentTests extends WindowTestsBase { waitUntilHandlersIdle(); exitingApp.mIsExiting = true; - exitingApp.getTask().getStack().mExitingActivities.add(exitingApp); + exitingApp.getTask().getRootTask().mExitingActivities.add(exitingApp); assertForAllWindowsOrder(Arrays.asList( mWallpaperWindow, @@ -321,7 +321,7 @@ public class DisplayContentTests extends WindowTestsBase { final DisplayContent dc = createNewDisplay(); // Add stack with activity. - final ActivityStack stack = createTaskStackOnDisplay(dc); + final Task stack = createTaskStackOnDisplay(dc); assertEquals(dc.getDisplayId(), stack.getDisplayContent().getDisplayId()); assertEquals(dc, stack.getDisplayContent()); @@ -395,7 +395,7 @@ public class DisplayContentTests extends WindowTestsBase { final DisplayContent dc1 = createNewDisplay(); // Add stack with activity. - final ActivityStack stack0 = createTaskStackOnDisplay(dc0); + final Task stack0 = createTaskStackOnDisplay(dc0); final Task task0 = createTaskInStack(stack0, 0 /* userId */); final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(dc0); @@ -403,7 +403,7 @@ public class DisplayContentTests extends WindowTestsBase { dc0.configureDisplayPolicy(); assertNotNull(dc0.mTapDetector); - final ActivityStack stack1 = createTaskStackOnDisplay(dc1); + final Task stack1 = createTaskStackOnDisplay(dc1); final Task task1 = createTaskInStack(stack1, 0 /* userId */); final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(dc0); @@ -849,13 +849,13 @@ public class DisplayContentTests extends WindowTestsBase { dc.getDisplayRotation().setFixedToUserRotation( IWindowManager.FIXED_TO_USER_ROTATION_DISABLED); - final ActivityStack stack = + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootWindowContainer) .setDisplay(dc) .build(); doReturn(true).when(stack).isVisible(); - final ActivityStack freeformStack = + final Task freeformStack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootWindowContainer) .setDisplay(dc) .setWindowingMode(WINDOWING_MODE_FREEFORM) @@ -881,7 +881,7 @@ public class DisplayContentTests extends WindowTestsBase { IWindowManager.FIXED_TO_USER_ROTATION_DISABLED); final int newOrientation = getRotatedOrientation(dc); - final ActivityStack stack = + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootWindowContainer) .setDisplay(dc).build(); final ActivityRecord activity = stack.getTopMostTask().getTopNonFinishingActivity(); @@ -901,7 +901,7 @@ public class DisplayContentTests extends WindowTestsBase { IWindowManager.FIXED_TO_USER_ROTATION_ENABLED); final int newOrientation = getRotatedOrientation(dc); - final ActivityStack stack = + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootWindowContainer) .setDisplay(dc).build(); final ActivityRecord activity = stack.getTopMostTask().getTopNonFinishingActivity(); @@ -950,6 +950,21 @@ public class DisplayContentTests extends WindowTestsBase { } @Test + public void testInputMethodInputTarget_isClearedWhenWindowStateIsRemoved() throws Exception { + final DisplayContent dc = createNewDisplay(); + + WindowState app = createWindow(null, TYPE_BASE_APPLICATION, dc, "app"); + + dc.mInputMethodInputTarget = app; + assertEquals(app, dc.computeImeControlTarget()); + + app.removeImmediately(); + + assertNull(dc.mInputMethodInputTarget); + assertNull(dc.computeImeControlTarget()); + } + + @Test public void testComputeImeControlTarget() throws Exception { final DisplayContent dc = createNewDisplay(); dc.setRemoteInsetsController(createDisplayWindowInsetsController()); @@ -1322,7 +1337,7 @@ public class DisplayContentTests extends WindowTestsBase { // Leave PiP to fullscreen. The orientation can be updated from // ActivityRecord#reportDescendantOrientationChangeIfNeeded. pinnedTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); - homeActivity.setState(ActivityStack.ActivityState.STOPPED, "test"); + homeActivity.setState(Task.ActivityState.STOPPED, "test"); assertFalse(displayContent.hasTopFixedRotationLaunchingApp()); verify(mWm, atLeastOnce()).startFreezingDisplay(anyInt(), anyInt(), any(), anyInt()); @@ -1430,7 +1445,7 @@ public class DisplayContentTests extends WindowTestsBase { TaskDisplayArea defaultTaskDisplayArea = mWm.mRoot.getDefaultTaskDisplayArea(); // Remove the current home stack if it exists so a new one can be created below. - ActivityStack homeTask = defaultTaskDisplayArea.getRootHomeTask(); + Task homeTask = defaultTaskDisplayArea.getRootHomeTask(); if (homeTask != null) { defaultTaskDisplayArea.removeChild(homeTask); } @@ -1446,7 +1461,7 @@ public class DisplayContentTests extends WindowTestsBase { // Remove the current home stack if it exists so a new one can be created below. TaskDisplayArea taskDisplayArea = display.getDefaultTaskDisplayArea(); - ActivityStack homeTask = taskDisplayArea.getRootHomeTask(); + Task homeTask = taskDisplayArea.getRootHomeTask(); if (homeTask != null) { taskDisplayArea.removeChild(homeTask); } @@ -1478,7 +1493,7 @@ public class DisplayContentTests extends WindowTestsBase { @Test public void testFindScrollCaptureTargetWindow_behindWindow() { DisplayContent display = createNewDisplay(); - ActivityStack stack = createTaskStackOnDisplay(display); + Task stack = createTaskStackOnDisplay(display); Task task = createTaskInStack(stack, 0 /* userId */); WindowState activityWindow = createAppWindow(task, TYPE_APPLICATION, "App Window"); WindowState behindWindow = createWindow(null, TYPE_SCREENSHOT, display, "Screenshot"); @@ -1491,7 +1506,7 @@ public class DisplayContentTests extends WindowTestsBase { @Test public void testFindScrollCaptureTargetWindow_taskId() { DisplayContent display = createNewDisplay(); - ActivityStack stack = createTaskStackOnDisplay(display); + Task stack = createTaskStackOnDisplay(display); Task task = createTaskInStack(stack, 0 /* userId */); WindowState window = createAppWindow(task, TYPE_APPLICATION, "App Window"); WindowState behindWindow = createWindow(null, TYPE_SCREENSHOT, display, "Screenshot"); @@ -1518,7 +1533,7 @@ public class DisplayContentTests extends WindowTestsBase { @Test public void testSetWindowingModeAtomicallyUpdatesWindoingModeAndDisplayWindowingMode() { final DisplayContent dc = createNewDisplay(); - final ActivityStack stack = + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootWindowContainer) .setDisplay(dc) .build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java index f9de37994350..4ea5b97decf4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java @@ -40,8 +40,13 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_SCREEN_DEC import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_BOTTOM; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_LEFT; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_RIGHT; +import static android.view.WindowManagerPolicyConstants.ALT_BAR_TOP; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; @@ -63,6 +68,7 @@ import android.util.Pair; import android.util.SparseArray; import android.view.DisplayCutout; import android.view.DisplayInfo; +import android.view.Gravity; import android.view.InsetsState; import android.view.WindowInsets.Side; import android.view.WindowInsets.Type; @@ -122,9 +128,14 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { updateDisplayFrames(); } - public void setRotation(int rotation) { + public void setRotation(int rotation, boolean includingWindows) { mRotation = rotation; updateDisplayFrames(); + if (includingWindows) { + mNavBarWindow.getWindowConfiguration().setRotation(rotation); + mStatusBarWindow.getWindowConfiguration().setRotation(rotation); + mWindow.getWindowConfiguration().setRotation(rotation); + } } public void addDisplayCutout() { @@ -162,6 +173,8 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void addingWindow_withInsetsTypes() { + mDisplayPolicy.removeWindowLw(mStatusBarWindow); // Removes the existing one. + WindowState win = createWindow(null, TYPE_STATUS_BAR_SUB_PANEL, "StatusBarSubPanel"); win.mAttrs.providesInsetsTypes = new int[]{ITYPE_STATUS_BAR, ITYPE_TOP_GESTURES}; win.getFrameLw().set(0, 0, 500, 100); @@ -211,6 +224,47 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { } @Test + public void addingWindow_variousGravities_alternateBarPosUpdated() { + mDisplayPolicy.removeWindowLw(mNavBarWindow); // Removes the existing one. + + WindowState win1 = createWindow(null, TYPE_NAVIGATION_BAR_PANEL, "NavBarPanel1"); + win1.mAttrs.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR}; + win1.mAttrs.gravity = Gravity.TOP; + win1.getFrameLw().set(0, 0, 200, 500); + addWindow(win1); + + assertEquals(mDisplayPolicy.getAlternateNavBarPosition(), ALT_BAR_TOP); + mDisplayPolicy.removeWindowLw(win1); + + WindowState win2 = createWindow(null, TYPE_NAVIGATION_BAR_PANEL, "NavBarPanel2"); + win2.mAttrs.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR}; + win2.mAttrs.gravity = Gravity.BOTTOM; + win2.getFrameLw().set(0, 0, 200, 500); + addWindow(win2); + + assertEquals(mDisplayPolicy.getAlternateNavBarPosition(), ALT_BAR_BOTTOM); + mDisplayPolicy.removeWindowLw(win2); + + WindowState win3 = createWindow(null, TYPE_NAVIGATION_BAR_PANEL, "NavBarPanel3"); + win3.mAttrs.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR}; + win3.mAttrs.gravity = Gravity.LEFT; + win3.getFrameLw().set(0, 0, 200, 500); + addWindow(win3); + + assertEquals(mDisplayPolicy.getAlternateNavBarPosition(), ALT_BAR_LEFT); + mDisplayPolicy.removeWindowLw(win3); + + WindowState win4 = createWindow(null, TYPE_NAVIGATION_BAR_PANEL, "NavBarPanel4"); + win4.mAttrs.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR}; + win4.mAttrs.gravity = Gravity.RIGHT; + win4.getFrameLw().set(0, 0, 200, 500); + addWindow(win4); + + assertEquals(mDisplayPolicy.getAlternateNavBarPosition(), ALT_BAR_RIGHT); + mDisplayPolicy.removeWindowLw(win4); + } + + @Test public void layoutWindowLw_fitStatusBars() { mWindow.mAttrs.setFitInsetsTypes(Type.statusBars()); addWindow(mWindow); @@ -483,8 +537,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void layoutWindowLw_withDisplayCutout_landscape() { addDisplayCutout(); - setRotation(ROTATION_90); - + setRotation(ROTATION_90, true /* includingWindows */); mWindow.mAttrs.flags = FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; mWindow.mAttrs.setFitInsetsTypes(0 /* types */); @@ -504,7 +557,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void layoutWindowLw_withDisplayCutout_seascape() { addDisplayCutout(); - setRotation(ROTATION_270); + setRotation(ROTATION_270, true /* includingWindows */); mWindow.mAttrs.flags = FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; @@ -525,7 +578,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void layoutWindowLw_withDisplayCutout_fullscreen_landscape() { addDisplayCutout(); - setRotation(ROTATION_90); + setRotation(ROTATION_90, true /* includingWindows */); mWindow.mAttrs.flags = FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; @@ -566,7 +619,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void layoutWindowLw_withDisplayCutout_fullscreenInCutout_landscape() { addDisplayCutout(); - setRotation(ROTATION_90); + setRotation(ROTATION_90, true /* includingWindows */); mWindow.mAttrs.flags = FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; @@ -784,7 +837,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { @Test public void testSimulateLayoutDisplay() { assertSimulateLayoutSameDisplayFrames(); - setRotation(ROTATION_90); + setRotation(ROTATION_90, false /* includingWindows */); assertSimulateLayoutSameDisplayFrames(); addDisplayCutout(); assertSimulateLayoutSameDisplayFrames(); diff --git a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java index 0eee3ca53c7d..e18d93d82686 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java @@ -40,7 +40,6 @@ import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.View; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import com.android.server.LocalServices; @@ -98,7 +97,7 @@ public class DragDropControllerTests extends WindowTestsBase { private WindowState createDropTargetWindow(String name, int ownerId) { final ActivityRecord activity = WindowTestUtils.createTestActivityRecord( mDisplayContent); - final ActivityStack stack = createTaskStackOnDisplay( + final Task stack = createTaskStackOnDisplay( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent); final Task task = createTaskInStack(stack, ownerId); task.addChild(activity, 0); diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java index 61de7d83fa1a..a7a8505e336d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java @@ -309,12 +309,12 @@ public class LaunchParamsControllerTests extends ActivityTestsBase { mController.registerModifier(positioner); - final int beforeWindowMode = task.getStack().getWindowingMode(); + final int beforeWindowMode = task.getRootTask().getWindowingMode(); assertNotEquals(windowingMode, beforeWindowMode); mController.layoutTask(task, null /* windowLayout */); - final int afterWindowMode = task.getStack().getWindowingMode(); + final int afterWindowMode = task.getRootTask().getWindowingMode(); assertEquals(windowingMode, afterWindowMode); } diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java index 9bf86d2c4704..e389a538f25d 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java @@ -114,7 +114,7 @@ public class LaunchParamsPersisterTests extends ActivityTestsBase { when(mRootWindowContainer.getDisplayContent(eq(mDisplayUniqueId))) .thenReturn(mTestDisplay); - ActivityStack stack = mTestDisplay.getDefaultTaskDisplayArea() + Task stack = mTestDisplay.getDefaultTaskDisplayArea() .createStack(TEST_WINDOWING_MODE, ACTIVITY_TYPE_STANDARD, /* onTop */ true); mTestTask = new TaskBuilder(mSupervisor).setComponent(TEST_COMPONENT).setStack(stack) .build(); @@ -337,7 +337,7 @@ public class LaunchParamsPersisterTests extends ActivityTestsBase { public void testClearsRecordsOfTheUserOnUserCleanUp() { mTarget.saveTask(mTestTask); - ActivityStack stack = mTestDisplay.getDefaultTaskDisplayArea().createStack( + Task stack = mTestDisplay.getDefaultTaskDisplayArea().createStack( TEST_WINDOWING_MODE, ACTIVITY_TYPE_STANDARD, /* onTop */ true); final Task anotherTaskOfTheSameUser = new TaskBuilder(mSupervisor) .setComponent(ALTERNATIVE_COMPONENT) diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java index bf84aecdb6a0..2f3004bf6832 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java @@ -16,8 +16,8 @@ package com.android.server.wm; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; @@ -60,6 +60,103 @@ public class LetterboxTest { assertTrue(mLetterbox.isOverlappingWith(new Rect(0, 0, 1, 1))); } + private static final int TOP_BAR = 0x1; + private static final int BOTTOM_BAR = 0x2; + private static final int LEFT_BAR = 0x4; + private static final int RIGHT_BAR = 0x8; + @Test + public void testNotIntersectsOrFullyContains_usesGlobalCoordinates() { + final Rect outer = new Rect(0, 0, 10, 50); + final Point surfaceOrig = new Point(1000, 2000); + + final Rect topBar = new Rect(0, 0, 10, 2); + final Rect bottomBar = new Rect(0, 45, 10, 50); + final Rect leftBar = new Rect(0, 0, 2, 50); + final Rect rightBar = new Rect(8, 0, 10, 50); + + final LetterboxLayoutVerifier verifier = + new LetterboxLayoutVerifier(outer, surfaceOrig, mLetterbox); + verifier.setBarRect(topBar, bottomBar, leftBar, rightBar); + + // top + verifier.setInner(0, 2, 10, 50).verifyPositions(TOP_BAR | BOTTOM_BAR, BOTTOM_BAR); + // bottom + verifier.setInner(0, 0, 10, 45).verifyPositions(TOP_BAR | BOTTOM_BAR, TOP_BAR); + // left + verifier.setInner(2, 0, 10, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, RIGHT_BAR); + // right + verifier.setInner(0, 0, 8, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, LEFT_BAR); + // top + bottom + verifier.setInner(0, 2, 10, 45).verifyPositions(TOP_BAR | BOTTOM_BAR, 0); + // left + right + verifier.setInner(2, 0, 8, 50).verifyPositions(LEFT_BAR | RIGHT_BAR, 0); + // top + left + verifier.setInner(2, 2, 10, 50).verifyPositions(TOP_BAR | LEFT_BAR, 0); + // top + left + right + verifier.setInner(2, 2, 8, 50).verifyPositions(TOP_BAR | LEFT_BAR | RIGHT_BAR, 0); + // left + right + bottom + verifier.setInner(2, 0, 8, 45).verifyPositions(LEFT_BAR | RIGHT_BAR | BOTTOM_BAR, 0); + // all + verifier.setInner(2, 2, 8, 45) + .verifyPositions(TOP_BAR | BOTTOM_BAR | LEFT_BAR | RIGHT_BAR, 0); + } + + private static class LetterboxLayoutVerifier { + final Rect mOuter; + final Rect mInner = new Rect(); + final Point mSurfaceOrig; + final Letterbox mLetterbox; + final Rect mTempRect = new Rect(); + + final Rect mTop = new Rect(); + final Rect mBottom = new Rect(); + final Rect mLeft = new Rect(); + final Rect mRight = new Rect(); + + LetterboxLayoutVerifier(Rect outer, Point surfaceOrig, Letterbox letterbox) { + mOuter = new Rect(outer); + mSurfaceOrig = new Point(surfaceOrig); + mLetterbox = letterbox; + } + + LetterboxLayoutVerifier setInner(int left, int top, int right, int bottom) { + mInner.set(left, top, right, bottom); + mLetterbox.layout(mOuter, mInner, mSurfaceOrig); + return this; + } + + void setBarRect(Rect top, Rect bottom, Rect left, Rect right) { + mTop.set(top); + mBottom.set(bottom); + mLeft.set(left); + mRight.set(right); + } + + void verifyPositions(int allowedPos, int noOverlapPos) { + assertEquals(mLetterbox.notIntersectsOrFullyContains(mTop), + (allowedPos & TOP_BAR) != 0); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mBottom), + (allowedPos & BOTTOM_BAR) != 0); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mLeft), + (allowedPos & LEFT_BAR) != 0); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mRight), + (allowedPos & RIGHT_BAR) != 0); + + mTempRect.set(mTop.left, mTop.top, mTop.right, mTop.bottom + 1); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect), + (noOverlapPos & TOP_BAR) != 0); + mTempRect.set(mLeft.left, mLeft.top, mLeft.right + 1, mLeft.bottom); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect), + (noOverlapPos & LEFT_BAR) != 0); + mTempRect.set(mRight.left - 1, mRight.top, mRight.right, mRight.bottom); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect), + (noOverlapPos & RIGHT_BAR) != 0); + mTempRect.set(mBottom.left, mBottom.top - 1, mBottom.right, mBottom.bottom); + assertEquals(mLetterbox.notIntersectsOrFullyContains(mTempRect), + (noOverlapPos & BOTTOM_BAR) != 0); + } + } + @Test public void testSurfaceOrigin_applied() { mLetterbox.layout(new Rect(0, 0, 10, 10), new Rect(0, 1, 10, 10), new Point(1000, 2000)); diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index fd169018782b..1724303633d9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -105,7 +105,7 @@ public class RecentTasksTest extends ActivityTestsBase { private static final int INVALID_STACK_ID = 999; private TaskDisplayArea mTaskContainer; - private ActivityStack mStack; + private Task mStack; private TestTaskPersister mTaskPersister; private TestRecentTasks mRecentTasks; private TestRunningTasks mRunningTasks; @@ -829,7 +829,7 @@ public class RecentTasksTest extends ActivityTestsBase { mRecentTasks.add(mTasks.get(2)); mRecentTasks.add(mTasks.get(1)); - ActivityStack stack = mTasks.get(2).getStack(); + Task stack = mTasks.get(2).getRootTask(); stack.moveToFront("", mTasks.get(2)); doReturn(stack).when(mService.mRootWindowContainer).getTopDisplayFocusedStack(); @@ -850,8 +850,8 @@ public class RecentTasksTest extends ActivityTestsBase { public void testBackStackTasks_expectNoTrim() { mRecentTasks.setParameters(-1 /* min */, 1 /* max */, -1 /* ms */); - final ActivityStack homeStack = mTaskContainer.getRootHomeTask(); - final ActivityStack aboveHomeStack = mTaskContainer.createStack( + final Task homeStack = mTaskContainer.getRootHomeTask(); + final Task aboveHomeStack = mTaskContainer.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Add a number of tasks (beyond the max) but ensure that nothing is trimmed because all @@ -868,10 +868,10 @@ public class RecentTasksTest extends ActivityTestsBase { public void testBehindHomeStackTasks_expectTaskTrimmed() { mRecentTasks.setParameters(-1 /* min */, 1 /* max */, -1 /* ms */); - final ActivityStack behindHomeStack = mTaskContainer.createStack( + final Task behindHomeStack = mTaskContainer.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); - final ActivityStack homeStack = mTaskContainer.getRootHomeTask(); - final ActivityStack aboveHomeStack = mTaskContainer.createStack( + final Task homeStack = mTaskContainer.getRootHomeTask(); + final Task aboveHomeStack = mTaskContainer.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Add a number of tasks (beyond the max) but ensure that only the task in the stack behind @@ -890,9 +890,9 @@ public class RecentTasksTest extends ActivityTestsBase { public void testOtherDisplayTasks_expectNoTrim() { mRecentTasks.setParameters(-1 /* min */, 1 /* max */, -1 /* ms */); - final ActivityStack homeStack = mTaskContainer.getRootHomeTask(); + final Task homeStack = mTaskContainer.getRootHomeTask(); final DisplayContent otherDisplay = addNewDisplayContentAt(DisplayContent.POSITION_TOP); - final ActivityStack otherDisplayStack = otherDisplay.getDefaultTaskDisplayArea() + final Task otherDisplayStack = otherDisplay.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); // Add a number of tasks (beyond the max) on each display, ensure that the tasks are not diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java index 4fbdd616dc93..695a0e3881ea 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java @@ -92,7 +92,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Mock RecentsAnimationController.RecentsAnimationCallbacks mAnimationCallbacks; @Mock TaskSnapshot mMockTaskSnapshot; private RecentsAnimationController mController; - private ActivityStack mRootHomeTask; + private Task mRootHomeTask; @Before public void setUp() throws Exception { diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java index 44ca2cdcb142..e3cfe11df99f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java @@ -31,8 +31,8 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.times; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE; +import static com.android.server.wm.Task.ActivityState.PAUSED; import static com.google.common.truth.Truth.assertThat; @@ -88,7 +88,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { @Test public void testRecentsActivityVisiblility() { TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS, true /* onTop */); ActivityRecord recentActivity = new ActivityBuilder(mService) .setComponent(mRecentsComponent) @@ -116,7 +116,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { @Test public void testPreloadRecentsActivity() { TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack homeStack = + final Task homeStack = defaultTaskDisplayArea.getStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME); defaultTaskDisplayArea.positionStackAtTop(homeStack, false /* includingParents */); ActivityRecord topRunningHomeActivity = homeStack.topRunningActivity(); @@ -148,7 +148,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { mService.startRecentsActivity(recentsIntent, null /* assistDataReceiver */, null /* recentsAnimationRunner */); - ActivityStack recentsStack = defaultTaskDisplayArea.getStack(WINDOWING_MODE_FULLSCREEN, + Task recentsStack = defaultTaskDisplayArea.getStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS); assertThat(recentsStack).isNotNull(); @@ -177,7 +177,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { public void testRestartRecentsActivity() throws Exception { // Have a recents activity that is not attached to its process (ActivityRecord.app = null). TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack recentsStack = defaultTaskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task recentsStack = defaultTaskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS, true /* onTop */); ActivityRecord recentActivity = new ActivityBuilder(mService).setComponent( mRecentsComponent).setCreateTask(true).setStack(recentsStack).build(); @@ -206,7 +206,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { @Test public void testSetLaunchTaskBehindOfTargetActivity() { TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack homeStack = taskDisplayArea.getRootHomeTask(); + Task homeStack = taskDisplayArea.getRootHomeTask(); // Assume the home activity support recents. ActivityRecord targetActivity = homeStack.getTopNonFinishingActivity(); if (targetActivity == null) { @@ -248,21 +248,21 @@ public class RecentsAnimationTest extends ActivityTestsBase { @Test public void testCancelAnimationOnVisibleStackOrderChange() { TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); new ActivityBuilder(mService) .setComponent(new ComponentName(mContext.getPackageName(), "App1")) .setCreateTask(true) .setStack(fullscreenStack) .build(); - ActivityStack recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS, true /* onTop */); new ActivityBuilder(mService) .setComponent(mRecentsComponent) .setCreateTask(true) .setStack(recentsStack) .build(); - ActivityStack fullscreenStack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task fullscreenStack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); new ActivityBuilder(mService) .setComponent(new ComponentName(mContext.getPackageName(), "App2")) @@ -289,21 +289,21 @@ public class RecentsAnimationTest extends ActivityTestsBase { @Test public void testKeepAnimationOnHiddenStackOrderChange() { TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); new ActivityBuilder(mService) .setComponent(new ComponentName(mContext.getPackageName(), "App1")) .setCreateTask(true) .setStack(fullscreenStack) .build(); - ActivityStack recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task recentsStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS, true /* onTop */); new ActivityBuilder(mService) .setComponent(mRecentsComponent) .setCreateTask(true) .setStack(recentsStack) .build(); - ActivityStack fullscreenStack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task fullscreenStack2 = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); new ActivityBuilder(mService) .setComponent(new ComponentName(mContext.getPackageName(), "App2")) @@ -326,7 +326,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { public void testMultipleUserHomeActivity_findUserHomeTask() { TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultDisplay() .getDefaultTaskDisplayArea(); - ActivityStack homeStack = taskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, + Task homeStack = taskDisplayArea.getStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_HOME); ActivityRecord otherUserHomeActivity = new ActivityBuilder(mService) .setStack(homeStack) @@ -335,7 +335,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { .build(); otherUserHomeActivity.getTask().mUserId = TEST_USER_ID; - ActivityStack fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task fullscreenStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); new ActivityBuilder(mService) .setComponent(new ComponentName(mContext.getPackageName(), "App1")) diff --git a/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java index 4aac47cf006a..3a5d33396c3a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java @@ -39,6 +39,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.times; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; import static com.android.server.wm.RootWindowContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE; +import static com.android.server.wm.Task.ActivityState.STOPPED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -67,7 +68,7 @@ import android.util.Pair; import androidx.test.filters.MediumTest; import com.android.internal.app.ResolverActivity; -import com.android.server.wm.ActivityStack.ActivityState; +import com.android.server.wm.Task.ActivityState; import org.junit.Before; import org.junit.Test; @@ -88,7 +89,7 @@ import java.util.function.Consumer; @Presubmit @RunWith(WindowTestRunner.class) public class RootActivityContainerTests extends ActivityTestsBase { - private ActivityStack mFullscreenStack; + private Task mFullscreenStack; @Before public void setUp() throws Exception { @@ -131,7 +132,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { mRootWindowContainer.moveActivityToPinnedStack(firstActivity, "initialMove"); final TaskDisplayArea taskDisplayArea = mFullscreenStack.getDisplayArea(); - ActivityStack pinnedStack = taskDisplayArea.getRootPinnedTask(); + Task pinnedStack = taskDisplayArea.getRootPinnedTask(); // Ensure a task has moved over. ensureStackPlacement(pinnedStack, firstActivity); ensureStackPlacement(mFullscreenStack, secondActivity); @@ -148,7 +149,30 @@ public class RootActivityContainerTests extends ActivityTestsBase { ensureStackPlacement(mFullscreenStack, firstActivity); } - private static void ensureStackPlacement(ActivityStack stack, ActivityRecord... activities) { + @Test + public void testMovingBottomMostStackActivityToPinnedStack() { + final ActivityRecord firstActivity = new ActivityBuilder(mService).setCreateTask(true) + .setStack(mFullscreenStack).build(); + final Task task = firstActivity.getTask(); + + final ActivityRecord secondActivity = new ActivityBuilder(mService).setTask(task) + .setStack(mFullscreenStack).build(); + + mFullscreenStack.moveTaskToBack(task); + + // Ensure full screen stack has both tasks. + ensureStackPlacement(mFullscreenStack, firstActivity, secondActivity); + assertEquals(task.getTopMostActivity(), secondActivity); + firstActivity.setState(STOPPED, "testMovingBottomMostStackActivityToPinnedStack"); + + + // Move first activity to pinned stack. + mRootWindowContainer.moveActivityToPinnedStack(secondActivity, "initialMove"); + + assertTrue(firstActivity.mRequestForceTransition); + } + + private static void ensureStackPlacement(Task stack, ActivityRecord... activities) { final Task task = stack.getBottomMostTask(); final ArrayList<ActivityRecord> stackActivities = new ArrayList<>(); @@ -170,7 +194,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testApplySleepTokens() { final DisplayContent display = mRootWindowContainer.getDefaultDisplay(); final KeyguardController keyguard = mSupervisor.getKeyguardController(); - final ActivityStack stack = new StackBuilder(mRootWindowContainer) + final Task stack = new StackBuilder(mRootWindowContainer) .setCreateActivity(false) .setDisplay(display) .setOnTop(false) @@ -205,7 +229,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { } private void verifySleepTokenBehavior(DisplayContent display, KeyguardController keyguard, - ActivityStack stack, boolean displaySleeping, boolean displayShouldSleep, + Task stack, boolean displaySleeping, boolean displayShouldSleep, boolean isFocusedStack, boolean keyguardShowing, boolean expectWakeFromSleep, boolean expectResumeTopActivity) { reset(stack); @@ -261,7 +285,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { final TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer .getDefaultTaskDisplayArea(); final int originalStackCount = defaultTaskDisplayArea.getStackCount(); - final ActivityStack stack = defaultTaskDisplayArea.createStack( + final Task stack = defaultTaskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */); final ActivityRecord firstActivity = new ActivityBuilder(mService).setCreateTask(true) .setStack(stack).build(); @@ -285,7 +309,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { final TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer .getDefaultTaskDisplayArea(); final int originalStackCount = defaultTaskDisplayArea.getStackCount(); - final ActivityStack stack = defaultTaskDisplayArea.createStack( + final Task stack = defaultTaskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */); final ActivityRecord firstActivity = new ActivityBuilder(mService).setCreateTask(true) .setStack(stack).build(); @@ -294,7 +318,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { final DisplayContent dc = defaultTaskDisplayArea.getDisplayContent(); final TaskDisplayArea secondTaskDisplayArea = WindowTestsBase.createTaskDisplayArea(dc, mRootWindowContainer.mWmService, "TestTaskDisplayArea", FEATURE_VENDOR_FIRST); - final ActivityStack secondStack = secondTaskDisplayArea.createStack( + final Task secondStack = secondTaskDisplayArea.createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */); new ActivityBuilder(mService).setCreateTask(true).setStack(secondStack) .setUseProcess(firstActivity.app).build(); @@ -313,7 +337,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testFocusability() { final TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer .getDefaultTaskDisplayArea(); - final ActivityStack stack = defaultTaskDisplayArea.createStack( + final Task stack = defaultTaskDisplayArea.createStack( WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); final ActivityRecord activity = new ActivityBuilder(mService).setCreateTask(true) .setStack(stack).build(); @@ -327,7 +351,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { assertFalse(stack.isTopActivityFocusable()); assertFalse(activity.isFocusable()); - final ActivityStack pinnedStack = defaultTaskDisplayArea.createStack( + final Task pinnedStack = defaultTaskDisplayArea.createStack( WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD, true /* onTop */); final ActivityRecord pinnedActivity = new ActivityBuilder(mService).setCreateTask(true) .setStack(pinnedStack).build(); @@ -356,7 +380,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { @Test public void testSplitScreenPrimaryChosenWhenTopActivityLaunchedToSecondary() { // Create primary split-screen stack with a task and an activity. - final ActivityStack primaryStack = mRootWindowContainer.getDefaultTaskDisplayArea() + final Task primaryStack = mRootWindowContainer.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */); final Task task = new TaskBuilder(mSupervisor).setStack(primaryStack).build(); @@ -366,7 +390,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { // split-screen secondary. final ActivityOptions options = ActivityOptions.makeBasic(); options.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY); - final ActivityStack result = + final Task result = mRootWindowContainer.getLaunchStack(r, options, task, true /* onTop */); // Assert that the primary stack is returned. @@ -379,13 +403,13 @@ public class RootActivityContainerTests extends ActivityTestsBase { @Test public void testFindTaskToMoveToFrontWhenRecentsOnTop() { // Create stack/task on default display. - final ActivityStack targetStack = new StackBuilder(mRootWindowContainer) + final Task targetStack = new StackBuilder(mRootWindowContainer) .setOnTop(false) .build(); final Task targetTask = targetStack.getBottomMostTask(); // Create Recents on top of the display. - final ActivityStack stack = new StackBuilder(mRootWindowContainer).setActivityType( + final Task stack = new StackBuilder(mRootWindowContainer).setActivityType( ACTIVITY_TYPE_RECENTS).build(); final String reason = "findTaskToMoveToFront"; @@ -404,14 +428,14 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testFindTaskToMoveToFrontWhenRecentsOnOtherDisplay() { // Create stack/task on default display. final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack targetStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task targetStack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */); final Task targetTask = new TaskBuilder(mSupervisor).setStack(targetStack).build(); // Create Recents on secondary display. final TestDisplayContent secondDisplay = addNewDisplayContentAt( DisplayContent.POSITION_TOP); - final ActivityStack stack = secondDisplay.getDefaultTaskDisplayArea() + final Task stack = secondDisplay.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_RECENTS, true /* onTop */); final Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); new ActivityBuilder(mService).setTask(task).build(); @@ -431,7 +455,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testResumeActivityWhenNonTopmostStackIsTopFocused() { // Create a stack at bottom. final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */)); final Task task = new TaskBuilder(mSupervisor).setStack(targetStack).build(); final ActivityRecord activity = new ActivityBuilder(mService).setTask(task).build(); @@ -487,7 +511,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { // Create an activity on secondary display. final TestDisplayContent secondDisplay = addNewDisplayContentAt( DisplayContent.POSITION_TOP); - final ActivityStack stack = secondDisplay.getDefaultTaskDisplayArea() + final Task stack = secondDisplay.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); final Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); new ActivityBuilder(mService).setTask(task).build(); @@ -511,7 +535,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testResumeActivityLingeringTransition() { // Create a stack at top. final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */)); final Task task = new TaskBuilder(mSupervisor).setStack(targetStack).build(); final ActivityRecord activity = new ActivityBuilder(mService).setTask(task).build(); @@ -531,7 +555,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { public void testResumeActivityLingeringTransition_notExecuted() { // Create a stack at bottom. final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + final Task targetStack = spy(taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, false /* onTop */)); final Task task = new TaskBuilder(mSupervisor).setStack(targetStack).build(); final ActivityRecord activity = new ActivityBuilder(mService).setTask(task).build(); @@ -844,7 +868,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { options.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN); doReturn(true).when(mSupervisor).canPlaceEntityOnDisplay(secondaryDisplay.mDisplayId, 300 /* test realCallerPid */, 300 /* test realCallerUid */, r.info); - final ActivityStack result = mRootWindowContainer.getLaunchStack(r, options, + final Task result = mRootWindowContainer.getLaunchStack(r, options, null /* task */, true /* onTop */, null, 300 /* test realCallerPid */, 300 /* test realCallerUid */); @@ -865,7 +889,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { .setTask(task).build(); // Make sure the root task is valid and can be reused on default display. - final ActivityStack stack = mRootWindowContainer.getValidLaunchStackInTaskDisplayArea( + final Task stack = mRootWindowContainer.getValidLaunchStackInTaskDisplayArea( mRootWindowContainer.getDefaultTaskDisplayArea(), activity, task, null, null); assertEquals(task, stack); @@ -876,7 +900,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { doReturn(mFullscreenStack).when(mRootWindowContainer).getTopDisplayFocusedStack(); final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack homeStack = taskDisplayArea.getRootHomeTask(); + Task homeStack = taskDisplayArea.getRootHomeTask(); if (homeStack != null) { homeStack.removeImmediately(); } @@ -896,7 +920,7 @@ public class RootActivityContainerTests extends ActivityTestsBase { // Create an activity on secondary display. final TestDisplayContent secondDisplay = addNewDisplayContentAt( DisplayContent.POSITION_TOP); - final ActivityStack stack = secondDisplay.getDefaultTaskDisplayArea() + final Task stack = secondDisplay.getDefaultTaskDisplayArea() .createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); final ActivityRecord activity = new ActivityBuilder(mService).setStack(stack).build(); spyOn(activity); diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java index 181de8e2a1a3..2e4c9ea747c5 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java @@ -25,11 +25,13 @@ import static android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; -import static com.android.server.wm.ActivityStack.ActivityState.FINISHING; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSED; -import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPING; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.android.server.wm.Task.ActivityState.FINISHING; +import static com.android.server.wm.Task.ActivityState.PAUSED; +import static com.android.server.wm.Task.ActivityState.PAUSING; +import static com.android.server.wm.Task.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPING; import static com.google.common.truth.Truth.assertThat; @@ -149,7 +151,7 @@ public class RootWindowContainerTests extends WindowTestsBase { public void testAllPausedActivitiesComplete() { DisplayContent displayContent = mWm.mRoot.getDisplayContent(DEFAULT_DISPLAY); TaskDisplayArea taskDisplayArea = displayContent.getDefaultTaskDisplayArea(); - ActivityStack stack = taskDisplayArea.getStackAt(0); + Task stack = taskDisplayArea.getStackAt(0); ActivityRecord activity = createActivityRecord(displayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); stack.mPausingActivity = activity; @@ -169,5 +171,27 @@ public class RootWindowContainerTests extends WindowTestsBase { activity.setState(FINISHING, "test FINISHING"); assertThat(mWm.mRoot.allPausedActivitiesComplete()).isTrue(); } + + @Test + public void testForceStopPackage() { + final Task task = new ActivityTestsBase.StackBuilder(mWm.mRoot).build(); + final ActivityRecord activity1 = task.getTopMostActivity(); + final ActivityRecord activity2 = + new ActivityTestsBase.ActivityBuilder(mWm.mAtmService).setStack(task).build(); + final WindowProcessController wpc = activity1.app; + spyOn(wpc); + activity1.app = null; + activity2.setProcess(wpc); + doReturn(true).when(wpc).isRemoved(); + + mWm.mAtmService.mInternal.onForceStopPackage(wpc.mInfo.packageName, true /* doit */, + false /* evenPersistent */, wpc.mUserId); + // The activity without process should be removed. + assertEquals(1, task.getChildCount()); + + mWm.mRoot.handleAppDied(wpc); + // The activity with process should be removed because WindowProcessController#isRemoved. + assertFalse(task.hasChild()); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/RunningTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RunningTasksTest.java index 3d3a0f148db5..e51a133d5cce 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RunningTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RunningTasksTest.java @@ -62,7 +62,7 @@ public class RunningTasksTest extends ActivityTestsBase { final int numStacks = 2; for (int stackIndex = 0; stackIndex < numStacks; stackIndex++) { - final ActivityStack stack = new StackBuilder(mRootWindowContainer) + final Task stack = new StackBuilder(mRootWindowContainer) .setCreateActivity(false) .setDisplay(display) .setOnTop(false) @@ -104,7 +104,7 @@ public class RunningTasksTest extends ActivityTestsBase { final DisplayContent display = new TestDisplayContent.Builder(mService, 1000, 2500).build(); final int numTasks = 10; for (int i = 0; i < numTasks; i++) { - final ActivityStack stack = new StackBuilder(mRootWindowContainer) + final Task stack = new StackBuilder(mRootWindowContainer) .setCreateActivity(false) .setDisplay(display) .setOnTop(true) @@ -130,7 +130,7 @@ public class RunningTasksTest extends ActivityTestsBase { /** * Create a task with a single activity in it, with the given last active time. */ - private Task createTask(ActivityStack stack, String className, int taskId, + private Task createTask(Task stack, String className, int taskId, int lastActiveTime, Bundle extras) { final Task task = new TaskBuilder(mService.mStackSupervisor) .setComponent(new ComponentName(mContext.getPackageName(), className)) diff --git a/services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java b/services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java index 31a102ae3bad..ef74861e9422 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ScreenDecorWindowTests.java @@ -25,8 +25,8 @@ import static android.view.Gravity.BOTTOM; import static android.view.Gravity.LEFT; import static android.view.Gravity.RIGHT; import static android.view.Gravity.TOP; -import static android.view.InsetsState.ITYPE_NAVIGATION_BAR; -import static android.view.InsetsState.ITYPE_STATUS_BAR; +import static android.view.InsetsState.ITYPE_CLIMATE_BAR; +import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; @@ -190,7 +190,7 @@ public class ScreenDecorWindowTests { @Test public void testProvidesInsetsTypes() { - int[] providesInsetsTypes = new int[]{ITYPE_STATUS_BAR}; + int[] providesInsetsTypes = new int[]{ITYPE_CLIMATE_BAR}; final View win = createWindow("StatusBarSubPanel", TOP, MATCH_PARENT, mDecorThickness, RED, FLAG_LAYOUT_IN_SCREEN, 0, providesInsetsTypes); @@ -199,7 +199,7 @@ public class ScreenDecorWindowTests { private View createDecorWindow(int gravity, int width, int height) { int[] providesInsetsTypes = - new int[]{gravity == TOP ? ITYPE_STATUS_BAR : ITYPE_NAVIGATION_BAR}; + new int[]{gravity == TOP ? ITYPE_CLIMATE_BAR : ITYPE_EXTRA_NAVIGATION_BAR}; return createWindow("decorWindow", gravity, width, height, RED, FLAG_LAYOUT_IN_SCREEN, PRIVATE_FLAG_IS_SCREEN_DECOR, providesInsetsTypes); } diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index a979c862a8e4..250cf09e8547 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -29,7 +29,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.eq; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; -import static com.android.server.wm.ActivityStack.ActivityState.STOPPED; +import static com.android.server.wm.Task.ActivityState.STOPPED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -65,7 +65,7 @@ import java.util.ArrayList; @Presubmit @RunWith(WindowTestRunner.class) public class SizeCompatTests extends ActivityTestsBase { - private ActivityStack mStack; + private Task mStack; private Task mTask; private ActivityRecord mActivity; @@ -86,7 +86,7 @@ public class SizeCompatTests extends ActivityTestsBase { doNothing().when(mSupervisor).scheduleRestartTimeout(mActivity); mActivity.mVisibleRequested = true; mActivity.setSavedState(null /* savedState */); - mActivity.setState(ActivityStack.ActivityState.RESUMED, "testRestart"); + mActivity.setState(Task.ActivityState.RESUMED, "testRestart"); prepareUnresizable(1.5f /* maxAspect */, SCREEN_ORIENTATION_UNSPECIFIED); final Rect originalOverrideBounds = new Rect(mActivity.getBounds()); @@ -94,7 +94,7 @@ public class SizeCompatTests extends ActivityTestsBase { // The visible activity should recompute configuration according to the last parent bounds. mService.restartActivityProcessIfVisible(mActivity.appToken); - assertEquals(ActivityStack.ActivityState.RESTARTING_PROCESS, mActivity.getState()); + assertEquals(Task.ActivityState.RESTARTING_PROCESS, mActivity.getState()); assertNotEquals(originalOverrideBounds, mActivity.getBounds()); } @@ -449,7 +449,7 @@ public class SizeCompatTests extends ActivityTestsBase { public void testHandleActivitySizeCompatMode() { setUpDisplaySizeWithApp(1000, 2000); ActivityRecord activity = mActivity; - activity.setState(ActivityStack.ActivityState.RESUMED, "testHandleActivitySizeCompatMode"); + activity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatMode"); prepareUnresizable(-1.f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); assertFitted(); @@ -476,7 +476,7 @@ public class SizeCompatTests extends ActivityTestsBase { activity.mVisibleRequested = true; activity.restartProcessIfVisible(); // The full lifecycle isn't hooked up so manually set state to resumed - activity.setState(ActivityStack.ActivityState.RESUMED, "testHandleActivitySizeCompatMode"); + activity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatMode"); mStack.getDisplay().handleActivitySizeCompatModeIfNeeded(activity); // Expect null token when switching to non-size-compat mode activity. diff --git a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java index 50675b03ae1f..eb7d9c2d3c32 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java +++ b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java @@ -319,7 +319,7 @@ public class SystemServicesTestRule implements TestRule { spyOn(display); final TaskDisplayArea taskDisplayArea = display.getDefaultTaskDisplayArea(); spyOn(taskDisplayArea); - final ActivityStack homeStack = taskDisplayArea.getStack( + final Task homeStack = taskDisplayArea.getStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME); spyOn(homeStack); } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java index 8c3661b409f4..27a8fc3c5943 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java @@ -32,7 +32,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; -import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; +import static com.android.server.wm.Task.ActivityState.RESUMED; import static com.google.common.truth.Truth.assertThat; @@ -67,7 +67,7 @@ import org.junit.runner.RunWith; @RunWith(WindowTestRunner.class) public class TaskDisplayAreaTests extends WindowTestsBase { - private ActivityStack mPinnedStack; + private Task mPinnedStack; @Before public void setUp() throws Exception { @@ -89,7 +89,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { @Test public void testActivityWithZBoost_taskDisplayAreaDoesNotMoveUp() { - final ActivityStack stack = createTaskStackOnDisplay( + final Task stack = createTaskStackOnDisplay( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(mDisplayContent); @@ -109,8 +109,8 @@ public class TaskDisplayAreaTests extends WindowTestsBase { @Test public void testStackPositionChildAt() { // Test that always-on-top stack can't be moved to position other than top. - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); - final ActivityStack stack2 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack2 = createTaskStackOnDisplay(mDisplayContent); final WindowContainer taskStackContainer = stack1.getParent(); @@ -134,7 +134,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { @Test public void testStackPositionBelowPinnedStack() { // Test that no stack can be above pinned stack. - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final WindowContainer taskStackContainer = stack1.getParent(); @@ -158,7 +158,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { doReturn(true).when(mDisplayContent).isTrusted(); // The display contains pinned stack that was added in {@link #setUp}. - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); // Add another display at top. @@ -216,10 +216,10 @@ public class TaskDisplayAreaTests extends WindowTestsBase { final TaskDisplayArea defaultTaskDisplayArea = rootWindowContainer.getDefaultTaskDisplayArea(); - final ActivityStack rootHomeTask = defaultTaskDisplayArea.getRootHomeTask(); + final Task rootHomeTask = defaultTaskDisplayArea.getRootHomeTask(); rootHomeTask.mResizeMode = RESIZE_MODE_UNRESIZEABLE; - final ActivityStack primarySplitTask = + final Task primarySplitTask = new ActivityTestsBase.StackBuilder(rootWindowContainer) .setTaskDisplayArea(defaultTaskDisplayArea) .setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) @@ -247,7 +247,7 @@ public class TaskDisplayAreaTests extends WindowTestsBase { private void assertGetOrCreateStack(int windowingMode, int activityType, Task candidateTask, boolean reuseCandidate) { final TaskDisplayArea taskDisplayArea = candidateTask.getDisplayArea(); - final ActivityStack stack = taskDisplayArea.getOrCreateStack(windowingMode, activityType, + final Task stack = taskDisplayArea.getOrCreateStack(windowingMode, activityType, false /* onTop */, null /* intent */, candidateTask /* candidateTask */); assertEquals(reuseCandidate, stack == candidateTask); } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java index a69231b9e03a..a048526bb068 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java @@ -30,7 +30,6 @@ import static android.util.DisplayMetrics.DENSITY_DEFAULT; import static android.view.Display.DEFAULT_DISPLAY; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; -import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE; import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP; @@ -1350,13 +1349,13 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { } private ActivityRecord createSourceActivity(TestDisplayContent display) { - final ActivityStack stack = display.getDefaultTaskDisplayArea() + final Task stack = display.getDefaultTaskDisplayArea() .createStack(display.getWindowingMode(), ACTIVITY_TYPE_STANDARD, true); return new ActivityBuilder(mService).setStack(stack).setCreateTask(true).build(); } private void addFreeformTaskTo(TestDisplayContent display, Rect bounds) { - final ActivityStack stack = display.getDefaultTaskDisplayArea() + final Task stack = display.getDefaultTaskDisplayArea() .createStack(display.getWindowingMode(), ACTIVITY_TYPE_STANDARD, true); stack.setWindowingMode(WINDOWING_MODE_FREEFORM); final Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java index 93dcc9103640..0db3f94d1fc3 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java @@ -37,7 +37,6 @@ import android.platform.test.annotations.Presubmit; import android.util.DisplayMetrics; import android.util.Log; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import org.junit.After; @@ -77,7 +76,7 @@ public class TaskPositionerTests extends WindowTestsBase { mMinVisibleHeight = dipToPixel(MINIMUM_VISIBLE_HEIGHT_IN_DP, dm); removeGlobalMinSizeRestriction(); - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity = new ActivityTestsBase.ActivityBuilder(stack.mAtmService) .setStack(stack) // In real case, there is no additional level for freeform mode. diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java index abdbd5131fd9..bf76c8ee5f0a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java @@ -173,7 +173,7 @@ public class TaskRecordTests extends ActivityTestsBase { public void testFitWithinBounds() { final Rect parentBounds = new Rect(10, 10, 200, 200); TaskDisplayArea taskDisplayArea = mService.mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack stack = taskDisplayArea.createStack(WINDOWING_MODE_FREEFORM, + Task stack = taskDisplayArea.createStack(WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, true /* onTop */); Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); final Configuration parentConfig = stack.getConfiguration(); @@ -211,7 +211,7 @@ public class TaskRecordTests extends ActivityTestsBase { @Test public void testBoundsOnModeChangeFreeformToFullscreen() { DisplayContent display = mService.mRootWindowContainer.getDefaultDisplay(); - ActivityStack stack = new StackBuilder(mRootWindowContainer).setDisplay(display) + Task stack = new StackBuilder(mRootWindowContainer).setDisplay(display) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); Task task = stack.getBottomMostTask(); task.getRootActivity().setOrientation(SCREEN_ORIENTATION_UNSPECIFIED); @@ -252,7 +252,7 @@ public class TaskRecordTests extends ActivityTestsBase { dr.setFixedToUserRotation(FIXED_TO_USER_ROTATION_ENABLED); dr.setUserRotation(USER_ROTATION_FREE, ROTATION_0); - ActivityStack stack = new StackBuilder(mRootWindowContainer) + Task stack = new StackBuilder(mRootWindowContainer) .setWindowingMode(WINDOWING_MODE_FULLSCREEN).setDisplay(display).build(); Task task = stack.getBottomMostTask(); ActivityRecord root = task.getTopNonFinishingActivity(); @@ -313,7 +313,7 @@ public class TaskRecordTests extends ActivityTestsBase { Configuration.ORIENTATION_LANDSCAPE; display.onRequestedOverrideConfigurationChanged( display.getRequestedOverrideConfiguration()); - ActivityStack stack = new StackBuilder(mRootWindowContainer) + Task stack = new StackBuilder(mRootWindowContainer) .setWindowingMode(WINDOWING_MODE_FULLSCREEN).setDisplay(display).build(); Task task = stack.getBottomMostTask(); ActivityRecord root = task.getTopNonFinishingActivity(); @@ -324,7 +324,7 @@ public class TaskRecordTests extends ActivityTestsBase { parentWindowContainer.setBounds(fullScreenBounds); doReturn(parentWindowContainer).when(task).getParent(); doReturn(display.getDefaultTaskDisplayArea()).when(task).getDisplayArea(); - doReturn(stack).when(task).getStack(); + doReturn(stack).when(task).getRootTask(); doReturn(true).when(parentWindowContainer).handlesOrientationChangeFromDescendant(); // Setting app to fixed portrait fits within parent, but Task shouldn't adjust the @@ -409,15 +409,15 @@ public class TaskRecordTests extends ActivityTestsBase { assertTrue(task.getResolvedOverrideBounds().isEmpty()); int origScreenH = task.getConfiguration().screenHeightDp; Configuration stackConfig = new Configuration(); - stackConfig.setTo(task.getStack().getRequestedOverrideConfiguration()); + stackConfig.setTo(task.getRootTask().getRequestedOverrideConfiguration()); stackConfig.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); // Set bounds on stack (not task) and verify that the task resource configuration changes // despite it's override bounds being empty. - Rect bounds = new Rect(task.getStack().getBounds()); + Rect bounds = new Rect(task.getRootTask().getBounds()); bounds.bottom = (int) (bounds.bottom * 0.6f); stackConfig.windowConfiguration.setBounds(bounds); - task.getStack().onRequestedOverrideConfigurationChanged(stackConfig); + task.getRootTask().onRequestedOverrideConfigurationChanged(stackConfig); assertNotEquals(origScreenH, task.getConfiguration().screenHeightDp); } @@ -439,7 +439,7 @@ public class TaskRecordTests extends ActivityTestsBase { @Test public void testInsetDisregardedWhenFreeformOverlapsNavBar() { TaskDisplayArea taskDisplayArea = mService.mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack stack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, + Task stack = taskDisplayArea.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); DisplayInfo displayInfo = new DisplayInfo(); mService.mContext.getDisplay().getDisplayInfo(displayInfo); @@ -514,7 +514,7 @@ public class TaskRecordTests extends ActivityTestsBase { info.packageName = DEFAULT_COMPONENT_PACKAGE_NAME; info.targetActivity = targetClassName; - final Task task = new ActivityStack(mService, 1 /* taskId */, info, intent, + final Task task = new Task(mService, 1 /* taskId */, info, intent, null /* voiceSession */, null /* voiceInteractor */, null /* taskDescriptor */, null /*stack*/); assertEquals("The alias activity component should be saved in task intent.", aliasClassName, @@ -880,7 +880,7 @@ public class TaskRecordTests extends ActivityTestsBase { final Task task = getTestTask(); task.setHasBeenVisible(false); task.getDisplayContent().setDisplayWindowingMode(WINDOWING_MODE_FREEFORM); - task.getStack().setWindowingMode(WINDOWING_MODE_FULLSCREEN); + task.getRootTask().setWindowingMode(WINDOWING_MODE_FULLSCREEN); task.setHasBeenVisible(true); task.onConfigurationChanged(task.getParent().getConfiguration()); @@ -896,7 +896,7 @@ public class TaskRecordTests extends ActivityTestsBase { final Task task = getTestTask(); task.setHasBeenVisible(false); task.getDisplayContent().setWindowingMode(WindowConfiguration.WINDOWING_MODE_FREEFORM); - task.getStack().setWindowingMode(WINDOWING_MODE_FULLSCREEN); + task.getRootTask().setWindowingMode(WINDOWING_MODE_FULLSCREEN); final DisplayContent oldDisplay = task.getDisplayContent(); LaunchParamsController.LaunchParams params = new LaunchParamsController.LaunchParams(); @@ -920,7 +920,7 @@ public class TaskRecordTests extends ActivityTestsBase { final Task task = getTestTask(); task.setHasBeenVisible(false); - task.getStack().setWindowingMode(WINDOWING_MODE_FULLSCREEN); + task.getRootTask().setWindowingMode(WINDOWING_MODE_FULLSCREEN); task.setHasBeenVisible(true); task.onConfigurationChanged(task.getParent().getConfiguration()); @@ -936,7 +936,7 @@ public class TaskRecordTests extends ActivityTestsBase { final Task task = getTestTask(); task.setHasBeenVisible(false); task.getDisplayContent().setDisplayWindowingMode(WINDOWING_MODE_FREEFORM); - task.getStack().setWindowingMode(WINDOWING_MODE_PINNED); + task.getRootTask().setWindowingMode(WINDOWING_MODE_PINNED); task.setHasBeenVisible(true); task.onConfigurationChanged(task.getParent().getConfiguration()); @@ -976,7 +976,7 @@ public class TaskRecordTests extends ActivityTestsBase { } private Task getTestTask() { - final ActivityStack stack = new StackBuilder(mRootWindowContainer).build(); + final Task stack = new StackBuilder(mRootWindowContainer).build(); return stack.getBottomMostTask(); } @@ -984,7 +984,7 @@ public class TaskRecordTests extends ActivityTestsBase { Rect expectedConfigBounds) { TaskDisplayArea taskDisplayArea = mService.mRootWindowContainer.getDefaultTaskDisplayArea(); - ActivityStack stack = taskDisplayArea.createStack(windowingMode, ACTIVITY_TYPE_STANDARD, + Task stack = taskDisplayArea.createStack(windowingMode, ACTIVITY_TYPE_STANDARD, true /* onTop */); Task task = new TaskBuilder(mSupervisor).setStack(stack).build(); @@ -1024,7 +1024,7 @@ public class TaskRecordTests extends ActivityTestsBase { } private Task createTask(int taskId) { - return new ActivityStack(mService, taskId, new Intent(), null, null, null, + return new Task(mService, taskId, new Intent(), null, null, null, ActivityBuilder.getDefaultComponent(), null, false, false, false, 0, 10050, null, 0, false, null, 0, 0, 0, 0, null, null, 0, false, false, false, 0, 0, null /*ActivityInfo*/, null /*_voiceSession*/, null /*_voiceInteractor*/, diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java index f1dbde066125..205b842253b7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java @@ -59,7 +59,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testStackPositionChildAt() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); final Task task2 = createTaskInStack(stack, 1 /* userId */); @@ -74,8 +74,8 @@ public class TaskStackTests extends WindowTestsBase { assertEquals(stack.mChildren.get(1), task1); // Non-leaf task should be moved to top regardless of the user id. - createTaskInStack((ActivityStack) task2, 0 /* userId */); - createTaskInStack((ActivityStack) task2, 1 /* userId */); + createTaskInStack(task2, 0 /* userId */); + createTaskInStack(task2, 1 /* userId */); stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */); assertEquals(stack.mChildren.get(0), task1); assertEquals(stack.mChildren.get(1), task2); @@ -83,7 +83,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testClosingAppDifferentStackOrientation() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(mDisplayContent); @@ -103,7 +103,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testMoveTaskToBackDifferentStackOrientation() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(mDisplayContent); @@ -120,9 +120,9 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testStackRemoveImmediately() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); - assertEquals(stack, task.getStack()); + assertEquals(stack, task.getRootTask()); // Remove stack and check if its child is also removed. stack.removeImmediately(); @@ -132,7 +132,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testRemoveContainer() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); assertNotNull(stack); @@ -148,7 +148,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testRemoveContainer_deferRemoval() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); // Stack removal is deferred if one of its child is animating. @@ -172,12 +172,12 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testReparent() { // Create first stack on primary display. - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack1, 0 /* userId */); // Create second display and put second stack on it. final DisplayContent dc = createNewDisplay(); - final ActivityStack stack2 = createTaskStackOnDisplay(dc); + final Task stack2 = createTaskStackOnDisplay(dc); // Reparent clearInvocations(task1); // reset the number of onDisplayChanged for task. @@ -191,7 +191,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testStackOutset() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final int stackOutset = 10; spyOn(stack); doReturn(stackOutset).when(stack).getTaskOutset(); @@ -219,7 +219,7 @@ public class TaskStackTests extends WindowTestsBase { @Test public void testActivityAndTaskGetsProperType() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(mDisplayContent); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index 9d88ada5a90c..039ffc464337 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -54,7 +54,7 @@ public class TaskTests extends WindowTestsBase { @Test public void testRemoveContainer() { - final ActivityStack stackController1 = createTaskStackOnDisplay(mDisplayContent); + final Task stackController1 = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stackController1, 0 /* userId */); final ActivityRecord activity = WindowTestUtils.createActivityRecordInTask(mDisplayContent, task); @@ -68,7 +68,7 @@ public class TaskTests extends WindowTestsBase { @Test public void testRemoveContainer_deferRemoval() { - final ActivityStack stackController1 = createTaskStackOnDisplay(mDisplayContent); + final Task stackController1 = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stackController1, 0 /* userId */); final ActivityRecord activity = WindowTestUtils.createActivityRecordInTask(mDisplayContent, task); @@ -90,9 +90,9 @@ public class TaskTests extends WindowTestsBase { @Test public void testReparent() { - final ActivityStack stackController1 = createTaskStackOnDisplay(mDisplayContent); + final Task stackController1 = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stackController1, 0 /* userId */); - final ActivityStack stackController2 = createTaskStackOnDisplay(mDisplayContent); + final Task stackController2 = createTaskStackOnDisplay(mDisplayContent); final Task task2 = createTaskInStack(stackController2, 0 /* userId */); boolean gotException = false; @@ -120,13 +120,13 @@ public class TaskTests extends WindowTestsBase { @Test public void testReparent_BetweenDisplays() { // Create first stack on primary display. - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack1, 0 /* userId */); assertEquals(mDisplayContent, stack1.getDisplayContent()); // Create second display and put second stack on it. final DisplayContent dc = createNewDisplay(); - final ActivityStack stack2 = createTaskStackOnDisplay(dc); + final Task stack2 = createTaskStackOnDisplay(dc); final Task task2 = createTaskInStack(stack2, 0 /* userId */); // Reparent and check state clearInvocations(task); // reset the number of onDisplayChanged for task. @@ -139,7 +139,7 @@ public class TaskTests extends WindowTestsBase { @Test public void testBounds() { - final ActivityStack stack1 = createTaskStackOnDisplay(mDisplayContent); + final Task stack1 = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack1, 0 /* userId */); // Check that setting bounds also updates surface position diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java index efc03df877b7..3ebc28886377 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java @@ -808,7 +808,7 @@ public class WindowContainerTests extends WindowTestsBase { @Test public void testOnDisplayChanged() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); final ActivityRecord activity = WindowTestUtils.createActivityRecordInTask(mDisplayContent, task); @@ -852,7 +852,7 @@ public class WindowContainerTests extends WindowTestsBase { @Test public void testTaskCanApplyAnimation() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(stack, 0 /* userId */); final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(mDisplayContent, task); @@ -863,7 +863,7 @@ public class WindowContainerTests extends WindowTestsBase { @Test public void testStackCanApplyAnimation() { - final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent); + final Task stack = createTaskStackOnDisplay(mDisplayContent); final ActivityRecord activity2 = WindowTestUtils.createActivityRecordInTask(mDisplayContent, createTaskInStack(stack, 0 /* userId */)); final ActivityRecord activity1 = WindowTestUtils.createActivityRecordInTask(mDisplayContent, @@ -879,7 +879,7 @@ public class WindowContainerTests extends WindowTestsBase { assertNull(windowContainer.getDisplayArea()); // ActivityStack > WindowContainer - final ActivityStack activityStack = createTaskStackOnDisplay(mDisplayContent); + final Task activityStack = createTaskStackOnDisplay(mDisplayContent); activityStack.addChild(windowContainer, 0); activityStack.setParent(null); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 8fa3a12f027d..f97dff3162c4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -105,13 +105,13 @@ public class WindowManagerServiceTests extends WindowTestsBase { public void testTaskFocusChange_stackNotHomeType_focusChanges() throws RemoteException { DisplayContent display = createNewDisplay(); // Current focused window - ActivityStack focusedStack = createTaskStackOnDisplay( + Task focusedStack = createTaskStackOnDisplay( WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, display); Task focusedTask = createTaskInStack(focusedStack, 0 /* userId */); WindowState focusedWindow = createAppWindow(focusedTask, TYPE_APPLICATION, "App Window"); mDisplayContent.mCurrentFocus = focusedWindow; // Tapped task - ActivityStack tappedStack = createTaskStackOnDisplay( + Task tappedStack = createTaskStackOnDisplay( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, display); Task tappedTask = createTaskInStack(tappedStack, 0 /* userId */); spyOn(mWm.mActivityTaskManager); @@ -126,13 +126,13 @@ public class WindowManagerServiceTests extends WindowTestsBase { throws RemoteException { DisplayContent display = createNewDisplay(); // Current focused window - ActivityStack focusedStack = createTaskStackOnDisplay( + Task focusedStack = createTaskStackOnDisplay( WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, display); Task focusedTask = createTaskInStack(focusedStack, 0 /* userId */); WindowState focusedWindow = createAppWindow(focusedTask, TYPE_APPLICATION, "App Window"); mDisplayContent.mCurrentFocus = focusedWindow; // Tapped home task - ActivityStack tappedStack = createTaskStackOnDisplay( + Task tappedStack = createTaskStackOnDisplay( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, display); Task tappedTask = createTaskInStack(tappedStack, 0 /* userId */); spyOn(mWm.mActivityTaskManager); @@ -149,13 +149,13 @@ public class WindowManagerServiceTests extends WindowTestsBase { final TaskDisplayArea secondTda = createTaskDisplayArea( display, mWm, "Tapped TDA", FEATURE_VENDOR_FIRST); // Current focused window - ActivityStack focusedStack = createTaskStackOnDisplay( + Task focusedStack = createTaskStackOnDisplay( WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD, display); Task focusedTask = createTaskInStack(focusedStack, 0 /* userId */); WindowState focusedWindow = createAppWindow(focusedTask, TYPE_APPLICATION, "App Window"); mDisplayContent.mCurrentFocus = focusedWindow; // Tapped home task on another task display area - ActivityStack tappedStack = createTaskStackOnTaskDisplayArea( + Task tappedStack = createTaskStackOnTaskDisplayArea( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, secondTda); Task tappedTask = createTaskInStack(tappedStack, 0 /* userId */); spyOn(mWm.mActivityTaskManager); 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 7cc19ad0ddd8..bd52e9a294fc 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -103,7 +103,7 @@ public class WindowOrganizerTests extends WindowTestsBase { return registerMockOrganizer(WINDOWING_MODE_MULTI_WINDOW); } - Task createTask(ActivityStack stack, boolean fakeDraw) { + Task createTask(Task stack, boolean fakeDraw) { final Task task = createTaskInStack(stack, 0); if (fakeDraw) { @@ -112,12 +112,12 @@ public class WindowOrganizerTests extends WindowTestsBase { return task; } - Task createTask(ActivityStack stack) { + Task createTask(Task stack) { // Fake draw notifications for most of our tests. return createTask(stack, true); } - ActivityStack createStack() { + Task createStack() { return createTaskStackOnDisplay(mDisplayContent); } @@ -130,7 +130,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testAppearVanish() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -144,7 +144,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testAppearWaitsForVisibility() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack, false); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -163,7 +163,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testNoVanishedIfNoAppear() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack, false /* hasBeenVisible */); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -179,7 +179,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testSwapOrganizer() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(WINDOWING_MODE_MULTI_WINDOW); final ITaskOrganizer organizer2 = registerMockOrganizer(WINDOWING_MODE_PINNED); @@ -193,7 +193,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testSwapWindowingModes() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(WINDOWING_MODE_MULTI_WINDOW); final ITaskOrganizer organizer2 = registerMockOrganizer(WINDOWING_MODE_PINNED); @@ -207,7 +207,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testTaskNoDraw() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack, false /* fakeDraw */); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -223,7 +223,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testClearOrganizer() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -238,7 +238,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testUnregisterOrganizer() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -253,11 +253,11 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testUnregisterOrganizerReturnsRegistrationToPrevious() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); - final ActivityStack stack2 = createStack(); + final Task stack2 = createStack(); final Task task2 = createTask(stack2); - final ActivityStack stack3 = createStack(); + final Task stack3 = createStack(); final Task task3 = createTask(stack3); final ITaskOrganizer organizer = registerMockOrganizer(WINDOWING_MODE_MULTI_WINDOW); @@ -297,7 +297,7 @@ public class WindowOrganizerTests extends WindowTestsBase { public void testRegisterTaskOrganizerStackWindowingModeChanges() throws RemoteException { final ITaskOrganizer organizer = registerMockOrganizer(WINDOWING_MODE_PINNED); - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final Task task2 = createTask(stack); stack.setWindowingMode(WINDOWING_MODE_PINNED); @@ -310,7 +310,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testRegisterTaskOrganizerWithExistingTasks() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); stack.setWindowingMode(WINDOWING_MODE_PINNED); @@ -322,7 +322,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testTaskTransaction() { removeGlobalMinSizeRestriction(); - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); final Task task = stack.getTopMostTask(); testTransaction(task); @@ -331,7 +331,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testStackTransaction() { removeGlobalMinSizeRestriction(); - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); StackInfo info = mWm.mAtmService.getStackInfo(WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD); @@ -356,7 +356,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testSetWindowingMode() { - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); testSetWindowingMode(stack); @@ -375,7 +375,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testSetActivityWindowingMode() { final ActivityRecord record = makePipableActivity(); - final ActivityStack stack = record.getStack(); + final Task stack = record.getStack(); final WindowContainerTransaction t = new WindowContainerTransaction(); t.setWindowingMode(stack.mRemoteToken.toWindowContainerToken(), WINDOWING_MODE_PINNED); @@ -390,7 +390,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testContainerFocusableChanges() { removeGlobalMinSizeRestriction(); - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); final Task task = stack.getTopMostTask(); WindowContainerTransaction t = new WindowContainerTransaction(); @@ -406,7 +406,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testContainerHiddenChanges() { removeGlobalMinSizeRestriction(); - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); WindowContainerTransaction t = new WindowContainerTransaction(); assertTrue(stack.shouldBeVisible(null)); @@ -421,7 +421,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testOverrideConfigSize() { removeGlobalMinSizeRestriction(); - final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) + final Task stack = new ActivityTestsBase.StackBuilder(mWm.mRoot) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); final Task task = stack.getTopMostTask(); WindowContainerTransaction t = new WindowContainerTransaction(); @@ -489,7 +489,7 @@ public class WindowOrganizerTests extends WindowTestsBase { RunningTaskInfo info1 = mWm.mAtmService.mTaskOrganizerController.createRootTask( mDisplayContent.mDisplayId, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); - final ActivityStack stack = createTaskStackOnDisplay( + final Task stack = createTaskStackOnDisplay( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, mDisplayContent); assertEquals(mDisplayContent.getWindowingMode(), stack.getWindowingMode()); WindowContainerTransaction wct = new WindowContainerTransaction(); @@ -550,7 +550,7 @@ public class WindowOrganizerTests extends WindowTestsBase { lastReportedTiles.clear(); called[0] = false; - final ActivityStack stack = createTaskStackOnDisplay( + final Task stack = createTaskStackOnDisplay( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, mDisplayContent); Task task1 = WindowContainer.fromBinder(info1.token.asBinder()).asTask(); WindowContainerTransaction wct = new WindowContainerTransaction(); @@ -561,7 +561,7 @@ public class WindowOrganizerTests extends WindowTestsBase { lastReportedTiles.clear(); called[0] = false; - final ActivityStack stack2 = createTaskStackOnDisplay( + final Task stack2 = createTaskStackOnDisplay( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_HOME, mDisplayContent); wct = new WindowContainerTransaction(); wct.reparent(stack2.mRemoteToken.toWindowContainerToken(), info1.token, true /* onTop */); @@ -617,9 +617,9 @@ public class WindowOrganizerTests extends WindowTestsBase { final int initialRootTaskCount = mWm.mAtmService.mTaskOrganizerController.getRootTasks( mDisplayContent.mDisplayId, null /* activityTypes */).size(); - final ActivityStack stack = createTaskStackOnDisplay( + final Task stack = createTaskStackOnDisplay( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, mDisplayContent); - final ActivityStack stack2 = createTaskStackOnDisplay( + final Task stack2 = createTaskStackOnDisplay( WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_HOME, mDisplayContent); // Check getRootTasks works @@ -694,7 +694,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testTrivialBLASTCallback() throws RemoteException { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -716,7 +716,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testOverlappingBLASTCallback() throws RemoteException { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -745,7 +745,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testBLASTCallbackWithWindow() { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); final WindowState w = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window"); @@ -769,7 +769,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testBLASTCallbackNoDoubleAdd() { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); final WindowState w = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window"); @@ -791,7 +791,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testBLASTCallbackWithInvisibleWindow() { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); final WindowState w = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window"); @@ -813,7 +813,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testBLASTCallbackWithChildWindow() { - final ActivityStack stackController1 = createStack(); + final Task stackController1 = createStack(); final Task task = createTask(stackController1); final ITaskOrganizer organizer = registerMockOrganizer(); final WindowState w = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window"); @@ -930,7 +930,7 @@ public class WindowOrganizerTests extends WindowTestsBase { mWm.mAtmService.mTaskOrganizerController.registerTaskOrganizer(o, WINDOWING_MODE_MULTI_WINDOW); - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ActivityRecord record = WindowTestUtils.createActivityRecordInTask( stack.mDisplayContent, task); @@ -943,7 +943,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testPreventDuplicateAppear() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ITaskOrganizer organizer = registerMockOrganizer(); @@ -965,7 +965,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testInterceptBackPressedOnTaskRoot() throws RemoteException { - final ActivityStack stack = createStack(); + final Task stack = createStack(); final Task task = createTask(stack); final ActivityRecord activity = WindowTestUtils.createActivityRecordInTask( stack.mDisplayContent, task); @@ -992,7 +992,7 @@ public class WindowOrganizerTests extends WindowTestsBase { @Test public void testBLASTCallbackWithMultipleWindows() throws Exception { - final ActivityStack stackController = createStack(); + final Task stackController = createStack(); final Task task = createTask(stackController); final ITaskOrganizer organizer = registerMockOrganizer(); final WindowState w1 = createAppWindow(task, TYPE_APPLICATION, "Enlightened Window 1"); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index ce9dd685293a..3894a2eaa461 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -250,7 +250,7 @@ public class WindowStateTests extends WindowTestsBase { // minimized and home stack is resizable, so that we should ignore input for the stack. final DockedStackDividerController controller = mDisplayContent.getDockedDividerController(); - final ActivityStack stack = createTaskStackOnDisplay(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, + final Task stack = createTaskStackOnDisplay(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, mDisplayContent); spyOn(appWindow); spyOn(controller); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java index 49993610bbed..2502932c5421 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java @@ -32,8 +32,8 @@ import com.android.server.wm.ActivityTestsBase.ActivityBuilder; */ class WindowTestUtils { - /** Creates a {@link Task} and adds it to the specified {@link ActivityStack}. */ - static Task createTaskInStack(WindowManagerService service, ActivityStack stack, int userId) { + /** Creates a {@link Task} and adds it to the specified {@link Task}. */ + static Task createTaskInStack(WindowManagerService service, Task stack, int userId) { final Task task = new ActivityTestsBase.TaskBuilder(stack.mStackSupervisor) .setUserId(userId) .setStack(stack) @@ -48,7 +48,7 @@ class WindowTestUtils { return activity; } - static ActivityRecord createTestActivityRecord(ActivityStack stack) { + static ActivityRecord createTestActivityRecord(Task stack) { final ActivityRecord activity = new ActivityTestsBase.ActivityBuilder(stack.mAtmService) .setStack(stack) .setCreateTask(true) diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 0bbe0a04f618..dc388833f338 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -211,7 +211,7 @@ class WindowTestsBase extends SystemServiceTestsBase { ActivityRecord createTestActivityRecord(DisplayContent dc, int windowingMode, int activityType) { - final ActivityStack stack = createTaskStackOnDisplay(windowingMode, activityType, dc); + final Task stack = createTaskStackOnDisplay(windowingMode, activityType, dc); return WindowTestUtils.createTestActivityRecord(stack); } @@ -322,12 +322,12 @@ class WindowTestsBase extends SystemServiceTestsBase { return newTaskDisplayArea; } - /** Creates a {@link ActivityStack} and adds it to the specified {@link DisplayContent}. */ - ActivityStack createTaskStackOnDisplay(DisplayContent dc) { + /** Creates a {@link Task} and adds it to the specified {@link DisplayContent}. */ + Task createTaskStackOnDisplay(DisplayContent dc) { return createTaskStackOnDisplay(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, dc); } - ActivityStack createTaskStackOnDisplay(int windowingMode, int activityType, DisplayContent dc) { + Task createTaskStackOnDisplay(int windowingMode, int activityType, DisplayContent dc) { return new ActivityTestsBase.StackBuilder(dc.mWmService.mRoot) .setDisplay(dc) .setWindowingMode(windowingMode) @@ -337,7 +337,7 @@ class WindowTestsBase extends SystemServiceTestsBase { .build(); } - ActivityStack createTaskStackOnTaskDisplayArea(int windowingMode, int activityType, + Task createTaskStackOnTaskDisplayArea(int windowingMode, int activityType, TaskDisplayArea tda) { return new ActivityTestsBase.StackBuilder(tda.mWmService.mRoot) .setTaskDisplayArea(tda) @@ -348,8 +348,8 @@ class WindowTestsBase extends SystemServiceTestsBase { .build(); } - /** Creates a {@link Task} and adds it to the specified {@link ActivityStack}. */ - Task createTaskInStack(ActivityStack stack, int userId) { + /** Creates a {@link Task} and adds it to the specified {@link Task}. */ + Task createTaskInStack(Task stack, int userId) { return WindowTestUtils.createTaskInStack(mWm, stack, userId); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowTokenTests.java index cef202cdc5d5..f185da395754 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTokenTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTokenTests.java @@ -84,6 +84,10 @@ public class WindowTokenTests extends WindowTestsBase { assertFalse(token.hasWindow(window12)); assertTrue(token.hasWindow(window2)); assertTrue(token.hasWindow(window3)); + + // The child windows should have the same window token as their parents. + assertEquals(window1.mToken, window11.mToken); + assertEquals(window1.mToken, window12.mToken); } @Test diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 321657d5d626..9b18ec644ceb 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -215,8 +215,7 @@ public class UsageStatsService extends SystemService implements mHandler = new H(BackgroundThread.get().getLooper()); mAppStandby = AppStandbyInternal.newAppStandbyController( - UsageStatsService.class.getClassLoader(), getContext(), - BackgroundThread.get().getLooper()); + UsageStatsService.class.getClassLoader(), getContext()); mAppTimeLimit = new AppTimeLimitController( new AppTimeLimitController.TimeLimitCallbackListener() { diff --git a/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java b/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java index 7e8a90ccd4ad..dcaff26b79c6 100644 --- a/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java +++ b/startop/iorap/src/com/google/android/startop/iorap/EventSequenceValidator.java @@ -96,7 +96,8 @@ import java.io.PrintWriter; */ public class EventSequenceValidator implements ActivityMetricsLaunchObserver { static final String TAG = "EventSequenceValidator"; - + /** $> adb shell 'setprop log.tag.EventSequenceValidator VERBOSE' */ + public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private State state = State.INIT; private long accIntentStartedEvents = 0; @@ -255,10 +256,12 @@ public class EventSequenceValidator implements ActivityMetricsLaunchObserver { } private void logWarningWithStackTrace(String log) { - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - new Throwable("EventSequenceValidator#getStackTrace").printStackTrace(pw); - Log.wtf(TAG, String.format("%s\n%s", log, sw)); + if (DEBUG) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + new Throwable("EventSequenceValidator#getStackTrace").printStackTrace(pw); + Log.wtf(TAG, String.format("%s\n%s", log, sw)); + } } } diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 8450a9018634..92e419707970 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -29,6 +29,7 @@ import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -231,7 +232,9 @@ public final class EuiccProfileInfo implements Parcelable { mState = baseProfile.mState; mCarrierIdentifier = baseProfile.mCarrierIdentifier; mPolicyRules = baseProfile.mPolicyRules; - mAccessRules = Arrays.asList(baseProfile.mAccessRules); + mAccessRules = baseProfile.mAccessRules == null + ? Collections.emptyList() + : Arrays.asList(baseProfile.mAccessRules); } /** Builds the profile instance. */ diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b617f6abc1d6..5ea4c7b5dac9 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2382,6 +2382,16 @@ public class CarrierConfigManager { "call_forwarding_blocks_while_roaming_string_array"; /** + * Call forwarding number prefixes defined by {@link + * #KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY} which will be allowed while the + * device is reporting that it is roaming and IMS is registered over LTE or Wi-Fi. + * By default this value is {@code true}. + * @hide + */ + public static final String KEY_SUPPORT_IMS_CALL_FORWARDING_WHILE_ROAMING_BOOL = + "support_ims_call_forwarding_while_roaming_bool"; + + /** * The day of the month (1-31) on which the data cycle rolls over. * <p> * If the current month does not have this day, the cycle will roll over at @@ -4223,6 +4233,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false); sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY, null); + sDefaults.putBoolean(KEY_SUPPORT_IMS_CALL_FORWARDING_WHILE_ROAMING_BOOL, true); sDefaults.putInt(KEY_LTE_EARFCNS_RSRP_BOOST_INT, 0); sDefaults.putStringArray(KEY_BOOSTED_LTE_EARFCNS_STRING_ARRAY, null); sDefaults.putBoolean(KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false); diff --git a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java index c667165e7a0e..e91d6fc9d801 100644 --- a/telephony/java/android/telephony/DataSpecificRegistrationInfo.java +++ b/telephony/java/android/telephony/DataSpecificRegistrationInfo.java @@ -72,28 +72,20 @@ public final class DataSpecificRegistrationInfo implements Parcelable { /** * Provides network support info for LTE VoPS and LTE Emergency bearer support */ + @Nullable private final LteVopsSupportInfo mLteVopsSupportInfo; /** - * Indicates if it's using carrier aggregation - * - * @hide - */ - public boolean mIsUsingCarrierAggregation; - - /** * @hide */ DataSpecificRegistrationInfo( int maxDataCalls, boolean isDcNrRestricted, boolean isNrAvailable, - boolean isEnDcAvailable, LteVopsSupportInfo lteVops, - boolean isUsingCarrierAggregation) { + boolean isEnDcAvailable, @Nullable LteVopsSupportInfo lteVops) { this.maxDataCalls = maxDataCalls; this.isDcNrRestricted = isDcNrRestricted; this.isNrAvailable = isNrAvailable; this.isEnDcAvailable = isEnDcAvailable; this.mLteVopsSupportInfo = lteVops; - this.mIsUsingCarrierAggregation = isUsingCarrierAggregation; } /** @@ -102,32 +94,29 @@ public final class DataSpecificRegistrationInfo implements Parcelable { * @param dsri another data specific registration info * @hide */ - DataSpecificRegistrationInfo(DataSpecificRegistrationInfo dsri) { + DataSpecificRegistrationInfo(@NonNull DataSpecificRegistrationInfo dsri) { maxDataCalls = dsri.maxDataCalls; isDcNrRestricted = dsri.isDcNrRestricted; isNrAvailable = dsri.isNrAvailable; isEnDcAvailable = dsri.isEnDcAvailable; mLteVopsSupportInfo = dsri.mLteVopsSupportInfo; - mIsUsingCarrierAggregation = dsri.mIsUsingCarrierAggregation; } - private DataSpecificRegistrationInfo(Parcel source) { + private DataSpecificRegistrationInfo(/* @NonNull */ Parcel source) { maxDataCalls = source.readInt(); isDcNrRestricted = source.readBoolean(); isNrAvailable = source.readBoolean(); isEnDcAvailable = source.readBoolean(); mLteVopsSupportInfo = LteVopsSupportInfo.CREATOR.createFromParcel(source); - mIsUsingCarrierAggregation = source.readBoolean(); } @Override - public void writeToParcel(Parcel dest, int flags) { + public void writeToParcel(/* @NonNull */ Parcel dest, int flags) { dest.writeInt(maxDataCalls); dest.writeBoolean(isDcNrRestricted); dest.writeBoolean(isNrAvailable); dest.writeBoolean(isEnDcAvailable); mLteVopsSupportInfo.writeToParcel(dest, flags); - dest.writeBoolean(mIsUsingCarrierAggregation); } @Override @@ -144,8 +133,7 @@ public final class DataSpecificRegistrationInfo implements Parcelable { .append(" isDcNrRestricted = " + isDcNrRestricted) .append(" isNrAvailable = " + isNrAvailable) .append(" isEnDcAvailable = " + isEnDcAvailable) - .append(" " + mLteVopsSupportInfo.toString()) - .append(" mIsUsingCarrierAggregation = " + mIsUsingCarrierAggregation) + .append(" " + mLteVopsSupportInfo) .append(" }") .toString(); } @@ -153,7 +141,7 @@ public final class DataSpecificRegistrationInfo implements Parcelable { @Override public int hashCode() { return Objects.hash(maxDataCalls, isDcNrRestricted, isNrAvailable, isEnDcAvailable, - mLteVopsSupportInfo, mIsUsingCarrierAggregation); + mLteVopsSupportInfo); } @Override @@ -167,8 +155,7 @@ public final class DataSpecificRegistrationInfo implements Parcelable { && this.isDcNrRestricted == other.isDcNrRestricted && this.isNrAvailable == other.isNrAvailable && this.isEnDcAvailable == other.isEnDcAvailable - && this.mLteVopsSupportInfo.equals(other.mLteVopsSupportInfo) - && this.mIsUsingCarrierAggregation == other.mIsUsingCarrierAggregation; + && Objects.equals(mLteVopsSupportInfo, other.mLteVopsSupportInfo); } public static final @NonNull Parcelable.Creator<DataSpecificRegistrationInfo> CREATOR = @@ -192,23 +179,4 @@ public final class DataSpecificRegistrationInfo implements Parcelable { return mLteVopsSupportInfo; } - /** - * Set the flag indicating if using carrier aggregation. - * - * @param isUsingCarrierAggregation {@code true} if using carrier aggregation. - * @hide - */ - public void setIsUsingCarrierAggregation(boolean isUsingCarrierAggregation) { - mIsUsingCarrierAggregation = isUsingCarrierAggregation; - } - - /** - * Get whether network has configured carrier aggregation or not. - * - * @return {@code true} if using carrier aggregation. - * @hide - */ - public boolean isUsingCarrierAggregation() { - return mIsUsingCarrierAggregation; - } } diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index e0b5779cfda9..aee1e84ca356 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -218,6 +218,9 @@ public final class NetworkRegistrationInfo implements Parcelable { @NonNull private String mRplmn; + // Updated based on the accessNetworkTechnology + private boolean mIsUsingCarrierAggregation; + /** * @param domain Network domain. Must be a {@link Domain}. For transport type * {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN}, this must set to {@link #DOMAIN_PS}. @@ -251,7 +254,7 @@ public final class NetworkRegistrationInfo implements Parcelable { mRegistrationState = registrationState; mRoamingType = (registrationState == REGISTRATION_STATE_ROAMING) ? ServiceState.ROAMING_TYPE_UNKNOWN : ServiceState.ROAMING_TYPE_NOT_ROAMING; - mAccessNetworkTechnology = accessNetworkTechnology; + setAccessNetworkTechnology(accessNetworkTechnology); mRejectCause = rejectCause; mAvailableServices = (availableServices != null) ? new ArrayList<>(availableServices) : new ArrayList<>(); @@ -290,13 +293,11 @@ public final class NetworkRegistrationInfo implements Parcelable { @Nullable CellIdentity cellIdentity, @Nullable String rplmn, int maxDataCalls, boolean isDcNrRestricted, boolean isNrAvailable, boolean isEndcAvailable, - LteVopsSupportInfo lteVopsSupportInfo, - boolean isUsingCarrierAggregation) { + LteVopsSupportInfo lteVopsSupportInfo) { this(domain, transportType, registrationState, accessNetworkTechnology, rejectCause, emergencyOnly, availableServices, cellIdentity, rplmn); mDataSpecificInfo = new DataSpecificRegistrationInfo( - maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo, - isUsingCarrierAggregation); + maxDataCalls, isDcNrRestricted, isNrAvailable, isEndcAvailable, lteVopsSupportInfo); updateNrState(); } @@ -317,6 +318,7 @@ public final class NetworkRegistrationInfo implements Parcelable { DataSpecificRegistrationInfo.class.getClassLoader()); mNrState = source.readInt(); mRplmn = source.readString(); + mIsUsingCarrierAggregation = source.readBoolean(); } /** @@ -331,6 +333,7 @@ public final class NetworkRegistrationInfo implements Parcelable { mRegistrationState = nri.mRegistrationState; mRoamingType = nri.mRoamingType; mAccessNetworkTechnology = nri.mAccessNetworkTechnology; + mIsUsingCarrierAggregation = nri.mIsUsingCarrierAggregation; mRejectCause = nri.mRejectCause; mEmergencyOnly = nri.mEmergencyOnly; mAvailableServices = new ArrayList<>(nri.mAvailableServices); @@ -484,9 +487,7 @@ public final class NetworkRegistrationInfo implements Parcelable { if (tech == TelephonyManager.NETWORK_TYPE_LTE_CA) { // For old device backward compatibility support tech = TelephonyManager.NETWORK_TYPE_LTE; - if (mDataSpecificInfo != null) { - mDataSpecificInfo.setIsUsingCarrierAggregation(true); - } + mIsUsingCarrierAggregation = true; } mAccessNetworkTechnology = tech; } @@ -511,6 +512,27 @@ public final class NetworkRegistrationInfo implements Parcelable { } /** + * Set whether network has configured carrier aggregation or not. + * + * @param isUsingCarrierAggregation set whether or not carrier aggregation is used. + * + * @hide + */ + public void setIsUsingCarrierAggregation(boolean isUsingCarrierAggregation) { + mIsUsingCarrierAggregation = isUsingCarrierAggregation; + } + + /** + * Get whether network has configured carrier aggregation or not. + * + * @return {@code true} if using carrier aggregation. + * @hide + */ + public boolean isUsingCarrierAggregation() { + return mIsUsingCarrierAggregation; + } + + /** * @hide */ @Nullable @@ -617,6 +639,7 @@ public final class NetworkRegistrationInfo implements Parcelable { .append(" dataSpecificInfo=").append(mDataSpecificInfo) .append(" nrState=").append(nrStateToString(mNrState)) .append(" rRplmn=").append(mRplmn) + .append(" isUsingCarrierAggregation=").append(mIsUsingCarrierAggregation) .append("}").toString(); } @@ -624,7 +647,8 @@ public final class NetworkRegistrationInfo implements Parcelable { public int hashCode() { return Objects.hash(mDomain, mTransportType, mRegistrationState, mRoamingType, mAccessNetworkTechnology, mRejectCause, mEmergencyOnly, mAvailableServices, - mCellIdentity, mVoiceSpecificInfo, mDataSpecificInfo, mNrState, mRplmn); + mCellIdentity, mVoiceSpecificInfo, mDataSpecificInfo, mNrState, mRplmn, + mIsUsingCarrierAggregation); } @Override @@ -644,6 +668,7 @@ public final class NetworkRegistrationInfo implements Parcelable { && mRejectCause == other.mRejectCause && mEmergencyOnly == other.mEmergencyOnly && mAvailableServices.equals(other.mAvailableServices) + && mIsUsingCarrierAggregation == other.mIsUsingCarrierAggregation && Objects.equals(mCellIdentity, other.mCellIdentity) && Objects.equals(mVoiceSpecificInfo, other.mVoiceSpecificInfo) && Objects.equals(mDataSpecificInfo, other.mDataSpecificInfo) @@ -670,6 +695,7 @@ public final class NetworkRegistrationInfo implements Parcelable { dest.writeParcelable(mDataSpecificInfo, 0); dest.writeInt(mNrState); dest.writeString(mRplmn); + dest.writeBoolean(mIsUsingCarrierAggregation); } /** diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 9e2ba6875577..3e7464739f9f 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -1412,29 +1412,14 @@ public class ServiceState implements Parcelable { /** @hide */ public boolean isUsingCarrierAggregation() { - boolean isUsingCa = false; - NetworkRegistrationInfo nri = getNetworkRegistrationInfo( - NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); - if (nri != null) { - DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo(); - if (dsri != null) { - isUsingCa = dsri.isUsingCarrierAggregation(); - } - } - return isUsingCa || getCellBandwidths().length > 1; - } + if (getCellBandwidths().length > 1) return true; - /** @hide */ - public void setIsUsingCarrierAggregation(boolean ca) { - NetworkRegistrationInfo nri = getNetworkRegistrationInfo( - NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); - if (nri != null) { - DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo(); - if (dsri != null) { - dsri.setIsUsingCarrierAggregation(ca); - addNetworkRegistrationInfo(nri); + synchronized (mNetworkRegistrationInfos) { + for (NetworkRegistrationInfo nri : mNetworkRegistrationInfos) { + if (nri.isUsingCarrierAggregation()) return true; } } + return false; } /** diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java index de0fb86029dd..d8a10ebb7bde 100644 --- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java +++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java @@ -303,7 +303,7 @@ public class MmTelFeature extends ImsFeature { } /** - * @param capabilities a bitmask of one or more {@link MmTelCapability}. + * @param capabilities a bitmask of one or more capabilities. * * @return true if all queried capabilities are true, otherwise false. */ diff --git a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java index ba2064005937..e1b508b424f5 100644 --- a/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java +++ b/tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java @@ -25,14 +25,30 @@ import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.perftests.am.util.Constants; import com.android.frameworks.perftests.am.util.TargetPackageUtils; +import com.android.frameworks.perftests.am.util.Utils; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @LargeTest public class ServiceStartPerfTest extends BasePerfTest { + private static final String STUB_PACKAGE_NAME = + "com.android.frameworks.perftests.amteststestapp"; + + @Before + public void setUp() { + super.setUp(); + Utils.runShellCommand("cmd deviceidle whitelist +" + STUB_PACKAGE_NAME); + } + + @After + public void tearDown() { + Utils.runShellCommand("cmd deviceidle whitelist -" + STUB_PACKAGE_NAME); + } /** * Tries to start the service with the given intent, throwing a RuntimeException with the diff --git a/tests/FlickerTests/README.md b/tests/FlickerTests/README.md index a7c9e20e0a07..6b28fdf8a8ef 100644 --- a/tests/FlickerTests/README.md +++ b/tests/FlickerTests/README.md @@ -1,146 +1,88 @@ # Flicker Test Library ## Motivation -Detect *flicker* — any discontinuous, or unpredictable behavior seen during UI transitions that is not due to performance. This is often the result of a logic error in the code and difficult to identify because the issue is transient and at times difficult to reproduce. This library helps create integration tests between `SurfaceFlinger`, `WindowManager` and `SystemUI` to identify flicker. +This set of tests use the flickerlib from `platform_testing/libraries/flicker` to execute a set of common UI transitions to detect discontinuous or unpredictable behavior. -## Adding a Test -The library builds and runs UI transitions, captures Winscope traces and exposes common assertions that can be tested against each trace. - -### Building Transitions -Start by defining common or error prone transitions using `TransitionRunner`. -```java -// Example: Build a transition that cold launches an app from launcher -TransitionRunner transition = TransitionRunner.newBuilder() - // Specify a tag to identify the transition (optional) - .withTag("OpenAppCold_" + testApp.getLauncherName()) - - // Specify preconditions to setup the device - // Wake up device and go to home screen - .runBeforeAll(AutomationUtils::wakeUpAndGoToHomeScreen) - - // Setup transition under test - // Press the home button and close the app to test a cold start - .runBefore(device::pressHome) - .runBefore(testApp::exit) - - // Run the transition under test - // Open the app and wait for UI to be idle - // This is the part of the transition that will be tested. - .run(testApp::open) - .run(device::waitForIdle) - - // Perform any tear downs - // Close the app - .runAfterAll(testApp::exit) - - // Number of times to repeat the transition to catch any flaky issues - .repeat(5); -``` - - -Run the transition to get a list of `TransitionResult` for each time the transition is repeated. -```java - List<TransitionResult> results = transition.run(); -``` -`TransitionResult` contains paths to test artifacts such as Winscope traces and screen recordings. - - -### Checking Assertions -Each `TransitionResult` can be tested using an extension of the Google Truth library, `LayersTraceSubject` and `WmTraceSubject`. They try to balance test principles set out by Google Truth (not supporting nested assertions, keeping assertions simple) with providing support for common assertion use cases. - -Each trace can be represented as a ordered collection of trace entries, with an associated timestamp. Each trace entry has common assertion checks. The trace subjects expose methods to filter the range of entries and test for changing assertions. - -```java - TransitionResult result = results.get(0); - Rect displayBounds = getDisplayBounds(); +The tests are organized in packages according to the transitions they test (e.g., `rotation`, `splitscreen`). - // check all trace entries - assertThat(result).coversRegion(displayBounds).forAllEntries(); - - // check a range of entries - assertThat(result).coversRegion(displayBounds).forRange(startTime, endTime); - - // check first entry - assertThat(result).coversRegion(displayBounds).inTheBeginning(); +## Adding a Test - // check last entry - assertThat(result).coversRegion(displayBounds).atTheEnd(); +By default tests should inherit from `RotationTestBase` or `NonRotationTestBase` and must override the variable `transitionToRun` (Kotlin) or the function `getTransitionToRun()` (Java). +Only tests that are not supported by these classes should inherit directly from the `FlickerTestBase` class. - // check a change in assertions, e.g. wallpaper window is visible, - // then wallpaper window becomes and stays invisible - assertThat(result) - .showsBelowAppWindow("wallpaper") - .then() - .hidesBelowAppWindow("wallpaper") - .forAllEntries(); -``` +### Rotation animations and transitions -All assertions return `Result` which contains a `success` flag, `assertionName` string identifier, and `reason` string to provide actionable details to the user. The `reason` string is build along the way with all the details as to why the assertions failed and any hints which might help the user determine the root cause. Failed assertion message will also contain a path to the trace that was tested. Example of a failed test: +Tests that rotate the device should inherit from `RotationTestBase`. +Tests that inherit from the class automatically receive start and end rotation values. +Moreover, these tests inherit the following checks: +* all regions on the screen are covered +* status bar is always visible +* status bar rotates +* nav bar is always visible +* nav bar is rotates -``` - java.lang.AssertionError: Not true that <com.android.server.wm.flicker.LayersTrace@65da4cc> - Layers Trace can be found in: /layers_trace_emptyregion.pb - Timestamp: 2308008331271 - Assertion: coversRegion - Reason: Region to test: Rect(0, 0 - 1440, 2880) - first empty point: 0, 99 - visible regions: - StatusBar#0Rect(0, 0 - 1440, 98) - NavigationBar#0Rect(0, 2712 - 1440, 2880) - ScreenDecorOverlay#0Rect(0, 0 - 1440, 91) - ... - at com.google.common.truth.FailureStrategy.fail(FailureStrategy.java:24) - ... -``` +The default tests can be disabled by overriding the respective methods and including an `@Ignore` annotation. ---- +### Non-Rotation animations and transitions -## Running Tests +`NonRotationTestBase` was created to make it easier to write tests that do not involve rotation (e.g., `Pip`, `split screen` or `IME`). +Tests that inherit from the class are automatically executed twice: once in portrait and once in landscape mode and the assertions are checked independently. +Moreover, these tests inherit the following checks: +* all regions on the screen are covered +* status bar is always visible +* nav bar is always visible -The tests can be run as any other Android JUnit tests. `platform_testing/tests/flicker` uses the library to test common UI transitions. Run `atest FlickerTest` to execute these tests. +The default tests can be disabled by overriding the respective methods and including an `@Ignore` annotation. ---- +### Exceptional cases -## Other Topics -### Monitors -Monitors capture test artifacts for each transition run. They are started before each iteration of the test transition (after the `runBefore` calls) and stopped after the transition is completed. Each iteration will produce a new test artifact. The following monitors are available: +Tests that rotate the device should inherit from `RotationTestBase`. +This class allows the test to be freely configured and does not provide any assertions. -#### LayersTraceMonitor -Captures Layers trace. This monitor is started by default. Build a transition with `skipLayersTrace()` to disable this monitor. -#### WindowManagerTraceMonitor -Captures Window Manager trace. This monitor is started by default. Build a transition with `skipWindowManagerTrace()` to disable this monitor. -#### WindowAnimationFrameStatsMonitor -Captures WindowAnimationFrameStats for the transition. This monitor is started by default and is used to eliminate *janky* runs. If an iteration has skipped frames, as determined by WindowAnimationFrameStats, the results for the iteration is skipped. If the list of results is empty after all iterations are completed, then the test should fail. Build a transition with `includeJankyRuns()` to disable this monitor. -#### ScreenRecorder -Captures screen to a video file. This monitor is disabled by default. Build a transition with `recordEachRun()` to capture each transition or build with `recordAllRuns()` to capture every transition including setup and teardown. ---- +### Example -### Extending Assertions - -To add a new assertion, add a function to one of the trace entry classes, `LayersTrace.Entry` or `WindowManagerTrace.Entry`. +Start by defining common or error prone transitions using `TransitionRunner`. +```kotlin +@LargeTest +@RunWith(Parameterized::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +class MyTest( + beginRotationName: String, + beginRotation: Int +) : NonRotationTestBase(beginRotationName, beginRotation) { + init { + mTestApp = MyAppHelper(InstrumentationRegistry.getInstrumentation()) + } -```java - // Example adds an assertion to the check if layer is hidden by parent. - Result isHiddenByParent(String layerName) { - // Result should contain a details if assertion fails for any reason - // such as if layer is not found or layer is not hidden by parent - // or layer has no parent. - // ... + override val transitionToRun: TransitionRunner + get() = TransitionRunner.newBuilder() + .withTag("myTest") + .recordAllRuns() + .runBefore { device.pressHome() } + .runBefore { device.waitForIdle() } + .run { testApp.open() } + .runAfter{ testApp.exit() } + .repeat(2) + .includeJankyRuns() + .build() + + @Test + fun myWMTest() { + checkResults { + WmTraceSubject.assertThat(it) + .showsAppWindow(MyTestApp) + .forAllEntries() + } } -``` -Then add a function to the trace subject `LayersTraceSubject` or `WmTraceSubject` which will add the assertion for testing. When the assertion is evaluated, the trace will first be filtered then the assertion will be applied to the remaining entries. -```java - public LayersTraceSubject isHiddenByParent(String layerName) { - mChecker.add(entry -> entry.isHiddenByParent(layerName), - "isHiddenByParent(" + layerName + ")"); - return this; + @Test + fun mySFTest() { + checkResults { + LayersTraceSubject.assertThat(it) + .showsLayer(MyTestApp) + .forAllEntries() + } } +} ``` - -To use the new assertion: -```java - // Check if "Chrome" layer is hidden by parent in the first trace entry. - assertThat(result).isHiddenByParent("Chrome").inTheBeginning(); -```
\ No newline at end of file diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp index a23df920b396..4f5a30502c91 100644 --- a/tests/RollbackTest/Android.bp +++ b/tests/RollbackTest/Android.bp @@ -53,6 +53,9 @@ java_test_host { name: "MultiUserRollbackTest", srcs: ["MultiUserRollbackTest/src/**/*.java"], libs: ["tradefed"], + static_libs: [ + "frameworks-base-hostutils", + ], test_suites: ["general-tests"], test_config: "MultiUserRollbackTest.xml", } diff --git a/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java b/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java index 42b886f0774f..741745560c61 100644 --- a/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java +++ b/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java @@ -24,6 +24,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +41,9 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { private static final long SWITCH_USER_COMPLETED_NUMBER_OF_POLLS = 60; private static final long SWITCH_USER_COMPLETED_POLL_INTERVAL_IN_MILLIS = 1000; + @Rule + public AbandonSessionsRule mHostTestRule = new AbandonSessionsRule(this); + @After public void tearDown() throws Exception { removeSecondaryUserIfNecessary(); @@ -59,6 +63,37 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { runPhaseForUsers("testBasic", mSecondaryUserId); } + /** + * Tests staged install/rollback works correctly on the 2nd user. + */ + @Test + public void testStagedRollback() throws Exception { + runPhaseForUsers("testStagedRollback_Phase1", mSecondaryUserId); + getDevice().reboot(); + + // Need to unlock the user for device tests to run successfully + getDevice().startUser(mSecondaryUserId); + awaitUserUnlocked(mSecondaryUserId); + runPhaseForUsers("testStagedRollback_Phase2", mSecondaryUserId); + getDevice().reboot(); + + getDevice().startUser(mSecondaryUserId); + awaitUserUnlocked(mSecondaryUserId); + runPhaseForUsers("testStagedRollback_Phase3", mSecondaryUserId); + getDevice().reboot(); + + getDevice().startUser(mSecondaryUserId); + awaitUserUnlocked(mSecondaryUserId); + runPhaseForUsers("testStagedRollback_Phase4", mSecondaryUserId); + } + + @Test + public void testBadUpdateRollback() throws Exception { + // Need to switch user in order to send broadcasts in device tests + assertTrue(getDevice().switchUser(mSecondaryUserId)); + runPhaseForUsers("testBadUpdateRollback", mSecondaryUserId); + } + @Test public void testMultipleUsers() throws Exception { runPhaseForUsers("testMultipleUsersInstallV1", mOriginalUserId, mSecondaryUserId); @@ -83,6 +118,8 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test { private void removeSecondaryUserIfNecessary() throws Exception { if (mSecondaryUserId != -1) { + // Can't remove the 2nd user without switching out of it + assertTrue(getDevice().switchUser(mOriginalUserId)); getDevice().removeUser(mSecondaryUserId); mSecondaryUserId = -1; } diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/MultiUserRollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/MultiUserRollbackTest.java index 8641f4d4013a..d37dd7b9ceab 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/MultiUserRollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/MultiUserRollbackTest.java @@ -70,6 +70,11 @@ public class MultiUserRollbackTest { new RollbackTest().testBasic(); } + @Test + public void testBadUpdateRollback() throws Exception { + new RollbackTest().testBadUpdateRollback(); + } + /** * Install version 1 of the test app. This method is run for both users. */ @@ -115,4 +120,32 @@ public class MultiUserRollbackTest { assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1); InstallUtils.processUserData(TestApp.A); } + + @Test + public void testStagedRollback_Phase1() throws Exception { + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1); + Install.single(TestApp.A1).setStaged().commit(); + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(-1); + } + + @Test + public void testStagedRollback_Phase2() throws Exception { + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1); + Install.single(TestApp.A2).setStaged().setEnableRollback().commit(); + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1); + } + + @Test + public void testStagedRollback_Phase3() throws Exception { + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2); + RollbackInfo rollback = RollbackUtils.waitForAvailableRollback(TestApp.A); + assertThat(rollback).packagesContainsExactly(Rollback.from(TestApp.A2).to(TestApp.A1)); + RollbackUtils.rollback(rollback.getRollbackId()); + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2); + } + + @Test + public void testStagedRollback_Phase4() { + assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1); + } } diff --git a/tests/benchmarks/internal/Android.bp b/tests/benchmarks/internal/Android.bp new file mode 100644 index 000000000000..9c34eaf2af01 --- /dev/null +++ b/tests/benchmarks/internal/Android.bp @@ -0,0 +1,26 @@ +// 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. + +android_test { + name: "InternalBenchTests", + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.rules", + "androidx.annotation_annotation", + ], + test_suites: ["device-tests"], + platform_apis: true, + certificate: "platform" +} + diff --git a/packages/SystemUI/res/drawable/floating_dismiss_gradient_transition.xml b/tests/benchmarks/internal/AndroidManifest.xml index 6a0695e817c7..16023c6f3617 100644 --- a/packages/SystemUI/res/drawable/floating_dismiss_gradient_transition.xml +++ b/tests/benchmarks/internal/AndroidManifest.xml @@ -13,7 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<transition xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/transparent" /> - <item android:drawable="@drawable/floating_dismiss_gradient" /> -</transition>
\ No newline at end of file +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.internal.bench"> + + <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> + + <application> + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.internal.bench"/> +</manifest> + diff --git a/packages/SystemUI/res/drawable/tv_pip_button_focused.xml b/tests/benchmarks/internal/AndroidTest.xml index 0db1a57a0973..d776ee681c04 100644 --- a/packages/SystemUI/res/drawable/tv_pip_button_focused.xml +++ b/tests/benchmarks/internal/AndroidTest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- 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. @@ -13,6 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. --> +<configuration description="Benchmark for internal classes/utilities."> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="InternalBenchTests.apk" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.internal.bench" /> + <option name="hidden-api-checks" value="false"/> + </test> + +</configuration> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="#9AFFFFFF" android:radius="17dp" /> diff --git a/tests/benchmarks/internal/src/com/android/internal/LambdaPerfTest.java b/tests/benchmarks/internal/src/com/android/internal/LambdaPerfTest.java new file mode 100644 index 000000000000..388548691b77 --- /dev/null +++ b/tests/benchmarks/internal/src/com/android/internal/LambdaPerfTest.java @@ -0,0 +1,454 @@ +/*
+ * 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.internal;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.Message;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.os.SystemClock;
+import android.util.Log;
+
+import androidx.test.filters.LargeTest;
+
+import com.android.internal.util.function.pooled.PooledConsumer;
+import com.android.internal.util.function.pooled.PooledLambda;
+import com.android.internal.util.function.pooled.PooledPredicate;
+
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runners.model.Statement;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/** Compares the performance of regular lambda and pooled lambda. */
+@LargeTest
+public class LambdaPerfTest {
+ private static final boolean DEBUG = false;
+ private static final String TAG = LambdaPerfTest.class.getSimpleName();
+
+ private static final String LAMBDA_FORM_REGULAR = "regular";
+ private static final String LAMBDA_FORM_POOLED = "pooled";
+
+ private static final int WARMUP_ITERATIONS = 1000;
+ private static final int TEST_ITERATIONS = 3000000;
+ private static final int TASK_COUNT = 10;
+ private static final long DELAY_AFTER_BENCH_MS = 1000;
+
+ private String mMethodName;
+
+ private final Bundle mTestResults = new Bundle();
+ private final ArrayList<Task> mTasks = new ArrayList<>();
+
+ // The member fields are used to ensure lambda capturing. They don't have the actual meaning.
+ private final Task mTask = new Task();
+ private final Rect mBounds = new Rect();
+ private int mTaskId;
+ private long mTime;
+ private boolean mTop;
+
+ @Rule
+ public final TestRule mRule = (base, description) -> new Statement() {
+ @Override
+ public void evaluate() throws Throwable {
+ mMethodName = description.getMethodName();
+ mTasks.clear();
+ for (int i = 0; i < TASK_COUNT; i++) {
+ final Task t = new Task();
+ mTasks.add(t);
+ }
+ base.evaluate();
+
+ getInstrumentation().sendStatus(Activity.RESULT_OK, mTestResults);
+ }
+ };
+
+ @Test
+ public void test1ParamConsumer() {
+ evaluate(LAMBDA_FORM_REGULAR, () -> forAllTask(t -> t.doSomething(mTask)));
+ evaluate(LAMBDA_FORM_POOLED, () -> {
+ final PooledConsumer c = PooledLambda.obtainConsumer(Task::doSomething,
+ PooledLambda.__(Task.class), mTask);
+ forAllTask(c);
+ c.recycle();
+ });
+ }
+
+ @Test
+ public void test2PrimitiveParamsConsumer() {
+ // Not in Integer#IntegerCache (-128~127) for autoboxing, that will create new object.
+ mTaskId = 12345;
+ mTime = 54321;
+
+ evaluate(LAMBDA_FORM_REGULAR, () -> forAllTask(t -> t.doSomething(mTaskId, mTime)));
+ evaluate(LAMBDA_FORM_POOLED, () -> {
+ final PooledConsumer c = PooledLambda.obtainConsumer(Task::doSomething,
+ PooledLambda.__(Task.class), mTaskId, mTime);
+ forAllTask(c);
+ c.recycle();
+ });
+ }
+
+ @Test
+ public void test3ParamsPredicate() {
+ mTop = true;
+ // In Integer#IntegerCache.
+ mTaskId = 10;
+
+ evaluate(LAMBDA_FORM_REGULAR, () -> handleTask(t -> t.doSomething(mBounds, mTop, mTaskId)));
+ evaluate(LAMBDA_FORM_POOLED, () -> {
+ final PooledPredicate c = PooledLambda.obtainPredicate(Task::doSomething,
+ PooledLambda.__(Task.class), mBounds, mTop, mTaskId);
+ handleTask(c);
+ c.recycle();
+ });
+ }
+
+ @Test
+ public void testMessage() {
+ evaluate(LAMBDA_FORM_REGULAR, () -> {
+ final Message m = Message.obtain().setCallback(() -> mTask.doSomething(mTaskId, mTime));
+ m.getCallback().run();
+ m.recycle();
+ });
+ evaluate(LAMBDA_FORM_POOLED, () -> {
+ final Message m = PooledLambda.obtainMessage(Task::doSomething, mTask, mTaskId, mTime);
+ m.getCallback().run();
+ m.recycle();
+ });
+ }
+
+ @Test
+ public void testRunnable() {
+ evaluate(LAMBDA_FORM_REGULAR, () -> {
+ final Runnable r = mTask::doSomething;
+ r.run();
+ });
+ evaluate(LAMBDA_FORM_POOLED, () -> {
+ final Runnable r = PooledLambda.obtainRunnable(Task::doSomething, mTask).recycleOnUse();
+ r.run();
+ });
+ }
+
+ @Test
+ public void testMultiThread() {
+ final int numThread = 3;
+
+ final Runnable regularAction = () -> forAllTask(t -> t.doSomething(mTask));
+ final Runnable[] regularActions = new Runnable[numThread];
+ Arrays.fill(regularActions, regularAction);
+ evaluateMultiThread(LAMBDA_FORM_REGULAR, regularActions);
+
+ final Runnable pooledAction = () -> {
+ final PooledConsumer c = PooledLambda.obtainConsumer(Task::doSomething,
+ PooledLambda.__(Task.class), mTask);
+ forAllTask(c);
+ c.recycle();
+ };
+ final Runnable[] pooledActions = new Runnable[numThread];
+ Arrays.fill(pooledActions, pooledAction);
+ evaluateMultiThread(LAMBDA_FORM_POOLED, pooledActions);
+ }
+
+ private void forAllTask(Consumer<Task> callback) {
+ for (int i = mTasks.size() - 1; i >= 0; i--) {
+ callback.accept(mTasks.get(i));
+ }
+ }
+
+ private void handleTask(Predicate<Task> callback) {
+ for (int i = mTasks.size() - 1; i >= 0; i--) {
+ final Task task = mTasks.get(i);
+ if (callback.test(task)) {
+ return;
+ }
+ }
+ }
+
+ private void evaluate(String title, Runnable action) {
+ for (int i = 0; i < WARMUP_ITERATIONS; i++) {
+ action.run();
+ }
+ performGc();
+
+ final GcStatus startGcStatus = getGcStatus();
+ final long startTime = SystemClock.elapsedRealtime();
+ for (int i = 0; i < TEST_ITERATIONS; i++) {
+ action.run();
+ }
+ evaluateResult(title, startGcStatus, startTime);
+ }
+
+ private void evaluateMultiThread(String title, Runnable[] actions) {
+ performGc();
+
+ final CountDownLatch latch = new CountDownLatch(actions.length);
+ final GcStatus startGcStatus = getGcStatus();
+ final long startTime = SystemClock.elapsedRealtime();
+ for (Runnable action : actions) {
+ new Thread() {
+ @Override
+ public void run() {
+ for (int i = 0; i < TEST_ITERATIONS; i++) {
+ action.run();
+ }
+ latch.countDown();
+ };
+ }.start();
+ }
+ try {
+ latch.await();
+ } catch (InterruptedException ignored) {
+ }
+ evaluateResult(title, startGcStatus, startTime);
+ }
+
+ private void evaluateResult(String title, GcStatus startStatus, long startTime) {
+ final float elapsed = SystemClock.elapsedRealtime() - startTime;
+ // Sleep a while to see if GC may happen.
+ SystemClock.sleep(DELAY_AFTER_BENCH_MS);
+ final GcStatus endStatus = getGcStatus();
+ final GcInfo info = startStatus.calculateGcTime(endStatus, title, mTestResults);
+ Log.i(TAG, mMethodName + "_" + title + " execution time: "
+ + elapsed + "ms (avg=" + String.format("%.5f", elapsed / TEST_ITERATIONS) + "ms)"
+ + " GC time: " + String.format("%.3f", info.mTotalGcTime) + "ms"
+ + " GC paused time: " + String.format("%.3f", info.mTotalGcPausedTime) + "ms");
+ }
+
+ /** Cleans the test environment. */
+ private static void performGc() {
+ System.gc();
+ System.runFinalization();
+ System.gc();
+ }
+
+ private static GcStatus getGcStatus() {
+ if (DEBUG) {
+ Log.i(TAG, "===== Read GC dump =====");
+ }
+ final GcStatus status = new GcStatus();
+ final List<String> vmDump = getVmDump();
+ Assume.assumeFalse("VM dump is empty", vmDump.isEmpty());
+ for (String line : vmDump) {
+ status.visit(line);
+ if (line.startsWith("DALVIK THREADS")) {
+ break;
+ }
+ }
+ return status;
+ }
+
+ private static List<String> getVmDump() {
+ final int myPid = Process.myPid();
+ // Another approach Debug#dumpJavaBacktraceToFileTimeout requires setenforce 0.
+ Process.sendSignal(myPid, Process.SIGNAL_QUIT);
+ // Give a chance to handle the signal.
+ SystemClock.sleep(100);
+
+ String dump = null;
+ final String pattern = myPid + " written to: ";
+ final List<String> logs = shell("logcat -v brief -d tombstoned:I *:S");
+ for (int i = logs.size() - 1; i >= 0; i--) {
+ final String log = logs.get(i);
+ // Log pattern: Traces for pid 9717 written to: /data/anr/trace_07
+ final int pos = log.indexOf(pattern);
+ if (pos > 0) {
+ dump = log.substring(pattern.length() + pos);
+ break;
+ }
+ }
+
+ Assume.assumeNotNull("Unable to find VM dump", dump);
+ // It requires system or root uid to read the trace.
+ return shell("cat " + dump);
+ }
+
+ private static List<String> shell(String command) {
+ final ParcelFileDescriptor.AutoCloseInputStream stream =
+ new ParcelFileDescriptor.AutoCloseInputStream(
+ getInstrumentation().getUiAutomation().executeShellCommand(command));
+ final ArrayList<String> lines = new ArrayList<>();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ lines.add(line);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return lines;
+ }
+
+ /** An empty class which provides some methods with different type arguments. */
+ static class Task {
+ void doSomething() {
+ }
+
+ void doSomething(Task t) {
+ }
+
+ void doSomething(int taskId, long time) {
+ }
+
+ boolean doSomething(Rect bounds, boolean top, int taskId) {
+ return false;
+ }
+ }
+
+ static class ValPattern {
+ static final int TYPE_COUNT = 0;
+ static final int TYPE_TIME = 1;
+ static final String PATTERN_COUNT = "(\\d+)";
+ static final String PATTERN_TIME = "(\\d+\\.?\\d+)(\\w+)";
+ final String mRawPattern;
+ final Pattern mPattern;
+ final int mType;
+
+ int mIntValue;
+ float mFloatValue;
+
+ ValPattern(String p, int type) {
+ mRawPattern = p;
+ mPattern = Pattern.compile(
+ p + (type == TYPE_TIME ? PATTERN_TIME : PATTERN_COUNT) + ".*");
+ mType = type;
+ }
+
+ boolean visit(String line) {
+ final Matcher matcher = mPattern.matcher(line);
+ if (!matcher.matches()) {
+ return false;
+ }
+ final String value = matcher.group(1);
+ if (value == null) {
+ return false;
+ }
+ if (mType == TYPE_COUNT) {
+ mIntValue = Integer.parseInt(value);
+ return true;
+ }
+ final float time = Float.parseFloat(value);
+ final String unit = matcher.group(2);
+ if (unit == null) {
+ return false;
+ }
+ // Refer to art/libartbase/base/time_utils.cc
+ switch (unit) {
+ case "s":
+ mFloatValue = time * 1000;
+ break;
+ case "ms":
+ mFloatValue = time;
+ break;
+ case "us":
+ mFloatValue = time / 1000;
+ break;
+ case "ns":
+ mFloatValue = time / 1000 / 1000;
+ break;
+ default:
+ throw new IllegalArgumentException();
+ }
+
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return mRawPattern + (mType == TYPE_TIME ? (mFloatValue + "ms") : mIntValue);
+ }
+ }
+
+ /** Parses the dump pattern of Heap::DumpGcPerformanceInfo. */
+ private static class GcStatus {
+ private static final int TOTAL_GC_TIME_INDEX = 1;
+ private static final int TOTAL_GC_PAUSED_TIME_INDEX = 5;
+
+ // Refer to art/runtime/gc/heap.cc
+ final ValPattern[] mPatterns = {
+ new ValPattern("Total GC count: ", ValPattern.TYPE_COUNT),
+ new ValPattern("Total GC time: ", ValPattern.TYPE_TIME),
+ new ValPattern("Total time waiting for GC to complete: ", ValPattern.TYPE_TIME),
+ new ValPattern("Total blocking GC count: ", ValPattern.TYPE_COUNT),
+ new ValPattern("Total blocking GC time: ", ValPattern.TYPE_TIME),
+ new ValPattern("Total mutator paused time: ", ValPattern.TYPE_TIME),
+ new ValPattern("Total number of allocations ", ValPattern.TYPE_COUNT),
+ new ValPattern("concurrent copying paused: Sum: ", ValPattern.TYPE_TIME),
+ new ValPattern("concurrent copying total time: ", ValPattern.TYPE_TIME),
+ new ValPattern("concurrent copying freed: ", ValPattern.TYPE_COUNT),
+ new ValPattern("Peak regions allocated ", ValPattern.TYPE_COUNT),
+ };
+
+ void visit(String dumpLine) {
+ for (ValPattern p : mPatterns) {
+ if (p.visit(dumpLine)) {
+ if (DEBUG) {
+ Log.i(TAG, " " + p);
+ }
+ }
+ }
+ }
+
+ GcInfo calculateGcTime(GcStatus newStatus, String title, Bundle result) {
+ Log.i(TAG, "===== GC status of " + title + " =====");
+ final GcInfo info = new GcInfo();
+ for (int i = 0; i < mPatterns.length; i++) {
+ final ValPattern p = mPatterns[i];
+ if (p.mType == ValPattern.TYPE_COUNT) {
+ final int diff = newStatus.mPatterns[i].mIntValue - p.mIntValue;
+ Log.i(TAG, " " + p.mRawPattern + diff);
+ if (diff > 0) {
+ result.putInt("[" + title + "] " + p.mRawPattern, diff);
+ }
+ continue;
+ }
+ final float diff = newStatus.mPatterns[i].mFloatValue - p.mFloatValue;
+ Log.i(TAG, " " + p.mRawPattern + diff + "ms");
+ if (diff > 0) {
+ result.putFloat("[" + title + "] " + p.mRawPattern + "(ms)", diff);
+ }
+ if (i == TOTAL_GC_TIME_INDEX) {
+ info.mTotalGcTime = diff;
+ } else if (i == TOTAL_GC_PAUSED_TIME_INDEX) {
+ info.mTotalGcPausedTime = diff;
+ }
+ }
+ return info;
+ }
+ }
+
+ private static class GcInfo {
+ float mTotalGcTime;
+ float mTotalGcPausedTime;
+ }
+}
diff --git a/tests/net/java/android/net/NetworkTemplateTest.kt b/tests/net/java/android/net/NetworkTemplateTest.kt index 5dd0fda4da28..9ba56e44fe88 100644 --- a/tests/net/java/android/net/NetworkTemplateTest.kt +++ b/tests/net/java/android/net/NetworkTemplateTest.kt @@ -26,6 +26,7 @@ import android.net.NetworkStats.METERED_ALL import android.net.NetworkStats.ROAMING_ALL import android.net.NetworkTemplate.MATCH_MOBILE import android.net.NetworkTemplate.MATCH_WIFI +import android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA import android.net.NetworkTemplate.NETWORK_TYPE_ALL import android.net.NetworkTemplate.buildTemplateMobileWithRatType import android.telephony.TelephonyManager @@ -145,11 +146,13 @@ class NetworkTemplateTest { assertParcelSane(templateWifi, 8) } - // Verify NETWORK_TYPE_ALL does not conflict with TelephonyManager#NETWORK_TYPE_* constants. + // Verify NETWORK_TYPE_* constants in NetworkTemplate do not conflict with + // TelephonyManager#NETWORK_TYPE_* constants. @Test - fun testNetworkTypeAll() { + fun testNetworkTypeConstants() { for (ratType in TelephonyManager.getAllNetworkTypes()) { assertNotEquals(NETWORK_TYPE_ALL, ratType) + assertNotEquals(NETWORK_TYPE_5G_NSA, ratType) } } } diff --git a/tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java b/tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java index 16fed39bcc74..6dc4fced19a2 100644 --- a/tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java @@ -17,6 +17,7 @@ package com.android.server.net; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; @@ -30,7 +31,9 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.content.Context; +import android.net.NetworkTemplate; import android.os.test.TestLooper; +import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -61,7 +64,6 @@ public final class NetworkStatsSubscriptionsMonitorTest { private static final String TEST_IMSI3 = "466929999999999"; @Mock private Context mContext; - @Mock private PhoneStateListener mPhoneStateListener; @Mock private SubscriptionManager mSubscriptionManager; @Mock private TelephonyManager mTelephonyManager; @Mock private NetworkStatsSubscriptionsMonitor.Delegate mDelegate; @@ -215,4 +217,55 @@ public final class NetworkStatsSubscriptionsMonitorTest { verify(mTelephonyManager, times(2)).listen(any(), eq(PhoneStateListener.LISTEN_NONE)); assertRatTypeChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_UNKNOWN); } + + + @Test + public void test5g() { + mMonitor.start(); + // Insert sim1, verify RAT type is NETWORK_TYPE_UNKNOWN, and never get any callback + // before changing RAT type. Also capture listener for later use. + addTestSub(TEST_SUBID1, TEST_IMSI1); + assertRatTypeNotChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_UNKNOWN); + final ArgumentCaptor<RatTypeListener> ratTypeListenerCaptor = + ArgumentCaptor.forClass(RatTypeListener.class); + verify(mTelephonyManager, times(1)).listen(ratTypeListenerCaptor.capture(), + eq(PhoneStateListener.LISTEN_SERVICE_STATE)); + final RatTypeListener listener = CollectionUtils + .find(ratTypeListenerCaptor.getAllValues(), it -> it.getSubId() == TEST_SUBID1); + assertNotNull(listener); + + // Set RAT type to 5G NSA (non-standalone) mode, verify the monitor outputs + // NETWORK_TYPE_5G_NSA. + final ServiceState serviceState = mock(ServiceState.class); + when(serviceState.getDataNetworkType()).thenReturn(TelephonyManager.NETWORK_TYPE_LTE); + when(serviceState.getNrState()).thenReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED); + listener.onServiceStateChanged(serviceState); + assertRatTypeChangedForSub(TEST_IMSI1, NetworkTemplate.NETWORK_TYPE_5G_NSA); + reset(mDelegate); + + // Set RAT type to LTE without NR connected, the RAT type should be downgraded to LTE. + when(serviceState.getNrState()).thenReturn(NetworkRegistrationInfo.NR_STATE_NONE); + listener.onServiceStateChanged(serviceState); + assertRatTypeChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_LTE); + reset(mDelegate); + + // Verify NR connected with other RAT type does not take effect. + when(serviceState.getDataNetworkType()).thenReturn(TelephonyManager.NETWORK_TYPE_UMTS); + when(serviceState.getNrState()).thenReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED); + listener.onServiceStateChanged(serviceState); + assertRatTypeChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_UMTS); + reset(mDelegate); + + // Set RAT type to 5G standalone mode, the RAT type should be NR. + setRatTypeForSub(ratTypeListenerCaptor.getAllValues(), TEST_SUBID1, + TelephonyManager.NETWORK_TYPE_NR); + assertRatTypeChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_NR); + reset(mDelegate); + + // Set NR state to none in standalone mode does not change anything. + when(serviceState.getDataNetworkType()).thenReturn(TelephonyManager.NETWORK_TYPE_NR); + when(serviceState.getNrState()).thenReturn(NetworkRegistrationInfo.NR_STATE_NONE); + listener.onServiceStateChanged(serviceState); + assertRatTypeNotChangedForSub(TEST_IMSI1, TelephonyManager.NETWORK_TYPE_NR); + } } diff --git a/tools/processors/intdef_mappings/Android.bp b/tools/processors/intdef_mappings/Android.bp new file mode 100644 index 000000000000..e255f7c784d3 --- /dev/null +++ b/tools/processors/intdef_mappings/Android.bp @@ -0,0 +1,33 @@ +java_plugin { + name: "intdef-annotation-processor", + + processor_class: "android.processor.IntDefProcessor", + + srcs: [ + ":framework-annotations", + "src/**/*.java", + "src/**/*.kt" + ], + + use_tools_jar: true, +} + +java_test_host { + name: "intdef-annotation-processor-test", + + srcs: [ + "test/**/*.java", + "test/**/*.kt" + ], + java_resource_dirs: ["test/resources"], + + static_libs: [ + "compile-testing-prebuilt", + "truth-prebuilt", + "junit", + "guava", + "intdef-annotation-processor" + ], + + test_suites: ["general-tests"], +}
\ No newline at end of file diff --git a/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt b/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt new file mode 100644 index 000000000000..84faeea36eea --- /dev/null +++ b/tools/processors/intdef_mappings/src/android/processor/IntDefProcessor.kt @@ -0,0 +1,190 @@ +/* + * 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.processor + +import android.annotation.IntDef +import com.sun.source.tree.IdentifierTree +import com.sun.source.tree.MemberSelectTree +import com.sun.source.tree.NewArrayTree +import com.sun.source.util.SimpleTreeVisitor +import com.sun.source.util.Trees +import java.io.IOException +import java.io.Writer +import javax.annotation.processing.AbstractProcessor +import javax.annotation.processing.RoundEnvironment +import javax.lang.model.SourceVersion +import javax.lang.model.element.AnnotationValue +import javax.lang.model.element.TypeElement +import javax.tools.Diagnostic.Kind +import javax.tools.StandardLocation.CLASS_OUTPUT +import kotlin.collections.set + + +/** + * The IntDefProcessor is intended to generate a mapping from ints to their respective string + * identifier for each IntDef for use by Winscope or any other tool which requires such a mapping. + * + * The processor will run when building :frameworks-all and dump all the IntDef mappings found the + * files the make up :frameworks-all as json to outputPath. + */ +class IntDefProcessor : AbstractProcessor() { + private val outputName = "intDefMapping.json" + + override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.latest() + + // Define what the annotation we care about are for compiler optimization + override fun getSupportedAnnotationTypes() = LinkedHashSet<String>().apply { + add(IntDef::class.java.name) + } + + override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean { + // There should only be one matching annotation definition for intDef + val annotationType = annotations.firstOrNull() ?: return false + val annotatedElements = roundEnv.getElementsAnnotatedWith(annotationType) + + val annotationTypeToIntDefMapping = annotatedElements.associate { annotatedElement -> + val type = (annotatedElement as TypeElement).qualifiedName.toString() + val mapping = generateIntDefMapping(annotatedElement, annotationType) + val intDef = annotatedElement.getAnnotation(IntDef::class.java) + type to IntDefMapping(mapping, intDef.flag) + } + + try { + outputToFile(annotationTypeToIntDefMapping) + } catch (e: IOException) { + error("Failed to write IntDef mappings :: $e") + } + return false + } + + private fun generateIntDefMapping( + annotatedElement: TypeElement, + annotationType: TypeElement + ): Map<Int, String> { + // LinkedHashMap makes sure ordering is the same as in the code + val mapping = LinkedHashMap<Int, String>() + + val annotationMirror = annotatedElement.annotationMirrors + // Should only ever be one matching this condition + .first { it.annotationType.asElement() == annotationType } + + val value = annotationMirror.elementValues.entries + .first { entry -> entry.key.simpleName.contentEquals("value") } + .value + + val trees = Trees.instance(processingEnv) + val tree = trees.getTree(annotatedElement, annotationMirror, value) + + val identifiers = ArrayList<String>() + tree.accept(IdentifierVisitor(), identifiers) + + val values = value.value as List<AnnotationValue> + + for (i in identifiers.indices) { + mapping[values[i].value as Int] = identifiers[i] + } + + return mapping + } + + private class IdentifierVisitor : SimpleTreeVisitor<Void, ArrayList<String>>() { + override fun visitNewArray(node: NewArrayTree, indentifiers: ArrayList<String>): Void? { + for (initializer in node.initializers) { + initializer.accept(this, indentifiers) + } + + return null + } + + override fun visitMemberSelect(node: MemberSelectTree, indentifiers: ArrayList<String>): + Void? { + indentifiers.add(node.identifier.toString()) + + return null + } + + override fun visitIdentifier(node: IdentifierTree, indentifiers: ArrayList<String>): Void? { + indentifiers.add(node.name.toString()) + + return null + } + } + + @Throws(IOException::class) + private fun outputToFile(annotationTypeToIntDefMapping: Map<String, IntDefMapping>) { + val resource = processingEnv.filer.createResource( + CLASS_OUTPUT, "com.android.winscope", outputName) + val writer = resource.openWriter() + serializeTo(annotationTypeToIntDefMapping, writer) + writer.close() + } + + private fun error(message: String) { + processingEnv.messager.printMessage(Kind.ERROR, message) + } + + private fun note(message: String) { + processingEnv.messager.printMessage(Kind.NOTE, message) + } + + class IntDefMapping(val mapping: Map<Int, String>, val flag: Boolean) { + val size + get() = this.mapping.size + + val entries + get() = this.mapping.entries + } + + companion object { + fun serializeTo( + annotationTypeToIntDefMapping: Map<String, IntDefMapping>, + writer: Writer + ) { + val indent = " " + + writer.appendln("{") + + val intDefTypesCount = annotationTypeToIntDefMapping.size + var currentIntDefTypesCount = 0 + for ((field, intDefMapping) in annotationTypeToIntDefMapping) { + writer.appendln("""$indent"$field": {""") + + // Start IntDef + + writer.appendln("""$indent$indent"flag": ${intDefMapping.flag},""") + + writer.appendln("""$indent$indent"values": {""") + intDefMapping.entries.joinTo(writer, separator = ",\n") { (value, identifier) -> + """$indent$indent$indent"$value": "$identifier"""" + } + writer.appendln() + writer.appendln("$indent$indent}") + + // End IntDef + + writer.append("$indent}") + if (++currentIntDefTypesCount < intDefTypesCount) { + writer.appendln(",") + } else { + writer.appendln("") + } + } + + writer.appendln("}") + } + } +} diff --git a/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt b/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt new file mode 100644 index 000000000000..c0c159c98aac --- /dev/null +++ b/tools/processors/intdef_mappings/test/android/processor/IntDefProcessorTest.kt @@ -0,0 +1,162 @@ +/* + * 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.processor + +import android.processor.IntDefProcessor.IntDefMapping +import com.google.common.collect.ObjectArrays.concat +import com.google.testing.compile.CompilationSubject.assertThat +import com.google.testing.compile.Compiler.javac +import com.google.testing.compile.JavaFileObjects +import junit.framework.Assert.assertEquals +import org.junit.Test +import java.io.StringWriter +import javax.tools.JavaFileObject +import javax.tools.StandardLocation.CLASS_OUTPUT + +/** + * Tests for [IntDefProcessor] + */ +class IntDefProcessorTest { + private val mAnnotations = arrayOf<JavaFileObject>( + JavaFileObjects.forSourceLines("android.annotation.IntDef", + "package android.annotation;", + "import java.lang.annotation.Retention;", + "import java.lang.annotation.Target;", + "import static java.lang.annotation.ElementType.ANNOTATION_TYPE;", + "import static java.lang.annotation.RetentionPolicy.SOURCE;", + "@Retention(SOURCE)", + "@Target({ANNOTATION_TYPE})", + "public @interface IntDef {", + " String[] prefix() default {};", + " String[] suffix() default {};", + " int[] value() default {};", + " boolean flag() default false;", + "}") + ) + + @Test + public fun annotationProcessorGeneratesMapping() { + val sources: Array<JavaFileObject> = arrayOf( + JavaFileObjects.forSourceLines( + "com.android.server.accessibility.magnification.MagnificationGestureMatcher", + "package com.android.server.accessibility.magnification;", + "import android.annotation.IntDef;", + "import java.lang.annotation.Retention;", + "import java.lang.annotation.RetentionPolicy;", + "class MagnificationGestureMatcher {", + " private static final int GESTURE_BASE = 100;", + " public static final int GESTURE_TWO_FINGER_DOWN = GESTURE_BASE + 1;", + " public static final int GESTURE_SWIPE = GESTURE_BASE + 2;", + " @IntDef(prefix = {\"GESTURE_MAGNIFICATION_\"}, value = {", + " GESTURE_TWO_FINGER_DOWN,", + " GESTURE_SWIPE", + " })", + " @Retention(RetentionPolicy.SOURCE)", + " @interface GestureId {}", + "}" + ), + JavaFileObjects.forSourceLines( + "android.service.storage.ExternalStorageService", + "package android.service.storage;", + "import android.annotation.IntDef;", + "import java.lang.annotation.Retention;", + "import java.lang.annotation.RetentionPolicy;", + "class MagnificationGestureMatcher {", + " public static final int FLAG_SESSION_TYPE_FUSE = 1 << 0;", + " public static final int FLAG_SESSION_ATTRIBUTE_INDEXABLE = 1 << 1;", + " @IntDef(flag = true, prefix = {\"FLAG_SESSION_\"},", + " value = {FLAG_SESSION_TYPE_FUSE, FLAG_SESSION_ATTRIBUTE_INDEXABLE})", + " @Retention(RetentionPolicy.SOURCE)", + " public @interface SessionFlag {}", + "}" + ) + ) + + val expectedFile = """ + { + "com.android.server.accessibility.magnification.MagnificationGestureMatcher.GestureId": { + "flag": false, + "values": { + "101": "GESTURE_TWO_FINGER_DOWN", + "102": "GESTURE_SWIPE" + } + }, + "android.service.storage.MagnificationGestureMatcher.SessionFlag": { + "flag": true, + "values": { + "1": "FLAG_SESSION_TYPE_FUSE", + "2": "FLAG_SESSION_ATTRIBUTE_INDEXABLE" + } + } + } + + """.trimIndent() + + val filesToCompile = concat(mAnnotations, sources, JavaFileObject::class.java) + + val compilation = javac() + .withProcessors(IntDefProcessor()) + .compile(filesToCompile.toMutableList()) + + assertThat(compilation).succeeded() + assertThat(compilation).generatedFile(CLASS_OUTPUT, "com.android.winscope", + "intDefMapping.json").contentsAsUtf8String().isEqualTo(expectedFile) + } + + @Test + public fun serializesMappingCorrectly() { + val map = linkedMapOf( + "SimpleIntDef" to IntDefMapping(linkedMapOf( + 0x0001 to "VAL_1", + 0x0002 to "VAL_2", + 0x0003 to "VAL_3" + ), flag = false), + "Flags" to IntDefMapping(linkedMapOf( + 0b0001 to "PRIVATE_FLAG_1", + 0b0010 to "PRIVATE_FLAG_2", + 0b0100 to "PRIVATE_FLAG_3" + ), flag = true) + ) + + val writer = StringWriter() + IntDefProcessor.serializeTo(map, writer) + + val actualOutput = writer.toString() + val expectedOutput = """ + { + "SimpleIntDef": { + "flag": false, + "values": { + "1": "VAL_1", + "2": "VAL_2", + "3": "VAL_3" + } + }, + "Flags": { + "flag": true, + "values": { + "1": "PRIVATE_FLAG_1", + "2": "PRIVATE_FLAG_2", + "4": "PRIVATE_FLAG_3" + } + } + } + + """.trimIndent() + + assertEquals(actualOutput, expectedOutput) + } +}
\ No newline at end of file |