diff options
644 files changed, 19926 insertions, 7993 deletions
diff --git a/apct-tests/perftests/core/src/android/libcore/BigIntegerPerfTest.java b/apct-tests/perftests/core/src/android/libcore/BigIntegerPerfTest.java new file mode 100644 index 000000000000..e0c12dd660e2 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/BigIntegerPerfTest.java @@ -0,0 +1,220 @@ +/* + * 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.math.BigInteger; + +/** + * Tries to measure important BigInteger operations across a variety of BigInteger sizes. Note that + * BigInteger implementations commonly need to use wildly different algorithms for different sizes, + * so relative performance may change substantially depending on the size of the integer. This is + * not structured as a proper benchmark; just run main(), e.g. with vogar + * libcore/benchmarks/src/benchmarks/BigIntegerBenchmark.java. + */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class BigIntegerPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + // A simple sum of products computation, mostly so we can check timing in the + // absence of any division. Computes the sum from 1 to n of ((10^prec) << 30) + 1)^2, + // repeating the multiplication, but not addition of 1, each time through the loop. + // Check the last few bits of the result as we go. Assumes n < 2^30. + // Note that we're actually squaring values in computing the product. + // That affects the algorithm used by some implementations. + private static void inner(int n, int prec) { + BigInteger big = BigInteger.TEN.pow(prec).shiftLeft(30).add(BigInteger.ONE); + BigInteger sum = BigInteger.ZERO; + for (int i = 0; i < n; ++i) { + sum = sum.add(big.multiply(big)); + } + if (sum.and(BigInteger.valueOf(0x3fffffff)).intValue() != n) { + throw new AssertionError( + "inner() got " + sum.and(BigInteger.valueOf(0x3fffffff)) + " instead of " + n); + } + } + + // Execute the above rep times, optionally timing it. + @Test + public void repeatInner() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 10; i <= 10_000; i *= 10) { + inner(100, i); + } + } + } + + // Approximate the sum of the first 1000 terms of the harmonic series (sum of 1/m as m + // goes from 1 to n) to about prec digits. The result has an implicit decimal point + // prec digits from the right. + private static BigInteger harmonic1000(int prec) { + BigInteger scaledOne = BigInteger.TEN.pow(prec); + BigInteger sum = BigInteger.ZERO; + for (int i = 1; i <= 1000; ++i) { + sum = sum.add(scaledOne.divide(BigInteger.valueOf(i))); + } + return sum; + } + + // Execute the above rep times, optionally timing it. + // Check results for equality, and print one, to compaare against reference. + @Test + public void repeatHarmonic1000() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 5; i <= 5_000; i *= 10) { + BigInteger refRes = harmonic1000(i); + BigInteger newRes = harmonic1000(i); + if (!newRes.equals(refRes)) { + throw new AssertionError(newRes + " != " + refRes); + } + if (i >= 50 + && !refRes.toString() + .startsWith("748547086055034491265651820433390017652167916970")) { + throw new AssertionError("harmanic(" + i + ") incorrectly produced " + refRes); + } + } + } + } + + // Repeatedly execute just the base conversion from the last test, allowing + // us to time and check it for consistency as well. + @Test + public void repeatToString() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 5; i <= 5_000; i *= 10) { + BigInteger refRes = harmonic1000(i); + String refString = refRes.toString(); + // Disguise refRes to avoid compiler optimization issues. + BigInteger newRes = refRes.shiftLeft(30).add(BigInteger.valueOf(i)).shiftRight(30); + // The time-consuming part: + String newString = newRes.toString(); + } + } + } + + // Compute base^exp, where base and result are scaled/multiplied by scaleBy to make them + // integers. exp >= 0 . + private static BigInteger myPow(BigInteger base, int exp, BigInteger scaleBy) { + if (exp == 0) { + return scaleBy; // Return one. + } else if ((exp & 1) != 0) { + BigInteger tmp = myPow(base, exp - 1, scaleBy); + return tmp.multiply(base).divide(scaleBy); + } else { + BigInteger tmp = myPow(base, exp / 2, scaleBy); + return tmp.multiply(tmp).divide(scaleBy); + } + } + + // Approximate e by computing (1 + 1/n)^n to prec decimal digits. + // This isn't necessarily a very good approximation to e. + // Return the result, scaled by 10^prec. + private static BigInteger eApprox(int n, int prec) { + BigInteger scaledOne = BigInteger.TEN.pow(prec); + BigInteger base = scaledOne.add(scaledOne.divide(BigInteger.valueOf(n))); + return myPow(base, n, scaledOne); + } + + // Repeatedly execute and check the above, printing one of the results + // to compare to reference. + @Test + public void repeatEApprox() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 10; i <= 10_000; i *= 10) { + BigInteger refRes = eApprox(100_000, i); + BigInteger newRes = eApprox(100_000, i); + if (!newRes.equals(refRes)) { + throw new AssertionError(newRes + " != " + refRes); + } + if (i >= 10 && !refRes.toString().startsWith("271826")) { + throw new AssertionError( + "eApprox(" + 100_000 + "," + i + ") incorrectly produced " + refRes); + } + } + } + } + + // Test / time modPow() + @Test + public void repeatModPow() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 5; i <= 500; i *= 10) { + BigInteger odd1 = BigInteger.TEN.pow(i / 2).add(BigInteger.ONE); + BigInteger odd2 = BigInteger.TEN.pow(i / 2).add(BigInteger.valueOf(17)); + BigInteger product = odd1.multiply(odd2); + BigInteger exponent = BigInteger.TEN.pow(i / 2 - 1); + BigInteger base = BigInteger.TEN.pow(i / 4); + BigInteger newRes = base.modPow(exponent, product); + if (!newRes.mod(odd1).equals(base.modPow(exponent, odd1))) { + throw new AssertionError( + "ModPow() result incorrect mod odd1:" + + odd1 + + "; lastRes.mod(odd1)=" + + newRes.mod(odd1) + + " vs. " + + "base.modPow(exponent, odd1)=" + + base.modPow(exponent, odd1) + + " base=" + + base + + " exponent=" + + exponent); + } + if (!newRes.mod(odd2).equals(base.modPow(exponent, odd2))) { + throw new AssertionError("ModPow() result incorrect mod odd2"); + } + } + } + } + + // Test / time modInverse() + @Test + public void repeatModInverse() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 10; i <= 10_000; i *= 10) { + BigInteger odd1 = BigInteger.TEN.pow(i / 2).add(BigInteger.ONE); + BigInteger odd2 = BigInteger.TEN.pow(i / 2).add(BigInteger.valueOf(17)); + BigInteger product = odd1.multiply(odd2); + BigInteger arg = BigInteger.ONE.shiftLeft(i / 4); + BigInteger lastRes = null; + BigInteger newRes = arg.modInverse(product); + lastRes = newRes; + if (!lastRes.mod(odd1).equals(arg.modInverse(odd1))) { + throw new AssertionError("ModInverse() result incorrect mod odd1"); + } + if (!lastRes.mod(odd2).equals(arg.modInverse(odd2))) { + throw new AssertionError("ModInverse() result incorrect mod odd2"); + } + } + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/BufferedZipFilePerfTest.java b/apct-tests/perftests/core/src/android/libcore/BufferedZipFilePerfTest.java new file mode 100644 index 000000000000..04ef09e4b682 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/BufferedZipFilePerfTest.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.util.Random; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +@RunWith(AndroidJUnit4.class) +@LargeTest +public final class BufferedZipFilePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + int[] mReadSize = new int[] {4, 32, 128}; + int[] mCompressedSize = new int[] {128, 1024, 8192, 65536}; + private File mFile; + + @Before + public void setUp() throws Exception { + mFile = File.createTempFile("BufferedZipFilePerfTest", ".zip"); + mFile.deleteOnExit(); + Random random = new Random(0); + ZipOutputStream out = new ZipOutputStream(new FileOutputStream(mFile)); + for (int i = 0; i < mCompressedSize.length; i++) { + byte[] data = new byte[8192]; + out.putNextEntry(new ZipEntry("entry.data" + mCompressedSize[i])); + int written = 0; + while (written < mCompressedSize[i]) { + random.nextBytes(data); + int toWrite = Math.min(mCompressedSize[i] - written, data.length); + out.write(data, 0, toWrite); + written += toWrite; + } + } + out.close(); + } + + @Test + public void timeUnbufferedRead() throws Exception { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 0; i < mCompressedSize.length; i++) { + for (int j = 0; j < mReadSize.length; j++) { + ZipFile zipFile = new ZipFile(mFile); + ZipEntry entry = zipFile.getEntry("entry.data" + mCompressedSize[i]); + InputStream in = zipFile.getInputStream(entry); + byte[] buffer = new byte[mReadSize[j]]; + while (in.read(buffer) != -1) { + // Keep reading + } + in.close(); + zipFile.close(); + } + } + } + } + + @Test + public void timeBufferedRead() throws Exception { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + for (int i = 0; i < mCompressedSize.length; i++) { + for (int j = 0; j < mReadSize.length; j++) { + ZipFile zipFile = new ZipFile(mFile); + ZipEntry entry = zipFile.getEntry("entry.data" + mCompressedSize[i]); + InputStream in = new BufferedInputStream(zipFile.getInputStream(entry)); + byte[] buffer = new byte[mReadSize[j]]; + while (in.read(buffer) != -1) { + // Keep reading + } + in.close(); + zipFile.close(); + } + } + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ClassLoaderResourcePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ClassLoaderResourcePerfTest.java new file mode 100644 index 000000000000..4ae88b88b090 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ClassLoaderResourcePerfTest.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +@LargeTest +public class ClassLoaderResourcePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + private static final String EXISTENT_RESOURCE = "java/util/logging/logging.properties"; + private static final String MISSING_RESOURCE = "missing_entry"; + + @Test + public void timeGetBootResource_hit() { + ClassLoader currentClassLoader = getClass().getClassLoader(); + Assert.assertNotNull(currentClassLoader.getResource(EXISTENT_RESOURCE)); + + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + currentClassLoader.getResource(EXISTENT_RESOURCE); + } + } + + @Test + public void timeGetBootResource_miss() { + ClassLoader currentClassLoader = getClass().getClassLoader(); + Assert.assertNull(currentClassLoader.getResource(MISSING_RESOURCE)); + + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + currentClassLoader.getResource(MISSING_RESOURCE); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ClonePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ClonePerfTest.java new file mode 100644 index 000000000000..5e73916d5f5b --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ClonePerfTest.java @@ -0,0 +1,1197 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +@LargeTest +public class ClonePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + static class CloneableObject implements Cloneable { + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + } + + static class CloneableManyFieldObject implements Cloneable { + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + Object mO1 = new Object(); + Object mO2 = new Object(); + Object mO3 = new Object(); + Object mO4 = new Object(); + Object mO5 = new Object(); + Object mO6 = new Object(); + Object mO7 = new Object(); + Object mO8 = new Object(); + Object mO9 = new Object(); + Object mO10 = new Object(); + Object mO11 = new Object(); + Object mO12 = new Object(); + Object mO13 = new Object(); + Object mO14 = new Object(); + Object mO15 = new Object(); + Object mO16 = new Object(); + Object mO17 = new Object(); + Object mO18 = new Object(); + Object mO19 = new Object(); + Object mO20 = new Object(); + Object mO21 = new Object(); + Object mO22 = new Object(); + Object mO23 = new Object(); + Object mO24 = new Object(); + Object mO25 = new Object(); + Object mO26 = new Object(); + Object mO27 = new Object(); + Object mO28 = new Object(); + Object mO29 = new Object(); + Object mO30 = new Object(); + Object mO31 = new Object(); + Object mO32 = new Object(); + Object mO33 = new Object(); + Object mO34 = new Object(); + Object mO35 = new Object(); + Object mO36 = new Object(); + Object mO37 = new Object(); + Object mO38 = new Object(); + Object mO39 = new Object(); + Object mO40 = new Object(); + Object mO41 = new Object(); + Object mO42 = new Object(); + Object mO43 = new Object(); + Object mO44 = new Object(); + Object mO45 = new Object(); + Object mO46 = new Object(); + Object mO47 = new Object(); + Object mO48 = new Object(); + Object mO49 = new Object(); + Object mO50 = new Object(); + Object mO51 = new Object(); + Object mO52 = new Object(); + Object mO53 = new Object(); + Object mO54 = new Object(); + Object mO55 = new Object(); + Object mO56 = new Object(); + Object mO57 = new Object(); + Object mO58 = new Object(); + Object mO59 = new Object(); + Object mO60 = new Object(); + Object mO61 = new Object(); + Object mO62 = new Object(); + Object mO63 = new Object(); + Object mO64 = new Object(); + Object mO65 = new Object(); + Object mO66 = new Object(); + Object mO67 = new Object(); + Object mO68 = new Object(); + Object mO69 = new Object(); + Object mO70 = new Object(); + Object mO71 = new Object(); + Object mO72 = new Object(); + Object mO73 = new Object(); + Object mO74 = new Object(); + Object mO75 = new Object(); + Object mO76 = new Object(); + Object mO77 = new Object(); + Object mO78 = new Object(); + Object mO79 = new Object(); + Object mO80 = new Object(); + Object mO81 = new Object(); + Object mO82 = new Object(); + Object mO83 = new Object(); + Object mO84 = new Object(); + Object mO85 = new Object(); + Object mO86 = new Object(); + Object mO87 = new Object(); + Object mO88 = new Object(); + Object mO89 = new Object(); + Object mO90 = new Object(); + Object mO91 = new Object(); + Object mO92 = new Object(); + Object mO93 = new Object(); + Object mO94 = new Object(); + Object mO95 = new Object(); + Object mO96 = new Object(); + Object mO97 = new Object(); + Object mO98 = new Object(); + Object mO99 = new Object(); + Object mO100 = new Object(); + Object mO101 = new Object(); + Object mO102 = new Object(); + Object mO103 = new Object(); + Object mO104 = new Object(); + Object mO105 = new Object(); + Object mO106 = new Object(); + Object mO107 = new Object(); + Object mO108 = new Object(); + Object mO109 = new Object(); + Object mO110 = new Object(); + Object mO111 = new Object(); + Object mO112 = new Object(); + Object mO113 = new Object(); + Object mO114 = new Object(); + Object mO115 = new Object(); + Object mO116 = new Object(); + Object mO117 = new Object(); + Object mO118 = new Object(); + Object mO119 = new Object(); + Object mO120 = new Object(); + Object mO121 = new Object(); + Object mO122 = new Object(); + Object mO123 = new Object(); + Object mO124 = new Object(); + Object mO125 = new Object(); + Object mO126 = new Object(); + Object mO127 = new Object(); + Object mO128 = new Object(); + Object mO129 = new Object(); + Object mO130 = new Object(); + Object mO131 = new Object(); + Object mO132 = new Object(); + Object mO133 = new Object(); + Object mO134 = new Object(); + Object mO135 = new Object(); + Object mO136 = new Object(); + Object mO137 = new Object(); + Object mO138 = new Object(); + Object mO139 = new Object(); + Object mO140 = new Object(); + Object mO141 = new Object(); + Object mO142 = new Object(); + Object mO143 = new Object(); + Object mO144 = new Object(); + Object mO145 = new Object(); + Object mO146 = new Object(); + Object mO147 = new Object(); + Object mO148 = new Object(); + Object mO149 = new Object(); + Object mO150 = new Object(); + Object mO151 = new Object(); + Object mO152 = new Object(); + Object mO153 = new Object(); + Object mO154 = new Object(); + Object mO155 = new Object(); + Object mO156 = new Object(); + Object mO157 = new Object(); + Object mO158 = new Object(); + Object mO159 = new Object(); + Object mO160 = new Object(); + Object mO161 = new Object(); + Object mO162 = new Object(); + Object mO163 = new Object(); + Object mO164 = new Object(); + Object mO165 = new Object(); + Object mO166 = new Object(); + Object mO167 = new Object(); + Object mO168 = new Object(); + Object mO169 = new Object(); + Object mO170 = new Object(); + Object mO171 = new Object(); + Object mO172 = new Object(); + Object mO173 = new Object(); + Object mO174 = new Object(); + Object mO175 = new Object(); + Object mO176 = new Object(); + Object mO177 = new Object(); + Object mO178 = new Object(); + Object mO179 = new Object(); + Object mO180 = new Object(); + Object mO181 = new Object(); + Object mO182 = new Object(); + Object mO183 = new Object(); + Object mO184 = new Object(); + Object mO185 = new Object(); + Object mO186 = new Object(); + Object mO187 = new Object(); + Object mO188 = new Object(); + Object mO189 = new Object(); + Object mO190 = new Object(); + Object mO191 = new Object(); + Object mO192 = new Object(); + Object mO193 = new Object(); + Object mO194 = new Object(); + Object mO195 = new Object(); + Object mO196 = new Object(); + Object mO197 = new Object(); + Object mO198 = new Object(); + Object mO199 = new Object(); + Object mO200 = new Object(); + Object mO201 = new Object(); + Object mO202 = new Object(); + Object mO203 = new Object(); + Object mO204 = new Object(); + Object mO205 = new Object(); + Object mO206 = new Object(); + Object mO207 = new Object(); + Object mO208 = new Object(); + Object mO209 = new Object(); + Object mO210 = new Object(); + Object mO211 = new Object(); + Object mO212 = new Object(); + Object mO213 = new Object(); + Object mO214 = new Object(); + Object mO215 = new Object(); + Object mO216 = new Object(); + Object mO217 = new Object(); + Object mO218 = new Object(); + Object mO219 = new Object(); + Object mO220 = new Object(); + Object mO221 = new Object(); + Object mO222 = new Object(); + Object mO223 = new Object(); + Object mO224 = new Object(); + Object mO225 = new Object(); + Object mO226 = new Object(); + Object mO227 = new Object(); + Object mO228 = new Object(); + Object mO229 = new Object(); + Object mO230 = new Object(); + Object mO231 = new Object(); + Object mO232 = new Object(); + Object mO233 = new Object(); + Object mO234 = new Object(); + Object mO235 = new Object(); + Object mO236 = new Object(); + Object mO237 = new Object(); + Object mO238 = new Object(); + Object mO239 = new Object(); + Object mO240 = new Object(); + Object mO241 = new Object(); + Object mO242 = new Object(); + Object mO243 = new Object(); + Object mO244 = new Object(); + Object mO245 = new Object(); + Object mO246 = new Object(); + Object mO247 = new Object(); + Object mO248 = new Object(); + Object mO249 = new Object(); + Object mO250 = new Object(); + Object mO251 = new Object(); + Object mO252 = new Object(); + Object mO253 = new Object(); + Object mO254 = new Object(); + Object mO255 = new Object(); + Object mO256 = new Object(); + Object mO257 = new Object(); + Object mO258 = new Object(); + Object mO259 = new Object(); + Object mO260 = new Object(); + Object mO261 = new Object(); + Object mO262 = new Object(); + Object mO263 = new Object(); + Object mO264 = new Object(); + Object mO265 = new Object(); + Object mO266 = new Object(); + Object mO267 = new Object(); + Object mO268 = new Object(); + Object mO269 = new Object(); + Object mO270 = new Object(); + Object mO271 = new Object(); + Object mO272 = new Object(); + Object mO273 = new Object(); + Object mO274 = new Object(); + Object mO275 = new Object(); + Object mO276 = new Object(); + Object mO277 = new Object(); + Object mO278 = new Object(); + Object mO279 = new Object(); + Object mO280 = new Object(); + Object mO281 = new Object(); + Object mO282 = new Object(); + Object mO283 = new Object(); + Object mO284 = new Object(); + Object mO285 = new Object(); + Object mO286 = new Object(); + Object mO287 = new Object(); + Object mO288 = new Object(); + Object mO289 = new Object(); + Object mO290 = new Object(); + Object mO291 = new Object(); + Object mO292 = new Object(); + Object mO293 = new Object(); + Object mO294 = new Object(); + Object mO295 = new Object(); + Object mO296 = new Object(); + Object mO297 = new Object(); + Object mO298 = new Object(); + Object mO299 = new Object(); + Object mO300 = new Object(); + Object mO301 = new Object(); + Object mO302 = new Object(); + Object mO303 = new Object(); + Object mO304 = new Object(); + Object mO305 = new Object(); + Object mO306 = new Object(); + Object mO307 = new Object(); + Object mO308 = new Object(); + Object mO309 = new Object(); + Object mO310 = new Object(); + Object mO311 = new Object(); + Object mO312 = new Object(); + Object mO313 = new Object(); + Object mO314 = new Object(); + Object mO315 = new Object(); + Object mO316 = new Object(); + Object mO317 = new Object(); + Object mO318 = new Object(); + Object mO319 = new Object(); + Object mO320 = new Object(); + Object mO321 = new Object(); + Object mO322 = new Object(); + Object mO323 = new Object(); + Object mO324 = new Object(); + Object mO325 = new Object(); + Object mO326 = new Object(); + Object mO327 = new Object(); + Object mO328 = new Object(); + Object mO329 = new Object(); + Object mO330 = new Object(); + Object mO331 = new Object(); + Object mO332 = new Object(); + Object mO333 = new Object(); + Object mO334 = new Object(); + Object mO335 = new Object(); + Object mO336 = new Object(); + Object mO337 = new Object(); + Object mO338 = new Object(); + Object mO339 = new Object(); + Object mO340 = new Object(); + Object mO341 = new Object(); + Object mO342 = new Object(); + Object mO343 = new Object(); + Object mO344 = new Object(); + Object mO345 = new Object(); + Object mO346 = new Object(); + Object mO347 = new Object(); + Object mO348 = new Object(); + Object mO349 = new Object(); + Object mO350 = new Object(); + Object mO351 = new Object(); + Object mO352 = new Object(); + Object mO353 = new Object(); + Object mO354 = new Object(); + Object mO355 = new Object(); + Object mO356 = new Object(); + Object mO357 = new Object(); + Object mO358 = new Object(); + Object mO359 = new Object(); + Object mO360 = new Object(); + Object mO361 = new Object(); + Object mO362 = new Object(); + Object mO363 = new Object(); + Object mO364 = new Object(); + Object mO365 = new Object(); + Object mO366 = new Object(); + Object mO367 = new Object(); + Object mO368 = new Object(); + Object mO369 = new Object(); + Object mO370 = new Object(); + Object mO371 = new Object(); + Object mO372 = new Object(); + Object mO373 = new Object(); + Object mO374 = new Object(); + Object mO375 = new Object(); + Object mO376 = new Object(); + Object mO377 = new Object(); + Object mO378 = new Object(); + Object mO379 = new Object(); + Object mO380 = new Object(); + Object mO381 = new Object(); + Object mO382 = new Object(); + Object mO383 = new Object(); + Object mO384 = new Object(); + Object mO385 = new Object(); + Object mO386 = new Object(); + Object mO387 = new Object(); + Object mO388 = new Object(); + Object mO389 = new Object(); + Object mO390 = new Object(); + Object mO391 = new Object(); + Object mO392 = new Object(); + Object mO393 = new Object(); + Object mO394 = new Object(); + Object mO395 = new Object(); + Object mO396 = new Object(); + Object mO397 = new Object(); + Object mO398 = new Object(); + Object mO399 = new Object(); + Object mO400 = new Object(); + Object mO401 = new Object(); + Object mO402 = new Object(); + Object mO403 = new Object(); + Object mO404 = new Object(); + Object mO405 = new Object(); + Object mO406 = new Object(); + Object mO407 = new Object(); + Object mO408 = new Object(); + Object mO409 = new Object(); + Object mO410 = new Object(); + Object mO411 = new Object(); + Object mO412 = new Object(); + Object mO413 = new Object(); + Object mO414 = new Object(); + Object mO415 = new Object(); + Object mO416 = new Object(); + Object mO417 = new Object(); + Object mO418 = new Object(); + Object mO419 = new Object(); + Object mO420 = new Object(); + Object mO421 = new Object(); + Object mO422 = new Object(); + Object mO423 = new Object(); + Object mO424 = new Object(); + Object mO425 = new Object(); + Object mO426 = new Object(); + Object mO427 = new Object(); + Object mO428 = new Object(); + Object mO429 = new Object(); + Object mO430 = new Object(); + Object mO431 = new Object(); + Object mO432 = new Object(); + Object mO433 = new Object(); + Object mO434 = new Object(); + Object mO435 = new Object(); + Object mO436 = new Object(); + Object mO437 = new Object(); + Object mO438 = new Object(); + Object mO439 = new Object(); + Object mO440 = new Object(); + Object mO441 = new Object(); + Object mO442 = new Object(); + Object mO460 = new Object(); + Object mO461 = new Object(); + Object mO462 = new Object(); + Object mO463 = new Object(); + Object mO464 = new Object(); + Object mO465 = new Object(); + Object mO466 = new Object(); + Object mO467 = new Object(); + Object mO468 = new Object(); + Object mO469 = new Object(); + Object mO470 = new Object(); + Object mO471 = new Object(); + Object mO472 = new Object(); + Object mO473 = new Object(); + Object mO474 = new Object(); + Object mO475 = new Object(); + Object mO476 = new Object(); + Object mO477 = new Object(); + Object mO478 = new Object(); + Object mO479 = new Object(); + Object mO480 = new Object(); + Object mO481 = new Object(); + Object mO482 = new Object(); + Object mO483 = new Object(); + Object mO484 = new Object(); + Object mO485 = new Object(); + Object mO486 = new Object(); + Object mO487 = new Object(); + Object mO488 = new Object(); + Object mO489 = new Object(); + Object mO490 = new Object(); + Object mO491 = new Object(); + Object mO492 = new Object(); + Object mO493 = new Object(); + Object mO494 = new Object(); + Object mO495 = new Object(); + Object mO496 = new Object(); + Object mO497 = new Object(); + Object mO498 = new Object(); + Object mO499 = new Object(); + Object mO500 = new Object(); + Object mO501 = new Object(); + Object mO502 = new Object(); + Object mO503 = new Object(); + Object mO504 = new Object(); + Object mO505 = new Object(); + Object mO506 = new Object(); + Object mO507 = new Object(); + Object mO508 = new Object(); + Object mO509 = new Object(); + Object mO510 = new Object(); + Object mO511 = new Object(); + Object mO512 = new Object(); + Object mO513 = new Object(); + Object mO514 = new Object(); + Object mO515 = new Object(); + Object mO516 = new Object(); + Object mO517 = new Object(); + Object mO518 = new Object(); + Object mO519 = new Object(); + Object mO520 = new Object(); + Object mO521 = new Object(); + Object mO522 = new Object(); + Object mO523 = new Object(); + Object mO556 = new Object(); + Object mO557 = new Object(); + Object mO558 = new Object(); + Object mO559 = new Object(); + Object mO560 = new Object(); + Object mO561 = new Object(); + Object mO562 = new Object(); + Object mO563 = new Object(); + Object mO564 = new Object(); + Object mO565 = new Object(); + Object mO566 = new Object(); + Object mO567 = new Object(); + Object mO568 = new Object(); + Object mO569 = new Object(); + Object mO570 = new Object(); + Object mO571 = new Object(); + Object mO572 = new Object(); + Object mO573 = new Object(); + Object mO574 = new Object(); + Object mO575 = new Object(); + Object mO576 = new Object(); + Object mO577 = new Object(); + Object mO578 = new Object(); + Object mO579 = new Object(); + Object mO580 = new Object(); + Object mO581 = new Object(); + Object mO582 = new Object(); + Object mO583 = new Object(); + Object mO584 = new Object(); + Object mO585 = new Object(); + Object mO586 = new Object(); + Object mO587 = new Object(); + Object mO588 = new Object(); + Object mO589 = new Object(); + Object mO590 = new Object(); + Object mO591 = new Object(); + Object mO592 = new Object(); + Object mO593 = new Object(); + Object mO594 = new Object(); + Object mO595 = new Object(); + Object mO596 = new Object(); + Object mO597 = new Object(); + Object mO598 = new Object(); + Object mO599 = new Object(); + Object mO600 = new Object(); + Object mO601 = new Object(); + Object mO602 = new Object(); + Object mO603 = new Object(); + Object mO604 = new Object(); + Object mO605 = new Object(); + Object mO606 = new Object(); + Object mO607 = new Object(); + Object mO608 = new Object(); + Object mO609 = new Object(); + Object mO610 = new Object(); + Object mO611 = new Object(); + Object mO612 = new Object(); + Object mO613 = new Object(); + Object mO614 = new Object(); + Object mO615 = new Object(); + Object mO616 = new Object(); + Object mO617 = new Object(); + Object mO618 = new Object(); + Object mO619 = new Object(); + Object mO620 = new Object(); + Object mO621 = new Object(); + Object mO622 = new Object(); + Object mO623 = new Object(); + Object mO624 = new Object(); + Object mO625 = new Object(); + Object mO626 = new Object(); + Object mO627 = new Object(); + Object mO628 = new Object(); + Object mO629 = new Object(); + Object mO630 = new Object(); + Object mO631 = new Object(); + Object mO632 = new Object(); + Object mO633 = new Object(); + Object mO634 = new Object(); + Object mO635 = new Object(); + Object mO636 = new Object(); + Object mO637 = new Object(); + Object mO638 = new Object(); + Object mO639 = new Object(); + Object mO640 = new Object(); + Object mO641 = new Object(); + Object mO642 = new Object(); + Object mO643 = new Object(); + Object mO644 = new Object(); + Object mO645 = new Object(); + Object mO646 = new Object(); + Object mO647 = new Object(); + Object mO648 = new Object(); + Object mO649 = new Object(); + Object mO650 = new Object(); + Object mO651 = new Object(); + Object mO652 = new Object(); + Object mO653 = new Object(); + Object mO654 = new Object(); + Object mO655 = new Object(); + Object mO656 = new Object(); + Object mO657 = new Object(); + Object mO658 = new Object(); + Object mO659 = new Object(); + Object mO660 = new Object(); + Object mO661 = new Object(); + Object mO662 = new Object(); + Object mO663 = new Object(); + Object mO664 = new Object(); + Object mO665 = new Object(); + Object mO666 = new Object(); + Object mO667 = new Object(); + Object mO668 = new Object(); + Object mO669 = new Object(); + Object mO670 = new Object(); + Object mO671 = new Object(); + Object mO672 = new Object(); + Object mO673 = new Object(); + Object mO674 = new Object(); + Object mO675 = new Object(); + Object mO676 = new Object(); + Object mO677 = new Object(); + Object mO678 = new Object(); + Object mO679 = new Object(); + Object mO680 = new Object(); + Object mO681 = new Object(); + Object mO682 = new Object(); + Object mO683 = new Object(); + Object mO684 = new Object(); + Object mO685 = new Object(); + Object mO686 = new Object(); + Object mO687 = new Object(); + Object mO688 = new Object(); + Object mO734 = new Object(); + Object mO735 = new Object(); + Object mO736 = new Object(); + Object mO737 = new Object(); + Object mO738 = new Object(); + Object mO739 = new Object(); + Object mO740 = new Object(); + Object mO741 = new Object(); + Object mO742 = new Object(); + Object mO743 = new Object(); + Object mO744 = new Object(); + Object mO745 = new Object(); + Object mO746 = new Object(); + Object mO747 = new Object(); + Object mO748 = new Object(); + Object mO749 = new Object(); + Object mO750 = new Object(); + Object mO751 = new Object(); + Object mO752 = new Object(); + Object mO753 = new Object(); + Object mO754 = new Object(); + Object mO755 = new Object(); + Object mO756 = new Object(); + Object mO757 = new Object(); + Object mO758 = new Object(); + Object mO759 = new Object(); + Object mO760 = new Object(); + Object mO761 = new Object(); + Object mO762 = new Object(); + Object mO763 = new Object(); + Object mO764 = new Object(); + Object mO765 = new Object(); + Object mO766 = new Object(); + Object mO767 = new Object(); + Object mO768 = new Object(); + Object mO769 = new Object(); + Object mO770 = new Object(); + Object mO771 = new Object(); + Object mO772 = new Object(); + Object mO773 = new Object(); + Object mO774 = new Object(); + Object mO775 = new Object(); + Object mO776 = new Object(); + Object mO777 = new Object(); + Object mO778 = new Object(); + Object mO779 = new Object(); + Object mO780 = new Object(); + Object mO781 = new Object(); + Object mO782 = new Object(); + Object mO783 = new Object(); + Object mO784 = new Object(); + Object mO785 = new Object(); + Object mO786 = new Object(); + Object mO787 = new Object(); + Object mO788 = new Object(); + Object mO789 = new Object(); + Object mO790 = new Object(); + Object mO791 = new Object(); + Object mO792 = new Object(); + Object mO793 = new Object(); + Object mO794 = new Object(); + Object mO795 = new Object(); + Object mO796 = new Object(); + Object mO797 = new Object(); + Object mO798 = new Object(); + Object mO799 = new Object(); + Object mO800 = new Object(); + Object mO801 = new Object(); + Object mO802 = new Object(); + Object mO803 = new Object(); + Object mO804 = new Object(); + Object mO805 = new Object(); + Object mO806 = new Object(); + Object mO807 = new Object(); + Object mO808 = new Object(); + Object mO809 = new Object(); + Object mO810 = new Object(); + Object mO811 = new Object(); + Object mO812 = new Object(); + Object mO813 = new Object(); + Object mO848 = new Object(); + Object mO849 = new Object(); + Object mO850 = new Object(); + Object mO851 = new Object(); + Object mO852 = new Object(); + Object mO853 = new Object(); + Object mO854 = new Object(); + Object mO855 = new Object(); + Object mO856 = new Object(); + Object mO857 = new Object(); + Object mO858 = new Object(); + Object mO859 = new Object(); + Object mO860 = new Object(); + Object mO861 = new Object(); + Object mO862 = new Object(); + Object mO863 = new Object(); + Object mO864 = new Object(); + Object mO865 = new Object(); + Object mO866 = new Object(); + Object mO867 = new Object(); + Object mO868 = new Object(); + Object mO869 = new Object(); + Object mO870 = new Object(); + Object mO871 = new Object(); + Object mO872 = new Object(); + Object mO873 = new Object(); + Object mO874 = new Object(); + Object mO875 = new Object(); + Object mO876 = new Object(); + Object mO877 = new Object(); + Object mO878 = new Object(); + Object mO879 = new Object(); + Object mO880 = new Object(); + Object mO881 = new Object(); + Object mO882 = new Object(); + Object mO883 = new Object(); + Object mO884 = new Object(); + Object mO885 = new Object(); + Object mO886 = new Object(); + Object mO887 = new Object(); + Object mO888 = new Object(); + Object mO889 = new Object(); + Object mO890 = new Object(); + Object mO891 = new Object(); + Object mO892 = new Object(); + Object mO893 = new Object(); + Object mO894 = new Object(); + Object mO895 = new Object(); + Object mO896 = new Object(); + Object mO897 = new Object(); + Object mO898 = new Object(); + Object mO899 = new Object(); + Object mO900 = new Object(); + Object mO901 = new Object(); + Object mO902 = new Object(); + Object mO903 = new Object(); + Object mO904 = new Object(); + Object mO905 = new Object(); + Object mO906 = new Object(); + Object mO907 = new Object(); + Object mO908 = new Object(); + Object mO909 = new Object(); + Object mO910 = new Object(); + Object mO911 = new Object(); + Object mO912 = new Object(); + Object mO913 = new Object(); + Object mO914 = new Object(); + Object mO915 = new Object(); + Object mO916 = new Object(); + Object mO917 = new Object(); + Object mO918 = new Object(); + Object mO919 = new Object(); + Object mO920 = new Object(); + Object mO921 = new Object(); + Object mO922 = new Object(); + Object mO923 = new Object(); + Object mO924 = new Object(); + Object mO925 = new Object(); + Object mO926 = new Object(); + Object mO927 = new Object(); + Object mO928 = new Object(); + Object mO929 = new Object(); + Object mO930 = new Object(); + Object mO931 = new Object(); + Object mO932 = new Object(); + Object mO933 = new Object(); + Object mO934 = new Object(); + Object mO935 = new Object(); + Object mO936 = new Object(); + Object mO937 = new Object(); + Object mO938 = new Object(); + Object mO939 = new Object(); + Object mO940 = new Object(); + Object mO941 = new Object(); + Object mO942 = new Object(); + Object mO943 = new Object(); + Object mO944 = new Object(); + Object mO945 = new Object(); + Object mO946 = new Object(); + Object mO947 = new Object(); + Object mO948 = new Object(); + Object mO949 = new Object(); + Object mO950 = new Object(); + Object mO951 = new Object(); + Object mO952 = new Object(); + Object mO953 = new Object(); + Object mO954 = new Object(); + Object mO955 = new Object(); + Object mO956 = new Object(); + Object mO957 = new Object(); + Object mO958 = new Object(); + Object mO959 = new Object(); + Object mO960 = new Object(); + Object mO961 = new Object(); + Object mO962 = new Object(); + Object mO963 = new Object(); + Object mO964 = new Object(); + Object mO965 = new Object(); + Object mO966 = new Object(); + Object mO967 = new Object(); + Object mO968 = new Object(); + Object mO969 = new Object(); + Object mO970 = new Object(); + Object mO971 = new Object(); + Object mO972 = new Object(); + Object mO973 = new Object(); + Object mO974 = new Object(); + Object mO975 = new Object(); + Object mO976 = new Object(); + Object mO977 = new Object(); + Object mO978 = new Object(); + Object mO979 = new Object(); + Object mO980 = new Object(); + Object mO981 = new Object(); + Object mO982 = new Object(); + Object mO983 = new Object(); + Object mO984 = new Object(); + Object mO985 = new Object(); + Object mO986 = new Object(); + Object mO987 = new Object(); + Object mO988 = new Object(); + Object mO989 = new Object(); + Object mO990 = new Object(); + Object mO991 = new Object(); + Object mO992 = new Object(); + Object mO993 = new Object(); + Object mO994 = new Object(); + Object mO995 = new Object(); + Object mO996 = new Object(); + Object mO997 = new Object(); + Object mO998 = new Object(); + Object mO999 = new Object(); + } + + static class Deep0 {} + + static class Deep1 extends Deep0 {} + + static class Deep2 extends Deep1 {} + + static class Deep3 extends Deep2 {} + + static class Deep4 extends Deep3 {} + + static class Deep5 extends Deep4 {} + + static class Deep6 extends Deep5 {} + + static class Deep7 extends Deep6 {} + + static class Deep8 extends Deep7 {} + + static class Deep9 extends Deep8 {} + + static class Deep10 extends Deep9 {} + + static class Deep11 extends Deep10 {} + + static class Deep12 extends Deep11 {} + + static class Deep13 extends Deep12 {} + + static class Deep14 extends Deep13 {} + + static class Deep15 extends Deep14 {} + + static class Deep16 extends Deep15 {} + + static class Deep17 extends Deep16 {} + + static class Deep18 extends Deep17 {} + + static class Deep19 extends Deep18 {} + + static class Deep20 extends Deep19 {} + + static class Deep21 extends Deep20 {} + + static class Deep22 extends Deep21 {} + + static class Deep23 extends Deep22 {} + + static class Deep24 extends Deep23 {} + + static class Deep25 extends Deep24 {} + + static class Deep26 extends Deep25 {} + + static class Deep27 extends Deep26 {} + + static class Deep28 extends Deep27 {} + + static class Deep29 extends Deep28 {} + + static class Deep30 extends Deep29 {} + + static class Deep31 extends Deep30 {} + + static class Deep32 extends Deep31 {} + + static class Deep33 extends Deep32 {} + + static class Deep34 extends Deep33 {} + + static class Deep35 extends Deep34 {} + + static class Deep36 extends Deep35 {} + + static class Deep37 extends Deep36 {} + + static class Deep38 extends Deep37 {} + + static class Deep39 extends Deep38 {} + + static class Deep40 extends Deep39 {} + + static class Deep41 extends Deep40 {} + + static class Deep42 extends Deep41 {} + + static class Deep43 extends Deep42 {} + + static class Deep44 extends Deep43 {} + + static class Deep45 extends Deep44 {} + + static class Deep46 extends Deep45 {} + + static class Deep47 extends Deep46 {} + + static class Deep48 extends Deep47 {} + + static class Deep49 extends Deep48 {} + + static class Deep50 extends Deep49 {} + + static class Deep51 extends Deep50 {} + + static class Deep52 extends Deep51 {} + + static class Deep53 extends Deep52 {} + + static class Deep54 extends Deep53 {} + + static class Deep55 extends Deep54 {} + + static class Deep56 extends Deep55 {} + + static class Deep57 extends Deep56 {} + + static class Deep58 extends Deep57 {} + + static class Deep59 extends Deep58 {} + + static class Deep60 extends Deep59 {} + + static class Deep61 extends Deep60 {} + + static class Deep62 extends Deep61 {} + + static class Deep63 extends Deep62 {} + + static class Deep64 extends Deep63 {} + + static class Deep65 extends Deep64 {} + + static class Deep66 extends Deep65 {} + + static class Deep67 extends Deep66 {} + + static class Deep68 extends Deep67 {} + + static class Deep69 extends Deep68 {} + + static class Deep70 extends Deep69 {} + + static class Deep71 extends Deep70 {} + + static class Deep72 extends Deep71 {} + + static class Deep73 extends Deep72 {} + + static class Deep74 extends Deep73 {} + + static class Deep75 extends Deep74 {} + + static class Deep76 extends Deep75 {} + + static class Deep77 extends Deep76 {} + + static class Deep78 extends Deep77 {} + + static class Deep79 extends Deep78 {} + + static class Deep80 extends Deep79 {} + + static class Deep81 extends Deep80 {} + + static class Deep82 extends Deep81 {} + + static class Deep83 extends Deep82 {} + + static class Deep84 extends Deep83 {} + + static class Deep85 extends Deep84 {} + + static class Deep86 extends Deep85 {} + + static class Deep87 extends Deep86 {} + + static class Deep88 extends Deep87 {} + + static class Deep89 extends Deep88 {} + + static class Deep90 extends Deep89 {} + + static class Deep91 extends Deep90 {} + + static class Deep92 extends Deep91 {} + + static class Deep93 extends Deep92 {} + + static class Deep94 extends Deep93 {} + + static class Deep95 extends Deep94 {} + + static class Deep96 extends Deep95 {} + + static class Deep97 extends Deep96 {} + + static class Deep98 extends Deep97 {} + + static class Deep99 extends Deep98 {} + + static class Deep100 extends Deep99 {} + + static class DeepCloneable extends Deep100 implements Cloneable { + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + } + + @Test + public void time_Object_clone() { + try { + CloneableObject o = new CloneableObject(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } catch (Exception e) { + throw new AssertionError(e.getMessage()); + } + } + + @Test + public void time_Object_manyFieldClone() { + try { + CloneableManyFieldObject o = new CloneableManyFieldObject(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } catch (Exception e) { + throw new AssertionError(e.getMessage()); + } + } + + @Test + public void time_Object_deepClone() { + try { + DeepCloneable o = new DeepCloneable(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } catch (Exception e) { + throw new AssertionError(e.getMessage()); + } + } + + @Test + public void time_Array_clone() { + int[] o = new int[32]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } + + @Test + public void time_ObjectArray_smallClone() { + Object[] o = new Object[32]; + for (int i = 0; i < o.length / 2; ++i) { + o[i] = new Object(); + } + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } + + @Test + public void time_ObjectArray_largeClone() { + Object[] o = new Object[2048]; + for (int i = 0; i < o.length / 2; ++i) { + o[i] = new Object(); + } + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + o.clone(); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/DeepArrayOpsPerfTest.java b/apct-tests/perftests/core/src/android/libcore/DeepArrayOpsPerfTest.java new file mode 100644 index 000000000000..3f4f6af7554c --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/DeepArrayOpsPerfTest.java @@ -0,0 +1,169 @@ +/* + * 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.util.Arrays; +import java.util.Collection; + +@RunWith(Parameterized.class) +@LargeTest +public class DeepArrayOpsPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + private Object[] mArray; + private Object[] mArray2; + + @Parameterized.Parameter(0) + public int mArrayLength; + + @Parameterized.Parameters(name = "mArrayLength({0})") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] {{1}, {4}, {16}, {32}, {2048}}); + } + + @Before + public void setUp() throws Exception { + mArray = new Object[mArrayLength * 14]; + mArray2 = new Object[mArrayLength * 14]; + for (int i = 0; i < mArrayLength; i += 14) { + mArray[i] = new IntWrapper(i); + mArray2[i] = new IntWrapper(i); + + mArray[i + 1] = new16ElementObjectmArray(); + mArray2[i + 1] = new16ElementObjectmArray(); + + mArray[i + 2] = new boolean[16]; + mArray2[i + 2] = new boolean[16]; + + mArray[i + 3] = new byte[16]; + mArray2[i + 3] = new byte[16]; + + mArray[i + 4] = new char[16]; + mArray2[i + 4] = new char[16]; + + mArray[i + 5] = new short[16]; + mArray2[i + 5] = new short[16]; + + mArray[i + 6] = new float[16]; + mArray2[i + 6] = new float[16]; + + mArray[i + 7] = new long[16]; + mArray2[i + 7] = new long[16]; + + mArray[i + 8] = new int[16]; + mArray2[i + 8] = new int[16]; + + mArray[i + 9] = new double[16]; + mArray2[i + 9] = new double[16]; + + // SubmArray types are concrete objects. + mArray[i + 10] = new16ElementArray(String.class, String.class); + mArray2[i + 10] = new16ElementArray(String.class, String.class); + + mArray[i + 11] = new16ElementArray(Integer.class, Integer.class); + mArray2[i + 11] = new16ElementArray(Integer.class, Integer.class); + + // SubmArray types is an interface. + mArray[i + 12] = new16ElementArray(CharSequence.class, String.class); + mArray2[i + 12] = new16ElementArray(CharSequence.class, String.class); + + mArray[i + 13] = null; + mArray2[i + 13] = null; + } + } + + @Test + public void deepHashCode() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + Arrays.deepHashCode(mArray); + } + } + + @Test + public void deepEquals() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + Arrays.deepEquals(mArray, mArray2); + } + } + + private static Object[] new16ElementObjectmArray() { + Object[] array = new Object[16]; + for (int i = 0; i < 16; ++i) { + array[i] = new IntWrapper(i); + } + + return array; + } + + @SuppressWarnings("unchecked") + private static <T, V> T[] new16ElementArray(Class<T> mArrayType, Class<V> type) + throws Exception { + T[] array = (T[]) Array.newInstance(type, 16); + if (!mArrayType.isAssignableFrom(type)) { + throw new IllegalArgumentException(mArrayType + " is not assignable from " + type); + } + + Constructor<V> constructor = type.getDeclaredConstructor(String.class); + for (int i = 0; i < 16; ++i) { + array[i] = (T) constructor.newInstance(String.valueOf(i + 1000)); + } + + return array; + } + + /** + * A class that provides very basic equals() and hashCode() operations and doesn't resort to + * memoization tricks like {@link java.lang.Integer}. + * + * <p>Useful for providing equal objects that aren't the same (a.equals(b) but a != b). + */ + public static final class IntWrapper { + private final int mWrapped; + + public IntWrapper(int wrap) { + mWrapped = wrap; + } + + @Override + public int hashCode() { + return mWrapped; + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof IntWrapper)) { + return false; + } + + return ((IntWrapper) o).mWrapped == this.mWrapped; + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/FieldAccessPerfTest.java b/apct-tests/perftests/core/src/android/libcore/FieldAccessPerfTest.java new file mode 100644 index 000000000000..da94ae118900 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/FieldAccessPerfTest.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** What does field access cost? */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class FieldAccessPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + private static class Inner { + public int mPublicInnerIntVal; + protected int mProtectedInnerIntVal; + private int mPrivateInnerIntVal; + int mPackageInnerIntVal; + } + + int mIntVal = 42; + final int mFinalIntVal = 42; + static int sStaticIntVal = 42; + static final int FINAL_INT_VAL = 42; + + @Test + public void timeField() { + int result = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = mIntVal; + } + } + + @Test + public void timeFieldFinal() { + int result = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = mFinalIntVal; + } + } + + @Test + public void timeFieldStatic() { + int result = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = sStaticIntVal; + } + } + + @Test + public void timeFieldStaticFinal() { + int result = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = FINAL_INT_VAL; + } + } + + @Test + public void timeFieldCached() { + int result = 0; + int cachedIntVal = this.mIntVal; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = cachedIntVal; + } + } + + @Test + public void timeFieldPrivateInnerClassPublicField() { + int result = 0; + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = inner.mPublicInnerIntVal; + } + } + + @Test + public void timeFieldPrivateInnerClassProtectedField() { + int result = 0; + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = inner.mProtectedInnerIntVal; + } + } + + @Test + public void timeFieldPrivateInnerClassPrivateField() { + int result = 0; + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = inner.mPrivateInnerIntVal; + } + } + + @Test + public void timeFieldPrivateInnerClassPackageField() { + int result = 0; + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = inner.mPackageInnerIntVal; + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/HashedCollectionsPerfTest.java b/apct-tests/perftests/core/src/android/libcore/HashedCollectionsPerfTest.java new file mode 100644 index 000000000000..9446d99c959d --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/HashedCollectionsPerfTest.java @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.HashMap; +import java.util.Hashtable; +import java.util.LinkedHashMap; +import java.util.concurrent.ConcurrentHashMap; + +/** How do the various hash maps compare? */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class HashedCollectionsPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Test + public void timeHashMapGet() { + HashMap<String, String> map = new HashMap<String, String>(); + map.put("hello", "world"); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.get("hello"); + } + } + + @Test + public void timeHashMapGet_Synchronized() { + HashMap<String, String> map = new HashMap<String, String>(); + synchronized (map) { + map.put("hello", "world"); + } + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + synchronized (map) { + map.get("hello"); + } + } + } + + @Test + public void timeHashtableGet() { + Hashtable<String, String> map = new Hashtable<String, String>(); + map.put("hello", "world"); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.get("hello"); + } + } + + @Test + public void timeLinkedHashMapGet() { + LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(); + map.put("hello", "world"); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.get("hello"); + } + } + + @Test + public void timeConcurrentHashMapGet() { + ConcurrentHashMap<String, String> map = new ConcurrentHashMap<String, String>(); + map.put("hello", "world"); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.get("hello"); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTest.java b/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTest.java new file mode 100644 index 000000000000..be2a7e97f775 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTest.java @@ -0,0 +1,1818 @@ +/* + * 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. + */ + +package android.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * This file is script-generated by ImtConflictPerfTestGen.py. It measures the performance impact of + * conflicts in interface method tables. Run `python ImtConflictPerfTestGen.py > + * ImtConflictPerfTest.java` to regenerate. + * + * <p>Each interface has 64 methods, which is the current size of an IMT. C0 implements one + * interface, C1 implements two, C2 implements three, and so on. The intent is that C0 has no + * conflicts in its IMT, C1 has depth-2 conflicts in its IMT, C2 has depth-3 conflicts, etc. This is + * currently guaranteed by the fact that we hash interface methods by taking their method index + * modulo 64. (Note that a "conflict depth" of 1 means no conflict at all.) + */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class ImtConflictPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Before + public void setup() { + C0 c0 = new C0(); + callF0(c0); + C1 c1 = new C1(); + callF0(c1); + callF19(c1); + C2 c2 = new C2(); + callF0(c2); + callF19(c2); + callF38(c2); + C3 c3 = new C3(); + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + C4 c4 = new C4(); + callF0(c4); + callF19(c4); + callF38(c4); + callF57(c4); + callF76(c4); + C5 c5 = new C5(); + callF0(c5); + callF19(c5); + callF38(c5); + callF57(c5); + callF76(c5); + callF95(c5); + C6 c6 = new C6(); + callF0(c6); + callF19(c6); + callF38(c6); + callF57(c6); + callF76(c6); + callF95(c6); + callF114(c6); + C7 c7 = new C7(); + callF0(c7); + callF19(c7); + callF38(c7); + callF57(c7); + callF76(c7); + callF95(c7); + callF114(c7); + callF133(c7); + C8 c8 = new C8(); + callF0(c8); + callF19(c8); + callF38(c8); + callF57(c8); + callF76(c8); + callF95(c8); + callF114(c8); + callF133(c8); + callF152(c8); + C9 c9 = new C9(); + callF0(c9); + callF19(c9); + callF38(c9); + callF57(c9); + callF76(c9); + callF95(c9); + callF114(c9); + callF133(c9); + callF152(c9); + callF171(c9); + C10 c10 = new C10(); + callF0(c10); + callF19(c10); + callF38(c10); + callF57(c10); + callF76(c10); + callF95(c10); + callF114(c10); + callF133(c10); + callF152(c10); + callF171(c10); + callF190(c10); + C11 c11 = new C11(); + callF0(c11); + callF19(c11); + callF38(c11); + callF57(c11); + callF76(c11); + callF95(c11); + callF114(c11); + callF133(c11); + callF152(c11); + callF171(c11); + callF190(c11); + callF209(c11); + C12 c12 = new C12(); + callF0(c12); + callF19(c12); + callF38(c12); + callF57(c12); + callF76(c12); + callF95(c12); + callF114(c12); + callF133(c12); + callF152(c12); + callF171(c12); + callF190(c12); + callF209(c12); + callF228(c12); + C13 c13 = new C13(); + callF0(c13); + callF19(c13); + callF38(c13); + callF57(c13); + callF76(c13); + callF95(c13); + callF114(c13); + callF133(c13); + callF152(c13); + callF171(c13); + callF190(c13); + callF209(c13); + callF228(c13); + callF247(c13); + C14 c14 = new C14(); + callF0(c14); + callF19(c14); + callF38(c14); + callF57(c14); + callF76(c14); + callF95(c14); + callF114(c14); + callF133(c14); + callF152(c14); + callF171(c14); + callF190(c14); + callF209(c14); + callF228(c14); + callF247(c14); + callF266(c14); + C15 c15 = new C15(); + callF0(c15); + callF19(c15); + callF38(c15); + callF57(c15); + callF76(c15); + callF95(c15); + callF114(c15); + callF133(c15); + callF152(c15); + callF171(c15); + callF190(c15); + callF209(c15); + callF228(c15); + callF247(c15); + callF266(c15); + callF285(c15); + C16 c16 = new C16(); + callF0(c16); + callF19(c16); + callF38(c16); + callF57(c16); + callF76(c16); + callF95(c16); + callF114(c16); + callF133(c16); + callF152(c16); + callF171(c16); + callF190(c16); + callF209(c16); + callF228(c16); + callF247(c16); + callF266(c16); + callF285(c16); + callF304(c16); + C17 c17 = new C17(); + callF0(c17); + callF19(c17); + callF38(c17); + callF57(c17); + callF76(c17); + callF95(c17); + callF114(c17); + callF133(c17); + callF152(c17); + callF171(c17); + callF190(c17); + callF209(c17); + callF228(c17); + callF247(c17); + callF266(c17); + callF285(c17); + callF304(c17); + callF323(c17); + C18 c18 = new C18(); + callF0(c18); + callF19(c18); + callF38(c18); + callF57(c18); + callF76(c18); + callF95(c18); + callF114(c18); + callF133(c18); + callF152(c18); + callF171(c18); + callF190(c18); + callF209(c18); + callF228(c18); + callF247(c18); + callF266(c18); + callF285(c18); + callF304(c18); + callF323(c18); + callF342(c18); + C19 c19 = new C19(); + callF0(c19); + callF19(c19); + callF38(c19); + callF57(c19); + callF76(c19); + callF95(c19); + callF114(c19); + callF133(c19); + callF152(c19); + callF171(c19); + callF190(c19); + callF209(c19); + callF228(c19); + callF247(c19); + callF266(c19); + callF285(c19); + callF304(c19); + callF323(c19); + callF342(c19); + callF361(c19); + } + + @Test + public void timeConflictDepth01() { + C0 c0 = new C0(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + callF0(c0); + } + } + + @Test + public void timeConflictDepth02() { + C1 c1 = new C1(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + callF0(c1); + callF19(c1); + } + } + + @Test + public void timeConflictDepth03() { + C2 c2 = new C2(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + callF38(c2); + callF0(c2); + callF19(c2); + } + } + + @Test + public void timeConflictDepth04() { + C3 c3 = new C3(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + callF0(c3); + callF19(c3); + callF38(c3); + callF57(c3); + } + } + + @Test + public void timeConflictDepth05() { + C4 c4 = new C4(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c4); + callF19(c4); + callF38(c4); + callF57(c4); + callF76(c4); + callF0(c4); + callF19(c4); + callF38(c4); + callF57(c4); + callF76(c4); + callF0(c4); + callF19(c4); + callF38(c4); + callF57(c4); + callF76(c4); + callF0(c4); + callF19(c4); + callF38(c4); + callF57(c4); + callF76(c4); + } + } + + @Test + public void timeConflictDepth06() { + C5 c5 = new C5(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c5); + callF19(c5); + callF38(c5); + callF57(c5); + callF76(c5); + callF95(c5); + callF0(c5); + callF19(c5); + callF38(c5); + callF57(c5); + callF76(c5); + callF95(c5); + callF0(c5); + callF19(c5); + callF38(c5); + callF57(c5); + callF76(c5); + callF95(c5); + callF0(c5); + callF19(c5); + } + } + + @Test + public void timeConflictDepth07() { + C6 c6 = new C6(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c6); + callF19(c6); + callF38(c6); + callF57(c6); + callF76(c6); + callF95(c6); + callF114(c6); + callF0(c6); + callF19(c6); + callF38(c6); + callF57(c6); + callF76(c6); + callF95(c6); + callF114(c6); + callF0(c6); + callF19(c6); + callF38(c6); + callF57(c6); + callF76(c6); + callF95(c6); + } + } + + @Test + public void timeConflictDepth08() { + C7 c7 = new C7(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c7); + callF19(c7); + callF38(c7); + callF57(c7); + callF76(c7); + callF95(c7); + callF114(c7); + callF133(c7); + callF0(c7); + callF19(c7); + callF38(c7); + callF57(c7); + callF76(c7); + callF95(c7); + callF114(c7); + callF133(c7); + callF0(c7); + callF19(c7); + callF38(c7); + callF57(c7); + } + } + + @Test + public void timeConflictDepth09() { + C8 c8 = new C8(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c8); + callF19(c8); + callF38(c8); + callF57(c8); + callF76(c8); + callF95(c8); + callF114(c8); + callF133(c8); + callF152(c8); + callF0(c8); + callF19(c8); + callF38(c8); + callF57(c8); + callF76(c8); + callF95(c8); + callF114(c8); + callF133(c8); + callF152(c8); + callF0(c8); + callF19(c8); + } + } + + @Test + public void timeConflictDepth10() { + C9 c9 = new C9(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c9); + callF19(c9); + callF38(c9); + callF57(c9); + callF76(c9); + callF95(c9); + callF114(c9); + callF133(c9); + callF152(c9); + callF171(c9); + callF0(c9); + callF19(c9); + callF38(c9); + callF57(c9); + callF76(c9); + callF95(c9); + callF114(c9); + callF133(c9); + callF152(c9); + callF171(c9); + } + } + + @Test + public void timeConflictDepth11() { + C10 c10 = new C10(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c10); + callF19(c10); + callF38(c10); + callF57(c10); + callF76(c10); + callF95(c10); + callF114(c10); + callF133(c10); + callF152(c10); + callF171(c10); + callF190(c10); + callF0(c10); + callF19(c10); + callF38(c10); + callF57(c10); + callF76(c10); + callF95(c10); + callF114(c10); + callF133(c10); + callF152(c10); + } + } + + @Test + public void timeConflictDepth12() { + C11 c11 = new C11(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c11); + callF19(c11); + callF38(c11); + callF57(c11); + callF76(c11); + callF95(c11); + callF114(c11); + callF133(c11); + callF152(c11); + callF171(c11); + callF190(c11); + callF209(c11); + callF0(c11); + callF19(c11); + callF38(c11); + callF57(c11); + callF76(c11); + callF95(c11); + callF114(c11); + callF133(c11); + } + } + + @Test + public void timeConflictDepth13() { + C12 c12 = new C12(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c12); + callF19(c12); + callF38(c12); + callF57(c12); + callF76(c12); + callF95(c12); + callF114(c12); + callF133(c12); + callF152(c12); + callF171(c12); + callF190(c12); + callF209(c12); + callF228(c12); + callF0(c12); + callF19(c12); + callF38(c12); + callF57(c12); + callF76(c12); + callF95(c12); + callF114(c12); + } + } + + @Test + public void timeConflictDepth14() { + C13 c13 = new C13(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c13); + callF19(c13); + callF38(c13); + callF57(c13); + callF76(c13); + callF95(c13); + callF114(c13); + callF133(c13); + callF152(c13); + callF171(c13); + callF190(c13); + callF209(c13); + callF228(c13); + callF247(c13); + callF0(c13); + callF19(c13); + callF38(c13); + callF57(c13); + callF76(c13); + callF95(c13); + } + } + + @Test + public void timeConflictDepth15() { + C14 c14 = new C14(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c14); + callF19(c14); + callF38(c14); + callF57(c14); + callF76(c14); + callF95(c14); + callF114(c14); + callF133(c14); + callF152(c14); + callF171(c14); + callF190(c14); + callF209(c14); + callF228(c14); + callF247(c14); + callF266(c14); + callF0(c14); + callF19(c14); + callF38(c14); + callF57(c14); + callF76(c14); + } + } + + @Test + public void timeConflictDepth16() { + C15 c15 = new C15(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c15); + callF19(c15); + callF38(c15); + callF57(c15); + callF76(c15); + callF95(c15); + callF114(c15); + callF133(c15); + callF152(c15); + callF171(c15); + callF190(c15); + callF209(c15); + callF228(c15); + callF247(c15); + callF266(c15); + callF285(c15); + callF0(c15); + callF19(c15); + callF38(c15); + callF57(c15); + } + } + + @Test + public void timeConflictDepth17() { + C16 c16 = new C16(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c16); + callF19(c16); + callF38(c16); + callF57(c16); + callF76(c16); + callF95(c16); + callF114(c16); + callF133(c16); + callF152(c16); + callF171(c16); + callF190(c16); + callF209(c16); + callF228(c16); + callF247(c16); + callF266(c16); + callF285(c16); + callF304(c16); + callF0(c16); + callF19(c16); + callF38(c16); + } + } + + @Test + public void timeConflictDepth18() { + C17 c17 = new C17(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c17); + callF19(c17); + callF38(c17); + callF57(c17); + callF76(c17); + callF95(c17); + callF114(c17); + callF133(c17); + callF152(c17); + callF171(c17); + callF190(c17); + callF209(c17); + callF228(c17); + callF247(c17); + callF266(c17); + callF285(c17); + callF304(c17); + callF323(c17); + callF0(c17); + callF19(c17); + } + } + + @Test + public void timeConflictDepth19() { + C18 c18 = new C18(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c18); + callF19(c18); + callF38(c18); + callF57(c18); + callF76(c18); + callF95(c18); + callF114(c18); + callF133(c18); + callF152(c18); + callF171(c18); + callF190(c18); + callF209(c18); + callF228(c18); + callF247(c18); + callF266(c18); + callF285(c18); + callF304(c18); + callF323(c18); + callF342(c18); + callF0(c18); + } + } + + @Test + public void timeConflictDepth20() { + C19 c19 = new C19(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + callF0(c19); + callF19(c19); + callF38(c19); + callF57(c19); + callF76(c19); + callF95(c19); + callF114(c19); + callF133(c19); + callF152(c19); + callF171(c19); + callF190(c19); + callF209(c19); + callF228(c19); + callF247(c19); + callF266(c19); + callF285(c19); + callF304(c19); + callF323(c19); + callF342(c19); + callF361(c19); + } + } + + public void callF0(I0 i) { + i.f0(); + } + + public void callF19(I1 i) { + i.f19(); + } + + public void callF38(I2 i) { + i.f38(); + } + + public void callF57(I3 i) { + i.f57(); + } + + public void callF76(I4 i) { + i.f76(); + } + + public void callF95(I5 i) { + i.f95(); + } + + public void callF114(I6 i) { + i.f114(); + } + + public void callF133(I7 i) { + i.f133(); + } + + public void callF152(I8 i) { + i.f152(); + } + + public void callF171(I9 i) { + i.f171(); + } + + public void callF190(I10 i) { + i.f190(); + } + + public void callF209(I11 i) { + i.f209(); + } + + public void callF228(I12 i) { + i.f228(); + } + + public void callF247(I13 i) { + i.f247(); + } + + public void callF266(I14 i) { + i.f266(); + } + + public void callF285(I15 i) { + i.f285(); + } + + public void callF304(I16 i) { + i.f304(); + } + + public void callF323(I17 i) { + i.f323(); + } + + public void callF342(I18 i) { + i.f342(); + } + + public void callF361(I19 i) { + i.f361(); + } + + static class C0 implements I0 {} + + static class C1 implements I0, I1 {} + + static class C2 implements I0, I1, I2 {} + + static class C3 implements I0, I1, I2, I3 {} + + static class C4 implements I0, I1, I2, I3, I4 {} + + static class C5 implements I0, I1, I2, I3, I4, I5 {} + + static class C6 implements I0, I1, I2, I3, I4, I5, I6 {} + + static class C7 implements I0, I1, I2, I3, I4, I5, I6, I7 {} + + static class C8 implements I0, I1, I2, I3, I4, I5, I6, I7, I8 {} + + static class C9 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9 {} + + static class C10 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10 {} + + static class C11 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11 {} + + static class C12 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12 {} + + static class C13 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13 {} + + static class C14 implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14 {} + + static class C15 + implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15 {} + + static class C16 + implements I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15, I16 {} + + static class C17 + implements I0, + I1, + I2, + I3, + I4, + I5, + I6, + I7, + I8, + I9, + I10, + I11, + I12, + I13, + I14, + I15, + I16, + I17 {} + + static class C18 + implements I0, + I1, + I2, + I3, + I4, + I5, + I6, + I7, + I8, + I9, + I10, + I11, + I12, + I13, + I14, + I15, + I16, + I17, + I18 {} + + static class C19 + implements I0, + I1, + I2, + I3, + I4, + I5, + I6, + I7, + I8, + I9, + I10, + I11, + I12, + I13, + I14, + I15, + I16, + I17, + I18, + I19 {} + + interface I0 { + default void f0() {} + + default void f1() {} + + default void f2() {} + + default void f3() {} + + default void f4() {} + + default void f5() {} + + default void f6() {} + + default void f7() {} + + default void f8() {} + + default void f9() {} + + default void f10() {} + + default void f11() {} + + default void f12() {} + + default void f13() {} + + default void f14() {} + + default void f15() {} + + default void f16() {} + + default void f17() {} + + default void f18() {} + } + + interface I1 { + default void f19() {} + + default void f20() {} + + default void f21() {} + + default void f22() {} + + default void f23() {} + + default void f24() {} + + default void f25() {} + + default void f26() {} + + default void f27() {} + + default void f28() {} + + default void f29() {} + + default void f30() {} + + default void f31() {} + + default void f32() {} + + default void f33() {} + + default void f34() {} + + default void f35() {} + + default void f36() {} + + default void f37() {} + } + + interface I2 { + default void f38() {} + + default void f39() {} + + default void f40() {} + + default void f41() {} + + default void f42() {} + + default void f43() {} + + default void f44() {} + + default void f45() {} + + default void f46() {} + + default void f47() {} + + default void f48() {} + + default void f49() {} + + default void f50() {} + + default void f51() {} + + default void f52() {} + + default void f53() {} + + default void f54() {} + + default void f55() {} + + default void f56() {} + } + + interface I3 { + default void f57() {} + + default void f58() {} + + default void f59() {} + + default void f60() {} + + default void f61() {} + + default void f62() {} + + default void f63() {} + + default void f64() {} + + default void f65() {} + + default void f66() {} + + default void f67() {} + + default void f68() {} + + default void f69() {} + + default void f70() {} + + default void f71() {} + + default void f72() {} + + default void f73() {} + + default void f74() {} + + default void f75() {} + } + + interface I4 { + default void f76() {} + + default void f77() {} + + default void f78() {} + + default void f79() {} + + default void f80() {} + + default void f81() {} + + default void f82() {} + + default void f83() {} + + default void f84() {} + + default void f85() {} + + default void f86() {} + + default void f87() {} + + default void f88() {} + + default void f89() {} + + default void f90() {} + + default void f91() {} + + default void f92() {} + + default void f93() {} + + default void f94() {} + } + + interface I5 { + default void f95() {} + + default void f96() {} + + default void f97() {} + + default void f98() {} + + default void f99() {} + + default void f100() {} + + default void f101() {} + + default void f102() {} + + default void f103() {} + + default void f104() {} + + default void f105() {} + + default void f106() {} + + default void f107() {} + + default void f108() {} + + default void f109() {} + + default void f110() {} + + default void f111() {} + + default void f112() {} + + default void f113() {} + } + + interface I6 { + default void f114() {} + + default void f115() {} + + default void f116() {} + + default void f117() {} + + default void f118() {} + + default void f119() {} + + default void f120() {} + + default void f121() {} + + default void f122() {} + + default void f123() {} + + default void f124() {} + + default void f125() {} + + default void f126() {} + + default void f127() {} + + default void f128() {} + + default void f129() {} + + default void f130() {} + + default void f131() {} + + default void f132() {} + } + + interface I7 { + default void f133() {} + + default void f134() {} + + default void f135() {} + + default void f136() {} + + default void f137() {} + + default void f138() {} + + default void f139() {} + + default void f140() {} + + default void f141() {} + + default void f142() {} + + default void f143() {} + + default void f144() {} + + default void f145() {} + + default void f146() {} + + default void f147() {} + + default void f148() {} + + default void f149() {} + + default void f150() {} + + default void f151() {} + } + + interface I8 { + default void f152() {} + + default void f153() {} + + default void f154() {} + + default void f155() {} + + default void f156() {} + + default void f157() {} + + default void f158() {} + + default void f159() {} + + default void f160() {} + + default void f161() {} + + default void f162() {} + + default void f163() {} + + default void f164() {} + + default void f165() {} + + default void f166() {} + + default void f167() {} + + default void f168() {} + + default void f169() {} + + default void f170() {} + } + + interface I9 { + default void f171() {} + + default void f172() {} + + default void f173() {} + + default void f174() {} + + default void f175() {} + + default void f176() {} + + default void f177() {} + + default void f178() {} + + default void f179() {} + + default void f180() {} + + default void f181() {} + + default void f182() {} + + default void f183() {} + + default void f184() {} + + default void f185() {} + + default void f186() {} + + default void f187() {} + + default void f188() {} + + default void f189() {} + } + + interface I10 { + default void f190() {} + + default void f191() {} + + default void f192() {} + + default void f193() {} + + default void f194() {} + + default void f195() {} + + default void f196() {} + + default void f197() {} + + default void f198() {} + + default void f199() {} + + default void f200() {} + + default void f201() {} + + default void f202() {} + + default void f203() {} + + default void f204() {} + + default void f205() {} + + default void f206() {} + + default void f207() {} + + default void f208() {} + } + + interface I11 { + default void f209() {} + + default void f210() {} + + default void f211() {} + + default void f212() {} + + default void f213() {} + + default void f214() {} + + default void f215() {} + + default void f216() {} + + default void f217() {} + + default void f218() {} + + default void f219() {} + + default void f220() {} + + default void f221() {} + + default void f222() {} + + default void f223() {} + + default void f224() {} + + default void f225() {} + + default void f226() {} + + default void f227() {} + } + + interface I12 { + default void f228() {} + + default void f229() {} + + default void f230() {} + + default void f231() {} + + default void f232() {} + + default void f233() {} + + default void f234() {} + + default void f235() {} + + default void f236() {} + + default void f237() {} + + default void f238() {} + + default void f239() {} + + default void f240() {} + + default void f241() {} + + default void f242() {} + + default void f243() {} + + default void f244() {} + + default void f245() {} + + default void f246() {} + } + + interface I13 { + default void f247() {} + + default void f248() {} + + default void f249() {} + + default void f250() {} + + default void f251() {} + + default void f252() {} + + default void f253() {} + + default void f254() {} + + default void f255() {} + + default void f256() {} + + default void f257() {} + + default void f258() {} + + default void f259() {} + + default void f260() {} + + default void f261() {} + + default void f262() {} + + default void f263() {} + + default void f264() {} + + default void f265() {} + } + + interface I14 { + default void f266() {} + + default void f267() {} + + default void f268() {} + + default void f269() {} + + default void f270() {} + + default void f271() {} + + default void f272() {} + + default void f273() {} + + default void f274() {} + + default void f275() {} + + default void f276() {} + + default void f277() {} + + default void f278() {} + + default void f279() {} + + default void f280() {} + + default void f281() {} + + default void f282() {} + + default void f283() {} + + default void f284() {} + } + + interface I15 { + default void f285() {} + + default void f286() {} + + default void f287() {} + + default void f288() {} + + default void f289() {} + + default void f290() {} + + default void f291() {} + + default void f292() {} + + default void f293() {} + + default void f294() {} + + default void f295() {} + + default void f296() {} + + default void f297() {} + + default void f298() {} + + default void f299() {} + + default void f300() {} + + default void f301() {} + + default void f302() {} + + default void f303() {} + } + + interface I16 { + default void f304() {} + + default void f305() {} + + default void f306() {} + + default void f307() {} + + default void f308() {} + + default void f309() {} + + default void f310() {} + + default void f311() {} + + default void f312() {} + + default void f313() {} + + default void f314() {} + + default void f315() {} + + default void f316() {} + + default void f317() {} + + default void f318() {} + + default void f319() {} + + default void f320() {} + + default void f321() {} + + default void f322() {} + } + + interface I17 { + default void f323() {} + + default void f324() {} + + default void f325() {} + + default void f326() {} + + default void f327() {} + + default void f328() {} + + default void f329() {} + + default void f330() {} + + default void f331() {} + + default void f332() {} + + default void f333() {} + + default void f334() {} + + default void f335() {} + + default void f336() {} + + default void f337() {} + + default void f338() {} + + default void f339() {} + + default void f340() {} + + default void f341() {} + } + + interface I18 { + default void f342() {} + + default void f343() {} + + default void f344() {} + + default void f345() {} + + default void f346() {} + + default void f347() {} + + default void f348() {} + + default void f349() {} + + default void f350() {} + + default void f351() {} + + default void f352() {} + + default void f353() {} + + default void f354() {} + + default void f355() {} + + default void f356() {} + + default void f357() {} + + default void f358() {} + + default void f359() {} + + default void f360() {} + } + + interface I19 { + default void f361() {} + + default void f362() {} + + default void f363() {} + + default void f364() {} + + default void f365() {} + + default void f366() {} + + default void f367() {} + + default void f368() {} + + default void f369() {} + + default void f370() {} + + default void f371() {} + + default void f372() {} + + default void f373() {} + + default void f374() {} + + default void f375() {} + + default void f376() {} + + default void f377() {} + + default void f378() {} + + default void f379() {} + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTestGen.py b/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTestGen.py new file mode 100755 index 000000000000..eea3b84a4498 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ImtConflictPerfTestGen.py @@ -0,0 +1,121 @@ +#!/usr/bin/env python3 +# +# 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. +# + +import sys + +max_conflict_depth = 20 # In practice does not go above 20 for reasonable IMT sizes +try: + imt_size = int(sys.argv[1]) +except (IndexError, ValueError): + print("Usage: python ImtConflictPerfTestGen.py <IMT_SIZE>") + sys.exit(1) + +license = """\ +/* + * 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. + */ +""" +description = """ +/** + * This file is script-generated by ImtConflictPerfTestGen.py. + * It measures the performance impact of conflicts in interface method tables. + * Run `python ImtConflictPerfTestGen.py > ImtConflictPerfTest.java` to regenerate. + * + * Each interface has 64 methods, which is the current size of an IMT. C0 implements + * one interface, C1 implements two, C2 implements three, and so on. The intent + * is that C0 has no conflicts in its IMT, C1 has depth-2 conflicts in + * its IMT, C2 has depth-3 conflicts, etc. This is currently guaranteed by + * the fact that we hash interface methods by taking their method index modulo 64. + * (Note that a "conflict depth" of 1 means no conflict at all.) + */\ +""" + +print(license) +print("package android.libcore;") +imports = """ +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +""" +print(imports) +print(description) + +print("@RunWith(AndroidJUnit4.class)") +print("@LargeTest") +print("public class ImtConflictPerfTest {") +print(" @Rule") +print(" public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();") +print("") +# Warm up interface method tables +print(" @Before") +print(" public void setup() {") +for i in range(max_conflict_depth): + print(" C{0} c{0} = new C{0}();".format(i)) + for j in range(i+1): + print(" callF{}(c{});".format(imt_size * j, i)) +print(" }") + +# Print test cases--one for each conflict depth +for i in range(max_conflict_depth): + print(" @Test") + print(" public void timeConflictDepth{:02d}() {{".format(i+1)) + print(" C{0} c{0} = new C{0}();".format(i)) + print(" BenchmarkState state = mPerfStatusReporter.getBenchmarkState();") + print(" while (state.keepRunning()) {") + # Cycle through each interface method in an IMT entry in order + # to test all conflict resolution possibilities + for j in range(max_conflict_depth): + print(" callF{}(c{});".format(imt_size * (j % (i + 1)), i)) + print(" }") + print(" }") + +# Make calls through the IMTs +for i in range(max_conflict_depth): + print(" public void callF{0}(I{1} i) {{ i.f{0}(); }}".format(imt_size*i, i)) + +# Class definitions, implementing varying amounts of interfaces +for i in range(max_conflict_depth): + interfaces = ", ".join(["I{}".format(j) for j in range(i+1)]) + print(" static class C{} implements {} {{}}".format(i, interfaces)) + +# Interface definitions, each with enough methods to fill an entire IMT +for i in range(max_conflict_depth): + print(" interface I{} {{".format(i)) + for j in range(imt_size): + print(" default void f{}() {{}}".format(i*imt_size + j)) + print(" }") + +print("}")
\ No newline at end of file diff --git a/apct-tests/perftests/core/src/android/libcore/MethodInvocationPerfTest.java b/apct-tests/perftests/core/src/android/libcore/MethodInvocationPerfTest.java new file mode 100644 index 000000000000..ca9977974a8a --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/MethodInvocationPerfTest.java @@ -0,0 +1,182 @@ +/* + * 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. + */ + +package android.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Compares various kinds of method invocation. */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class MethodInvocationPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + interface I { + void emptyInterface(); + } + + static class C implements I { + private int mField; + + private int getField() { + return mField; + } + + public void timeInternalGetter(BenchmarkState state) { + int result = 0; + while (state.keepRunning()) { + result = getField(); + } + } + + public void timeInternalFieldAccess(BenchmarkState state) { + int result = 0; + while (state.keepRunning()) { + result = mField; + } + } + + public static void emptyStatic() {} + + public void emptyVirtual() {} + + public void emptyInterface() {} + } + + public void timeInternalGetter() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + new C().timeInternalGetter(state); + } + + public void timeInternalFieldAccess() { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + new C().timeInternalFieldAccess(state); + } + + // Test an intrinsic. + @Test + public void timeStringLength() { + int result = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result = "hello, world!".length(); + } + } + + @Test + public void timeEmptyStatic() { + C c = new C(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + c.emptyStatic(); + } + } + + @Test + public void timeEmptyVirtual() { + C c = new C(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + c.emptyVirtual(); + } + } + + @Test + public void timeEmptyInterface() { + I c = new C(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + c.emptyInterface(); + } + } + + public static class Inner { + private int mI; + + private void privateMethod() { + ++mI; + } + + protected void protectedMethod() { + ++mI; + } + + public void publicMethod() { + ++mI; + } + + void packageMethod() { + ++mI; + } + + final void finalPackageMethod() { + ++mI; + } + } + + @Test + public void timePrivateInnerPublicMethod() { + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + inner.publicMethod(); + } + } + + @Test + public void timePrivateInnerProtectedMethod() { + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + inner.protectedMethod(); + } + } + + @Test + public void timePrivateInnerPrivateMethod() { + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + inner.privateMethod(); + } + } + + @Test + public void timePrivateInnerPackageMethod() { + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + inner.packageMethod(); + } + } + + @Test + public void timePrivateInnerFinalPackageMethod() { + Inner inner = new Inner(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + inner.finalPackageMethod(); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/MultiplicationPerfTest.java b/apct-tests/perftests/core/src/android/libcore/MultiplicationPerfTest.java new file mode 100644 index 000000000000..8496fbecb6bd --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/MultiplicationPerfTest.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** How much do various kinds of multiplication cost? */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class MultiplicationPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Test + public void timeMultiplyIntByConstant10() { + int result = 1; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result *= 10; + } + } + + @Test + public void timeMultiplyIntByConstant8() { + int result = 1; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result *= 8; + } + } + + @Test + public void timeMultiplyIntByVariable10() { + int result = 1; + int factor = 10; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result *= factor; + } + } + + @Test + public void timeMultiplyIntByVariable8() { + int result = 1; + int factor = 8; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + result *= factor; + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ReferenceGetPerfTest.java b/apct-tests/perftests/core/src/android/libcore/ReferenceGetPerfTest.java new file mode 100644 index 000000000000..bb794249e9f4 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ReferenceGetPerfTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2014 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; +import java.lang.ref.WeakReference; +import java.lang.reflect.Field; + +@RunWith(AndroidJUnit4.class) +@LargeTest +public class ReferenceGetPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + boolean mIntrinsicDisabled; + + private Object mObj = "str"; + + @Before + public void setUp() throws Exception { + Field intrinsicDisabledField = Reference.class.getDeclaredField("disableIntrinsic"); + intrinsicDisabledField.setAccessible(true); + intrinsicDisabledField.setBoolean(null, mIntrinsicDisabled); + } + + @Test + public void timeSoftReferenceGet() throws Exception { + Reference soft = new SoftReference(mObj); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + Object o = soft.get(); + } + } + + @Test + public void timeWeakReferenceGet() throws Exception { + Reference weak = new WeakReference(mObj); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + Object o = weak.get(); + } + } + + @Test + public void timeNonPreservedWeakReferenceGet() throws Exception { + Reference weak = new WeakReference(mObj); + mObj = null; + Runtime.getRuntime().gc(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + Object o = weak.get(); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ReferencePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ReferencePerfTest.java new file mode 100644 index 000000000000..2ef68ca7bdb2 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ReferencePerfTest.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2015 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.lang.ref.PhantomReference; +import java.lang.ref.ReferenceQueue; +import java.util.concurrent.atomic.AtomicInteger; + +/** Benchmark to evaluate the performance of References. */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class ReferencePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + private Object mObject; + + // How fast can references can be allocated? + @Test + public void timeAlloc() { + ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + new PhantomReference(mObject, queue); + } + } + + // How fast can references can be allocated and manually enqueued? + @Test + public void timeAllocAndEnqueue() { + ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + (new PhantomReference<Object>(mObject, queue)).enqueue(); + } + } + + // How fast can references can be allocated, enqueued, and polled? + @Test + public void timeAllocEnqueueAndPoll() { + ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + (new PhantomReference<Object>(mObject, queue)).enqueue(); + queue.poll(); + } + } + + // How fast can references can be allocated, enqueued, and removed? + @Test + public void timeAllocEnqueueAndRemove() { + ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + (new PhantomReference<Object>(mObject, queue)).enqueue(); + try { + queue.remove(); + } catch (InterruptedException ie) { + } + } + } + + private static class FinalizableObject { + AtomicInteger mCount; + + FinalizableObject(AtomicInteger count) { + this.mCount = count; + } + + @Override + protected void finalize() { + mCount.incrementAndGet(); + } + } + + // How fast does finalization run? + @Test + public void timeFinalization() { + // Allocate a bunch of finalizable objects. + int n = 0; + AtomicInteger count = new AtomicInteger(0); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + n++; + new FinalizableObject(count); + } + + // Run GC so the objects will be collected for finalization. + Runtime.getRuntime().gc(); + + // Wait for finalization. + Runtime.getRuntime().runFinalization(); + + // Double check all the objects were finalized. + int got = count.get(); + if (n != got) { + throw new IllegalStateException( + String.format("Only %i of %i objects finalized?", got, n)); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/SmallBigIntegerPerfTest.java b/apct-tests/perftests/core/src/android/libcore/SmallBigIntegerPerfTest.java new file mode 100644 index 000000000000..65a2fdbae304 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/SmallBigIntegerPerfTest.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.math.BigInteger; +import java.util.Random; + +/** + * This measures performance of operations on small BigIntegers. We manually determine the number of + * iterations so that it should cause total memory allocation on the order of a few hundred + * megabytes. Due to BigInteger's reliance on finalization, these may unfortunately all be kept + * around at once. + * + * <p>This is not structured as a proper benchmark; just run main(), e.g. with vogar + * libcore/benchmarks/src/benchmarks/SmallBigIntegerBenchmark.java + */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class SmallBigIntegerPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + // We allocate about 2 1/3 BigIntegers per iteration. + // Assuming 100 bytes/BigInteger, this gives us around 500MB total. + static final BigInteger BIG_THREE = BigInteger.valueOf(3); + static final BigInteger BIG_FOUR = BigInteger.valueOf(4); + + @Test + public void testSmallBigInteger() { + final Random r = new Random(); + BigInteger x = new BigInteger(20, r); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + // We know this converges, but the compiler doesn't. + if (x.and(BigInteger.ONE).equals(BigInteger.ONE)) { + x = x.multiply(BIG_THREE).add(BigInteger.ONE); + } else { + x = x.shiftRight(1); + } + } + if (x.signum() < 0 || x.compareTo(BIG_FOUR) > 0) { + throw new AssertionError("Something went horribly wrong."); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/StringDexCachePerfTest.java b/apct-tests/perftests/core/src/android/libcore/StringDexCachePerfTest.java new file mode 100644 index 000000000000..4f5c54d6a847 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/StringDexCachePerfTest.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** How long does it take to access a string in the dex cache? */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class StringDexCachePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Test + public void timeStringDexCacheAccess() { + int v = 0; + int count = 0; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + // Deliberately obscured to make optimizations less likely. + String s = (count >= 0) ? "hello, world!" : null; + v += s.length(); + ++count; + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/StringIterationPerfTest.java b/apct-tests/perftests/core/src/android/libcore/StringIterationPerfTest.java new file mode 100644 index 000000000000..08ad92694013 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/StringIterationPerfTest.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** How do the various schemes for iterating through a string compare? */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class StringIterationPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Test + public void timeStringIteration0() { + String s = "hello, world!"; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + char ch; + for (int i = 0; i < s.length(); ++i) { + ch = s.charAt(i); + } + } + } + + @Test + public void timeStringIteration1() { + String s = "hello, world!"; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + char ch; + for (int i = 0, length = s.length(); i < length; ++i) { + ch = s.charAt(i); + } + } + } + + @Test + public void timeStringIteration2() { + String s = "hello, world!"; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + char ch; + char[] chars = s.toCharArray(); + for (int i = 0, length = chars.length; i < length; ++i) { + ch = chars[i]; + } + } + } + + @Test + public void timeStringToCharArray() { + String s = "hello, world!"; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + char[] chars = s.toCharArray(); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/SystemArrayCopyPerfTest.java b/apct-tests/perftests/core/src/android/libcore/SystemArrayCopyPerfTest.java new file mode 100644 index 000000000000..5aacfc25bfd1 --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/SystemArrayCopyPerfTest.java @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; + +@RunWith(Parameterized.class) +@LargeTest +public class SystemArrayCopyPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Parameters(name = "arrayLength={0}") + public static Collection<Object[]> data() { + return Arrays.asList( + new Object[][] { + {2}, {4}, {8}, {16}, {32}, {64}, {128}, {256}, {512}, {1024}, {2048}, {4096}, + {8192}, {16384}, {32768}, {65536}, {131072}, {262144} + }); + } + + @Parameterized.Parameter(0) + public int arrayLength; + + // Provides benchmarking for different types of arrays using the arraycopy function. + @Test + public void timeSystemCharArrayCopy() { + final int len = arrayLength; + char[] src = new char[len]; + char[] dst = new char[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemByteArrayCopy() { + final int len = arrayLength; + byte[] src = new byte[len]; + byte[] dst = new byte[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemShortArrayCopy() { + final int len = arrayLength; + short[] src = new short[len]; + short[] dst = new short[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemIntArrayCopy() { + final int len = arrayLength; + int[] src = new int[len]; + int[] dst = new int[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemLongArrayCopy() { + final int len = arrayLength; + long[] src = new long[len]; + long[] dst = new long[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemFloatArrayCopy() { + final int len = arrayLength; + float[] src = new float[len]; + float[] dst = new float[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemDoubleArrayCopy() { + final int len = arrayLength; + double[] src = new double[len]; + double[] dst = new double[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } + + @Test + public void timeSystemBooleanArrayCopy() { + final int len = arrayLength; + boolean[] src = new boolean[len]; + boolean[] dst = new boolean[len]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + System.arraycopy(src, 0, dst, 0, len); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/VirtualVersusInterfacePerfTest.java b/apct-tests/perftests/core/src/android/libcore/VirtualVersusInterfacePerfTest.java new file mode 100644 index 000000000000..7e71976fdc9d --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/VirtualVersusInterfacePerfTest.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.HashMap; +import java.util.Map; + +/** + * Is there a performance reason to "Prefer virtual over interface", as the Android documentation + * once claimed? + */ +@RunWith(AndroidJUnit4.class) +@LargeTest +public class VirtualVersusInterfacePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Test + public void timeMapPut() { + Map<String, String> map = new HashMap<String, String>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.put("hello", "world"); + } + } + + @Test + public void timeHashMapPut() { + HashMap<String, String> map = new HashMap<String, String>(); + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + map.put("hello", "world"); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/XmlSerializePerfTest.java b/apct-tests/perftests/core/src/android/libcore/XmlSerializePerfTest.java new file mode 100644 index 000000000000..eec0734cffda --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/XmlSerializePerfTest.java @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2022 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.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import org.xmlpull.v1.XmlSerializer; + +import java.io.CharArrayWriter; +import java.lang.reflect.Constructor; +import java.util.Arrays; +import java.util.Collection; +import java.util.Random; + +@RunWith(Parameterized.class) +@LargeTest +public class XmlSerializePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Parameters(name = "mDatasetAsString({0}), mSeed({1})") + public static Collection<Object[]> data() { + return Arrays.asList( + new Object[][] { + {"0.99 0.7 0.7 0.7 0.7 0.7", 854328}, + {"0.999 0.3 0.3 0.95 0.9 0.9", 854328}, + {"0.99 0.7 0.7 0.7 0.7 0.7", 312547}, + {"0.999 0.3 0.3 0.95 0.9 0.9", 312547} + }); + } + + @Parameterized.Parameter(0) + public String mDatasetAsString; + + @Parameterized.Parameter(1) + public int mSeed; + + double[] mDataset; + private Constructor<? extends XmlSerializer> mKxmlConstructor; + private Constructor<? extends XmlSerializer> mFastConstructor; + + private void serializeRandomXml(Constructor<? extends XmlSerializer> ctor, long mSeed) + throws Exception { + double contChance = mDataset[0]; + double levelUpChance = mDataset[1]; + double levelDownChance = mDataset[2]; + double attributeChance = mDataset[3]; + double writeChance1 = mDataset[4]; + double writeChance2 = mDataset[5]; + + XmlSerializer serializer = (XmlSerializer) ctor.newInstance(); + + CharArrayWriter w = new CharArrayWriter(); + serializer.setOutput(w); + int level = 0; + Random r = new Random(mSeed); + char[] toWrite = {'a', 'b', 'c', 'd', 's', 'z'}; + serializer.startDocument("UTF-8", true); + while (r.nextDouble() < contChance) { + while (level > 0 && r.nextDouble() < levelUpChance) { + serializer.endTag("aaaaaa", "bbbbbb"); + level--; + } + while (r.nextDouble() < levelDownChance) { + serializer.startTag("aaaaaa", "bbbbbb"); + level++; + } + serializer.startTag("aaaaaa", "bbbbbb"); + level++; + while (r.nextDouble() < attributeChance) { + serializer.attribute("aaaaaa", "cccccc", "dddddd"); + } + serializer.endTag("aaaaaa", "bbbbbb"); + level--; + while (r.nextDouble() < writeChance1) serializer.text(toWrite, 0, 5); + while (r.nextDouble() < writeChance2) serializer.text("Textxtsxtxtxt "); + } + serializer.endDocument(); + } + + @SuppressWarnings("unchecked") + @Before + public void setUp() throws Exception { + mKxmlConstructor = + (Constructor) + Class.forName("com.android.org.kxml2.io.KXmlSerializer").getConstructor(); + mFastConstructor = + (Constructor) + Class.forName("com.android.internal.util.FastXmlSerializer") + .getConstructor(); + String[] splitStrings = mDatasetAsString.split(" "); + mDataset = new double[splitStrings.length]; + for (int i = 0; i < splitStrings.length; i++) { + mDataset[i] = Double.parseDouble(splitStrings[i]); + } + } + + private void internalTimeSerializer(Constructor<? extends XmlSerializer> ctor) + throws Exception { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + serializeRandomXml(ctor, mSeed); + } + } + + @Test + public void timeKxml() throws Exception { + internalTimeSerializer(mKxmlConstructor); + } + + @Test + public void timeFast() throws Exception { + internalTimeSerializer(mFastConstructor); + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java new file mode 100644 index 000000000000..517e3ce39d7e --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Random; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +@RunWith(Parameterized.class) +@LargeTest +public class ZipFilePerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + private File mFile; + + @Parameters(name = "numEntries={0}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] {{128}, {1024}, {8192}}); + } + + @Parameterized.Parameter(0) + public int numEntries; + + @Before + public void setUp() throws Exception { + mFile = File.createTempFile(getClass().getName(), ".zip"); + mFile.deleteOnExit(); + writeEntries(new ZipOutputStream(new FileOutputStream(mFile)), numEntries, 0); + ZipFile zipFile = new ZipFile(mFile); + for (Enumeration<? extends ZipEntry> e = zipFile.entries(); e.hasMoreElements(); ) { + ZipEntry zipEntry = e.nextElement(); + } + zipFile.close(); + } + + @Test + public void timeZipFileOpen() throws Exception { + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + ZipFile zf = new ZipFile(mFile); + } + } + + /** Compresses the given number of files, each of the given size, into a .zip archive. */ + protected void writeEntries(ZipOutputStream out, int entryCount, long entrySize) + throws IOException { + byte[] writeBuffer = new byte[8192]; + Random random = new Random(); + try { + for (int entry = 0; entry < entryCount; ++entry) { + ZipEntry ze = new ZipEntry(Integer.toHexString(entry)); + ze.setSize(entrySize); + out.putNextEntry(ze); + + for (long i = 0; i < entrySize; i += writeBuffer.length) { + random.nextBytes(writeBuffer); + int byteCount = (int) Math.min(writeBuffer.length, entrySize - i); + out.write(writeBuffer, 0, byteCount); + } + + out.closeEntry(); + } + } finally { + out.close(); + } + } +} diff --git a/apct-tests/perftests/core/src/android/libcore/ZipFileReadPerfTest.java b/apct-tests/perftests/core/src/android/libcore/ZipFileReadPerfTest.java new file mode 100644 index 000000000000..faa96285cefd --- /dev/null +++ b/apct-tests/perftests/core/src/android/libcore/ZipFileReadPerfTest.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 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. + */ + +package android.libcore; + +import android.perftests.utils.BenchmarkState; +import android.perftests.utils.PerfStatusReporter; +import android.test.suitebuilder.annotation.LargeTest; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Random; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +@RunWith(Parameterized.class) +@LargeTest +public class ZipFileReadPerfTest { + @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); + + @Parameters(name = "readBufferSize={0}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] {{1024}, {16384}, {65536}}); + } + + private File mFile; + + @Parameterized.Parameter(0) + public int readBufferSize; + + @Before + public void setUp() throws Exception { + mFile = File.createTempFile(getClass().getName(), ".zip"); + writeEntries(new ZipOutputStream(new FileOutputStream(mFile)), 2, 1024 * 1024); + ZipFile zipFile = new ZipFile(mFile); + for (Enumeration<? extends ZipEntry> e = zipFile.entries(); e.hasMoreElements(); ) { + ZipEntry zipEntry = e.nextElement(); + } + zipFile.close(); + } + + /** Compresses the given number of files, each of the given size, into a .zip archive. */ + protected void writeEntries(ZipOutputStream out, int entryCount, long entrySize) + throws IOException { + byte[] writeBuffer = new byte[8192]; + Random random = new Random(); + try { + for (int entry = 0; entry < entryCount; ++entry) { + ZipEntry ze = new ZipEntry(Integer.toHexString(entry)); + ze.setSize(entrySize); + out.putNextEntry(ze); + + for (long i = 0; i < entrySize; i += writeBuffer.length) { + random.nextBytes(writeBuffer); + int byteCount = (int) Math.min(writeBuffer.length, entrySize - i); + out.write(writeBuffer, 0, byteCount); + } + + out.closeEntry(); + } + } finally { + out.close(); + } + } + + @Test + public void timeZipFileRead() throws Exception { + byte[] readBuffer = new byte[readBufferSize]; + BenchmarkState state = mPerfStatusReporter.getBenchmarkState(); + while (state.keepRunning()) { + ZipFile zipFile = new ZipFile(mFile); + for (Enumeration<? extends ZipEntry> e = zipFile.entries(); e.hasMoreElements(); ) { + ZipEntry zipEntry = e.nextElement(); + InputStream is = zipFile.getInputStream(zipEntry); + while (true) { + if (is.read(readBuffer, 0, readBuffer.length) < 0) { + break; + } + } + } + zipFile.close(); + } + } +} diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index b9673f25d680..f49cdbf403f0 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -18,6 +18,7 @@ package android.app.job; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; @@ -240,7 +241,7 @@ public class JobInfo implements Parcelable { /** * Default value for all regular jobs. As noted in {@link JobScheduler}, - * these jobs have a general maximum execution time of 10 minutes. + * these jobs have a general execution time of 10 minutes. * Receives the standard job management policy. */ public static final int PRIORITY_DEFAULT = 300; @@ -249,7 +250,7 @@ public class JobInfo implements Parcelable { * This task should be ordered ahead of most other tasks. It may be * deferred a little, but if it doesn't run at some point, the user may think * something is wrong. Assuming all constraints remain satisfied - * (including ideal system load conditions), these jobs will have a maximum + * (including ideal system load conditions), these jobs can have an * execution time of at least 4 minutes. Setting all of your jobs to high * priority will not be beneficial to your app and in fact may hurt its * performance in the long run. @@ -259,7 +260,7 @@ public class JobInfo implements Parcelable { /** * This task should be run ahead of all other tasks. Only Expedited Jobs * {@link Builder#setExpedited(boolean)} can have this priority and as such, - * are subject to the same maximum execution time details noted in + * are subject to the same execution time details noted in * {@link Builder#setExpedited(boolean)}. * A sample task of max priority: receiving a text message and processing it to * show a notification @@ -1332,6 +1333,7 @@ public class JobInfo implements Parcelable { builder.addCapability(NET_CAPABILITY_INTERNET); builder.addCapability(NET_CAPABILITY_VALIDATED); builder.removeCapability(NET_CAPABILITY_NOT_VPN); + builder.removeCapability(NET_CAPABILITY_NOT_RESTRICTED); if (networkType == NETWORK_TYPE_ANY) { // No other capabilities @@ -1412,6 +1414,15 @@ public class JobInfo implements Parcelable { * you also need to define the network traffic used by each work item * when constructing them. * + * <p class="note"> + * Prior to Android version {@link Build.VERSION_CODES#TIRAMISU}, JobScheduler used the + * estimated transfer numbers in a similar fashion to + * {@link #setMinimumNetworkChunkBytes(long)} (to estimate if the work would complete + * within the time available to job). In other words, JobScheduler treated the transfer as + * all-or-nothing. Starting from Android version {@link Build.VERSION_CODES#TIRAMISU}, + * JobScheduler will only use the estimated transfer numbers in this manner if minimum + * chunk sizes have not been provided via {@link #setMinimumNetworkChunkBytes(long)}. + * * @param downloadBytes The estimated size of network traffic that will * be downloaded by this job, in bytes. * @param uploadBytes The estimated size of network traffic that will be @@ -1754,14 +1765,19 @@ public class JobInfo implements Parcelable { * * <p> * Assuming all constraints remain satisfied (including ideal system load conditions), - * expedited jobs will have a maximum execution time of at least 1 minute. If your + * expedited jobs can have an execution time of at least 1 minute. If your * app has remaining expedited job quota, then the expedited job <i>may</i> potentially run * longer until remaining quota is used up. Just like with regular jobs, quota is not * consumed while the app is on top and visible to the user. * - * <p> + * <p class="note"> * Note: Even though expedited jobs are meant to run as soon as possible, they may be * deferred if the system is under heavy load or requested constraints are not satisfied. + * This delay may be true for expedited jobs of the foreground app on Android version + * {@link Build.VERSION_CODES#S}, but starting from Android version + * {@link Build.VERSION_CODES#TIRAMISU}, expedited jobs for the foreground app are + * guaranteed to be started before {@link JobScheduler#schedule(JobInfo)} returns (assuming + * all requested constraints are satisfied), similar to foreground services. * * @see JobInfo#isExpedited() */ @@ -1797,6 +1813,9 @@ public class JobInfo implements Parcelable { * and in the background, or the job failed due to unsatisfied constraints, * this job should be expected to behave like other jobs without this flag. * + * <p> + * Jobs marked as important-while-foreground are given {@link #PRIORITY_HIGH} by default. + * * @param importantWhileForeground whether to relax doze restrictions for this job when the * app is in the foreground. False by default. * @see JobInfo#isImportantWhileForeground() @@ -1829,8 +1848,9 @@ public class JobInfo implements Parcelable { * the specific user of this device. For example, fetching top headlines * of interest to the current user. * <p> - * Starting with Android version {@link Build.VERSION_CODES#TIRAMISU}, prefetch jobs are - * not allowed to have deadlines (set via {@link #setOverrideDeadline(long)}. + * Apps targeting Android version {@link Build.VERSION_CODES#TIRAMISU} or later are + * not allowed to have deadlines (set via {@link #setOverrideDeadline(long)} on their + * prefetch jobs. * <p> * The system may use this signal to relax the network constraints you * originally requested, such as allowing a diff --git a/apex/jobscheduler/framework/java/android/app/job/JobParameters.java b/apex/jobscheduler/framework/java/android/app/job/JobParameters.java index 1429c45ef2d2..ed72530d8608 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobParameters.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobParameters.java @@ -167,7 +167,7 @@ public class JobParameters implements Parcelable { /** * The job used up its maximum execution time and timed out. Each individual job has a maximum * execution time limit, regardless of how much total quota the app has. See the note on - * {@link JobScheduler} for the execution time limits. + * {@link JobScheduler} and {@link JobInfo} for the execution time limits. */ public static final int STOP_REASON_TIMEOUT = 3; /** diff --git a/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java b/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java index dd0d07f68547..c3fc7b16ebdf 100644 --- a/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java +++ b/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java @@ -16,8 +16,10 @@ package android.app.tare; +import android.annotation.Nullable; import android.annotation.SystemService; import android.content.Context; +import android.util.Log; /** * Provides access to the resource economy service. @@ -26,6 +28,69 @@ import android.content.Context; */ @SystemService(Context.RESOURCE_ECONOMY_SERVICE) public class EconomyManager { + private static final String TAG = "TARE-" + EconomyManager.class.getSimpleName(); + + /** + * 1 ARC = 1 GIGA-CAKE! + * + * @hide + */ + public static final long CAKE_IN_ARC = 1_000_000_000L; + + /** @hide */ + public static long arcToCake(int arcs) { + return arcs * CAKE_IN_ARC; + } + + /** + * Parses a configuration string to get the value in cakes. + * + * @hide + */ + public static long parseCreditValue(@Nullable final String val, final long defaultValCakes) { + String trunc; + if (val == null || (trunc = val.trim()).isEmpty()) { + return defaultValCakes; + } + long multiplier; + if (trunc.endsWith("c")) { + trunc = trunc.substring(0, trunc.length() - 1); + multiplier = 1; + } else if (trunc.endsWith("ck")) { + trunc = trunc.substring(0, trunc.length() - 2); + multiplier = 1; + } else if (trunc.endsWith("A")) { + trunc = trunc.substring(0, trunc.length() - 1); + multiplier = CAKE_IN_ARC; + } else if (trunc.endsWith("ARC")) { + trunc = trunc.substring(0, trunc.length() - 3); + multiplier = CAKE_IN_ARC; + } else { + // Don't risk using the wrong units + Log.e(TAG, "Couldn't determine units of credit value: " + val); + return defaultValCakes; + } + + // Allow people to shorten notation (eg. Mc for Megacake). + if (trunc.endsWith("k")) { + trunc = trunc.substring(0, trunc.length() - 1); + multiplier *= 1_000; + } else if (trunc.endsWith("M")) { + trunc = trunc.substring(0, trunc.length() - 1); + multiplier *= 1_000_000; + } else if (trunc.endsWith("G")) { + trunc = trunc.substring(0, trunc.length() - 1); + multiplier *= 1_000_000_000; + } + + try { + return Long.parseLong(trunc) * multiplier; + } catch (NumberFormatException e) { + Log.e(TAG, "Malformed config string: " + val + " to " + trunc, e); + return defaultValCakes; + } + } + // Keys for AlarmManager TARE factors /** @hide */ public static final String KEY_AM_MIN_SATIATED_BALANCE_EXEMPTED = @@ -276,179 +341,201 @@ public class EconomyManager { // Default values AlarmManager factors /** @hide */ - public static final int DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED = 500; + public static final long DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED_CAKES = arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_MIN_SATIATED_BALANCE_HEADLESS_SYSTEM_APP = 200; + public static final long DEFAULT_AM_MIN_SATIATED_BALANCE_HEADLESS_SYSTEM_APP_CAKES = + arcToCake(256); /** @hide */ - public static final int DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP = 160; + public static final long DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP_CAKES = arcToCake(160); /** @hide */ - public static final int DEFAULT_AM_MAX_SATIATED_BALANCE = 1440; + public static final long DEFAULT_AM_MAX_SATIATED_BALANCE_CAKES = arcToCake(960); /** @hide */ - public static final int DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT = 4000; + public static final long DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES = arcToCake(2880); /** @hide */ - public static final int DEFAULT_AM_HARD_CONSUMPTION_LIMIT = 28_800; + public static final long DEFAULT_AM_HARD_CONSUMPTION_LIMIT_CAKES = arcToCake(15_000); // TODO: add AlarmManager modifier default values /** @hide */ - public static final int DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT = 0; + public static final long DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT_CAKES = arcToCake(0); /** @hide */ - public static final float DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING = 0.01f; + // 10 megacakes = .01 ARC + public static final long DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING_CAKES = 10_000_000; /** @hide */ - public static final int DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX = 500; + public static final long DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX_CAKES = arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT = 3; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING = 0; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX = 60; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX_CAKES = arcToCake(60); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_INSTANT = 5; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_INSTANT_CAKES = + arcToCake(5); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_ONGOING = 0; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_ONGOING_CAKES = + arcToCake(0); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_MAX = 500; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_SEEN_WITHIN_15_MAX_CAKES = + arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT = 5; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES = + arcToCake(5); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING = 0; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES = + arcToCake(0); /** @hide */ - public static final int DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX = 500; + public static final long DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES = arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT = 10; + public static final long DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING = 0; + public static final long DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX = 500; + public static final long DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX_CAKES = arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT = 10; + public static final long DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING = 0; + public static final long DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX = 500; + public static final long DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX_CAKES = arcToCake(500); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP = 3; + public static final long DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP_CAKES = + arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP = 3; + public static final long DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP_CAKES = + arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP = 3; + public static final long DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP = 3; + public static final long DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP = 1; + public static final long DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP_CAKES = + arcToCake(1); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP = 1; + public static final long DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP_CAKES = arcToCake(1); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP = 1; + public static final long DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP_CAKES = + arcToCake(1); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP = 1; + public static final long DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP_CAKES = arcToCake(1); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP = 5; + public static final long DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP_CAKES = arcToCake(5); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE = 5; + public static final long + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE_CAKES = arcToCake(5); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE = 4; + public static final long + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE_CAKES = arcToCake(4); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE = 4; + public static final long DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE_CAKES = arcToCake(4); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE = 3; + public static final long DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE = 3; + public static final long + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE_CAKES = + arcToCake(3); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE = 2; + public static final long DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE_CAKES = + arcToCake(2); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE = - 2; + public static final long + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE_CAKES = + arcToCake(2); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE = 1; + public static final long DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE_CAKES = + arcToCake(1); /** @hide */ - public static final int DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE = 10; + public static final long DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE_CAKES = arcToCake(10); // Default values JobScheduler factors // TODO: add time_since_usage variable to min satiated balance factors /** @hide */ - public static final int DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED = 20000; + public static final long DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED_CAKES = arcToCake(15000); /** @hide */ - public static final int DEFAULT_JS_MIN_SATIATED_BALANCE_HEADLESS_SYSTEM_APP = 10000; + public static final long DEFAULT_JS_MIN_SATIATED_BALANCE_HEADLESS_SYSTEM_APP_CAKES = + arcToCake(7500); /** @hide */ - public static final int DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP = 2000; + public static final long DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP_CAKES = arcToCake(2000); /** @hide */ - public static final int DEFAULT_JS_MAX_SATIATED_BALANCE = 60000; + public static final long DEFAULT_JS_MAX_SATIATED_BALANCE_CAKES = arcToCake(60000); /** @hide */ - public static final int DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT = 100_000; + public static final long DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES = arcToCake(29_000); /** @hide */ - public static final int DEFAULT_JS_HARD_CONSUMPTION_LIMIT = 460_000; + // TODO: set hard limit based on device type (phone vs tablet vs etc) + battery size + public static final long DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES = arcToCake(250_000); // TODO: add JobScheduler modifier default values /** @hide */ - public static final int DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT = 0; + public static final long DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT_CAKES = arcToCake(0); /** @hide */ - public static final float DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING = 0.5f; + public static final long DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING_CAKES = CAKE_IN_ARC / 2; /** @hide */ - public static final int DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX = 15000; + public static final long DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX_CAKES = arcToCake(15000); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT = 1; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES = arcToCake(1); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING = 0; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX = 10; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT = 5; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES = + arcToCake(5); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING = 0; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES = + arcToCake(0); /** @hide */ - public static final int DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX = 5000; + public static final long DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES = arcToCake(5000); /** @hide */ - public static final int DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT = 10; + public static final long DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING = 0; + public static final long DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX = 5000; + public static final long DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX_CAKES = arcToCake(5000); /** @hide */ - public static final int DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT = 10; + public static final long DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING = 0; + public static final long DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES = arcToCake(0); /** @hide */ - public static final int DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX = 5000; + public static final long DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX_CAKES = arcToCake(5000); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MAX_START_CTP = 3; + public static final long DEFAULT_JS_ACTION_JOB_MAX_START_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP = 2; + public static final long DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_HIGH_START_CTP = 3; + public static final long DEFAULT_JS_ACTION_JOB_HIGH_START_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP = 2; + public static final long DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP = 3; + public static final long DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP = 2; + public static final long DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_LOW_START_CTP = 3; + public static final long DEFAULT_JS_ACTION_JOB_LOW_START_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP = 2; + public static final long DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MIN_START_CTP = 3; + public static final long DEFAULT_JS_ACTION_JOB_MIN_START_CTP_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP = 2; + public static final long DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP = 30; + public static final long DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP_CAKES = arcToCake(30); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE = 10; + public static final long DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE_CAKES = arcToCake(10); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE = 5; + public static final long DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE_CAKES = arcToCake(5); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE = 8; + public static final long DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE_CAKES = arcToCake(8); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE = 4; + public static final long DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE_CAKES = arcToCake(4); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE = 6; + public static final long DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE_CAKES = arcToCake(6); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE = 3; + public static final long DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE_CAKES = arcToCake(3); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE = 4; + public static final long DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE_CAKES = arcToCake(4); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE = 2; + public static final long DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE = 2; + public static final long DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE_CAKES = arcToCake(2); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE = 1; + public static final long DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE_CAKES = arcToCake(1); /** @hide */ - public static final int DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE = 60; + public static final long DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE_CAKES = arcToCake(60); } diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java index c8ec89475050..c86353c84467 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java @@ -690,6 +690,12 @@ class JobConcurrencyManager { int projectedRunningCount = numRunningJobs; while ((nextPending = pendingJobQueue.next()) != null) { if (mRunningJobs.contains(nextPending)) { + // Should never happen. + Slog.wtf(TAG, "Pending queue contained a running job"); + if (DEBUG) { + Slog.e(TAG, "Pending+running job: " + nextPending); + } + pendingJobQueue.remove(nextPending); continue; } @@ -1137,7 +1143,8 @@ class JobConcurrencyManager { } } - if (mActiveServices.size() >= STANDARD_CONCURRENCY_LIMIT) { + final PendingJobQueue pendingJobQueue = mService.getPendingJobQueue(); + if (mActiveServices.size() >= STANDARD_CONCURRENCY_LIMIT || pendingJobQueue.size() == 0) { worker.clearPreferredUid(); // We're over the limit (because the TOP app scheduled a lot of EJs). Don't start // running anything new until we get back below the limit. @@ -1145,7 +1152,6 @@ class JobConcurrencyManager { return; } - final PendingJobQueue pendingJobQueue = mService.getPendingJobQueue(); if (worker.getPreferredUid() != JobServiceContext.NO_PREFERRED_UID) { updateCounterConfigLocked(); // Preemption case needs special care. @@ -1162,6 +1168,12 @@ class JobConcurrencyManager { pendingJobQueue.resetIterator(); while ((nextPending = pendingJobQueue.next()) != null) { if (mRunningJobs.contains(nextPending)) { + // Should never happen. + Slog.wtf(TAG, "Pending queue contained a running job"); + if (DEBUG) { + Slog.e(TAG, "Pending+running job: " + nextPending); + } + pendingJobQueue.remove(nextPending); continue; } @@ -1239,6 +1251,12 @@ class JobConcurrencyManager { while ((nextPending = pendingJobQueue.next()) != null) { if (mRunningJobs.contains(nextPending)) { + // Should never happen. + Slog.wtf(TAG, "Pending queue contained a running job"); + if (DEBUG) { + Slog.e(TAG, "Pending+running job: " + nextPending); + } + pendingJobQueue.remove(nextPending); continue; } diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 9e131339595f..358c32722b8b 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -1749,8 +1749,13 @@ public class JobSchedulerService extends com.android.server.SystemService if (!removed) { // We never create JobStatus objects for the express purpose of removing them, and this // method is only ever called for jobs that were saved in the JobStore at some point, - // so if we can't find it, something went seriously wrong. - Slog.wtfStack(TAG, "Job didn't exist in JobStore"); + // so if we can't find it, something may be wrong. As of Android T, there is a + // legitimate code path where removed is false --- when an actively running job is + // cancelled (eg. via JobScheduler.cancel() or the app scheduling a new job with the + // same job ID), we remove it from the JobStore and tell the JobServiceContext to stop + // running the job. Once the job stops running, we then call this method again. + // TODO: rework code so we don't intentionally call this method twice for the same job + Slog.w(TAG, "Job didn't exist in JobStore"); } if (mReadyToRock) { for (int i = 0; i < mControllers.size(); i++) { diff --git a/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java index c2e81882eed2..d0f719b13b89 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java @@ -16,43 +16,43 @@ package com.android.server.tare; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP; -import static android.app.tare.EconomyManager.DEFAULT_AM_HARD_CONSUMPTION_LIMIT; -import static android.app.tare.EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT; -import static android.app.tare.EconomyManager.DEFAULT_AM_MAX_SATIATED_BALANCE; -import static android.app.tare.EconomyManager.DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED; -import static android.app.tare.EconomyManager.DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_HARD_CONSUMPTION_LIMIT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_MAX_SATIATED_BALANCE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING_CAKES; import static android.app.tare.EconomyManager.KEY_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE; import static android.app.tare.EconomyManager.KEY_AM_ACTION_ALARM_ALARMCLOCK_CTP; import static android.app.tare.EconomyManager.KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE; @@ -97,12 +97,12 @@ import static com.android.server.tare.Modifier.COST_MODIFIER_CHARGING; import static com.android.server.tare.Modifier.COST_MODIFIER_DEVICE_IDLE; import static com.android.server.tare.Modifier.COST_MODIFIER_POWER_SAVE_MODE; import static com.android.server.tare.Modifier.COST_MODIFIER_PROCESS_STATE; -import static com.android.server.tare.TareUtils.arcToCake; import static com.android.server.tare.TareUtils.cakeToString; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ContentResolver; +import android.provider.DeviceConfig; import android.provider.Settings; import android.util.IndentingPrintWriter; import android.util.KeyValueListParser; @@ -157,14 +157,15 @@ public class AlarmManagerEconomicPolicy extends EconomicPolicy { AlarmManagerEconomicPolicy(InternalResourceService irs) { super(irs); mInternalResourceService = irs; - loadConstants(""); + loadConstants("", null); } @Override - void setup() { - super.setup(); + void setup(@NonNull DeviceConfig.Properties properties) { + super.setup(properties); ContentResolver resolver = mInternalResourceService.getContext().getContentResolver(); - loadConstants(Settings.Global.getString(resolver, TARE_ALARM_MANAGER_CONSTANTS)); + loadConstants(Settings.Global.getString(resolver, TARE_ALARM_MANAGER_CONSTANTS), + properties); } @Override @@ -178,6 +179,11 @@ public class AlarmManagerEconomicPolicy extends EconomicPolicy { @Override long getMaxSatiatedBalance() { + // TODO(230501287): adjust balance based on whether the app has the SCHEDULE_EXACT_ALARM + // permission granted. Apps without the permission granted shouldn't need a high balance + // since they won't be able to use exact alarms. Apps with the permission granted could + // have a higher balance, or perhaps just those with the USE_EXACT_ALARM permission since + // that is limited to specific use cases. return mMaxSatiatedBalance; } @@ -209,7 +215,8 @@ public class AlarmManagerEconomicPolicy extends EconomicPolicy { return mRewards.get(rewardId); } - private void loadConstants(String policyValuesString) { + private void loadConstants(String policyValuesString, + @Nullable DeviceConfig.Properties properties) { mActions.clear(); mRewards.clear(); @@ -219,145 +226,159 @@ public class AlarmManagerEconomicPolicy extends EconomicPolicy { Slog.e(TAG, "Global setting key incorrect: ", e); } - mMinSatiatedBalanceExempted = arcToCake(mParser.getInt(KEY_AM_MIN_SATIATED_BALANCE_EXEMPTED, - DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED)); - mMinSatiatedBalanceOther = arcToCake(mParser.getInt(KEY_AM_MIN_SATIATED_BALANCE_OTHER_APP, - DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP)); - mMaxSatiatedBalance = arcToCake(mParser.getInt(KEY_AM_MAX_SATIATED_BALANCE, - DEFAULT_AM_MAX_SATIATED_BALANCE)); - mInitialSatiatedConsumptionLimit = arcToCake(mParser.getInt( - KEY_AM_INITIAL_CONSUMPTION_LIMIT, DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT)); + mMinSatiatedBalanceExempted = getConstantAsCake(mParser, properties, + KEY_AM_MIN_SATIATED_BALANCE_EXEMPTED, + DEFAULT_AM_MIN_SATIATED_BALANCE_EXEMPTED_CAKES); + mMinSatiatedBalanceOther = getConstantAsCake(mParser, properties, + KEY_AM_MIN_SATIATED_BALANCE_OTHER_APP, + DEFAULT_AM_MIN_SATIATED_BALANCE_OTHER_APP_CAKES); + mMaxSatiatedBalance = getConstantAsCake(mParser, properties, + KEY_AM_MAX_SATIATED_BALANCE, + DEFAULT_AM_MAX_SATIATED_BALANCE_CAKES); + mInitialSatiatedConsumptionLimit = getConstantAsCake(mParser, properties, + KEY_AM_INITIAL_CONSUMPTION_LIMIT, DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES); mHardSatiatedConsumptionLimit = Math.max(mInitialSatiatedConsumptionLimit, - arcToCake(mParser.getInt( - KEY_AM_HARD_CONSUMPTION_LIMIT, DEFAULT_AM_HARD_CONSUMPTION_LIMIT))); + getConstantAsCake(mParser, properties, + KEY_AM_HARD_CONSUMPTION_LIMIT, DEFAULT_AM_HARD_CONSUMPTION_LIMIT_CAKES)); - final long exactAllowWhileIdleWakeupBasePrice = arcToCake( - mParser.getInt(KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE)); + final long exactAllowWhileIdleWakeupBasePrice = getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE, + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_BASE_PRICE_CAKES); mActions.put(ACTION_ALARM_WAKEUP_EXACT_ALLOW_WHILE_IDLE, new Action(ACTION_ALARM_WAKEUP_EXACT_ALLOW_WHILE_IDLE, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP)), + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_WAKEUP_CTP_CAKES), exactAllowWhileIdleWakeupBasePrice)); mActions.put(ACTION_ALARM_WAKEUP_EXACT, new Action(ACTION_ALARM_WAKEUP_EXACT, - arcToCake(mParser.getInt(KEY_AM_ACTION_ALARM_EXACT_WAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP)), - arcToCake(mParser.getInt(KEY_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_EXACT_WAKEUP_CTP, + DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE, + DEFAULT_AM_ACTION_ALARM_EXACT_WAKEUP_BASE_PRICE_CAKES))); final long inexactAllowWhileIdleWakeupBasePrice = - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE)); + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_BASE_PRICE_CAKES); mActions.put(ACTION_ALARM_WAKEUP_INEXACT_ALLOW_WHILE_IDLE, new Action(ACTION_ALARM_WAKEUP_INEXACT_ALLOW_WHILE_IDLE, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP)), + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_WAKEUP_CTP_CAKES), inexactAllowWhileIdleWakeupBasePrice)); mActions.put(ACTION_ALARM_WAKEUP_INEXACT, new Action(ACTION_ALARM_WAKEUP_INEXACT, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP)), - arcToCake(mParser.getInt( + DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_CTP_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE)))); - - final long exactAllowWhileIdleNonWakeupBasePrice = - arcToCake(mParser.getInt( - KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE)); + DEFAULT_AM_ACTION_ALARM_INEXACT_WAKEUP_BASE_PRICE_CAKES))); + final long exactAllowWhileIdleNonWakeupBasePrice = getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_BASE_PRICE, + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE_CAKES); mActions.put(ACTION_ALARM_NONWAKEUP_EXACT_ALLOW_WHILE_IDLE, new Action(ACTION_ALARM_NONWAKEUP_EXACT_ALLOW_WHILE_IDLE, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP)), + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_EXACT_NONWAKEUP_CTP_CAKES), exactAllowWhileIdleNonWakeupBasePrice)); + mActions.put(ACTION_ALARM_NONWAKEUP_EXACT, new Action(ACTION_ALARM_NONWAKEUP_EXACT, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP)), - arcToCake(mParser.getInt( + DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_CTP_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE)))); - - final long inexactAllowWhileIdleNonWakeupBasePrice = - arcToCake(mParser.getInt( - KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE)); - + DEFAULT_AM_ACTION_ALARM_EXACT_NONWAKEUP_BASE_PRICE_CAKES))); + + final long inexactAllowWhileIdleNonWakeupBasePrice = getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE, + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_BASE_PRICE_CAKES); + final long inexactAllowWhileIdleNonWakeupCtp = getConstantAsCake(mParser, properties, + KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP, + DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP_CAKES); mActions.put(ACTION_ALARM_NONWAKEUP_INEXACT_ALLOW_WHILE_IDLE, new Action(ACTION_ALARM_NONWAKEUP_INEXACT_ALLOW_WHILE_IDLE, - arcToCake(mParser.getInt( - KEY_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_ALLOW_WHILE_IDLE_INEXACT_NONWAKEUP_CTP)), + inexactAllowWhileIdleNonWakeupCtp, inexactAllowWhileIdleNonWakeupBasePrice)); + mActions.put(ACTION_ALARM_NONWAKEUP_INEXACT, new Action(ACTION_ALARM_NONWAKEUP_INEXACT, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP, - DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP)), - arcToCake(mParser.getInt( + DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_CTP_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE)))); + DEFAULT_AM_ACTION_ALARM_INEXACT_NONWAKEUP_BASE_PRICE_CAKES))); mActions.put(ACTION_ALARM_CLOCK, new Action(ACTION_ALARM_CLOCK, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALARMCLOCK_CTP, - DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP)), - arcToCake(mParser.getInt( + DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_CTP_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE, - DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE)))); + DEFAULT_AM_ACTION_ALARM_ALARMCLOCK_BASE_PRICE_CAKES))); mRewards.put(REWARD_TOP_ACTIVITY, new Reward(REWARD_TOP_ACTIVITY, - arcToCake(mParser.getInt(KEY_AM_REWARD_TOP_ACTIVITY_INSTANT, - DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT)), - (long) (arcToCake(1) * mParser.getFloat(KEY_AM_REWARD_TOP_ACTIVITY_ONGOING, - DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING)), - arcToCake(mParser.getInt(KEY_AM_REWARD_TOP_ACTIVITY_MAX, - DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX)))); + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_TOP_ACTIVITY_INSTANT, + DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_TOP_ACTIVITY_ONGOING, + DEFAULT_AM_REWARD_TOP_ACTIVITY_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_TOP_ACTIVITY_MAX, + DEFAULT_AM_REWARD_TOP_ACTIVITY_MAX_CAKES))); mRewards.put(REWARD_NOTIFICATION_SEEN, new Reward(REWARD_NOTIFICATION_SEEN, - arcToCake(mParser.getInt(KEY_AM_REWARD_NOTIFICATION_SEEN_INSTANT, - DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT)), - arcToCake(mParser.getInt(KEY_AM_REWARD_NOTIFICATION_SEEN_ONGOING, - DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING)), - arcToCake(mParser.getInt(KEY_AM_REWARD_NOTIFICATION_SEEN_MAX, - DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX)))); + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_NOTIFICATION_SEEN_INSTANT, + DEFAULT_AM_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_NOTIFICATION_SEEN_ONGOING, + DEFAULT_AM_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_NOTIFICATION_SEEN_MAX, + DEFAULT_AM_REWARD_NOTIFICATION_SEEN_MAX_CAKES))); mRewards.put(REWARD_NOTIFICATION_INTERACTION, new Reward(REWARD_NOTIFICATION_INTERACTION, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT, - DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT)), - arcToCake(mParser.getInt( + DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING, - DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING)), - arcToCake(mParser.getInt( + DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_REWARD_NOTIFICATION_INTERACTION_MAX, - DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX)))); + DEFAULT_AM_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES))); mRewards.put(REWARD_WIDGET_INTERACTION, new Reward(REWARD_WIDGET_INTERACTION, - arcToCake(mParser.getInt(KEY_AM_REWARD_WIDGET_INTERACTION_INSTANT, - DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT)), - arcToCake(mParser.getInt(KEY_AM_REWARD_WIDGET_INTERACTION_ONGOING, - DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING)), - arcToCake(mParser.getInt(KEY_AM_REWARD_WIDGET_INTERACTION_MAX, - DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX)))); + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_WIDGET_INTERACTION_INSTANT, + DEFAULT_AM_REWARD_WIDGET_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_WIDGET_INTERACTION_ONGOING, + DEFAULT_AM_REWARD_WIDGET_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_WIDGET_INTERACTION_MAX, + DEFAULT_AM_REWARD_WIDGET_INTERACTION_MAX_CAKES))); mRewards.put(REWARD_OTHER_USER_INTERACTION, new Reward(REWARD_OTHER_USER_INTERACTION, - arcToCake(mParser.getInt(KEY_AM_REWARD_OTHER_USER_INTERACTION_INSTANT, - DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT)), - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, + KEY_AM_REWARD_OTHER_USER_INTERACTION_INSTANT, + DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_REWARD_OTHER_USER_INTERACTION_ONGOING, - DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING)), - arcToCake(mParser.getInt( + DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, KEY_AM_REWARD_OTHER_USER_INTERACTION_MAX, - DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX)))); + DEFAULT_AM_REWARD_OTHER_USER_INTERACTION_MAX_CAKES))); } @Override diff --git a/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java index 2109a8575777..c3eb5bf51161 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java @@ -18,6 +18,7 @@ package com.android.server.tare; import android.annotation.NonNull; import android.annotation.Nullable; +import android.provider.DeviceConfig; import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.SparseArray; @@ -57,10 +58,10 @@ public class CompleteEconomicPolicy extends EconomicPolicy { } @Override - void setup() { - super.setup(); + void setup(@NonNull DeviceConfig.Properties properties) { + super.setup(properties); for (int i = 0; i < mEnabledEconomicPolicies.size(); ++i) { - mEnabledEconomicPolicies.valueAt(i).setup(); + mEnabledEconomicPolicies.valueAt(i).setup(properties); } updateMaxBalances(); } diff --git a/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java index 3a26aae217c2..d401373c0066 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java @@ -16,6 +16,8 @@ package com.android.server.tare; +import static android.app.tare.EconomyManager.parseCreditValue; + import static com.android.server.tare.Modifier.COST_MODIFIER_CHARGING; import static com.android.server.tare.Modifier.COST_MODIFIER_DEVICE_IDLE; import static com.android.server.tare.Modifier.COST_MODIFIER_POWER_SAVE_MODE; @@ -27,7 +29,9 @@ import android.annotation.CallSuper; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.provider.DeviceConfig; import android.util.IndentingPrintWriter; +import android.util.KeyValueListParser; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -170,7 +174,7 @@ public abstract class EconomicPolicy { } @CallSuper - void setup() { + void setup(@NonNull DeviceConfig.Properties properties) { for (int i = 0; i < NUM_COST_MODIFIERS; ++i) { final Modifier modifier = COST_MODIFIER_BY_INDEX[i]; if (modifier != null) { @@ -409,6 +413,22 @@ public abstract class EconomicPolicy { return "UNKNOWN_REWARD:" + Integer.toHexString(eventId); } + protected long getConstantAsCake(@NonNull KeyValueListParser parser, + @Nullable DeviceConfig.Properties properties, String key, long defaultValCake) { + // Don't cross the streams! Mixing Settings/local user config changes with DeviceConfig + // config can cause issues since the scales may be different, so use one or the other. + if (parser.size() > 0) { + // User settings take precedence. Just stick with the Settings constants, even if there + // are invalid values. It's not worth the time to evaluate all the key/value pairs to + // make sure there are valid ones before deciding. + return parseCreditValue(parser.getString(key, null), defaultValCake); + } + if (properties != null) { + return parseCreditValue(properties.getString(key, null), defaultValCake); + } + return defaultValCake; + } + protected static void dumpActiveModifiers(IndentingPrintWriter pw) { for (int i = 0; i < NUM_COST_MODIFIERS; ++i) { pw.print("Modifier "); diff --git a/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java b/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java index ce4604f80f50..2118eeb45d70 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java @@ -731,7 +731,7 @@ public class InternalResourceService extends SystemService { registerListeners(); mCurrentBatteryLevel = getCurrentBatteryLevel(); mHandler.post(this::setupHeavyWork); - mCompleteEconomicPolicy.setup(); + mCompleteEconomicPolicy.setup(mConfigObserver.getAllDeviceConfigProperties()); } } @@ -1014,10 +1014,17 @@ public class InternalResourceService extends SystemService { Settings.Global.getUriFor(TARE_ALARM_MANAGER_CONSTANTS), false, this); mContentResolver.registerContentObserver( Settings.Global.getUriFor(TARE_JOB_SCHEDULER_CONSTANTS), false, this); - onPropertiesChanged(DeviceConfig.getProperties(DeviceConfig.NAMESPACE_TARE)); + onPropertiesChanged(getAllDeviceConfigProperties()); updateEnabledStatus(); } + @NonNull + DeviceConfig.Properties getAllDeviceConfigProperties() { + // Don't want to cache the Properties object locally in case it ends up being large, + // especially since it'll only be used once/infrequently (during setup or on a change). + return DeviceConfig.getProperties(DeviceConfig.NAMESPACE_TARE); + } + @Override public void onChange(boolean selfChange, Uri uri) { if (uri.equals(Settings.Global.getUriFor(Settings.Global.ENABLE_TARE))) { @@ -1030,6 +1037,7 @@ public class InternalResourceService extends SystemService { @Override public void onPropertiesChanged(DeviceConfig.Properties properties) { + boolean economicPolicyUpdated = false; synchronized (mLock) { for (String name : properties.getKeyset()) { if (name == null) { @@ -1039,6 +1047,12 @@ public class InternalResourceService extends SystemService { case KEY_DC_ENABLE_TARE: updateEnabledStatus(); break; + default: + if (!economicPolicyUpdated + && (name.startsWith("am") || name.startsWith("js"))) { + updateEconomicPolicy(); + economicPolicyUpdated = true; + } } } } @@ -1072,7 +1086,7 @@ public class InternalResourceService extends SystemService { mCompleteEconomicPolicy.tearDown(); mCompleteEconomicPolicy = new CompleteEconomicPolicy(InternalResourceService.this); if (mIsEnabled && mBootPhase >= PHASE_SYSTEM_SERVICES_READY) { - mCompleteEconomicPolicy.setup(); + mCompleteEconomicPolicy.setup(getAllDeviceConfigProperties()); if (initialLimit != mCompleteEconomicPolicy.getInitialSatiatedConsumptionLimit() || hardLimit != mCompleteEconomicPolicy.getHardSatiatedConsumptionLimit()) { diff --git a/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java index 99b93ce5c22c..948f0a71510c 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java @@ -16,48 +16,48 @@ package com.android.server.tare; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_START_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_START_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_START_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_START_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE; -import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP; -import static android.app.tare.EconomyManager.DEFAULT_JS_HARD_CONSUMPTION_LIMIT; -import static android.app.tare.EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT; -import static android.app.tare.EconomyManager.DEFAULT_JS_MAX_SATIATED_BALANCE; -import static android.app.tare.EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED; -import static android.app.tare.EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX; -import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_HIGH_START_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_LOW_START_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MAX_START_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_MIN_START_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_MAX_SATIATED_BALANCE_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX_CAKES; +import static android.app.tare.EconomyManager.DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING_CAKES; import static android.app.tare.EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE; import static android.app.tare.EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_RUNNING_CTP; import static android.app.tare.EconomyManager.KEY_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE; @@ -106,12 +106,12 @@ import static com.android.server.tare.Modifier.COST_MODIFIER_CHARGING; import static com.android.server.tare.Modifier.COST_MODIFIER_DEVICE_IDLE; import static com.android.server.tare.Modifier.COST_MODIFIER_POWER_SAVE_MODE; import static com.android.server.tare.Modifier.COST_MODIFIER_PROCESS_STATE; -import static com.android.server.tare.TareUtils.arcToCake; import static com.android.server.tare.TareUtils.cakeToString; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ContentResolver; +import android.provider.DeviceConfig; import android.provider.Settings; import android.util.IndentingPrintWriter; import android.util.KeyValueListParser; @@ -159,14 +159,15 @@ public class JobSchedulerEconomicPolicy extends EconomicPolicy { JobSchedulerEconomicPolicy(InternalResourceService irs) { super(irs); mInternalResourceService = irs; - loadConstants(""); + loadConstants("", null); } @Override - void setup() { - super.setup(); + void setup(@NonNull DeviceConfig.Properties properties) { + super.setup(properties); ContentResolver resolver = mInternalResourceService.getContext().getContentResolver(); - loadConstants(Settings.Global.getString(resolver, TARE_JOB_SCHEDULER_CONSTANTS)); + loadConstants(Settings.Global.getString(resolver, TARE_JOB_SCHEDULER_CONSTANTS), + properties); } @Override @@ -211,7 +212,8 @@ public class JobSchedulerEconomicPolicy extends EconomicPolicy { return mRewards.get(rewardId); } - private void loadConstants(String policyValuesString) { + private void loadConstants(String policyValuesString, + @Nullable DeviceConfig.Properties properties) { mActions.clear(); mRewards.clear(); @@ -221,118 +223,153 @@ public class JobSchedulerEconomicPolicy extends EconomicPolicy { Slog.e(TAG, "Global setting key incorrect: ", e); } - mMinSatiatedBalanceExempted = arcToCake( - mParser.getInt(KEY_JS_MIN_SATIATED_BALANCE_EXEMPTED, - DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED)); - mMinSatiatedBalanceOther = arcToCake( - mParser.getInt(KEY_JS_MIN_SATIATED_BALANCE_OTHER_APP, - DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP)); - mMaxSatiatedBalance = arcToCake(mParser.getInt(KEY_JS_MAX_SATIATED_BALANCE, - DEFAULT_JS_MAX_SATIATED_BALANCE)); - mInitialSatiatedConsumptionLimit = arcToCake(mParser.getInt( - KEY_JS_INITIAL_CONSUMPTION_LIMIT, DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT)); + mMinSatiatedBalanceExempted = getConstantAsCake(mParser, properties, + KEY_JS_MIN_SATIATED_BALANCE_EXEMPTED, + DEFAULT_JS_MIN_SATIATED_BALANCE_EXEMPTED_CAKES); + mMinSatiatedBalanceOther = getConstantAsCake(mParser, properties, + KEY_JS_MIN_SATIATED_BALANCE_OTHER_APP, + DEFAULT_JS_MIN_SATIATED_BALANCE_OTHER_APP_CAKES); + mMaxSatiatedBalance = getConstantAsCake(mParser, properties, + KEY_JS_MAX_SATIATED_BALANCE, + DEFAULT_JS_MAX_SATIATED_BALANCE_CAKES); + mInitialSatiatedConsumptionLimit = getConstantAsCake(mParser, properties, + KEY_JS_INITIAL_CONSUMPTION_LIMIT, + DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES); mHardSatiatedConsumptionLimit = Math.max(mInitialSatiatedConsumptionLimit, - arcToCake(mParser.getInt( - KEY_JS_HARD_CONSUMPTION_LIMIT, DEFAULT_JS_HARD_CONSUMPTION_LIMIT))); + getConstantAsCake(mParser, properties, + KEY_JS_HARD_CONSUMPTION_LIMIT, + DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES)); mActions.put(ACTION_JOB_MAX_START, new Action(ACTION_JOB_MAX_START, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MAX_START_CTP, - DEFAULT_JS_ACTION_JOB_MAX_START_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MAX_START_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MAX_START_CTP, + DEFAULT_JS_ACTION_JOB_MAX_START_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MAX_START_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_MAX_START_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_MAX_RUNNING, new Action(ACTION_JOB_MAX_RUNNING, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MAX_RUNNING_CTP, - DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MAX_RUNNING_CTP, + DEFAULT_JS_ACTION_JOB_MAX_RUNNING_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_MAX_RUNNING_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_HIGH_START, new Action(ACTION_JOB_HIGH_START, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_HIGH_START_CTP, - DEFAULT_JS_ACTION_JOB_HIGH_START_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_HIGH_START_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_HIGH_START_CTP, + DEFAULT_JS_ACTION_JOB_HIGH_START_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_HIGH_START_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_HIGH_START_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_HIGH_RUNNING, new Action(ACTION_JOB_HIGH_RUNNING, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_HIGH_RUNNING_CTP, - DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_HIGH_RUNNING_CTP, + DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_HIGH_RUNNING_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_DEFAULT_START, new Action(ACTION_JOB_DEFAULT_START, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_DEFAULT_START_CTP, - DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_DEFAULT_START_CTP, + DEFAULT_JS_ACTION_JOB_DEFAULT_START_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_DEFAULT_START_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_DEFAULT_RUNNING, new Action(ACTION_JOB_DEFAULT_RUNNING, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_DEFAULT_RUNNING_CTP, - DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_DEFAULT_RUNNING_CTP, + DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_DEFAULT_RUNNING_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_LOW_START, new Action(ACTION_JOB_LOW_START, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_LOW_START_CTP, - DEFAULT_JS_ACTION_JOB_LOW_START_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_LOW_START_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_LOW_START_CTP, + DEFAULT_JS_ACTION_JOB_LOW_START_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_LOW_START_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_LOW_START_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_LOW_RUNNING, new Action(ACTION_JOB_LOW_RUNNING, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_LOW_RUNNING_CTP, - DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_LOW_RUNNING_CTP, + DEFAULT_JS_ACTION_JOB_LOW_RUNNING_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_LOW_RUNNING_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_MIN_START, new Action(ACTION_JOB_MIN_START, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MIN_START_CTP, - DEFAULT_JS_ACTION_JOB_MIN_START_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MIN_START_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MIN_START_CTP, + DEFAULT_JS_ACTION_JOB_MIN_START_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MIN_START_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_MIN_START_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_MIN_RUNNING, new Action(ACTION_JOB_MIN_RUNNING, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MIN_RUNNING_CTP, - DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MIN_RUNNING_CTP, + DEFAULT_JS_ACTION_JOB_MIN_RUNNING_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_MIN_RUNNING_BASE_PRICE_CAKES))); mActions.put(ACTION_JOB_TIMEOUT, new Action(ACTION_JOB_TIMEOUT, - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP, - DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP)), - arcToCake(mParser.getInt(KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE, - DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE)))); + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP, + DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_CTP_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE, + DEFAULT_JS_ACTION_JOB_TIMEOUT_PENALTY_BASE_PRICE_CAKES))); mRewards.put(REWARD_TOP_ACTIVITY, new Reward(REWARD_TOP_ACTIVITY, - arcToCake(mParser.getInt(KEY_JS_REWARD_TOP_ACTIVITY_INSTANT, - DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT)), - (long) (arcToCake(1) * mParser.getFloat(KEY_JS_REWARD_TOP_ACTIVITY_ONGOING, - DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING)), - arcToCake(mParser.getInt(KEY_JS_REWARD_TOP_ACTIVITY_MAX, - DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX)))); + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_TOP_ACTIVITY_INSTANT, + DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_TOP_ACTIVITY_ONGOING, + DEFAULT_JS_REWARD_TOP_ACTIVITY_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_TOP_ACTIVITY_MAX, + DEFAULT_JS_REWARD_TOP_ACTIVITY_MAX_CAKES))); mRewards.put(REWARD_NOTIFICATION_SEEN, new Reward(REWARD_NOTIFICATION_SEEN, - arcToCake(mParser.getInt(KEY_JS_REWARD_NOTIFICATION_SEEN_INSTANT, - DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT)), - arcToCake(mParser.getInt(KEY_JS_REWARD_NOTIFICATION_SEEN_ONGOING, - DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING)), - arcToCake(mParser.getInt(KEY_JS_REWARD_NOTIFICATION_SEEN_MAX, - DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX)))); + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_NOTIFICATION_SEEN_INSTANT, + DEFAULT_JS_REWARD_NOTIFICATION_SEEN_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_NOTIFICATION_SEEN_ONGOING, + DEFAULT_JS_REWARD_NOTIFICATION_SEEN_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_NOTIFICATION_SEEN_MAX, + DEFAULT_JS_REWARD_NOTIFICATION_SEEN_MAX_CAKES))); mRewards.put(REWARD_NOTIFICATION_INTERACTION, new Reward(REWARD_NOTIFICATION_INTERACTION, - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, KEY_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT, - DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT)), - arcToCake(mParser.getInt( + DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, KEY_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING, - DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING)), - arcToCake(mParser.getInt( + DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, KEY_JS_REWARD_NOTIFICATION_INTERACTION_MAX, - DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX)))); + DEFAULT_JS_REWARD_NOTIFICATION_INTERACTION_MAX_CAKES))); mRewards.put(REWARD_WIDGET_INTERACTION, new Reward(REWARD_WIDGET_INTERACTION, - arcToCake(mParser.getInt(KEY_JS_REWARD_WIDGET_INTERACTION_INSTANT, - DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT)), - arcToCake(mParser.getInt(KEY_JS_REWARD_WIDGET_INTERACTION_ONGOING, - DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING)), - arcToCake(mParser.getInt(KEY_JS_REWARD_WIDGET_INTERACTION_MAX, - DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX)))); + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_WIDGET_INTERACTION_INSTANT, + DEFAULT_JS_REWARD_WIDGET_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_WIDGET_INTERACTION_ONGOING, + DEFAULT_JS_REWARD_WIDGET_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_WIDGET_INTERACTION_MAX, + DEFAULT_JS_REWARD_WIDGET_INTERACTION_MAX_CAKES))); mRewards.put(REWARD_OTHER_USER_INTERACTION, new Reward(REWARD_OTHER_USER_INTERACTION, - arcToCake(mParser.getInt(KEY_JS_REWARD_OTHER_USER_INTERACTION_INSTANT, - DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT)), - arcToCake(mParser.getInt( + getConstantAsCake(mParser, properties, + KEY_JS_REWARD_OTHER_USER_INTERACTION_INSTANT, + DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_INSTANT_CAKES), + getConstantAsCake(mParser, properties, KEY_JS_REWARD_OTHER_USER_INTERACTION_ONGOING, - DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING)), - arcToCake(mParser.getInt( + DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_ONGOING_CAKES), + getConstantAsCake(mParser, properties, KEY_JS_REWARD_OTHER_USER_INTERACTION_MAX, - DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX)))); + DEFAULT_JS_REWARD_OTHER_USER_INTERACTION_MAX_CAKES))); } @Override diff --git a/apex/jobscheduler/service/java/com/android/server/tare/README.md b/apex/jobscheduler/service/java/com/android/server/tare/README.md index 72d506972dd1..e338ed1c6987 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/README.md +++ b/apex/jobscheduler/service/java/com/android/server/tare/README.md @@ -18,16 +18,17 @@ The key tenets of TARE are: In an ideal world, the system could be said to most efficiently allocate resources by maximizing its profits — by maximizing the aggregate sum of the difference between an action's price (that the app ends up paying) and the cost to produce by the system. This assumes that more important -actions have a higher price than less important actions. With this assumption, maximizing profits -implies that the system runs the most important work first and proceeds in decreasing order of -importance. Of course, that also means the system will not run anything where an app would pay less -for the action than the system's cost to produce that action. Some of this breaks down when we throw -TOP apps into the mix — TOP apps pay 0 for all actions, even though the CTP may be greater -than 0. This is to ensure ideal user experience for the app the user is actively interacting with. -Similar caveats exist for system-critical processes (such as the OS itself) and apps running -foreground services (since those could be critical to user experience, as is the case for media and -navigation apps). Excluding those caveats/special situations, maximizing profits of actions -performed by apps in the background should be the target. +actions have a higher price than less important actions and all actors have perfect information and +convey that information accurately. With these assumptions, maximizing profits implies that the +system runs the most important work first and proceeds in decreasing order of importance. Of course, +that also means the system will not run anything where an app would pay less for the action than the +system's cost to produce that action. Some of this breaks down when we throw TOP apps into the mix +— TOP apps pay 0 for all actions, even though the CTP may be greater than 0. This is to ensure +ideal user experience for the app the user is actively interacting with. Similar caveats exist for +system-critical processes (such as the OS itself) and apps running foreground services (since those +could be critical to user experience, as is the case for media and navigation apps). Excluding those +caveats/special situations, maximizing profits of actions performed by apps in the background should +be the target. To achieve the goal laid out by TARE, we use Android Resource Credits (ARCs for short) as the internal/representative currency of the system. @@ -101,11 +102,37 @@ Tare Improvement Proposal #1 (TIP1) separated allocation (to apps) from supply ( allowed apps to accrue credits as appropriate while still limiting the total number of credits consumed. +# Potential Future Changes + +These are some ideas for further changes. There's no guarantee that they'll be implemented. + +* Include additional components and policies for them. TARE may benefit from adding policies for + components such as broadcast dispatching, network traffic, location requests, and sensor usage. +* Have a separate "account" for critical/special actions. In other words, have two accounts for each + app, where one acts like a special savings account and is only allowed to be used for special + actions such as expedited job execution. The second account would have a lower maximum than the + main account, but would help to make sure that normal actions don't interfere too much with more + critical actions. +* Transferring credits from one app to another. For apps that rely on others for some pieces of + work, it may be beneficial to allow the requesting app to transfer, donate, or somehow make + available some of its own credits to the app doing the work in order to make sure the working app + has enough credits available to do the work. +* Formulate values based on device hardware. For example, adjust the consumption limit based on the + battery size, or the price and/or CTP of actions based on hardware efficiency. +* Price discovery via an auction system. Instead of just setting a fixed price that may be modified + by device and app states, let an app say how much it's willing to pay for a specific action and + then have a small auction when the system needs to decide which app to perform the action for + first or how much to charge the app. + # Definitions * ARC: Android Resource Credits are the "currency" units used as an abstraction layer over the real battery drain. They allow the system to standardize costs and prices across various devices. * Cake: A lie; also the smallest unit of an ARC (1 cake = one-billionth of an ARC = 1 nano-ARC). When the apps request to do something, we shall let them eat cake. -* NARC: The smallest unit of an ARC. A narc is 1 nano-ARC. +* Cost to produce (CTP): An economic term that refers to the total cost incurred by a business to + produce a specific quantity of a product or offer a service. In TARE's context, CTP is meant to be + the estimated cost t ohe system to accomplish a certain action. These "actions" are basically APIs + that apps use to get something done. So the idea is to define the base cost for an app to use a + specific API. * Satiated: used to refer to when the device is fully charged (at 100% battery level)
\ No newline at end of file diff --git a/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java b/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java index 87db8637ddac..6b6984f6ac17 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/TareUtils.java @@ -16,6 +16,8 @@ package com.android.server.tare; +import static android.app.tare.EconomyManager.CAKE_IN_ARC; + import android.annotation.NonNull; import android.annotation.SuppressLint; import android.util.IndentingPrintWriter; @@ -26,8 +28,6 @@ import java.text.SimpleDateFormat; import java.time.Clock; class TareUtils { - private static final long CAKE_IN_ARC = 1_000_000_000L; - @SuppressLint("SimpleDateFormat") private static final SimpleDateFormat sDumpDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); @@ -35,10 +35,6 @@ class TareUtils { @VisibleForTesting static Clock sSystemClock = Clock.systemUTC(); - static long arcToCake(int arcs) { - return arcs * CAKE_IN_ARC; - } - static void dumpTime(IndentingPrintWriter pw, long time) { pw.print(sDumpDateFormat.format(time)); } @@ -56,7 +52,7 @@ class TareUtils { if (cakes == 0) { return "0 ARCs"; } - final long sub = Math.abs(cakes) % CAKE_IN_ARC; + final long sub = cakes % CAKE_IN_ARC; final long arcs = cakeToArc(cakes); if (arcs == 0) { return sub == 1 @@ -65,11 +61,11 @@ class TareUtils { } StringBuilder sb = new StringBuilder(); sb.append(arcs); - if (sub > 0) { - sb.append(".").append(sub / (CAKE_IN_ARC / 1000)); + if (sub != 0) { + sb.append(".").append(String.format("%03d", Math.abs(sub) / (CAKE_IN_ARC / 1000))); } sb.append(" ARC"); - if (arcs != 1 || sub > 0) { + if (arcs != 1 || sub != 0) { sb.append("s"); } return sb.toString(); diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index fb68c6d84d6a..50c8e933d25f 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -1459,6 +1459,8 @@ bool BootAnimation::playAnimation(const Animation& animation) { int fadedFramesCount = 0; int lastDisplayedProgress = 0; + int colorTransitionStart = animation.colorTransitionStart; + int colorTransitionEnd = animation.colorTransitionEnd; for (size_t i=0 ; i<pcount ; i++) { const Animation::Part& part(animation.parts[i]); const size_t fcount = part.frames.size(); @@ -1471,15 +1473,27 @@ bool BootAnimation::playAnimation(const Animation& animation) { continue; //to next part } - if (animation.dynamicColoringEnabled && part.useDynamicColoring && !mDynamicColorsApplied) { - SLOGD("Trying to load dynamic color sysprops."); - initDynamicColors(); - } - // process the part not only while the count allows but also if already fading for (int r=0 ; !part.count || r<part.count || fadedFramesCount > 0 ; r++) { if (shouldStopPlayingPart(part, fadedFramesCount, lastDisplayedProgress)) break; + // It's possible that the sysprops were not loaded yet at this boot phase. + // If that's the case, then we should keep trying until they are available. + if (animation.dynamicColoringEnabled && !mDynamicColorsApplied + && (part.useDynamicColoring || part.postDynamicColoring)) { + SLOGD("Trying to load dynamic color sysprops."); + initDynamicColors(); + if (mDynamicColorsApplied) { + // Sysprops were loaded. Next step is to adjust the animation if we loaded + // the colors after the animation should have started. + const int transitionLength = colorTransitionEnd - colorTransitionStart; + if (part.postDynamicColoring) { + colorTransitionStart = 0; + colorTransitionEnd = fmin(transitionLength, fcount - 1); + } + } + } + mCallbacks->playPart(i, part, r); glClearColor( @@ -1509,9 +1523,8 @@ bool BootAnimation::playAnimation(const Animation& animation) { // - 1 for parts that come after. float colorProgress = part.useDynamicColoring ? fmin(fmax( - ((float)j - animation.colorTransitionStart) / - fmax(animation.colorTransitionEnd - - animation.colorTransitionStart, 1.0f), 0.0f), 1.0f) + ((float)j - colorTransitionStart) / + fmax(colorTransitionEnd - colorTransitionStart, 1.0f), 0.0f), 1.0f) : (part.postDynamicColoring ? 1 : 0); processDisplayEvents(); diff --git a/core/api/module-lib-lint-baseline.txt b/core/api/module-lib-lint-baseline.txt index 0c1ebb3b2208..27436ce35867 100644 --- a/core/api/module-lib-lint-baseline.txt +++ b/core/api/module-lib-lint-baseline.txt @@ -1,4 +1,6 @@ // Baseline format: 1.0 +SamShouldBeLast: android.app.Activity#convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions): + SAM-compatible parameters (such as parameter 1, "callback", in android.app.Activity.convertToTranslucent) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.ActivityManager#addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int): SAM-compatible parameters (such as parameter 1, "listener", in android.app.ActivityManager.addOnUidImportanceListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.PendingIntent#send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler): @@ -9,6 +11,24 @@ SamShouldBeLast: android.app.PendingIntent#send(android.content.Context, int, an SAM-compatible parameters (such as parameter 4, "onFinished", in android.app.PendingIntent.send) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.PendingIntent#send(int, android.app.PendingIntent.OnFinished, android.os.Handler): SAM-compatible parameters (such as parameter 2, "onFinished", in android.app.PendingIntent.send) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.content.pm.ApplicationInfo#dump(android.util.Printer, String): + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.ApplicationInfo.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.content.pm.PackageItemInfo#dumpBack(android.util.Printer, String): + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.PackageItemInfo.dumpBack) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.content.pm.PackageItemInfo#dumpFront(android.util.Printer, String): + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.PackageItemInfo.dumpFront) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#addNmeaListener(android.location.OnNmeaMessageListener, android.os.Handler): + SAM-compatible parameters (such as parameter 1, "listener", in android.location.LocationManager.addNmeaListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(String, long, float, android.location.LocationListener, android.os.Looper): + SAM-compatible parameters (such as parameter 4, "listener", in android.location.LocationManager.requestLocationUpdates) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(android.location.LocationRequest, android.location.LocationListener, android.os.Looper): + SAM-compatible parameters (such as parameter 2, "listener", in android.location.LocationManager.requestLocationUpdates) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper): + SAM-compatible parameters (such as parameter 4, "listener", in android.location.LocationManager.requestLocationUpdates) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#requestSingleUpdate(String, android.location.LocationListener, android.os.Looper): + SAM-compatible parameters (such as parameter 2, "listener", in android.location.LocationManager.requestSingleUpdate) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.location.LocationManager#requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper): + SAM-compatible parameters (such as parameter 2, "listener", in android.location.LocationManager.requestSingleUpdate) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioManager#abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes): SAM-compatible parameters (such as parameter 1, "l", in android.media.AudioManager.abandonAudioFocus) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioManager#requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes, int, int): diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt index 1b45e88584fe..025e8629fc20 100644 --- a/core/api/system-lint-baseline.txt +++ b/core/api/system-lint-baseline.txt @@ -1,36 +1,20 @@ // Baseline format: 1.0 ArrayReturn: android.view.contentcapture.ViewNode#getAutofillOptions(): - -ExecutorRegistration: android.media.MediaPlayer#setOnRtpRxNoticeListener(android.content.Context, android.media.MediaPlayer.OnRtpRxNoticeListener, android.os.Handler): - Registration methods should have overload that accepts delivery Executor: `setOnRtpRxNoticeListener` + Method should return Collection<CharSequence> (or subclass) instead of raw array; was `java.lang.CharSequence[]` GenericException: android.app.prediction.AppPredictor#finalize(): - + Methods must not throw generic exceptions (`java.lang.Throwable`) GenericException: android.hardware.location.ContextHubClient#finalize(): - + Methods must not throw generic exceptions (`java.lang.Throwable`) GenericException: android.service.autofill.augmented.FillWindow#finalize(): - - - -IntentBuilderName: android.app.search.SearchAction#getIntent(): - -IntentBuilderName: android.app.smartspace.SmartspaceAction#getIntent(): - Methods creating an Intent should be named `create<Foo>Intent()`, was `getIntent` + Methods must not throw generic exceptions (`java.lang.Throwable`) KotlinKeyword: android.app.Notification#when: - + Avoid field names that are Kotlin hard keywords ("when"); see https://android.github.io/kotlin-guides/interop.html#no-hard-keywords -MissingGetterMatchingBuilder: android.os.NewUserRequest.Builder#setAdmin(): - android.os.NewUserRequest does not declare a `getAdmin()` method matching method android.os.NewUserRequest.Builder.setAdmin() -MissingGetterMatchingBuilder: android.os.NewUserRequest.Builder#setEphemeral(): - android.os.NewUserRequest does not declare a `getEphemeral()` method matching method android.os.NewUserRequest.Builder.setEphemeral() -MissingGetterMatchingBuilder: android.security.keystore.KeyGenParameterSpec.Builder#setUid(int): - android.security.keystore.KeyGenParameterSpec does not declare a `getUid()` method matching method android.security.keystore.KeyGenParameterSpec.Builder.setUid(int) -MissingGetterMatchingBuilder: android.service.autofill.Dataset.Builder#setFieldInlinePresentation(android.view.autofill.AutofillId, android.view.autofill.AutofillValue, java.util.regex.Pattern, android.service.autofill.InlinePresentation): - android.service.autofill.Dataset does not declare a `getFieldInlinePresentation()` method matching method android.service.autofill.Dataset.Builder.setFieldInlinePresentation(android.view.autofill.AutofillId,android.view.autofill.AutofillValue,java.util.regex.Pattern,android.service.autofill.InlinePresentation) MissingGetterMatchingBuilder: android.telecom.CallScreeningService.CallResponse.Builder#setShouldScreenCallViaAudioProcessing(boolean): android.telecom.CallScreeningService.CallResponse does not declare a `shouldScreenCallViaAudioProcessing()` method matching method android.telecom.CallScreeningService.CallResponse.Builder.setShouldScreenCallViaAudioProcessing(boolean) MissingGetterMatchingBuilder: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String): @@ -38,175 +22,135 @@ MissingGetterMatchingBuilder: android.telephony.mbms.DownloadRequest.Builder#set MissingNullability: android.media.soundtrigger.SoundTriggerDetectionService#onUnbind(android.content.Intent) parameter #0: - + Missing nullability on parameter `intent` in method `onUnbind` MissingNullability: android.media.tv.TvRecordingClient.RecordingCallback#onEvent(String, String, android.os.Bundle) parameter #0: - + Missing nullability on parameter `inputId` in method `onEvent` MissingNullability: android.media.tv.TvRecordingClient.RecordingCallback#onEvent(String, String, android.os.Bundle) parameter #1: - + Missing nullability on parameter `eventType` in method `onEvent` MissingNullability: android.media.tv.TvRecordingClient.RecordingCallback#onEvent(String, String, android.os.Bundle) parameter #2: - + Missing nullability on parameter `eventArgs` in method `onEvent` MissingNullability: android.printservice.recommendation.RecommendationService#attachBaseContext(android.content.Context) parameter #0: - + Missing nullability on parameter `base` in method `attachBaseContext` MissingNullability: android.provider.ContactsContract.MetadataSync#CONTENT_URI: - + Missing nullability on field `CONTENT_URI` in class `class android.provider.ContactsContract.MetadataSync` MissingNullability: android.provider.ContactsContract.MetadataSync#METADATA_AUTHORITY_URI: - + Missing nullability on field `METADATA_AUTHORITY_URI` in class `class android.provider.ContactsContract.MetadataSync` MissingNullability: android.provider.ContactsContract.MetadataSyncState#CONTENT_URI: - + Missing nullability on field `CONTENT_URI` in class `class android.provider.ContactsContract.MetadataSyncState` MissingNullability: android.provider.SearchIndexablesProvider#attachInfo(android.content.Context, android.content.pm.ProviderInfo) parameter #0: - + Missing nullability on parameter `context` in method `attachInfo` MissingNullability: android.provider.SearchIndexablesProvider#attachInfo(android.content.Context, android.content.pm.ProviderInfo) parameter #1: - + Missing nullability on parameter `info` in method `attachInfo` MissingNullability: android.service.autofill.augmented.AugmentedAutofillService#onUnbind(android.content.Intent) parameter #0: - + Missing nullability on parameter `intent` in method `onUnbind` MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0: - + Missing nullability on parameter `fd` in method `dump` MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #1: - + Missing nullability on parameter `pw` in method `dump` MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #2: - + Missing nullability on parameter `args` in method `dump` MissingNullability: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context) parameter #0: - + Missing nullability on parameter `base` in method `attachBaseContext` MissingNullability: android.telephony.NetworkService#onUnbind(android.content.Intent) parameter #0: - -MissingNullability: android.telephony.SubscriptionPlan.Builder#createRecurringDaily(java.time.ZonedDateTime) parameter #0: - -MissingNullability: android.telephony.SubscriptionPlan.Builder#createRecurringMonthly(java.time.ZonedDateTime) parameter #0: - -MissingNullability: android.telephony.SubscriptionPlan.Builder#createRecurringWeekly(java.time.ZonedDateTime) parameter #0: - + Missing nullability on parameter `intent` in method `onUnbind` MissingNullability: android.telephony.data.DataService#onUnbind(android.content.Intent) parameter #0: - + Missing nullability on parameter `intent` in method `onUnbind` MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String): - + Missing nullability on method `setServiceId` return MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String) parameter #0: - - - -NoSettingsProvider: android.provider.Settings.Secure#FAST_PAIR_SCAN_ENABLED: - New setting keys are not allowed (Field: FAST_PAIR_SCAN_ENABLED); use getters/setters in relevant manager class - - -OnNameExpected: android.service.smartspace.SmartspaceService#notifySmartspaceEvent(android.app.smartspace.SmartspaceSessionId, android.app.smartspace.SmartspaceTargetEvent): - Methods implemented by developers should follow the on<Something> style, was `notifySmartspaceEvent` + Missing nullability on parameter `serviceId` in method `setServiceId` ProtectedMember: android.printservice.recommendation.RecommendationService#attachBaseContext(android.content.Context): - + Protected methods not allowed; must be public: method android.printservice.recommendation.RecommendationService.attachBaseContext(android.content.Context)} ProtectedMember: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]): - + Protected methods not allowed; must be public: method android.service.contentcapture.ContentCaptureService.dump(java.io.FileDescriptor,java.io.PrintWriter,String[])} ProtectedMember: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context): - - - -RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimAmount(): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimmingAmount(): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimAmount(float): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimmingAmount(float): - Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) + Protected methods not allowed; must be public: method android.service.notification.NotificationAssistantService.attachBaseContext(android.content.Context)} SamShouldBeLast: android.accounts.AccountManager#addAccount(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 6, "callback", in android.accounts.AccountManager.addAccount) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean): - + SAM-compatible parameters (such as parameter 1, "listener", in android.accounts.AccountManager.addOnAccountsUpdatedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, String[]): - + SAM-compatible parameters (such as parameter 1, "listener", in android.accounts.AccountManager.addOnAccountsUpdatedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 4, "callback", in android.accounts.AccountManager.confirmCredentials) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#editProperties(String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.editProperties) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.finishSession) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.getAccountsByTypeAndFeatures) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#getAuthToken(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 5, "callback", in android.accounts.AccountManager.getAuthToken) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#getAuthToken(android.accounts.Account, String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 5, "callback", in android.accounts.AccountManager.getAuthToken) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#getAuthToken(android.accounts.Account, String, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 4, "callback", in android.accounts.AccountManager.getAuthToken) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#getAuthTokenByFeatures(String, String, String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 7, "callback", in android.accounts.AccountManager.getAuthTokenByFeatures) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#hasFeatures(android.accounts.Account, String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.hasFeatures) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#isCredentialsUpdateSuggested(android.accounts.Account, String, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.isCredentialsUpdateSuggested) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler): - + SAM-compatible parameters (such as parameter 2, "callback", in android.accounts.AccountManager.removeAccount) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.removeAccount) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#renameAccount(android.accounts.Account, String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.accounts.AccountManager.renameAccount) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#startAddAccountSession(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 6, "callback", in android.accounts.AccountManager.startAddAccountSession) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#startUpdateCredentialsSession(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 5, "callback", in android.accounts.AccountManager.startUpdateCredentialsSession) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.accounts.AccountManager#updateCredentials(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler): - + SAM-compatible parameters (such as parameter 5, "callback", in android.accounts.AccountManager.updateCredentials) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.AlarmManager#set(int, long, String, android.app.AlarmManager.OnAlarmListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 4, "listener", in android.app.AlarmManager.set) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.AlarmManager#setExact(int, long, String, android.app.AlarmManager.OnAlarmListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 4, "listener", in android.app.AlarmManager.setExact) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.AlarmManager#setWindow(int, long, long, String, android.app.AlarmManager.OnAlarmListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 5, "listener", in android.app.AlarmManager.setWindow) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.WallpaperInfo#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.app.WallpaperInfo.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.app.WallpaperManager#addOnColorsChangedListener(android.app.WallpaperManager.OnColorsChangedListener, android.os.Handler): - -SamShouldBeLast: android.app.admin.DevicePolicyManager#installSystemUpdate(android.content.ComponentName, android.net.Uri, java.util.concurrent.Executor, android.app.admin.DevicePolicyManager.InstallSystemUpdateCallback): - + SAM-compatible parameters (such as parameter 1, "listener", in android.app.WallpaperManager.addOnColorsChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.content.IntentFilter#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "du", in android.content.IntentFilter.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.content.pm.ApplicationInfo#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.ApplicationInfo.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.content.pm.PackageItemInfo#dumpBack(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.PackageItemInfo.dumpBack) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.content.pm.PackageItemInfo#dumpFront(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.PackageItemInfo.dumpFront) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.content.pm.ResolveInfo#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.content.pm.ResolveInfo.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.Location#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.location.Location.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.LocationManager#addNmeaListener(android.location.OnNmeaMessageListener, android.os.Handler): - -SamShouldBeLast: android.location.LocationManager#registerGnssMeasurementsCallback(java.util.concurrent.Executor, android.location.GnssMeasurementsEvent.Callback): - -SamShouldBeLast: android.location.LocationManager#registerGnssNavigationMessageCallback(java.util.concurrent.Executor, android.location.GnssNavigationMessage.Callback): - -SamShouldBeLast: android.location.LocationManager#registerGnssStatusCallback(java.util.concurrent.Executor, android.location.GnssStatus.Callback): - + SAM-compatible parameters (such as parameter 1, "listener", in android.location.LocationManager.addNmeaListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(String, long, float, android.location.LocationListener, android.os.Looper): - -SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(String, long, float, java.util.concurrent.Executor, android.location.LocationListener): - -SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(android.location.LocationRequest, java.util.concurrent.Executor, android.location.LocationListener): - + SAM-compatible parameters (such as parameter 4, "listener", in android.location.LocationManager.requestLocationUpdates) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(long, float, android.location.Criteria, android.location.LocationListener, android.os.Looper): - -SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(long, float, android.location.Criteria, java.util.concurrent.Executor, android.location.LocationListener): - + SAM-compatible parameters (such as parameter 4, "listener", in android.location.LocationManager.requestLocationUpdates) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.LocationManager#requestSingleUpdate(String, android.location.LocationListener, android.os.Looper): - + SAM-compatible parameters (such as parameter 2, "listener", in android.location.LocationManager.requestSingleUpdate) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.location.LocationManager#requestSingleUpdate(android.location.Criteria, android.location.LocationListener, android.os.Looper): - + SAM-compatible parameters (such as parameter 2, "listener", in android.location.LocationManager.requestSingleUpdate) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioFocusRequest.Builder#setOnAudioFocusChangeListener(android.media.AudioManager.OnAudioFocusChangeListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.AudioFocusRequest.Builder.setOnAudioFocusChangeListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioManager#requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int): - + SAM-compatible parameters (such as parameter 1, "l", in android.media.AudioManager.requestAudioFocus) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioRecord#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler): - -SamShouldBeLast: android.media.AudioRecord#registerAudioRecordingCallback(java.util.concurrent.Executor, android.media.AudioManager.AudioRecordingCallback): - -SamShouldBeLast: android.media.AudioRecordingMonitor#registerAudioRecordingCallback(java.util.concurrent.Executor, android.media.AudioManager.AudioRecordingCallback): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.AudioRecord.addOnRoutingChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioRouting#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.AudioRouting.addOnRoutingChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.AudioTrack#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.AudioTrack.addOnRoutingChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions +SamShouldBeLast: android.media.MediaCodec#setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler): + SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaCodec.setOnFrameRenderedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.MediaPlayer#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler): SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaPlayer.addOnRoutingChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.MediaPlayer#setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler): @@ -215,82 +159,65 @@ SamShouldBeLast: android.media.MediaPlayer#setOnDrmPreparedListener(android.medi SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaPlayer.setOnDrmPreparedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.MediaPlayer#setOnMediaTimeDiscontinuityListener(android.media.MediaPlayer.OnMediaTimeDiscontinuityListener, android.os.Handler): SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaPlayer.setOnMediaTimeDiscontinuityListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions -SamShouldBeLast: android.media.MediaPlayer#setOnRtpRxNoticeListener(android.content.Context, android.media.MediaPlayer.OnRtpRxNoticeListener, android.os.Handler): - SAM-compatible parameters (such as parameter 2, "listener", in android.media.MediaPlayer.setOnRtpRxNoticeListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.MediaPlayer#setOnSubtitleDataListener(android.media.MediaPlayer.OnSubtitleDataListener, android.os.Handler): SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaPlayer.setOnSubtitleDataListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.MediaRecorder#addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler): - -SamShouldBeLast: android.media.MediaRecorder#registerAudioRecordingCallback(java.util.concurrent.Executor, android.media.AudioManager.AudioRecordingCallback): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.MediaRecorder.addOnRoutingChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.session.MediaSessionManager#addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName): - + SAM-compatible parameters (such as parameter 1, "sessionListener", in android.media.session.MediaSessionManager.addOnActiveSessionsChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.session.MediaSessionManager#addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "sessionListener", in android.media.session.MediaSessionManager.addOnActiveSessionsChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.media.session.MediaSessionManager#addOnSession2TokensChangedListener(android.media.session.MediaSessionManager.OnSession2TokensChangedListener, android.os.Handler): - -SamShouldBeLast: android.media.session.MediaSessionManager#registerCallback(java.util.concurrent.Executor, android.media.session.MediaSessionManager.Callback): - + SAM-compatible parameters (such as parameter 1, "listener", in android.media.session.MediaSessionManager.addOnSession2TokensChangedListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.nfc.NfcAdapter#enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle): - + SAM-compatible parameters (such as parameter 2, "callback", in android.nfc.NfcAdapter.enableReaderMode) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.nfc.NfcAdapter#ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "tagRemovedListener", in android.nfc.NfcAdapter.ignore) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.nfc.NfcAdapter#setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity): - + SAM-compatible parameters (such as parameter 1, "callback", in android.nfc.NfcAdapter.setBeamPushUrisCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.nfc.NfcAdapter#setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...): - + SAM-compatible parameters (such as parameter 1, "callback", in android.nfc.NfcAdapter.setNdefPushMessageCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.nfc.NfcAdapter#setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...): - + SAM-compatible parameters (such as parameter 1, "callback", in android.nfc.NfcAdapter.setOnNdefPushCompleteCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Binder#attachInterface(android.os.IInterface, String): - + SAM-compatible parameters (such as parameter 1, "owner", in android.os.Binder.attachInterface) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Binder#linkToDeath(android.os.IBinder.DeathRecipient, int): - + SAM-compatible parameters (such as parameter 1, "recipient", in android.os.Binder.linkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Binder#unlinkToDeath(android.os.IBinder.DeathRecipient, int): - + SAM-compatible parameters (such as parameter 1, "recipient", in android.os.Binder.unlinkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.os.Handler.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#postAtTime(Runnable, Object, long): - + SAM-compatible parameters (such as parameter 1, "r", in android.os.Handler.postAtTime) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#postAtTime(Runnable, long): - + SAM-compatible parameters (such as parameter 1, "r", in android.os.Handler.postAtTime) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#postDelayed(Runnable, Object, long): - + SAM-compatible parameters (such as parameter 1, "r", in android.os.Handler.postDelayed) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#postDelayed(Runnable, long): - + SAM-compatible parameters (such as parameter 1, "r", in android.os.Handler.postDelayed) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.Handler#removeCallbacks(Runnable, Object): - + SAM-compatible parameters (such as parameter 1, "r", in android.os.Handler.removeCallbacks) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.IBinder#linkToDeath(android.os.IBinder.DeathRecipient, int): - + SAM-compatible parameters (such as parameter 1, "recipient", in android.os.IBinder.linkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.IBinder#unlinkToDeath(android.os.IBinder.DeathRecipient, int): - + SAM-compatible parameters (such as parameter 1, "recipient", in android.os.IBinder.unlinkToDeath) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.RecoverySystem#verifyPackage(java.io.File, android.os.RecoverySystem.ProgressListener, java.io.File): - + SAM-compatible parameters (such as parameter 2, "listener", in android.os.RecoverySystem.verifyPackage) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.security.KeyChain#choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, String[], java.security.Principal[], String, int, String): SAM-compatible parameters (such as parameter 2, "response", in android.security.KeyChain.choosePrivateKeyAlias) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.security.KeyChain#choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, String[], java.security.Principal[], android.net.Uri, String): SAM-compatible parameters (such as parameter 2, "response", in android.security.KeyChain.choosePrivateKeyAlias) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.View#postDelayed(Runnable, long): - + SAM-compatible parameters (such as parameter 1, "action", in android.view.View.postDelayed) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.View#postOnAnimationDelayed(Runnable, long): - + SAM-compatible parameters (such as parameter 1, "action", in android.view.View.postOnAnimationDelayed) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.View#scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long): - + SAM-compatible parameters (such as parameter 2, "what", in android.view.View.scheduleDrawable) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.Window#addOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.view.Window.addOnFrameMetricsAvailableListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.accessibility.AccessibilityManager#addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.view.accessibility.AccessibilityManager.addAccessibilityStateChangeListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.accessibility.AccessibilityManager#addTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener, android.os.Handler): - + SAM-compatible parameters (such as parameter 1, "listener", in android.view.accessibility.AccessibilityManager.addTouchExplorationStateChangeListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.webkit.WebChromeClient#onShowFileChooser(android.webkit.WebView, android.webkit.ValueCallback<android.net.Uri[]>, android.webkit.WebChromeClient.FileChooserParams): - - - -ServiceName: android.content.Context#CLOUDSEARCH_SERVICE: - - -UserHandleName: android.app.search.SearchAction.Builder#setUserHandle(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `setUserHandle` -UserHandleName: android.app.search.SearchTarget.Builder#setUserHandle(android.os.UserHandle): - -UserHandleName: android.app.smartspace.SmartspaceAction.Builder#setUserHandle(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `setUserHandle` + SAM-compatible parameters (such as parameter 2, "filePathCallback", in android.webkit.WebChromeClient.onShowFileChooser) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 167cd344a2c9..cac13743461d 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -168,11 +168,11 @@ package android.app { } public static interface ActivityOptions.OnAnimationFinishedListener { - method public void onAnimationFinished(); + method public void onAnimationFinished(long); } public static interface ActivityOptions.OnAnimationStartedListener { - method public void onAnimationStarted(); + method public void onAnimationStarted(long); } public class ActivityTaskManager { @@ -464,6 +464,7 @@ package android.app { method @NonNull public android.graphics.Rect getMaxBounds(); method public int getRotation(); method public int getWindowingMode(); + method public static boolean isFloating(int); method public void setActivityType(int); method public void setAppBounds(android.graphics.Rect); method public void setBounds(android.graphics.Rect); diff --git a/core/api/test-lint-baseline.txt b/core/api/test-lint-baseline.txt index 01604e6becf0..0a906bee6fad 100644 --- a/core/api/test-lint-baseline.txt +++ b/core/api/test-lint-baseline.txt @@ -1,920 +1,270 @@ // Baseline format: 1.0 AcronymName: android.app.NotificationChannel#isImportanceLockedByOEM(): - + Acronyms should not be capitalized in method names: was `isImportanceLockedByOEM`, should this be `isImportanceLockedByOem`? AcronymName: android.app.NotificationChannel#setImportanceLockedByOEM(boolean): - - - -ActionValue: android.location.Location#EXTRA_NO_GPS_LOCATION: - -ActionValue: android.net.TetheringManager#ACTION_TETHER_STATE_CHANGED: - -ActionValue: android.net.TetheringManager#EXTRA_ACTIVE_TETHER: - -ActionValue: android.net.TetheringManager#EXTRA_AVAILABLE_TETHER: - -ActionValue: android.net.TetheringManager#EXTRA_ERRORED_TETHER: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_ADDITIONAL_CALL_INFO: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_CALL_RAT_TYPE: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_CHILD_NUMBER: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_CNA: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_CNAP: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_CODEC: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_DIALSTRING: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_DISPLAY_TEXT: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_EMERGENCY_CALL: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_IS_CALL_PULL: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_OI: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_OIR: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_REMOTE_URI: - -ActionValue: android.telephony.ims.ImsCallProfile#EXTRA_USSD: - -ActionValue: android.telephony.ims.ImsReasonInfo#EXTRA_MSG_SERVICE_NOT_AUTHORIZED: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#ACTION_CLEANUP: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#ACTION_DOWNLOAD_RESULT_INTERNAL: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#ACTION_FILE_DESCRIPTOR_REQUEST: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_FD_COUNT: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_FINAL_URI: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_FREE_URI_LIST: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_PAUSED_LIST: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_PAUSED_URI_LIST: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_SERVICE_ID: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_TEMP_FILES_IN_USE: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_TEMP_FILE_ROOT: - -ActionValue: android.telephony.mbms.vendor.VendorUtils#EXTRA_TEMP_LIST: - - - -AllUpper: android.media.audiopolicy.AudioProductStrategy#sDefaultAttributes: - Constant field names must be named with only upper case characters: `android.media.audiopolicy.AudioProductStrategy#sDefaultAttributes`, should be `S_DEFAULT_ATTRIBUTES`? - - -ArrayReturn: android.app.UiAutomation#executeShellCommandRw(String): - -ArrayReturn: android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel#KeyphraseSoundModel(java.util.UUID, java.util.UUID, byte[], android.hardware.soundtrigger.SoundTrigger.Keyphrase[]) parameter #3: - -ArrayReturn: android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel#KeyphraseSoundModel(java.util.UUID, java.util.UUID, byte[], android.hardware.soundtrigger.SoundTrigger.Keyphrase[], int) parameter #3: - -ArrayReturn: android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel#getKeyphrases(): - -ArrayReturn: android.location.GnssMeasurementsEvent#GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]) parameter #1: - + Acronyms should not be capitalized in method names: was `setImportanceLockedByOEM`, should this be `setImportanceLockedByOem`? + + ArrayReturn: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #10: - + Method parameter should be Collection<Descriptor> (or subclass) instead of raw array; was `android.media.audiofx.AudioEffect.Descriptor[]` ArrayReturn: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #11: - -ArrayReturn: android.metrics.LogMaker#LogMaker(Object[]) parameter #0: - -ArrayReturn: android.metrics.LogMaker#deserialize(Object[]) parameter #0: - -ArrayReturn: android.metrics.LogMaker#serialize(): - -ArrayReturn: android.net.TestNetworkManager#createTunInterface(android.net.LinkAddress[]) parameter #0: - -ArrayReturn: android.os.HwBlob#wrapArray(boolean[]): - -ArrayReturn: android.os.HwBlob#wrapArray(byte[]): - -ArrayReturn: android.os.HwBlob#wrapArray(double[]): - -ArrayReturn: android.os.HwBlob#wrapArray(float[]): - -ArrayReturn: android.os.HwBlob#wrapArray(int[]): - -ArrayReturn: android.os.HwBlob#wrapArray(long[]): - -ArrayReturn: android.os.HwBlob#wrapArray(short[]): - -ArrayReturn: android.os.NativeHandle#NativeHandle(java.io.FileDescriptor[], int[], boolean) parameter #0: - -ArrayReturn: android.os.NativeHandle#getFileDescriptors(): - -ArrayReturn: android.security.keystore.AttestationUtils#attestDeviceIds(android.content.Context, int[], byte[]): - -ArrayReturn: android.telephony.ims.ImsUtListener#onUtConfigurationCallBarringQueried(int, android.telephony.ims.ImsSsInfo[]) parameter #1: - -ArrayReturn: android.telephony.ims.ImsUtListener#onUtConfigurationCallForwardQueried(int, android.telephony.ims.ImsCallForwardInfo[]) parameter #1: - -ArrayReturn: android.telephony.ims.ImsUtListener#onUtConfigurationCallWaitingQueried(int, android.telephony.ims.ImsSsInfo[]) parameter #1: - -ArrayReturn: android.telephony.ims.stub.ImsRegistrationImplBase#onSubscriberAssociatedUriChanged(android.net.Uri[]) parameter #0: - + Method parameter should be Collection<Descriptor> (or subclass) instead of raw array; was `android.media.audiofx.AudioEffect.Descriptor[]` ArrayReturn: android.view.Display#getSupportedWideColorGamut(): - + Method should return Collection<ColorSpace> (or subclass) instead of raw array; was `android.graphics.ColorSpace[]` ArrayReturn: android.view.FocusFinder#sort(android.view.View[], int, int, android.view.ViewGroup, boolean) parameter #0: - -ArrayReturn: android.view.contentcapture.ViewNode#getAutofillOptions(): - + Method parameter should be Collection<View> (or subclass) instead of raw array; was `android.view.View[]` ArrayReturn: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillOptions(CharSequence[]) parameter #0: - -ArrayReturn: android.view.inspector.InspectableProperty#enumMapping(): - -ArrayReturn: android.view.inspector.InspectableProperty#flagMapping(): - - - -AutoBoxing: android.os.HwBlob#wrapArray(byte[]): - -AutoBoxing: android.os.HwBlob#wrapArray(double[]): - -AutoBoxing: android.os.HwBlob#wrapArray(float[]): - -AutoBoxing: android.os.HwBlob#wrapArray(int[]): - -AutoBoxing: android.os.HwBlob#wrapArray(long[]): - -AutoBoxing: android.os.HwBlob#wrapArray(short[]): - -AutoBoxing: android.os.VintfObject#getTargetFrameworkCompatibilityMatrixVersion(): - - - -BannedThrow: android.app.ActivityTaskManager#removeStacksInWindowingModes(int[]): - -BannedThrow: android.app.ActivityTaskManager#removeStacksWithActivityTypes(int[]): - -BannedThrow: android.app.ActivityTaskManager#setTaskWindowingMode(int, int, boolean): - -BannedThrow: android.app.ActivityTaskManager#setTaskWindowingModeSplitScreenPrimary(int, int, boolean, boolean, android.graphics.Rect, boolean): - -BannedThrow: android.media.audiofx.AudioEffect#getParameter(byte[], byte[]): - -BannedThrow: android.media.audiofx.AudioEffect#getParameter(int, byte[]): - -BannedThrow: android.media.audiofx.AudioEffect#getParameter(int, int[]): - -BannedThrow: android.media.audiofx.AudioEffect#getParameter(int, short[]): - -BannedThrow: android.media.audiofx.AudioEffect#getParameter(int[], short[]): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(byte[], byte[]): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(int, byte[]): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(int, int): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(int, short): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(int[], byte[]): - -BannedThrow: android.media.audiofx.AudioEffect#setParameter(int[], int[]): - -BannedThrow: android.media.audiopolicy.AudioMix.Builder#Builder(android.media.audiopolicy.AudioMixingRule): - -BannedThrow: android.media.audiopolicy.AudioMix.Builder#build(): - -BannedThrow: android.media.audiopolicy.AudioMix.Builder#setDevice(android.media.AudioDeviceInfo): - -BannedThrow: android.media.audiopolicy.AudioMix.Builder#setFormat(android.media.AudioFormat): - -BannedThrow: android.media.audiopolicy.AudioMix.Builder#setRouteFlags(int): - -BannedThrow: android.media.audiopolicy.AudioMixingRule.Builder#addMixRule(int, Object): - -BannedThrow: android.media.audiopolicy.AudioMixingRule.Builder#addRule(android.media.AudioAttributes, int): - -BannedThrow: android.media.audiopolicy.AudioMixingRule.Builder#excludeMixRule(int, Object): - -BannedThrow: android.media.audiopolicy.AudioMixingRule.Builder#excludeRule(android.media.AudioAttributes, int): - -BannedThrow: android.media.audiopolicy.AudioPolicy#createAudioRecordSink(android.media.audiopolicy.AudioMix): - -BannedThrow: android.media.audiopolicy.AudioPolicy#createAudioTrackSource(android.media.audiopolicy.AudioMix): - -BannedThrow: android.media.audiopolicy.AudioPolicy#setFocusDuckingBehavior(int): - -BannedThrow: android.media.audiopolicy.AudioPolicy.Builder#addMix(android.media.audiopolicy.AudioMix): - -BannedThrow: android.media.audiopolicy.AudioPolicy.Builder#setLooper(android.os.Looper): - -BannedThrow: android.os.HwBinder#getService(String, String): - -BannedThrow: android.os.HwBinder#getService(String, String, boolean): - -BannedThrow: android.os.Process#getThreadScheduler(int): - - - -BuilderSetStyle: android.media.audiopolicy.AudioMixingRule.Builder#allowPrivilegedPlaybackCapture(boolean): - -BuilderSetStyle: android.media.audiopolicy.AudioMixingRule.Builder#excludeMixRule(int, Object): - -BuilderSetStyle: android.media.audiopolicy.AudioMixingRule.Builder#excludeRule(android.media.AudioAttributes, int): - -BuilderSetStyle: android.net.NetworkCapabilities.Builder#removeCapability(int): - -BuilderSetStyle: android.net.NetworkCapabilities.Builder#removeTransportType(int): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updateDnsslLifetime(long): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updatePrefixPreferredLifetime(long): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updatePrefixValidLifetime(long): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updateRdnssLifetime(long): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updateRouteInfoLifetime(long): - -BuilderSetStyle: android.net.metrics.RaEvent.Builder#updateRouterLifetime(long): - -BuilderSetStyle: android.os.StrictMode.ThreadPolicy.Builder#detectExplicitGc(): - -BuilderSetStyle: android.os.StrictMode.VmPolicy.Builder#detectIncorrectContextUse(): - -BuilderSetStyle: android.os.StrictMode.VmPolicy.Builder#permitIncorrectContextUse(): - + Method parameter should be Collection<CharSequence> (or subclass) instead of raw array; was `java.lang.CharSequence[]` -CallbackInterface: android.app.prediction.AppPredictor.Callback: - -CallbackInterface: android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback: - -CallbackInterface: android.widget.Magnifier.Callback: - +AutoBoxing: android.os.VintfObject#getTargetFrameworkCompatibilityMatrixVersion(): + Must avoid boxed primitives (`java.lang.Long`) -CallbackMethodName: android.os.RemoteCallback: - +BuilderSetStyle: android.os.StrictMode.ThreadPolicy.Builder#detectExplicitGc(): + Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.os.StrictMode.ThreadPolicy.Builder.detectExplicitGc() +BuilderSetStyle: android.os.StrictMode.VmPolicy.Builder#permitIncorrectContextUse(): + Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.os.StrictMode.VmPolicy.Builder.permitIncorrectContextUse() ConcreteCollection: android.content.AutofillOptions#disabledActivities: - + Field type is concrete collection (`android.util.ArrayMap`); must be higher-level interface ConcreteCollection: android.content.AutofillOptions#whitelistedActivitiesForAugmentedAutofill: - + Field type is concrete collection (`android.util.ArraySet`); must be higher-level interface ConcreteCollection: android.content.ContentCaptureOptions#ContentCaptureOptions(int, int, int, int, int, android.util.ArraySet<android.content.ComponentName>) parameter #5: - + Parameter type is concrete collection (`android.util.ArraySet`); must be higher-level interface ConcreteCollection: android.content.ContentCaptureOptions#whitelistedComponents: - + Field type is concrete collection (`android.util.ArraySet`); must be higher-level interface ConcreteCollection: android.database.sqlite.SQLiteDebug.PagerStats#dbStats: - -ConcreteCollection: android.os.HwParcel#readBoolVector(): - -ConcreteCollection: android.os.HwParcel#readDoubleVector(): - -ConcreteCollection: android.os.HwParcel#readFloatVector(): - -ConcreteCollection: android.os.HwParcel#readInt16Vector(): - -ConcreteCollection: android.os.HwParcel#readInt32Vector(): - -ConcreteCollection: android.os.HwParcel#readInt64Vector(): - -ConcreteCollection: android.os.HwParcel#readInt8Vector(): - -ConcreteCollection: android.os.HwParcel#readNativeHandleVector(): - -ConcreteCollection: android.os.HwParcel#readStringVector(): - -ConcreteCollection: android.os.HwParcel#writeBoolVector(java.util.ArrayList<java.lang.Boolean>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeDoubleVector(java.util.ArrayList<java.lang.Double>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeFloatVector(java.util.ArrayList<java.lang.Float>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeInt16Vector(java.util.ArrayList<java.lang.Short>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeInt32Vector(java.util.ArrayList<java.lang.Integer>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeInt64Vector(java.util.ArrayList<java.lang.Long>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeInt8Vector(java.util.ArrayList<java.lang.Byte>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeNativeHandleVector(java.util.ArrayList<android.os.NativeHandle>) parameter #0: - -ConcreteCollection: android.os.HwParcel#writeStringVector(java.util.ArrayList<java.lang.String>) parameter #0: - + Field type is concrete collection (`java.util.ArrayList`); must be higher-level interface ConcreteCollection: android.service.autofill.CompositeUserData#getFieldClassificationAlgorithms(): - + Return type is concrete collection (`android.util.ArrayMap`); must be higher-level interface ConcreteCollection: android.service.autofill.CompositeUserData#getFieldClassificationArgs(): - + Return type is concrete collection (`android.util.ArrayMap`); must be higher-level interface ConcreteCollection: android.service.autofill.InternalTransformation#batchApply(android.service.autofill.ValueFinder, android.widget.RemoteViews, java.util.ArrayList<android.util.Pair<java.lang.Integer,android.service.autofill.InternalTransformation>>) parameter #2: - + Parameter type is concrete collection (`java.util.ArrayList`); must be higher-level interface ConcreteCollection: android.service.autofill.UserData#getFieldClassificationAlgorithms(): - -ConcreteCollection: android.telephony.ims.ImsConferenceState#mParticipants: - + Return type is concrete collection (`android.util.ArrayMap`); must be higher-level interface ContextFirst: android.os.VibrationEffect#get(android.net.Uri, android.content.Context) parameter #1: - - - -ContextNameSuffix: android.telephony.mbms.vendor.MbmsGroupCallServiceBase: - + Context is distinct, so it must be the first argument (method `get`) EndsWithImpl: android.view.contentcapture.ViewNode.ViewStructureImpl: - + Don't expose your implementation details: `ViewStructureImpl` ends with `Impl` Enum: android.view.inspector.InspectableProperty.ValueType: - - - -EqualsAndHashCode: android.app.prediction.AppPredictionContext#equals(Object): - -EqualsAndHashCode: android.app.prediction.AppTarget#equals(Object): - -EqualsAndHashCode: android.app.prediction.AppTargetEvent#equals(Object): - -EqualsAndHashCode: android.net.apf.ApfCapabilities#equals(Object): - -EqualsAndHashCode: android.net.metrics.ApfProgramEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.ApfStats#equals(Object): - -EqualsAndHashCode: android.net.metrics.DhcpClientEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.IpManagerEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.IpReachabilityEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.NetworkEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.RaEvent#equals(Object): - -EqualsAndHashCode: android.net.metrics.ValidationProbeEvent#equals(Object): - -EqualsAndHashCode: android.os.IncidentManager.PendingReport#equals(Object): - + Enums are discouraged in Android APIs + + EqualsAndHashCode: android.os.StrictMode.ViolationInfo#hashCode(): - + Must override both equals and hashCode; missing one in android.os.StrictMode.ViolationInfo -ExecutorRegistration: android.content.pm.PackageManager#addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener): - -ExecutorRegistration: android.hardware.camera2.CameraDevice#createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, int, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler): - ExecutorRegistration: android.media.audiofx.AudioEffect#setParameterListener(android.media.audiofx.AudioEffect.OnParameterChangeListener): - -ExecutorRegistration: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyFocusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener): - -ExecutorRegistration: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyStatusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener): - -ExecutorRegistration: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyVolumeCallback(android.media.audiopolicy.AudioPolicy.AudioPolicyVolumeCallback): - -ExecutorRegistration: android.os.IncidentManager#cancelAuthorization(android.os.IncidentManager.AuthListener): - -ExecutorRegistration: android.os.IncidentManager#requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener): - -ExecutorRegistration: android.os.RemoteCallback#RemoteCallback(android.os.RemoteCallback.OnResultListener, android.os.Handler): - + Registration methods should have overload that accepts delivery Executor: `setParameterListener` ExecutorRegistration: android.permission.PermissionControllerManager#countPermissionApps(java.util.List<java.lang.String>, int, android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, android.os.Handler): - + Registration methods should have overload that accepts delivery Executor: `countPermissionApps` ExecutorRegistration: android.permission.PermissionControllerManager#getAppPermissions(String, android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, android.os.Handler): - + Registration methods should have overload that accepts delivery Executor: `getAppPermissions` ExecutorRegistration: android.service.watchdog.ExplicitHealthCheckService#setCallback(android.os.RemoteCallback): - -ExecutorRegistration: android.telephony.ims.stub.ImsCallSessionImplBase#setListener(android.telephony.ims.ImsCallSessionListener): - -ExecutorRegistration: android.telephony.ims.stub.ImsUtImplBase#setListener(android.telephony.ims.ImsUtListener): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsDownloadServiceBase#initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsStreamingServiceBase#initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int): - -ExecutorRegistration: android.telephony.mbms.vendor.MbmsStreamingServiceBase#startStreaming(int, String, android.telephony.mbms.StreamingServiceCallback): - + Registration methods should have overload that accepts delivery Executor: `setCallback` ExecutorRegistration: android.window.WindowOrganizer#applySyncTransaction(android.window.WindowContainerTransaction, android.window.WindowContainerTransactionCallback): - + Registration methods should have overload that accepts delivery Executor: `applySyncTransaction` ForbiddenSuperClass: android.app.AppDetailsActivity: - + AppDetailsActivity should not extend `Activity`. Activity subclasses are impossible to compose. Expose a composable API instead. -GenericException: android.app.prediction.AppPredictor#finalize(): - GenericException: android.service.autofill.CharSequenceTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - + Methods must not throw generic exceptions (`java.lang.Exception`) GenericException: android.service.autofill.DateTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - + Methods must not throw generic exceptions (`java.lang.Exception`) GenericException: android.service.autofill.ImageTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - -GenericException: android.service.autofill.augmented.FillWindow#finalize(): - - - -GetterOnBuilder: android.hardware.display.BrightnessConfiguration.Builder#getMaxCorrectionsByCategory(): - -GetterOnBuilder: android.hardware.display.BrightnessConfiguration.Builder#getMaxCorrectionsByPackageName(): - + Methods must not throw generic exceptions (`java.lang.Exception`) -GetterSetterNames: android.app.NotificationChannel#isBlockableSystem(): - -GetterSetterNames: android.app.NotificationChannel#isImportanceLockedByCriticalDeviceFunction(): - -GetterSetterNames: android.app.NotificationChannel#isImportanceLockedByOEM(): - GetterSetterNames: android.location.GnssClock#setBiasNanos(double): - + Symmetric method for `hasBiasNanos` must be named `setHasBiasNanos`; was `setBiasNanos` GetterSetterNames: android.location.GnssClock#setBiasUncertaintyNanos(double): - + Symmetric method for `hasBiasUncertaintyNanos` must be named `setHasBiasUncertaintyNanos`; was `setBiasUncertaintyNanos` GetterSetterNames: android.location.GnssClock#setDriftNanosPerSecond(double): - + Symmetric method for `hasDriftNanosPerSecond` must be named `setHasDriftNanosPerSecond`; was `setDriftNanosPerSecond` GetterSetterNames: android.location.GnssClock#setDriftUncertaintyNanosPerSecond(double): - + Symmetric method for `hasDriftUncertaintyNanosPerSecond` must be named `setHasDriftUncertaintyNanosPerSecond`; was `setDriftUncertaintyNanosPerSecond` GetterSetterNames: android.location.GnssClock#setElapsedRealtimeNanos(long): - + Symmetric method for `hasElapsedRealtimeNanos` must be named `setHasElapsedRealtimeNanos`; was `setElapsedRealtimeNanos` GetterSetterNames: android.location.GnssClock#setElapsedRealtimeUncertaintyNanos(double): - + Symmetric method for `hasElapsedRealtimeUncertaintyNanos` must be named `setHasElapsedRealtimeUncertaintyNanos`; was `setElapsedRealtimeUncertaintyNanos` GetterSetterNames: android.location.GnssClock#setFullBiasNanos(long): - + Symmetric method for `hasFullBiasNanos` must be named `setHasFullBiasNanos`; was `setFullBiasNanos` GetterSetterNames: android.location.GnssClock#setLeapSecond(int): - + Symmetric method for `hasLeapSecond` must be named `setHasLeapSecond`; was `setLeapSecond` GetterSetterNames: android.location.GnssClock#setReferenceCarrierFrequencyHzForIsb(double): - + Symmetric method for `hasReferenceCarrierFrequencyHzForIsb` must be named `setHasReferenceCarrierFrequencyHzForIsb`; was `setReferenceCarrierFrequencyHzForIsb` GetterSetterNames: android.location.GnssClock#setReferenceCodeTypeForIsb(String): - + Symmetric method for `hasReferenceCodeTypeForIsb` must be named `setHasReferenceCodeTypeForIsb`; was `setReferenceCodeTypeForIsb` GetterSetterNames: android.location.GnssClock#setReferenceConstellationTypeForIsb(int): - + Symmetric method for `hasReferenceConstellationTypeForIsb` must be named `setHasReferenceConstellationTypeForIsb`; was `setReferenceConstellationTypeForIsb` GetterSetterNames: android.location.GnssClock#setTimeUncertaintyNanos(double): - + Symmetric method for `hasTimeUncertaintyNanos` must be named `setHasTimeUncertaintyNanos`; was `setTimeUncertaintyNanos` GetterSetterNames: android.location.GnssMeasurement#setBasebandCn0DbHz(double): - + Symmetric method for `hasBasebandCn0DbHz` must be named `setHasBasebandCn0DbHz`; was `setBasebandCn0DbHz` GetterSetterNames: android.location.GnssMeasurement#setCarrierFrequencyHz(float): - + Symmetric method for `hasCarrierFrequencyHz` must be named `setHasCarrierFrequencyHz`; was `setCarrierFrequencyHz` GetterSetterNames: android.location.GnssMeasurement#setCodeType(String): - + Symmetric method for `hasCodeType` must be named `setHasCodeType`; was `setCodeType` GetterSetterNames: android.location.GnssMeasurement#setCorrelationVectors(java.util.Collection<android.location.CorrelationVector>): - + Symmetric method for `hasCorrelationVectors` must be named `setHasCorrelationVectors`; was `setCorrelationVectors` GetterSetterNames: android.location.GnssMeasurement#setFullInterSignalBiasNanos(double): - + Symmetric method for `hasFullInterSignalBiasNanos` must be named `setHasFullInterSignalBiasNanos`; was `setFullInterSignalBiasNanos` GetterSetterNames: android.location.GnssMeasurement#setFullInterSignalBiasUncertaintyNanos(double): - + Symmetric method for `hasFullInterSignalBiasUncertaintyNanos` must be named `setHasFullInterSignalBiasUncertaintyNanos`; was `setFullInterSignalBiasUncertaintyNanos` GetterSetterNames: android.location.GnssMeasurement#setSatelliteInterSignalBiasNanos(double): - + Symmetric method for `hasSatelliteInterSignalBiasNanos` must be named `setHasSatelliteInterSignalBiasNanos`; was `setSatelliteInterSignalBiasNanos` GetterSetterNames: android.location.GnssMeasurement#setSatelliteInterSignalBiasUncertaintyNanos(double): - + Symmetric method for `hasSatelliteInterSignalBiasUncertaintyNanos` must be named `setHasSatelliteInterSignalBiasUncertaintyNanos`; was `setSatelliteInterSignalBiasUncertaintyNanos` GetterSetterNames: android.location.GnssMeasurement#setSatellitePvt(android.location.SatellitePvt): - + Symmetric method for `hasSatellitePvt` must be named `setHasSatellitePvt`; was `setSatellitePvt` GetterSetterNames: android.location.GnssMeasurement#setSnrInDb(double): - -GetterSetterNames: android.location.LocationRequest#isLocationSettingsIgnored(): - -GetterSetterNames: android.location.LocationRequest#isLowPowerMode(): - + Symmetric method for `hasSnrInDb` must be named `setHasSnrInDb`; was `setSnrInDb` GetterSetterNames: android.net.NetworkPolicyManager#getRestrictBackground(): Symmetric method for `setRestrictBackground` must be named `isRestrictBackground`; was `getRestrictBackground` -GetterSetterNames: android.os.IncidentReportArgs#isAll(): - -GetterSetterNames: android.service.notification.NotificationStats#setDirectReplied(): - -GetterSetterNames: android.service.notification.NotificationStats#setExpanded(): - -GetterSetterNames: android.service.notification.NotificationStats#setSeen(): - -GetterSetterNames: android.service.notification.NotificationStats#setSnoozed(): - -GetterSetterNames: android.service.notification.NotificationStats#setViewedSettings(): - -GetterSetterNames: android.view.View#isAutofilled(): - -GetterSetterNames: android.view.View#isDefaultFocusHighlightEnabled(): - - - -IllegalStateException: android.media.audiopolicy.AudioMix.Builder#build(): - - - -IntentBuilderName: android.app.backup.BackupManager#getConfigurationIntent(String): - -IntentBuilderName: android.app.backup.BackupManager#getDataManagementIntent(String): - + + IntentBuilderName: android.hardware.soundtrigger.KeyphraseEnrollmentInfo#getManageKeyphraseIntent(int, String, java.util.Locale): - + Methods creating an Intent should be named `create<Foo>Intent()`, was `getManageKeyphraseIntent` IntentName: android.provider.Settings.Secure#VOICE_INTERACTION_SERVICE: - + Intent action constant name must be ACTION_FOO: VOICE_INTERACTION_SERVICE IntentName: android.provider.Telephony.Sms.Intents#SMS_CARRIER_PROVISION_ACTION: - -IntentName: android.service.notification.Adjustment#KEY_CONTEXTUAL_ACTIONS: - + Intent action constant name must be ACTION_FOO: SMS_CARRIER_PROVISION_ACTION -InterfaceConstant: android.service.autofill.AutofillFieldClassificationService#SERVICE_INTERFACE: - -InterfaceConstant: android.service.autofill.augmented.AugmentedAutofillService#SERVICE_INTERFACE: - -InterfaceConstant: android.service.contentcapture.ContentCaptureService#SERVICE_INTERFACE: - -InterfaceConstant: android.service.notification.NotificationAssistantService#SERVICE_INTERFACE: - -InterfaceConstant: android.telecom.PhoneAccountSuggestionService#SERVICE_INTERFACE: - - - -InternalField: android.media.audiopolicy.AudioProductStrategy#sDefaultAttributes: - Internal field sDefaultAttributes must not be exposed -InternalField: android.telephony.ims.ImsConferenceState#mParticipants: - +KotlinOperator: android.os.PackageTagsList#contains(android.os.PackageTagsList): + Method can be invoked as a "in" operator from Kotlin: `contains` (this is usually desirable; just make sure it makes sense for this type of object) +KotlinOperator: android.util.SparseArrayMap#get(int, K): + Method can be invoked with an indexing operator from Kotlin: `get` (this is usually desirable; just make sure it makes sense for this type of object) -KotlinOperator: android.os.WorkSource#get(int): - -KotlinOperator: android.util.SparseArrayMap#get(int, K): - -KotlinOperator: android.util.SparseArrayMap#get(int, String): - - - -ListenerInterface: android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener: - -ListenerInterface: android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener: - -ListenerInterface: android.os.IncidentManager.AuthListener: - -ListenerInterface: android.telephony.ims.ImsCallSessionListener: - -ListenerInterface: android.telephony.ims.ImsUtListener: - - - -ListenerLast: android.hardware.camera2.CameraDevice#createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, int, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) parameter #4: - -ListenerLast: android.location.LocationManager#requestLocationUpdates(android.location.LocationRequest, android.location.LocationListener, android.os.Looper) parameter #2: - ListenerLast: android.permission.PermissionControllerManager#countPermissionApps(java.util.List<java.lang.String>, int, android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, android.os.Handler) parameter #3: - + Listeners should always be at end of argument list (method `countPermissionApps`) ListenerLast: android.permission.PermissionControllerManager#getAppPermissions(String, android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, android.os.Handler) parameter #2: - -ListenerLast: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int) parameter #1: - -ListenerLast: android.telephony.mbms.vendor.MbmsStreamingServiceBase#initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int) parameter #1: - + Listeners should always be at end of argument list (method `getAppPermissions`) ManagerConstructor: android.content.pm.ShortcutManager#ShortcutManager(android.content.Context): - - - -ManagerLookup: android.telephony.ims.ImsMmTelManager#createForSubscriptionId(int): - -ManagerLookup: android.telephony.ims.ProvisioningManager#createForSubscriptionId(int): - - - -MethodNameTense: android.telephony.ims.feature.CapabilityChangeRequest#getCapabilitiesToEnable(): - - - -MethodNameUnits: android.telephony.ims.ImsCallForwardInfo#getTimeSeconds(): - + Managers must always be obtained from Context; no direct constructors MinMaxConstant: android.os.UserHandle#MIN_SECONDARY_USER_ID: - + If min/max could change in future, make them dynamic methods: android.os.UserHandle#MIN_SECONDARY_USER_ID MinMaxConstant: android.view.autofill.AutofillManager#MAX_TEMP_AUGMENTED_SERVICE_DURATION_MS: - - - -MissingGetterMatchingBuilder: android.app.AppOpsManager.HistoricalOpsRequest.Builder#setFlags(int): - -MissingGetterMatchingBuilder: android.app.AppOpsManager.HistoricalOpsRequest.Builder#setOpNames(java.util.List<java.lang.String>): - -MissingGetterMatchingBuilder: android.app.AppOpsManager.HistoricalOpsRequest.Builder#setPackageName(String): - -MissingGetterMatchingBuilder: android.app.AppOpsManager.HistoricalOpsRequest.Builder#setUid(int): - -MissingGetterMatchingBuilder: android.content.integrity.RuleSet.Builder#addRules(java.util.List<android.content.integrity.Rule>): - -MissingGetterMatchingBuilder: android.hardware.display.BrightnessConfiguration.Builder#addCorrectionByCategory(int, android.hardware.display.BrightnessCorrection): - -MissingGetterMatchingBuilder: android.hardware.display.BrightnessConfiguration.Builder#addCorrectionByPackageName(String, android.hardware.display.BrightnessCorrection): - -MissingGetterMatchingBuilder: android.hardware.display.BrightnessConfiguration.Builder#setDescription(String): - -MissingGetterMatchingBuilder: android.hardware.lights.LightsRequest.Builder#setLight(android.hardware.lights.Light, android.hardware.lights.LightState): - + If min/max could change in future, make them dynamic methods: android.view.autofill.AutofillManager#MAX_TEMP_AUGMENTED_SERVICE_DURATION_MS + + MissingGetterMatchingBuilder: android.media.VolumeShaper.Configuration.Builder#setOptionFlags(int): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioMix.Builder#setDevice(android.media.AudioDeviceInfo): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioMix.Builder#setFormat(android.media.AudioFormat): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioMix.Builder#setRouteFlags(int): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioMixingRule.Builder#addMixRule(int, Object): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioMixingRule.Builder#addRule(android.media.AudioAttributes, int): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#addMix(android.media.audiopolicy.AudioMix): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyFocusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyStatusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyVolumeCallback(android.media.audiopolicy.AudioPolicy.AudioPolicyVolumeCallback): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setIsAudioFocusPolicy(boolean): - + android.media.VolumeShaper.Configuration does not declare a `getOptionFlags()` method matching method android.media.VolumeShaper.Configuration.Builder.setOptionFlags(int) MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setIsTestFocusPolicy(boolean): - -MissingGetterMatchingBuilder: android.media.audiopolicy.AudioPolicy.Builder#setLooper(android.os.Looper): - -MissingGetterMatchingBuilder: android.net.CaptivePortalData.Builder#setBytesRemaining(long): - -MissingGetterMatchingBuilder: android.net.CaptivePortalData.Builder#setExpiryTime(long): - -MissingGetterMatchingBuilder: android.net.CaptivePortalData.Builder#setRefreshTime(long): - -MissingGetterMatchingBuilder: android.net.NetworkCapabilities.Builder#addCapability(int): - -MissingGetterMatchingBuilder: android.net.NetworkCapabilities.Builder#setRequestorPackageName(String): - -MissingGetterMatchingBuilder: android.net.NetworkCapabilities.Builder#setRequestorUid(int): - -MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setShouldShowEntitlementUi(boolean): - -MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setStaticIpv4Addresses(android.net.LinkAddress, android.net.LinkAddress): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setActualLifetime(long): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setCurrentRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setFilteredRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setFlags(boolean, boolean): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setLifetime(long): - -MissingGetterMatchingBuilder: android.net.metrics.ApfProgramEvent.Builder#setProgramLength(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setDroppedRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setDurationMs(long): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setMatchingRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setMaxProgramSize(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setParseErrors(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setProgramUpdates(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setProgramUpdatesAll(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setProgramUpdatesAllowingMulticast(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setReceivedRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.ApfStats.Builder#setZeroLifetimeRas(int): - -MissingGetterMatchingBuilder: android.net.metrics.DhcpClientEvent.Builder#setDurationMs(int): - -MissingGetterMatchingBuilder: android.net.metrics.DhcpClientEvent.Builder#setMsg(String): - -MissingGetterMatchingBuilder: android.net.metrics.ValidationProbeEvent.Builder#setDurationMs(long): - -MissingGetterMatchingBuilder: android.net.metrics.ValidationProbeEvent.Builder#setProbeType(int, boolean): - -MissingGetterMatchingBuilder: android.net.metrics.ValidationProbeEvent.Builder#setReturnCode(int): - + android.media.audiopolicy.AudioPolicy does not declare a `isIsTestFocusPolicy()` method matching method android.media.audiopolicy.AudioPolicy.Builder.setIsTestFocusPolicy(boolean) MissingGetterMatchingBuilder: android.security.keystore.KeyGenParameterSpec.Builder#setUniqueIdIncluded(boolean): - -MissingGetterMatchingBuilder: android.service.autofill.Dataset.Builder#setFieldInlinePresentation(android.view.autofill.AutofillId, android.view.autofill.AutofillValue, java.util.regex.Pattern, android.service.autofill.InlinePresentation): - -MissingGetterMatchingBuilder: android.service.autofill.augmented.FillResponse.Builder#setClientState(android.os.Bundle): - -MissingGetterMatchingBuilder: android.service.autofill.augmented.FillResponse.Builder#setFillWindow(android.service.autofill.augmented.FillWindow): - -MissingGetterMatchingBuilder: android.service.autofill.augmented.FillResponse.Builder#setInlineSuggestions(java.util.List<android.service.autofill.Dataset>): - -MissingGetterMatchingBuilder: android.telecom.CallScreeningService.CallResponse.Builder#setShouldScreenCallViaAudioProcessing(boolean): - + android.security.keystore.KeyGenParameterSpec does not declare a `isUniqueIdIncluded()` method matching method android.security.keystore.KeyGenParameterSpec.Builder.setUniqueIdIncluded(boolean) MissingGetterMatchingBuilder: android.telecom.ConnectionRequest.Builder#setIsAdhocConferenceCall(boolean): - + android.telecom.ConnectionRequest does not declare a `isIsAdhocConferenceCall()` method matching method android.telecom.ConnectionRequest.Builder.setIsAdhocConferenceCall(boolean) MissingGetterMatchingBuilder: android.telecom.ConnectionRequest.Builder#setRttPipeFromInCall(android.os.ParcelFileDescriptor): - + android.telecom.ConnectionRequest does not declare a `getRttPipeFromInCall()` method matching method android.telecom.ConnectionRequest.Builder.setRttPipeFromInCall(android.os.ParcelFileDescriptor) MissingGetterMatchingBuilder: android.telecom.ConnectionRequest.Builder#setRttPipeToInCall(android.os.ParcelFileDescriptor): - + android.telecom.ConnectionRequest does not declare a `getRttPipeToInCall()` method matching method android.telecom.ConnectionRequest.Builder.setRttPipeToInCall(android.os.ParcelFileDescriptor) MissingGetterMatchingBuilder: android.telecom.ConnectionRequest.Builder#setShouldShowIncomingCallUi(boolean): - -MissingGetterMatchingBuilder: android.telecom.PhoneAccount.Builder#setGroupId(String): - -MissingGetterMatchingBuilder: android.telephony.NetworkRegistrationInfo.Builder#setEmergencyOnly(boolean): - -MissingGetterMatchingBuilder: android.telephony.ims.ImsSsData.Builder#setCallForwardingInfo(java.util.List<android.telephony.ims.ImsCallForwardInfo>): - -MissingGetterMatchingBuilder: android.telephony.ims.stub.ImsFeatureConfiguration.Builder#addFeature(int, int): - -MissingGetterMatchingBuilder: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String): - + android.telecom.ConnectionRequest does not declare a `shouldShowIncomingCallUi()` method matching method android.telecom.ConnectionRequest.Builder.setShouldShowIncomingCallUi(boolean) MissingGetterMatchingBuilder: android.view.Display.Mode.Builder#setResolution(int, int): android.view.Display.Mode does not declare a `getResolution()` method matching method android.view.Display.Mode.Builder.setResolution(int,int) MissingNullability: android.app.Activity#onMovedToDisplay(int, android.content.res.Configuration) parameter #1: - -MissingNullability: android.app.ActivityManager#addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int) parameter #0: - + Missing nullability on parameter `config` in method `onMovedToDisplay` MissingNullability: android.app.ActivityManager#alwaysShowUnsupportedCompileSdkWarning(android.content.ComponentName) parameter #0: - -MissingNullability: android.app.ActivityManager#forceStopPackage(String) parameter #0: - -MissingNullability: android.app.ActivityManager#getPackageImportance(String) parameter #0: - + Missing nullability on parameter `activity` in method `alwaysShowUnsupportedCompileSdkWarning` MissingNullability: android.app.ActivityManager#holdLock(android.os.IBinder, int) parameter #0: - -MissingNullability: android.app.ActivityManager#removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener) parameter #0: - + Missing nullability on parameter `token` in method `holdLock` MissingNullability: android.app.ActivityManager#scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int) parameter #0: - + Missing nullability on parameter `packages` in method `scheduleApplicationInfoChanged` MissingNullability: android.app.ActivityManager.TaskDescription#getIconFilename(): - + Missing nullability on method `getIconFilename` return MissingNullability: android.app.ActivityTaskManager#clearLaunchParamsForPackages(java.util.List<java.lang.String>) parameter #0: - -MissingNullability: android.app.ActivityTaskManager#listAllStacks(): - -MissingNullability: android.app.ActivityTaskManager#moveTopActivityToPinnedStack(int, android.graphics.Rect) parameter #1: - -MissingNullability: android.app.ActivityTaskManager#removeStacksInWindowingModes(int[]) parameter #0: - -MissingNullability: android.app.ActivityTaskManager#removeStacksWithActivityTypes(int[]) parameter #0: - -MissingNullability: android.app.ActivityTaskManager#resizeDockedStack(android.graphics.Rect, android.graphics.Rect) parameter #0: - -MissingNullability: android.app.ActivityTaskManager#resizeDockedStack(android.graphics.Rect, android.graphics.Rect) parameter #1: - -MissingNullability: android.app.ActivityTaskManager#resizePinnedStack(int, android.graphics.Rect, boolean) parameter #1: - + Missing nullability on parameter `packageNames` in method `clearLaunchParamsForPackages` MissingNullability: android.app.ActivityTaskManager#resizeTask(int, android.graphics.Rect) parameter #1: - -MissingNullability: android.app.ActivityTaskManager#setTaskWindowingModeSplitScreenPrimary(int, int, boolean, boolean, android.graphics.Rect, boolean) parameter #4: - + Missing nullability on parameter `bounds` in method `resizeTask` MissingNullability: android.app.ActivityTaskManager#supportsMultiWindow(android.content.Context) parameter #0: - + Missing nullability on parameter `context` in method `supportsMultiWindow` MissingNullability: android.app.ActivityTaskManager#supportsSplitScreenMultiWindow(android.content.Context) parameter #0: - + Missing nullability on parameter `context` in method `supportsSplitScreenMultiWindow` MissingNullability: android.app.AppDetailsActivity#onCreate(android.os.Bundle) parameter #0: - -MissingNullability: android.app.AppOpsManager#getOpStrs(): - + Missing nullability on parameter `savedInstanceState` in method `onCreate` MissingNullability: android.app.AppOpsManager#isOperationActive(int, int, String) parameter #2: - + Missing nullability on parameter `packageName` in method `isOperationActive` MissingNullability: android.app.AppOpsManager#opToPermission(int): - + Missing nullability on method `opToPermission` return MissingNullability: android.app.AppOpsManager#permissionToOpCode(String) parameter #0: - -MissingNullability: android.app.AppOpsManager#setMode(String, int, String, int) parameter #0: - -MissingNullability: android.app.AppOpsManager#setMode(String, int, String, int) parameter #2: - + Missing nullability on parameter `permission` in method `permissionToOpCode` MissingNullability: android.app.AppOpsManager#setMode(int, int, String, int) parameter #2: - -MissingNullability: android.app.AppOpsManager#setUidMode(String, int, int) parameter #0: - -MissingNullability: android.app.AppOpsManager.HistoricalOp#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.app.AppOpsManager.HistoricalOps#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.app.AppOpsManager.HistoricalUidOps#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.app.AppOpsManager.OpEntry#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `packageName` in method `setMode` MissingNullability: android.app.NotificationManager#allowAssistantAdjustment(String) parameter #0: - + Missing nullability on parameter `capability` in method `allowAssistantAdjustment` MissingNullability: android.app.NotificationManager#disallowAssistantAdjustment(String) parameter #0: - + Missing nullability on parameter `capability` in method `disallowAssistantAdjustment` MissingNullability: android.app.NotificationManager#getEffectsSuppressor(): - -MissingNullability: android.app.NotificationManager#matchesCallFilter(android.os.Bundle) parameter #0: - -MissingNullability: android.app.PictureInPictureParams#getActions(): - -MissingNullability: android.app.PictureInPictureParams#getSourceRectHint(): - + Missing nullability on method `getEffectsSuppressor` return MissingNullability: android.app.TimePickerDialog#getTimePicker(): - -MissingNullability: android.app.UiAutomation#executeShellCommandRw(String): - -MissingNullability: android.app.UiAutomation#executeShellCommandRw(String) parameter #0: - -MissingNullability: android.app.UiAutomation#grantRuntimePermission(String, String, android.os.UserHandle) parameter #0: - -MissingNullability: android.app.UiAutomation#grantRuntimePermission(String, String, android.os.UserHandle) parameter #1: - -MissingNullability: android.app.UiAutomation#grantRuntimePermission(String, String, android.os.UserHandle) parameter #2: - -MissingNullability: android.app.UiAutomation#revokeRuntimePermission(String, String, android.os.UserHandle) parameter #0: - -MissingNullability: android.app.UiAutomation#revokeRuntimePermission(String, String, android.os.UserHandle) parameter #1: - -MissingNullability: android.app.UiAutomation#revokeRuntimePermission(String, String, android.os.UserHandle) parameter #2: - -MissingNullability: android.app.WallpaperManager#setWallpaperComponent(android.content.ComponentName) parameter #0: - + Missing nullability on method `getTimePicker` return MissingNullability: android.app.WindowConfiguration#compareTo(android.app.WindowConfiguration) parameter #0: - + Missing nullability on parameter `that` in method `compareTo` MissingNullability: android.app.WindowConfiguration#getAppBounds(): - + Missing nullability on method `getAppBounds` return MissingNullability: android.app.WindowConfiguration#getBounds(): - + Missing nullability on method `getBounds` return MissingNullability: android.app.WindowConfiguration#setAppBounds(android.graphics.Rect) parameter #0: - + Missing nullability on parameter `rect` in method `setAppBounds` MissingNullability: android.app.WindowConfiguration#setBounds(android.graphics.Rect) parameter #0: - + Missing nullability on parameter `rect` in method `setBounds` MissingNullability: android.app.WindowConfiguration#setTo(android.app.WindowConfiguration) parameter #0: - + Missing nullability on parameter `other` in method `setTo` MissingNullability: android.app.WindowConfiguration#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `dest` in method `writeToParcel` MissingNullability: android.app.admin.DevicePolicyManager#getOwnerInstalledCaCerts(android.os.UserHandle): - + Missing nullability on method `getOwnerInstalledCaCerts` return MissingNullability: android.app.admin.SecurityLog.SecurityEvent#SecurityEvent(long, byte[]) parameter #1: - -MissingNullability: android.app.backup.BackupManager#getConfigurationIntent(String): - -MissingNullability: android.app.backup.BackupManager#getConfigurationIntent(String) parameter #0: - -MissingNullability: android.app.backup.BackupManager#getDataManagementIntent(String): - -MissingNullability: android.app.backup.BackupManager#getDataManagementIntent(String) parameter #0: - -MissingNullability: android.app.backup.BackupManager#getDestinationString(String): - -MissingNullability: android.app.backup.BackupManager#getDestinationString(String) parameter #0: - -MissingNullability: android.app.prediction.AppPredictionSessionId#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `data` in method `SecurityEvent` MissingNullability: android.app.prediction.AppPredictor#getSessionId(): - -MissingNullability: android.app.prediction.AppTarget#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.app.prediction.AppTargetEvent#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.app.prediction.AppTargetId#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on method `getSessionId` return MissingNullability: android.content.AutofillOptions#forWhitelistingItself(): - + Missing nullability on method `forWhitelistingItself` return MissingNullability: android.content.AutofillOptions#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `parcel` in method `writeToParcel` MissingNullability: android.content.ContentCaptureOptions#forWhitelistingItself(): - + Missing nullability on method `forWhitelistingItself` return MissingNullability: android.content.ContentCaptureOptions#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `parcel` in method `writeToParcel` MissingNullability: android.content.ContentResolver#getSyncAdapterPackagesForAuthorityAsUser(String, int): - + Missing nullability on method `getSyncAdapterPackagesForAuthorityAsUser` return MissingNullability: android.content.ContentResolver#getSyncAdapterPackagesForAuthorityAsUser(String, int) parameter #0: - -MissingNullability: android.content.Context#getDisplay(): - -MissingNullability: android.content.Context#getUser(): - -MissingNullability: android.content.ContextWrapper#getDisplay(): - -MissingNullability: android.content.ContextWrapper#setContentCaptureOptions(android.content.ContentCaptureOptions) parameter #0: - + Missing nullability on parameter `authority` in method `getSyncAdapterPackagesForAuthorityAsUser` MissingNullability: android.content.pm.ActivityInfo#isTranslucentOrFloating(android.content.res.TypedArray) parameter #0: - + Missing nullability on parameter `attributes` in method `isTranslucentOrFloating` MissingNullability: android.content.pm.LauncherApps#LauncherApps(android.content.Context) parameter #0: - -MissingNullability: android.content.pm.PackageInstaller.SessionParams#setGrantedRuntimePermissions(String[]) parameter #0: - + Missing nullability on parameter `context` in method `LauncherApps` MissingNullability: android.content.pm.PackageManager#getHoldLockToken(): - Missing nullability on method `BINDER` return + Missing nullability on method `getHoldLockToken` return MissingNullability: android.content.pm.PackageManager#getNamesForUids(int[]) parameter #0: - + Missing nullability on parameter `uids` in method `getNamesForUids` MissingNullability: android.content.pm.PackageManager#holdLock(android.os.IBinder, int) parameter #0: - + Missing nullability on parameter `token` in method `holdLock` MissingNullability: android.content.pm.ShortcutManager#ShortcutManager(android.content.Context) parameter #0: - + Missing nullability on parameter `context` in method `ShortcutManager` MissingNullability: android.content.pm.UserInfo#UserInfo(android.content.pm.UserInfo) parameter #0: Missing nullability on parameter `orig` in method `UserInfo` MissingNullability: android.content.pm.UserInfo#UserInfo(int, String, String, int) parameter #1: @@ -942,1469 +292,477 @@ MissingNullability: android.content.pm.UserInfo#userType: MissingNullability: android.content.pm.UserInfo#writeToParcel(android.os.Parcel, int) parameter #0: Missing nullability on parameter `dest` in method `writeToParcel` MissingNullability: android.content.res.AssetManager#getOverlayablesToString(String) parameter #0: - + Missing nullability on parameter `packageName` in method `getOverlayablesToString` MissingNullability: android.content.res.Configuration#windowConfiguration: - -MissingNullability: android.content.rollback.PackageRollbackInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.content.rollback.RollbackInfo#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on field `windowConfiguration` in class `class android.content.res.Configuration` MissingNullability: android.database.sqlite.SQLiteDebug#dump(android.util.Printer, String[]) parameter #0: - + Missing nullability on parameter `printer` in method `dump` MissingNullability: android.database.sqlite.SQLiteDebug#dump(android.util.Printer, String[]) parameter #1: - + Missing nullability on parameter `args` in method `dump` MissingNullability: android.database.sqlite.SQLiteDebug#getDatabaseInfo(): - + Missing nullability on method `getDatabaseInfo` return MissingNullability: android.database.sqlite.SQLiteDebug.DbStats#DbStats(String, long, long, int, int, int, int) parameter #0: - + Missing nullability on parameter `dbName` in method `DbStats` MissingNullability: android.database.sqlite.SQLiteDebug.DbStats#cache: - + Missing nullability on field `cache` in class `class android.database.sqlite.SQLiteDebug.DbStats` MissingNullability: android.database.sqlite.SQLiteDebug.DbStats#dbName: - + Missing nullability on field `dbName` in class `class android.database.sqlite.SQLiteDebug.DbStats` MissingNullability: android.database.sqlite.SQLiteDebug.PagerStats#dbStats: - + Missing nullability on field `dbStats` in class `class android.database.sqlite.SQLiteDebug.PagerStats` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, String, String, android.os.CancellationSignal) parameter #0: - + Missing nullability on parameter `db` in method `SQLiteDirectCursorDriver` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, String, String, android.os.CancellationSignal) parameter #1: - + Missing nullability on parameter `sql` in method `SQLiteDirectCursorDriver` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, String, String, android.os.CancellationSignal) parameter #2: - + Missing nullability on parameter `editTable` in method `SQLiteDirectCursorDriver` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#SQLiteDirectCursorDriver(android.database.sqlite.SQLiteDatabase, String, String, android.os.CancellationSignal) parameter #3: - + Missing nullability on parameter `cancellationSignal` in method `SQLiteDirectCursorDriver` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#cursorRequeried(android.database.Cursor) parameter #0: - + Missing nullability on parameter `cursor` in method `cursorRequeried` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#query(android.database.sqlite.SQLiteDatabase.CursorFactory, String[]): - + Missing nullability on method `query` return MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#query(android.database.sqlite.SQLiteDatabase.CursorFactory, String[]) parameter #0: - + Missing nullability on parameter `factory` in method `query` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#query(android.database.sqlite.SQLiteDatabase.CursorFactory, String[]) parameter #1: - + Missing nullability on parameter `selectionArgs` in method `query` MissingNullability: android.database.sqlite.SQLiteDirectCursorDriver#setBindArguments(String[]) parameter #0: - + Missing nullability on parameter `bindArgs` in method `setBindArguments` MissingNullability: android.database.sqlite.SQLiteGlobal#getDefaultJournalMode(): - + Missing nullability on method `getDefaultJournalMode` return MissingNullability: android.database.sqlite.SQLiteGlobal#getDefaultSyncMode(): - + Missing nullability on method `getDefaultSyncMode` return MissingNullability: android.database.sqlite.SQLiteGlobal#getWALSyncMode(): - + Missing nullability on method `getWALSyncMode` return MissingNullability: android.graphics.ImageDecoder#createSource(android.content.res.Resources, java.io.InputStream, int) parameter #0: - -MissingNullability: android.graphics.ImageDecoder#createSource(android.content.res.Resources, java.io.InputStream, int) parameter #1: - + Missing nullability on parameter `res` in method `createSource` MissingNullability: android.graphics.drawable.AdaptiveIconDrawable#getSafeZone(): - + Missing nullability on method `getSafeZone` return MissingNullability: android.graphics.drawable.ColorDrawable#getXfermode(): - -MissingNullability: android.hardware.camera2.CameraDevice#createCustomCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.hardware.camera2.params.OutputConfiguration>, int, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) parameter #0: - + Missing nullability on method `getXfermode` return MissingNullability: android.hardware.camera2.CameraManager#getCameraIdListNoLazy(): - -MissingNullability: android.hardware.display.AmbientBrightnessDayStats#getBucketBoundaries(): - -MissingNullability: android.hardware.display.AmbientBrightnessDayStats#getLocalDate(): - -MissingNullability: android.hardware.display.AmbientBrightnessDayStats#getStats(): - -MissingNullability: android.hardware.display.AmbientBrightnessDayStats#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on method `getCameraIdListNoLazy` return MissingNullability: android.hardware.display.AmbientDisplayConfiguration#AmbientDisplayConfiguration(android.content.Context) parameter #0: - -MissingNullability: android.hardware.display.BrightnessChangeEvent#luxTimestamps: - -MissingNullability: android.hardware.display.BrightnessChangeEvent#luxValues: - -MissingNullability: android.hardware.display.BrightnessChangeEvent#packageName: - -MissingNullability: android.hardware.display.BrightnessChangeEvent#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.hardware.display.BrightnessConfiguration#getCurve(): - -MissingNullability: android.hardware.display.BrightnessConfiguration#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.hardware.display.BrightnessConfiguration.Builder#Builder(float[], float[]) parameter #0: - -MissingNullability: android.hardware.display.BrightnessConfiguration.Builder#Builder(float[], float[]) parameter #1: - -MissingNullability: android.hardware.display.BrightnessCorrection#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.hardware.display.DisplayManager#getAmbientBrightnessStats(): - -MissingNullability: android.hardware.display.DisplayManager#getBrightnessConfiguration(): - -MissingNullability: android.hardware.display.DisplayManager#getBrightnessEvents(): - -MissingNullability: android.hardware.display.DisplayManager#getStableDisplaySize(): - -MissingNullability: android.hardware.display.DisplayManager#setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration) parameter #0: - + Missing nullability on parameter `context` in method `AmbientDisplayConfiguration` MissingNullability: android.location.GnssClock#set(android.location.GnssClock) parameter #0: - + Missing nullability on parameter `clock` in method `set` MissingNullability: android.location.GnssMeasurement#set(android.location.GnssMeasurement) parameter #0: - -MissingNullability: android.location.GnssMeasurementsEvent#GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]) parameter #0: - -MissingNullability: android.location.GnssMeasurementsEvent#GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]) parameter #1: - + Missing nullability on parameter `measurement` in method `set` MissingNullability: android.location.GnssNavigationMessage#set(android.location.GnssNavigationMessage) parameter #0: - + Missing nullability on parameter `navigationMessage` in method `set` MissingNullability: android.location.GnssNavigationMessage#setData(byte[]) parameter #0: - -MissingNullability: android.location.LocationManager#getTestProviderCurrentRequests(String) parameter #0: - -MissingNullability: android.location.LocationRequest#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.media.AudioAttributes#SDK_USAGES: - Missing nullability on field `SDK_USAGES` in class `class android.media.AudioAttributes` + Missing nullability on parameter `value` in method `setData` MissingNullability: android.media.AudioAttributes#getSdkUsages(): Missing nullability on method `getSdkUsages` return -MissingNullability: android.media.AudioFocusInfo#writeToParcel(android.os.Parcel, int) parameter #0: - MissingNullability: android.media.AudioManager#getPublicStreamTypes(): Missing nullability on method `getPublicStreamTypes` return MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String) parameter #3: - + Missing nullability on parameter `clientFormat` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String) parameter #4: - + Missing nullability on parameter `devFormat` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String) parameter #6: - + Missing nullability on parameter `packageName` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #10: - + Missing nullability on parameter `clientEffects` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #11: - + Missing nullability on parameter `deviceEffects` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #3: - + Missing nullability on parameter `clientFormat` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #4: - + Missing nullability on parameter `devFormat` in method `AudioRecordingConfiguration` MissingNullability: android.media.AudioRecordingConfiguration#AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]) parameter #6: - -MissingNullability: android.media.AudioSystem#streamToString(int): - Missing nullability on method `streamToString` return + Missing nullability on parameter `packageName` in method `AudioRecordingConfiguration` MissingNullability: android.media.PlaybackParams#setAudioStretchMode(int): - + Missing nullability on method `setAudioStretchMode` return MissingNullability: android.media.audiofx.AudioEffect#EFFECT_TYPE_NULL: - + Missing nullability on field `EFFECT_TYPE_NULL` in class `class android.media.audiofx.AudioEffect` MissingNullability: android.media.audiofx.AudioEffect#byteArrayToInt(byte[]) parameter #0: - + Missing nullability on parameter `valueBuf` in method `byteArrayToInt` MissingNullability: android.media.audiofx.AudioEffect#byteArrayToShort(byte[]) parameter #0: - + Missing nullability on parameter `valueBuf` in method `byteArrayToShort` MissingNullability: android.media.audiofx.AudioEffect#getParameter(byte[], byte[]) parameter #0: - + Missing nullability on parameter `param` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(byte[], byte[]) parameter #1: - + Missing nullability on parameter `value` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(int, byte[]) parameter #1: - + Missing nullability on parameter `value` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(int, int[]) parameter #1: - + Missing nullability on parameter `value` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(int, short[]) parameter #1: - + Missing nullability on parameter `value` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(int[], short[]) parameter #0: - + Missing nullability on parameter `param` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#getParameter(int[], short[]) parameter #1: - + Missing nullability on parameter `value` in method `getParameter` MissingNullability: android.media.audiofx.AudioEffect#intToByteArray(int): - + Missing nullability on method `intToByteArray` return MissingNullability: android.media.audiofx.AudioEffect#isEffectTypeAvailable(java.util.UUID) parameter #0: - + Missing nullability on parameter `type` in method `isEffectTypeAvailable` MissingNullability: android.media.audiofx.AudioEffect#setParameter(byte[], byte[]) parameter #0: - + Missing nullability on parameter `param` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(byte[], byte[]) parameter #1: - + Missing nullability on parameter `value` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(int, byte[]) parameter #1: - + Missing nullability on parameter `value` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(int[], byte[]) parameter #0: - + Missing nullability on parameter `param` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(int[], byte[]) parameter #1: - + Missing nullability on parameter `value` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(int[], int[]) parameter #0: - + Missing nullability on parameter `param` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameter(int[], int[]) parameter #1: - + Missing nullability on parameter `value` in method `setParameter` MissingNullability: android.media.audiofx.AudioEffect#setParameterListener(android.media.audiofx.AudioEffect.OnParameterChangeListener) parameter #0: - + Missing nullability on parameter `listener` in method `setParameterListener` MissingNullability: android.media.audiofx.AudioEffect#shortToByteArray(short): - + Missing nullability on method `shortToByteArray` return MissingNullability: android.media.audiofx.AudioEffect.Descriptor#Descriptor(android.os.Parcel) parameter #0: - + Missing nullability on parameter `in` in method `Descriptor` MissingNullability: android.media.audiofx.AudioEffect.Descriptor#writeToParcel(android.os.Parcel) parameter #0: - + Missing nullability on parameter `dest` in method `writeToParcel` MissingNullability: android.media.audiofx.AudioEffect.OnParameterChangeListener#onParameterChange(android.media.audiofx.AudioEffect, int, byte[], byte[]) parameter #0: - + Missing nullability on parameter `effect` in method `onParameterChange` MissingNullability: android.media.audiofx.AudioEffect.OnParameterChangeListener#onParameterChange(android.media.audiofx.AudioEffect, int, byte[], byte[]) parameter #2: - + Missing nullability on parameter `param` in method `onParameterChange` MissingNullability: android.media.audiofx.AudioEffect.OnParameterChangeListener#onParameterChange(android.media.audiofx.AudioEffect, int, byte[], byte[]) parameter #3: - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#Builder(android.media.audiopolicy.AudioMixingRule) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#build(): - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#setDevice(android.media.AudioDeviceInfo): - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#setFormat(android.media.AudioFormat): - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#setFormat(android.media.AudioFormat) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioMix.Builder#setRouteFlags(int): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#addMixRule(int, Object): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#addMixRule(int, Object) parameter #1: - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#addRule(android.media.AudioAttributes, int): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#addRule(android.media.AudioAttributes, int) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#build(): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#excludeMixRule(int, Object): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#excludeMixRule(int, Object) parameter #1: - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#excludeRule(android.media.AudioAttributes, int): - -MissingNullability: android.media.audiopolicy.AudioMixingRule.Builder#excludeRule(android.media.AudioAttributes, int) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy#createAudioRecordSink(android.media.audiopolicy.AudioMix): - -MissingNullability: android.media.audiopolicy.AudioPolicy#createAudioRecordSink(android.media.audiopolicy.AudioMix) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy#createAudioTrackSource(android.media.audiopolicy.AudioMix): - -MissingNullability: android.media.audiopolicy.AudioPolicy#createAudioTrackSource(android.media.audiopolicy.AudioMix) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy#setRegistration(String) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy#toLogFriendlyString(): - -MissingNullability: android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener#onAudioFocusAbandon(android.media.AudioFocusInfo) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener#onAudioFocusGrant(android.media.AudioFocusInfo, int) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener#onAudioFocusLoss(android.media.AudioFocusInfo, boolean) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener#onAudioFocusRequest(android.media.AudioFocusInfo, int) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener#onMixStateUpdate(android.media.audiopolicy.AudioMix) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.Builder#Builder(android.content.Context) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyFocusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener) parameter #0: - -MissingNullability: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyStatusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener) parameter #0: - -MissingNullability: android.metrics.LogMaker#LogMaker(Object[]) parameter #0: - -MissingNullability: android.metrics.LogMaker#addTaggedData(int, Object): - -MissingNullability: android.metrics.LogMaker#addTaggedData(int, Object) parameter #1: - -MissingNullability: android.metrics.LogMaker#clearCategory(): - -MissingNullability: android.metrics.LogMaker#clearPackageName(): - -MissingNullability: android.metrics.LogMaker#clearSubtype(): - -MissingNullability: android.metrics.LogMaker#clearTaggedData(int): - -MissingNullability: android.metrics.LogMaker#clearType(): - -MissingNullability: android.metrics.LogMaker#deserialize(Object[]) parameter #0: - -MissingNullability: android.metrics.LogMaker#getCounterName(): - -MissingNullability: android.metrics.LogMaker#getPackageName(): - -MissingNullability: android.metrics.LogMaker#getTaggedData(int): - -MissingNullability: android.metrics.LogMaker#isSubsetOf(android.metrics.LogMaker) parameter #0: - -MissingNullability: android.metrics.LogMaker#isValidValue(Object) parameter #0: - -MissingNullability: android.metrics.LogMaker#serialize(): - -MissingNullability: android.metrics.LogMaker#setCategory(int): - -MissingNullability: android.metrics.LogMaker#setPackageName(String): - -MissingNullability: android.metrics.LogMaker#setPackageName(String) parameter #0: - -MissingNullability: android.metrics.LogMaker#setSubtype(int): - -MissingNullability: android.metrics.LogMaker#setType(int): - -MissingNullability: android.metrics.MetricsReader#next(): - -MissingNullability: android.net.NetworkCapabilities#getCapabilities(): - -MissingNullability: android.net.StaticIpConfiguration#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.net.TestNetworkInterface#CREATOR: - -MissingNullability: android.net.TestNetworkInterface#TestNetworkInterface(android.os.ParcelFileDescriptor, String) parameter #0: - -MissingNullability: android.net.TestNetworkInterface#TestNetworkInterface(android.os.ParcelFileDescriptor, String) parameter #1: - -MissingNullability: android.net.TestNetworkInterface#getFileDescriptor(): - -MissingNullability: android.net.TestNetworkInterface#getInterfaceName(): - -MissingNullability: android.net.TestNetworkInterface#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.net.TestNetworkManager#createTapInterface(): - -MissingNullability: android.net.TestNetworkManager#createTunInterface(android.net.LinkAddress[]): - -MissingNullability: android.net.apf.ApfCapabilities#CREATOR: - -MissingNullability: android.net.apf.ApfCapabilities#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.net.metrics.DhcpClientEvent.Builder#setMsg(String) parameter #0: - + Missing nullability on parameter `value` in method `onParameterChange` MissingNullability: android.os.Build#is64BitAbi(String) parameter #0: - + Missing nullability on parameter `abi` in method `is64BitAbi` MissingNullability: android.os.Build.VERSION#ACTIVE_CODENAMES: - + Missing nullability on field `ACTIVE_CODENAMES` in class `class android.os.Build.VERSION` MissingNullability: android.os.Environment#buildPath(java.io.File, java.lang.String...): - + Missing nullability on method `buildPath` return MissingNullability: android.os.Environment#buildPath(java.io.File, java.lang.String...) parameter #0: - + Missing nullability on parameter `base` in method `buildPath` MissingNullability: android.os.Environment#buildPath(java.io.File, java.lang.String...) parameter #1: - + Missing nullability on parameter `segments` in method `buildPath` MissingNullability: android.os.FileUtils#contains(java.io.File, java.io.File) parameter #0: - + Missing nullability on parameter `dir` in method `contains` MissingNullability: android.os.FileUtils#contains(java.io.File, java.io.File) parameter #1: - -MissingNullability: android.os.HwBinder#getService(String, String): - -MissingNullability: android.os.HwBinder#getService(String, String) parameter #0: - -MissingNullability: android.os.HwBinder#getService(String, String) parameter #1: - -MissingNullability: android.os.HwBinder#getService(String, String, boolean): - -MissingNullability: android.os.HwBinder#getService(String, String, boolean) parameter #0: - -MissingNullability: android.os.HwBinder#getService(String, String, boolean) parameter #1: - -MissingNullability: android.os.HwBinder#onTransact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #1: - -MissingNullability: android.os.HwBinder#onTransact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #2: - -MissingNullability: android.os.HwBinder#registerService(String) parameter #0: - -MissingNullability: android.os.HwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #1: - -MissingNullability: android.os.HwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #2: - -MissingNullability: android.os.HwBlob#copyToBoolArray(long, boolean[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToDoubleArray(long, double[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToFloatArray(long, float[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToInt16Array(long, short[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToInt32Array(long, int[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToInt64Array(long, long[], int) parameter #1: - -MissingNullability: android.os.HwBlob#copyToInt8Array(long, byte[], int) parameter #1: - -MissingNullability: android.os.HwBlob#getString(long): - -MissingNullability: android.os.HwBlob#putBlob(long, android.os.HwBlob) parameter #1: - -MissingNullability: android.os.HwBlob#putBoolArray(long, boolean[]) parameter #1: - -MissingNullability: android.os.HwBlob#putDoubleArray(long, double[]) parameter #1: - -MissingNullability: android.os.HwBlob#putFloatArray(long, float[]) parameter #1: - -MissingNullability: android.os.HwBlob#putInt16Array(long, short[]) parameter #1: - -MissingNullability: android.os.HwBlob#putInt32Array(long, int[]) parameter #1: - -MissingNullability: android.os.HwBlob#putInt64Array(long, long[]) parameter #1: - -MissingNullability: android.os.HwBlob#putInt8Array(long, byte[]) parameter #1: - -MissingNullability: android.os.HwBlob#putString(long, String) parameter #1: - -MissingNullability: android.os.HwBlob#wrapArray(boolean[]): - -MissingNullability: android.os.HwBlob#wrapArray(byte[]): - -MissingNullability: android.os.HwBlob#wrapArray(double[]): - -MissingNullability: android.os.HwBlob#wrapArray(float[]): - -MissingNullability: android.os.HwBlob#wrapArray(int[]): - -MissingNullability: android.os.HwBlob#wrapArray(long[]): - -MissingNullability: android.os.HwBlob#wrapArray(short[]): - -MissingNullability: android.os.HwParcel#enforceInterface(String) parameter #0: - -MissingNullability: android.os.HwParcel#readBoolVector(): - -MissingNullability: android.os.HwParcel#readBuffer(long): - -MissingNullability: android.os.HwParcel#readDoubleVector(): - -MissingNullability: android.os.HwParcel#readEmbeddedBuffer(long, long, long, boolean): - -MissingNullability: android.os.HwParcel#readFloatVector(): - -MissingNullability: android.os.HwParcel#readInt16Vector(): - -MissingNullability: android.os.HwParcel#readInt32Vector(): - -MissingNullability: android.os.HwParcel#readInt64Vector(): - -MissingNullability: android.os.HwParcel#readInt8Vector(): - -MissingNullability: android.os.HwParcel#readString(): - -MissingNullability: android.os.HwParcel#readStringVector(): - -MissingNullability: android.os.HwParcel#readStrongBinder(): - -MissingNullability: android.os.HwParcel#writeBoolVector(java.util.ArrayList<java.lang.Boolean>) parameter #0: - -MissingNullability: android.os.HwParcel#writeBuffer(android.os.HwBlob) parameter #0: - -MissingNullability: android.os.HwParcel#writeDoubleVector(java.util.ArrayList<java.lang.Double>) parameter #0: - -MissingNullability: android.os.HwParcel#writeFloatVector(java.util.ArrayList<java.lang.Float>) parameter #0: - -MissingNullability: android.os.HwParcel#writeInt16Vector(java.util.ArrayList<java.lang.Short>) parameter #0: - -MissingNullability: android.os.HwParcel#writeInt32Vector(java.util.ArrayList<java.lang.Integer>) parameter #0: - -MissingNullability: android.os.HwParcel#writeInt64Vector(java.util.ArrayList<java.lang.Long>) parameter #0: - -MissingNullability: android.os.HwParcel#writeInt8Vector(java.util.ArrayList<java.lang.Byte>) parameter #0: - -MissingNullability: android.os.HwParcel#writeInterfaceToken(String) parameter #0: - -MissingNullability: android.os.HwParcel#writeString(String) parameter #0: - -MissingNullability: android.os.HwParcel#writeStringVector(java.util.ArrayList<java.lang.String>) parameter #0: - -MissingNullability: android.os.HwParcel#writeStrongBinder(android.os.IHwBinder) parameter #0: - -MissingNullability: android.os.IHwBinder#linkToDeath(android.os.IHwBinder.DeathRecipient, long) parameter #0: - -MissingNullability: android.os.IHwBinder#queryLocalInterface(String): - -MissingNullability: android.os.IHwBinder#queryLocalInterface(String) parameter #0: - -MissingNullability: android.os.IHwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #1: - -MissingNullability: android.os.IHwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int) parameter #2: - -MissingNullability: android.os.IHwBinder#unlinkToDeath(android.os.IHwBinder.DeathRecipient) parameter #0: - -MissingNullability: android.os.IHwInterface#asBinder(): - -MissingNullability: android.os.IncidentManager#approveReport(android.net.Uri) parameter #0: - -MissingNullability: android.os.IncidentManager#cancelAuthorization(android.os.IncidentManager.AuthListener) parameter #0: - -MissingNullability: android.os.IncidentManager#deleteIncidentReports(android.net.Uri) parameter #0: - -MissingNullability: android.os.IncidentManager#denyReport(android.net.Uri) parameter #0: - -MissingNullability: android.os.IncidentManager#getIncidentReport(android.net.Uri) parameter #0: - -MissingNullability: android.os.IncidentManager#getIncidentReportList(String) parameter #0: - -MissingNullability: android.os.IncidentManager#getPendingReports(): - -MissingNullability: android.os.IncidentManager#reportIncident(android.os.IncidentReportArgs) parameter #0: - -MissingNullability: android.os.IncidentManager#requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener) parameter #1: - -MissingNullability: android.os.IncidentManager#requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener) parameter #3: - -MissingNullability: android.os.IncidentManager.IncidentReport#IncidentReport(android.os.Parcel) parameter #0: - -MissingNullability: android.os.IncidentManager.IncidentReport#getInputStream(): - -MissingNullability: android.os.IncidentManager.IncidentReport#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.os.IncidentReportArgs#IncidentReportArgs(android.os.Parcel) parameter #0: - -MissingNullability: android.os.IncidentReportArgs#addHeader(byte[]) parameter #0: - -MissingNullability: android.os.IncidentReportArgs#readFromParcel(android.os.Parcel) parameter #0: - -MissingNullability: android.os.IncidentReportArgs#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `file` in method `contains` MissingNullability: android.os.ParcelFileDescriptor#getFile(java.io.FileDescriptor): - + Missing nullability on method `getFile` return MissingNullability: android.os.ParcelFileDescriptor#getFile(java.io.FileDescriptor) parameter #0: - -MissingNullability: android.os.RemoteCallback#RemoteCallback(android.os.RemoteCallback.OnResultListener) parameter #0: - -MissingNullability: android.os.RemoteCallback#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `fd` in method `getFile` MissingNullability: android.os.StrictMode#setViolationLogger(android.os.StrictMode.ViolationLogger) parameter #0: - + Missing nullability on parameter `listener` in method `setViolationLogger` MissingNullability: android.os.StrictMode.ViolationInfo#ViolationInfo(android.os.Parcel) parameter #0: - + Missing nullability on parameter `in` in method `ViolationInfo` MissingNullability: android.os.StrictMode.ViolationInfo#ViolationInfo(android.os.Parcel, boolean) parameter #0: - + Missing nullability on parameter `in` in method `ViolationInfo` MissingNullability: android.os.StrictMode.ViolationInfo#broadcastIntentAction: - + Missing nullability on field `broadcastIntentAction` in class `class android.os.StrictMode.ViolationInfo` MissingNullability: android.os.StrictMode.ViolationInfo#dump(android.util.Printer, String) parameter #0: - + Missing nullability on parameter `pw` in method `dump` MissingNullability: android.os.StrictMode.ViolationInfo#dump(android.util.Printer, String) parameter #1: - + Missing nullability on parameter `prefix` in method `dump` MissingNullability: android.os.StrictMode.ViolationInfo#getStackTrace(): - + Missing nullability on method `getStackTrace` return MissingNullability: android.os.StrictMode.ViolationInfo#getViolationClass(): - + Missing nullability on method `getViolationClass` return MissingNullability: android.os.StrictMode.ViolationInfo#getViolationDetails(): - + Missing nullability on method `getViolationDetails` return MissingNullability: android.os.StrictMode.ViolationInfo#tags: - + Missing nullability on field `tags` in class `class android.os.StrictMode.ViolationInfo` MissingNullability: android.os.StrictMode.ViolationInfo#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `dest` in method `writeToParcel` MissingNullability: android.os.StrictMode.ViolationLogger#log(android.os.StrictMode.ViolationInfo) parameter #0: - -MissingNullability: android.os.UserHandle#of(int): - + Missing nullability on parameter `info` in method `log` MissingNullability: android.os.VibrationEffect#RINGTONES: - + Missing nullability on field `RINGTONES` in class `class android.os.VibrationEffect` MissingNullability: android.os.VibrationEffect#get(android.net.Uri, android.content.Context) parameter #0: - + Missing nullability on parameter `uri` in method `get` MissingNullability: android.os.VibrationEffect#get(android.net.Uri, android.content.Context) parameter #1: - + Missing nullability on parameter `context` in method `get` MissingNullability: android.os.VibrationEffect#get(int): - + Missing nullability on method `get` return MissingNullability: android.os.VibrationEffect#get(int, boolean): - + Missing nullability on method `get` return MissingNullability: android.os.VintfObject#getHalNamesAndVersions(): - + Missing nullability on method `getHalNamesAndVersions` return MissingNullability: android.os.VintfObject#getSepolicyVersion(): - + Missing nullability on method `getSepolicyVersion` return MissingNullability: android.os.VintfObject#getTargetFrameworkCompatibilityMatrixVersion(): - + Missing nullability on method `getTargetFrameworkCompatibilityMatrixVersion` return MissingNullability: android.os.VintfObject#getVndkSnapshots(): - + Missing nullability on method `getVndkSnapshots` return MissingNullability: android.os.VintfObject#report(): - + Missing nullability on method `report` return MissingNullability: android.os.VintfRuntimeInfo#getCpuInfo(): - + Missing nullability on method `getCpuInfo` return MissingNullability: android.os.VintfRuntimeInfo#getHardwareId(): - + Missing nullability on method `getHardwareId` return MissingNullability: android.os.VintfRuntimeInfo#getKernelVersion(): - + Missing nullability on method `getKernelVersion` return MissingNullability: android.os.VintfRuntimeInfo#getNodeName(): - + Missing nullability on method `getNodeName` return MissingNullability: android.os.VintfRuntimeInfo#getOsName(): - + Missing nullability on method `getOsName` return MissingNullability: android.os.VintfRuntimeInfo#getOsRelease(): - + Missing nullability on method `getOsRelease` return MissingNullability: android.os.VintfRuntimeInfo#getOsVersion(): - + Missing nullability on method `getOsVersion` return MissingNullability: android.os.WorkSource#add(int, String) parameter #1: - -MissingNullability: android.os.WorkSource#addReturningNewbs(android.os.WorkSource) parameter #0: - -MissingNullability: android.os.WorkSource#getName(int): - -MissingNullability: android.os.WorkSource#setReturningDiffs(android.os.WorkSource) parameter #0: - + Missing nullability on parameter `name` in method `add` MissingNullability: android.os.health.HealthKeys.Constants#Constants(Class) parameter #0: - + Missing nullability on parameter `clazz` in method `Constants` MissingNullability: android.os.health.HealthKeys.Constants#getDataType(): - + Missing nullability on method `getDataType` return MissingNullability: android.os.health.HealthKeys.Constants#getKeys(int): - + Missing nullability on method `getKeys` return MissingNullability: android.os.health.HealthStats#HealthStats(android.os.Parcel) parameter #0: - + Missing nullability on parameter `in` in method `HealthStats` MissingNullability: android.os.health.HealthStatsParceler#HealthStatsParceler(android.os.Parcel) parameter #0: - + Missing nullability on parameter `in` in method `HealthStatsParceler` MissingNullability: android.os.health.HealthStatsParceler#HealthStatsParceler(android.os.health.HealthStatsWriter) parameter #0: - + Missing nullability on parameter `writer` in method `HealthStatsParceler` MissingNullability: android.os.health.HealthStatsParceler#getHealthStats(): - + Missing nullability on method `getHealthStats` return MissingNullability: android.os.health.HealthStatsParceler#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `out` in method `writeToParcel` MissingNullability: android.os.health.HealthStatsWriter#HealthStatsWriter(android.os.health.HealthKeys.Constants) parameter #0: - + Missing nullability on parameter `constants` in method `HealthStatsWriter` MissingNullability: android.os.health.HealthStatsWriter#addMeasurements(int, String, long) parameter #1: - + Missing nullability on parameter `name` in method `addMeasurements` MissingNullability: android.os.health.HealthStatsWriter#addStats(int, String, android.os.health.HealthStatsWriter) parameter #1: - + Missing nullability on parameter `name` in method `addStats` MissingNullability: android.os.health.HealthStatsWriter#addStats(int, String, android.os.health.HealthStatsWriter) parameter #2: - + Missing nullability on parameter `value` in method `addStats` MissingNullability: android.os.health.HealthStatsWriter#addTimers(int, String, android.os.health.TimerStat) parameter #1: - + Missing nullability on parameter `name` in method `addTimers` MissingNullability: android.os.health.HealthStatsWriter#addTimers(int, String, android.os.health.TimerStat) parameter #2: - + Missing nullability on parameter `value` in method `addTimers` MissingNullability: android.os.health.HealthStatsWriter#flattenToParcel(android.os.Parcel) parameter #0: - + Missing nullability on parameter `out` in method `flattenToParcel` MissingNullability: android.os.storage.StorageVolume#getPath(): - -MissingNullability: android.permission.RuntimePermissionPresentationInfo#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on method `getPath` return MissingNullability: android.provider.CalendarContract.Calendars#SYNC_WRITABLE_COLUMNS: - + Missing nullability on field `SYNC_WRITABLE_COLUMNS` in class `class android.provider.CalendarContract.Calendars` MissingNullability: android.provider.CalendarContract.Events#SYNC_WRITABLE_COLUMNS: - -MissingNullability: android.provider.ContactsContract.CommonDataKinds.Phone#ENTERPRISE_CONTENT_URI: - + Missing nullability on field `SYNC_WRITABLE_COLUMNS` in class `class android.provider.CalendarContract.Events` MissingNullability: android.provider.ContactsContract.RawContactsEntity#CORP_CONTENT_URI: - -MissingNullability: android.provider.DeviceConfig#getProperty(String, String): - -MissingNullability: android.provider.DeviceConfig#getString(String, String, String): - -MissingNullability: android.provider.MediaStore#deleteContributedMedia(android.content.Context, String, android.os.UserHandle) parameter #0: - -MissingNullability: android.provider.MediaStore#deleteContributedMedia(android.content.Context, String, android.os.UserHandle) parameter #1: - -MissingNullability: android.provider.MediaStore#deleteContributedMedia(android.content.Context, String, android.os.UserHandle) parameter #2: - -MissingNullability: android.provider.MediaStore#getContributedMediaSize(android.content.Context, String, android.os.UserHandle) parameter #0: - -MissingNullability: android.provider.MediaStore#getContributedMediaSize(android.content.Context, String, android.os.UserHandle) parameter #1: - -MissingNullability: android.provider.MediaStore#getContributedMediaSize(android.content.Context, String, android.os.UserHandle) parameter #2: - -MissingNullability: android.provider.MediaStore#scanFile(android.content.Context, java.io.File): - -MissingNullability: android.provider.MediaStore#scanFile(android.content.Context, java.io.File) parameter #0: - -MissingNullability: android.provider.MediaStore#scanFile(android.content.Context, java.io.File) parameter #1: - -MissingNullability: android.provider.MediaStore#scanFileFromShell(android.content.Context, java.io.File): - -MissingNullability: android.provider.MediaStore#scanFileFromShell(android.content.Context, java.io.File) parameter #0: - -MissingNullability: android.provider.MediaStore#scanFileFromShell(android.content.Context, java.io.File) parameter #1: - -MissingNullability: android.provider.MediaStore#scanVolume(android.content.Context, java.io.File) parameter #0: - -MissingNullability: android.provider.MediaStore#scanVolume(android.content.Context, java.io.File) parameter #1: - -MissingNullability: android.provider.MediaStore#waitForIdle(android.content.Context) parameter #0: - -MissingNullability: android.security.KeyStoreException#KeyStoreException(int, String) parameter #1: - -MissingNullability: android.security.keystore.AttestationUtils#attestDeviceIds(android.content.Context, int[], byte[]) parameter #0: - + Missing nullability on field `CORP_CONTENT_URI` in class `class android.provider.ContactsContract.RawContactsEntity` MissingNullability: android.security.keystore.KeyProtection.Builder#setBoundToSpecificSecureUserId(long): - -MissingNullability: android.service.autofill.AutofillFieldClassificationService#onBind(android.content.Intent): - -MissingNullability: android.service.autofill.AutofillFieldClassificationService#onBind(android.content.Intent) parameter #0: - + Missing nullability on method `setBoundToSpecificSecureUserId` return MissingNullability: android.service.autofill.CompositeUserData#getCategoryIds(): - + Missing nullability on method `getCategoryIds` return MissingNullability: android.service.autofill.CompositeUserData#getDefaultFieldClassificationArgs(): - + Missing nullability on method `getDefaultFieldClassificationArgs` return MissingNullability: android.service.autofill.CompositeUserData#getFieldClassificationAlgorithms(): - + Missing nullability on method `getFieldClassificationAlgorithms` return MissingNullability: android.service.autofill.CompositeUserData#getFieldClassificationArgs(): - + Missing nullability on method `getFieldClassificationArgs` return MissingNullability: android.service.autofill.CompositeUserData#getValues(): - + Missing nullability on method `getValues` return MissingNullability: android.service.autofill.CompositeUserData#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `parcel` in method `writeToParcel` MissingNullability: android.service.autofill.UserData#getFieldClassificationAlgorithms(): - -MissingNullability: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0: - -MissingNullability: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #1: - -MissingNullability: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #2: - -MissingNullability: android.service.autofill.augmented.AugmentedAutofillService#onUnbind(android.content.Intent) parameter #0: - -MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0: - -MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #1: - -MissingNullability: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #2: - -MissingNullability: android.service.notification.Adjustment#Adjustment(String, String, android.os.Bundle, CharSequence, int) parameter #0: - -MissingNullability: android.service.notification.Adjustment#Adjustment(String, String, android.os.Bundle, CharSequence, int) parameter #1: - -MissingNullability: android.service.notification.Adjustment#Adjustment(String, String, android.os.Bundle, CharSequence, int) parameter #2: - -MissingNullability: android.service.notification.Adjustment#Adjustment(String, String, android.os.Bundle, CharSequence, int) parameter #3: - -MissingNullability: android.service.notification.Adjustment#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context) parameter #0: - -MissingNullability: android.service.notification.NotificationStats#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.service.notification.SnoozeCriterion#SnoozeCriterion(String, CharSequence, CharSequence) parameter #0: - -MissingNullability: android.service.notification.SnoozeCriterion#SnoozeCriterion(String, CharSequence, CharSequence) parameter #1: - -MissingNullability: android.service.notification.SnoozeCriterion#SnoozeCriterion(String, CharSequence, CharSequence) parameter #2: - -MissingNullability: android.service.notification.SnoozeCriterion#SnoozeCriterion(android.os.Parcel) parameter #0: - -MissingNullability: android.service.notification.SnoozeCriterion#getConfirmation(): - -MissingNullability: android.service.notification.SnoozeCriterion#getExplanation(): - -MissingNullability: android.service.notification.SnoozeCriterion#getId(): - -MissingNullability: android.service.notification.SnoozeCriterion#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on method `getFieldClassificationAlgorithms` return MissingNullability: android.telecom.Call.Details#getTelecomCallId(): - -MissingNullability: android.telecom.CallScreeningService.CallResponse.Builder#setShouldScreenCallFurther(boolean): - -MissingNullability: android.telecom.Conference#getPrimaryConnection(): - -MissingNullability: android.telecom.PhoneAccountSuggestionService#onBind(android.content.Intent): - -MissingNullability: android.telecom.PhoneAccountSuggestionService#onBind(android.content.Intent) parameter #0: - -MissingNullability: android.telephony.CallQuality#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.DataSpecificRegistrationInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.LteVopsSupportInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.NetworkRegistrationInfo#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on method `getTelecomCallId` return MissingNullability: android.telephony.ServiceState#addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo) parameter #0: - + Missing nullability on parameter `nri` in method `addNetworkRegistrationInfo` MissingNullability: android.telephony.ServiceState#setCellBandwidths(int[]) parameter #0: - + Missing nullability on parameter `bandwidths` in method `setCellBandwidths` MissingNullability: android.telephony.SmsManager#checkSmsShortCodeDestination(String, String) parameter #0: - + Missing nullability on parameter `destAddress` in method `checkSmsShortCodeDestination` MissingNullability: android.telephony.SmsManager#checkSmsShortCodeDestination(String, String) parameter #1: - -MissingNullability: android.telephony.TelephonyManager#checkCarrierPrivilegesForPackage(String) parameter #0: - -MissingNullability: android.telephony.TelephonyManager#getCarrierPackageNamesForIntent(android.content.Intent): - -MissingNullability: android.telephony.TelephonyManager#getCarrierPackageNamesForIntent(android.content.Intent) parameter #0: - + Missing nullability on parameter `countryIso` in method `checkSmsShortCodeDestination` MissingNullability: android.telephony.TelephonyManager#getLine1AlphaTag(): - + Missing nullability on method `getLine1AlphaTag` return MissingNullability: android.telephony.TelephonyManager#getRadioHalVersion(): - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #0: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #1: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #2: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #3: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #4: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #5: - -MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String) parameter #6: - + Missing nullability on method `getRadioHalVersion` return MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #0: - + Missing nullability on parameter `mccmnc` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #1: - + Missing nullability on parameter `imsi` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #2: - + Missing nullability on parameter `iccid` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #3: - + Missing nullability on parameter `gid1` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #4: - + Missing nullability on parameter `gid2` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #5: - + Missing nullability on parameter `plmn` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #6: - + Missing nullability on parameter `spn` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #7: - + Missing nullability on parameter `carrierPriviledgeRules` in method `setCarrierTestOverride` MissingNullability: android.telephony.TelephonyManager#setCarrierTestOverride(String, String, String, String, String, String, String, String, String) parameter #8: - -MissingNullability: android.telephony.ims.ImsCallForwardInfo#getNumber(): - -MissingNullability: android.telephony.ims.ImsCallForwardInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#ImsCallProfile(int, int, android.os.Bundle, android.telephony.ims.ImsStreamMediaProfile) parameter #2: - -MissingNullability: android.telephony.ims.ImsCallProfile#ImsCallProfile(int, int, android.os.Bundle, android.telephony.ims.ImsStreamMediaProfile) parameter #3: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtra(String): - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtra(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtra(String, String): - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtra(String, String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtra(String, String) parameter #1: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtraBoolean(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtraBoolean(String, boolean) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtraInt(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtraInt(String, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#getCallExtras(): - -MissingNullability: android.telephony.ims.ImsCallProfile#getMediaProfile(): - -MissingNullability: android.telephony.ims.ImsCallProfile#getVideoStateFromImsCallProfile(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#setCallExtra(String, String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#setCallExtra(String, String) parameter #1: - -MissingNullability: android.telephony.ims.ImsCallProfile#setCallExtraBoolean(String, boolean) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#setCallExtraInt(String, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#updateCallExtras(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#updateCallType(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#updateMediaProfile(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallProfile#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceExtendFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceExtendReceived(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceExtendReceived(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #1: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceExtended(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceExtended(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #1: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionConferenceStateUpdated(android.telephony.ims.ImsConferenceState) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionHandover(int, int, android.telephony.ims.ImsReasonInfo) parameter #2: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionHandoverFailed(int, int, android.telephony.ims.ImsReasonInfo) parameter #2: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionHeld(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionHoldFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionHoldReceived(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionInitiated(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionInitiatedFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionInviteParticipantsRequestFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionMergeComplete(android.telephony.ims.stub.ImsCallSessionImplBase) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionMergeFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionMergeStarted(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionMergeStarted(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile) parameter #1: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionProgressing(android.telephony.ims.ImsStreamMediaProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionRemoveParticipantsRequestFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionResumeFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionResumeReceived(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionResumed(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionRttMessageReceived(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionRttModifyRequestReceived(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionSuppServiceReceived(android.telephony.ims.ImsSuppServiceNotification) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionTerminated(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionUpdateFailed(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionUpdateReceived(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionUpdated(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsCallSessionListener#callSessionUssdMessageReceived(int, String) parameter #1: - -MissingNullability: android.telephony.ims.ImsConferenceState#getConnectionStateForStatus(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsConferenceState#mParticipants: - -MissingNullability: android.telephony.ims.ImsConferenceState#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsExternalCallState#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsReasonInfo#ImsReasonInfo(int, int, String) parameter #2: - -MissingNullability: android.telephony.ims.ImsReasonInfo#getExtraMessage(): - -MissingNullability: android.telephony.ims.ImsReasonInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsService#createMmTelFeature(int): - -MissingNullability: android.telephony.ims.ImsService#createRcsFeature(int): - -MissingNullability: android.telephony.ims.ImsService#getConfig(int): - -MissingNullability: android.telephony.ims.ImsService#getRegistration(int): - -MissingNullability: android.telephony.ims.ImsService#onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration) parameter #0: - -MissingNullability: android.telephony.ims.ImsService#querySupportedImsFeatures(): - -MissingNullability: android.telephony.ims.ImsSsData#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsSsInfo#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsStreamMediaProfile#copyFrom(android.telephony.ims.ImsStreamMediaProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsStreamMediaProfile#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsSuppServiceNotification#ImsSuppServiceNotification(int, int, int, int, String, String[]) parameter #4: - -MissingNullability: android.telephony.ims.ImsSuppServiceNotification#ImsSuppServiceNotification(int, int, int, int, String, String[]) parameter #5: - -MissingNullability: android.telephony.ims.ImsSuppServiceNotification#history: - -MissingNullability: android.telephony.ims.ImsSuppServiceNotification#number: - -MissingNullability: android.telephony.ims.ImsSuppServiceNotification#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsUtListener#onSupplementaryServiceIndication(android.telephony.ims.ImsSsData) parameter #0: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationCallBarringQueried(int, android.telephony.ims.ImsSsInfo[]) parameter #1: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationCallForwardQueried(int, android.telephony.ims.ImsCallForwardInfo[]) parameter #1: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationCallWaitingQueried(int, android.telephony.ims.ImsSsInfo[]) parameter #1: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationQueried(int, android.os.Bundle) parameter #1: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationQueryFailed(int, android.telephony.ims.ImsReasonInfo) parameter #1: - -MissingNullability: android.telephony.ims.ImsUtListener#onUtConfigurationUpdateFailed(int, android.telephony.ims.ImsReasonInfo) parameter #1: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#changeCameraCapabilities(android.telecom.VideoProfile.CameraCapabilities) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile) parameter #1: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSendSessionModifyResponse(android.telecom.VideoProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSetCamera(String) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSetCamera(String, int) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSetDisplaySurface(android.view.Surface) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSetPauseImage(android.net.Uri) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#onSetPreviewSurface(android.view.Surface) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#receiveSessionModifyRequest(android.telecom.VideoProfile) parameter #0: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile) parameter #1: - -MissingNullability: android.telephony.ims.ImsVideoCallProvider#receiveSessionModifyResponse(int, android.telecom.VideoProfile, android.telecom.VideoProfile) parameter #2: - -MissingNullability: android.telephony.ims.feature.CapabilityChangeRequest#getCapabilitiesToDisable(): - -MissingNullability: android.telephony.ims.feature.CapabilityChangeRequest#getCapabilitiesToEnable(): - -MissingNullability: android.telephony.ims.feature.CapabilityChangeRequest#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.feature.ImsFeature#changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy) parameter #0: - -MissingNullability: android.telephony.ims.feature.ImsFeature#changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy) parameter #1: - -MissingNullability: android.telephony.ims.feature.MmTelFeature#queryCapabilityStatus(): - -MissingNullability: android.telephony.ims.feature.MmTelFeature.MmTelCapabilities#MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#accept(int, android.telephony.ims.ImsStreamMediaProfile) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#deflect(String) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#extendToConference(String[]) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getCallId(): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getCallProfile(): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getImsVideoCallProvider(): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getLocalCallProfile(): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getProperty(String): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getProperty(String) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#getRemoteCallProfile(): - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#hold(android.telephony.ims.ImsStreamMediaProfile) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#inviteParticipants(String[]) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#removeParticipants(String[]) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#resume(android.telephony.ims.ImsStreamMediaProfile) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#sendDtmf(char, android.os.Message) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#sendRttMessage(String) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#sendRttModifyRequest(android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#sendUssd(String) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#setListener(android.telephony.ims.ImsCallSessionListener) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#start(String, android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#start(String, android.telephony.ims.ImsCallProfile) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#startConference(String[], android.telephony.ims.ImsCallProfile) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#startConference(String[], android.telephony.ims.ImsCallProfile) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase#update(int, android.telephony.ims.ImsStreamMediaProfile) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsCallSessionImplBase.State#toString(int): - -MissingNullability: android.telephony.ims.stub.ImsConfigImplBase#getConfigString(int): - -MissingNullability: android.telephony.ims.stub.ImsConfigImplBase#notifyProvisionedValueChanged(int, String) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsConfigImplBase#setConfig(int, String) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsFeatureConfiguration#getServiceFeatures(): - -MissingNullability: android.telephony.ims.stub.ImsFeatureConfiguration#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsFeatureConfiguration.Builder#addFeature(int, int): - -MissingNullability: android.telephony.ims.stub.ImsFeatureConfiguration.Builder#build(): - -MissingNullability: android.telephony.ims.stub.ImsMultiEndpointImplBase#onImsExternalCallStateUpdate(java.util.List<android.telephony.ims.ImsExternalCallState>) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsRegistrationImplBase#onDeregistered(android.telephony.ims.ImsReasonInfo) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsRegistrationImplBase#onSubscriberAssociatedUriChanged(android.net.Uri[]) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsRegistrationImplBase#onTechnologyChangeFailed(int, android.telephony.ims.ImsReasonInfo) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#getSmsFormat(): - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsReceived(int, String, byte[]) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsReceived(int, String, byte[]) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsStatusReportReceived(int, String, byte[]) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsStatusReportReceived(int, String, byte[]) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsStatusReportReceived(int, int, String, byte[]) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#onSmsStatusReportReceived(int, int, String, byte[]) parameter #3: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#sendSms(int, int, String, String, boolean, byte[]) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#sendSms(int, int, String, String, boolean, byte[]) parameter #3: - -MissingNullability: android.telephony.ims.stub.ImsSmsImplBase#sendSms(int, int, String, String, boolean, byte[]) parameter #5: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#queryCallForward(int, String) parameter #1: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#setListener(android.telephony.ims.ImsUtListener) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#transact(android.os.Bundle) parameter #0: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#updateCallBarring(int, int, String[]) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#updateCallBarringForServiceClass(int, int, String[], int) parameter #2: - -MissingNullability: android.telephony.ims.stub.ImsUtImplBase#updateCallForward(int, int, String, int, int) parameter #2: - -MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String): - -MissingNullability: android.telephony.mbms.DownloadRequest.Builder#setServiceId(String) parameter #0: - -MissingNullability: android.telephony.mbms.FileInfo#FileInfo(android.net.Uri, String) parameter #0: - -MissingNullability: android.telephony.mbms.FileInfo#FileInfo(android.net.Uri, String) parameter #1: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #0: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #1: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #2: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #3: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #4: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #5: - -MissingNullability: android.telephony.mbms.FileServiceInfo#FileServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date, java.util.List<android.telephony.mbms.FileInfo>) parameter #6: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #0: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #1: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #2: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #3: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #4: - -MissingNullability: android.telephony.mbms.StreamingServiceInfo#StreamingServiceInfo(java.util.Map<java.util.Locale,java.lang.String>, String, java.util.List<java.util.Locale>, String, java.util.Date, java.util.Date) parameter #5: - -MissingNullability: android.telephony.mbms.UriPathPair#getContentUri(): - -MissingNullability: android.telephony.mbms.UriPathPair#getFilePathUri(): - -MissingNullability: android.telephony.mbms.UriPathPair#writeToParcel(android.os.Parcel, int) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#asBinder(): - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#cancelDownload(android.telephony.mbms.DownloadRequest) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#download(android.telephony.mbms.DownloadRequest) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int) parameter #2: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#requestDownloadState(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#requestDownloadState(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#requestUpdateFileServices(int, java.util.List<java.lang.String>) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#resetDownloadKnowledge(android.telephony.mbms.DownloadRequest) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsDownloadServiceBase#setTempFileRootDirectory(int, String) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#onBind(android.content.Intent): - -MissingNullability: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#onBind(android.content.Intent) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#asBinder(): - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#getPlaybackUri(int, String) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int) parameter #2: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#requestUpdateStreamingServices(int, java.util.List<java.lang.String>) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#startStreaming(int, String, android.telephony.mbms.StreamingServiceCallback) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#startStreaming(int, String, android.telephony.mbms.StreamingServiceCallback) parameter #2: - -MissingNullability: android.telephony.mbms.vendor.MbmsStreamingServiceBase#stopStreaming(int, String) parameter #1: - -MissingNullability: android.telephony.mbms.vendor.VendorUtils#getAppReceiverFromPackageName(android.content.Context, String): - -MissingNullability: android.telephony.mbms.vendor.VendorUtils#getAppReceiverFromPackageName(android.content.Context, String) parameter #0: - -MissingNullability: android.telephony.mbms.vendor.VendorUtils#getAppReceiverFromPackageName(android.content.Context, String) parameter #1: - + Missing nullability on parameter `apn` in method `setCarrierTestOverride` MissingNullability: android.text.Selection.MemoryTextWatcher#afterTextChanged(android.text.Editable) parameter #0: - + Missing nullability on parameter `s` in method `afterTextChanged` MissingNullability: android.text.Selection.MemoryTextWatcher#beforeTextChanged(CharSequence, int, int, int) parameter #0: - + Missing nullability on parameter `s` in method `beforeTextChanged` MissingNullability: android.text.Selection.MemoryTextWatcher#onTextChanged(CharSequence, int, int, int) parameter #0: - + Missing nullability on parameter `s` in method `onTextChanged` MissingNullability: android.transition.TransitionManager#getTransition(android.transition.Scene): - + Missing nullability on method `getTransition` return MissingNullability: android.transition.TransitionManager#getTransition(android.transition.Scene) parameter #0: - + Missing nullability on parameter `scene` in method `getTransition` MissingNullability: android.util.FeatureFlagUtils#getAllFeatureFlags(): - + Missing nullability on method `getAllFeatureFlags` return MissingNullability: android.util.FeatureFlagUtils#isEnabled(android.content.Context, String) parameter #0: - + Missing nullability on parameter `context` in method `isEnabled` MissingNullability: android.util.FeatureFlagUtils#isEnabled(android.content.Context, String) parameter #1: - + Missing nullability on parameter `feature` in method `isEnabled` MissingNullability: android.util.FeatureFlagUtils#setEnabled(android.content.Context, String, boolean) parameter #0: - + Missing nullability on parameter `context` in method `setEnabled` MissingNullability: android.util.FeatureFlagUtils#setEnabled(android.content.Context, String, boolean) parameter #1: - + Missing nullability on parameter `feature` in method `setEnabled` MissingNullability: android.util.TimeUtils#formatDuration(long): - + Missing nullability on method `formatDuration` return MissingNullability: android.util.proto.EncodedBuffer#dumpBuffers(String) parameter #0: - + Missing nullability on parameter `tag` in method `dumpBuffers` MissingNullability: android.util.proto.EncodedBuffer#dumpByteString(String, String, byte[]) parameter #0: - + Missing nullability on parameter `tag` in method `dumpByteString` MissingNullability: android.util.proto.EncodedBuffer#dumpByteString(String, String, byte[]) parameter #1: - + Missing nullability on parameter `prefix` in method `dumpByteString` MissingNullability: android.util.proto.EncodedBuffer#dumpByteString(String, String, byte[]) parameter #2: - + Missing nullability on parameter `buf` in method `dumpByteString` MissingNullability: android.util.proto.EncodedBuffer#getBytes(int): - + Missing nullability on method `getBytes` return MissingNullability: android.util.proto.EncodedBuffer#getDebugString(): - + Missing nullability on method `getDebugString` return MissingNullability: android.util.proto.EncodedBuffer#writeRawBuffer(byte[]) parameter #0: - + Missing nullability on parameter `val` in method `writeRawBuffer` MissingNullability: android.util.proto.EncodedBuffer#writeRawBuffer(byte[], int, int) parameter #0: - -MissingNullability: android.util.proto.ProtoOutputStream#ProtoOutputStream(java.io.FileDescriptor) parameter #0: - -MissingNullability: android.util.proto.ProtoOutputStream#ProtoOutputStream(java.io.OutputStream) parameter #0: - -MissingNullability: android.util.proto.ProtoOutputStream#dump(String) parameter #0: - -MissingNullability: android.util.proto.ProtoOutputStream#getBytes(): - -MissingNullability: android.util.proto.ProtoOutputStream#write(long, String) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#write(long, byte[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeBytes(long, byte[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeObject(long, byte[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedBool(long, boolean[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedDouble(long, double[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedEnum(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedFixed32(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedFixed64(long, long[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedFloat(long, float[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedInt32(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedInt64(long, long[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedSFixed32(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedSFixed64(long, long[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedSInt32(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedSInt64(long, long[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedUInt32(long, int[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writePackedUInt64(long, long[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeRepeatedBytes(long, byte[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeRepeatedObject(long, byte[]) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeRepeatedString(long, String) parameter #1: - -MissingNullability: android.util.proto.ProtoOutputStream#writeString(long, String) parameter #1: - + Missing nullability on parameter `val` in method `writeRawBuffer` MissingNullability: android.util.proto.ProtoParseException#ProtoParseException(String) parameter #0: - -MissingNullability: android.util.proto.ProtoStream#FIELD_TYPE_NAMES: - -MissingNullability: android.util.proto.ProtoStream#getFieldCountString(long): - -MissingNullability: android.util.proto.ProtoStream#getFieldIdString(long): - -MissingNullability: android.util.proto.ProtoStream#getFieldTypeString(long): - -MissingNullability: android.util.proto.ProtoStream#getWireTypeString(int): - -MissingNullability: android.util.proto.ProtoStream#token2String(long): - + Missing nullability on parameter `msg` in method `ProtoParseException` MissingNullability: android.util.proto.WireTypeMismatchException#WireTypeMismatchException(String) parameter #0: - + Missing nullability on parameter `msg` in method `WireTypeMismatchException` MissingNullability: android.view.Choreographer#postCallback(int, Runnable, Object) parameter #1: - + Missing nullability on parameter `action` in method `postCallback` MissingNullability: android.view.Choreographer#postCallback(int, Runnable, Object) parameter #2: - + Missing nullability on parameter `token` in method `postCallback` MissingNullability: android.view.Choreographer#postCallbackDelayed(int, Runnable, Object, long) parameter #1: - + Missing nullability on parameter `action` in method `postCallbackDelayed` MissingNullability: android.view.Choreographer#postCallbackDelayed(int, Runnable, Object, long) parameter #2: - + Missing nullability on parameter `token` in method `postCallbackDelayed` MissingNullability: android.view.Choreographer#removeCallbacks(int, Runnable, Object) parameter #1: - + Missing nullability on parameter `action` in method `removeCallbacks` MissingNullability: android.view.Choreographer#removeCallbacks(int, Runnable, Object) parameter #2: - + Missing nullability on parameter `token` in method `removeCallbacks` MissingNullability: android.view.FocusFinder#sort(android.view.View[], int, int, android.view.ViewGroup, boolean) parameter #0: - + Missing nullability on parameter `views` in method `sort` MissingNullability: android.view.FocusFinder#sort(android.view.View[], int, int, android.view.ViewGroup, boolean) parameter #3: - + Missing nullability on parameter `root` in method `sort` MissingNullability: android.view.KeyEvent#actionToString(int): - -MissingNullability: android.view.SurfaceControlViewHost#SurfaceControlViewHost(android.content.Context, android.view.Display, android.view.SurfaceControl) parameter #0: - -MissingNullability: android.view.SurfaceControlViewHost#SurfaceControlViewHost(android.content.Context, android.view.Display, android.view.SurfaceControl) parameter #1: - -MissingNullability: android.view.SurfaceControlViewHost#SurfaceControlViewHost(android.content.Context, android.view.Display, android.view.SurfaceControl) parameter #2: - -MissingNullability: android.view.SurfaceControlViewHost#addView(android.view.View, android.view.WindowManager.LayoutParams) parameter #0: - -MissingNullability: android.view.SurfaceControlViewHost#addView(android.view.View, android.view.WindowManager.LayoutParams) parameter #1: - + Missing nullability on method `actionToString` return MissingNullability: android.view.SurfaceControlViewHost#relayout(android.view.WindowManager.LayoutParams) parameter #0: - + Missing nullability on parameter `attrs` in method `relayout` MissingNullability: android.view.View#getTooltipView(): - + Missing nullability on method `getTooltipView` return MissingNullability: android.view.View#isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable) parameter #0: - + Missing nullability on parameter `background` in method `isDefaultFocusHighlightNeeded` MissingNullability: android.view.View#isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable) parameter #1: - + Missing nullability on parameter `foreground` in method `isDefaultFocusHighlightNeeded` MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.concurrent.Callable<java.io.OutputStream>) parameter #0: - + Missing nullability on parameter `tree` in method `startRenderingCommandsCapture` MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.concurrent.Callable<java.io.OutputStream>) parameter #1: - + Missing nullability on parameter `executor` in method `startRenderingCommandsCapture` MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.concurrent.Callable<java.io.OutputStream>) parameter #2: - -MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.function.Function<android.graphics.Picture,java.lang.Boolean>) parameter #0: - -MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.function.Function<android.graphics.Picture,java.lang.Boolean>) parameter #1: - -MissingNullability: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.function.Function<android.graphics.Picture,java.lang.Boolean>) parameter #2: - + Missing nullability on parameter `callback` in method `startRenderingCommandsCapture` MissingNullability: android.view.WindowManager#holdLock(android.os.IBinder, int) parameter #0: - + Missing nullability on parameter `token` in method `holdLock` MissingNullability: android.view.WindowManager.LayoutParams#accessibilityTitle: - -MissingNullability: android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener#onAccessibilityServicesStateChanged(android.view.accessibility.AccessibilityManager) parameter #0: - -MissingNullability: android.view.accessibility.AccessibilityNodeInfo#setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger) parameter #0: - + Missing nullability on field `accessibilityTitle` in class `class android.view.WindowManager.LayoutParams` MissingNullability: android.view.accessibility.AccessibilityNodeInfo#writeToParcelNoRecycle(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `parcel` in method `writeToParcelNoRecycle` MissingNullability: android.view.accessibility.AccessibilityWindowInfo#setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger) parameter #0: - -MissingNullability: android.view.contentcapture.ContentCaptureEvent#writeToParcel(android.os.Parcel, int) parameter #0: - + Missing nullability on parameter `counter` in method `setNumInstancesInUseCounter` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#asyncNewChild(int): - + Missing nullability on method `asyncNewChild` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getAutofillId(): - + Missing nullability on method `getAutofillId` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getExtras(): - + Missing nullability on method `getExtras` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getHint(): - + Missing nullability on method `getHint` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getNode(): - + Missing nullability on method `getNode` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getTempRect(): - + Missing nullability on method `getTempRect` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#getText(): - + Missing nullability on method `getText` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#newChild(int): - + Missing nullability on method `newChild` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#newHtmlInfoBuilder(String): - + Missing nullability on method `newHtmlInfoBuilder` return MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#newHtmlInfoBuilder(String) parameter #0: - + Missing nullability on parameter `tagName` in method `newHtmlInfoBuilder` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillHints(String[]) parameter #0: - + Missing nullability on parameter `hints` in method `setAutofillHints` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillId(android.view.autofill.AutofillId) parameter #0: - + Missing nullability on parameter `id` in method `setAutofillId` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillId(android.view.autofill.AutofillId, int) parameter #0: - + Missing nullability on parameter `parentId` in method `setAutofillId` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillOptions(CharSequence[]) parameter #0: - + Missing nullability on parameter `options` in method `setAutofillOptions` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setAutofillValue(android.view.autofill.AutofillValue) parameter #0: - + Missing nullability on parameter `value` in method `setAutofillValue` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setClassName(String) parameter #0: - + Missing nullability on parameter `className` in method `setClassName` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setContentDescription(CharSequence) parameter #0: - + Missing nullability on parameter `contentDescription` in method `setContentDescription` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setHint(CharSequence) parameter #0: - + Missing nullability on parameter `hint` in method `setHint` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setHintIdEntry(String) parameter #0: - + Missing nullability on parameter `entryName` in method `setHintIdEntry` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setHtmlInfo(android.view.ViewStructure.HtmlInfo) parameter #0: - + Missing nullability on parameter `htmlInfo` in method `setHtmlInfo` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setId(int, String, String, String) parameter #1: - + Missing nullability on parameter `packageName` in method `setId` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setId(int, String, String, String) parameter #2: - + Missing nullability on parameter `typeName` in method `setId` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setId(int, String, String, String) parameter #3: - + Missing nullability on parameter `entryName` in method `setId` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setLocaleList(android.os.LocaleList) parameter #0: - + Missing nullability on parameter `localeList` in method `setLocaleList` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setText(CharSequence) parameter #0: - + Missing nullability on parameter `text` in method `setText` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setText(CharSequence, int, int) parameter #0: - + Missing nullability on parameter `text` in method `setText` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setTextLines(int[], int[]) parameter #0: - + Missing nullability on parameter `charOffsets` in method `setTextLines` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setTextLines(int[], int[]) parameter #1: - + Missing nullability on parameter `baselines` in method `setTextLines` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setTransformation(android.graphics.Matrix) parameter #0: - + Missing nullability on parameter `matrix` in method `setTransformation` MissingNullability: android.view.contentcapture.ViewNode.ViewStructureImpl#setWebDomain(String) parameter #0: - + Missing nullability on parameter `domain` in method `setWebDomain` MissingNullability: android.widget.CalendarView#getBoundsForDate(long, android.graphics.Rect) parameter #1: - + Missing nullability on parameter `outBounds` in method `getBoundsForDate` MissingNullability: android.widget.ImageView#isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable) parameter #0: - + Missing nullability on parameter `background` in method `isDefaultFocusHighlightNeeded` MissingNullability: android.widget.ImageView#isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable) parameter #1: - + Missing nullability on parameter `foreground` in method `isDefaultFocusHighlightNeeded` MissingNullability: android.widget.Magnifier#getMagnifierDefaultSize(): - + Missing nullability on method `getMagnifierDefaultSize` return MissingNullability: android.widget.Magnifier#setOnOperationCompleteCallback(android.widget.Magnifier.Callback) parameter #0: - + Missing nullability on parameter `callback` in method `setOnOperationCompleteCallback` MissingNullability: android.widget.NumberPicker#getDisplayedValueForCurrentSelection(): - + Missing nullability on method `getDisplayedValueForCurrentSelection` return MissingNullability: android.widget.PopupMenu#getMenuListView(): - + Missing nullability on method `getMenuListView` return MissingNullability: android.widget.TimePicker#getAmView(): - + Missing nullability on method `getAmView` return MissingNullability: android.widget.TimePicker#getHourView(): - + Missing nullability on method `getHourView` return MissingNullability: android.widget.TimePicker#getMinuteView(): - + Missing nullability on method `getMinuteView` return MissingNullability: android.widget.TimePicker#getPmView(): - + Missing nullability on method `getPmView` return MutableBareField: android.content.AutofillOptions#appDisabledExpiration: - + Bare field appDisabledExpiration must be marked final, or moved behind accessors if mutable MutableBareField: android.content.AutofillOptions#augmentedAutofillEnabled: - + Bare field augmentedAutofillEnabled must be marked final, or moved behind accessors if mutable MutableBareField: android.content.AutofillOptions#disabledActivities: - + Bare field disabledActivities must be marked final, or moved behind accessors if mutable MutableBareField: android.content.AutofillOptions#whitelistedActivitiesForAugmentedAutofill: - + Bare field whitelistedActivitiesForAugmentedAutofill must be marked final, or moved behind accessors if mutable MutableBareField: android.content.pm.UserInfo#convertedFromPreCreated: Bare field convertedFromPreCreated must be marked final, or moved behind accessors if mutable MutableBareField: android.content.pm.UserInfo#creationTime: @@ -2438,588 +796,230 @@ MutableBareField: android.content.pm.UserInfo#serialNumber: MutableBareField: android.content.pm.UserInfo#userType: Bare field userType must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.DbStats#cache: - + Bare field cache must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.DbStats#dbName: - + Bare field dbName must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.DbStats#dbSize: - + Bare field dbSize must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.DbStats#lookaside: - + Bare field lookaside must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.DbStats#pageSize: - + Bare field pageSize must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.PagerStats#dbStats: - + Bare field dbStats must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.PagerStats#largestMemAlloc: - + Bare field largestMemAlloc must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.PagerStats#memoryUsed: - + Bare field memoryUsed must be marked final, or moved behind accessors if mutable MutableBareField: android.database.sqlite.SQLiteDebug.PagerStats#pageCacheOverflow: - + Bare field pageCacheOverflow must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#broadcastIntentAction: - + Bare field broadcastIntentAction must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#durationMillis: - + Bare field durationMillis must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#numAnimationsRunning: - + Bare field numAnimationsRunning must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#numInstances: - + Bare field numInstances must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#tags: - + Bare field tags must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#violationNumThisLoop: - + Bare field violationNumThisLoop must be marked final, or moved behind accessors if mutable MutableBareField: android.os.StrictMode.ViolationInfo#violationUptimeMillis: - + Bare field violationUptimeMillis must be marked final, or moved behind accessors if mutable NoByteOrShort: android.media.audiofx.AudioEffect#byteArrayToShort(byte[]): - + Should avoid odd sized primitives; use `int` instead of `short` in method android.media.audiofx.AudioEffect.byteArrayToShort(byte[]) NoByteOrShort: android.media.audiofx.AudioEffect#setParameter(int, short) parameter #1: - + Should avoid odd sized primitives; use `int` instead of `short` in parameter value in android.media.audiofx.AudioEffect.setParameter(int param, short value) NoByteOrShort: android.media.audiofx.AudioEffect#shortToByteArray(short) parameter #0: - -NoByteOrShort: android.os.HwBlob#getInt16(long): - -NoByteOrShort: android.os.HwBlob#getInt8(long): - -NoByteOrShort: android.os.HwBlob#putInt16(long, short) parameter #1: - -NoByteOrShort: android.os.HwBlob#putInt8(long, byte) parameter #1: - -NoByteOrShort: android.os.HwParcel#readInt16(): - -NoByteOrShort: android.os.HwParcel#readInt8(): - -NoByteOrShort: android.os.HwParcel#writeInt16(short) parameter #0: - -NoByteOrShort: android.os.HwParcel#writeInt8(byte) parameter #0: - + Should avoid odd sized primitives; use `int` instead of `short` in parameter value in android.media.audiofx.AudioEffect.shortToByteArray(short value) NoByteOrShort: android.util.proto.EncodedBuffer#readRawByte(): - + Should avoid odd sized primitives; use `int` instead of `byte` in method android.util.proto.EncodedBuffer.readRawByte() NoByteOrShort: android.util.proto.EncodedBuffer#writeRawByte(byte) parameter #0: - - - -NoClone: android.net.util.SocketUtils#bindSocketToInterface(java.io.FileDescriptor, String) parameter #0: - -NoClone: android.net.util.SocketUtils#closeSocket(java.io.FileDescriptor) parameter #0: - -NoClone: android.os.NativeHandle#NativeHandle(java.io.FileDescriptor, boolean) parameter #0: - -NoClone: android.os.NativeHandle#getFileDescriptor(): - -NoClone: android.os.ParcelFileDescriptor#getFile(java.io.FileDescriptor) parameter #0: - -NoClone: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0: - -NoClone: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]) parameter #0: - -NoClone: android.util.proto.ProtoOutputStream#ProtoOutputStream(java.io.FileDescriptor) parameter #0: - + Should avoid odd sized primitives; use `int` instead of `byte` in parameter val in android.util.proto.EncodedBuffer.writeRawByte(byte val) NoSettingsProvider: android.provider.Settings.Global#APP_OPS_CONSTANTS: - -NoSettingsProvider: android.provider.Settings.Global#AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES: - + New setting keys are not allowed (Field: APP_OPS_CONSTANTS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#AUTOMATIC_POWER_SAVE_MODE: - + New setting keys are not allowed (Field: AUTOMATIC_POWER_SAVE_MODE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#BATTERY_SAVER_CONSTANTS: - + New setting keys are not allowed (Field: BATTERY_SAVER_CONSTANTS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD: - + New setting keys are not allowed (Field: DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#DYNAMIC_POWER_SAVINGS_ENABLED: - + New setting keys are not allowed (Field: DYNAMIC_POWER_SAVINGS_ENABLED); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_BLACKLIST_EXEMPTIONS: - + New setting keys are not allowed (Field: HIDDEN_API_BLACKLIST_EXEMPTIONS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_POLICY: - + New setting keys are not allowed (Field: HIDDEN_API_POLICY); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#HIDE_ERROR_DIALOGS: - -NoSettingsProvider: android.provider.Settings.Global#LOCATION_GLOBAL_KILL_SWITCH: - -NoSettingsProvider: android.provider.Settings.Global#LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST: - + New setting keys are not allowed (Field: HIDE_ERROR_DIALOGS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#LOW_POWER_MODE: - + New setting keys are not allowed (Field: LOW_POWER_MODE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#LOW_POWER_MODE_STICKY: - -NoSettingsProvider: android.provider.Settings.Global#NOTIFICATION_BUBBLES: - + New setting keys are not allowed (Field: LOW_POWER_MODE_STICKY); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Global#OVERLAY_DISPLAY_DEVICES: - -NoSettingsProvider: android.provider.Settings.Global#TETHER_OFFLOAD_DISABLED: - -NoSettingsProvider: android.provider.Settings.Global#USE_OPEN_WIFI_PACKAGE: - + New setting keys are not allowed (Field: OVERLAY_DISPLAY_DEVICES); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED: - + New setting keys are not allowed (Field: ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_CAPABILITY: - + New setting keys are not allowed (Field: ACCESSIBILITY_MAGNIFICATION_CAPABILITY); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE: - -NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_ALL: - -NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN: - -NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW: - + New setting keys are not allowed (Field: ACCESSIBILITY_MAGNIFICATION_MODE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_SHORTCUT_TARGET_SERVICE: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_FEATURE_FIELD_CLASSIFICATION: - + New setting keys are not allowed (Field: ACCESSIBILITY_SHORTCUT_TARGET_SERVICE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_SERVICE: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_USER_DATA_MAX_VALUE_LENGTH: - -NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_USER_DATA_MIN_VALUE_LENGTH: - + New setting keys are not allowed (Field: AUTOFILL_SERVICE); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#CONTENT_CAPTURE_ENABLED: - + New setting keys are not allowed (Field: CONTENT_CAPTURE_ENABLED); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#DISABLED_PRINT_SERVICES: - -NoSettingsProvider: android.provider.Settings.Secure#DOZE_ALWAYS_ON: - + New setting keys are not allowed (Field: DISABLED_PRINT_SERVICES); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#ENABLED_VR_LISTENERS: - + New setting keys are not allowed (Field: ENABLED_VR_LISTENERS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#IMMERSIVE_MODE_CONFIRMATIONS: - -NoSettingsProvider: android.provider.Settings.Secure#LOCATION_ACCESS_CHECK_DELAY_MILLIS: - -NoSettingsProvider: android.provider.Settings.Secure#LOCATION_ACCESS_CHECK_INTERVAL_MILLIS: - -NoSettingsProvider: android.provider.Settings.Secure#LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS: - -NoSettingsProvider: android.provider.Settings.Secure#LOCK_SCREEN_SHOW_NOTIFICATIONS: - -NoSettingsProvider: android.provider.Settings.Secure#NFC_PAYMENT_DEFAULT_COMPONENT: - + New setting keys are not allowed (Field: IMMERSIVE_MODE_CONFIRMATIONS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#NOTIFICATION_BADGING: - + New setting keys are not allowed (Field: NOTIFICATION_BADGING); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#POWER_MENU_LOCKED_SHOW_CONTENT: - + New setting keys are not allowed (Field: POWER_MENU_LOCKED_SHOW_CONTENT); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#SYNC_PARENT_SOUNDS: - -NoSettingsProvider: android.provider.Settings.Secure#USER_SETUP_COMPLETE: - + New setting keys are not allowed (Field: SYNC_PARENT_SOUNDS); use getters/setters in relevant manager class NoSettingsProvider: android.provider.Settings.Secure#VOICE_INTERACTION_SERVICE: - + New setting keys are not allowed (Field: VOICE_INTERACTION_SERVICE); use getters/setters in relevant manager class -NotCloseable: android.app.prediction.AppPredictor: - -NotCloseable: android.net.EthernetManager.TetheredInterfaceRequest: - -NotCloseable: android.os.HwParcel: - -NotCloseable: android.telephony.ims.stub.ImsUtImplBase: - - - -NullableCollection: android.os.UserManager#createProfileForUser(String, String, int, int, String[]) parameter #4: - Type of parameter disallowedPackages in android.os.UserManager.createProfileForUser(String name, String userType, int flags, int userId, String[] disallowedPackages) is a nullable collection (`java.lang.String[]`); must be non-null - - -OnNameExpected: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.PrintWriter, String[]): - -OnNameExpected: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]): - OnNameExpected: android.service.notification.ConditionProviderService#isBound(): - -OnNameExpected: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context): - -OnNameExpected: android.service.quicksettings.TileService#isQuickSettingsSupported(): - + If implemented by developer, should follow the on<Something> style; otherwise consider marking final OnNameExpected: android.service.watchdog.ExplicitHealthCheckService#setCallback(android.os.RemoteCallback): - -OnNameExpected: android.telephony.ims.ImsService#createMmTelFeature(int): - -OnNameExpected: android.telephony.ims.ImsService#createRcsFeature(int): - -OnNameExpected: android.telephony.ims.ImsService#disableIms(int): - -OnNameExpected: android.telephony.ims.ImsService#enableIms(int): - -OnNameExpected: android.telephony.ims.ImsService#getConfig(int): - -OnNameExpected: android.telephony.ims.ImsService#getRegistration(int): - -OnNameExpected: android.telephony.ims.ImsService#querySupportedImsFeatures(): - -OnNameExpected: android.telephony.ims.ImsService#readyForFeatureCreation(): - -OnNameExpected: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#dispose(int): - -OnNameExpected: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int): - -OnNameExpected: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback): - -OnNameExpected: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#stopGroupCall(int, long): - -OnNameExpected: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>): - - - -OptionalBuilderConstructorArgument: android.app.prediction.AppTargetEvent.Builder#Builder(android.app.prediction.AppTarget, int) parameter #0: - -OptionalBuilderConstructorArgument: android.net.CaptivePortalData.Builder#Builder(android.net.CaptivePortalData) parameter #0: - -OptionalBuilderConstructorArgument: android.os.VibrationAttributes.Builder#Builder(android.media.AudioAttributes, android.os.VibrationEffect) parameter #1: - + If implemented by developer, should follow the on<Something> style; otherwise consider marking final PackageLayering: android.util.FeatureFlagUtils: - + Method parameter type `android.content.Context` violates package layering: nothing in `package android.util` should depend on `package android.content` -ParcelConstructor: android.os.IncidentManager.IncidentReport#IncidentReport(android.os.Parcel): - -ParcelConstructor: android.os.IncidentReportArgs#IncidentReportArgs(android.os.Parcel): - ParcelConstructor: android.os.StrictMode.ViolationInfo#ViolationInfo(android.os.Parcel): - + Parcelable inflation is exposed through CREATOR, not raw constructors, in android.os.StrictMode.ViolationInfo ParcelConstructor: android.os.health.HealthStatsParceler#HealthStatsParceler(android.os.Parcel): - -ParcelConstructor: android.service.notification.SnoozeCriterion#SnoozeCriterion(android.os.Parcel): - + Parcelable inflation is exposed through CREATOR, not raw constructors, in android.os.health.HealthStatsParceler ParcelCreator: android.app.WindowConfiguration: - -ParcelCreator: android.net.metrics.ApfProgramEvent: - -ParcelCreator: android.net.metrics.ApfStats: - -ParcelCreator: android.net.metrics.DhcpClientEvent: - -ParcelCreator: android.net.metrics.DhcpErrorEvent: - -ParcelCreator: android.net.metrics.IpConnectivityLog.Event: - -ParcelCreator: android.net.metrics.IpManagerEvent: - -ParcelCreator: android.net.metrics.IpReachabilityEvent: - -ParcelCreator: android.net.metrics.NetworkEvent: - -ParcelCreator: android.net.metrics.RaEvent: - -ParcelCreator: android.net.metrics.ValidationProbeEvent: - + Parcelable requires a `CREATOR` field; missing in android.app.WindowConfiguration ParcelCreator: android.service.autofill.InternalOnClickAction: - + Parcelable requires a `CREATOR` field; missing in android.service.autofill.InternalOnClickAction ParcelCreator: android.service.autofill.InternalSanitizer: - + Parcelable requires a `CREATOR` field; missing in android.service.autofill.InternalSanitizer ParcelCreator: android.service.autofill.InternalTransformation: - + Parcelable requires a `CREATOR` field; missing in android.service.autofill.InternalTransformation ParcelCreator: android.service.autofill.InternalValidator: - + Parcelable requires a `CREATOR` field; missing in android.service.autofill.InternalValidator ParcelNotFinal: android.app.WindowConfiguration: - + Parcelable classes must be final: android.app.WindowConfiguration is not final ParcelNotFinal: android.content.pm.UserInfo: Parcelable classes must be final: android.content.pm.UserInfo is not final -ParcelNotFinal: android.net.metrics.IpConnectivityLog.Event: - -ParcelNotFinal: android.os.IncidentManager.IncidentReport: - ParcelNotFinal: android.os.health.HealthStatsParceler: - + Parcelable classes must be final: android.os.health.HealthStatsParceler is not final ParcelNotFinal: android.service.autofill.InternalOnClickAction: - + Parcelable classes must be final: android.service.autofill.InternalOnClickAction is not final ParcelNotFinal: android.service.autofill.InternalSanitizer: - + Parcelable classes must be final: android.service.autofill.InternalSanitizer is not final ParcelNotFinal: android.service.autofill.InternalTransformation: - + Parcelable classes must be final: android.service.autofill.InternalTransformation is not final ParcelNotFinal: android.service.autofill.InternalValidator: - + Parcelable classes must be final: android.service.autofill.InternalValidator is not final ProtectedMember: android.app.AppDetailsActivity#onCreate(android.os.Bundle): - -ProtectedMember: android.os.VibrationEffect#scale(int, float, int): - -ProtectedMember: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]): - -ProtectedMember: android.service.autofill.augmented.AugmentedAutofillService#dump(java.io.PrintWriter, String[]): - -ProtectedMember: android.service.contentcapture.ContentCaptureService#dump(java.io.FileDescriptor, java.io.PrintWriter, String[]): - -ProtectedMember: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context): - -ProtectedMember: android.util.proto.ProtoStream#FIELD_TYPE_NAMES: - + Protected methods not allowed; must be public: method android.app.AppDetailsActivity.onCreate(android.os.Bundle)} ProtectedMember: android.view.View#resetResolvedDrawables(): - + Protected methods not allowed; must be public: method android.view.View.resetResolvedDrawables()} ProtectedMember: android.view.ViewGroup#resetResolvedDrawables(): - + Protected methods not allowed; must be public: method android.view.ViewGroup.resetResolvedDrawables()} -RawAidl: android.telephony.mbms.vendor.MbmsDownloadServiceBase: - -RawAidl: android.telephony.mbms.vendor.MbmsStreamingServiceBase: - +RethrowRemoteException: android.app.ActivityManager#resumeAppSwitches(): + Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause) -RethrowRemoteException: android.app.ActivityManager#resumeAppSwitches(): - -RethrowRemoteException: android.os.HwBinder#getService(String, String): - -RethrowRemoteException: android.os.HwBinder#getService(String, String, boolean): - -RethrowRemoteException: android.os.HwBinder#onTransact(int, android.os.HwParcel, android.os.HwParcel, int): - -RethrowRemoteException: android.os.HwBinder#registerService(String): - -RethrowRemoteException: android.os.HwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int): - -RethrowRemoteException: android.os.IHwBinder#transact(int, android.os.HwParcel, android.os.HwParcel, int): - -RethrowRemoteException: android.telephony.ims.ImsService#onUpdateSupportedImsFeatures(android.telephony.ims.stub.ImsFeatureConfiguration): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#cancelDownload(android.telephony.mbms.DownloadRequest): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#dispose(int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#download(android.telephony.mbms.DownloadRequest): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#initialize(int, android.telephony.mbms.MbmsDownloadSessionCallback): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#listPendingDownloads(int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#removeStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#requestDownloadState(android.telephony.mbms.DownloadRequest, android.telephony.mbms.FileInfo): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#requestUpdateFileServices(int, java.util.List<java.lang.String>): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#resetDownloadKnowledge(android.telephony.mbms.DownloadRequest): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsDownloadServiceBase#setTempFileRootDirectory(int, String): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#dispose(int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsGroupCallServiceBase#initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#dispose(int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#getPlaybackUri(int, String): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#initialize(android.telephony.mbms.MbmsStreamingSessionCallback, int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#onTransact(int, android.os.Parcel, android.os.Parcel, int): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#requestUpdateStreamingServices(int, java.util.List<java.lang.String>): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#startStreaming(int, String, android.telephony.mbms.StreamingServiceCallback): - -RethrowRemoteException: android.telephony.mbms.vendor.MbmsStreamingServiceBase#stopStreaming(int, String): - - - -SamShouldBeLast: android.app.ActivityManager#addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int): - SamShouldBeLast: android.database.sqlite.SQLiteDebug#dump(android.util.Printer, String[]): - + SAM-compatible parameters (such as parameter 1, "printer", in android.database.sqlite.SQLiteDebug.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.database.sqlite.SQLiteDirectCursorDriver#query(android.database.sqlite.SQLiteDatabase.CursorFactory, String[]): - -SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(android.location.LocationRequest, android.location.LocationListener, android.os.Looper): - -SamShouldBeLast: android.location.LocationManager#requestLocationUpdates(android.location.LocationRequest, java.util.concurrent.Executor, android.location.LocationListener): - -SamShouldBeLast: android.os.BugreportManager#startBugreport(android.os.ParcelFileDescriptor, android.os.ParcelFileDescriptor, android.os.BugreportParams, java.util.concurrent.Executor, android.os.BugreportManager.BugreportCallback): - -SamShouldBeLast: android.os.IHwBinder#linkToDeath(android.os.IHwBinder.DeathRecipient, long): - + SAM-compatible parameters (such as parameter 1, "factory", in android.database.sqlite.SQLiteDirectCursorDriver.query) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.os.StrictMode.ViolationInfo#dump(android.util.Printer, String): - + SAM-compatible parameters (such as parameter 1, "pw", in android.os.StrictMode.ViolationInfo.dump) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.permission.PermissionControllerManager#countPermissionApps(java.util.List<java.lang.String>, int, android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, android.os.Handler): - + SAM-compatible parameters (such as parameter 3, "callback", in android.permission.PermissionControllerManager.countPermissionApps) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.permission.PermissionControllerManager#getAppPermissions(String, android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, android.os.Handler): - -SamShouldBeLast: android.permission.PermissionControllerManager#revokeRuntimePermissions(java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, java.util.concurrent.Executor, android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback): - + SAM-compatible parameters (such as parameter 2, "callback", in android.permission.PermissionControllerManager.getAppPermissions) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.service.autofill.CharSequenceTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - + SAM-compatible parameters (such as parameter 1, "finder", in android.service.autofill.CharSequenceTransformation.apply) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.service.autofill.DateTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - + SAM-compatible parameters (such as parameter 1, "finder", in android.service.autofill.DateTransformation.apply) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.service.autofill.ImageTransformation#apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int): - + SAM-compatible parameters (such as parameter 1, "finder", in android.service.autofill.ImageTransformation.apply) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.service.autofill.InternalTransformation#batchApply(android.service.autofill.ValueFinder, android.widget.RemoteViews, java.util.ArrayList<android.util.Pair<java.lang.Integer,android.service.autofill.InternalTransformation>>): - -SamShouldBeLast: android.telephony.ims.ImsMmTelManager#getFeatureState(java.util.function.Consumer<java.lang.Integer>, java.util.concurrent.Executor): - + SAM-compatible parameters (such as parameter 1, "finder", in android.service.autofill.InternalTransformation.batchApply) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.Choreographer#postCallback(int, Runnable, Object): - + SAM-compatible parameters (such as parameter 2, "action", in android.view.Choreographer.postCallback) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.Choreographer#postCallbackDelayed(int, Runnable, Object, long): - + SAM-compatible parameters (such as parameter 2, "action", in android.view.Choreographer.postCallbackDelayed) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions SamShouldBeLast: android.view.Choreographer#removeCallbacks(int, Runnable, Object): - -SamShouldBeLast: android.view.ViewDebug#startRenderingCommandsCapture(android.view.View, java.util.concurrent.Executor, java.util.function.Function<android.graphics.Picture,java.lang.Boolean>): - -SamShouldBeLast: android.view.accessibility.AccessibilityManager#addAccessibilityServicesStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, android.os.Handler): - - - -ServiceName: android.Manifest.permission#BIND_CELL_BROADCAST_SERVICE: - -ServiceName: android.app.AppOpsManager#OPSTR_BIND_ACCESSIBILITY_SERVICE: - -ServiceName: android.provider.Settings.Secure#ACCESSIBILITY_SHORTCUT_TARGET_SERVICE: - -ServiceName: android.provider.Settings.Secure#AUTOFILL_SERVICE: - -ServiceName: android.provider.Settings.Secure#VOICE_INTERACTION_SERVICE: - - - -SetterReturnsThis: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyFocusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyFocusListener): - -SetterReturnsThis: android.media.audiopolicy.AudioPolicy.Builder#setAudioPolicyStatusListener(android.media.audiopolicy.AudioPolicy.AudioPolicyStatusListener): - - - -StartWithLower: android.content.pm.PackageManager#BINDER(): - Method name must start with lowercase char: BINDER - - -StaticFinalBuilder: android.content.integrity.RuleSet.Builder: - -StaticFinalBuilder: android.hardware.display.BrightnessConfiguration.Builder: - -StaticFinalBuilder: android.media.audiopolicy.AudioMix.Builder: - -StaticFinalBuilder: android.media.audiopolicy.AudioMixingRule.Builder: - -StaticFinalBuilder: android.media.audiopolicy.AudioPolicy.Builder: - -StaticFinalBuilder: android.net.CaptivePortalData.Builder: - -StaticFinalBuilder: android.net.TetheringManager.TetheringRequest.Builder: - -StaticFinalBuilder: android.telephony.ims.stub.ImsFeatureConfiguration.Builder: - + SAM-compatible parameters (such as parameter 2, "action", in android.view.Choreographer.removeCallbacks) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions StaticUtils: android.os.health.HealthKeys: - + Fully-static utility classes must not have constructor StaticUtils: android.service.autofill.InternalTransformation: - -StaticUtils: android.telephony.mbms.vendor.VendorUtils: - + Fully-static utility classes must not have constructor StaticUtils: android.util.FeatureFlagUtils: - -StaticUtils: android.util.proto.ProtoStream: - + Fully-static utility classes must not have constructor StreamFiles: android.os.Environment#buildPath(java.io.File, java.lang.String...): - + Methods accepting `File` should also accept `FileDescriptor` or streams: method android.os.Environment.buildPath(java.io.File,java.lang.String...) StreamFiles: android.os.FileUtils#contains(java.io.File, java.io.File): - -StreamFiles: android.provider.MediaStore#scanFile(android.content.Context, java.io.File): - -StreamFiles: android.provider.MediaStore#scanFileFromShell(android.content.Context, java.io.File): - -StreamFiles: android.provider.MediaStore#scanVolume(android.content.Context, java.io.File): - + Methods accepting `File` should also accept `FileDescriptor` or streams: method android.os.FileUtils.contains(java.io.File,java.io.File) UseIcu: android.hardware.soundtrigger.KeyphraseEnrollmentInfo#getKeyphraseMetadata(String, java.util.Locale) parameter #1: - + Type `java.util.Locale` should be replaced with richer ICU type `android.icu.util.ULocale` UseIcu: android.hardware.soundtrigger.KeyphraseEnrollmentInfo#getManageKeyphraseIntent(int, String, java.util.Locale) parameter #2: - + Type `java.util.Locale` should be replaced with richer ICU type `android.icu.util.ULocale` UseIcu: android.hardware.soundtrigger.KeyphraseMetadata#supportsLocale(java.util.Locale) parameter #0: - -UseIcu: android.hardware.soundtrigger.SoundTrigger.Keyphrase#Keyphrase(int, int, java.util.Locale, String, int[]) parameter #2: - -UseIcu: android.hardware.soundtrigger.SoundTrigger.Keyphrase#getLocale(): - - - -UseParcelFileDescriptor: android.util.proto.ProtoOutputStream#ProtoOutputStream(java.io.FileDescriptor) parameter #0: - + Type `java.util.Locale` should be replaced with richer ICU type `android.icu.util.ULocale` -UserHandle: android.app.ActivityManager#switchUser(android.os.UserHandle): - UserHandle: android.app.admin.DevicePolicyManager#getOwnerInstalledCaCerts(android.os.UserHandle): - + When a method overload is needed to target a specific UserHandle, callers should be directed to use Context.createPackageContextAsUser() and re-obtain the relevant Manager, and no new API should be added UserHandle: android.app.usage.StorageStatsManager#queryCratesForPackage(java.util.UUID, String, android.os.UserHandle): - + When a method overload is needed to target a specific UserHandle, callers should be directed to use Context.createPackageContextAsUser() and re-obtain the relevant Manager, and no new API should be added UserHandle: android.app.usage.StorageStatsManager#queryCratesForUser(java.util.UUID, android.os.UserHandle): - -UserHandle: android.companion.CompanionDeviceManager#isDeviceAssociated(String, android.net.MacAddress, android.os.UserHandle): - -UserHandle: android.companion.CompanionDeviceManager#isDeviceAssociatedForWifiConnection(String, android.net.MacAddress, android.os.UserHandle): - + When a method overload is needed to target a specific UserHandle, callers should be directed to use Context.createPackageContextAsUser() and re-obtain the relevant Manager, and no new API should be added UserHandle: android.content.pm.PackageManager#getInstallReason(String, android.os.UserHandle): - -UserHandle: android.content.pm.PackageManager#getPermissionFlags(String, String, android.os.UserHandle): - -UserHandle: android.content.pm.PackageManager#grantRuntimePermission(String, String, android.os.UserHandle): - -UserHandle: android.content.pm.PackageManager#revokeRuntimePermission(String, String, android.os.UserHandle): - -UserHandle: android.content.pm.PackageManager#revokeRuntimePermission(String, String, android.os.UserHandle, String): - -UserHandle: android.content.pm.PackageManager#updatePermissionFlags(String, String, int, int, android.os.UserHandle): - -UserHandle: android.location.LocationManager#setLocationEnabledForUser(boolean, android.os.UserHandle): - -UserHandle: android.permission.PermissionControllerManager#applyStagedRuntimePermissionBackup(String, android.os.UserHandle, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Boolean>): - -UserHandle: android.permission.PermissionControllerManager#getRuntimePermissionBackup(android.os.UserHandle, java.util.concurrent.Executor, java.util.function.Consumer<byte[]>): - -UserHandle: android.permission.PermissionControllerManager#stageAndApplyRuntimePermissionsBackup(byte[], android.os.UserHandle): - -UserHandle: android.telecom.TelecomManager#getDefaultDialerPackage(android.os.UserHandle): - + When a method overload is needed to target a specific UserHandle, callers should be directed to use Context.createPackageContextAsUser() and re-obtain the relevant Manager, and no new API should be added UserHandleName: android.content.AutofillOptions: - + Classes holding a set of parameters should be called `FooParams`, was `AutofillOptions` UserHandleName: android.content.ContentCaptureOptions: - -UserHandleName: android.os.IncidentReportArgs: - -UserHandleName: android.provider.MediaStore#deleteContributedMedia(android.content.Context, String, android.os.UserHandle): - -UserHandleName: android.provider.MediaStore#getContributedMediaSize(android.content.Context, String, android.os.UserHandle): - - - -VisiblySynchronized: PsiClassObjectAccessExpression: - -VisiblySynchronized: PsiThisExpression: - -VisiblySynchronized: android.app.ActivityManager#addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int): - -VisiblySynchronized: android.app.ActivityManager#removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener): - -VisiblySynchronized: android.content.ContentProviderClient#setDetectNotResponding(long): - + Classes holding a set of parameters should be called `FooParams`, was `ContentCaptureOptions` + + +VisiblySynchronized: PsiThisExpression:this: + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getApkPaths() VisiblySynchronized: android.content.res.AssetManager#getApkPaths(): - + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getApkPaths() VisiblySynchronized: android.content.res.AssetManager#getLastResourceResolution(): - + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getLastResourceResolution() VisiblySynchronized: android.content.res.AssetManager#getOverlayablesToString(String): - + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.getOverlayablesToString(String) VisiblySynchronized: android.content.res.AssetManager#setResourceResolutionLoggingEnabled(boolean): - + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.content.res.AssetManager.setResourceResolutionLoggingEnabled(boolean) VisiblySynchronized: android.os.MessageQueue#removeSyncBarrier(int): - + Internal locks must not be exposed (synchronizing on this or class is still externally observable): method android.os.MessageQueue.removeSyncBarrier(int) diff --git a/core/java/android/app/ActivityClient.java b/core/java/android/app/ActivityClient.java index 7b7b1efdb86b..668dc6b8ec63 100644 --- a/core/java/android/app/ActivityClient.java +++ b/core/java/android/app/ActivityClient.java @@ -454,7 +454,13 @@ public class ActivityClient { } } - /** Removes the snapshot of home task. */ + /** + * Removes the outdated snapshot of the home task. + * + * @param homeToken The token of the home task, or null if you have the + * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS} permission and + * want us to find the home task token for you. + */ public void invalidateHomeTaskSnapshot(IBinder homeToken) { try { getActivityClientController().invalidateHomeTaskSnapshot(homeToken); diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 709272ce0e26..2eebc01ccc04 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -46,6 +46,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; import android.os.ResultReceiver; +import android.os.SystemClock; import android.os.UserHandle; import android.transition.TransitionManager; import android.util.Pair; @@ -634,9 +635,10 @@ public class ActivityOptions extends ComponentOptions { mAnimationStartedListener = new IRemoteCallback.Stub() { @Override public void sendResult(Bundle data) throws RemoteException { + final long elapsedRealtime = SystemClock.elapsedRealtime(); handler.post(new Runnable() { @Override public void run() { - listener.onAnimationStarted(); + listener.onAnimationStarted(elapsedRealtime); } }); } @@ -645,13 +647,15 @@ public class ActivityOptions extends ComponentOptions { } /** - * Callback for use with {@link ActivityOptions#makeThumbnailScaleUpAnimation} - * to find out when the given animation has started running. + * Callback for finding out when the given animation has started running. * @hide */ @TestApi public interface OnAnimationStartedListener { - void onAnimationStarted(); + /** + * @param elapsedRealTime {@link SystemClock#elapsedRealTime} when animation started. + */ + void onAnimationStarted(long elapsedRealTime); } private void setOnAnimationFinishedListener(final Handler handler, @@ -660,10 +664,11 @@ public class ActivityOptions extends ComponentOptions { mAnimationFinishedListener = new IRemoteCallback.Stub() { @Override public void sendResult(Bundle data) throws RemoteException { + final long elapsedRealtime = SystemClock.elapsedRealtime(); handler.post(new Runnable() { @Override public void run() { - listener.onAnimationFinished(); + listener.onAnimationFinished(elapsedRealtime); } }); } @@ -672,13 +677,15 @@ public class ActivityOptions extends ComponentOptions { } /** - * Callback for use with {@link ActivityOptions#makeThumbnailAspectScaleDownAnimation} - * to find out when the given animation has drawn its last frame. + * Callback for finding out when the given animation has drawn its last frame. * @hide */ @TestApi public interface OnAnimationFinishedListener { - void onAnimationFinished(); + /** + * @param elapsedRealTime {@link SystemClock#elapsedRealTime} when animation finished. + */ + void onAnimationFinished(long elapsedRealTime); } /** diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 4829dc085bd9..6e395be215b5 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -2916,6 +2916,133 @@ public class AppOpsManager { }; /** + * This specifies whether each option is only allowed to be read + * by apps with manage appops permission. + */ + private static boolean[] sOpRestrictRead = new boolean[] { + false, // COARSE_LOCATION + false, // FINE_LOCATION + false, // GPS + false, // VIBRATE + false, // READ_CONTACTS + false, // WRITE_CONTACTS + false, // READ_CALL_LOG + false, // WRITE_CALL_LOG + false, // READ_CALENDAR + false, // WRITE_CALENDAR + false, // WIFI_SCAN + false, // POST_NOTIFICATION + false, // NEIGHBORING_CELLS + false, // CALL_PHONE + false, // READ_SMS + false, // WRITE_SMS + false, // RECEIVE_SMS + false, // RECEIVE_EMERGENCY_BROADCAST + false, // RECEIVE_MMS + false, // RECEIVE_WAP_PUSH + false, // SEND_SMS + false, // READ_ICC_SMS + false, // WRITE_ICC_SMS + false, // WRITE_SETTINGS + false, // SYSTEM_ALERT_WINDOW + false, // ACCESS_NOTIFICATIONS + false, // CAMERA + false, // RECORD_AUDIO + false, // PLAY_AUDIO + false, // READ_CLIPBOARD + false, // WRITE_CLIPBOARD + false, // TAKE_MEDIA_BUTTONS + false, // TAKE_AUDIO_FOCUS + false, // AUDIO_MASTER_VOLUME + false, // AUDIO_VOICE_VOLUME + false, // AUDIO_RING_VOLUME + false, // AUDIO_MEDIA_VOLUME + false, // AUDIO_ALARM_VOLUME + false, // AUDIO_NOTIFICATION_VOLUME + false, // AUDIO_BLUETOOTH_VOLUME + false, // WAKE_LOCK + false, // MONITOR_LOCATION + false, // MONITOR_HIGH_POWER_LOCATION + false, // GET_USAGE_STATS + false, // MUTE_MICROPHONE + false, // TOAST_WINDOW + false, // PROJECT_MEDIA + false, // ACTIVATE_VPN + false, // WRITE_WALLPAPER + false, // ASSIST_STRUCTURE + false, // ASSIST_SCREENSHOT + false, // READ_PHONE_STATE + false, // ADD_VOICEMAIL + false, // USE_SIP + false, // PROCESS_OUTGOING_CALLS + false, // USE_FINGERPRINT + false, // BODY_SENSORS + false, // READ_CELL_BROADCASTS + false, // MOCK_LOCATION + false, // READ_EXTERNAL_STORAGE + false, // WRITE_EXTERNAL_STORAGE + false, // TURN_SCREEN_ON + false, // GET_ACCOUNTS + false, // RUN_IN_BACKGROUND + false, // AUDIO_ACCESSIBILITY_VOLUME + false, // READ_PHONE_NUMBERS + false, // REQUEST_INSTALL_PACKAGES + false, // PICTURE_IN_PICTURE + false, // INSTANT_APP_START_FOREGROUND + false, // ANSWER_PHONE_CALLS + false, // RUN_ANY_IN_BACKGROUND + false, // CHANGE_WIFI_STATE + false, // REQUEST_DELETE_PACKAGES + false, // BIND_ACCESSIBILITY_SERVICE + false, // ACCEPT_HANDOVER + false, // MANAGE_IPSEC_TUNNELS + false, // START_FOREGROUND + false, // BLUETOOTH_SCAN + false, // USE_BIOMETRIC + false, // ACTIVITY_RECOGNITION + false, // SMS_FINANCIAL_TRANSACTIONS + false, // READ_MEDIA_AUDIO + false, // WRITE_MEDIA_AUDIO + false, // READ_MEDIA_VIDEO + false, // WRITE_MEDIA_VIDEO + false, // READ_MEDIA_IMAGES + false, // WRITE_MEDIA_IMAGES + false, // LEGACY_STORAGE + false, // ACCESS_ACCESSIBILITY + false, // READ_DEVICE_IDENTIFIERS + false, // ACCESS_MEDIA_LOCATION + false, // QUERY_ALL_PACKAGES + false, // MANAGE_EXTERNAL_STORAGE + false, // INTERACT_ACROSS_PROFILES + false, // ACTIVATE_PLATFORM_VPN + false, // LOADER_USAGE_STATS + false, // deprecated operation + false, // AUTO_REVOKE_PERMISSIONS_IF_UNUSED + false, // AUTO_REVOKE_MANAGED_BY_INSTALLER + false, // NO_ISOLATED_STORAGE + false, // PHONE_CALL_MICROPHONE + false, // PHONE_CALL_CAMERA + false, // RECORD_AUDIO_HOTWORD + false, // MANAGE_ONGOING_CALLS + false, // MANAGE_CREDENTIALS + false, // USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER + false, // RECORD_AUDIO_OUTPUT + false, // SCHEDULE_EXACT_ALARM + false, // ACCESS_FINE_LOCATION_SOURCE + false, // ACCESS_COARSE_LOCATION_SOURCE + false, // MANAGE_MEDIA + false, // BLUETOOTH_CONNECT + false, // UWB_RANGING + false, // ACTIVITY_RECOGNITION_SOURCE + false, // BLUETOOTH_ADVERTISE + false, // RECORD_INCOMING_PHONE_AUDIO + false, // NEARBY_WIFI_DEVICES + false, // OP_ESTABLISH_VPN_SERVICE + false, // OP_ESTABLISH_VPN_MANAGER + true, // ACCESS_RESTRICTED_SETTINGS + }; + + /** * Mapping from an app op name to the app op code. */ private static HashMap<String, Integer> sOpStrToOp = new HashMap<>(); @@ -3143,6 +3270,14 @@ public class AppOpsManager { } /** + * Retrieve whether the op can be read by apps with manage appops permission. + * @hide + */ + public static boolean opRestrictsRead(int op) { + return sOpRestrictRead[op]; + } + + /** * Retrieve whether the op allows itself to be reset. * @hide */ diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 7c337a4319ca..2767b43a119c 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -30,11 +30,9 @@ import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.util.Log; -import android.util.Slog; import android.view.autofill.AutofillManager; import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicReference; /** * Base class for maintaining global application state. You can provide your own @@ -56,9 +54,6 @@ import java.util.concurrent.atomic.AtomicReference; public class Application extends ContextWrapper implements ComponentCallbacks2 { private static final String TAG = "Application"; - /** Whether to enable the check to detect "duplicate application instances". */ - private static final boolean DEBUG_DUP_APP_INSTANCES = true; - @UnsupportedAppUsage private ArrayList<ActivityLifecycleCallbacks> mActivityLifecycleCallbacks = new ArrayList<ActivityLifecycleCallbacks>(); @@ -72,9 +67,6 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { @UnsupportedAppUsage public LoadedApk mLoadedApk; - private static final AtomicReference<StackTrace> sConstructorStackTrace = - new AtomicReference<>(); - public interface ActivityLifecycleCallbacks { /** @@ -240,26 +232,6 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { public Application() { super(null); - if (DEBUG_DUP_APP_INSTANCES) { - checkDuplicateInstances(); - } - } - - private void checkDuplicateInstances() { - // STOPSHIP: Delete this check b/221248960 - // Only run this check for gms-core. - if (!"com.google.android.gms".equals(ActivityThread.currentOpPackageName())) { - return; - } - - final StackTrace previousStackTrace = sConstructorStackTrace.getAndSet( - new StackTrace("Previous stack trace")); - if (previousStackTrace == null) { - // This is the first call. - return; - } - Slog.wtf(TAG, "Application ctor called twice for " + this.getClass(), - new StackTrace("Current stack trace", previousStackTrace)); } private String getLoadedApkInfo() { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 53e7559b910b..974d20a7eab3 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1901,6 +1901,11 @@ public class Notification implements Parcelable /** * Construct a new builder for {@link Action} object. + * <p>As of Android {@link android.os.Build.VERSION_CODES#N}, + * action button icons will not be displayed on action buttons, but are still required + * and are available to + * {@link android.service.notification.NotificationListenerService notification listeners}, + * which may display them in other contexts, for example on a wearable device. * @param icon icon to show for this action * @param title the title of the action * @param intent the {@link PendingIntent} to fire when users trigger this action @@ -1923,6 +1928,12 @@ public class Notification implements Parcelable * both are displayed or required, depends on where and how the action is used, and the * {@link Style} applied to the Notification. * + * <p>As of Android {@link android.os.Build.VERSION_CODES#N}, action button icons + * will not be displayed on action buttons, but are still required and are available + * to {@link android.service.notification.NotificationListenerService notification + * listeners}, which may display them in other contexts, for example on a wearable + * device. + * * <p>When the {@code title} is a {@link android.text.Spanned}, any colors set by a * {@link ForegroundColorSpan} or {@link TextAppearanceSpan} may be removed or displayed * with an altered in luminance to ensure proper contrast within the Notification. @@ -4918,6 +4929,12 @@ public class Notification implements Parcelable * while processing broadcast receivers or services in response to notification action * clicks. To launch an activity in those cases, provide a {@link PendingIntent} to the * activity itself. + * <p> + * As of Android {@link android.os.Build.VERSION_CODES#N}, + * action button icons will not be displayed on action buttons, but are still required + * and are available to + * {@link android.service.notification.NotificationListenerService notification listeners}, + * which may display them in other contexts, for example on a wearable device. * * @param icon Resource ID of a drawable that represents the action. * @param title Text describing the action. diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index e502ba03bf8e..5ef3fc05130c 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -819,11 +819,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu return isFloating(mWindowingMode); } - /** - * Returns true if the windowingMode represents a floating window. - * @hide - */ - public static boolean isFloating(int windowingMode) { + /** Returns true if the windowingMode represents a floating window. */ + public static boolean isFloating(@WindowingMode int windowingMode) { return windowingMode == WINDOWING_MODE_FREEFORM || windowingMode == WINDOWING_MODE_PINNED; } diff --git a/core/java/android/app/admin/DevicePolicyCache.java b/core/java/android/app/admin/DevicePolicyCache.java index 9c07f85a6390..da6237513562 100644 --- a/core/java/android/app/admin/DevicePolicyCache.java +++ b/core/java/android/app/admin/DevicePolicyCache.java @@ -41,8 +41,7 @@ public abstract class DevicePolicyCache { /** * See {@link DevicePolicyManager#getScreenCaptureDisabled} */ - public abstract boolean isScreenCaptureAllowed(@UserIdInt int userHandle, - boolean ownerCanAddInternalSystemWindow); + public abstract boolean isScreenCaptureAllowed(@UserIdInt int userHandle); /** * Caches {@link DevicePolicyManager#getPasswordQuality(android.content.ComponentName)} of the @@ -70,8 +69,7 @@ public abstract class DevicePolicyCache { private static final EmptyDevicePolicyCache INSTANCE = new EmptyDevicePolicyCache(); @Override - public boolean isScreenCaptureAllowed(int userHandle, - boolean ownerCanAddInternalSystemWindow) { + public boolean isScreenCaptureAllowed(int userHandle) { return true; } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index d11b23cc871b..b7b93aac8ee2 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3322,8 +3322,8 @@ public class DevicePolicyManager { * Activity action: Starts the device policy management role holder updater. * * <p>The activity must handle the device policy management role holder update and set the - * intent result to either {@link Activity#RESULT_OK} if the update was successful or not - * necessary, {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if + * intent result. This can include {@link Activity#RESULT_OK} if the update was successful, + * {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if * it encounters a problem that may be solved by relaunching it again, {@link * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED} if role holder * provisioning is disabled, or {@link @@ -3376,7 +3376,8 @@ public class DevicePolicyManager { /** * An {@code int} extra which contains the result code of the last attempt to update - * the device policy management role holder. + * the device policy management role holder via {@link + * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER}. * * <p>This extra is provided to the device policy management role holder via either {@link * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} or {@link @@ -3394,6 +3395,8 @@ public class DevicePolicyManager { * encounters a problem that may be solved by relaunching it again. * <li>{@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if * it encounters a problem that will not be solved by relaunching it again. + * <li>Any other value returned by {@link + * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} * </ul> * * @hide diff --git a/core/java/android/app/admin/PreferentialNetworkServiceConfig.java b/core/java/android/app/admin/PreferentialNetworkServiceConfig.java index 54170a2a187f..24b4f4b99ad0 100644 --- a/core/java/android/app/admin/PreferentialNetworkServiceConfig.java +++ b/core/java/android/app/admin/PreferentialNetworkServiceConfig.java @@ -16,15 +16,31 @@ package android.app.admin; +import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; +import static org.xmlpull.v1.XmlPullParser.END_TAG; +import static org.xmlpull.v1.XmlPullParser.TEXT; + import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SuppressLint; import android.os.Parcel; import android.os.Parcelable; +import android.util.IndentingPrintWriter; +import android.util.Log; +import android.util.TypedXmlPullParser; +import android.util.TypedXmlSerializer; + +import org.xmlpull.v1.XmlPullParserException; +import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * Network configuration to be set for the user profile @@ -37,6 +53,20 @@ public final class PreferentialNetworkServiceConfig implements Parcelable { final int[] mIncludedUids; final int[] mExcludedUids; + private static final String LOG_TAG = "PreferentialNetworkServiceConfig"; + private static final String TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG = + "preferential_network_service_config"; + private static final String TAG_CONFIG_ENABLED = + "preferential_network_service_config_enabled"; + private static final String TAG_UID = "uid"; + private static final String TAG_NETWORK_ID = + "preferential_network_service_network_id"; + private static final String TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION = + "allow_fallback_to_default_connection"; + private static final String TAG_INCLUDED_UIDS = "included_uids"; + private static final String TAG_EXCLUDED_UIDS = "excluded_uids"; + private static final String ATTR_VALUE = "value"; + /** @hide */ public static final PreferentialNetworkServiceConfig DEFAULT = (new PreferentialNetworkServiceConfig.Builder()).build(); @@ -159,8 +189,8 @@ public final class PreferentialNetworkServiceConfig implements Parcelable { return "PreferentialNetworkServiceConfig{" + "mIsEnabled=" + isEnabled() + "mAllowFallbackToDefaultConnection=" + isFallbackToDefaultConnectionAllowed() - + "mIncludedUids=" + mIncludedUids.toString() - + "mExcludedUids=" + mExcludedUids.toString() + + "mIncludedUids=" + Arrays.toString(mIncludedUids) + + "mExcludedUids=" + Arrays.toString(mExcludedUids) + "mNetworkId=" + mNetworkId + '}'; } @@ -309,6 +339,135 @@ public final class PreferentialNetworkServiceConfig implements Parcelable { dest.writeIntArray(mExcludedUids); } + private void writeAttributeValueToXml(TypedXmlSerializer out, String tag, int value) + throws IOException { + out.startTag(null, tag); + out.attributeInt(null, ATTR_VALUE, value); + out.endTag(null, tag); + } + + private void writeAttributeValueToXml(TypedXmlSerializer out, String tag, boolean value) + throws IOException { + out.startTag(null, tag); + out.attributeBoolean(null, ATTR_VALUE, value); + out.endTag(null, tag); + } + + private void writeAttributeValuesToXml(TypedXmlSerializer out, String outerTag, String innerTag, + @NonNull Collection<String> values) throws IOException { + out.startTag(null, outerTag); + for (String value : values) { + out.startTag(null, innerTag); + out.attribute(null, ATTR_VALUE, value); + out.endTag(null, innerTag); + } + out.endTag(null, outerTag); + } + + private static void readAttributeValues( + TypedXmlPullParser parser, String tag, Collection<String> result) + throws XmlPullParserException, IOException { + result.clear(); + int outerDepthDAM = parser.getDepth(); + int typeDAM; + while ((typeDAM = parser.next()) != END_DOCUMENT + && (typeDAM != END_TAG || parser.getDepth() > outerDepthDAM)) { + if (typeDAM == END_TAG || typeDAM == TEXT) { + continue; + } + String tagDAM = parser.getName(); + if (tag.equals(tagDAM)) { + result.add(parser.getAttributeValue(null, ATTR_VALUE)); + } else { + Log.e(LOG_TAG, "Expected tag " + tag + " but found " + tagDAM); + } + } + } + + private List<String> intArrayToStringList(int[] array) { + return Arrays.stream(array).mapToObj(String::valueOf).collect(Collectors.toList()); + } + + private static int[] readStringListToIntArray(TypedXmlPullParser parser, String tag) + throws XmlPullParserException, IOException { + List<String> stringList = new ArrayList<>(); + readAttributeValues(parser, tag, stringList); + int[] intArray = stringList.stream() + .map(s -> Integer.parseInt(s)) + .mapToInt(Integer::intValue) + .toArray(); + return intArray; + } + + /** + * @hide + */ + public static PreferentialNetworkServiceConfig getPreferentialNetworkServiceConfig( + TypedXmlPullParser parser, String tag) throws XmlPullParserException, IOException { + int outerDepthDAM = parser.getDepth(); + int typeDAM; + PreferentialNetworkServiceConfig.Builder resultBuilder = + new PreferentialNetworkServiceConfig.Builder(); + while ((typeDAM = parser.next()) != END_DOCUMENT + && (typeDAM != END_TAG || parser.getDepth() > outerDepthDAM)) { + if (typeDAM == END_TAG || typeDAM == TEXT) { + continue; + } + String tagDAM = parser.getName(); + if (TAG_CONFIG_ENABLED.equals(tagDAM)) { + resultBuilder.setEnabled(parser.getAttributeBoolean(null, ATTR_VALUE, + DevicePolicyManager.PREFERENTIAL_NETWORK_SERVICE_ENABLED_DEFAULT)); + } else if (TAG_NETWORK_ID.equals(tagDAM)) { + int val = parser.getAttributeInt(null, ATTR_VALUE, 0); + if (val != 0) { + resultBuilder.setNetworkId(val); + } + } else if (TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION.equals(tagDAM)) { + resultBuilder.setFallbackToDefaultConnectionAllowed(parser.getAttributeBoolean( + null, ATTR_VALUE, true)); + } else if (TAG_INCLUDED_UIDS.equals(tagDAM)) { + resultBuilder.setIncludedUids(readStringListToIntArray(parser, TAG_UID)); + } else if (TAG_EXCLUDED_UIDS.equals(tagDAM)) { + resultBuilder.setExcludedUids(readStringListToIntArray(parser, TAG_UID)); + } else { + Log.w(LOG_TAG, "Unknown tag under " + tag + ": " + tagDAM); + } + } + return resultBuilder.build(); + } + + /** + * @hide + */ + public void writeToXml(@NonNull TypedXmlSerializer out) throws IOException { + out.startTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG); + writeAttributeValueToXml(out, TAG_CONFIG_ENABLED, isEnabled()); + writeAttributeValueToXml(out, TAG_NETWORK_ID, getNetworkId()); + writeAttributeValueToXml(out, TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION, + isFallbackToDefaultConnectionAllowed()); + writeAttributeValuesToXml(out, TAG_INCLUDED_UIDS, TAG_UID, + intArrayToStringList(getIncludedUids())); + writeAttributeValuesToXml(out, TAG_EXCLUDED_UIDS, TAG_UID, + intArrayToStringList(getExcludedUids())); + out.endTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG); + } + + /** + * @hide + */ + public void dump(IndentingPrintWriter pw) { + pw.print("networkId="); + pw.println(mNetworkId); + pw.print("isEnabled="); + pw.println(mIsEnabled); + pw.print("allowFallbackToDefaultConnection="); + pw.println(mAllowFallbackToDefaultConnection); + pw.print("includedUids="); + pw.println(mIncludedUids); + pw.print("excludedUids="); + pw.println(mExcludedUids); + } + @Override public int describeContents() { return 0; diff --git a/core/java/android/app/smartspace/ISmartspaceManager.aidl b/core/java/android/app/smartspace/ISmartspaceManager.aidl index e7ec8891ea83..8dc07a1b6daf 100644 --- a/core/java/android/app/smartspace/ISmartspaceManager.aidl +++ b/core/java/android/app/smartspace/ISmartspaceManager.aidl @@ -26,7 +26,7 @@ import android.content.pm.ParceledListSlice; /** * @hide */ -interface ISmartspaceManager { +oneway interface ISmartspaceManager { void createSmartspaceSession(in SmartspaceConfig config, in SmartspaceSessionId sessionId, in IBinder token); diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index ca7d77b2c44a..54d57a1b24d9 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -571,8 +571,14 @@ interface IPackageManager { /** * Ask the package manager to dump profiles associated with a package. + * + * @param packageName The name of the package to dump. + * @param dumpClassesAndMethods If false, pass {@code --dump-only} to profman to dump the + * profile in a human readable form intended for debugging. If true, pass + * {@code --dump-classes-and-methods} to profman to dump a sorted list of classes and methods + * in a human readable form that is valid input for {@code profman --create-profile-from}. */ - void dumpProfiles(String packageName); + void dumpProfiles(String packageName, boolean dumpClassesAndMethods); void forceDexOpt(String packageName); diff --git a/core/java/android/content/pm/SigningDetails.java b/core/java/android/content/pm/SigningDetails.java index 584a058aaede..1e659b74db77 100644 --- a/core/java/android/content/pm/SigningDetails.java +++ b/core/java/android/content/pm/SigningDetails.java @@ -112,6 +112,29 @@ public final class SigningDetails implements Parcelable { int AUTH = 16; } + @IntDef(value = {CapabilityMergeRule.MERGE_SELF_CAPABILITY, + CapabilityMergeRule.MERGE_OTHER_CAPABILITY, + CapabilityMergeRule.MERGE_RESTRICTED_CAPABILITY}) + public @interface CapabilityMergeRule { + /** + * When capabilities are different for a common signer in the lineage, use the capabilities + * from this instance. + */ + int MERGE_SELF_CAPABILITY = 0; + + /** + * When capabilities are different for a common signer in the lineage, use the capabilites + * from the other instance. + */ + int MERGE_OTHER_CAPABILITY = 1; + + /** + * When capabilities are different for a common signer in the lineage, use the most + * restrictive between the two signers. + */ + int MERGE_RESTRICTED_CAPABILITY = 2; + } + /** A representation of unknown signing details. Use instead of null. */ public static final SigningDetails UNKNOWN = new SigningDetails(/* signatures */ null, SignatureSchemeVersion.UNKNOWN, /* keys */ null, /* pastSigningCertificates */ null); @@ -164,30 +187,60 @@ public final class SigningDetails implements Parcelable { /** * Merges the signing lineage of this instance with the lineage in the provided {@code - * otherSigningDetails} when one has the same or an ancestor signer of the other. + * otherSigningDetails} using {@link CapabilityMergeRule#MERGE_OTHER_CAPABILITY} as the merge + * rule. + * + * @param otherSigningDetails the {@code SigningDetails} with which to merge + * @return Merged {@code SigningDetails} instance when one has the same or an ancestor signer + * of the other. If neither instance has a lineage, or if neither has the same or an + * ancestor signer then this instance is returned. + * @see #mergeLineageWith(SigningDetails, int) + */ + public @NonNull SigningDetails mergeLineageWith(@NonNull SigningDetails otherSigningDetails) { + return mergeLineageWith(otherSigningDetails, CapabilityMergeRule.MERGE_OTHER_CAPABILITY); + } + + /** + * Merges the signing lineage of this instance with the lineage in the provided {@code + * otherSigningDetails} when one has the same or an ancestor signer of the other using the + * provided {@code mergeRule} to handle differences in capabilities for shared signers. * * <p>Merging two signing lineages will result in a new {@code SigningDetails} instance - * containing the longest common lineage with the most restrictive capabilities. If the two - * lineages contain the same signers with the same capabilities then the instance on which - * this was invoked is returned without any changes. Similarly if neither instance has a - * lineage, or if neither has the same or an ancestor signer then this instance is returned. + * containing the longest common lineage with differences in capabilities for shared signers + * resolved using the provided {@code mergeRule}. If the two lineages contain the same signers + * with the same capabilities then the instance on which this was invoked is returned without + * any changes. Similarly if neither instance has a lineage, or if neither has the same or an + * ancestor signer then this instance is returned. * * Following are some example results of this method for lineages with signers A, B, C, D: - * - lineage B merged with lineage A -> B returns lineage A -> B. - * - lineage A -> B merged with lineage B -> C returns lineage A -> B -> C - * - lineage A -> B with the {@code PERMISSION} capability revoked for A merged with - * lineage A -> B with the {@code SHARED_USER_ID} capability revoked for A returns - * lineage A -> B with both capabilities revoked for A. - * - lineage A -> B -> C merged with lineage A -> B -> D would return the original lineage - * A -> B -> C since the current signer of both instances is not the same or in the - * lineage of the other. + * <ul> + * <li>lineage B merged with lineage A -> B returns lineage A -> B. + * <li>lineage A -> B merged with lineage B -> C returns lineage A -> B -> C + * <li>lineage A -> B with the {@code PERMISSION} capability revoked for A merged with + * lineage A -> B with the {@code SHARED_USER_ID} capability revoked for A returns the + * following based on the {@code mergeRule}: + * <ul> + * <li>{@code MERGE_SELF_CAPABILITY} - lineage A -> B with {@code PERMISSION} revoked + * for A. + * <li>{@code MERGE_OTHER_CAPABILITY} - lineage A -> B with {@code SHARED_USER_ID} + * revoked for A. + * <li>{@code MERGE_RESTRICTED_CAPABILITY} - lineage A -> B with {@code PERMISSION} and + * {@code SHARED_USER_ID} revoked for A. + * </ul> + * <li>lineage A -> B -> C merged with lineage A -> B -> D would return the original lineage + * A -> B -> C since the current signer of both instances is not the same or in the + * lineage of the other. + * </ul> * - * @param otherSigningDetails The {@code SigningDetails} you would like to merge with. + * @param otherSigningDetails the {@code SigningDetails} with which to merge + * @param mergeRule the {@link CapabilityMergeRule} to use when resolving differences in + * capabilities for shared signers * @return Merged {@code SigningDetails} instance when one has the same or an ancestor signer * of the other. If neither instance has a lineage, or if neither has the same or an * ancestor signer then this instance is returned. */ - public @NonNull SigningDetails mergeLineageWith(@NonNull SigningDetails otherSigningDetails) { + public @NonNull SigningDetails mergeLineageWith(@NonNull SigningDetails otherSigningDetails, + @CapabilityMergeRule int mergeRule) { if (!hasPastSigningCertificates()) { return otherSigningDetails.hasPastSigningCertificates() && otherSigningDetails.hasAncestorOrSelf(this) ? otherSigningDetails : this; @@ -201,19 +254,43 @@ public final class SigningDetails implements Parcelable { if (descendantSigningDetails == null) { return this; } - return descendantSigningDetails == this ? mergeLineageWithAncestorOrSelf( - otherSigningDetails) : otherSigningDetails.mergeLineageWithAncestorOrSelf(this); + SigningDetails mergedDetails = this; + if (descendantSigningDetails == this) { + // If this instance is the descendant then the merge will also be invoked against this + // instance and the provided mergeRule can be used as is. + mergedDetails = mergeLineageWithAncestorOrSelf(otherSigningDetails, mergeRule); + } else { + // If the provided instance is the descendant then the merge will be invoked against the + // other instance and a self or other merge rule will need to be flipped. + switch (mergeRule) { + case CapabilityMergeRule.MERGE_SELF_CAPABILITY: + mergedDetails = otherSigningDetails.mergeLineageWithAncestorOrSelf(this, + CapabilityMergeRule.MERGE_OTHER_CAPABILITY); + break; + case CapabilityMergeRule.MERGE_OTHER_CAPABILITY: + mergedDetails = otherSigningDetails.mergeLineageWithAncestorOrSelf(this, + CapabilityMergeRule.MERGE_SELF_CAPABILITY); + break; + case CapabilityMergeRule.MERGE_RESTRICTED_CAPABILITY: + mergedDetails = otherSigningDetails.mergeLineageWithAncestorOrSelf(this, + mergeRule); + break; + } + } + return mergedDetails; } /** * Merges the signing lineage of this instance with the lineage of the ancestor (or same) * signer in the provided {@code otherSigningDetails}. * - * @param otherSigningDetails The {@code SigningDetails} you would like to merge with. + * @param otherSigningDetails the {@code SigningDetails} with which to merge + * @param mergeRule the {@link CapabilityMergeRule} to use when resolving differences in + * capabilities for shared signers * @return Merged {@code SigningDetails} instance. */ private @NonNull SigningDetails mergeLineageWithAncestorOrSelf( - @NonNull SigningDetails otherSigningDetails) { + @NonNull SigningDetails otherSigningDetails, @CapabilityMergeRule int mergeRule) { // This method should only be called with instances that contain lineages. int index = mPastSigningCertificates.length - 1; int otherIndex = otherSigningDetails.mPastSigningCertificates.length - 1; @@ -236,16 +313,26 @@ public final class SigningDetails implements Parcelable { } do { - // Add the common signer to the merged lineage with the most restrictive - // capabilities of the two lineages. + // Add the common signer to the merged lineage and resolve any differences in + // capabilites with the merge rule. Signature signature = mPastSigningCertificates[index--]; Signature ancestorSignature = otherSigningDetails.mPastSigningCertificates[otherIndex--]; Signature mergedSignature = new Signature(signature); - int mergedCapabilities = signature.getFlags() & ancestorSignature.getFlags(); - if (signature.getFlags() != mergedCapabilities) { + if (signature.getFlags() != ancestorSignature.getFlags()) { capabilitiesModified = true; - mergedSignature.setFlags(mergedCapabilities); + switch (mergeRule) { + case CapabilityMergeRule.MERGE_SELF_CAPABILITY: + mergedSignature.setFlags(signature.getFlags()); + break; + case CapabilityMergeRule.MERGE_OTHER_CAPABILITY: + mergedSignature.setFlags(ancestorSignature.getFlags()); + break; + case CapabilityMergeRule.MERGE_RESTRICTED_CAPABILITY: + mergedSignature.setFlags( + signature.getFlags() & ancestorSignature.getFlags()); + break; + } } mergedSignatures.add(mergedSignature); } while (index >= 0 && otherIndex >= 0 && mPastSigningCertificates[index].equals( @@ -858,7 +945,7 @@ public final class SigningDetails implements Parcelable { - // Code below generated by codegen v1.0.22. + // Code below generated by codegen v1.0.23. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -914,10 +1001,10 @@ public final class SigningDetails implements Parcelable { } @DataClass.Generated( - time = 1616984092921L, - codegenVersion = "1.0.22", + time = 1650058974710L, + codegenVersion = "1.0.23", sourceFile = "frameworks/base/core/java/android/content/pm/SigningDetails.java", - inputSignatures = "private static final java.lang.String TAG\nprivate final @android.annotation.Nullable android.content.pm.Signature[] mSignatures\nprivate final @android.content.pm.SigningDetails.SignatureSchemeVersion int mSignatureSchemeVersion\nprivate final @android.annotation.Nullable android.util.ArraySet<java.security.PublicKey> mPublicKeys\nprivate final @android.annotation.Nullable android.content.pm.Signature[] mPastSigningCertificates\nprivate static final int PAST_CERT_EXISTS\npublic static final android.content.pm.SigningDetails UNKNOWN\npublic static final @android.annotation.NonNull android.os.Parcelable.Creator<android.content.pm.SigningDetails> CREATOR\npublic @android.annotation.NonNull android.content.pm.SigningDetails mergeLineageWith(android.content.pm.SigningDetails)\nprivate @android.annotation.NonNull android.content.pm.SigningDetails mergeLineageWithAncestorOrSelf(android.content.pm.SigningDetails)\npublic boolean hasCommonAncestor(android.content.pm.SigningDetails)\npublic boolean hasAncestorOrSelfWithDigest(java.util.Set<java.lang.String>)\nprivate @android.annotation.Nullable android.content.pm.SigningDetails getDescendantOrSelf(android.content.pm.SigningDetails)\npublic boolean hasSignatures()\npublic boolean hasPastSigningCertificates()\npublic boolean hasAncestorOrSelf(android.content.pm.SigningDetails)\npublic boolean hasAncestor(android.content.pm.SigningDetails)\npublic boolean hasCommonSignerWithCapability(android.content.pm.SigningDetails,int)\npublic boolean checkCapability(android.content.pm.SigningDetails,int)\npublic boolean checkCapabilityRecover(android.content.pm.SigningDetails,int)\npublic boolean hasCertificate(android.content.pm.Signature)\npublic boolean hasCertificate(android.content.pm.Signature,int)\npublic boolean hasCertificate(byte[])\nprivate boolean hasCertificateInternal(android.content.pm.Signature,int)\npublic boolean checkCapability(java.lang.String,int)\npublic boolean hasSha256Certificate(byte[])\npublic boolean hasSha256Certificate(byte[],int)\nprivate boolean hasSha256CertificateInternal(byte[],int)\npublic boolean signaturesMatchExactly(android.content.pm.SigningDetails)\npublic @java.lang.Override int describeContents()\npublic @java.lang.Override void writeToParcel(android.os.Parcel,int)\npublic @java.lang.Override boolean equals(java.lang.Object)\npublic @java.lang.Override int hashCode()\npublic static android.util.ArraySet<java.security.PublicKey> toSigningKeys(android.content.pm.Signature[])\nclass SigningDetails extends java.lang.Object implements [android.os.Parcelable]\nprivate @android.annotation.NonNull android.content.pm.Signature[] mSignatures\nprivate @android.content.pm.SigningDetails.SignatureSchemeVersion int mSignatureSchemeVersion\nprivate @android.annotation.Nullable android.content.pm.Signature[] mPastSigningCertificates\npublic android.content.pm.SigningDetails.Builder setSignatures(android.content.pm.Signature[])\npublic android.content.pm.SigningDetails.Builder setSignatureSchemeVersion(int)\npublic android.content.pm.SigningDetails.Builder setPastSigningCertificates(android.content.pm.Signature[])\nprivate void checkInvariants()\npublic android.content.pm.SigningDetails build()\nclass Builder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false, genParcelable=true, genAidl=false)") + inputSignatures = "private static final java.lang.String TAG\nprivate final @android.annotation.Nullable android.content.pm.Signature[] mSignatures\nprivate final @android.content.pm.SigningDetails.SignatureSchemeVersion int mSignatureSchemeVersion\nprivate final @android.annotation.Nullable android.util.ArraySet<java.security.PublicKey> mPublicKeys\nprivate final @android.annotation.Nullable android.content.pm.Signature[] mPastSigningCertificates\nprivate static final int PAST_CERT_EXISTS\npublic static final android.content.pm.SigningDetails UNKNOWN\npublic static final @android.annotation.NonNull android.os.Parcelable.Creator<android.content.pm.SigningDetails> CREATOR\npublic @android.annotation.NonNull android.content.pm.SigningDetails mergeLineageWith(android.content.pm.SigningDetails)\npublic @android.annotation.NonNull android.content.pm.SigningDetails mergeLineageWith(android.content.pm.SigningDetails,int)\nprivate @android.annotation.NonNull android.content.pm.SigningDetails mergeLineageWithAncestorOrSelf(android.content.pm.SigningDetails,int)\npublic boolean hasCommonAncestor(android.content.pm.SigningDetails)\npublic boolean hasAncestorOrSelfWithDigest(java.util.Set<java.lang.String>)\nprivate @android.annotation.Nullable android.content.pm.SigningDetails getDescendantOrSelf(android.content.pm.SigningDetails)\npublic boolean hasSignatures()\npublic boolean hasPastSigningCertificates()\npublic boolean hasAncestorOrSelf(android.content.pm.SigningDetails)\npublic boolean hasAncestor(android.content.pm.SigningDetails)\npublic boolean hasCommonSignerWithCapability(android.content.pm.SigningDetails,int)\npublic boolean checkCapability(android.content.pm.SigningDetails,int)\npublic boolean checkCapabilityRecover(android.content.pm.SigningDetails,int)\npublic boolean hasCertificate(android.content.pm.Signature)\npublic boolean hasCertificate(android.content.pm.Signature,int)\npublic boolean hasCertificate(byte[])\nprivate boolean hasCertificateInternal(android.content.pm.Signature,int)\npublic boolean checkCapability(java.lang.String,int)\npublic boolean hasSha256Certificate(byte[])\npublic boolean hasSha256Certificate(byte[],int)\nprivate boolean hasSha256CertificateInternal(byte[],int)\npublic boolean signaturesMatchExactly(android.content.pm.SigningDetails)\npublic @java.lang.Override int describeContents()\npublic @java.lang.Override void writeToParcel(android.os.Parcel,int)\npublic @java.lang.Override boolean equals(java.lang.Object)\npublic @java.lang.Override int hashCode()\npublic static android.util.ArraySet<java.security.PublicKey> toSigningKeys(android.content.pm.Signature[])\nclass SigningDetails extends java.lang.Object implements [android.os.Parcelable]\nprivate @android.annotation.NonNull android.content.pm.Signature[] mSignatures\nprivate @android.content.pm.SigningDetails.SignatureSchemeVersion int mSignatureSchemeVersion\nprivate @android.annotation.Nullable android.content.pm.Signature[] mPastSigningCertificates\npublic android.content.pm.SigningDetails.Builder setSignatures(android.content.pm.Signature[])\npublic android.content.pm.SigningDetails.Builder setSignatureSchemeVersion(int)\npublic android.content.pm.SigningDetails.Builder setPastSigningCertificates(android.content.pm.Signature[])\nprivate void checkInvariants()\npublic android.content.pm.SigningDetails build()\nclass Builder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false, genParcelable=true, genAidl=false)") @Deprecated private void __metadata() {} diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java index dc65beffa6e5..d235f124de32 100644 --- a/core/java/android/hardware/biometrics/BiometricPrompt.java +++ b/core/java/android/hardware/biometrics/BiometricPrompt.java @@ -422,6 +422,18 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan } /** + * Set if BiometricPrompt is being used by the legacy fingerprint manager API. + * @param sensorId sensor id + * @return This builder. + * @hide + */ + @NonNull + public Builder setIsForLegacyFingerprintManager(int sensorId) { + mPromptInfo.setIsForLegacyFingerprintManager(sensorId); + return this; + } + + /** * Creates a {@link BiometricPrompt}. * * @return An instance of {@link BiometricPrompt}. @@ -883,28 +895,36 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan @NonNull @CallbackExecutor Executor executor, @NonNull AuthenticationCallback callback, int userId) { - authenticateUserForOperation(cancel, executor, callback, userId, 0 /* operationId */); + if (cancel == null) { + throw new IllegalArgumentException("Must supply a cancellation signal"); + } + if (executor == null) { + throw new IllegalArgumentException("Must supply an executor"); + } + if (callback == null) { + throw new IllegalArgumentException("Must supply a callback"); + } + + authenticateInternal(0 /* operationId */, cancel, executor, callback, userId); } /** - * Authenticates for the given user and keystore operation. + * Authenticates for the given keystore operation. * * @param cancel An object that can be used to cancel authentication * @param executor An executor to handle callback events * @param callback An object to receive authentication events - * @param userId The user to authenticate * @param operationId The keystore operation associated with authentication * * @return A requestId that can be used to cancel this operation. * * @hide */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public long authenticateUserForOperation( + @RequiresPermission(USE_BIOMETRIC) + public long authenticateForOperation( @NonNull CancellationSignal cancel, @NonNull @CallbackExecutor Executor executor, @NonNull AuthenticationCallback callback, - int userId, long operationId) { if (cancel == null) { throw new IllegalArgumentException("Must supply a cancellation signal"); @@ -916,7 +936,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan throw new IllegalArgumentException("Must supply a callback"); } - return authenticateInternal(operationId, cancel, executor, callback, userId); + return authenticateInternal(operationId, cancel, executor, callback, mContext.getUserId()); } /** @@ -1050,7 +1070,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan private void cancelAuthentication(long requestId) { if (mService != null) { try { - mService.cancelAuthentication(mToken, mContext.getOpPackageName(), requestId); + mService.cancelAuthentication(mToken, mContext.getPackageName(), requestId); } catch (RemoteException e) { Log.e(TAG, "Unable to cancel authentication", e); } @@ -1109,7 +1129,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan } final long authId = mService.authenticate(mToken, operationId, userId, - mBiometricServiceReceiver, mContext.getOpPackageName(), promptInfo); + mBiometricServiceReceiver, mContext.getPackageName(), promptInfo); cancel.setOnCancelListener(new OnAuthenticationCancelListener(authId)); return authId; } catch (RemoteException e) { diff --git a/core/java/android/hardware/biometrics/ITestSessionCallback.aidl b/core/java/android/hardware/biometrics/ITestSessionCallback.aidl index 3d9517f29548..b336a9f21b60 100644 --- a/core/java/android/hardware/biometrics/ITestSessionCallback.aidl +++ b/core/java/android/hardware/biometrics/ITestSessionCallback.aidl @@ -19,7 +19,7 @@ package android.hardware.biometrics; * ITestSession callback for FingerprintManager and BiometricManager. * @hide */ -interface ITestSessionCallback { +oneway interface ITestSessionCallback { void onCleanupStarted(int userId); void onCleanupFinished(int userId); } diff --git a/core/java/android/hardware/biometrics/PromptInfo.java b/core/java/android/hardware/biometrics/PromptInfo.java index 0c03948e5368..a6b8096e6d4f 100644 --- a/core/java/android/hardware/biometrics/PromptInfo.java +++ b/core/java/android/hardware/biometrics/PromptInfo.java @@ -46,6 +46,7 @@ public class PromptInfo implements Parcelable { @NonNull private List<Integer> mAllowedSensorIds = new ArrayList<>(); private boolean mAllowBackgroundAuthentication; private boolean mIgnoreEnrollmentState; + private boolean mIsForLegacyFingerprintManager = false; public PromptInfo() { @@ -68,6 +69,7 @@ public class PromptInfo implements Parcelable { mAllowedSensorIds = in.readArrayList(Integer.class.getClassLoader(), java.lang.Integer.class); mAllowBackgroundAuthentication = in.readBoolean(); mIgnoreEnrollmentState = in.readBoolean(); + mIsForLegacyFingerprintManager = in.readBoolean(); } public static final Creator<PromptInfo> CREATOR = new Creator<PromptInfo>() { @@ -105,10 +107,15 @@ public class PromptInfo implements Parcelable { dest.writeList(mAllowedSensorIds); dest.writeBoolean(mAllowBackgroundAuthentication); dest.writeBoolean(mIgnoreEnrollmentState); + dest.writeBoolean(mIsForLegacyFingerprintManager); } public boolean containsTestConfigurations() { - if (!mAllowedSensorIds.isEmpty()) { + if (mIsForLegacyFingerprintManager + && mAllowedSensorIds.size() == 1 + && !mAllowBackgroundAuthentication) { + return false; + } else if (!mAllowedSensorIds.isEmpty()) { return true; } else if (mAllowBackgroundAuthentication) { return true; @@ -188,7 +195,8 @@ public class PromptInfo implements Parcelable { } public void setAllowedSensorIds(@NonNull List<Integer> sensorIds) { - mAllowedSensorIds = sensorIds; + mAllowedSensorIds.clear(); + mAllowedSensorIds.addAll(sensorIds); } public void setAllowBackgroundAuthentication(boolean allow) { @@ -199,6 +207,12 @@ public class PromptInfo implements Parcelable { mIgnoreEnrollmentState = ignoreEnrollmentState; } + public void setIsForLegacyFingerprintManager(int sensorId) { + mIsForLegacyFingerprintManager = true; + mAllowedSensorIds.clear(); + mAllowedSensorIds.add(sensorId); + } + // Getters public CharSequence getTitle() { @@ -272,4 +286,8 @@ public class PromptInfo implements Parcelable { public boolean isIgnoreEnrollmentState() { return mIgnoreEnrollmentState; } + + public boolean isForLegacyFingerprintManager() { + return mIsForLegacyFingerprintManager; + } } diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java index eccbb403b306..9a7ccc64efcd 100644 --- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java @@ -53,7 +53,6 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub private static final int DO_APP_PRIVATE_COMMAND = 100; private static final int DO_FINISH_SESSION = 110; private static final int DO_VIEW_CLICKED = 115; - private static final int DO_NOTIFY_IME_HIDDEN = 120; private static final int DO_REMOVE_IME_SURFACE = 130; private static final int DO_FINISH_INPUT = 140; private static final int DO_INVALIDATE_INPUT = 150; @@ -133,10 +132,6 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub mInputMethodSession.viewClicked(msg.arg1 == 1); return; } - case DO_NOTIFY_IME_HIDDEN: { - mInputMethodSession.notifyImeHidden(); - return; - } case DO_REMOVE_IME_SURFACE: { mInputMethodSession.removeImeSurface(); return; @@ -198,11 +193,6 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub } @Override - public void notifyImeHidden() { - mCaller.executeOrSendMessage(mCaller.obtainMessage(DO_NOTIFY_IME_HIDDEN)); - } - - @Override public void removeImeSurface() { mCaller.executeOrSendMessage(mCaller.obtainMessage(DO_REMOVE_IME_SURFACE)); } diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 4fdd53425328..a6ed42348af6 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1058,10 +1058,6 @@ public class InputMethodService extends AbstractInputMethodService { return viewRoot == null ? null : viewRoot.getInputToken(); } - private void notifyImeHidden() { - requestHideSelf(0); - } - private void scheduleImeSurfaceRemoval() { if (mShowInputRequested || mWindowVisible || mWindow == null || mImeSurfaceScheduledForRemoval) { @@ -1225,14 +1221,6 @@ public class InputMethodService extends AbstractInputMethodService { } /** - * Notify IME that window is hidden. - * @hide - */ - public final void notifyImeHidden() { - InputMethodService.this.notifyImeHidden(); - } - - /** * Notify IME that surface can be now removed. * @hide */ diff --git a/core/java/android/inputmethodservice/NavigationBarController.java b/core/java/android/inputmethodservice/NavigationBarController.java index dc38db2134f4..69105016e0ea 100644 --- a/core/java/android/inputmethodservice/NavigationBarController.java +++ b/core/java/android/inputmethodservice/NavigationBarController.java @@ -152,6 +152,7 @@ final class NavigationBarController { private boolean mDrawLegacyNavigationBarBackground; private final Rect mTempRect = new Rect(); + private final int[] mTempPos = new int[2]; Impl(@NonNull InputMethodService inputMethodService) { mService = inputMethodService; @@ -259,21 +260,28 @@ final class NavigationBarController { switch (originalInsets.touchableInsets) { case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME: if (inputFrame.getVisibility() == View.VISIBLE) { - inputFrame.getBoundsOnScreen(mTempRect); + inputFrame.getLocationInWindow(mTempPos); + mTempRect.set(mTempPos[0], mTempPos[1], + mTempPos[0] + inputFrame.getWidth(), + mTempPos[1] + inputFrame.getHeight()); touchableRegion = new Region(mTempRect); } break; case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT: if (inputFrame.getVisibility() == View.VISIBLE) { - inputFrame.getBoundsOnScreen(mTempRect); - mTempRect.top = originalInsets.contentTopInsets; + inputFrame.getLocationInWindow(mTempPos); + mTempRect.set(mTempPos[0], originalInsets.contentTopInsets, + mTempPos[0] + inputFrame.getWidth() , + mTempPos[1] + inputFrame.getHeight()); touchableRegion = new Region(mTempRect); } break; case ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_VISIBLE: if (inputFrame.getVisibility() == View.VISIBLE) { - inputFrame.getBoundsOnScreen(mTempRect); - mTempRect.top = originalInsets.visibleTopInsets; + inputFrame.getLocationInWindow(mTempPos); + mTempRect.set(mTempPos[0], originalInsets.visibleTopInsets, + mTempPos[0] + inputFrame.getWidth(), + mTempPos[1] + inputFrame.getHeight()); touchableRegion = new Region(mTempRect); } break; diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java index f1b110ab29c8..40e4083c02db 100644 --- a/core/java/android/net/vcn/VcnManager.java +++ b/core/java/android/net/vcn/VcnManager.java @@ -104,6 +104,14 @@ public class VcnManager { // TODO: Add separate signal strength thresholds for 2.4 GHz and 5GHz + /** List of Carrier Config options to extract from Carrier Config bundles. @hide */ + @NonNull + public static final String[] VCN_RELATED_CARRIER_CONFIG_KEYS = + new String[] { + VCN_NETWORK_SELECTION_WIFI_ENTRY_RSSI_THRESHOLD_KEY, + VCN_NETWORK_SELECTION_WIFI_EXIT_RSSI_THRESHOLD_KEY + }; + private static final Map< VcnNetworkPolicyChangeListener, VcnUnderlyingNetworkPolicyListenerBinder> REGISTERED_POLICY_LISTENERS = new ConcurrentHashMap<>(); diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index c6cf09789899..cb7e6f71a8fd 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -94,6 +94,8 @@ public class GraphicsEnvironment { private static final int VULKAN_1_0 = 0x00400000; private static final int VULKAN_1_1 = 0x00401000; + private static final int VULKAN_1_2 = 0x00402000; + private static final int VULKAN_1_3 = 0x00403000; // Values for UPDATABLE_DRIVER_ALL_APPS // 0: Default (Invalid values fallback to default as well) @@ -213,6 +215,14 @@ public class GraphicsEnvironment { private int getVulkanVersion(PackageManager pm) { // PackageManager doesn't have an API to retrieve the version of a specific feature, and we // need to avoid retrieving all system features here and looping through them. + if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_3)) { + return VULKAN_1_3; + } + + if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_2)) { + return VULKAN_1_2; + } + if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_1)) { return VULKAN_1_1; } diff --git a/core/java/android/permission/ILegacyPermissionManager.aidl b/core/java/android/permission/ILegacyPermissionManager.aidl index f1f083668711..78e12de04e89 100644 --- a/core/java/android/permission/ILegacyPermissionManager.aidl +++ b/core/java/android/permission/ILegacyPermissionManager.aidl @@ -49,4 +49,6 @@ interface ILegacyPermissionManager { void grantDefaultPermissionsToActiveLuiApp(in String packageName, int userId); void revokeDefaultPermissionsFromLuiApps(in String[] packageNames, int userId); + + void grantDefaultPermissionsToCarrierServiceApp(in String packageName, int userId); } diff --git a/core/java/android/permission/LegacyPermissionManager.java b/core/java/android/permission/LegacyPermissionManager.java index a4fa11b5121b..57776857864e 100644 --- a/core/java/android/permission/LegacyPermissionManager.java +++ b/core/java/android/permission/LegacyPermissionManager.java @@ -22,6 +22,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemService; +import android.annotation.UserIdInt; import android.content.Context; import android.content.pm.PackageManager; import android.os.RemoteException; @@ -244,4 +245,20 @@ public final class LegacyPermissionManager { e.rethrowFromSystemServer(); } } + + /** + * Grant permissions to a newly set Carrier Services app. + * @param packageName The newly set Carrier Services app + * @param userId The user for which to grant the permissions. + * @hide + */ + public void grantDefaultPermissionsToCarrierServiceApp(@NonNull String packageName, + @UserIdInt int userId) { + try { + mLegacyPermissionManager.grantDefaultPermissionsToCarrierServiceApp(packageName, + userId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index d25e456270ae..37f44e98c165 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -731,6 +731,13 @@ public final class DeviceConfig { public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE = "ambient_context_manager_service"; + /** + * Namespace for Vendor System Native related features. + * + * @hide + */ + public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native"; + private static final Object sLock = new Object(); @GuardedBy("sLock") private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners = diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9d166b995e4f..34647b144be1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7086,7 +7086,7 @@ public final class Settings { * * @hide */ - @Readable + @Readable(maxTargetSdk = Build.VERSION_CODES.S) public static final String ALWAYS_ON_VPN_LOCKDOWN_WHITELIST = "always_on_vpn_lockdown_whitelist"; diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 296877a448ab..78f91edfedcd 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -26,6 +26,7 @@ import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.TestApi; import android.app.Activity; +import android.content.Intent; import android.content.IntentSender; import android.content.pm.ParceledListSlice; import android.os.Bundle; @@ -306,6 +307,13 @@ public final class FillResponse implements Parcelable { * with the fully populated {@link FillResponse response} (or {@code null} if the screen * cannot be autofilled). * + * <p> <b>IMPORTANT</b>: Extras must be non-null on the intent being set for Android 12 + * otherwise it will cause a crash. Do not use {@link Activity#setResult(int)}, instead use + * {@link Activity#setResult(int, Intent) with non-null extras. Consider setting { + * @link android.view.autofill.AutofillManager#EXTRA_AUTHENTICATION_RESULT} to null or use + * {@link Bundle#EMPTY} with {@link Intent#putExtras(Bundle)} on the intent when + * finishing activity to avoid crash). </p> + * * <p>For example, if you provided an empty {@link FillResponse response} because the * user's data was locked and marked that the response needs an authentication then * in the response returned if authentication succeeds you need to provide all diff --git a/core/java/android/service/games/GameSession.java b/core/java/android/service/games/GameSession.java index 01152943efe3..e8d53d351795 100644 --- a/core/java/android/service/games/GameSession.java +++ b/core/java/android/service/games/GameSession.java @@ -25,7 +25,6 @@ import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.app.ActivityTaskManager; import android.app.Instrumentation; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; @@ -511,14 +510,11 @@ public abstract class GameSession { callback.onActivityResult(result.getResultCode(), result.getData()); }, executor); - final Intent trampolineIntent = new Intent(); - trampolineIntent.setComponent( - new ComponentName( - "android", "android.service.games.GameSessionTrampolineActivity")); - trampolineIntent.putExtra(GameSessionTrampolineActivity.INTENT_KEY, intent); - trampolineIntent.putExtra(GameSessionTrampolineActivity.OPTIONS_KEY, options); - trampolineIntent.putExtra( - GameSessionTrampolineActivity.FUTURE_KEY, future); + final Intent trampolineIntent = + GameSessionTrampolineActivity.createIntent( + intent, + options, + future); try { int result = ActivityTaskManager.getService().startActivityFromGameSession( diff --git a/core/java/android/service/games/GameSessionActivityResult.java b/core/java/android/service/games/GameSessionActivityResult.java index a2ec6ada010c..c8099e6e5eff 100644 --- a/core/java/android/service/games/GameSessionActivityResult.java +++ b/core/java/android/service/games/GameSessionActivityResult.java @@ -22,8 +22,12 @@ import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; +import com.android.internal.annotations.VisibleForTesting; -final class GameSessionActivityResult implements Parcelable { + +/** @hide */ +@VisibleForTesting +public final class GameSessionActivityResult implements Parcelable { public static final Creator<GameSessionActivityResult> CREATOR = new Creator<GameSessionActivityResult>() { @@ -44,17 +48,17 @@ final class GameSessionActivityResult implements Parcelable { @Nullable private final Intent mData; - GameSessionActivityResult(int resultCode, @Nullable Intent data) { + public GameSessionActivityResult(int resultCode, @Nullable Intent data) { mResultCode = resultCode; mData = data; } - int getResultCode() { + public int getResultCode() { return mResultCode; } @Nullable - Intent getData() { + public Intent getData() { return mData; } diff --git a/core/java/android/service/games/GameSessionService.java b/core/java/android/service/games/GameSessionService.java index df5bad5c53b2..52c8ec3d4018 100644 --- a/core/java/android/service/games/GameSessionService.java +++ b/core/java/android/service/games/GameSessionService.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SystemApi; import android.app.Service; +import android.content.Context; import android.content.Intent; import android.hardware.display.DisplayManager; import android.os.Binder; @@ -28,6 +29,7 @@ import android.os.Handler; import android.os.IBinder; import android.view.Display; import android.view.SurfaceControlViewHost; +import android.view.WindowManager; import com.android.internal.infra.AndroidFuture; import com.android.internal.util.function.pooled.PooledLambda; @@ -117,13 +119,18 @@ public abstract class GameSessionService extends Service { } IBinder hostToken = new Binder(); + + // Use a WindowContext so that views attached to the SurfaceControlViewHost will receive + // configuration changes (rather than always perceiving the global configuration). + final Context windowContext = createWindowContext(display, + WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, /*options=*/ null); SurfaceControlViewHost surfaceControlViewHost = - new SurfaceControlViewHost(this, display, hostToken); + new SurfaceControlViewHost(windowContext, display, hostToken); gameSession.attach( gameSessionController, createGameSessionRequest.getTaskId(), - this, + windowContext, surfaceControlViewHost, gameSessionViewHostConfiguration.mWidthPx, gameSessionViewHostConfiguration.mHeightPx); diff --git a/core/java/android/service/games/GameSessionTrampolineActivity.java b/core/java/android/service/games/GameSessionTrampolineActivity.java index 3d97d0f59b33..b23791842284 100644 --- a/core/java/android/service/games/GameSessionTrampolineActivity.java +++ b/core/java/android/service/games/GameSessionTrampolineActivity.java @@ -16,12 +16,15 @@ package android.service.games; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Activity; +import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.util.Slog; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.infra.AndroidFuture; import java.util.concurrent.Executor; @@ -35,6 +38,7 @@ import java.util.concurrent.Executor; * * @hide */ +@VisibleForTesting public final class GameSessionTrampolineActivity extends Activity { private static final String TAG = "GameSessionTrampoline"; private static final int REQUEST_CODE = 1; @@ -42,11 +46,52 @@ public final class GameSessionTrampolineActivity extends Activity { static final String FUTURE_KEY = "GameSessionTrampolineActivity.future"; static final String INTENT_KEY = "GameSessionTrampolineActivity.intent"; static final String OPTIONS_KEY = "GameSessionTrampolineActivity.options"; + private static final String HAS_LAUNCHED_INTENT_KEY = + "GameSessionTrampolineActivity.hasLaunchedIntent"; + private boolean mHasLaunchedIntent = false; + + /** + * Create an {@link Intent} for the {@link GameSessionTrampolineActivity} with the given + * parameters. + * + * @param targetIntent the forwarded {@link Intent} that is associated with the Activity that + * will be launched by the {@link GameSessionTrampolineActivity}. + * @param options Activity options. See {@link #startActivity(Intent, Bundle)}. + * @param resultFuture the {@link AndroidFuture} that will complete with the activity results of + * {@code targetIntent} launched. + * @return the Intent that will launch the {@link GameSessionTrampolineActivity} with the given + * parameters. + * @hide + */ + @VisibleForTesting + public static Intent createIntent( + @NonNull Intent targetIntent, + @Nullable Bundle options, + @NonNull AndroidFuture<GameSessionActivityResult> resultFuture) { + final Intent trampolineIntent = new Intent(); + trampolineIntent.setComponent( + new ComponentName( + "android", "android.service.games.GameSessionTrampolineActivity")); + trampolineIntent.putExtra(INTENT_KEY, targetIntent); + trampolineIntent.putExtra(OPTIONS_KEY, options); + trampolineIntent.putExtra(FUTURE_KEY, resultFuture); + + return trampolineIntent; + } @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + mHasLaunchedIntent = savedInstanceState.getBoolean(HAS_LAUNCHED_INTENT_KEY); + } + + if (mHasLaunchedIntent) { + return; + } + mHasLaunchedIntent = true; + try { startActivityAsCaller( getIntent().getParcelableExtra(INTENT_KEY), @@ -60,10 +105,17 @@ public final class GameSessionTrampolineActivity extends Activity { FUTURE_KEY); future.completeExceptionally(e); finish(); + overridePendingTransition(0, 0); } } @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putBoolean(HAS_LAUNCHED_INTENT_KEY, mHasLaunchedIntent); + } + + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode != REQUEST_CODE) { // Something went very wrong if we hit this code path, and we should bail. @@ -74,5 +126,6 @@ public final class GameSessionTrampolineActivity extends Activity { FUTURE_KEY); future.complete(new GameSessionActivityResult(resultCode, data)); finish(); + overridePendingTransition(0, 0); } } diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java index 4bbfbc2e717d..b783f6b8fd51 100644 --- a/core/java/android/service/voice/VoiceInteractionSession.java +++ b/core/java/android/service/voice/VoiceInteractionSession.java @@ -1095,7 +1095,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall if (!mWindowVisible) { mWindowVisible = true; if (mUiEnabled) { - mWindow.show(); + showWindow(); } } if (showCallback != null) { @@ -1284,9 +1284,25 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall } } + void showWindow() { + if (mWindow != null) { + mWindow.show(); + try { + mSystemService.setSessionWindowVisible(mToken, true); + } catch (RemoteException e) { + Log.w(TAG, "Failed to notify session window shown", e); + } + } + } + void ensureWindowHidden() { if (mWindow != null) { mWindow.hide(); + try { + mSystemService.setSessionWindowVisible(mToken, false); + } catch (RemoteException e) { + Log.w(TAG, "Failed to notify session window hidden", e); + } } } @@ -1377,7 +1393,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall if (mWindowVisible) { if (enabled) { ensureWindowAdded(); - mWindow.show(); + showWindow(); } else { ensureWindowHidden(); } diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index 60593ca46bcb..77591a7efb5e 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -765,18 +765,24 @@ public final class Choreographer { startNanos = System.nanoTime(); final long jitterNanos = startNanos - frameTimeNanos; if (jitterNanos >= frameIntervalNanos) { - final long skippedFrames = jitterNanos / frameIntervalNanos; - if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) { - Log.i(TAG, "Skipped " + skippedFrames + " frames! " - + "The application may be doing too much work on its main thread."); - } final long lastFrameOffset = jitterNanos % frameIntervalNanos; - if (DEBUG_JANK) { - Log.d(TAG, "Missed vsync by " + (jitterNanos * 0.000001f) + " ms " - + "which is more than the frame interval of " - + (frameIntervalNanos * 0.000001f) + " ms! " - + "Skipping " + skippedFrames + " frames and setting frame " - + "time to " + (lastFrameOffset * 0.000001f) + " ms in the past."); + if (frameIntervalNanos == 0) { + Log.i(TAG, "Vsync data empty due to timeout"); + } else { + final long skippedFrames = jitterNanos / frameIntervalNanos; + if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) { + Log.i(TAG, "Skipped " + skippedFrames + " frames! " + + "The application may be doing too much work on its main " + + "thread."); + } + if (DEBUG_JANK) { + Log.d(TAG, "Missed vsync by " + (jitterNanos * 0.000001f) + " ms " + + "which is more than the frame interval of " + + (frameIntervalNanos * 0.000001f) + " ms! " + + "Skipping " + skippedFrames + " frames and setting frame " + + "time to " + (lastFrameOffset * 0.000001f) + + " ms in the past."); + } } frameTimeNanos = startNanos - lastFrameOffset; DisplayEventReceiver.VsyncEventData latestVsyncEventData = diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 0c4d9bf08583..f8a848ed8c25 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -26,11 +26,9 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.TestApi; -import android.app.ActivityThread; import android.app.KeyguardManager; import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; -import android.content.ComponentName; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Resources; @@ -52,14 +50,11 @@ import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.Log; -import com.android.internal.R; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; /** * Provides information about the size and density of a logical display. @@ -116,12 +111,6 @@ public final class Display { private int mCachedAppHeightCompat; /** - * Cache if the application is the recents component. - * TODO(b/179308296) Remove once Launcher addresses issue - */ - private Optional<Boolean> mIsRecentsComponent = Optional.empty(); - - /** * The default Display id, which is the id of the primary display assuming there is one. */ public static final int DEFAULT_DISPLAY = 0; @@ -1584,36 +1573,7 @@ public final class Display { return false; } final Configuration config = mResources.getConfiguration(); - // TODO(b/179308296) Temporarily exclude Launcher from being given max bounds, by checking - // if the caller is the recents component. - return config != null && !config.windowConfiguration.getMaxBounds().isEmpty() - && !isRecentsComponent(); - } - - /** - * Returns {@code true} when the calling package is the recents component. - * TODO(b/179308296) Remove once Launcher addresses issue - */ - boolean isRecentsComponent() { - if (mIsRecentsComponent.isPresent()) { - return mIsRecentsComponent.get(); - } - if (mResources == null) { - return false; - } - try { - String recentsComponent = mResources.getString(R.string.config_recentsComponentName); - if (recentsComponent == null) { - return false; - } - String recentsPackage = ComponentName.unflattenFromString(recentsComponent) - .getPackageName(); - mIsRecentsComponent = Optional.of(recentsPackage != null - && recentsPackage.equals(ActivityThread.currentPackageName())); - return mIsRecentsComponent.get(); - } catch (Resources.NotFoundException e) { - return false; - } + return config != null && !config.windowConfiguration.getMaxBounds().isEmpty(); } /** diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 5ce5477daa0f..c83869c9ee68 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -249,7 +249,7 @@ interface IWindowManager * Set whether screen capture is disabled for all windows of a specific user from * the device policy cache. */ - void refreshScreenCaptureDisabled(int userId); + void refreshScreenCaptureDisabled(); // These can only be called with the SET_ORIENTATION permission. /** diff --git a/core/java/android/view/ImeInsetsSourceConsumer.java b/core/java/android/view/ImeInsetsSourceConsumer.java index d609fb8eb234..4fdea3b006dc 100644 --- a/core/java/android/view/ImeInsetsSourceConsumer.java +++ b/core/java/android/view/ImeInsetsSourceConsumer.java @@ -18,12 +18,13 @@ package android.view; import static android.os.Trace.TRACE_TAG_VIEW; import static android.view.ImeInsetsSourceConsumerProto.INSETS_SOURCE_CONSUMER; +import static android.view.ImeInsetsSourceConsumerProto.IS_HIDE_ANIMATION_RUNNING; import static android.view.ImeInsetsSourceConsumerProto.IS_REQUESTED_VISIBLE_AWAITING_CONTROL; +import static android.view.ImeInsetsSourceConsumerProto.IS_SHOW_REQUESTED_DURING_HIDE_ANIMATION; import static android.view.InsetsController.AnimationType; import static android.view.InsetsState.ITYPE_IME; import android.annotation.Nullable; -import android.inputmethodservice.InputMethodService; import android.os.IBinder; import android.os.Trace; import android.util.proto.ProtoOutputStream; @@ -44,6 +45,16 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { */ private boolean mIsRequestedVisibleAwaitingControl; + private boolean mIsHideAnimationRunning; + + /** + * Tracks whether {@link WindowInsetsController#show(int)} or + * {@link InputMethodManager#showSoftInput(View, int)} is called during IME hide animation. + * If it was called, we should not call {@link InputMethodManager#notifyImeHidden(IBinder)}, + * because the IME is being shown. + */ + private boolean mIsShowRequestedDuringHideAnimation; + public ImeInsetsSourceConsumer( InsetsState state, Supplier<Transaction> transactionSupplier, InsetsController controller) { @@ -64,6 +75,12 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { } @Override + public void show(boolean fromIme) { + super.show(fromIme); + onShowRequested(); + } + + @Override public void hide() { super.hide(); mIsRequestedVisibleAwaitingControl = false; @@ -74,10 +91,20 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { hide(); if (animationFinished) { - // remove IME surface as IME has finished hide animation. - notifyHidden(); - removeSurface(); + // Remove IME surface as IME has finished hide animation, if there is no pending + // show request. + if (!mIsShowRequestedDuringHideAnimation) { + notifyHidden(); + removeSurface(); + } } + // This method is called + // (1) before the hide animation starts. + // (2) after the hide animation ends. + // (3) if the IME is not controllable (animationFinished == true in this case). + // We should reset mIsShowRequestedDuringHideAnimation in all cases. + mIsHideAnimationRunning = !animationFinished; + mIsShowRequestedDuringHideAnimation = false; } /** @@ -104,7 +131,8 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { } /** - * Notify {@link InputMethodService} that IME window is hidden. + * Notify {@link com.android.server.inputmethod.InputMethodManagerService} that + * IME insets are hidden. */ @Override void notifyHidden() { @@ -157,9 +185,20 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { final long token = proto.start(fieldId); super.dumpDebug(proto, INSETS_SOURCE_CONSUMER); proto.write(IS_REQUESTED_VISIBLE_AWAITING_CONTROL, mIsRequestedVisibleAwaitingControl); + proto.write(IS_HIDE_ANIMATION_RUNNING, mIsHideAnimationRunning); + proto.write(IS_SHOW_REQUESTED_DURING_HIDE_ANIMATION, mIsShowRequestedDuringHideAnimation); proto.end(token); } + /** + * Called when {@link #show} or {@link InputMethodManager#showSoftInput(View, int)} is called. + */ + public void onShowRequested() { + if (mIsHideAnimationRunning) { + mIsShowRequestedDuringHideAnimation = true; + } + } + private InputMethodManager getImm() { return mController.getHost().getInputMethodManager(); } diff --git a/core/java/android/view/InsetsSourceConsumer.java b/core/java/android/view/InsetsSourceConsumer.java index 6aab6359d23e..4d9033df89e1 100644 --- a/core/java/android/view/InsetsSourceConsumer.java +++ b/core/java/android/view/InsetsSourceConsumer.java @@ -25,6 +25,7 @@ import static android.view.InsetsSourceConsumerProto.IS_REQUESTED_VISIBLE; import static android.view.InsetsSourceConsumerProto.PENDING_FRAME; import static android.view.InsetsSourceConsumerProto.PENDING_VISIBLE_FRAME; import static android.view.InsetsSourceConsumerProto.SOURCE_CONTROL; +import static android.view.InsetsSourceControl.INVALID_HINTS; import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.getDefaultVisibility; import static android.view.InsetsState.toPublicType; @@ -163,8 +164,10 @@ public class InsetsSourceConsumer { // We are gaining control, and need to run an animation since previous state // didn't match final boolean requestedVisible = isRequestedVisibleAwaitingControl(); - final boolean needAnimation = requestedVisible != mState.getSource(mType).isVisible(); - if (control.getLeash() != null && (needAnimation || mIsAnimationPending)) { + final boolean fakeControl = INVALID_HINTS.equals(control.getInsetsHint()); + final boolean needsAnimation = requestedVisible != mState.getSource(mType).isVisible() + && !fakeControl; + if (control.getLeash() != null && (needsAnimation || mIsAnimationPending)) { if (DEBUG) Log.d(TAG, String.format("Gaining control in %s, requestedVisible: %b", mController.getHost().getRootViewTitle(), requestedVisible)); if (requestedVisible) { @@ -174,7 +177,7 @@ public class InsetsSourceConsumer { } mIsAnimationPending = false; } else { - if (needAnimation) { + if (needsAnimation) { // We need animation but we haven't had a leash yet. Set this flag that when we // get the leash we can play the deferred animation. mIsAnimationPending = true; diff --git a/core/java/android/view/InsetsSourceControl.java b/core/java/android/view/InsetsSourceControl.java index 9d98a3e4b0e1..2cf827db38db 100644 --- a/core/java/android/view/InsetsSourceControl.java +++ b/core/java/android/view/InsetsSourceControl.java @@ -39,6 +39,8 @@ import java.util.function.Consumer; */ public class InsetsSourceControl implements Parcelable { + public static final Insets INVALID_HINTS = Insets.of(-1, -1, -1, -1); + private final @InternalInsetsType int mType; private final @Nullable SurfaceControl mLeash; private final Point mSurfacePosition; diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index dc3620bcc5e5..62d0d37da84d 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12063,8 +12063,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Gets the coordinates of this view in the coordinate space of the * {@link Surface} that contains the view. * - * <p>After the method returns, the argument array contains the x- and - * y-coordinates of the view relative to the view's left and top edges, + * <p>In multiple-screen scenarios, if the surface spans multiple screens, + * the coordinate space of the surface also spans multiple screens. + * + * <p>After the method returns, the argument array contains the x and y + * coordinates of the view relative to the view's left and top edges, * respectively. * * @param location A two-element integer array in which the view coordinates @@ -18740,18 +18743,37 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * If some part of this view is not clipped by any of its parents, then - * return that area in r in global (root) coordinates. To convert r to local - * coordinates (without taking possible View rotations into account), offset - * it by -globalOffset (e.g. r.offset(-globalOffset.x, -globalOffset.y)). - * If the view is completely clipped or translated out, return false. + * Sets {@code r} to the coordinates of the non-clipped area of this view in + * the coordinate space of the view's root view. Sets {@code globalOffset} + * to the offset of the view's x and y coordinates from the coordinate space + * origin, which is the top left corner of the root view irrespective of + * screen decorations and system UI elements. + * + * <p>To convert {@code r} to coordinates relative to the top left corner of + * this view (without taking view rotations into account), offset {@code r} + * by the inverse values of + * {@code globalOffset}—{@code r.offset(-globalOffset.x, + * -globalOffset.y)}—which is equivalent to calling + * {@link #getLocalVisibleRect(Rect) getLocalVisibleRect(Rect)}. + * + * <p><b>Note:</b> Do not use this method to determine the size of a window + * in multi-window mode; use + * {@link WindowManager#getCurrentWindowMetrics()}. + * + * @param r If the method returns true, contains the coordinates of the + * visible portion of this view in the coordinate space of the view's + * root view. If the method returns false, the contents of {@code r} + * are undefined. + * @param globalOffset If the method returns true, contains the offset of + * the x and y coordinates of this view from the top left corner of the + * view's root view. If the method returns false, the contents of + * {@code globalOffset} are undefined. The argument can be null (see + * {@link #getGlobalVisibleRect(Rect) getGlobalVisibleRect(Rect)}. + * @return true if at least part of the view is visible within the root + * view; false if the view is completely clipped or translated out of + * the visible area of the root view. * - * @param r If true is returned, r holds the global coordinates of the - * visible portion of this view. - * @param globalOffset If true is returned, globalOffset holds the dx,dy - * between this view and its root. globalOffet may be null. - * @return true if r is non-empty (i.e. part of the view is visible at the - * root level. + * @see #getLocalVisibleRect(Rect) */ public boolean getGlobalVisibleRect(Rect r, Point globalOffset) { int width = mRight - mLeft; @@ -18766,10 +18788,48 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return false; } + /** + * Sets {@code r} to the coordinates of the non-clipped area of this view in + * the coordinate space of the view's root view. + * + * <p>See {@link #getGlobalVisibleRect(Rect, Point) + * getGlobalVisibleRect(Rect, Point)} for more information. + * + * @param r If the method returns true, contains the coordinates of the + * visible portion of this view in the coordinate space of the view's + * root view. If the method returns false, the contents of {@code r} + * are undefined. + * @return true if at least part of the view is visible within the root + * view; otherwise false. + */ public final boolean getGlobalVisibleRect(Rect r) { return getGlobalVisibleRect(r, null); } + /** + * Sets {@code r} to the coordinates of the non-clipped area of this view + * relative to the top left corner of the view. + * + * <p>If the view is clipped on the left or top, the left and top + * coordinates are offset from 0 by the clipped amount. For example, if the + * view is off screen 50px on the left and 30px at the top, the left and top + * coordinates are 50 and 30 respectively. + * + * <p>If the view is clipped on the right or bottom, the right and bottom + * coordinates are reduced by the clipped amount. For example, if the view + * is off screen 40px on the right and 20px at the bottom, the right + * coordinate is the view width - 40, and the bottom coordinate is the view + * height - 20. + * + * @param r If the method returns true, contains the coordinates of the + * visible portion of this view relative to the top left corner of the + * view. If the method returns false, the contents of {@code r} are + * undefined. + * @return true if at least part of the view is visible; false if the view + * is completely clipped or translated out of the visible area. + * + * @see #getGlobalVisibleRect(Rect, Point) + */ public final boolean getLocalVisibleRect(Rect r) { final Point offset = mAttachInfo != null ? mAttachInfo.mPoint : new Point(); if (getGlobalVisibleRect(r, offset)) { @@ -25585,22 +25645,26 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } /** - * Gets the global coordinates of this view. The coordinates are in the - * coordinate space of the device screen, irrespective of system decorations - * and whether the system is in multi-window mode. + * Gets the coordinates of this view in the coordinate space of the device + * screen, irrespective of system decorations and whether the system is in + * multi-window mode. * - * <p>In multi-window mode, the global coordinate space encompasses the - * entire device screen, ignoring the bounds of the app window. For - * example, if the view is in the bottom portion of a horizontal split - * screen, the top edge of the screen—not the top edge of the - * window—is the origin from which the y-coordinate is calculated. + * <p>In multi-window mode, the coordinate space encompasses the entire + * device screen, ignoring the bounds of the app window. For example, if the + * view is in the bottom portion of a horizontal split screen, the top edge + * of the screen—not the top edge of the window—is the origin + * from which the y-coordinate is calculated. * - * <p><b>Note:</b> In multiple-screen scenarios, the global coordinate space - * is restricted to the screen on which the view is displayed. The - * coordinate space does not span multiple screens. + * <p>In multiple-screen scenarios, the coordinate space can span screens. + * For example, if the app is spanning both screens of a dual-screen device + * and the view is located on the right-hand screen, the x-coordinate is + * calculated from the left edge of the left-hand screen to the left edge of + * the view. When the app is restricted to a single screen in a + * multiple-screen environment, the coordinate space includes only the + * screen on which the app is running. * - * <p>After the method returns, the argument array contains the x- and - * y-coordinates of the view relative to the view's left and top edges, + * <p>After the method returns, the argument array contains the x and y + * coordinates of the view relative to the view's left and top edges, * respectively. * * @param outLocation A two-element integer array in which the view @@ -25625,8 +25689,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * top left corner of the window that contains the view. In full screen * mode, the origin is the top left corner of the device screen. * - * <p>After the method returns, the argument array contains the x- and - * y-coordinates of the view relative to the view's left and top edges, + * <p>In multiple-screen scenarios, if the app spans multiple screens, the + * coordinate space also spans multiple screens. But if the app is + * restricted to a single screen, the coordinate space includes only the + * screen on which the app is running. + * + * <p>After the method returns, the argument array contains the x and y + * coordinates of the view relative to the view's left and top edges, * respectively. * * @param outLocation A two-element integer array in which the view @@ -28733,7 +28802,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * {@link InputDevice#SOURCE_MOUSE_RELATIVE}, and relative position changes will be * available through {@link MotionEvent#getX} and {@link MotionEvent#getY}.</li> * - * <li>Events from a touchpad will be delivered with the source + * <li>Events from a touchpad or trackpad will be delivered with the source * {@link InputDevice#SOURCE_TOUCHPAD}, where the absolute position of each of the pointers * on the touchpad will be available through {@link MotionEvent#getX(int)} and * {@link MotionEvent#getY(int)}, and their relative movements are stored in @@ -28742,6 +28811,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <li>Events from other types of devices, such as touchscreens, will not be affected.</li> * </ul> * <p> + * When pointer capture changes, connected mouse and trackpad devices may be reconfigured, + * and their properties (such as their sources or motion ranges) may change. Use an + * {@link android.hardware.input.InputManager.InputDeviceListener} to be notified when a device + * changes (which may happen after enabling or disabling pointer capture), and use + * {@link InputDevice#getDevice(int)} to get the updated {@link InputDevice}. + * <p> * Events captured through pointer capture will be dispatched to * {@link OnCapturedPointerListener#onCapturedPointer(View, MotionEvent)} if an * {@link OnCapturedPointerListener} is set, and otherwise to diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 90e349864092..4baad1e95aa8 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -1058,11 +1058,6 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Refreshes this info with the latest state of the view it represents. - * <p> - * <strong>Note:</strong> If this method returns false this info is obsolete - * since it represents a view that is no longer in the view tree and should - * be recycled. - * </p> * * @param bypassCache Whether to bypass the cache. * @return Whether the refresh succeeded. @@ -1089,8 +1084,7 @@ public class AccessibilityNodeInfo implements Parcelable { * Refreshes this info with the latest state of the view it represents. * * @return {@code true} if the refresh succeeded. {@code false} if the {@link View} represented - * by this node is no longer in the view tree (and thus this node is obsolete and should be - * recycled). + * by this node is no longer in the view tree (and thus this node is obsolete). */ public boolean refresh() { return refresh(null, true); @@ -1109,8 +1103,7 @@ public class AccessibilityNodeInfo implements Parcelable { * @param args A bundle of arguments for the request. These depend on the particular request. * * @return {@code true} if the refresh succeeded. {@code false} if the {@link View} represented - * by this node is no longer in the view tree (and thus this node is obsolete and should be - * recycled). + * by this node is no longer in the view tree (and thus this node is obsolete). */ public boolean refreshWithExtraData(String extraDataKey, Bundle args) { // limits the text location length to make sure the rectangle array allocation avoids @@ -1823,11 +1816,6 @@ public class AccessibilityNodeInfo implements Parcelable { * this info is the root of the traversed tree. * * <p> - * <strong>Note:</strong> It is a client responsibility to recycle the - * received info by calling {@link AccessibilityNodeInfo#recycle()} - * to avoid creating of multiple instances. - * </p> - * <p> * <strong>Note:</strong> If this view hierarchy has a {@link SurfaceView} embedding another * view hierarchy via {@link SurfaceView#setChildSurfacePackage}, there is a limitation that * this API won't be able to find the node for the view on the embedded view hierarchy. It's @@ -1855,11 +1843,6 @@ public class AccessibilityNodeInfo implements Parcelable { * resource name is "baz", the fully qualified resource id is "foo.bar:id/baz". * * <p> - * <strong>Note:</strong> It is a client responsibility to recycle the - * received info by calling {@link AccessibilityNodeInfo#recycle()} - * to avoid creating of multiple instances. - * </p> - * <p> * <strong>Note:</strong> The primary usage of this API is for UI test automation * and in order to report the fully qualified view id if an {@link AccessibilityNodeInfo} * the client has to set the {@link AccessibilityServiceInfo#FLAG_REPORT_VIEW_IDS} @@ -3282,11 +3265,6 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Gets the node info for which the view represented by this info serves as * a label for accessibility purposes. - * <p> - * <strong>Note:</strong> It is a client responsibility to recycle the - * received info by calling {@link AccessibilityNodeInfo#recycle()} - * to avoid creating of multiple instances. - * </p> * * @return The labeled info. */ @@ -3334,11 +3312,6 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Gets the node info which serves as the label of the view represented by * this info for accessibility purposes. - * <p> - * <strong>Note:</strong> It is a client responsibility to recycle the - * received info by calling {@link AccessibilityNodeInfo#recycle()} - * to avoid creating of multiple instances. - * </p> * * @return The label. */ @@ -5312,9 +5285,7 @@ public class AccessibilityNodeInfo implements Parcelable { } /** - * Class with information if a node is a range. Use - * {@link RangeInfo#obtain(int, float, float, float)} to get an instance. Recycling is - * handled by the {@link AccessibilityNodeInfo} to which this object is attached. + * Class with information if a node is a range. */ public static final class RangeInfo { @@ -5423,9 +5394,7 @@ public class AccessibilityNodeInfo implements Parcelable { } /** - * Class with information if a node is a collection. Use - * {@link CollectionInfo#obtain(int, int, boolean)} to get an instance. Recycling is - * handled by the {@link AccessibilityNodeInfo} to which this object is attached. + * Class with information if a node is a collection. * <p> * A collection of items has rows and columns and may be hierarchical. * For example, a horizontal list is a collection with one column, as @@ -5591,10 +5560,7 @@ public class AccessibilityNodeInfo implements Parcelable { } /** - * Class with information if a node is a collection item. Use - * {@link CollectionItemInfo#obtain(int, int, int, int, boolean)} - * to get an instance. Recycling is handled by the {@link AccessibilityNodeInfo} to which this - * object is attached. + * Class with information if a node is a collection item. * <p> * A collection item is contained in a collection, it starts at * a given row and column in the collection, and spans one or @@ -6085,11 +6051,6 @@ public class AccessibilityNodeInfo implements Parcelable { * <p> * <strong>Note:</strong> This api can only be called from {@link AccessibilityService}. * </p> - * <p> - * <strong>Note:</strong> It is a client responsibility to recycle the - * received info by calling {@link AccessibilityNodeInfo#recycle()} - * to avoid creating of multiple instances. - * </p> * * @param region The region retrieved from {@link #getRegionAt(int)}. * @return The target node associates with the given region. diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 07756f638d4b..0a75992811f4 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -1958,7 +1958,7 @@ public final class AutofillManager { if (newClientState != null) { responseData.putBundle(EXTRA_CLIENT_STATE, newClientState); } - if (data.getExtras().containsKey(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET)) { + if (data.hasExtra(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET)) { responseData.putBoolean(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET, data.getBooleanExtra(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET, false)); diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 84f13930e03a..850256871b15 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -543,6 +543,7 @@ public final class InputMethodManager { static final int MSG_BIND_ACCESSIBILITY_SERVICE = 11; static final int MSG_UNBIND_ACCESSIBILITY_SERVICE = 12; static final int MSG_UPDATE_VIRTUAL_DISPLAY_TO_SCREEN_MATRIX = 30; + static final int MSG_ON_SHOW_REQUESTED = 31; private static boolean isAutofillUIShowing(View servedView) { AutofillManager afm = servedView.getContext().getSystemService(AutofillManager.class); @@ -1117,6 +1118,14 @@ public final class InputMethodManager { } return; } + case MSG_ON_SHOW_REQUESTED: { + synchronized (mH) { + if (mImeInsetsConsumer != null) { + mImeInsetsConsumer.onShowRequested(); + } + } + return; + } } } } @@ -1834,6 +1843,9 @@ public final class InputMethodManager { return false; } + // Makes sure to call ImeInsetsSourceConsumer#onShowRequested on the UI thread. + // TODO(b/229426865): call WindowInsetsController#show instead. + mH.executeOrSendMessage(Message.obtain(mH, MSG_ON_SHOW_REQUESTED)); try { Log.d(TAG, "showSoftInput() view=" + view + " flags=" + flags + " reason=" + InputMethodDebug.softInputDisplayReasonToString(reason)); @@ -1869,6 +1881,9 @@ public final class InputMethodManager { Log.w(TAG, "No current root view, ignoring showSoftInputUnchecked()"); return; } + // Makes sure to call ImeInsetsSourceConsumer#onShowRequested on the UI thread. + // TODO(b/229426865): call WindowInsetsController#show instead. + mH.executeOrSendMessage(Message.obtain(mH, MSG_ON_SHOW_REQUESTED)); mService.showSoftInput( mClient, mCurRootView.getView().getWindowToken(), @@ -2521,7 +2536,7 @@ public final class InputMethodManager { } /** - * Notify IME directly that it is no longer visible. + * Notify IMMS that IME insets are no longer visible. * * @param windowToken the window from which this request originates. If this doesn't match the * currently served view, the request is ignored. @@ -2533,7 +2548,13 @@ public final class InputMethodManager { synchronized (mH) { if (mCurrentInputMethodSession != null && mCurRootView != null && mCurRootView.getWindowToken() == windowToken) { - mCurrentInputMethodSession.notifyImeHidden(); + try { + mService.hideSoftInput(mClient, windowToken, 0 /* flags */, + null /* resultReceiver */, + SoftInputShowHideReason.HIDE_SOFT_INPUT); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } } diff --git a/core/java/android/view/inputmethod/InputMethodSession.java b/core/java/android/view/inputmethod/InputMethodSession.java index a178ee8ee866..28c44507e43c 100644 --- a/core/java/android/view/inputmethod/InputMethodSession.java +++ b/core/java/android/view/inputmethod/InputMethodSession.java @@ -195,13 +195,6 @@ public interface InputMethodSession { public void updateCursorAnchorInfo(CursorAnchorInfo cursorAnchorInfo); /** - * Notifies {@link android.inputmethodservice.InputMethodService} that IME has been - * hidden from user. - * @hide - */ - public void notifyImeHidden(); - - /** * Notify IME directly to remove surface as it is no longer visible. * @hide */ diff --git a/core/java/android/view/inputmethod/InputMethodSessionWrapper.java b/core/java/android/view/inputmethod/InputMethodSessionWrapper.java index a1995202485f..ee22b6508549 100644 --- a/core/java/android/view/inputmethod/InputMethodSessionWrapper.java +++ b/core/java/android/view/inputmethod/InputMethodSessionWrapper.java @@ -106,15 +106,6 @@ final class InputMethodSessionWrapper { } @AnyThread - void notifyImeHidden() { - try { - mSession.notifyImeHidden(); - } catch (RemoteException e) { - Log.w(TAG, "IME died", e); - } - } - - @AnyThread void viewClicked(boolean focusChanged) { try { mSession.viewClicked(focusChanged); diff --git a/core/java/android/view/translation/UiTranslationStateCallback.java b/core/java/android/view/translation/UiTranslationStateCallback.java index 3ccca5f5290f..96b6f8ca6c4a 100644 --- a/core/java/android/view/translation/UiTranslationStateCallback.java +++ b/core/java/android/view/translation/UiTranslationStateCallback.java @@ -25,14 +25,28 @@ import java.util.concurrent.Executor; * Callback for listening to UI Translation state changes. See {@link * UiTranslationManager#registerUiTranslationStateCallback(Executor, UiTranslationStateCallback)}. * <p> - * Prior to Android version {@link android.os.Build.VERSION_CODES#TIRAMISU}, callback methods - * <em>without</em> {@code packageName} are invoked. Apps with minSdkVersion lower than {@link - * android.os.Build.VERSION_CODES#TIRAMISU} <em>must</em> implement those methods if they want to - * handle the events. + * Prior to Android version {@link android.os.Build.VERSION_CODES#TIRAMISU}: + * <ul> + * <li>Callback methods <em>without</em> {@code packageName} are invoked. Apps with + * minSdkVersion lower than {@link android.os.Build.VERSION_CODES#TIRAMISU} <em>must</em> + * implement those methods if they want to handle the events.</li> + * <li>Callback methods for a particular event <em>may</em> be called multiple times + * consecutively, even when the translation state has not changed (e.g., + * {@link #onStarted(ULocale, ULocale, String)} may be called multiple times even after + * translation has already started).</li> + * </ul> * <p> - * In Android version {@link android.os.Build.VERSION_CODES#TIRAMISU} and later, if both methods - * with and without {@code packageName} are implemented (e.g., {@link #onFinished()} and {@link - * #onFinished(String)}, only the one <em>with</em> {@code packageName} will be called. + * In Android version {@link android.os.Build.VERSION_CODES#TIRAMISU} and later: + * <ul> + * <li>If both methods with and without {@code packageName} are implemented (e.g., + * {@link #onFinished()} and {@link #onFinished(String)}, only the one <em>with</em> {@code + * packageName} will be called.</li> + * <li>Callback methods for a particular event will <em>not</em> be called multiple times + * consecutively. They will only be called when the translation state has actually changed + * (e.g., from "started" to "paused"). Note: "resumed" is not considered a separate state + * from "started", so {@link #onResumed(ULocale, ULocale, String)} will never be called after + * {@link #onStarted(ULocale, ULocale, String)}.<</li> + * </ul> */ public interface UiTranslationStateCallback { diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 2c6264783f56..41ff69d6fb5f 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -32,6 +32,7 @@ import android.content.res.TypedArray; import android.database.ContentObserver; import android.os.Build; import android.os.Handler; +import android.text.TextUtils; import android.util.AttributeSet; import android.util.PluralsMessageFormatter; import android.view.accessibility.AccessibilityNodeInfo; @@ -230,7 +231,7 @@ public class DateTimeView extends TextView { // Set the text String text = format.format(new Date(time)); - setText(text); + maybeSetText(text); // Schedule the next update if (display == SHOW_TIME) { @@ -258,7 +259,7 @@ public class DateTimeView extends TextView { boolean past = (now >= mTimeMillis); String result; if (duration < MINUTE_IN_MILLIS) { - setText(mNowText); + maybeSetText(mNowText); mUpdateTimeMillis = mTimeMillis + MINUTE_IN_MILLIS + 1; return; } else if (duration < HOUR_IN_MILLIS) { @@ -308,7 +309,19 @@ public class DateTimeView extends TextView { mUpdateTimeMillis = mTimeMillis - millisIncrease * count + 1; } } - setText(result); + maybeSetText(result); + } + + /** + * Sets text only if the text has actually changed. This prevents needles relayouts of this + * view when set to wrap_content. + */ + private void maybeSetText(String text) { + if (TextUtils.equals(getText(), text)) { + return; + } + + setText(text); } /** diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index fbad38f27a23..2879cd888d2d 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -1588,24 +1588,33 @@ public class RemoteViews implements Parcelable, Filter { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ArrayList<Bitmap> mBitmaps; + SparseIntArray mBitmapHashes; int mBitmapMemory = -1; public BitmapCache() { mBitmaps = new ArrayList<>(); + mBitmapHashes = new SparseIntArray(); } public BitmapCache(Parcel source) { mBitmaps = source.createTypedArrayList(Bitmap.CREATOR); + mBitmapHashes = source.readSparseIntArray(); } public int getBitmapId(Bitmap b) { if (b == null) { return -1; } else { - if (mBitmaps.contains(b)) { - return mBitmaps.indexOf(b); + int hash = b.hashCode(); + int hashId = mBitmapHashes.get(hash, -1); + if (hashId != -1) { + return hashId; } else { + if (b.isMutable()) { + b = b.asShared(); + } mBitmaps.add(b); + mBitmapHashes.put(mBitmaps.size() - 1, hash); mBitmapMemory = -1; return (mBitmaps.size() - 1); } @@ -1616,13 +1625,13 @@ public class RemoteViews implements Parcelable, Filter { public Bitmap getBitmapForId(int id) { if (id == -1 || id >= mBitmaps.size()) { return null; - } else { - return mBitmaps.get(id); } + return mBitmaps.get(id); } public void writeBitmapsToParcel(Parcel dest, int flags) { dest.writeTypedList(mBitmaps, flags); + dest.writeSparseIntArray(mBitmapHashes); } public int getBitmapMemory() { diff --git a/core/java/android/window/ITaskFragmentOrganizer.aidl b/core/java/android/window/ITaskFragmentOrganizer.aidl index cdfa206423c2..8dfda7d41c2d 100644 --- a/core/java/android/window/ITaskFragmentOrganizer.aidl +++ b/core/java/android/window/ITaskFragmentOrganizer.aidl @@ -16,6 +16,7 @@ package android.window; +import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; import android.os.IBinder; @@ -48,4 +49,20 @@ oneway interface ITaskFragmentOrganizer { * {@link TaskFragmentOrganizer#putExceptionInBundle}. */ void onTaskFragmentError(in IBinder errorCallbackToken, in Bundle exceptionBundle); + + /** + * Called when an Activity is reparented to the Task with organized TaskFragment. For example, + * when an Activity enters and then exits Picture-in-picture, it will be reparented back to its + * orginial Task. In this case, we need to notify the organizer so that it can check if the + * Activity matches any split rule. + * + * @param taskId The Task that the activity is reparented to. + * @param activityIntent The intent that the activity is original launched with. + * @param activityToken If the activity belongs to the same process as the organizer, this + * will be the actual activity token; if the activity belongs to a + * different process, the server will generate a temporary token that + * the organizer can use to reparent the activity through + * {@link WindowContainerTransaction} if needed. + */ + void onActivityReparentToTask(int taskId, in Intent activityIntent, in IBinder activityToken); } diff --git a/core/java/android/window/ITaskOrganizerController.aidl b/core/java/android/window/ITaskOrganizerController.aidl index 172456e4d0fa..e6bb1f64ad86 100644 --- a/core/java/android/window/ITaskOrganizerController.aidl +++ b/core/java/android/window/ITaskOrganizerController.aidl @@ -69,4 +69,14 @@ interface ITaskOrganizerController { /** Updates a state of camera compat control for stretched issues in the viewfinder. */ void updateCameraCompatControlState(in WindowContainerToken task, int state); + + /** + * Controls whether ignore orientation request logic in {@link + * com.android.server.wm.DisplayArea} is disabled at runtime. + * + * @param isDisabled when {@code true}, the system always ignores the value of {@link + * com.android.server.wm.DisplayArea#getIgnoreOrientationRequest} and app + * requested orientation is respected. + */ + void setIsIgnoreOrientationRequestDisabled(boolean isDisabled); } diff --git a/core/java/android/window/TaskFragmentOrganizer.java b/core/java/android/window/TaskFragmentOrganizer.java index 1d1deacf0eb3..2ef49c3e2aac 100644 --- a/core/java/android/window/TaskFragmentOrganizer.java +++ b/core/java/android/window/TaskFragmentOrganizer.java @@ -19,6 +19,7 @@ package android.window; import android.annotation.CallSuper; import android.annotation.NonNull; import android.annotation.TestApi; +import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; import android.os.IBinder; @@ -154,6 +155,24 @@ public class TaskFragmentOrganizer extends WindowOrganizer { public void onTaskFragmentError( @NonNull IBinder errorCallbackToken, @NonNull Throwable exception) {} + /** + * Called when an Activity is reparented to the Task with organized TaskFragment. For example, + * when an Activity enters and then exits Picture-in-picture, it will be reparented back to its + * orginial Task. In this case, we need to notify the organizer so that it can check if the + * Activity matches any split rule. + * + * @param taskId The Task that the activity is reparented to. + * @param activityIntent The intent that the activity is original launched with. + * @param activityToken If the activity belongs to the same process as the organizer, this + * will be the actual activity token; if the activity belongs to a + * different process, the server will generate a temporary token that + * the organizer can use to reparent the activity through + * {@link WindowContainerTransaction} if needed. + * @hide + */ + public void onActivityReparentToTask(int taskId, @NonNull Intent activityIntent, + @NonNull IBinder activityToken) {} + @Override public void applyTransaction(@NonNull WindowContainerTransaction t) { t.setTaskFragmentOrganizer(mInterface); @@ -203,6 +222,14 @@ public class TaskFragmentOrganizer extends WindowOrganizer { errorCallbackToken, (Throwable) exceptionBundle.getSerializable(KEY_ERROR_CALLBACK_EXCEPTION))); } + + @Override + public void onActivityReparentToTask(int taskId, @NonNull Intent activityIntent, + @NonNull IBinder activityToken) { + mExecutor.execute( + () -> TaskFragmentOrganizer.this.onActivityReparentToTask( + taskId, activityIntent, activityToken)); + } }; private final TaskFragmentOrganizerToken mToken = new TaskFragmentOrganizerToken(mInterface); diff --git a/core/java/android/window/TaskOrganizer.java b/core/java/android/window/TaskOrganizer.java index 8d88f80ff483..bffd4e437dfa 100644 --- a/core/java/android/window/TaskOrganizer.java +++ b/core/java/android/window/TaskOrganizer.java @@ -253,6 +253,24 @@ public class TaskOrganizer extends WindowOrganizer { } /** + * Controls whether ignore orientation request logic in {@link + * com.android.server.wm.DisplayArea} is disabled at runtime. + * + * @param isDisabled when {@code true}, the system always ignores the value of {@link + * com.android.server.wm.DisplayArea#getIgnoreOrientationRequest} and app + * requested orientation is respected. + * @hide + */ + @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) + public void setIsIgnoreOrientationRequestDisabled(boolean isDisabled) { + try { + mTaskOrganizerController.setIsIgnoreOrientationRequestDisabled(isDisabled); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Gets the executor to run callbacks on. * @hide */ diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index 79dac19d0927..7dc039d44f95 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -650,6 +650,26 @@ public final class WindowContainerTransaction implements Parcelable { } /** + * Requests focus on the top running Activity in the given TaskFragment. This will only take + * effect if there is no focus, or if the current focus is in the same Task as the requested + * TaskFragment. + * @param fragmentToken client assigned unique token to create TaskFragment with specified in + * {@link TaskFragmentCreationParams#getFragmentToken()}. + * @hide + */ + @NonNull + public WindowContainerTransaction requestFocusOnTaskFragment(@NonNull IBinder fragmentToken) { + final HierarchyOp hierarchyOp = + new HierarchyOp.Builder( + HierarchyOp.HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT) + .setContainer(fragmentToken) + .build(); + mHierarchyOps.add(hierarchyOp); + return this; + + } + + /** * When this {@link WindowContainerTransaction} failed to finish on the server side, it will * trigger callback with this {@param errorCallbackToken}. * @param errorCallbackToken client provided token that will be passed back as parameter in @@ -1057,6 +1077,7 @@ public final class WindowContainerTransaction implements Parcelable { public static final int HIERARCHY_OP_TYPE_RESTORE_TRANSIENT_ORDER = 15; public static final int HIERARCHY_OP_TYPE_ADD_RECT_INSETS_PROVIDER = 16; public static final int HIERARCHY_OP_TYPE_REMOVE_INSETS_PROVIDER = 17; + public static final int HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT = 18; // The following key(s) are for use with mLaunchOptions: // When launching a task (eg. from recents), this is the taskId to be launched. @@ -1368,6 +1389,8 @@ public final class WindowContainerTransaction implements Parcelable { case HIERARCHY_OP_TYPE_REMOVE_INSETS_PROVIDER: return "{removeLocalInsetsProvider: container=" + mContainer + " insetsType=" + Arrays.toString(mInsetsTypes) + "}"; + case HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT: + return "{requestFocusOnTaskFragment: container=" + mContainer + "}"; default: return "{mType=" + mType + " container=" + mContainer + " reparent=" + mReparent + " mToTop=" + mToTop diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index b0be0df80b29..7db4243d3a83 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -19,8 +19,8 @@ import static android.window.ConfigurationHelper.freeTextLayoutCachesIfNeeded; import static android.window.ConfigurationHelper.isDifferentDisplay; import static android.window.ConfigurationHelper.shouldUpdateResources; +import android.annotation.AnyThread; import android.annotation.BinderThread; -import android.annotation.MainThread; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.IWindowToken; @@ -40,6 +40,7 @@ import android.view.IWindowManager; import android.view.WindowManager.LayoutParams.WindowType; import android.view.WindowManagerGlobal; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import java.lang.ref.WeakReference; @@ -68,6 +69,7 @@ public class WindowTokenClient extends IWindowToken.Stub { private IWindowManager mWms; + @GuardedBy("itself") private final Configuration mConfiguration = new Configuration(); private boolean mShouldDumpConfigForIme; @@ -111,8 +113,7 @@ public class WindowTokenClient extends IWindowToken.Stub { if (configuration == null) { return false; } - mHandler.runWithScissors(() -> onConfigurationChanged(configuration, displayId, - false /* shouldReportConfigChange */), 0 /* timeout */); + onConfigurationChanged(configuration, displayId, false /* shouldReportConfigChange */); mAttachToWindowContainer = true; return true; } catch (RemoteException e) { @@ -137,8 +138,7 @@ public class WindowTokenClient extends IWindowToken.Stub { if (configuration == null) { return false; } - mHandler.runWithScissors(() -> onConfigurationChanged(configuration, displayId, - false /* shouldReportConfigChange */), 0 /* timeout */); + onConfigurationChanged(configuration, displayId, false /* shouldReportConfigChange */); mAttachToWindowContainer = true; return true; } catch (RemoteException e) { @@ -199,8 +199,19 @@ public class WindowTokenClient extends IWindowToken.Stub { * * Similar to {@link #onConfigurationChanged(Configuration, int)}, but adds a flag to control * whether to dispatch configuration update or not. + * <p> + * Note that this method must be executed on the main thread if + * {@code shouldReportConfigChange} is {@code true}, which is usually from + * {@link IWindowToken#onConfigurationChanged(Configuration, int)} + * directly, while this method could be run on any thread if it is used to initialize + * Context's {@code Configuration} via {@link #attachToDisplayArea(int, int, Bundle)} + * or {@link #attachToDisplayContent(int)}. + * + * @param shouldReportConfigChange {@code true} to indicate that the {@code Configuration} + * should be dispatched to listeners. + * */ - @MainThread + @AnyThread @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) public void onConfigurationChanged(Configuration newConfig, int newDisplayId, boolean shouldReportConfigChange) { @@ -208,18 +219,29 @@ public class WindowTokenClient extends IWindowToken.Stub { if (context == null) { return; } - final boolean displayChanged = isDifferentDisplay(context.getDisplayId(), newDisplayId); - final boolean shouldUpdateResources = shouldUpdateResources(this, mConfiguration, - newConfig, newConfig /* overrideConfig */, displayChanged, - null /* configChanged */); + final boolean displayChanged; + final boolean shouldUpdateResources; + final int diff; + final Configuration currentConfig; + + synchronized (mConfiguration) { + displayChanged = isDifferentDisplay(context.getDisplayId(), newDisplayId); + shouldUpdateResources = shouldUpdateResources(this, mConfiguration, + newConfig, newConfig /* overrideConfig */, displayChanged, + null /* configChanged */); + diff = mConfiguration.diffPublicOnly(newConfig); + currentConfig = mShouldDumpConfigForIme ? new Configuration(mConfiguration) : null; + if (shouldUpdateResources) { + mConfiguration.setTo(newConfig); + } + } if (!shouldUpdateResources && mShouldDumpConfigForIme) { Log.d(TAG, "Configuration not dispatch to IME because configuration is up" + " to date. Current config=" + context.getResources().getConfiguration() - + ", reported config=" + mConfiguration + + ", reported config=" + currentConfig + ", updated config=" + newConfig); } - if (shouldUpdateResources) { // TODO(ag/9789103): update resource manager logic to track non-activity tokens mResourcesManager.updateResourcesForActivity(this, newConfig, newDisplayId); @@ -229,7 +251,7 @@ public class WindowTokenClient extends IWindowToken.Stub { windowContext.dispatchConfigurationChanged(newConfig); } - final int diff = mConfiguration.diffPublicOnly(newConfig); + if (shouldReportConfigChange && diff != 0 && context instanceof WindowProviderService) { final WindowProviderService windowProviderService = (WindowProviderService) context; @@ -244,11 +266,10 @@ public class WindowTokenClient extends IWindowToken.Stub { Log.d(TAG, "Configuration not dispatch to IME because configuration has no " + " public difference with updated config. " + " Current config=" + context.getResources().getConfiguration() - + ", reported config=" + mConfiguration + + ", reported config=" + currentConfig + ", updated config=" + newConfig); } } - mConfiguration.setTo(newConfig); } if (displayChanged) { context.updateDisplay(newDisplayId); diff --git a/core/java/com/android/internal/app/AbstractResolverComparator.java b/core/java/com/android/internal/app/AbstractResolverComparator.java index 42fc7bd6e6fc..975954035c17 100644 --- a/core/java/com/android/internal/app/AbstractResolverComparator.java +++ b/core/java/com/android/internal/app/AbstractResolverComparator.java @@ -228,12 +228,6 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC */ abstract float getScore(ComponentName name); - /** - * Returns the list of top K component names which have highest - * {@link #getScore(ComponentName)} - */ - abstract List<ComponentName> getTopComponentNames(int topK); - /** Handles result message sent to mHandler. */ abstract void handleResultMessage(Message message); diff --git a/core/java/com/android/internal/app/AppPredictionServiceResolverComparator.java b/core/java/com/android/internal/app/AppPredictionServiceResolverComparator.java index bc9eff04636d..b19ac2fec640 100644 --- a/core/java/com/android/internal/app/AppPredictionServiceResolverComparator.java +++ b/core/java/com/android/internal/app/AppPredictionServiceResolverComparator.java @@ -18,6 +18,7 @@ package com.android.internal.app; import static android.app.prediction.AppTargetEvent.ACTION_LAUNCH; +import android.annotation.Nullable; import android.app.prediction.AppPredictor; import android.app.prediction.AppTarget; import android.app.prediction.AppTargetEvent; @@ -33,12 +34,11 @@ import android.util.Log; import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.Executors; -import java.util.stream.Collectors; /** * Uses an {@link AppPredictor} to sort Resolver targets. If the AppPredictionService appears to be @@ -58,7 +58,9 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator private final String mReferrerPackage; // If this is non-null (and this is not destroyed), it means APS is disabled and we should fall // back to using the ResolverRankerService. + // TODO: responsibility for this fallback behavior can live outside of the AppPrediction client. private ResolverRankerServiceResolverComparator mResolverRankerService; + private AppPredictionServiceComparatorModel mComparatorModel; AppPredictionServiceResolverComparator( Context context, @@ -74,25 +76,12 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator mUser = user; mReferrerPackage = referrerPackage; setChooserActivityLogger(chooserActivityLogger); + mComparatorModel = buildUpdatedModel(); } @Override int compare(ResolveInfo lhs, ResolveInfo rhs) { - if (mResolverRankerService != null) { - return mResolverRankerService.compare(lhs, rhs); - } - Integer lhsRank = mTargetRanks.get(new ComponentName(lhs.activityInfo.packageName, - lhs.activityInfo.name)); - Integer rhsRank = mTargetRanks.get(new ComponentName(rhs.activityInfo.packageName, - rhs.activityInfo.name)); - if (lhsRank == null && rhsRank == null) { - return 0; - } else if (lhsRank == null) { - return -1; - } else if (rhsRank == null) { - return 1; - } - return lhsRank - rhsRank; + return mComparatorModel.getComparator().compare(lhs, rhs); } @Override @@ -121,6 +110,7 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator mContext, mIntent, mReferrerPackage, () -> mHandler.sendEmptyMessage(RANKER_SERVICE_RESULT), getChooserActivityLogger()); + mComparatorModel = buildUpdatedModel(); mResolverRankerService.compute(targets); } else { Log.i(TAG, "AppPredictionService response received"); @@ -163,6 +153,7 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator mTargetRanks.put(componentName, i); Log.i(TAG, "handleSortedAppTargets, sortedAppTargets #" + i + ": " + componentName); } + mComparatorModel = buildUpdatedModel(); } private boolean checkAppTargetRankValid(List<AppTarget> sortedAppTargets) { @@ -176,43 +167,12 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator @Override float getScore(ComponentName name) { - if (mResolverRankerService != null) { - return mResolverRankerService.getScore(name); - } - Integer rank = mTargetRanks.get(name); - if (rank == null) { - Log.w(TAG, "Score requested for unknown component. Did you call compute yet?"); - return 0f; - } - int consecutiveSumOfRanks = (mTargetRanks.size() - 1) * (mTargetRanks.size()) / 2; - return 1.0f - (((float) rank) / consecutiveSumOfRanks); - } - - @Override - List<ComponentName> getTopComponentNames(int topK) { - if (mResolverRankerService != null) { - return mResolverRankerService.getTopComponentNames(topK); - } - return mTargetRanks.entrySet().stream() - .sorted(Entry.comparingByValue()) - .limit(topK) - .map(Entry::getKey) - .collect(Collectors.toList()); + return mComparatorModel.getScore(name); } @Override void updateModel(ComponentName componentName) { - if (mResolverRankerService != null) { - mResolverRankerService.updateModel(componentName); - return; - } - mAppPredictor.notifyAppTargetEvent( - new AppTargetEvent.Builder( - new AppTarget.Builder( - new AppTargetId(componentName.toString()), - componentName.getPackageName(), mUser) - .setClassName(componentName.getClassName()).build(), - ACTION_LAUNCH).build()); + mComparatorModel.notifyOnTargetSelected(componentName); } @Override @@ -220,6 +180,97 @@ class AppPredictionServiceResolverComparator extends AbstractResolverComparator if (mResolverRankerService != null) { mResolverRankerService.destroy(); mResolverRankerService = null; + mComparatorModel = buildUpdatedModel(); + } + } + + /** + * Re-construct an {@code AppPredictionServiceComparatorModel} to replace the current model + * instance (if any) using the up-to-date {@code AppPredictionServiceResolverComparator} ivar + * values. + * + * TODO: each time we replace the model instance, we're either updating the model to use + * adjusted data (which is appropriate), or we're providing a (late) value for one of our ivars + * that wasn't available the last time the model was updated. For those latter cases, we should + * just avoid creating the model altogether until we have all the prerequisites we'll need. Then + * we can probably simplify the logic in {@code AppPredictionServiceComparatorModel} since we + * won't need to handle edge cases when the model data isn't fully prepared. + * (In some cases, these kinds of "updates" might interleave -- e.g., we might have finished + * initializing the first time and now want to adjust some data, but still need to wait for + * changes to propagate to the other ivars before rebuilding the model.) + */ + private AppPredictionServiceComparatorModel buildUpdatedModel() { + return new AppPredictionServiceComparatorModel( + mAppPredictor, mResolverRankerService, mUser, mTargetRanks); + } + + // TODO: Finish separating behaviors of AbstractResolverComparator, then (probably) make this a + // standalone class once clients are written in terms of ResolverComparatorModel. + static class AppPredictionServiceComparatorModel implements ResolverComparatorModel { + private final AppPredictor mAppPredictor; + private final ResolverRankerServiceResolverComparator mResolverRankerService; + private final UserHandle mUser; + private final Map<ComponentName, Integer> mTargetRanks; // Treat as immutable. + + AppPredictionServiceComparatorModel( + AppPredictor appPredictor, + @Nullable ResolverRankerServiceResolverComparator resolverRankerService, + UserHandle user, + Map<ComponentName, Integer> targetRanks) { + mAppPredictor = appPredictor; + mResolverRankerService = resolverRankerService; + mUser = user; + mTargetRanks = targetRanks; + } + + @Override + public Comparator<ResolveInfo> getComparator() { + return (lhs, rhs) -> { + if (mResolverRankerService != null) { + return mResolverRankerService.compare(lhs, rhs); + } + Integer lhsRank = mTargetRanks.get(new ComponentName(lhs.activityInfo.packageName, + lhs.activityInfo.name)); + Integer rhsRank = mTargetRanks.get(new ComponentName(rhs.activityInfo.packageName, + rhs.activityInfo.name)); + if (lhsRank == null && rhsRank == null) { + return 0; + } else if (lhsRank == null) { + return -1; + } else if (rhsRank == null) { + return 1; + } + return lhsRank - rhsRank; + }; + } + + @Override + public float getScore(ComponentName name) { + if (mResolverRankerService != null) { + return mResolverRankerService.getScore(name); + } + Integer rank = mTargetRanks.get(name); + if (rank == null) { + Log.w(TAG, "Score requested for unknown component. Did you call compute yet?"); + return 0f; + } + int consecutiveSumOfRanks = (mTargetRanks.size() - 1) * (mTargetRanks.size()) / 2; + return 1.0f - (((float) rank) / consecutiveSumOfRanks); + } + + @Override + public void notifyOnTargetSelected(ComponentName componentName) { + if (mResolverRankerService != null) { + mResolverRankerService.updateModel(componentName); + return; + } + mAppPredictor.notifyAppTargetEvent( + new AppTargetEvent.Builder( + new AppTarget.Builder( + new AppTargetId(componentName.toString()), + componentName.getPackageName(), mUser) + .setClassName(componentName.getClassName()).build(), + ACTION_LAUNCH).build()); } } } diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 49ee91c4c2a7..3cb39e725214 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -194,9 +194,6 @@ public class ChooserActivity extends ResolverActivity implements private static final String PLURALS_COUNT = "count"; private static final String PLURALS_FILE_NAME = "file_name"; - @VisibleForTesting - public static final int LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS = 250; - private boolean mIsAppPredictorComponentAvailable; private Map<ChooserTarget, AppTarget> mDirectShareAppTargetCache; private Map<ChooserTarget, ShortcutInfo> mDirectShareShortcutInfoCache; @@ -248,6 +245,13 @@ public class ChooserActivity extends ResolverActivity implements SystemUiDeviceConfigFlags.IS_NEARBY_SHARE_FIRST_TARGET_IN_RANKED_APP, DEFAULT_IS_NEARBY_SHARE_FIRST_TARGET_IN_RANKED_APP); + private static final int DEFAULT_LIST_VIEW_UPDATE_DELAY_MS = 250; + + @VisibleForTesting + int mListViewUpdateDelayMs = DeviceConfig.getInt(DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.SHARESHEET_LIST_VIEW_UPDATE_DELAY, + DEFAULT_LIST_VIEW_UPDATE_DELAY_MS); + private Bundle mReplacementExtras; private IntentSender mChosenComponentSender; private IntentSender mRefinementIntentSender; @@ -2624,7 +2628,7 @@ public class ChooserActivity extends ResolverActivity implements Message msg = Message.obtain(); msg.what = ChooserHandler.LIST_VIEW_UPDATE_MESSAGE; msg.obj = userHandle; - mChooserHandler.sendMessageDelayed(msg, LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + mChooserHandler.sendMessageDelayed(msg, mListViewUpdateDelayMs); } @Override diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index 52d54cd1f717..681693b1dbad 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -284,4 +284,9 @@ interface IVoiceInteractionManagerService { * Stops to listen the status of visible activity. */ void stopListeningVisibleActivityChanged(in IBinder token); + + /** + * Notifies when the session window is shown or hidden. + */ + void setSessionWindowVisible(in IBinder token, boolean visible); } diff --git a/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl index bc757e24c852..6e409885fa13 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl @@ -30,6 +30,11 @@ void onVoiceSessionHidden(); /** + * Called when a voice session window is shown/hidden. + */ + void onVoiceSessionWindowVisibilityChanged(boolean visible); + + /** * Called when UI hints were received. */ void onSetUiHints(in Bundle args); diff --git a/core/java/com/android/internal/app/ResolverComparatorModel.java b/core/java/com/android/internal/app/ResolverComparatorModel.java new file mode 100644 index 000000000000..3e8f64bf4ed3 --- /dev/null +++ b/core/java/com/android/internal/app/ResolverComparatorModel.java @@ -0,0 +1,57 @@ +/* + * Copyright 2022 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.app; + +import android.content.ComponentName; +import android.content.pm.ResolveInfo; + +import java.util.Comparator; +import java.util.List; + +/** + * A ranking model for resolver targets, providing ordering and (optionally) numerical scoring. + * + * As required by the {@link Comparator} contract, objects returned by {@code getComparator()} must + * apply a total ordering on its inputs consistent across all calls to {@code Comparator#compare()}. + * Other query methods and ranking feedback should refer to that same ordering, so implementors are + * generally advised to "lock in" an immutable snapshot of their model data when this object is + * initialized (preferring to replace the entire {@code ResolverComparatorModel} instance if the + * backing data needs to be updated in the future). + */ +interface ResolverComparatorModel { + /** + * Get a {@code Comparator} that can be used to sort {@code ResolveInfo} targets according to + * the model ranking. + */ + Comparator<ResolveInfo> getComparator(); + + /** + * Get the numerical score, if any, that the model assigns to the component with the specified + * {@code name}. Scores range from zero to one, with one representing the highest possible + * likelihood that the user will select that component as the target. Implementations that don't + * assign numerical scores are <em>recommended</em> to return a value of 0 for all components. + */ + float getScore(ComponentName name); + + /** + * Notify the model that the user selected a target. (Models may log this information, use it as + * a feedback signal for their ranking, etc.) Because the data in this + * {@code ResolverComparatorModel} instance is immutable, clients will need to get an up-to-date + * instance in order to see any changes in the ranking that might result from this feedback. + */ + void notifyOnTargetSelected(ComponentName componentName); +} diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java index ac9b2d8a8d8f..0a07e0a04a40 100644 --- a/core/java/com/android/internal/app/ResolverListAdapter.java +++ b/core/java/com/android/internal/app/ResolverListAdapter.java @@ -155,14 +155,6 @@ public class ResolverListAdapter extends BaseAdapter { return mResolverListController.getScore(componentName); } - /** - * Returns the list of top K component names which have highest - * {@link #getScore(DisplayResolveInfo)} - */ - public List<ComponentName> getTopComponentNames(int topK) { - return mResolverListController.getTopComponentNames(topK); - } - public void updateModel(ComponentName componentName) { mResolverListController.updateModel(componentName); } @@ -177,107 +169,212 @@ public class ResolverListAdapter extends BaseAdapter { } /** - * Rebuild the list of resolvers. In some cases some parts will need some asynchronous work - * to complete. + * Rebuild the list of resolvers. When rebuilding is complete, queue the {@code onPostListReady} + * callback on the main handler with {@code rebuildCompleted} true. + * + * In some cases some parts will need some asynchronous work to complete. Then this will first + * immediately queue {@code onPostListReady} (on the main handler) with {@code rebuildCompleted} + * false; only when the asynchronous work completes will this then go on to queue another + * {@code onPostListReady} callback with {@code rebuildCompleted} true. * - * The {@code doPostProcessing } parameter is used to specify whether to update the UI and - * load additional targets (e.g. direct share) after the list has been rebuilt. This is used - * in the case where we want to load the inactive profile's resolved apps to know the + * The {@code doPostProcessing} parameter is used to specify whether to update the UI and + * load additional targets (e.g. direct share) after the list has been rebuilt. We may choose + * to skip that step if we're only loading the inactive profile's resolved apps to know the * number of targets. * - * @return Whether or not the list building is completed. + * @return Whether the list building was completed synchronously. If not, we'll queue the + * {@code onPostListReady} callback first with {@code rebuildCompleted} false, and then again + * with {@code rebuildCompleted} true at the end of some newly-launched asynchronous work. + * Otherwise the callback is only queued once, with {@code rebuildCompleted} true. */ protected boolean rebuildList(boolean doPostProcessing) { - List<ResolvedComponentInfo> currentResolveList = null; - // Clear the value of mOtherProfile from previous call. - mOtherProfile = null; - mLastChosen = null; - mLastChosenPosition = -1; mDisplayList.clear(); mIsTabLoaded = false; + mLastChosenPosition = -1; + + List<ResolvedComponentInfo> currentResolveList = getInitialRebuiltResolveList(); + + /* TODO: this seems like unnecessary extra complexity; why do we need to do this "primary" + * (i.e. "eligibility") filtering before evaluating the "other profile" special-treatment, + * but the "secondary" (i.e. "priority") filtering after? Are there in fact cases where the + * eligibility conditions will filter out a result that would've otherwise gotten the "other + * profile" treatment? Or, are there cases where the priority conditions *would* filter out + * a result, but we *want* that result to get the "other profile" treatment, so we only + * filter *after* evaluating the special-treatment conditions? If the answer to either is + * "no," then the filtering steps can be consolidated. (And that also makes the "unfiltered + * list" bookkeeping a little cleaner.) + */ + mUnfilteredResolveList = performPrimaryResolveListFiltering(currentResolveList); + // So far we only support a single other profile at a time. + // The first one we see gets special treatment. + ResolvedComponentInfo otherProfileInfo = + getFirstNonCurrentUserResolvedComponentInfo(currentResolveList); + updateOtherProfileTreatment(otherProfileInfo); + if (otherProfileInfo != null) { + currentResolveList.remove(otherProfileInfo); + /* TODO: the previous line removed the "other profile info" item from + * mUnfilteredResolveList *ONLY IF* that variable is an alias for the same List instance + * as currentResolveList (i.e., if no items were filtered out as the result of the + * earlier "primary" filtering). It seems wrong for our behavior to depend on that. + * Should we: + * A. replicate the above removal to mUnfilteredResolveList (which is idempotent, so we + * don't even have to check whether they're aliases); or + * B. break the alias relationship by copying currentResolveList to a new + * mUnfilteredResolveList instance if necessary before removing otherProfileInfo? + * In other words: do we *want* otherProfileInfo in the "unfiltered" results? Either + * way, we'll need one of the changes suggested above. + */ + } + + // If no results have yet been filtered, mUnfilteredResolveList is an alias for the same + // List instance as currentResolveList. Then we need to make a copy to store as the + // mUnfilteredResolveList if we go on to filter any more items. Otherwise we've already + // copied the original unfiltered items to a separate List instance and can now filter + // the remainder in-place without any further bookkeeping. + boolean needsCopyOfUnfiltered = (mUnfilteredResolveList == currentResolveList); + List<ResolvedComponentInfo> originalList = performSecondaryResolveListFiltering( + currentResolveList, needsCopyOfUnfiltered); + if (originalList != null) { + // Only need the originalList value if there was a modification (otherwise it's null + // and shouldn't overwrite mUnfilteredResolveList). + mUnfilteredResolveList = originalList; + } + + + return finishRebuildingListWithFilteredResults(currentResolveList, doPostProcessing); + } + + /** + * Get the full (unfiltered) set of {@code ResolvedComponentInfo} records for all resolvers + * to be considered in a newly-rebuilt list. This list will be filtered and ranked before the + * rebuild is complete. + */ + List<ResolvedComponentInfo> getInitialRebuiltResolveList() { if (mBaseResolveList != null) { - currentResolveList = mUnfilteredResolveList = new ArrayList<>(); + List<ResolvedComponentInfo> currentResolveList = new ArrayList<>(); mResolverListController.addResolveListDedupe(currentResolveList, mResolverListCommunicator.getTargetIntent(), mBaseResolveList); + return currentResolveList; } else { - currentResolveList = mUnfilteredResolveList = - mResolverListController.getResolversForIntent( + return mResolverListController.getResolversForIntent( /* shouldGetResolvedFilter= */ true, mResolverListCommunicator.shouldGetActivityMetadata(), mIntents); - if (currentResolveList == null) { - processSortedList(currentResolveList, doPostProcessing); - return true; - } - List<ResolvedComponentInfo> originalList = - mResolverListController.filterIneligibleActivities(currentResolveList, - true); - if (originalList != null) { - mUnfilteredResolveList = originalList; - } } + } - // So far we only support a single other profile at a time. - // The first one we see gets special treatment. - for (ResolvedComponentInfo info : currentResolveList) { - ResolveInfo resolveInfo = info.getResolveInfoAt(0); - if (resolveInfo.targetUserId != UserHandle.USER_CURRENT) { - Intent pOrigIntent = mResolverListCommunicator.getReplacementIntent( - resolveInfo.activityInfo, - info.getIntentAt(0)); - Intent replacementIntent = mResolverListCommunicator.getReplacementIntent( - resolveInfo.activityInfo, - mResolverListCommunicator.getTargetIntent()); - mOtherProfile = new DisplayResolveInfo(info.getIntentAt(0), - resolveInfo, - resolveInfo.loadLabel(mPm), - resolveInfo.loadLabel(mPm), - pOrigIntent != null ? pOrigIntent : replacementIntent, - makePresentationGetter(resolveInfo)); - currentResolveList.remove(info); - break; - } + /** + * Remove ineligible activities from {@code currentResolveList} (if non-null), in-place. More + * broadly, filtering logic should apply in the "primary" stage if it should preclude items from + * receiving the "other profile" special-treatment described in {@code rebuildList()}. + * + * @return A copy of the original {@code currentResolveList}, if any items were removed, or a + * (possibly null) reference to the original list otherwise. (That is, this always returns a + * list of all the unfiltered items, but if no items were filtered, it's just an alias for the + * same list that was passed in). + */ + @Nullable + List<ResolvedComponentInfo> performPrimaryResolveListFiltering( + @Nullable List<ResolvedComponentInfo> currentResolveList) { + /* TODO: mBaseResolveList appears to be(?) some kind of configured mode. Why is it not + * subject to filterIneligibleActivities, even though all the other logic still applies + * (including "secondary" filtering)? (This also relates to the earlier question; do we + * believe there's an item that would be eligible for "other profile" special treatment, + * except we want to filter it out as ineligible... but only if we're not in + * "mBaseResolveList mode"? */ + if ((mBaseResolveList != null) || (currentResolveList == null)) { + return currentResolveList; + } + + List<ResolvedComponentInfo> originalList = + mResolverListController.filterIneligibleActivities(currentResolveList, true); + return (originalList == null) ? currentResolveList : originalList; + } + + /** + * Remove low-priority activities from {@code currentResolveList} (if non-null), in place. More + * broadly, filtering logic should apply in the "secondary" stage to prevent items from + * appearing in the rebuilt-list results, while still considering those items for the "other + * profile" special-treatment described in {@code rebuildList()}. + * + * @return the same (possibly null) List reference as {@code currentResolveList} if the list is + * unmodified as a result of filtering; or, if some item(s) were removed, then either a copy of + * the original {@code currentResolveList} (if {@code returnCopyOfOriginalListIfModified} is + * true), or null (otherwise). + */ + @Nullable + List<ResolvedComponentInfo> performSecondaryResolveListFiltering( + @Nullable List<ResolvedComponentInfo> currentResolveList, + boolean returnCopyOfOriginalListIfModified) { + if ((currentResolveList == null) || currentResolveList.isEmpty()) { + return currentResolveList; } + return mResolverListController.filterLowPriority( + currentResolveList, returnCopyOfOriginalListIfModified); + } + + /** + * Update the special "other profile" UI treatment based on the components resolved for a + * newly-built list. + * + * @param otherProfileInfo the first {@code ResolvedComponentInfo} specifying a + * {@code targetUserId} other than {@code USER_CURRENT}, or null if no such component info was + * found in the process of rebuilding the list (or if any such candidates were already removed + * due to "primary filtering"). + */ + void updateOtherProfileTreatment(@Nullable ResolvedComponentInfo otherProfileInfo) { + mLastChosen = null; - if (mOtherProfile == null) { + if (otherProfileInfo != null) { + mOtherProfile = makeOtherProfileDisplayResolveInfo( + mContext, otherProfileInfo, mPm, mResolverListCommunicator, mIconDpi); + } else { + mOtherProfile = null; try { mLastChosen = mResolverListController.getLastChosen(); + // TODO: does this also somehow need to update mLastChosenPosition? If so, maybe + // the current method should also take responsibility for re-initializing + // mLastChosenPosition, where it's currently done at the start of rebuildList()? + // (Why is this related to the presence of mOtherProfile in fhe first place?) } catch (RemoteException re) { Log.d(TAG, "Error calling getLastChosenActivity\n" + re); } } + } - setPlaceholderCount(0); - int n; - if ((currentResolveList != null) && ((n = currentResolveList.size()) > 0)) { - // We only care about fixing the unfilteredList if the current resolve list and - // current resolve list are currently the same. - List<ResolvedComponentInfo> originalList = - mResolverListController.filterLowPriority(currentResolveList, - mUnfilteredResolveList == currentResolveList); - if (originalList != null) { - mUnfilteredResolveList = originalList; - } - - if (currentResolveList.size() > 1) { - int placeholderCount = currentResolveList.size(); - if (mResolverListCommunicator.useLayoutWithDefault()) { - --placeholderCount; - } - setPlaceholderCount(placeholderCount); - createSortingTask(doPostProcessing).execute(currentResolveList); - postListReadyRunnable(doPostProcessing, /* rebuildCompleted */ false); - return false; - } else { - processSortedList(currentResolveList, doPostProcessing); - return true; - } - } else { - processSortedList(currentResolveList, doPostProcessing); + /** + * Prepare the appropriate placeholders to eventually display the final set of resolved + * components in a newly-rebuilt list, and spawn an asynchronous sorting task if necessary. + * This eventually results in a {@code onPostListReady} callback with {@code rebuildCompleted} + * true; if any asynchronous work is required, that will first be preceded by a separate + * occurrence of the callback with {@code rebuildCompleted} false (once there are placeholders + * set up to represent the pending asynchronous results). + * @return Whether we were able to do all the work to prepare the list for display + * synchronously; if false, there will eventually be two separate {@code onPostListReady} + * callbacks, first with placeholders to represent pending asynchronous results, then later when + * the results are ready for presentation. + */ + boolean finishRebuildingListWithFilteredResults( + @Nullable List<ResolvedComponentInfo> filteredResolveList, boolean doPostProcessing) { + if (filteredResolveList == null || filteredResolveList.size() < 2) { + // No asynchronous work to do. + setPlaceholderCount(0); + processSortedList(filteredResolveList, doPostProcessing); return true; } + + int placeholderCount = filteredResolveList.size(); + if (mResolverListCommunicator.useLayoutWithDefault()) { + --placeholderCount; + } + setPlaceholderCount(placeholderCount); + + // Send an "incomplete" list-ready while the async task is running. + postListReadyRunnable(doPostProcessing, /* rebuildCompleted */ false); + createSortingTask(doPostProcessing).execute(filteredResolveList); + return false; } AsyncTask<List<ResolvedComponentInfo>, @@ -644,6 +741,59 @@ public class ResolverListAdapter extends BaseAdapter { } /** + * Find the first element in a list of {@code ResolvedComponentInfo} objects whose + * {@code ResolveInfo} specifies a {@code targetUserId} other than the current user. + * @return the first ResolvedComponentInfo targeting a non-current user, or null if there are + * none (or if the list itself is null). + */ + private static ResolvedComponentInfo getFirstNonCurrentUserResolvedComponentInfo( + @Nullable List<ResolvedComponentInfo> resolveList) { + if (resolveList == null) { + return null; + } + + for (ResolvedComponentInfo info : resolveList) { + ResolveInfo resolveInfo = info.getResolveInfoAt(0); + if (resolveInfo.targetUserId != UserHandle.USER_CURRENT) { + return info; + } + } + return null; + } + + /** + * Set up a {@code DisplayResolveInfo} to provide "special treatment" for the first "other" + * profile in the resolve list (i.e., the first non-current profile to appear as the target user + * of an element in the resolve list). + */ + private static DisplayResolveInfo makeOtherProfileDisplayResolveInfo( + Context context, + ResolvedComponentInfo resolvedComponentInfo, + PackageManager pm, + ResolverListCommunicator resolverListCommunicator, + int iconDpi) { + ResolveInfo resolveInfo = resolvedComponentInfo.getResolveInfoAt(0); + + Intent pOrigIntent = resolverListCommunicator.getReplacementIntent( + resolveInfo.activityInfo, + resolvedComponentInfo.getIntentAt(0)); + Intent replacementIntent = resolverListCommunicator.getReplacementIntent( + resolveInfo.activityInfo, + resolverListCommunicator.getTargetIntent()); + + ResolveInfoPresentationGetter presentationGetter = + new ResolveInfoPresentationGetter(context, iconDpi, resolveInfo); + + return new DisplayResolveInfo( + resolvedComponentInfo.getIntentAt(0), + resolveInfo, + resolveInfo.loadLabel(pm), + resolveInfo.loadLabel(pm), + pOrigIntent != null ? pOrigIntent : replacementIntent, + presentationGetter); + } + + /** * Necessary methods to communicate between {@link ResolverListAdapter} * and {@link ResolverActivity}. */ diff --git a/core/java/com/android/internal/app/ResolverListController.java b/core/java/com/android/internal/app/ResolverListController.java index 9a95e6411fa4..27573631b2ce 100644 --- a/core/java/com/android/internal/app/ResolverListController.java +++ b/core/java/com/android/internal/app/ResolverListController.java @@ -393,14 +393,6 @@ public class ResolverListController { return mResolverComparator.getScore(componentName); } - /** - * Returns the list of top K component names which have highest - * {@link #getScore(DisplayResolveInfo)} - */ - public List<ComponentName> getTopComponentNames(int topK) { - return mResolverComparator.getTopComponentNames(topK); - } - public void updateModel(ComponentName componentName) { mResolverComparator.updateModel(componentName); } diff --git a/core/java/com/android/internal/app/ResolverRankerServiceResolverComparator.java b/core/java/com/android/internal/app/ResolverRankerServiceResolverComparator.java index cb946c0dcf99..c5b21ac4da90 100644 --- a/core/java/com/android/internal/app/ResolverRankerServiceResolverComparator.java +++ b/core/java/com/android/internal/app/ResolverRankerServiceResolverComparator.java @@ -43,12 +43,12 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.text.Collator; import java.util.ArrayList; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; /** * Ranks and compares packages based on usage stats and uses the {@link ResolverRankerService}. @@ -83,6 +83,7 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator private ResolverRankerServiceConnection mConnection; private Context mContext; private CountDownLatch mConnectSignal; + private ResolverRankerServiceComparatorModel mComparatorModel; public ResolverRankerServiceResolverComparator(Context context, Intent intent, String referrerPackage, AfterCompute afterCompute, @@ -99,6 +100,8 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator mRankerServiceName = new ComponentName(mContext, this.getClass()); setCallBack(afterCompute); setChooserActivityLogger(chooserActivityLogger); + + mComparatorModel = buildUpdatedModel(); } @Override @@ -125,6 +128,7 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator } if (isUpdated) { mRankerServiceName = mResolvedRankerName; + mComparatorModel = buildUpdatedModel(); } } else { Log.e(TAG, "Sizes of sent and received ResolverTargets diff."); @@ -218,83 +222,25 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator } } predictSelectProbabilities(mTargets); + + mComparatorModel = buildUpdatedModel(); } @Override public int compare(ResolveInfo lhs, ResolveInfo rhs) { - if (mStats != null) { - final ResolverTarget lhsTarget = mTargetsDict.get(new ComponentName( - lhs.activityInfo.packageName, lhs.activityInfo.name)); - final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName( - rhs.activityInfo.packageName, rhs.activityInfo.name)); - - if (lhsTarget != null && rhsTarget != null) { - final int selectProbabilityDiff = Float.compare( - rhsTarget.getSelectProbability(), lhsTarget.getSelectProbability()); - - if (selectProbabilityDiff != 0) { - return selectProbabilityDiff > 0 ? 1 : -1; - } - } - } - - CharSequence sa = lhs.loadLabel(mPm); - if (sa == null) sa = lhs.activityInfo.name; - CharSequence sb = rhs.loadLabel(mPm); - if (sb == null) sb = rhs.activityInfo.name; - - return mCollator.compare(sa.toString().trim(), sb.toString().trim()); + return mComparatorModel.getComparator().compare(lhs, rhs); } @Override public float getScore(ComponentName name) { - final ResolverTarget target = mTargetsDict.get(name); - if (target != null) { - return target.getSelectProbability(); - } - return 0; - } - - @Override - List<ComponentName> getTopComponentNames(int topK) { - return mTargetsDict.entrySet().stream() - .sorted((o1, o2) -> -Float.compare(getScore(o1.getKey()), getScore(o2.getKey()))) - .limit(topK) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); + return mComparatorModel.getScore(name); } // update ranking model when the connection to it is valid. @Override public void updateModel(ComponentName componentName) { synchronized (mLock) { - if (mRanker != null) { - try { - int selectedPos = new ArrayList<ComponentName>(mTargetsDict.keySet()) - .indexOf(componentName); - if (selectedPos >= 0 && mTargets != null) { - final float selectedProbability = getScore(componentName); - int order = 0; - for (ResolverTarget target : mTargets) { - if (target.getSelectProbability() > selectedProbability) { - order++; - } - } - logMetrics(order); - mRanker.train(mTargets, selectedPos); - } else { - if (DEBUG) { - Log.d(TAG, "Selected a unknown component: " + componentName); - } - } - } catch (RemoteException e) { - Log.e(TAG, "Error in Train: " + e); - } - } else { - if (DEBUG) { - Log.d(TAG, "Ranker is null; skip updateModel."); - } - } + mComparatorModel.notifyOnTargetSelected(componentName); } } @@ -313,19 +259,6 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator } } - // records metrics for evaluation. - private void logMetrics(int selectedPos) { - if (mRankerServiceName != null) { - MetricsLogger metricsLogger = new MetricsLogger(); - LogMaker log = new LogMaker(MetricsEvent.ACTION_TARGET_SELECTED); - log.setComponentName(mRankerServiceName); - int isCategoryUsed = (mAnnotations == null) ? 0 : 1; - log.addTaggedData(MetricsEvent.FIELD_IS_CATEGORY_USED, isCategoryUsed); - log.addTaggedData(MetricsEvent.FIELD_RANKED_POSITION, selectedPos); - metricsLogger.write(log); - } - } - // connect to a ranking service. private void initRanker(Context context) { synchronized (mLock) { @@ -426,6 +359,7 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator } synchronized (mLock) { mRanker = IResolverRankerService.Stub.asInterface(service); + mComparatorModel = buildUpdatedModel(); mConnectSignal.countDown(); } } @@ -443,6 +377,7 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator public void destroy() { synchronized (mLock) { mRanker = null; + mComparatorModel = buildUpdatedModel(); } } } @@ -453,6 +388,7 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator mTargetsDict.clear(); mTargets = null; mRankerServiceName = new ComponentName(mContext, this.getClass()); + mComparatorModel = buildUpdatedModel(); mResolvedRankerName = null; initRanker(mContext); } @@ -508,4 +444,155 @@ class ResolverRankerServiceResolverComparator extends AbstractResolverComparator } return false; } + + /** + * Re-construct a {@code ResolverRankerServiceComparatorModel} to replace the current model + * instance (if any) using the up-to-date {@code ResolverRankerServiceResolverComparator} ivar + * values. + * + * TODO: each time we replace the model instance, we're either updating the model to use + * adjusted data (which is appropriate), or we're providing a (late) value for one of our ivars + * that wasn't available the last time the model was updated. For those latter cases, we should + * just avoid creating the model altogether until we have all the prerequisites we'll need. Then + * we can probably simplify the logic in {@code ResolverRankerServiceComparatorModel} since we + * won't need to handle edge cases when the model data isn't fully prepared. + * (In some cases, these kinds of "updates" might interleave -- e.g., we might have finished + * initializing the first time and now want to adjust some data, but still need to wait for + * changes to propagate to the other ivars before rebuilding the model.) + */ + private ResolverRankerServiceComparatorModel buildUpdatedModel() { + // TODO: we don't currently guarantee that the underlying target list/map won't be mutated, + // so the ResolverComparatorModel may provide inconsistent results. We should make immutable + // copies of the data (waiting for any necessary remaining data before creating the model). + return new ResolverRankerServiceComparatorModel( + mStats, + mTargetsDict, + mTargets, + mCollator, + mRanker, + mRankerServiceName, + (mAnnotations != null), + mPm); + } + + /** + * Implementation of a {@code ResolverComparatorModel} that provides the same ranking logic as + * the legacy {@code ResolverRankerServiceResolverComparator}, as a refactoring step toward + * removing the complex legacy API. + */ + static class ResolverRankerServiceComparatorModel implements ResolverComparatorModel { + private final Map<String, UsageStats> mStats; // Treat as immutable. + private final Map<ComponentName, ResolverTarget> mTargetsDict; // Treat as immutable. + private final List<ResolverTarget> mTargets; // Treat as immutable. + private final Collator mCollator; + private final IResolverRankerService mRanker; + private final ComponentName mRankerServiceName; + private final boolean mAnnotationsUsed; + private final PackageManager mPm; + + // TODO: it doesn't look like we should have to pass both targets and targetsDict, but it's + // not written in a way that makes it clear whether we can derive one from the other (at + // least in this constructor). + ResolverRankerServiceComparatorModel( + Map<String, UsageStats> stats, + Map<ComponentName, ResolverTarget> targetsDict, + List<ResolverTarget> targets, + Collator collator, + IResolverRankerService ranker, + ComponentName rankerServiceName, + boolean annotationsUsed, + PackageManager pm) { + mStats = stats; + mTargetsDict = targetsDict; + mTargets = targets; + mCollator = collator; + mRanker = ranker; + mRankerServiceName = rankerServiceName; + mAnnotationsUsed = annotationsUsed; + mPm = pm; + } + + @Override + public Comparator<ResolveInfo> getComparator() { + // TODO: doCompute() doesn't seem to be concerned about null-checking mStats. Is that + // a bug there, or do we have a way of knowing it will be non-null under certain + // conditions? + return (lhs, rhs) -> { + if (mStats != null) { + final ResolverTarget lhsTarget = mTargetsDict.get(new ComponentName( + lhs.activityInfo.packageName, lhs.activityInfo.name)); + final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName( + rhs.activityInfo.packageName, rhs.activityInfo.name)); + + if (lhsTarget != null && rhsTarget != null) { + final int selectProbabilityDiff = Float.compare( + rhsTarget.getSelectProbability(), lhsTarget.getSelectProbability()); + + if (selectProbabilityDiff != 0) { + return selectProbabilityDiff > 0 ? 1 : -1; + } + } + } + + CharSequence sa = lhs.loadLabel(mPm); + if (sa == null) sa = lhs.activityInfo.name; + CharSequence sb = rhs.loadLabel(mPm); + if (sb == null) sb = rhs.activityInfo.name; + + return mCollator.compare(sa.toString().trim(), sb.toString().trim()); + }; + } + + @Override + public float getScore(ComponentName name) { + final ResolverTarget target = mTargetsDict.get(name); + if (target != null) { + return target.getSelectProbability(); + } + return 0; + } + + @Override + public void notifyOnTargetSelected(ComponentName componentName) { + if (mRanker != null) { + try { + int selectedPos = new ArrayList<ComponentName>(mTargetsDict.keySet()) + .indexOf(componentName); + if (selectedPos >= 0 && mTargets != null) { + final float selectedProbability = getScore(componentName); + int order = 0; + for (ResolverTarget target : mTargets) { + if (target.getSelectProbability() > selectedProbability) { + order++; + } + } + logMetrics(order); + mRanker.train(mTargets, selectedPos); + } else { + if (DEBUG) { + Log.d(TAG, "Selected a unknown component: " + componentName); + } + } + } catch (RemoteException e) { + Log.e(TAG, "Error in Train: " + e); + } + } else { + if (DEBUG) { + Log.d(TAG, "Ranker is null; skip updateModel."); + } + } + } + + /** Records metrics for evaluation. */ + private void logMetrics(int selectedPos) { + if (mRankerServiceName != null) { + MetricsLogger metricsLogger = new MetricsLogger(); + LogMaker log = new LogMaker(MetricsEvent.ACTION_TARGET_SELECTED); + log.setComponentName(mRankerServiceName); + log.addTaggedData(MetricsEvent.FIELD_IS_CATEGORY_USED, mAnnotationsUsed); + log.addTaggedData(MetricsEvent.FIELD_RANKED_POSITION, selectedPos); + metricsLogger.write(log); + } + } + } } diff --git a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java index 18fde4794969..5fe111148c91 100644 --- a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java +++ b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java @@ -27,7 +27,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.Filter; import android.widget.Filterable; -import android.widget.FrameLayout; import android.widget.TextView; import com.android.internal.R; @@ -222,6 +221,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { convertView = mInflater.inflate( R.layout.app_language_picker_current_locale_item, parent, false); title = convertView.findViewById(R.id.language_picker_item); + addStateDescriptionIntoCurrentLocaleItem(convertView); } else { convertView = mInflater.inflate( R.layout.language_picker_item, parent, false); @@ -234,6 +234,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { if (!(convertView instanceof ViewGroup)) { convertView = mInflater.inflate( R.layout.app_language_picker_current_locale_item, parent, false); + addStateDescriptionIntoCurrentLocaleItem(convertView); } updateTextView( convertView, convertView.findViewById(R.id.language_picker_item), position); @@ -369,4 +370,9 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { : View.TEXT_DIRECTION_LTR); } } + + private void addStateDescriptionIntoCurrentLocaleItem(View root) { + String description = root.getContext().getResources().getString(R.string.checked); + root.setStateDescription(description); + } } diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index c94438e3cee8..ffb37529dd6e 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -520,6 +520,13 @@ public final class SystemUiDeviceConfigFlags { public static final String USE_UNBUNDLED_SHARESHEET = "use_unbundled_sharesheet"; /** + * (int) The delay (in ms) before refreshing the Sharesheet UI after a change to the share + * target data model. For more info see go/sharesheet-list-view-update-delay. + */ + public static final String SHARESHEET_LIST_VIEW_UPDATE_DELAY = + "sharesheet_list_view_update_delay"; + + /** * (string) Name of the default QR code scanner activity. On the eligible devices this activity * is provided by GMS core. */ diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java index a60b31078a86..563cf0414ab9 100644 --- a/core/java/com/android/internal/content/FileSystemProvider.java +++ b/core/java/com/android/internal/content/FileSystemProvider.java @@ -414,6 +414,12 @@ public abstract class FileSystemProvider extends DocumentsProvider { final File parent = getFileForDocId(parentDocumentId); final MatrixCursor result = new DirectoryCursor( resolveProjection(projection), parentDocumentId, parent); + + if (!filter.test(parent)) { + Log.w(TAG, "No permission to access parentDocumentId: " + parentDocumentId); + return result; + } + if (parent.isDirectory()) { for (File file : FileUtils.listFilesOrEmpty(parent)) { if (filter.test(file)) { diff --git a/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java b/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java index b2ab819eb8a5..0ee8ee7fb4c7 100644 --- a/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java +++ b/core/java/com/android/internal/inputmethod/RemoteAccessibilityInputConnection.java @@ -115,14 +115,6 @@ public final class RemoteAccessibilityInputConnection { @AnyThread public SurroundingText getSurroundingText( @IntRange(from = 0) int beforeLength, @IntRange(from = 0) int afterLength, int flags) { - if (beforeLength < 0) { - throw new IllegalArgumentException("beforeLength cannot be negative but was " - + beforeLength); - } - if (afterLength < 0) { - throw new IllegalArgumentException("afterLength cannot be negative but was " - + afterLength); - } if (mCancellationGroup.isCanceled()) { return null; } diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java index 4f51a5ba1bd1..825b486d0635 100644 --- a/core/java/com/android/internal/jank/FrameTracker.java +++ b/core/java/com/android/internal/jank/FrameTracker.java @@ -36,7 +36,6 @@ import android.os.Trace; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; -import android.util.StatsLog; import android.view.Choreographer; import android.view.FrameMetrics; import android.view.SurfaceControl; @@ -481,6 +480,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener int missedFramesCount = 0; int missedAppFramesCount = 0; int missedSfFramesCount = 0; + int maxSuccessiveMissedFramesCount = 0; + int successiveMissedFramesCount = 0; for (int i = 0; i < mJankInfos.size(); i++) { JankInfo info = mJankInfos.valueAt(i); @@ -510,6 +511,11 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener } if (missedFrame) { missedFramesCount++; + successiveMissedFramesCount++; + } else { + maxSuccessiveMissedFramesCount = Math.max( + maxSuccessiveMissedFramesCount, successiveMissedFramesCount); + successiveMissedFramesCount = 0; } // TODO (b/174755489): Early latch currently gets fired way too often, so we have // to ignore it for now. @@ -524,6 +530,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener } } } + maxSuccessiveMissedFramesCount = Math.max( + maxSuccessiveMissedFramesCount, successiveMissedFramesCount); // Log the frame stats as counters to make them easily accessible in traces. Trace.traceCounter(Trace.TRACE_TAG_APP, mSession.getName() + "#missedFrames", @@ -536,6 +544,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener totalFramesCount); Trace.traceCounter(Trace.TRACE_TAG_APP, mSession.getName() + "#maxFrameTimeMillis", (int) (maxFrameTimeNanos / NANOS_IN_MILLISECOND)); + Trace.traceCounter(Trace.TRACE_TAG_APP, mSession.getName() + "#maxSuccessiveMissedFrames", + maxSuccessiveMissedFramesCount); // Trigger perfetto if necessary. if (shouldTriggerPerfetto(missedFramesCount, (int) maxFrameTimeNanos)) { @@ -549,7 +559,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener missedFramesCount, maxFrameTimeNanos, /* will be 0 if mSurfaceOnly == true */ missedSfFramesCount, - missedAppFramesCount); + missedAppFramesCount, + maxSuccessiveMissedFramesCount); } if (DEBUG) { Log.i(TAG, "finish: CUJ=" + mSession.getName() @@ -558,7 +569,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener + " missedAppFrames=" + missedAppFramesCount + " missedSfFrames=" + missedSfFramesCount + " missedFrames=" + missedFramesCount - + " maxFrameTimeMillis=" + maxFrameTimeNanos / NANOS_IN_MILLISECOND); + + " maxFrameTimeMillis=" + maxFrameTimeNanos / NANOS_IN_MILLISECOND + + " maxSuccessiveMissedFramesCount=" + maxSuccessiveMissedFramesCount); } } @@ -694,8 +706,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener public static class StatsLogWrapper { public void write(int code, - int arg1, long arg2, long arg3, long arg4, long arg5, long arg6) { - FrameworkStatsLog.write(code, arg1, arg2, arg3, arg4, arg5, arg6); + int arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long arg7) { + FrameworkStatsLog.write(code, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } } diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 6424989c6b4f..1b52aa93a51d 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -28,6 +28,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_WIDGET; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_QUICK_SWITCH; +import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_LAUNCH_CAMERA; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PASSWORD_APPEAR; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PASSWORD_DISAPPEAR; import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PATTERN_APPEAR; @@ -189,7 +190,8 @@ public class InteractionJankMonitor { public static final int CUJ_SUW_LOADING_SCREEN_FOR_STATUS = 48; public static final int CUJ_SPLIT_SCREEN_ENTER = 49; public static final int CUJ_SPLIT_SCREEN_EXIT = 50; - public static final int CUJ_SPLIT_SCREEN_RESIZE = 51; + public static final int CUJ_LOCKSCREEN_LAUNCH_CAMERA = 51; // reserved. + public static final int CUJ_SPLIT_SCREEN_RESIZE = 52; private static final int NO_STATSD_LOGGING = -1; @@ -249,6 +251,7 @@ public class InteractionJankMonitor { UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_SCREEN_FOR_STATUS, UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_ENTER, UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_EXIT, + UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_LAUNCH_CAMERA, UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_RESIZE, }; @@ -321,6 +324,7 @@ public class InteractionJankMonitor { CUJ_SUW_LOADING_SCREEN_FOR_STATUS, CUJ_SPLIT_SCREEN_ENTER, CUJ_SPLIT_SCREEN_EXIT, + CUJ_LOCKSCREEN_LAUNCH_CAMERA, CUJ_SPLIT_SCREEN_RESIZE }) @Retention(RetentionPolicy.SOURCE) @@ -742,6 +746,8 @@ public class InteractionJankMonitor { return "SPLIT_SCREEN_ENTER"; case CUJ_SPLIT_SCREEN_EXIT: return "SPLIT_SCREEN_EXIT"; + case CUJ_LOCKSCREEN_LAUNCH_CAMERA: + return "CUJ_LOCKSCREEN_LAUNCH_CAMERA"; case CUJ_SPLIT_SCREEN_RESIZE: return "CUJ_SPLIT_SCREEN_RESIZE"; } diff --git a/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java b/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java new file mode 100644 index 000000000000..fc064ea1ff10 --- /dev/null +++ b/core/java/com/android/internal/policy/ForceShowNavBarSettingsObserver.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2022 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.policy; + +import android.content.ContentResolver; +import android.content.Context; +import android.database.ContentObserver; +import android.os.Handler; +import android.os.UserHandle; +import android.provider.Settings; + +/** + * A ContentObserver for listening {@link Settings.Secure#NAV_BAR_FORCE_VISIBLE} setting key. + * + * @hide + */ +public class ForceShowNavBarSettingsObserver extends ContentObserver { + private Context mContext; + private Runnable mOnChangeRunnable; + + public ForceShowNavBarSettingsObserver(Handler handler, Context context) { + super(handler); + mContext = context; + } + + public void setOnChangeRunnable(Runnable r) { + mOnChangeRunnable = r; + } + + /** + * Registers the observer. + */ + public void register() { + final ContentResolver r = mContext.getContentResolver(); + r.registerContentObserver( + Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_FORCE_VISIBLE), + false, this, UserHandle.USER_ALL); + } + + /** + * Unregisters the observer. + */ + public void unregister() { + mContext.getContentResolver().unregisterContentObserver(this); + } + + @Override + public void onChange(boolean selfChange) { + if (mOnChangeRunnable != null) { + mOnChangeRunnable.run(); + } + } + + /** + * Returns true only when it's in orce show navigation bar mode. Otherwise, return false. + */ + public boolean isEnabled() { + return Settings.Secure.getIntForUser(mContext.getContentResolver(), + Settings.Secure.NAV_BAR_FORCE_VISIBLE, 0, UserHandle.USER_CURRENT) == 1; + } +} diff --git a/core/java/com/android/internal/view/IInputMethodSession.aidl b/core/java/com/android/internal/view/IInputMethodSession.aidl index b9eb997b851b..d505c1995def 100644 --- a/core/java/com/android/internal/view/IInputMethodSession.aidl +++ b/core/java/com/android/internal/view/IInputMethodSession.aidl @@ -50,8 +50,6 @@ oneway interface IInputMethodSession { void updateCursorAnchorInfo(in CursorAnchorInfo cursorAnchorInfo); - void notifyImeHidden(); - void removeImeSurface(); void finishInput(); diff --git a/core/java/com/android/internal/widget/LocalImageResolver.java b/core/java/com/android/internal/widget/LocalImageResolver.java index c9953513a97a..b866723954b5 100644 --- a/core/java/com/android/internal/widget/LocalImageResolver.java +++ b/core/java/com/android/internal/widget/LocalImageResolver.java @@ -198,6 +198,11 @@ public class LocalImageResolver { } final Size size = info.getSize(); + if (size.getWidth() <= maxWidth && size.getHeight() <= maxHeight) { + // We don't want to upscale images needlessly. + return; + } + if (size.getWidth() > size.getHeight()) { if (size.getWidth() > maxWidth) { final int targetHeight = size.getHeight() * maxWidth / size.getWidth(); diff --git a/core/jni/android_content_res_ApkAssets.cpp b/core/jni/android_content_res_ApkAssets.cpp index fc12e174b55d..a8d72316036e 100644 --- a/core/jni/android_content_res_ApkAssets.cpp +++ b/core/jni/android_content_res_ApkAssets.cpp @@ -459,8 +459,12 @@ static jobject NativeGetOverlayableInfo(JNIEnv* env, jclass /*clazz*/, jlong ptr return nullptr; } - auto overlayable_name_native = std::string(env->GetStringUTFChars(overlayable_name, NULL)); + const char* overlayable_name_native = env->GetStringUTFChars(overlayable_name, nullptr); + if (overlayable_name_native == nullptr) { + return nullptr; + } auto actor = overlayable_map.find(overlayable_name_native); + env->ReleaseStringUTFChars(overlayable_name, overlayable_name_native); if (actor == overlayable_map.end()) { return nullptr; } diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index db33863ddd77..c947fba2dbd9 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -48,6 +48,7 @@ #include <jni.h> #include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedUtfChars.h> using namespace android; using namespace img_utils; @@ -1264,16 +1265,14 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt sp<NativeContext> nativeContext = new NativeContext(characteristics, results); - const char* captureTime = env->GetStringUTFChars(formattedCaptureTime, nullptr); - - size_t len = strlen(captureTime) + 1; - if (len != NativeContext::DATETIME_COUNT) { + ScopedUtfChars captureTime(env, formattedCaptureTime); + if (captureTime.size() + 1 != NativeContext::DATETIME_COUNT) { jniThrowException(env, "java/lang/IllegalArgumentException", "Formatted capture time string length is not required 20 characters"); return; } - nativeContext->setCaptureTime(String8(captureTime)); + nativeContext->setCaptureTime(String8(captureTime.c_str())); DngCreator_setNativeContext(env, thiz, nativeContext); } diff --git a/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp b/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp index 6e7ebdabeeb3..0ebf2dddd7eb 100644 --- a/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp +++ b/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp @@ -111,17 +111,17 @@ static void native_writeToParcel(JNIEnv *env, jobject self, jlong nativePtr, job jint flags) { battery::LongArrayMultiStateCounter *counter = reinterpret_cast<battery::LongArrayMultiStateCounter *>(nativePtr); - AParcel *parcel = AParcel_fromJavaParcel(env, jParcel); + ndk::ScopedAParcel parcel(AParcel_fromJavaParcel(env, jParcel)); uint16_t stateCount = counter->getStateCount(); - THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel, stateCount)); + THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel.get(), stateCount)); // LongArrayMultiStateCounter has at least state 0 const std::vector<uint64_t> &anyState = counter->getCount(0); - THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel, anyState.size())); + THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel.get(), anyState.size())); for (battery::state_t state = 0; state < stateCount; state++) { - THROW_ON_WRITE_ERROR(ndk::AParcel_writeVector(parcel, counter->getCount(state))); + THROW_ON_WRITE_ERROR(ndk::AParcel_writeVector(parcel.get(), counter->getCount(state))); } } @@ -139,13 +139,13 @@ static void throwReadRE(JNIEnv *env, binder_status_t status) { } static jlong native_initFromParcel(JNIEnv *env, jclass theClass, jobject jParcel) { - AParcel *parcel = AParcel_fromJavaParcel(env, jParcel); + ndk::ScopedAParcel parcel(AParcel_fromJavaParcel(env, jParcel)); int32_t stateCount; - THROW_ON_READ_ERROR(AParcel_readInt32(parcel, &stateCount)); + THROW_ON_READ_ERROR(AParcel_readInt32(parcel.get(), &stateCount)); int32_t arrayLength; - THROW_ON_READ_ERROR(AParcel_readInt32(parcel, &arrayLength)); + THROW_ON_READ_ERROR(AParcel_readInt32(parcel.get(), &arrayLength)); battery::LongArrayMultiStateCounter *counter = new battery::LongArrayMultiStateCounter(stateCount, std::vector<uint64_t>(arrayLength)); @@ -154,7 +154,7 @@ static jlong native_initFromParcel(JNIEnv *env, jclass theClass, jobject jParcel value.reserve(arrayLength); for (battery::state_t state = 0; state < stateCount; state++) { - THROW_ON_READ_ERROR(ndk::AParcel_readVector(parcel, &value)); + THROW_ON_READ_ERROR(ndk::AParcel_readVector(parcel.get(), &value)); counter->setValue(state, value); } diff --git a/core/jni/com_android_internal_os_LongMultiStateCounter.cpp b/core/jni/com_android_internal_os_LongMultiStateCounter.cpp index 69c4f3ddd9c5..8c69d276fe6a 100644 --- a/core/jni/com_android_internal_os_LongMultiStateCounter.cpp +++ b/core/jni/com_android_internal_os_LongMultiStateCounter.cpp @@ -120,13 +120,13 @@ static void throwWriteRE(JNIEnv *env, binder_status_t status) { static void native_writeToParcel(JNIEnv *env, jobject self, jlong nativePtr, jobject jParcel, jint flags) { battery::LongMultiStateCounter *counter = asLongMultiStateCounter(nativePtr); - AParcel *parcel = AParcel_fromJavaParcel(env, jParcel); + ndk::ScopedAParcel parcel(AParcel_fromJavaParcel(env, jParcel)); uint16_t stateCount = counter->getStateCount(); - THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel, stateCount)); + THROW_ON_WRITE_ERROR(AParcel_writeInt32(parcel.get(), stateCount)); for (battery::state_t state = 0; state < stateCount; state++) { - THROW_ON_WRITE_ERROR(AParcel_writeInt64(parcel, counter->getCount(state))); + THROW_ON_WRITE_ERROR(AParcel_writeInt64(parcel.get(), counter->getCount(state))); } } @@ -144,16 +144,16 @@ static void throwReadRE(JNIEnv *env, binder_status_t status) { } static jlong native_initFromParcel(JNIEnv *env, jclass theClass, jobject jParcel) { - AParcel *parcel = AParcel_fromJavaParcel(env, jParcel); + ndk::ScopedAParcel parcel(AParcel_fromJavaParcel(env, jParcel)); int32_t stateCount; - THROW_ON_READ_ERROR(AParcel_readInt32(parcel, &stateCount)); + THROW_ON_READ_ERROR(AParcel_readInt32(parcel.get(), &stateCount)); battery::LongMultiStateCounter *counter = new battery::LongMultiStateCounter(stateCount, 0); for (battery::state_t state = 0; state < stateCount; state++) { int64_t value; - THROW_ON_READ_ERROR(AParcel_readInt64(parcel, &value)); + THROW_ON_READ_ERROR(AParcel_readInt64(parcel.get(), &value)); counter->setValue(state, value); } diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 7bc69055292d..21bbac0b0a7d 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -110,6 +110,8 @@ using android::base::GetBoolProperty; using android::zygote::ZygoteFailure; +using Action = android_mallopt_gwp_asan_options_t::Action; + // This type is duplicated in fd_utils.h typedef const std::function<void(std::string)>& fail_fn_t; @@ -1717,16 +1719,24 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, // runtime. runtime_flags &= ~RuntimeFlags::NATIVE_HEAP_ZERO_INIT_ENABLED; - bool forceEnableGwpAsan = false; + const char* nice_name_ptr = nice_name.has_value() ? nice_name.value().c_str() : nullptr; + android_mallopt_gwp_asan_options_t gwp_asan_options; + // The system server doesn't have its nice name set by the time SpecializeCommon is called. + gwp_asan_options.program_name = nice_name_ptr ?: process_name; switch (runtime_flags & RuntimeFlags::GWP_ASAN_LEVEL_MASK) { default: case RuntimeFlags::GWP_ASAN_LEVEL_NEVER: + gwp_asan_options.desire = Action::DONT_TURN_ON_UNLESS_OVERRIDDEN; + android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options)); break; case RuntimeFlags::GWP_ASAN_LEVEL_ALWAYS: - forceEnableGwpAsan = true; - [[fallthrough]]; + gwp_asan_options.desire = Action::TURN_ON_FOR_APP; + android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options)); + break; case RuntimeFlags::GWP_ASAN_LEVEL_LOTTERY: - android_mallopt(M_INITIALIZE_GWP_ASAN, &forceEnableGwpAsan, sizeof(forceEnableGwpAsan)); + gwp_asan_options.desire = Action::TURN_ON_WITH_SAMPLING; + android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options)); + break; } // Now that we've used the flag, clear it so that we don't pass unknown flags to the ART // runtime. @@ -1739,7 +1749,6 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, AStatsSocket_close(); const char* se_info_ptr = se_info.has_value() ? se_info.value().c_str() : nullptr; - const char* nice_name_ptr = nice_name.has_value() ? nice_name.value().c_str() : nullptr; if (selinux_android_setcontext(uid, is_system_server, se_info_ptr, nice_name_ptr) == -1) { fail_fn(CREATE_ERROR("selinux_android_setcontext(%d, %d, \"%s\", \"%s\") failed", uid, diff --git a/core/proto/android/os/appbackgroundrestrictioninfo.proto b/core/proto/android/os/appbackgroundrestrictioninfo.proto index 502fd64f97e4..5bf8ea79a8ea 100644 --- a/core/proto/android/os/appbackgroundrestrictioninfo.proto +++ b/core/proto/android/os/appbackgroundrestrictioninfo.proto @@ -73,12 +73,17 @@ message AppBackgroundRestrictionsInfo { optional FgsTrackerInfo fgs_tracker_info = 5; message BatteryTrackerInfo { - // total battery usage within last 24h (percentage) + // total battery usage within last 24h (1/10000th) optional int32 battery_24h = 1; - // background battery usage (percentage) + // background battery usage (1/10000th) optional int32 battery_usage_background = 2; - // FGS battery usage (percentage) + // FGS battery usage (1/10000th) optional int32 battery_usage_fgs = 3; + // Foreground battery usage (1/10000th) + optional int32 battery_usage_foreground = 4; + // Cached battery usage (1/10000th) + optional int32 battery_usage_cached = 5; + } optional BatteryTrackerInfo battery_tracker_info = 6; @@ -197,5 +202,8 @@ message AppBackgroundRestrictionsInfo { // indicates if the current device is a low ram device. optional bool low_mem_device = 12; + + // indicates previous background restriction level. + optional RestrictionLevel previous_restriction_level = 13; } diff --git a/core/proto/android/view/imeinsetssourceconsumer.proto b/core/proto/android/view/imeinsetssourceconsumer.proto index b1ed365309c4..6e007fad5f8d 100644 --- a/core/proto/android/view/imeinsetssourceconsumer.proto +++ b/core/proto/android/view/imeinsetssourceconsumer.proto @@ -29,4 +29,6 @@ message ImeInsetsSourceConsumerProto { optional InsetsSourceConsumerProto insets_source_consumer = 1; reserved 2; // focused_editor = 2 optional bool is_requested_visible_awaiting_control = 3; + optional bool is_hide_animation_running = 4; + optional bool is_show_requested_during_hide_animation = 5; }
\ No newline at end of file diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4075c5f4d8ae..217166c6810b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -377,6 +377,8 @@ <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_ACCEPTED" /> <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_DECLINED" /> <protected-broadcast android:name="com.android.internal.action.EUICC_FACTORY_RESET" /> + <protected-broadcast + android:name="com.android.internal.action.EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS" /> <protected-broadcast android:name="com.android.server.usb.ACTION_OPEN_IN_APPS" /> <protected-broadcast android:name="com.android.server.am.DELETE_DUMPHEAP" /> <protected-broadcast android:name="com.android.server.net.action.SNOOZE_WARNING" /> @@ -6790,7 +6792,7 @@ android:excludeFromRecents="true" android:exported="true" android:permission="android.permission.MANAGE_GAME_ACTIVITY" - android:theme="@style/Theme.Translucent.NoTitleBar"> + android:theme="@style/Theme.GameSessionTrampoline"> </activity> <receiver android:name="com.android.server.BootReceiver" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index febd14c4c058..cae6165b650d 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Moenie Steur Nie het verander"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tik om te kyk wat geblokkeer word."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Gaan kennisgewinginstellings na"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13 het programme wat jy installeer jou toestemming nodig om kennisgewings te stuur. Tik om hierdie toestemming vir bestaande programme te verander."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Herinner my later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Maak toe"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Stelsel"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 1fd1b519f960..8bac983694ec 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"አትረብሽ ተቀይሯል"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"ምን እንደታገደ ለመፈተሽ መታ ያድርጉ።"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"የማሳወቂያ ቅንብሮችን ይገምግሙ"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"በAndroid 13 ላይ የሚጭኗቸው መተግበሪያዎች ማሳወቂያዎችን ለመላክ የእርስዎ ፈቃድ ያስፈልጋቸዋል። ይህን ፈቃድ ለነባር መተግበሪያዎች ለመቀየር መታ ያድርጉ።"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"በኋላ አስታውሰኝ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"አሰናብት"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ሥርዓት"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 59d67e9f181e..61349186ff54 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -2057,7 +2057,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"تم تغيير ميزة \"عدم الإزعاج\""</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"انقر للاطّلاع على ما تم حظره."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"مراجعة إعدادات الإشعارات"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"في نظام التشغيل Android 13، يجب أن تحصل التطبيقات التي تُثبِّتها على إذن لإرسال الإشعارات. انقر لتغيير هذا الإذن للتطبيقات الحالية."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"تذكيري لاحقًا"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"إغلاق"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"النظام"</string> @@ -2278,11 +2279,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> (مُترجَم)."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"الرسالة مُترجَمة من <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> إلى <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"النشاط في الخلفية"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"تطبيق يستنزف طاقة البطارية"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"ثمة تطبيق لا يزال نشطًا"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"التطبيق <xliff:g id="APP">%1$s</xliff:g> قيد التشغيل في الخلفية. انقر لإدارة استخدام البطارية."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"قد يؤثر استخدام التطبيق <xliff:g id="APP">%1$s</xliff:g> على عمر البطارية. انقر للاطّلاع على التطبيقات النشطة."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"التحقّق من التطبيقات النشطة"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"يتعذّر الوصول إلى كاميرا الهاتف من على جهاز <xliff:g id="DEVICE">%1$s</xliff:g>."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 80b2c32eb978..4f3ed4cd20bb 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1037,7 +1037,7 @@ <string name="permdesc_readHistoryBookmarks" msgid="2323799501008967852">"ব্ৰাউজাৰৰ বুকমার্ক আৰু ব্ৰাউজাৰে ব্যৱহাৰ কৰা আটাইবোৰ URLৰ ইতিহাস পঢ়িবলৈ এপক অনুমতি দিয়ে। টোকা: এই অনুমতি তৃতীয় পক্ষৰ ব্ৰাউজাৰবোৰ বা ৱেব ব্ৰাউজিং কৰিব পৰা অন্য এপ্লিকেশ্বনবোৰৰ দ্বাৰা বলৱৎ নহ\'বও পাৰে।"</string> <string name="permlab_writeHistoryBookmarks" msgid="6090259925187986937">"আপোনাৰ ৱেব বুকমার্কবোৰ আৰু ইতিহাস লিখক"</string> <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="573341025292489065">"আপোনাৰ টেবলেটত সঞ্চয় কৰি ৰখা ব্ৰাউজাৰৰ বুকমার্ক আৰু ব্ৰাউজাৰৰ ইতিহাস সংশোধন কৰিবলৈ এপক অনুমতি দিয়ে। টোকা: এই অনুমতি তৃতীয় পক্ষৰ ব্ৰাউজাৰবোৰ বা ৱেব ব্ৰাউজিং কৰিব পৰা অন্য এপ্লিকেশ্বনবোৰৰ দ্বাৰা বলৱৎ নহ\'বও পাৰে।"</string> - <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"এপ্টোক আপোনাৰ Android TV ডিভাইচত ষ্ট’ৰ কৰি ৰখা ব্ৰাউজাৰৰ ইতিহাস আৰু বুকমার্কবোৰ সংশোধন কৰিবলৈ অনুমতি দিয়ে। ব্ৰাউজাৰ ডাটা মোহাৰিবলৈ অথবা সংশোধন কৰিবলৈ ই এপ্টোক অনুমতি দিব পাৰে। টোকা: এই অনুমতি তৃতীয় পক্ষৰ ব্ৰাউজাৰবোৰ অথবা ৱেব ব্ৰাউজিঙৰ ক্ষমতা থকা অন্য এপ্লিকেশ্বনবোৰৰ দ্বাৰা বলৱৎ কৰা নহ’বও পাৰে।"</string> + <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"এপ্টোক আপোনাৰ Android TV ডিভাইচত ষ্ট’ৰ কৰি ৰখা ব্ৰাউজাৰৰ ইতিহাস আৰু বুকমার্কবোৰ সংশোধন কৰিবলৈ অনুমতি দিয়ে। ব্ৰাউজাৰ ডেটা মোহাৰিবলৈ অথবা সংশোধন কৰিবলৈ ই এপ্টোক অনুমতি দিব পাৰে। টোকা: এই অনুমতি তৃতীয় পক্ষৰ ব্ৰাউজাৰবোৰ অথবা ৱেব ব্ৰাউজিঙৰ ক্ষমতা থকা অন্য এপ্লিকেশ্বনবোৰৰ দ্বাৰা বলৱৎ কৰা নহ’বও পাৰে।"</string> <string name="permdesc_writeHistoryBookmarks" product="default" msgid="2245203087160913652">"আপোনাৰ ফ\'নত সঞ্চয় কৰি ৰখা ব্ৰাউজাৰৰ বুকমার্ক আৰু ব্ৰাউজাৰৰ ইতিহাস সংশোধন কৰিবলৈ এপক অনুমতি দিয়ে। টোকা: এই অনুমতি তৃতীয় পক্ষৰ ব্ৰাউজাৰবোৰ বা ৱেব ব্ৰাউজিং কৰিব পৰা অন্য এপ্লিকেশ্বনবোৰৰ দ্বাৰা বলৱৎ নহ\'বও পাৰে।"</string> <string name="permlab_setAlarm" msgid="1158001610254173567">"এলাৰ্ম ছেট কৰক"</string> <string name="permdesc_setAlarm" msgid="2185033720060109640">"এপটোক ইনষ্টল হৈ থকা এলাৰ্ম ক্লক এপত এলাৰ্ম ছেট কৰিবলৈ অনুমতি দিয়ে। কিছুমান এলাৰ্ম ক্লক এপত এই সুবিধাটো প্ৰযোজ্য নহ’ব পাৰে।"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"অসুবিধা নিদিব সলনি হৈছে"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"কি কি অৱৰোধ কৰা হৈছে জানিবলৈ টিপক।"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"জাননীৰ ছেটিং পৰ্যালোচনা কৰক"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"আপুনি Android 13ত ইনষ্টল কৰা এপক জাননী পঠিয়াবলৈ আপোনাৰ অনুমতিৰ প্ৰয়োজন। আগৰে পৰা থকা এপৰ বাবে এই অনুমতিটো সলনি কৰিবলৈ টিপক।"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"পাছত মনত পেলাই দিব"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"অগ্ৰাহ্য কৰক"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ছিষ্টেম"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 64007d943987..52a43af4e589 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\"Narahat Etməyin\" rejimi dəyişdirildi"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Nəyin blok edildiyini yoxlamaq üçün klikləyin."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Bildiriş ayarlarını nəzərdən keçirin"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-də quraşdırdığınız tətbiqlər bildiriş göndərmək üçün icazənizi tələb edir. Mövcud tətbiqlər üçün bu icazəni dəyişmək üçün toxunun."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Sonra xatırladın"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Qapadın"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 117120c44b9a..e854f43087e6 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Režim Ne uznemiravaj je promenjen"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Dodirnite da biste proverili šta je blokirano."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Pregledajte podešavanja obaveštenja"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"U Android-u 13 aplikacije koje instalirate moraju da imaju dozvolu za slanje obaveštenja. Dodirnite da biste promenili ovu dozvolu za postojeće aplikacije."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Podseti me kasnije"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Odbaci"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 4dbd03ca038c..3197b732ad76 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Зменены налады рэжыму \"Не турбаваць\""</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Націсніце, каб паглядзець заблакіраванае."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Праверце налады апавяшчэнняў"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"У версіі Android 13 усталяваным вамі праграмам неабходна даць дазвол на адпраўку апавяшчэнняў. Націсніце, каб змяніць дазвол для існуючых праграм."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Нагадаць пазней"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Закрыць"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Сістэма"</string> @@ -2276,11 +2277,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Паведамленне \"<xliff:g id="MESSAGE">%1$s</xliff:g>\" перакладзена."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Паведамленне перакладзена з мовы \"<xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>\" на мову \"<xliff:g id="TO_LANGUAGE">%2$s</xliff:g>\"."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Фонавая дзейнасць"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Праграма разраджае акумулятар"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Праграма па-ранейшаму актыўная"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Праграма \"<xliff:g id="APP">%1$s</xliff:g>\" працуе ў фонавым рэжыме. Націсніце, каб кіраваць выкарыстаннем зараду."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> можа скараціць час працы прылады ад акумулятара. Націсніце, каб праглядзець актыўныя праграмы."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Праверце актыўныя праграмы"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Не ўдалося атрымаць доступ да камеры тэлефона з прылады \"<xliff:g id="DEVICE">%1$s</xliff:g>\""</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index ea5aed4d3cc9..ee7af661cb11 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Настройките за „Не безпокойте“ са променени"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Докоснете, за да проверите какво е блокирано."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Преглед на настройките за известия"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Под Android 13 инсталираните от вас приложения трябва да получат разрешението ви, за да изпращат известия. Докоснете, за да промените това разрешение за съществуващите приложения."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Напомняне по-късно"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Отхвърляне"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Система"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Съобщението <xliff:g id="MESSAGE">%1$s</xliff:g> бе преведено."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Съобщението бе преведено от <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> на <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Активност на заден план"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Приложение изтощава батерията"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Приложение е все още активно"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> работи на заден план. Докоснете, за да управлявате използването на батерията."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> може да засегне живота на батерията. Докоснете за преглед на активните приложения."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Проверете активните приложения"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Няма достъп до камерата на телефона от вашия <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 386677c509ed..b0a832e4f700 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'বিরক্ত করবে না\' মোডের সেটিং বদলে গেছে"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"কী কী ব্লক করা আছে তা দেখতে ট্যাপ করুন।"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"বিজ্ঞপ্তির সেটিংস পর্যালোচনা করুন"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-এ, আপনার ইনস্টল করা অ্যাপের বিজ্ঞপ্তি পাঠানোর জন্য অনুমতি প্রয়োজন। আগে থাকা অ্যাপের জন্য এই অনুমতি পরিবর্তন করতে ট্যাপ করুন।"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"পরে মনে করিয়ে দিও"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"বাতিল করুন"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"সিস্টেম"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> অনুবাদ করা হয়েছে।"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"মেসেজ <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> থেকে <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> ভাষাতে অনুবাদ করা হয়েছে।"</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"কোনও অ্যাপ ব্যাটারির চার্জ দ্রুত শেষ করে ফেলছে"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"কোনও একটি অ্যাপ এখনও চালু আছে"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"ব্যাকগ্রাউন্ডে <xliff:g id="APP">%1$s</xliff:g> চলছে। ব্যাটারির ব্যবহার ম্যানেজ করতে ট্যাপ করুন।"</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ব্যাটারির আয়ুকে প্রভাবিত করতে পারে। চালু থাকা অ্যাপ পর্যালোচনা করতে ট্যাপ করুন।"</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"অ্যাক্টিভ অ্যাপ চেক করুন"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"আপনার <xliff:g id="DEVICE">%1$s</xliff:g> থেকে ফোনের ক্যামেরা অ্যাক্সেস করা যাচ্ছে না"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index b1b0e05a5594..b73b6a99a328 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Način rada Ne ometaj je promijenjen"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Dodirnite da provjerite šta je blokirano."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Pregledajte postavke obavještenja"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"U Androidu 13 aplikacije koje instalirate trebaju odobrenje da šalju obavještenja. Dodirnite da promijenite odobrenje za postojeće aplikacije."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Podsjeti me kasnije"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Odbaci"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> @@ -2275,9 +2276,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> – prevedeno."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Poruka je prevedena s jezika <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> na <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktivnost u pozadini"</string> - <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Aplikacija prazni bateriju"</string> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Aplikacija troši bateriju"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Aplikacija je i dalje aktivna"</string> - <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> se pokreće u pozadini. Dodirnite da biste upravljali potrošnjom baterije."</string> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> radi u pozadini. Dodirnite da upravljate potrošnjom baterije."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"Aplikacija <xliff:g id="APP">%1$s</xliff:g> može uticati na vijek trajanja baterije. Dodirnite da pregledate aktivne aplikacije."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Provjerite aktivne aplikacije"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nije moguće pristupiti kameri telefona s uređaja <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index c40da7126b50..ded50c717c04 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"S\'ha canviat el mode No molestis"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toca per consultar què s\'ha bloquejat."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Consulta la configuració de notificacions"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"A Android 13, les aplicacions que instal·les necessiten el teu permís per enviar notificacions. Toca per canviar aquest permís per a les aplicacions existents."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Recorda-m\'ho més tard"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ignora"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index bb6a14d2f516..aad6bc4d5ed1 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Nastavení režimu Nerušit se změnilo"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Klepnutím zkontrolujete, co je blokováno."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Zkontrolujte nastavení oznámení"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"V systému Android 13 od vás nainstalované aplikace potřebují oprávnění k odesílání oznámení. Klepnutím toto oprávnění změníte pro stávající aplikace."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Připomenout později"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Zavřít"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Systém"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 879e00160d6b..6c12cc2bdb64 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Tilstanden Forstyr ikke blev ændret"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tryk for at se, hvad der er blokeret."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Gennemgå indstillinger for notifikationer"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"I Android 13 skal apps, som du installerer, have din tilladelse til at sende notifikationer. Tryk for at ændre denne indstilling for eksisterende apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Påmind mig senere"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Luk"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> er oversat."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Meddelelsen er oversat fra <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> til <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktivitet i baggrunden"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"En app aflader batteriet"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"En app er stadig aktiv"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> kører i baggrunden. Tryk for at administrere batteriforbruget."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> kan påvirke batteritiden. Tryk for at gennemgå nye apps."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Tjek aktive apps"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Kameraet på din telefon kan ikke tilgås via din <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 78e986e5d972..f8c75965bf25 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"„Bitte nicht stören“ wurde geändert"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tippe, um zu überprüfen, welche Inhalte blockiert werden."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Benachrichtigungseinstellungen überprüfen"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Bei Android 13 benötigen Apps, die du installierst, die Berechtigung zum Senden von Benachrichtigungen. Wenn du diese Berechtigung für bereits installierte Apps ändern möchtest, tippe hier."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Später erinnern"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Schließen"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index fca6363a848f..e949ce1b15e2 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1912,8 +1912,8 @@ <string name="importance_from_user" msgid="2782756722448800447">"Μπορείτε να ρυθμίσετε τη βαρύτητα αυτών των ειδοποιήσεων."</string> <string name="importance_from_person" msgid="4235804979664465383">"Αυτό είναι σημαντικό λόγω των ατόμων που συμμετέχουν."</string> <string name="notification_history_title_placeholder" msgid="7748630986182249599">"Προσαρμοσμένη ειδοποίηση εφαρμογής"</string> - <string name="user_creation_account_exists" msgid="2239146360099708035">"Επιτρέπετε στην εφαρμογή <xliff:g id="APP">%1$s</xliff:g> να δημιουργήσει έναν νέο χρήστη με τον λογαριασμό <xliff:g id="ACCOUNT">%2$s</xliff:g> (υπάρχει ήδη χρήστης με αυτόν τον λογαριασμό);"</string> - <string name="user_creation_adding" msgid="7305185499667958364">"Επιτρέπετε στην εφαρμογή <xliff:g id="APP">%1$s</xliff:g> να δημιουργήσει έναν νέο χρήστη με τον λογαριασμό <xliff:g id="ACCOUNT">%2$s</xliff:g>;"</string> + <string name="user_creation_account_exists" msgid="2239146360099708035">"Επιτρέπετε στο <xliff:g id="APP">%1$s</xliff:g> να δημιουργήσει έναν νέο χρήστη με τον λογαριασμό <xliff:g id="ACCOUNT">%2$s</xliff:g> (υπάρχει ήδη χρήστης με αυτόν τον λογαριασμό);"</string> + <string name="user_creation_adding" msgid="7305185499667958364">"Επιτρέπετε στο <xliff:g id="APP">%1$s</xliff:g> να δημιουργήσει έναν νέο χρήστη με τον λογαριασμό <xliff:g id="ACCOUNT">%2$s</xliff:g>;"</string> <string name="supervised_user_creation_label" msgid="6884904353827427515">"Προσθήκη εποπτευόμενου χρήστη"</string> <string name="language_selection_title" msgid="52674936078683285">"Προσθήκη γλώσσας"</string> <string name="country_selection_title" msgid="5221495687299014379">"Προτίμηση περιοχής"</string> @@ -2037,7 +2037,7 @@ <string name="harmful_app_warning_uninstall" msgid="6472912975664191772">"ΑΠΕΓΚΑΤΑΣΤΑΣΗ"</string> <string name="harmful_app_warning_open_anyway" msgid="5963657791740211807">"ΑΝΟΙΓΜΑ"</string> <string name="harmful_app_warning_title" msgid="8794823880881113856">"Εντοπίστηκε επιβλαβής εφαρμογή"</string> - <string name="log_access_confirmation_title" msgid="2343578467290592708">"Να επιτρέπεται στην εφαρμογή <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> η πρόσβαση σε όλα τα αρχεία καταγραφής συσκευής;"</string> + <string name="log_access_confirmation_title" msgid="2343578467290592708">"Να επιτρέπεται στο <xliff:g id="LOG_ACCESS_APP_NAME">%s</xliff:g> η πρόσβαση σε όλα τα αρχεία καταγραφής συσκευής;"</string> <string name="log_access_confirmation_allow" msgid="5302517782599389507">"Να επιτρέπεται η πρόσβαση για μία φορά"</string> <string name="log_access_confirmation_deny" msgid="7685790957455099845">"Να μην επιτραπεί"</string> <string name="log_access_confirmation_body" msgid="6581985716241928135">"Τα αρχεία καταγραφής συσκευής καταγράφουν ό,τι συμβαίνει στη συσκευή σας. Οι εφαρμογές μπορούν να χρησιμοποιούν αυτά τα αρχεία καταγραφής για να εντοπίζουν και να διορθώνουν ζητήματα.\n\nΟρισμένα αρχεία καταγραφής ενδέχεται να περιέχουν ευαίσθητες πληροφορίες. Ως εκ τούτου, επιτρέψτε την πρόσβαση σε όλα τα αρχεία καταγραφής συσκευής μόνο στις εφαρμογές που εμπιστεύεστε. \n\nΕάν δεν επιτρέψετε σε αυτήν την εφαρμογή την πρόσβαση σε όλα τα αρχεία καταγραφής συσκευής, η εφαρμογή εξακολουθεί να έχει πρόσβαση στα δικά της αρχεία καταγραφής. Ο κατασκευαστής της συσκευής σας ενδέχεται να εξακολουθεί να έχει πρόσβαση σε ορισμένα αρχεία καταγραφής ή ορισμένες πληροφορίες στη συσκευή σας. Μάθετε περισσότερα"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Η λειτουργία \"Μην ενοχλείτε\" άλλαξε"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Πατήστε για να ελέγξετε το περιεχόμενο που έχει αποκλειστεί."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Έλεγχος ρυθμίσεων ειδοποιήσεων"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Στο Android 13, οι εφαρμογές που εγκαθιστάτε χρειάζονται την άδειά σας για την αποστολή ειδοποιήσεων. Πατήστε για να αλλάξετε αυτήν την άδεια για υπάρχουσες εφαρμογές."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Υπενθύμιση αργότερα"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Παράβλεψη"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Σύστημα"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 4b55b70faade..aedac3e874ae 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, apps that you install need your permission to send notifications. Tap to change this permission for existing apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Remind me later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 7ac8f01f3ad1..88fedc9c2454 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, apps that you install need your permission to send notifications. Tap to change this permission for existing apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Remind me later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 5f3faeb01883..dd9de67d24d2 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, apps that you install need your permission to send notifications. Tap to change this permission for existing apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Remind me later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 9855d01bfcde..a953730d90c2 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, apps that you install need your permission to send notifications. Tap to change this permission for existing apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Remind me later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 05565ae8c8d2..0aa8b28ca2a3 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Do Not Disturb has changed"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tap to check what\'s blocked."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Review notification settings"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, apps that you install need your permission to send notifications. Tap to change this permission for existing apps."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Remind me later"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 3ed995079e8c..62b2d7651107 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Se modificó la opción No interrumpir"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Presiona para consultar lo que está bloqueado."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Revisa la configuración de notificaciones"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"En Android 13, las apps que instales necesitarán tu permiso a fin de enviar notificaciones. Presiona para cambiar este permiso para las apps existentes."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Recordarme más tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Descartar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Se tradujo: <xliff:g id="MESSAGE">%1$s</xliff:g>."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Se tradujo el mensaje del <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> al <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Actividad en segundo plano"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Una app está agotando la batería."</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Hay una app que sigue activa"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> se está ejecutando en segundo plano. Presiona para administrar el uso de batería."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> podría afectar la duración de la batería. Presiona para revisar las apps activas."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Consulta las apps activas"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"No se puede acceder a la cámara del dispositivo desde tu <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 7be37cf9fed4..d31705d5583b 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -213,7 +213,7 @@ <string name="power_dialog" product="tablet" msgid="8333207765671417261">"Opciones del tablet"</string> <string name="power_dialog" product="tv" msgid="7792839006640933763">"Opciones de Android TV"</string> <string name="power_dialog" product="default" msgid="1107775420270203046">"Opciones del teléfono"</string> - <string name="silent_mode" msgid="8796112363642579333">"Modo silencio"</string> + <string name="silent_mode" msgid="8796112363642579333">"Modo Silencio"</string> <string name="turn_on_radio" msgid="2961717788170634233">"Activar conexión inalámbrica"</string> <string name="turn_off_radio" msgid="7222573978109933360">"Desactivar función inalámbrica"</string> <string name="screen_lock" msgid="2072642720826409809">"Bloqueo de pantalla"</string> @@ -233,8 +233,8 @@ <string name="shutdown_confirm" product="watch" msgid="2977299851200240146">"El reloj se apagará."</string> <string name="shutdown_confirm" product="default" msgid="136816458966692315">"El teléfono se apagará."</string> <string name="shutdown_confirm_question" msgid="796151167261608447">"¿Seguro que quieres apagar el teléfono?"</string> - <string name="reboot_safemode_title" msgid="5853949122655346734">"Reiniciar en modo seguro"</string> - <string name="reboot_safemode_confirm" msgid="1658357874737219624">"¿Quieres reiniciar el sistema en modo seguro? Se inhabilitarán todas las aplicaciones externas que hayas instalado. Esas aplicaciones se restaurarán la próxima vez que reinicies del sistema."</string> + <string name="reboot_safemode_title" msgid="5853949122655346734">"Reiniciar en modo Seguro"</string> + <string name="reboot_safemode_confirm" msgid="1658357874737219624">"¿Quieres reiniciar el sistema en modo Seguro? Se inhabilitarán todas las aplicaciones externas que hayas instalado. Esas aplicaciones se restaurarán la próxima vez que reinicies del sistema."</string> <string name="recent_tasks_title" msgid="8183172372995396653">"Reciente"</string> <string name="no_recent_tasks" msgid="9063946524312275906">"No hay aplicaciones recientes."</string> <string name="global_actions" product="tablet" msgid="4412132498517933867">"Opciones del tablet"</string> @@ -257,12 +257,12 @@ <string name="bugreport_countdown" msgid="6418620521782120755">"{count,plural, =1{La captura de pantalla para el informe de errores se hará en # segundo.}other{La captura de pantalla para el informe de errores se hará en # segundos.}}"</string> <string name="bugreport_screenshot_success_toast" msgid="7986095104151473745">"Se ha hecho la captura de pantalla con el informe de errores"</string> <string name="bugreport_screenshot_failure_toast" msgid="6736320861311294294">"No se ha podido hacer la captura de pantalla con el informe de errores"</string> - <string name="global_action_toggle_silent_mode" msgid="8464352592860372188">"Modo silencio"</string> + <string name="global_action_toggle_silent_mode" msgid="8464352592860372188">"Modo Silencio"</string> <string name="global_action_silent_mode_on_status" msgid="2371892537738632013">"El sonido está desactivado. Activar"</string> <string name="global_action_silent_mode_off_status" msgid="6608006545950920042">"El sonido está activado. Desactivar"</string> - <string name="global_actions_toggle_airplane_mode" msgid="6911684460146916206">"Modo avión"</string> - <string name="global_actions_airplane_mode_on_status" msgid="5508025516695361936">"Modo avión activado. Desactivar"</string> - <string name="global_actions_airplane_mode_off_status" msgid="8522219771500505475">"Modo avión desactivado. Activar"</string> + <string name="global_actions_toggle_airplane_mode" msgid="6911684460146916206">"Modo Avión"</string> + <string name="global_actions_airplane_mode_on_status" msgid="5508025516695361936">"Modo Avión activado. Desactivar"</string> + <string name="global_actions_airplane_mode_off_status" msgid="8522219771500505475">"Modo Avión desactivado. Activar"</string> <string name="global_action_settings" msgid="4671878836947494217">"Ajustes"</string> <string name="global_action_assist" msgid="2517047220311505805">"Asistencia"</string> <string name="global_action_voice_assist" msgid="6655788068555086695">"Asistente voz"</string> @@ -293,7 +293,7 @@ <string name="foreground_service_apps_in_background" msgid="7340037176412387863">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones están usando la batería"</string> <string name="foreground_service_tap_for_details" msgid="9078123626015586751">"Toca para ver información detallada sobre el uso de datos y de la batería"</string> <string name="foreground_service_multiple_separator" msgid="5002287361849863168">"<xliff:g id="LEFT_SIDE">%1$s</xliff:g>, <xliff:g id="RIGHT_SIDE">%2$s</xliff:g>"</string> - <string name="safeMode" msgid="8974401416068943888">"Modo seguro"</string> + <string name="safeMode" msgid="8974401416068943888">"Modo Seguro"</string> <string name="android_system_label" msgid="5974767339591067210">"Sistema Android"</string> <string name="user_owner_label" msgid="8628726904184471211">"Cambiar al perfil personal"</string> <string name="managed_profile_label" msgid="7316778766973512382">"Cambiar al perfil de trabajo"</string> @@ -1696,7 +1696,7 @@ <string name="leave_accessibility_shortcut_on" msgid="6543362062336990814">"Utilizar acceso directo"</string> <string name="color_inversion_feature_name" msgid="326050048927789012">"Inversión de color"</string> <string name="color_correction_feature_name" msgid="3655077237805422597">"Corrección de color"</string> - <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo una mano"</string> + <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Modo Una mano"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Atenuación extra"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Al mantener pulsadas las teclas de volumen, se ha activado <xliff:g id="SERVICE_NAME">%1$s</xliff:g>."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Se han mantenido pulsadas las teclas de volumen. Se ha desactivado <xliff:g id="SERVICE_NAME">%1$s</xliff:g>."</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Ha cambiado el modo No molestar"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toca para consultar lo que se está bloqueando."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Consulta los ajustes de notificaciones"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"En Android 13, las aplicaciones que instales necesitan tu permiso para enviar notificaciones. Toca para cambiar este permiso en las aplicaciones que ya tengas."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Recordar más tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Cerrar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> @@ -2098,7 +2099,7 @@ <string name="mime_type_spreadsheet_ext" msgid="8720173181137254414">"Hoja de cálculo <xliff:g id="EXTENSION">%1$s</xliff:g>"</string> <string name="mime_type_presentation" msgid="1145384236788242075">"Presentación"</string> <string name="mime_type_presentation_ext" msgid="8761049335564371468">"Presentación <xliff:g id="EXTENSION">%1$s</xliff:g>"</string> - <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"El Bluetooth seguirá activado en el modo avión"</string> + <string name="bluetooth_airplane_mode_toast" msgid="2066399056595768554">"El Bluetooth seguirá activado en el modo Avión"</string> <string name="car_loading_profile" msgid="8219978381196748070">"Cargando"</string> <string name="file_count" msgid="3220018595056126969">"{count,plural, =1{{file_name} y # archivo más}other{{file_name} y # archivos más}}"</string> <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"No hay sugerencias de personas con las que compartir"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> traducido."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Mensaje traducido del <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> al <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Actividad en segundo plano"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Una aplicación está agotando la batería"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Una aplicación sigue activa"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> está funcionando en segundo plano. Toca para gestionar el uso de batería."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> podría afectar a la duración de la batería. Toca para ver las aplicaciones activas."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Consultar aplicaciones activas"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"No se puede acceder a la cámara del teléfono desde tu <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 6e6349f26bdd..abd332527905 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Režiimi Mitte segada muudeti"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Puudutage, et kontrollida, mis on blokeeritud."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Vaadake üle märguandeseaded"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Operatsioonisüsteemis Android 13 vajavad installitavad rakendused märguannete saatmiseks teie luba. Puudutage, et muuta seda luba olemasolevate rakenduste jaoks."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Tuleta hiljem meelde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Loobu"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Süsteem"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Sõnum „<xliff:g id="MESSAGE">%1$s</xliff:g>” on tõlgitud."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Sõnum on tõlgitud <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> keelest <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> keelde."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Tegevus taustal"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Rakendus kulutab akutoidet"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Rakendus on ikka aktiivne"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Rakendus <xliff:g id="APP">%1$s</xliff:g> töötab taustal. Puudutage akukasutuse haldamiseks."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> võib aku tööiga mõjutada. Puudutage aktiivsete rakenduste ülevaatamiseks."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Vaadake aktiivseid rakendusi"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Teie seadmest <xliff:g id="DEVICE">%1$s</xliff:g> ei pääse telefoni kaamerale juurde"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 497df3a8c4f1..9652c9aab22e 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Ez molestatzeko modua aldatu da"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Sakatu zer dagoen blokeatuta ikusteko."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Berrikusi jakinarazpen-ezarpenak"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-n, jakinarazpenak bidaltzeko baimena eman behar diezu instalatzen dituzun aplikazioei. Sakatu hau lehendik dauden aplikazioen baimenak aldatzeko."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Gogorarazi geroago"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Baztertu"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index d1af2cd8b3aa..808240112e95 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"«مزاحم نشوید» تغییر کرده است"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"برای بررسی موارد مسدودشده ضربه بزنید."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"مرور تنظیمات اعلان"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"در Android نسخه ۱۳، برنامههایی که نصب میکنید برای ارسال اعلان به اجازه شما نیاز دارند. برای تغییر دادن این اجازه برای برنامههای موجود، ضربه بزنید."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"بعداً یادآوری شود"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"رد شدن"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"سیستم"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> ترجمه شد."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"پیام از <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> به <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> ترجمه شد."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"فعالیت در پسزمینه"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"برنامهای شارژ باتری را خالی میکند"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"یکی از برنامهها همچنان فعال است"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> در پسزمینه درحال اجرا است. برای مدیریت مصرف باتری ضربه بزنید."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ممکن است بر عمر باتری تأثیر بگذارد. برای مرور برنامههای فعال، ضربه بزنید."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"بررسی برنامههای فعال"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"نمیتوان از <xliff:g id="DEVICE">%1$s</xliff:g> شما به دوربین تلفن دسترسی داشت"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index adea5bf0838c..52c1d26902b8 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Älä häiritse ‑tila muuttui"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Napauta niin näet, mitä on estetty."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Tarkista ilmoitusasetukset"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Asentamasi sovellukset tarvitsevat sinulta luvan ilmoitusten lähettämiseen Android 13 ‑käyttöjärjestelmässä. Napauta muuttaaksesi aiempien sovellusten lupia."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Muistuta myöhemmin"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ohita"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Järjestelmä"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> käännettiin."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Viesti käännettiin kielestä <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> kielelle <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Taustatoiminta"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Sovellus kuluttaa akkua"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Sovellus on edelleen aktiivinen"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> on käynnissä taustalla. Hallitse akun käyttöä napauttamalla."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> saattaa vaikuttaa akunkestoon. Tarkista aktiiviset sovellukset napauttamalla."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Tarkista aktiiviset sovellukset"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"<xliff:g id="DEVICE">%1$s</xliff:g> ei pääse puhelimen kameraan"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 71bd100d7dbf..fc7fc071f7a1 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Les paramètres du mode Ne pas déranger ont changé"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Touchez l\'écran pour vérifier ce qui est bloqué."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Examiner les paramètres de notification"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Sous Android 13, les applications que vous installez ont besoin de votre autorisation pour envoyer des notifications. Touchez pour modifier cette autorisation pour les applications existantes."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Me rappeler plus tard"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Fermer"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Système"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Message <xliff:g id="MESSAGE">%1$s</xliff:g> traduit."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Message traduit : <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> vers <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Activité en arrière-plan"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Une application décharge votre pile"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Une application est toujours active"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> s\'exécute en arrière-plan. Touchez pour gérer l\'utilisation de la pile."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> peut avoir une incidence sur l\'autonomie de la pile. Touchez pour examiner les applications actives."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Vérifier les applications actives"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Impossible d\'accéder à l\'appareil photo du téléphone à partir de votre <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 0675e8c00dc4..a8082c63e96d 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Le mode Ne pas déranger a été modifié"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Appuyez pour vérifier les contenus bloqués."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Consulter les paramètres de notification"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Sur Android 13, les applis que vous installez ont besoin de votre autorisation pour vous envoyer des notifications. Appuyez pour modifier cette autorisation pour les applis déjà installées."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Plus tard"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Fermer"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Système"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 6cadfa1a4d66..0393c4b2ab29 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"O modo Non molestar cambiou"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toca para comprobar o contido bloqueado."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Consulta a configuración de notificacións"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"En Android 13, as aplicacións que instales necesitan o teu permiso para enviar notificacións. Toca para cambiar este permiso nas aplicacións que xa teñas."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Lembrarmo máis tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Pechar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Mensaxe <xliff:g id="MESSAGE">%1$s</xliff:g> traducida."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Mensaxe traducida do <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> ao <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Actividade en segundo plano"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Hai unha aplicación que está consumindo excesiva batería"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Hai unha aplicación que aínda está activa"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Estase executando en segundo plano a aplicación <xliff:g id="APP">%1$s</xliff:g>. Toca para xestionar o uso da batería."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> podería estar minguando a duración da batería. Toca para revisar as aplicacións activas."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Comprobar aplicacións activas"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Non se puido acceder á cámara do teléfono desde o teu dispositivo (<xliff:g id="DEVICE">%1$s</xliff:g>)"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 43f21d48c4d4..033f7ee5ac58 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -2052,14 +2052,11 @@ <string name="zen_upgrade_notification_visd_content" msgid="3683314609114134946">"વધુ જાણવા અને બદલવા માટે ટૅપ કરો."</string> <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"ખલેલ પાડશો નહીંમાં ફેરફાર થયો છે"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"શું બ્લૉક કરેલ છે તે તપાસવા માટે ટૅપ કરો."</string> - <!-- no translation found for review_notification_settings_title (5102557424459810820) --> - <skip /> - <!-- no translation found for review_notification_settings_text (5696497037817525074) --> - <skip /> - <!-- no translation found for review_notification_settings_remind_me_action (1081081018678480907) --> - <skip /> - <!-- no translation found for review_notification_settings_dismiss (4160916504616428294) --> + <string name="review_notification_settings_title" msgid="5102557424459810820">"નોટિફિકેશનના સેટિંગ રિવ્યૂ કરો"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> <skip /> + <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"મને પછી યાદ અપાવજો"</string> + <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"છોડી દો"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"સિસ્ટમ"</string> <string name="notification_app_name_settings" msgid="9088548800899952531">"સેટિંગ"</string> <string name="notification_appops_camera_active" msgid="8177643089272352083">"કૅમેરા"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index bef53d6afd3d..f02982284476 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1926,7 +1926,7 @@ <string name="app_suspended_default_message" msgid="6451215678552004172">"फ़िलहाल <xliff:g id="APP_NAME_0">%1$s</xliff:g> उपलब्ध नहीं है. इसे <xliff:g id="APP_NAME_1">%2$s</xliff:g> के ज़रिए प्रबंधित किया जाता है."</string> <string name="app_suspended_more_details" msgid="211260942831587014">"ज़्यादा जानें"</string> <string name="app_suspended_unsuspend_message" msgid="1665438589450555459">"ऐप्लिकेशन पर लगी रोक हटाएं"</string> - <string name="work_mode_off_title" msgid="961171256005852058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करना चाहते हैं?"</string> + <string name="work_mode_off_title" msgid="961171256005852058">"ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करने हैं?"</string> <string name="work_mode_off_message" msgid="7319580997683623309">"अपने ऑफ़िस के काम से जुड़े ऐप्लिकेशन और सूचनाओं का ऐक्सेस पाएं"</string> <string name="work_mode_turn_on" msgid="3662561662475962285">"चालू करें"</string> <string name="app_blocked_title" msgid="7353262160455028160">"ऐप्लिकेशन उपलब्ध नहीं है"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"परेशान न करें की सुविधा बदल गई है"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"टैप करके देखें कि किन चीज़ों पर रोक लगाई गई है."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"सूचना सेटिंग देखें"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 में जो ऐप्लिकेशन इंस्टॉल किए जाएंगे, उन्हें आपको सूचनाएं भेजने के लिए अनुमति लेनी होगी. पहले से इंस्टॉल किए गए ऐप्लिकेशन को दी गई अनुमति बदलने के लिए टैप करें."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"बाद में याद दिलाएं"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"बंद करें"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"सिस्टम"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> का अनुवाद किया गया."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"मैसेज का <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> से <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> में अनुवाद किया गया."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"बैकग्राउंड में हो रही गतिविधि"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"कोई ऐप्लिकेशन, तेज़ी से बैटरी खर्च कर रहा है"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"कोई ऐप्लिकेशन अब भी चालू है"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> बैकग्राउंड में चल रहा है. \'बैटरी खर्च को मैनेज करें\' पर टैप करें."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> से, आपके डिवाइस की बैटरी लाइफ़ पर असर पड़ सकता है. चालू ऐप्लिकेशन देखने के लिए टैप करें."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"चालू ऐप्लिकेशन देखें"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"आपके <xliff:g id="DEVICE">%1$s</xliff:g> से फ़ोन के कैमरे को ऐक्सेस नहीं किया जा सकता"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 21bcd20a27f9..42adb5dfdaa4 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Promijenjena je postavka Ne uznemiravaj"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Dodirnite da biste provjerili što je blokirano."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Pregledajte postavke obavijesti"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"U Androidu 13 aplikacije koje instalirate trebaju vaše dopuštenje za slanje obavijesti. Dodirnite da biste promijenili to dopuštenje za postojeće aplikacije."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Podsjeti me kasnije"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Odbaci"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sustav"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 21c40ade7637..c02cff6ac7f1 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Módosultak a Ne zavarjanak mód beállításai"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Koppintson a letiltott elemek megtekintéséhez."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Értesítési beállítások áttekintése"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-as rendszeren a telepített alkalmazásoknak engedélyre van szükségük értesítések küldéséhez. Koppintással módosíthatja ezt az engedélyt a meglévő alkalmazások esetében."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Emlékeztessen később"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Bezárás"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Rendszer"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 7c966b364d5b..b983004690e6 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1927,7 +1927,7 @@ <string name="app_suspended_more_details" msgid="211260942831587014">"Մանրամասն"</string> <string name="app_suspended_unsuspend_message" msgid="1665438589450555459">"Չեղարկել դադարեցումը"</string> <string name="work_mode_off_title" msgid="961171256005852058">"Միացնե՞լ հավելվածները"</string> - <string name="work_mode_off_message" msgid="7319580997683623309">"Միացրեք աշխատանքային հավելվածներն ու ծանուցումները"</string> + <string name="work_mode_off_message" msgid="7319580997683623309">"Ձեզ հասանելի կդառնան ձեր աշխատանքային հավելվածներն ու ծանուցումները"</string> <string name="work_mode_turn_on" msgid="3662561662475962285">"Միացնել"</string> <string name="app_blocked_title" msgid="7353262160455028160">"Հավելվածը հասանելի չէ"</string> <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածն այս պահին հասանելի չէ։"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"«Չանհանգստացնել» ռեժիմի կարգավորումները փոխվել են"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Հպեք՝ տեսնելու, թե ինչ է արգելափակվել:"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Ստուգեք ծանուցումների կարգավորումները"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-ում ձեր տեղադրած հավելվածներին անհրաժեշտ է տրամադրել ծանուցումներ ուղարկելու թույլտվություն։ Հպեք և փոխեք այս թույլտվությունն արդեն տեղադրված հավելվածների համար։"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Հիշեցնել ավելի ուշ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Փակել"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Համակարգ"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 61104d3a6ab6..0fb0f5b9edd7 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Jangan Ganggu telah berubah"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Ketuk untuk memeriksa item yang diblokir."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Tinjau setelan notifikasi"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Di Android 13, aplikasi yang Anda instal memerlukan izin untuk mengirim notifikasi. Ketuk guna mengubah izin ini untuk aplikasi yang sudah ada."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Ingatkan saya nanti"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Tutup"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> Diterjemahkan."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Pesan diterjemahkan dari bahasa <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> ke <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktivitas Latar Belakang"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Aplikasi menghabiskan daya baterai"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Aplikasi masih aktif"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> sedang berjalan di latar belakang. Ketuk untuk mengelola penggunaan baterai."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> mungkin memengaruhi masa pakai baterai. Ketuk untuk meninjau aplikasi aktif."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Periksa aplikasi aktif"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Tidak dapat mengakses kamera ponsel dari <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 8b8a22883db6..ce84af711ad3 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"„Ónáðið ekki“ var breytt"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Ýttu til að skoða hvað lokað hefur verið á."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Yfirfara tilkynningastillingar"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Í Android 13 þurfa forrit sem þú setur upp heimild frá þér til að senda tilkynningar. Ýttu til að breyta þessari heimild fyrir forrit sem fyrir eru."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Minna mig á seinna"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Hunsa"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Kerfi"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> var þýtt."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Skilaboð þýdd úr <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> á <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Bakgrunnsvirkni"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Forrit notar mikið af rafhlöðunni"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Forrit er enn virkt"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> keyrir í bakgrunni. Ýttu til að stjórna rafhlöðunotkun."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> gæti haft áhrif á rafhlöðuendingu. Ýttu til að skoða virk forrit."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Skoða virk forrit"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Ekki er hægt að opna myndavél símans úr <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index bf591eca6d6c..1db6e6660557 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"L\'impostazione Non disturbare è cambiata"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tocca per controllare le notifiche bloccate."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Controlla le impostazioni di notifica"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13, le app che installi devono avere la tua autorizzazione per poter inviare notifiche. Tocca per cambiare questa autorizzazione per le app esistenti."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Ricordamelo dopo"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ignora"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Messaggio <xliff:g id="MESSAGE">%1$s</xliff:g> tradotto."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Messaggio tradotto dalla lingua <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> alla lingua <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Attività in background"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Un\'app sta consumando la batteria"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"C\'è un\'app ancora attiva"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> è in esecuzione in background. Tocca per gestire l\'utilizzo della batteria."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> potrebbe influire sulla durata della batteria. Tocca per controllare le app attive."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Verifica le app attive"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Impossibile accedere alla fotocamera del telefono dal tuo <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index e1c696f4dca6..044934951ec7 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"ההגדרה \'נא לא להפריע\' השתנתה"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"יש להקיש כדי לבדוק מה חסום."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"בדיקת הגדרת ההתראות"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"ב-Android 13, עליך לתת לאפליקציות שהתקנת הרשאה לשלוח התראות. אפשר להקיש כדי לשנות את ההרשאה הזו באפליקציות קיימות."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"תזכירו לי מאוחר יותר"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"סגירה"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"מערכת"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index dff29f980e4b..1fe37366eeec 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"サイレント モードが変わりました"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"タップしてブロック対象をご確認ください。"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"通知設定の確認"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 では、インストールするアプリに、通知を送信する権限を付与する必要があります。既存のアプリのこの権限を変更するには、タップしてください。"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"後で"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"閉じる"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"システム"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index e98240e45949..7fb4833c1a6d 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"„არ შემაწუხოთ“ რეჟიმი შეცვლილია"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"შეეხეთ იმის სანახავად, თუ რა არის დაბლოკილი."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"შეტყობინების პარამეტრების შემოწმება"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-ზე შეტყობინებების გასაგზავნად საჭიროა თქვენ მიერ დაინსტალირებული აპებისთვის ნებართვის მინიჭება. არსებული აპებისთვის ამ ნებართვის შესაცვლელად შეეხეთ."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"შემახსენე მოგვიან."</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"უარყოფა"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"სისტემა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index a21479f30767..4bd7c144e635 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1933,36 +1933,21 @@ <string name="app_blocked_message" msgid="542972921087873023">"<xliff:g id="APP_NAME">%1$s</xliff:g> қазір қолжетімді емес."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"<xliff:g id="ACTIVITY">%1$s</xliff:g> қолжетімсіз"</string> <string name="app_streaming_blocked_title_for_permission_dialog" msgid="4483161748582966785">"Рұқсат қажет"</string> - <!-- no translation found for app_streaming_blocked_title_for_camera_dialog (3935701653713853065) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_fingerprint_dialog (3516853717714141951) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_microphone_dialog (544822455127171206) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (196994247017450357) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (8222710146267948647) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (6895719984375299791) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (5024599278277957935) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (7491114163056552686) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (1245180131667647277) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (6306583663205997979) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (6545624942642129664) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (8462740631707923000) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (3470977315395784567) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (698460091901465092) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (8552691971910603907) --> - <skip /> + <string name="app_streaming_blocked_title_for_camera_dialog" msgid="3935701653713853065">"Камера қолжетімді емес"</string> + <string name="app_streaming_blocked_title_for_fingerprint_dialog" msgid="3516853717714141951">"Телефоннан жалғастыру"</string> + <string name="app_streaming_blocked_title_for_microphone_dialog" msgid="544822455127171206">"Микрофон қолжетімді емес"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="tv" msgid="196994247017450357">"Android TV параметрлері қолжетімді емес"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="tablet" msgid="8222710146267948647">"Планшет параметрлері қолжетімді емес"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="default" msgid="6895719984375299791">"Телефон параметрлері қолжетімді емес"</string> + <string name="app_streaming_blocked_message" product="tv" msgid="5024599278277957935">"Бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына Android TV құрылғысын пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message" product="tablet" msgid="7491114163056552686">"Бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына планшетті пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message" product="default" msgid="1245180131667647277">"Бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына телефонды пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="tv" msgid="6306583663205997979">"Қазір бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына Android TV құрылғысын пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="tablet" msgid="6545624942642129664">"Қазір бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына планшетті пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="default" msgid="8462740631707923000">"Қазір бұған <xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан кіру мүмкін емес. Оның орнына телефонды пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv" msgid="3470977315395784567">"Бұл қолданба үшін қосымша қауіпсіздік шарасы қажет. Оның орнына Android TV құрылғысын пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet" msgid="698460091901465092">"Бұл қолданба үшін қосымша қауіпсіздік шарасы қажет. Оның орнына планшетті пайдаланып көріңіз."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default" msgid="8552691971910603907">"Бұл қолданба үшін қосымша қауіпсіздік шарасы қажет. Оның орнына телефонды пайдаланып көріңіз."</string> <string name="deprecated_target_sdk_message" msgid="5203207875657579953">"Қолданба Android жүйесінің ескі нұсқасына арналған және дұрыс жұмыс істемеуі мүмкін. Жаңартылған нұсқаны тексеріңіз немесе әзірлеушіге хабарласыңыз."</string> <string name="deprecated_target_sdk_app_store" msgid="8456784048558808909">"Жаңарту бар-жоғын тексеру"</string> <string name="new_sms_notification_title" msgid="6528758221319927107">"Сізде жаңа хабарлар бар"</string> @@ -2068,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Мазаламау режимі өзгерді"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Түймені түртіп, неге тыйым салынатынын көріңіз."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Хабарландыру параметрлерін қарау"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 нұсқасында орнатылатын қолданбалар үшін хабарландырулар жіберу рұқсаты керек. Бұрынғы қолданбаларда осы рұқсатты өзгерту үшін түртіңіз."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Кейінірек еске салу"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Жабу"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Жүйе"</string> @@ -2289,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\" хабары аударылды."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Хабар мына тілге аударылды: <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>. Түпнұсқаның тілі: <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Фондық режимдегі әрекет"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Қолданба батареяны тез отырғызып жатыр"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Қолданба әлі белсенді"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> фондық режимде жұмыс істеп тұр. Батарея шығынын басқару үшін түртіңіз."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> қолданбасы батарея жұмысының ұзақтығына әсер етуі мүмкін. Белсенді қолданбаларды қарап шығу үшін түртіңіз."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Белсенді қолданбаларды тексеру"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"<xliff:g id="DEVICE">%1$s</xliff:g> құрылғысынан телефон камерасын пайдалану мүмкін емес."</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index bf0f8dbb1572..a3447096cb19 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"មុខងារកុំរំខានត្រូវបានប្ដូរ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"សូមចុចដើម្បីមើលថាបានទប់ស្កាត់អ្វីខ្លះ។"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ពិនិត្យមើលការកំណត់ការជូនដំណឹង"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"ក្នុង Android 13 កម្មវិធីដែលអ្នកដំឡើងត្រូវការការអនុញ្ញាតរបស់អ្នក ដើម្បីផ្ញើការជូនដំណឹង។ សូមចុចដើម្បីផ្លាស់ប្ដូរការអនុញ្ញាតនេះសម្រាប់កម្មវិធីដែលមានស្រាប់។"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"រំលឹកខ្ញុំពេលក្រោយ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ច្រានចោល"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ប្រព័ន្ធ"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index d415d800827d..eb1baf009e37 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಬದಲಾಗಿದೆ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"ಏನನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ಪರೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 ನಲ್ಲಿ, ನೀವು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವ ಆ್ಯಪ್ಗಳಿಗೆ, ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಲು ನಿಮ್ಮ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ. ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆ್ಯಪ್ಗಳ ಅನುಮತಿಗಳನ್ನು ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"ನಂತರ ರಿಮೈಂಡ್ ಮಾಡಿ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ವಜಾಗೊಳಿಸಿ"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ಸಿಸ್ಟಂ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index b34d17e859d7..f8b9bdc8031a 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"방해 금지 모드 변경"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"차단된 항목을 확인하려면 탭하세요."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"알림 설정 검토"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13에 설치된 앱에는 알림을 전송하기 위한 권한이 필요합니다. 기존 앱의 알림 전송 권한을 변경하려면 탭하세요."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"나중에 알림"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"닫기"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"시스템"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"다음 메시지가 번역되었습니다. <xliff:g id="MESSAGE">%1$s</xliff:g>"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"메시지가 <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>에서 <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>로 번역되었습니다."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"백그라운드 활동"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"배터리 소모가 큰 앱이 있습니다"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"앱이 여전히 활성 상태임"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> 앱이 백그라운드에서 실행 중입니다. 배터리 사용량을 관리하려면 탭하세요."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> 앱은 배터리 수명에 영향을 미칠 수 있습니다. 활성 상태인 앱을 확인하려면 탭하세요."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"활성 상태의 앱 확인"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"사용자의 <xliff:g id="DEVICE">%1$s</xliff:g>에서 휴대전화 카메라에 액세스할 수 없습니다."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 76956575f6c4..663842f5d158 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1320,7 +1320,7 @@ <string name="sms_short_code_confirm_allow" msgid="920477594325526691">"Жөнөтүү"</string> <string name="sms_short_code_confirm_deny" msgid="1356917469323768230">"Айнуу"</string> <string name="sms_short_code_remember_choice" msgid="1374526438647744862">"Менин тандоомду эстеп кал"</string> - <string name="sms_short_code_remember_undo_instruction" msgid="2620984439143080410">"Муну кийин Тууралоолор > Колдонмолордон өзгөртө аласыз"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="2620984439143080410">"Муну кийин Тууралоо > Колдонмолордон өзгөртө аласыз"</string> <string name="sms_short_code_confirm_always_allow" msgid="2223014893129755950">"Дайыма уруксат берүү"</string> <string name="sms_short_code_confirm_never_allow" msgid="2688828813521652079">"Эч качан уруксат берилбесин"</string> <string name="sim_removed_title" msgid="5387212933992546283">"SIM-карта өчүрүлдү"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\"Тынчымды алба\" режими өзгөрдү"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Бөгөттөлгөн нерселерди көрүү үчүн таптаңыз."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Билдирмелердин жөндөөлөрүн карап чыгуу"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 версиясында билдирмелерди жөнөтүү үчүн орноткон колдонмолоруңузга уруксат берүү керек. Учурдагы колдонмолор үчүн бул уруксатты өзгөртүү үчүн таптап коюңуз."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Кийинчерээк эскертүү"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Жабуу"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Тутум"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index cb8a77df06b3..9e8b1197fbae 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"ປ່ຽນໂໝດຫ້າມລົບກວນແລ້ວ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"ແຕະເພື່ອກວດສອບວ່າມີຫຍັງຖືກບລັອກໄວ້ແດ່."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ກວດສອບການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"ໃນ Android 13, ແອັບຕ່າງໆທີ່ທ່ານຕິດຕັ້ງຈະຕ້ອງໃຊ້ການອະນຸຍາດຂອງທ່ານເພື່ອສົ່ງການແຈ້ງເຕືອນ. ແຕະເພື່ອປ່ຽນການອະນຸຍາດນີ້ສຳລັບແອັບທີ່ມີຢູ່ກ່ອນແລ້ວ."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"ແຈ້ງເຕືອນຂ້ອຍພາຍຫຼັງ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ປິດໄວ້"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ລະບົບ"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"ແປ <xliff:g id="MESSAGE">%1$s</xliff:g> ແລ້ວ."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"ແປຂໍ້ຄວາມຈາກ <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> ເປັນ <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> ແລ້ວ."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"ການເຄື່ອນໄຫວໃນພື້ນຫຼັງ"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"ມີແອັບກຳລັງໃຊ້ແບັດເຕີຣີຫຼາຍ"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"ມີແອັບທີ່ຍັງຄົງນຳໃຊ້ຢູ່"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> ກຳລັງເອີ້ນໃຊ້ໃນພື້ນຫຼັງ. ແຕະເພື່ອຈັດການການໃຊ້ແບັດເຕີຣີ."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ອາດສົ່ງຜົນກະທົບຕໍ່ອາຍຸແບັດເຕີຣີ. ແຕະເພື່ອກວດສອບແອັບທີ່ນຳໃຊ້ຢູ່."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"ກວດສອບແອັບທີ່ເຄື່ອນໄຫວ"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"ບໍ່ສາມາດເຂົ້າເຖິງກ້ອງຖ່າຍຮູບຂອງໂທລະສັບຈາກ <xliff:g id="DEVICE">%1$s</xliff:g> ຂອງທ່ານໄດ້"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index f2ce117330d0..989d57c1cc40 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Netrukdymo režimas pakeistas"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Palieskite, kad patikrintumėte, kas blokuojama."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Peržiūrėkite pranešimų nustatymus"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"13 versijos „Android” jūsų įdiegtoms programoms reikia suteikti leidimą siųsti pranešimus. Palieskite, kad pakeistumėte šį leidimą esamoms programoms."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Priminti vėliau"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Atsisakyti"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> @@ -2276,11 +2277,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Pranešimas „<xliff:g id="MESSAGE">%1$s</xliff:g>“ išverstas."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Pranešimas išverstas iš <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> į <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Veikla fone"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Programa eikvoja akumuliatoriaus energiją"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Programa vis dar aktyvi"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"„<xliff:g id="APP">%1$s</xliff:g>“ veikia fone. Palieskite ir tvarkykite akumuliatoriaus energijos vartojimą."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"Programa „<xliff:g id="APP">%1$s</xliff:g>“ gali turėti įtakos akumuliatoriaus veikimo laikui. Palieskite ir peržiūrėkite aktyvias programas."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Peržiūrėkite aktyvias programas"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nepavyko pasiekti telefono fotoaparato iš „<xliff:g id="DEVICE">%1$s</xliff:g>“"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 12b41462e969..076900c9020c 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Režīms “Netraucēt” ir mainīts"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Pieskarieties, lai uzzinātu, kas tiek bloķēts."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Pārskatīt paziņojumu iestatījumus"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Operētājsistēmā Android 13 jūsu instalētajām lietotnēm ir nepieciešama jūsu atļauja, lai sūtītu paziņojumus. Pieskarieties, lai mainītu šo atļauju esošajām lietotnēm."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Atgādināt vēlāk"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Noraidīt"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistēma"</string> @@ -2275,11 +2276,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Iztulkots: <xliff:g id="MESSAGE">%1$s</xliff:g>."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Ziņojums ir iztulkots no šādas valodas: <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> šādā valodā: <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Darbība fonā"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Lietotnes darbības dēļ notiek akumulatora izlāde"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Lietotne joprojām ir aktīva"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Lietotne <xliff:g id="APP">%1$s</xliff:g> darbojas fonā. Pieskarieties, lai pārvaldītu akumulatora lietojumu."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"Lietotne <xliff:g id="APP">%1$s</xliff:g> var ietekmēt akumulatora darbības ilgumu. Pieskarieties, lai pārskatītu aktīvās lietotnes."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Pārbaudiet aktīvās lietotnes"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nevar piekļūt tālruņa kamerai no jūsu ierīces (<xliff:g id="DEVICE">%1$s</xliff:g>)."</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index e287a7af7482..1c4b514cae57 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Поставките за „Не вознемирувај“ се изменија"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Допрете за да проверите што е блокирано."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Прегледајте ги поставките за известувања"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Во Android 13, на апликациите што ги инсталирате им е потребна ваша дозвола за испраќање известувања. Допрете за да ја промените оваа дозвола за постојни апликации."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Потсети ме подоцна"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Отфрли"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Систем"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 23236e08b869..9169e97314e7 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'ശല്യപ്പെടുത്തരുത്\' മാറ്റി"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"എന്തിനെയാണ് ബ്ലോക്ക് ചെയ്തതെന്ന് പരിശോധിക്കാൻ ടാപ്പ് ചെയ്യുക."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"അറിയിപ്പ് ക്രമീകരണം അവലോകനം ചെയ്യുക"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-ൽ നിങ്ങൾ ഇൻസ്റ്റാൾ ചെയ്യുന്ന ആപ്പുകൾക്ക് അറിയിപ്പുകൾ അയയ്ക്കാൻ നിങ്ങളുടെ അനുമതി വേണം. നിലവിലുള്ള ആപ്പുകൾക്ക് ഈ അനുമതി മാറ്റാൻ ടാപ്പ് ചെയ്യുക."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"പിന്നീട് ഓർമ്മിപ്പിക്കൂ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ഡിസ്മിസ് ചെയ്യുക"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"സിസ്റ്റം"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 45ee7549f757..9ee9ad1f1bf4 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Бүү саад бол горимыг өөрчилсөн"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Блоклосон зүйлийг шалгахын тулд товшино уу."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Мэдэгдлийн тохиргоог шалгах"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13-т таны суулгасан аппууд мэдэгдэл илгээхийн тулд тэдгээрт таны зөвшөөрөл шаардлагатай. Одоо байгаа аппуудын уг зөвшөөрлийг өөрчлөхийн тулд товшино уу."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Надад дараа сануул"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Хаах"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Систем"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 408a3ae55340..637342df5082 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"व्यत्यय आणू नका बदलले आहे"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"काय ब्लॉक केले आहे हे तपासण्यासाठी टॅप करा."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"सूचना सेटिंग्जचे पुनरावलोकन करा"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 मध्ये, तुम्ही इंस्टॉल केलेल्या अॅप्सना सूचना पाठवण्यासाठी तुमच्या परवानगीची आवश्यकता असते. सध्याच्या अॅप्ससाठी ही परवानगी बदलण्याकरिता टॅप करा."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"मला आठवण करून द्या"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"डिसमिस करा"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"सिस्टम"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 3a95c940a57d..487fc1db09aa 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Jangan Ganggu telah berubah"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Ketik untuk menyemak item yang disekat."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Semak tetapan pemberitahuan"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Dalam Android 13, apl yang anda pasang memerlukan kebenaran anda untuk menghantar pemberitahuan. Ketik untuk menukar kebenaran ini bagi apl sedia ada."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Ingatkan saya nanti"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ketepikan"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index b655345d6714..78cdb62bff80 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'မနှောင့်ယှက်ရ\' ပြောင်းလဲသွားပါပြီ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"ပိတ်ထားသည့်အရာများကို ကြည့်ရန် တို့ပါ။"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"အကြောင်းကြားချက် ဆက်တင်များ စိစစ်ရန်"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 တွင် သင်ထည့်သွင်းသော အက်ပ်များသည် အကြောင်းကြားချက်များပို့ရန် သင်၏ခွင့်ပြုချက် လိုအပ်ပါမည်။ ရှိပြီးသားအက်ပ်များအတွက် ဤခွင့်ပြုချက်ကိုပြောင်းရန် တို့ပါ။"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"နောက်မှ သတိပေးပါ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ပယ်ရန်"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"စနစ်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 2f495b0151b6..01bb15582ca1 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1887,7 +1887,7 @@ <string name="stk_cc_ss_to_ussd" msgid="8417905193112944760">"SS-forespørsel endret til USSD-forespørsel"</string> <string name="stk_cc_ss_to_ss" msgid="132040645206514450">"Endret til ny SS-forespørsel"</string> <string name="notification_phishing_alert_content_description" msgid="494227305355958790">"Varsel om nettfisking"</string> - <string name="notification_work_profile_content_description" msgid="5296477955677725799">"Arbeidsprofil"</string> + <string name="notification_work_profile_content_description" msgid="5296477955677725799">"Jobbprofil"</string> <string name="notification_alerted_content_description" msgid="6139691253611265992">"Varslet"</string> <string name="notification_verified_content_description" msgid="6401483602782359391">"Bekreftet"</string> <string name="expand_button_content_description_collapsed" msgid="3873368935659010279">"Vis"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Ikke forstyrr er endret"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Trykk for å sjekke hva som er blokkert."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Gjennomgå varslingsinnstillingene"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"I Android 13 må apper du installerer, få tillatelse til å sende varsler. Trykk for å endre denne tillatelsen for eksisterende apper."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Påminn meg senere"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Lukk"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> er oversatt."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Meldingen er oversatt fra <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> til <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktivitet i bakgrunnen"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"En app bruker batteri"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"En app er fremdeles aktiv"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> kjører i bakgrunnen. Trykk for å administrere batteribruken."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> kan påvirke batterilevetiden. Trykk for å gjennomgå aktive apper."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Sjekk aktive apper"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Det er ikke mulig å få tilgang til telefonkameraet fra <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 1bcab4e85c78..b12c5c0cef06 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -1926,7 +1926,7 @@ <string name="app_suspended_default_message" msgid="6451215678552004172">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> अहिले उपलब्ध छैन। यो <xliff:g id="APP_NAME_1">%2$s</xliff:g> द्वारा व्यवस्थित छ।"</string> <string name="app_suspended_more_details" msgid="211260942831587014">"थप जान्नुहोस्"</string> <string name="app_suspended_unsuspend_message" msgid="1665438589450555459">"एपको पज हटाउनुहोस्"</string> - <string name="work_mode_off_title" msgid="961171256005852058">"कामसम्बन्धी एपहरू सक्षम पार्ने हो?"</string> + <string name="work_mode_off_title" msgid="961171256005852058">"कामसम्बन्धी एपहरू अन गर्ने हो?"</string> <string name="work_mode_off_message" msgid="7319580997683623309">"कामसम्बन्धी एप चलाउने र सूचना प्राप्त गर्ने सुविधा अन गर्नुहोस्"</string> <string name="work_mode_turn_on" msgid="3662561662475962285">"अन गर्नुहोस्"</string> <string name="app_blocked_title" msgid="7353262160455028160">"एप उपलब्ध छैन"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"बाधा नपुर्याउनुहोस् मोड परिवर्तन भएको छ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"रोक लगाइएका कुराहरू जाँच गर्न ट्याप गर्नुहोस्।"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"सूचनाका सेटिङको समीक्षा गर्नुहोस्"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android १३ मा तपाईंले अनुमति दिनुभएका खण्डमा मात्र तपाईंले इन्स्टल गर्नुभएका एपले सूचना पठाउन सक्छन्। यसअघि इन्स्टल गरिसकिएका एपका हकमा यो अनुमति परिवर्तन गर्न ट्याप गर्नुहोस्।"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"मलाई पछि स्मरण गराइयोस्"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"हटाउनुहोस्"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"प्रणाली"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> अनुवाद गरिएको छ।"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"म्यासेज <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> भाषाबाट <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> भाषामा अनुवाद गरिएको छ।"</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"ब्याकग्राउन्डमा गरिएको क्रियाकलाप"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"कुनै एपले ब्याट्री खपत गरिरहेको छ"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"कुनै एप अझै पनि चलिरहेको छ"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> ब्याकग्राउन्डमा चलिरहेको छ। कुन एपले कति ब्याट्री खपत गर्छ भन्ने कुरा व्यवस्थापन गर्न ट्याप गर्नुहोस्।"</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ले ब्याट्रीको आयु घटाउन सक्छ। सक्रिय एपहरू हेर्न ट्याप गर्नुहोस्।"</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"कुन कुन एप सक्रिय छ भन्ने कुरा जाँच्नुहोस्"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"तपाईंको <xliff:g id="DEVICE">%1$s</xliff:g> मार्फत फोनको क्यामेरा प्रयोग गर्न मिल्दैन"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 93f96104bb63..f5448049bbf6 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'Niet storen\' is gewijzigd"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tik om te controleren wat er is geblokkeerd."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Instellingen voor meldingen bekijken"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"In Android 13 hebben apps die je installeert je toestemming nodig om meldingen te sturen. Tik om deze toestemming voor bestaande apps te wijzigen."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Later herinneren"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Sluiten"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Systeem"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> vertaald."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Bericht vertaald vanuit het <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> naar het <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Achtergrondactiviteit"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Een app gebruikt de batterij overmatig"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Een app is nog actief"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> is op de achtergrond actief. Tik om het batterijgebruik te beheren."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> kan van invloed zijn op de batterijduur. Tik om actieve apps te bekijken."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Actieve apps checken"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Kan geen toegang tot de camera van de telefoon krijgen vanaf je <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 6b58faf99960..a51d2f36c9c4 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ବଦଳିଯାଇଛି"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"କ’ଣ ଅବରୋଧ ହୋଇଛି ଯାଞ୍ଚ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ବିଜ୍ଞପ୍ତି ସେଟିଂସକୁ ସମୀକ୍ଷା କରନ୍ତୁ"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13ରେ, ଆପଣ ଇନଷ୍ଟଲ କରୁଥିବା ଆପ୍ସ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ପଠାଇବା ପାଇଁ ଆପଣଙ୍କ ଅନୁମତି ଆବଶ୍ୟକ କରେ। ପୂର୍ବରୁ ଥିବା ଆପ୍ସ ପାଇଁ ଏହି ଅନୁମତିକୁ ପରିବର୍ତ୍ତନ କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"ମୋତେ ପରେ ରିମାଇଣ୍ଡ କର"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ଖାରଜ କରନ୍ତୁ"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ସିଷ୍ଟମ୍"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> ଅନୁବାଦ କରାଯାଇଛି।"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"ମେସେଜ୍, <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>ରୁ <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>କୁ ଅନୁବାଦ କରାଯାଇଛି।"</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"ପୃଷ୍ଠପଟ କାର୍ଯ୍ୟକଳାପ"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"ଏକ ଆପ ବ୍ୟାଟେରୀର ଚାର୍ଜ ଶୀଘ୍ର ସମାପ୍ତ କରୁଛି"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"ଏକ ଆପ ଏବେ ବି ସକ୍ରିୟ ଅଛି"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> ପୃଷ୍ଠପଟରେ ଚାଲୁଛି। ବ୍ୟାଟେରୀ ବ୍ୟବହାର ପରିଚାଳନା କରିବାକୁ ଟାପ କରନ୍ତୁ।"</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ବ୍ୟାଟେରୀ ଲାଇଫକୁ ପ୍ରଭାବିତ କରିପାରେ। ସକ୍ରିୟ ଆପ୍ସକୁ ସମୀକ୍ଷା କରିବା ପାଇଁ ଟାପ କରନ୍ତୁ।"</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"ସକ୍ରିୟ ଆପଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରନ୍ତୁ"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"ଆପଣଙ୍କ <xliff:g id="DEVICE">%1$s</xliff:g>ରୁ ଫୋନର କ୍ୟାମେରାକୁ ଆକ୍ସେସ କରାଯାଇପାରିବ ନାହିଁ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index c02e01d43105..2bc6da6d9d2f 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵਿਕਲਪ ਬਦਲ ਗਿਆ ਹੈ"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"ਟੈਪ ਕਰਕੇ ਦੋਖੋ ਕਿ ਕਿਹੜੀਆਂ ਚੀਜ਼ਾਂ ਬਲਾਕ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ।"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 ਵਿੱਚ, ਤੁਹਾਡੇ ਵੱਲੋਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਐਪਾਂ ਨੂੰ ਸੂਚਨਾਵਾਂ ਭੇਜਣ ਲਈ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਮੌਜੂਦਾ ਐਪਾਂ ਲਈ ਇਸ ਇਜਾਜ਼ਤ ਨੂੰ ਬਦਲਣ ਵਾਸਤੇ ਟੈਪ ਕਰੋ।"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"ਬਾਅਦ ਵਿੱਚ ਯਾਦ ਕਰਵਾਓ"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ਖਾਰਜ ਕਰੋ"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ਸਿਸਟਮ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 8e44bde5a4bf..6c96e08c2cf2 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Zmiany w trybie Nie przeszkadzać"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Kliknij, by sprawdzić, co jest zablokowane."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Sprawdź ustawienia powiadomień"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Na Androidzie 13 aplikacje, które zainstalujesz, będą potrzebowały zezwolenia na wysyłanie powiadomień. Kliknij, aby zmienić uprawnienia dla istniejących aplikacji."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Przypomnij później"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Odrzuć"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> @@ -2276,11 +2277,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"Przetłumaczono wiadomość: <xliff:g id="MESSAGE">%1$s</xliff:g>."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Wiadomość przetłumaczono z języka: <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> na język: <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktywność w tle"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Aplikacja zużywa baterię"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Aplikacja jest wciąż aktywna"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Aplikacja <xliff:g id="APP">%1$s</xliff:g> działa w tle. Kliknij, by zarządzać wykorzystaniem baterii."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"Aplikacja <xliff:g id="APP">%1$s</xliff:g> może mieć wpływ na czas pracy na baterii. Kliknij, aby sprawdzić aktywne aplikacje."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Sprawdź aktywne aplikacje"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nie można korzystać z aparatu telefonu na urządzeniu <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 375e16df61e2..dd51ad91072e 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"O modo \"Não perturbe\" foi alterado"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toque para verificar o que está bloqueado."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Revise as configurações de notificação"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"No Android 13, os apps que você instala precisam da sua permissão para enviar notificações. Toque para mudar essa permissão para os apps já instalados."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Lembrar mais tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dispensar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 47a6fe521568..c51cf863fb70 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"O modo Não incomodar foi alterado"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toque para verificar o que está bloqueado."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Analise as definições de notificação"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"No Android 13, as apps que instalar precisam da sua autorização para enviar notificações. Toque para alterar esta autorização para as apps existentes."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Lembrar mais tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ignorar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 375e16df61e2..dd51ad91072e 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"O modo \"Não perturbe\" foi alterado"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Toque para verificar o que está bloqueado."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Revise as configurações de notificação"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"No Android 13, os apps que você instala precisam da sua permissão para enviar notificações. Toque para mudar essa permissão para os apps já instalados."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Lembrar mais tarde"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Dispensar"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistema"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 5b84189231e8..c1e6d87b568d 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Funcția Nu deranja s-a schimbat"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Atingeți pentru a verifica ce este blocat."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Examinați setările pentru notificări"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Pe Android 13, aplicațiile pe care le instalați necesită permisiunea de a trimite notificări. Atingeți ca să modificați permisiunea pentru aplicațiile existente."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Mai târziu"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Închideți"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index b90c3c3cc87a..ce3cfe748058 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Настройки режима \"Не беспокоить\" изменены"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Нажмите, чтобы проверить настройки."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Проверьте настройки уведомлений"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Если вы хотите получать уведомления от приложения в Android 13, после установки ему нужно предоставить надлежащее разрешение. Нажмите, чтобы настроить разрешения для установленных приложений."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Напомнить позже"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Закрыть"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Система"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 1cb81a98f39d..8fdfeb7346d1 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"බාධා නොකරන්න වෙනස් කර ඇත"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"අවහිර කර ඇති දේ පරීක්ෂා කිරීමට තට්ටු කරන්න."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"දැනුම්දීම් සැකසීම් සමාලෝචනය කරන්න"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 හි, ඔබ ස්ථාපනය කරන යෙදුම්වලට දැනුම්දීම් යැවීමට ඔබගේ අවසරය අවශ්ය වේ. තිබෙන යෙදුම් සඳහා මෙම අවසරය වෙනස් කිරීමට තට්ටු කරන්න."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"මට පසුව මතක් කරන්න"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ඉවත ලන්න"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"පද්ධතිය"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 70f6a51a7043..01583c8603dd 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Režim bez vyrušení sa zmenil"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Klepnutím skontrolujete, čo je blokované."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Kontrola nastavení upozornení"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"V Androide 13 vyžadujú nainštalované aplikácie povolenie, aby mohli odosielať upozornenia. Klepnutím môžete zmeniť toto povolenie pre existujúce aplikácie."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Pripomenúť neskôr"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Zavrieť"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Systém"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 7515456765cc..f69442822825 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -2055,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Način »ne moti« je spremenjen"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Dotaknite se, da preverite, kaj je blokirano."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Preglejte nastavitve obvestil"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"V Androidu 13 bodo aplikacije, ki jih namestite, za pošiljanje obvestil potrebovale vaše dovoljenje. Dotaknite se, če želite spremeniti to dovoljenje za obstoječe aplikacije."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Opomni me pozneje"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Opusti"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index f247fa9fb7b1..52fcea3a2826 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\"Mos shqetëso\" ka ndryshuar"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Trokit për të shënuar atë që është bllokuar"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Rishiko cilësimet e njoftimeve"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Në Android 13, aplikacionet që instalon kanë nevojë për lejen tënde për të dërguar njoftime. Trokit për ta ndryshuar këtë leje për aplikacionet ekzistuese."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Më kujto më vonë"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Hiq"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistemi"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> i përkthyer."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Mesazhi u përkthye nga <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> në <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Aktiviteti në sfond"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Një aplikacion po shkarkon baterinë"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Një aplikacion është ende aktiv"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> po ekzekutohet në sfond. Trokit për të menaxhuar përdorimin e baterisë."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> mund të kenë ndikim në kohëzgjatjen e baterisë. Trokit për të rishikuar aplikacionet aktive."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Kontrollo aplikacionet aktive"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Nuk mund të qasesh në kamerën e telefonit tënd nga <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 3a5db52eab52..0dbef5a0a2a9 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -2054,7 +2054,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Режим Не узнемиравај је промењен"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Додирните да бисте проверили шта је блокирано."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Прегледајте подешавања обавештења"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"У Android-у 13 апликације које инсталирате морају да имају дозволу за слање обавештења. Додирните да бисте променили ову дозволу за постојеће апликације."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Подсети ме касније"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Одбаци"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Систем"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 5cf929f9d399..6223b0dfd762 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Stör ej har ändrats"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Tryck om du vill se vad som blockeras."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Granska aviseringsinställningarna"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"I Android 13 behöver appar som du installerar behörighet att skicka aviseringar. Tryck om du vill ändra denna behörighet för befintliga appar."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Påminn mig senare"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Stäng"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> har översatts."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Meddelandet har översatts från <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> till<xliff:g id="TO_LANGUAGE">%2$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Bakgrundsaktivitet"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"En app laddar ur batteriet"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"En app är fortfarande aktiv"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> körs i bakgrunden. Tryck för att hantera batteriförbrukning."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> kan påverka batteritiden. Tryck för att granska de aktiva apparna."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Kontrollera aktiva appar"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Telefonens kamera kan inte användas från <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index cf7044532e45..aded067bebb4 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Kipengele cha Usinisumbue kimebadilishwa"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Gusa ili uangalie kipengee ambacho kimezuiwa."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Kagua mipangilio ya arifa"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Kwenye Android toleo la 13, programu ambazo unasakinisha zitahitaji ruhusa yako ili zikutumie arifa. Gusa ili ubadilishe ruhusa hii kwa programu zilizopo."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Nikumbushe baadaye"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Ondoa"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Mfumo"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> Imetafsiriwa."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Ujumbe umetafsiriwa kwa <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> kutoka <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Shughuli za Chinichini"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Programu inamaliza chaji ya betri haraka"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Programu bado inatumika"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> inatumika chinichini. Gusa ili udhibiti matumizi ya betri."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> inaweza kuathiri muda wa matumizi ya betri. Gusa ili ukague programu zinazotumika."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Angalia programu zinazotumika"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Haiwezi kufikia kamera ya simu kutoka kwenye <xliff:g id="DEVICE">%1$s</xliff:g> yako"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 31d702942b64..b7dd38729bd3 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"தொந்தரவு செய்ய வேண்டாம் அமைப்புகள் மாற்றப்பட்டன"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"எவற்றையெல்லாம் தடுக்கிறது என்பதைப் பார்க்க, தட்டவும்."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"அறிவிப்பு அமைப்புகளை மதிப்பாய்வு செய்யுங்கள்"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13ல், நீங்கள் நிறுவுகின்ற ஆப்ஸ் உங்களுக்கு அறிவிப்புகளை அனுப்ப உங்கள் அனுமதி தேவை. ஏற்கெனவே உள்ள ஆப்ஸுக்கு இந்த அனுமதியை மாற்ற தட்டவும்."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"பின்னர் நினைவூட்டு"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"நிராகரி"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"சிஸ்டம்"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> மொழிபெயர்க்கப்பட்டது."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"<xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> மொழியிலிருந்து <xliff:g id="TO_LANGUAGE">%2$s</xliff:g> மொழிக்கு மெசேஜ் மொழிபெயர்க்கப்பட்டது."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"பின்னணிச் செயல்பாடு"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"ஓர் ஆப்ஸ் பேட்டரியை அதிகமாகப் பயன்படுத்துதல்"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"ஆப்ஸ் செயல்பாட்டில் உள்ளது"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"பின்னணியில் <xliff:g id="APP">%1$s</xliff:g> இயங்கிக் கொண்டிருக்கிறது. பேட்டரி உபயோகத்தை நிர்வகிக்க, தட்டவும்."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> பேட்டரியின் ஆயுளைப் பாதிக்கலாம். செயலிலுள்ள ஆப்ஸைப் பார்க்க தட்டவும்."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"செயலிலுள்ள ஆப்ஸைப் பாருங்கள்"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"உங்கள் <xliff:g id="DEVICE">%1$s</xliff:g> சாதனத்திலிருந்து மொபைலின் கேமராவை அணுக முடியாது"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 1c3d4fce719f..3b807415d47d 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1224,7 +1224,7 @@ <string name="unsupported_display_size_show" msgid="980129850974919375">"ఎల్లప్పుడూ చూపు"</string> <string name="unsupported_compile_sdk_message" msgid="7326293500707890537">"Android OS యొక్క అననుకూల వెర్షన్ కోసం <xliff:g id="APP_NAME">%1$s</xliff:g> రూపొందించబడింది మరియు ఊహించని సమస్యలు తలెత్తవచ్చు. యాప్ యొక్క అప్డేట్ చేసిన వెర్షన్ అందుబాటులో ఉండవచ్చు."</string> <string name="unsupported_compile_sdk_show" msgid="1601210057960312248">"ఎల్లప్పుడూ చూపు"</string> - <string name="unsupported_compile_sdk_check_update" msgid="1103639989147664456">"అప్డేట్ కోసం తనిఖీ చేయి"</string> + <string name="unsupported_compile_sdk_check_update" msgid="1103639989147664456">"అప్డేట్ కోసం చెక్ చేయి"</string> <string name="smv_application" msgid="3775183542777792638">"<xliff:g id="APPLICATION">%1$s</xliff:g> యాప్ (<xliff:g id="PROCESS">%2$s</xliff:g> ప్రాసెస్) అది స్వయంగా అమలు చేసే ఖచ్చితమైన మోడ్ విధానాన్ని ఉల్లంఘించింది."</string> <string name="smv_process" msgid="1398801497130695446">"ప్రక్రియ <xliff:g id="PROCESS">%1$s</xliff:g> అది స్వయంగా అమలు చేసే ఖచ్చితమైన మోడ్ విధానాన్ని ఉల్లంఘించింది."</string> <string name="android_upgrading_title" product="default" msgid="7279077384220829683">"ఫోన్ అప్డేట్ అవుతోంది…"</string> @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"అంతరాయం కలిగించవద్దు మార్చబడింది"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"బ్లాక్ చేయబడిన దాన్ని తనిఖీ చేయడానికి నొక్కండి."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"నోటిఫికేషన్ సెట్టింగ్లను రివ్యూ చేయండి"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13లో, మీరు ఇన్స్టాల్ చేసే యాప్లకు నోటిఫికేషన్లను పంపడానికి మీ అనుమతి అవసరం. ఇప్పటికే ఉన్న యాప్ల కోసం ఈ అనుమతిని మార్చడానికి ట్యాప్ చేయండి."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"తర్వాత గుర్తు చేయి"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"విస్మరించండి"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"సిస్టమ్"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> అనువదించబడింది."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"మెసేజ్ <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> నుండి <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>కు అనువదించబడింది."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"బ్యాక్గ్రౌండ్ యాక్టివిటీ"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"యాప్ బ్యాటరీని డ్రెయిన్ చేస్తోంది"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"యాప్ ఇప్పటికీ యాక్టివ్గా ఉంది"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> బ్యాక్గ్రౌండ్లో రన్ అవుతోంది. బ్యాటరీ వినియోగాన్ని మేనేజ్ చేయడానికి."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> బ్యాటరీ జీవితకాలాన్ని ప్రభావితం చేయవచ్చు. యాక్టివ్ యాప్లను రివ్యూ చేయడానికి ట్యాప్ చేయండి."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"యాక్టివ్గా ఉన్న యాప్లను చెక్ చేయండి"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"మీ <xliff:g id="DEVICE">%1$s</xliff:g> నుండి ఫోన్ కెమెరాను యాక్సెస్ చేయడం సాధ్యపడదు"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index d52428329119..77e1ab18b95e 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"เปลี่ยน \"ห้ามรบกวน\" แล้ว"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"แตะเพื่อดูรายการที่ถูกบล็อก"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"ตรวจสอบการตั้งค่าการแจ้งเตือน"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"ใน Android 13 แอปที่คุณติดตั้งจะต้องได้รับสิทธิ์จากคุณเพื่อส่งการแจ้งเตือน แตะเพื่อเปลี่ยนแปลงสิทธิ์นี้สำหรับแอปที่มีอยู่"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"เตือนภายหลัง"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"ปิด"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"ระบบ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index d0504747e3b2..bb071ad28acd 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Binago ang Huwag Istorbohin"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"I-tap para tingnan kung ano ang naka-block."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Suriin ang mga setting ng notification"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Sa Android 13, kakailanganin ng mga app na na-install mo ng pahintulot para magpadala ng mga notification. I-tap para baguhin ang pahintulot na ito para sa mga kasalukuyang app."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Ipaalala mamaya"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"I-dismiss"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"System"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index fbfec602e42a..add4cc3dd699 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Rahatsız Etmeyin modu değişti"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Nelerin engellendiğini kontrol etmek için dokunun."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Bildirim ayarlarını inceleyin"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13\'te yüklediğiniz uygulamaların bildirim göndermek için izninize ihtiyacı vardır. Mevcut uygulamalarda bu izni değiştirmek için dokunun."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Sonra hatırlat"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Kapat"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Sistem"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> Çevrildi."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Mesajın, <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>-<xliff:g id="TO_LANGUAGE">%2$s</xliff:g> çevirisi yapıldı."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Arka Plan Etkinliği"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Bir uygulama, pili hızlı tüketiyor"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Hâlâ etkin olan bir uygulama var"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> arka planda çalışıyor. Pil kullanımını yönetmek için dokunun."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> uygulaması pil ömrünü etkileyebilir. Etkin uygulamaları incelemek için dokunun."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Etkin uygulamaları kontrol edin"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"<xliff:g id="DEVICE">%1$s</xliff:g> cihazınızdan telefonun kamerasına erişilemiyor"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index ec4e52cbbac4..582dc57814f8 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1935,36 +1935,21 @@ <string name="app_blocked_message" msgid="542972921087873023">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> зараз недоступний."</string> <string name="app_streaming_blocked_title" msgid="6090945835898766139">"Недоступно: <xliff:g id="ACTIVITY">%1$s</xliff:g>"</string> <string name="app_streaming_blocked_title_for_permission_dialog" msgid="4483161748582966785">"Потрібен дозвіл"</string> - <!-- no translation found for app_streaming_blocked_title_for_camera_dialog (3935701653713853065) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_fingerprint_dialog (3516853717714141951) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_microphone_dialog (544822455127171206) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (196994247017450357) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (8222710146267948647) --> - <skip /> - <!-- no translation found for app_streaming_blocked_title_for_settings_dialog (6895719984375299791) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (5024599278277957935) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (7491114163056552686) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message (1245180131667647277) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (6306583663205997979) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (6545624942642129664) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_permission_dialog (8462740631707923000) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (3470977315395784567) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (698460091901465092) --> - <skip /> - <!-- no translation found for app_streaming_blocked_message_for_fingerprint_dialog (8552691971910603907) --> - <skip /> + <string name="app_streaming_blocked_title_for_camera_dialog" msgid="3935701653713853065">"Камера недоступна"</string> + <string name="app_streaming_blocked_title_for_fingerprint_dialog" msgid="3516853717714141951">"Продовжте на телефоні"</string> + <string name="app_streaming_blocked_title_for_microphone_dialog" msgid="544822455127171206">"Мікрофон недоступний"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="tv" msgid="196994247017450357">"Налаштування Android TV недоступні"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="tablet" msgid="8222710146267948647">"Налаштування планшета недоступні"</string> + <string name="app_streaming_blocked_title_for_settings_dialog" product="default" msgid="6895719984375299791">"Налаштування телефона недоступні"</string> + <string name="app_streaming_blocked_message" product="tv" msgid="5024599278277957935">"Цей додаток недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися пристроєм Android TV."</string> + <string name="app_streaming_blocked_message" product="tablet" msgid="7491114163056552686">"Цей додаток недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися планшетом."</string> + <string name="app_streaming_blocked_message" product="default" msgid="1245180131667647277">"Цей додаток недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися телефоном."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="tv" msgid="6306583663205997979">"Цей додаток зараз недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися пристроєм Android TV."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="tablet" msgid="6545624942642129664">"Цей додаток зараз недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися планшетом."</string> + <string name="app_streaming_blocked_message_for_permission_dialog" product="default" msgid="8462740631707923000">"Цей додаток зараз недоступний на вашому пристрої (<xliff:g id="DEVICE">%1$s</xliff:g>). Спробуйте натомість скористатися телефоном."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv" msgid="3470977315395784567">"Цьому додатку потрібен додатковий рівень безпеки. Спробуйте натомість скористатися пристроєм Android TV."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet" msgid="698460091901465092">"Цьому додатку потрібен додатковий рівень безпеки. Спробуйте натомість скористатися планшетом."</string> + <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default" msgid="8552691971910603907">"Цьому додатку потрібен додатковий рівень безпеки. Спробуйте натомість скористатися телефоном."</string> <string name="deprecated_target_sdk_message" msgid="5203207875657579953">"Цей додаток створений для старішої версії Android і може працювати неналежним чином. Спробуйте знайти оновлення або зв’яжіться з розробником."</string> <string name="deprecated_target_sdk_app_store" msgid="8456784048558808909">"Шукати оновлення"</string> <string name="new_sms_notification_title" msgid="6528758221319927107">"У вас є нові повідомлення"</string> @@ -2070,7 +2055,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Налаштування режиму \"Не турбувати\" змінено"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Торкніться, щоб перевірити, що заблоковано."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Перегляньте налаштування сповіщень"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"В ОС Android 13 встановленим додаткам потрібно надати дозвіл, щоб вони могли надсилати сповіщення. Натисніть, щоб змінити цей дозвіл для наявних додатків."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Нагадати пізніше"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Закрити"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Система"</string> @@ -2291,11 +2277,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> (перекладене повідомлення)."</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"Повідомлення перекладено (мова оригіналу: <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>, мова перекладу: <xliff:g id="TO_LANGUAGE">%2$s</xliff:g>)."</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"Робота у фоновому режимі"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"Додаток швидко розряджає акумулятор"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"Додаток досі активний"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"Додаток <xliff:g id="APP">%1$s</xliff:g> працює у фоновому режимі. Натисніть, щоб керувати використанням заряду."</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"Додаток <xliff:g id="APP">%1$s</xliff:g> може вплинути на час роботи акумулятора. Натисніть, щоб переглянути активні додатки."</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"Перевірте активні додатки"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"Не вдається отримати доступ до камери телефона з пристрою <xliff:g id="DEVICE">%1$s</xliff:g>"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 80f88497934f..20c931e51716 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"\'ڈسٹرب نہ کریں\' تبدیل ہو گيا ہے"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"مسدود کی گئی چیزوں کو چیک کرنے کے لیے تھپتھپائیں۔"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"اطلاع کی ترتیبات کا جائزہ لیں"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 میں، اطلاعات بھیجنے کے لیے آپ کے انسٹال کردہ ایپس کو آپ کی اجازت درکار ہوتی ہے۔ موجودہ ایپس کے لیے اس اجازت کو تبدیل کرنے کی خاطر تھپتھپائیں۔"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"بعد میں یاد دلائیں"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"برخاست کریں"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"سسٹم"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"<xliff:g id="MESSAGE">%1$s</xliff:g> کا ترجمہ کیا گیا۔"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"پیغام کا ترجمہ <xliff:g id="FROM_LANGUAGE">%1$s</xliff:g> سے<xliff:g id="TO_LANGUAGE">%2$s</xliff:g> میں کیا گیا۔"</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"پس منظر کی سرگرمی"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"ایپ کی بیٹری ختم ہو رہی ہے"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"ایک ایپ اب بھی فعال ہے"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"<xliff:g id="APP">%1$s</xliff:g> پس منظر میں چل رہی ہے۔ بیٹری کے استعمال کا نظم کرنے کے لیے تھپتھپائیں۔"</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"<xliff:g id="APP">%1$s</xliff:g> ایپ بیٹری لائف کو متاثر کر سکتی ہے۔ فعال ایپس کا جائزہ لینے کے لیے تھپتھپائیں۔"</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"فعال ایپس چیک کریں"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"آپ کے <xliff:g id="DEVICE">%1$s</xliff:g> سے فون کے کیمرا تک رسائی حاصل نہیں کی جا سکتی"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index e00860e9dee7..6905f900b465 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Bezovta qilinmasin rejimi sozlamalari o‘zgartirildi"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Nimalar bloklanganini tekshirish uchun bosing"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Bildirishnoma sozlamalarini tekshiring"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Android 13 versiyasida oʻrnatiladigan ilovalar bildirishnoma yuborishiga ruxsat talab etiladi. Mavjud ilovalar uchun bu ruxsatni oʻzgartirish uchun bosing."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Keyinroq eslatilsin"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Yopish"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Tizim"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 944b02d60fb4..4ccbfad3b718 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Cài đặt Không làm phiền đã thay đổi"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Nhấn để xem những thông báo bị chặn."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Xem lại chế độ cài đặt thông báo"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Trên Android 13, các ứng dụng mà bạn cài đặt sẽ cần bạn cấp quyền gửi thông báo. Hãy nhấn để thay đổi quyền này cho các ứng dụng hiện có."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Nhắc tôi sau"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Đóng"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Hệ thống"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 2053b6a4d992..33c78c279555 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"“勿扰”设置有变更"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"点按即可查看屏蔽内容。"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"查看通知设置"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"在 Android 13 中，您安装的应用需要您授予相应权限才能发送通知。点按即可为现有应用更改此权限。"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"稍后提醒我"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"关闭"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"系统"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index eb07e300c129..2e891cfb1ec0 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"請勿騷擾已變更"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"輕按即可查看封鎖內容。"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"查看通知設定"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"在 Android 13 中，您安裝的應用程式須獲得授權才能傳送通知。輕按即可變更現有應用程式的這項權限。"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"稍後提醒我"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"關閉"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"系統"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 44dba0be8eb9..5ec0a0c1d0f5 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"「零打擾」設定已變更"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"輕觸即可查看遭封鎖的項目。"</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"查看通知設定"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"在 Android 13 中，你安裝的應用程式必須獲得授權，才能傳送通知。輕觸即可變更現有應用程式的這項權限。"</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"稍後提醒我"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"關閉"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"系統"</string> @@ -2274,11 +2275,9 @@ <string name="ui_translation_accessibility_translated_text" msgid="3197547218178944544">"已翻譯<xliff:g id="MESSAGE">%1$s</xliff:g>。"</string> <string name="ui_translation_accessibility_translation_finished" msgid="3057830947610088465">"訊息內容已從<xliff:g id="FROM_LANGUAGE">%1$s</xliff:g>翻成<xliff:g id="TO_LANGUAGE">%2$s</xliff:g>。"</string> <string name="notification_channel_abusive_bg_apps" msgid="6092140213264920355">"背景活動"</string> - <!-- no translation found for notification_title_abusive_bg_apps (994230770856147656) --> - <skip /> + <string name="notification_title_abusive_bg_apps" msgid="994230770856147656">"某個應用程式正在耗用大量電力"</string> <string name="notification_title_long_running_fgs" msgid="8170284286477131587">"某個應用程式目前仍在運作"</string> - <!-- no translation found for notification_content_abusive_bg_apps (5296898075922695259) --> - <skip /> + <string name="notification_content_abusive_bg_apps" msgid="5296898075922695259">"「<xliff:g id="APP">%1$s</xliff:g>」正在背景運作。輕觸即可管理電池用量。"</string> <string name="notification_content_long_running_fgs" msgid="8258193410039977101">"「<xliff:g id="APP">%1$s</xliff:g>」應用程式可能會影響電池續航力。輕觸即可查看使用中的應用程式。"</string> <string name="notification_action_check_bg_apps" msgid="4758877443365362532">"查看使用中的應用程式"</string> <string name="vdm_camera_access_denied" product="default" msgid="6102378580971542473">"無法從 <xliff:g id="DEVICE">%1$s</xliff:g> 存取手機的相機"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 76c39ac35ccb..ee1711cd15f8 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -2053,7 +2053,8 @@ <string name="zen_upgrade_notification_title" msgid="8198167698095298717">"Ukungaphazamisi kushintshile"</string> <string name="zen_upgrade_notification_content" msgid="5228458567180124005">"Thepha ukuze uhlole ukuthi yini evinjelwe."</string> <string name="review_notification_settings_title" msgid="5102557424459810820">"Buyekeza amasethingi wesaziso"</string> - <string name="review_notification_settings_text" msgid="5696497037817525074">"Ku-Android 13, ama-app owafakayo adinga imvume yakho yokuthumela izaziso. Thepha ukuze ushintshe le mvume yama-app akhona kakade."</string> + <!-- no translation found for review_notification_settings_text (5916244866751849279) --> + <skip /> <string name="review_notification_settings_remind_me_action" msgid="1081081018678480907">"Ngikhumbuze ngesinye isikhathi"</string> <string name="review_notification_settings_dismiss" msgid="4160916504616428294">"Chitha"</string> <string name="notification_app_name_system" msgid="3045196791746735601">"Isistimu"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b23d8cab74d4..19b72bfbe6c0 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2966,6 +2966,9 @@ config_preventImeStartupUnlessTextEditor. --> <string-array name="config_nonPreemptibleInputMethods" translatable="false" /> + <!-- Flag indicating that enhanced confirmation mode is enabled. --> + <bool name="config_enhancedConfirmationModeEnabled">true</bool> + <!-- The list of classes that should be added to the notification ranking pipeline. See {@link com.android.server.notification.NotificationSignalExtractor} If you add a new extractor to this list make sure to update @@ -5775,4 +5778,7 @@ <string name="safety_protection_display_text"></string> <!-- End safety protection resources to be overlaid --> + + <!-- List of the labels of requestable device state config values --> + <string-array name="config_deviceStatesAvailableForAppRequests"/> </resources> diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml index 77500c42c6bf..d9ac5164f705 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -109,4 +109,12 @@ <!-- Telephony qualified networks service class name to bind to by default. --> <string name="config_qualified_networks_service_class" translatable="false"></string> <java-symbol type="string" name="config_qualified_networks_service_class" /> + + <!-- Whether enhanced IWLAN handover check is enabled. If enabled, telephony frameworks + will not perform handover if the target transport is out of service, or VoPS not + supported. The network will be torn down on the source transport, and will be + re-established on the target transport when condition is allowed for bringing up a + new network. --> + <bool name="config_enhanced_iwlan_handover_check">true</bool> + <java-symbol type="bool" name="config_enhanced_iwlan_handover_check" /> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index ff87ac07b291..824dd8be0160 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -876,19 +876,19 @@ <string name="permgroupdesc_sms">send and view SMS messages</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permgrouplab_storage">Files & documents</string> + <string name="permgrouplab_storage">Files and documents</string> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgroupdesc_storage">access files and documents on your device</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]--> - <string name="permgrouplab_readMediaAural">Music & other audio</string> + <string name="permgrouplab_readMediaAural">Music and audio</string> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]--> - <string name="permgroupdesc_readMediaAural">access audio files on your device</string> + <string name="permgroupdesc_readMediaAural">access music and audio on your device</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]--> - <string name="permgrouplab_readMediaVisual">Photos & videos</string> + <string name="permgrouplab_readMediaVisual">Photos and videos</string> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]--> - <string name="permgroupdesc_readMediaVisual">access images and video files on your device</string> + <string name="permgroupdesc_readMediaVisual">access photos and videos on your device</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgrouplab_microphone">Microphone</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 21b235104694..012030e9b393 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2256,6 +2256,7 @@ <java-symbol type="bool" name="config_killableInputMethods" /> <java-symbol type="bool" name="config_preventImeStartupUnlessTextEditor" /> <java-symbol type="array" name="config_nonPreemptibleInputMethods" /> + <java-symbol type="bool" name="config_enhancedConfirmationModeEnabled" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> @@ -4773,6 +4774,7 @@ <java-symbol type="bool" name="config_bg_current_drain_high_threshold_by_bg_location" /> <java-symbol type="drawable" name="ic_swap_horiz" /> <java-symbol type="bool" name="config_notificationForceUserSetOnUpgrade" /> + <java-symbol type="array" name="config_deviceStatesAvailableForAppRequests" /> <!-- For app language picker --> <java-symbol type="string" name="system_locale_title" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index bf42da080390..a60862b74e15 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -894,6 +894,22 @@ please see themes_device_defaults.xml. <!-- @hide Special theme for the default system Activity-based Alert dialogs. --> <style name="Theme.Dialog.Confirmation" parent="Theme.DeviceDefault.Dialog.Alert.DayNight" /> + <!-- @hide Theme for GameSessionTrampolineActivity that prevents showing UI and activity + transitions. --> + <style name="Theme.GameSessionTrampoline"> + <item name="backgroundDimEnabled">false</item> + <item name="colorBackgroundCacheHint">@null</item> + <item name="navigationBarColor">@color/transparent</item> + <item name="statusBarColor">@color/transparent</item> + <item name="windowAnimationStyle">@null</item> + <item name="windowBackground">@null</item> + <item name="windowContentOverlay">@null</item> + <item name="windowDrawsSystemBarBackgrounds">true</item> + <item name="windowIsFloating">true</item> + <item name="windowIsTranslucent">true</item> + <item name="windowNoTitle">true</item> + </style> + <!-- Theme for a window that looks like a toast. --> <style name="Theme.Toast" parent="Theme.DeviceDefault.Dialog"> <item name="windowBackground">?attr/toastFrameBackground</item> diff --git a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java index c194989b2752..8587a3579def 100644 --- a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java +++ b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java @@ -166,7 +166,8 @@ public class StartProgramListUpdatesFanoutTest { new HashSet<ProgramSelector.Identifier>(), true, false); // Start updates on the clients in order. The HAL filter should get updated after each - // client except [2]. + // client except [2]. Client [2] should update received chunk with an empty program + // list mTunerSessions[0].startProgramListUpdates(idFilter); ProgramFilter halFilter = Convert.programFilterToHal(idFilter); verify(mHalTunerSessionMock, times(1)).startProgramListUpdates(halFilter); @@ -177,6 +178,9 @@ public class StartProgramListUpdatesFanoutTest { mTunerSessions[2].startProgramListUpdates(typeFilterWithoutModifications); verify(mHalTunerSessionMock, times(2)).startProgramListUpdates(any()); + verifyAidlClientReceivedChunk(mAidlTunerCallbackMocks[2], true, Arrays.asList(), + null); + verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(1)).onProgramListUpdated(any()); mTunerSessions[3].startProgramListUpdates(typeFilterWithModifications); halFilter.excludeModifications = false; @@ -207,7 +211,7 @@ public class StartProgramListUpdatesFanoutTest { updateHalProgramInfo(false, Arrays.asList(mDabEnsembleInfo), null); verify(mAidlTunerCallbackMocks[0], CB_TIMEOUT.times(1)).onProgramListUpdated(any()); verify(mAidlTunerCallbackMocks[1], CB_TIMEOUT.times(2)).onProgramListUpdated(any()); - verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(1)).onProgramListUpdated(any()); + verify(mAidlTunerCallbackMocks[2], CB_TIMEOUT.times(2)).onProgramListUpdated(any()); verify(mAidlTunerCallbackMocks[3], CB_TIMEOUT.times(2)).onProgramListUpdated(any()); } diff --git a/core/tests/coretests/src/android/content/pm/SigningDetailsTest.java b/core/tests/coretests/src/android/content/pm/SigningDetailsTest.java index d5223492a83c..b331a24fedc6 100644 --- a/core/tests/coretests/src/android/content/pm/SigningDetailsTest.java +++ b/core/tests/coretests/src/android/content/pm/SigningDetailsTest.java @@ -15,6 +15,9 @@ */ package android.content.pm; +import static android.content.pm.SigningDetails.CapabilityMergeRule.MERGE_OTHER_CAPABILITY; +import static android.content.pm.SigningDetails.CapabilityMergeRule.MERGE_RESTRICTED_CAPABILITY; +import static android.content.pm.SigningDetails.CapabilityMergeRule.MERGE_SELF_CAPABILITY; import static android.content.pm.SigningDetails.CertCapabilities.AUTH; import static android.content.pm.SigningDetails.CertCapabilities.INSTALLED_DATA; import static android.content.pm.SigningDetails.CertCapabilities.PERMISSION; @@ -45,6 +48,7 @@ import java.util.Set; public class SigningDetailsTest { private static final int DEFAULT_CAPABILITIES = INSTALLED_DATA | SHARED_USER_ID | PERMISSION | AUTH; + private static final int CURRENT_SIGNER_CAPABILITIES = DEFAULT_CAPABILITIES | ROLLBACK; // Some of the tests in this class require valid certificate encodings from which to pull the // public key for the SigningDetails; the following are all DER encoded EC X.509 certificates. @@ -368,10 +372,10 @@ public class SigningDetailsTest { } @Test - public void mergeLineageWith_sameLineageDifferentCaps_returnsLineageWithModifiedCaps() + public void mergeLineageWith_sameLineageDifferentCaps_returnsLineageWithProvidedCaps() throws Exception { // This test verifies when two lineages consist of the same signers but have different - // capabilities the more restrictive capabilities are returned. + // capabilities, the capabilities of the provided lineage are returned. SigningDetails defaultCapabilitiesDetails = createSigningDetailsWithLineage(FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE); SigningDetails modifiedCapabilitiesDetails = createSigningDetailsWithLineageAndCapabilities( @@ -384,68 +388,135 @@ public class SigningDetailsTest { defaultCapabilitiesDetails); assertEquals(modifiedCapabilitiesDetails, result1); - assertTrue(result2 == modifiedCapabilitiesDetails); + assertEquals(defaultCapabilitiesDetails, result2); + } + + @Test + public void + mergeLineageWith_sameLineageDifferentCapsRestrictedRule_returnsLineageWithModifiedCaps() + throws Exception { + // This test verifies when two lineages consist of the same signers but have different + // capabilities, and the restricted merge rule is used, the more restrictive capabilities + // are returned. + SigningDetails defaultCapabilitiesDetails = createSigningDetailsWithLineage(FIRST_SIGNATURE, + SECOND_SIGNATURE, THIRD_SIGNATURE); + SigningDetails modifiedCapabilitiesDetails = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE}, + new int[]{INSTALLED_DATA, INSTALLED_DATA, INSTALLED_DATA}); + + SigningDetails result1 = defaultCapabilitiesDetails.mergeLineageWith( + modifiedCapabilitiesDetails, MERGE_RESTRICTED_CAPABILITY); + SigningDetails result2 = modifiedCapabilitiesDetails.mergeLineageWith( + defaultCapabilitiesDetails, MERGE_RESTRICTED_CAPABILITY); + + assertEquals(modifiedCapabilitiesDetails, result1); + assertEquals(modifiedCapabilitiesDetails, result2); } @Test public void mergeLineageWith_overlappingLineageDiffCaps_returnsFullLineageWithModifiedCaps() throws Exception { - // This test verifies the following scenario: - // - First lineage has signers A -> B with modified capabilities for A and B - // - Second lineage has signers B -> C with modified capabilities for B and C - // The merged lineage should be A -> B -> C with the most restrictive capabilities for B - // since it is in both lineages. + // This test verifies the merge of two lineages with overlapping signers and modified caps + // returns the full lineage with expected capabilities based on the provided merge rule. int[] firstCapabilities = new int[]{INSTALLED_DATA | AUTH, INSTALLED_DATA | SHARED_USER_ID | PERMISSION}; int[] secondCapabilities = new int[]{INSTALLED_DATA | SHARED_USER_ID | AUTH, INSTALLED_DATA | SHARED_USER_ID | AUTH}; - int[] expectedCapabilities = + int[] expectedRestrictedCapabilities = new int[]{firstCapabilities[0], firstCapabilities[1] & secondCapabilities[0], secondCapabilities[1]}; + int[] expectedCapabilities1 = + new int[]{firstCapabilities[0], secondCapabilities[0], secondCapabilities[1]}; + int[] expectedCapabilities2 = + new int[]{firstCapabilities[0], firstCapabilities[1], secondCapabilities[1]}; SigningDetails firstDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE}, firstCapabilities); SigningDetails secondDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{SECOND_SIGNATURE, THIRD_SIGNATURE}, secondCapabilities); - SigningDetails expectedDetails = createSigningDetailsWithLineageAndCapabilities( + SigningDetails expectedRestrictedDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE}, - expectedCapabilities); - - SigningDetails result1 = firstDetails.mergeLineageWith(secondDetails); - SigningDetails result2 = secondDetails.mergeLineageWith(firstDetails); - - assertEquals(expectedDetails, result1); - assertEquals(expectedDetails, result2); + expectedRestrictedCapabilities); + SigningDetails expectedDetails1 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE}, + expectedCapabilities1); + SigningDetails expectedDetails2 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE}, + expectedCapabilities2); + + SigningDetails result1 = firstDetails.mergeLineageWith(secondDetails, + MERGE_OTHER_CAPABILITY); + SigningDetails result2 = secondDetails.mergeLineageWith(firstDetails, + MERGE_SELF_CAPABILITY); + SigningDetails result3 = firstDetails.mergeLineageWith(secondDetails, + MERGE_SELF_CAPABILITY); + SigningDetails result4 = secondDetails.mergeLineageWith(firstDetails, + MERGE_OTHER_CAPABILITY); + SigningDetails result5 = firstDetails.mergeLineageWith(secondDetails, + MERGE_RESTRICTED_CAPABILITY); + SigningDetails result6 = secondDetails.mergeLineageWith(firstDetails, + MERGE_RESTRICTED_CAPABILITY); + + assertEquals(expectedDetails1, result1); + assertEquals(expectedDetails1, result2); + assertEquals(expectedDetails2, result3); + assertEquals(expectedDetails2, result4); + assertEquals(expectedRestrictedDetails, result5); + assertEquals(expectedRestrictedDetails, result6); } @Test public void mergeLineageWith_subLineageModifiedCaps_returnsFullLineageWithModifiedCaps() throws Exception { - // This test verifies the following scenario: - // - First lineage has signers B -> C with modified capabilities - // - Second lineage has signers A -> B -> C -> D with modified capabilities - // The merged lineage should be A -> B -> C -> D with the most restrictive capabilities for - // B and C since they are in both lineages. + // This test verifies the merge of a full lineage and a subset of that lineage with + // modified caps returns the full lineage with expected capabilities based on the + // provided merge rule. int[] subCapabilities = new int[]{INSTALLED_DATA | SHARED_USER_ID | PERMISSION, DEFAULT_CAPABILITIES | ROLLBACK}; int[] fullCapabilities = new int[]{0, SHARED_USER_ID, DEFAULT_CAPABILITIES, DEFAULT_CAPABILITIES}; - int[] expectedCapabilities = + int[] expectedRestrictedCapabilities = new int[]{fullCapabilities[0], subCapabilities[0] & fullCapabilities[1], subCapabilities[1] & fullCapabilities[2], fullCapabilities[3]}; + int[] expectedCapabilities1 = + new int[]{fullCapabilities[0], fullCapabilities[1], fullCapabilities[2], + fullCapabilities[3]}; + int[] expectedCapabilities2 = + new int[]{fullCapabilities[0], subCapabilities[0], subCapabilities[1], + fullCapabilities[3]}; SigningDetails subLineageDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{SECOND_SIGNATURE, THIRD_SIGNATURE}, subCapabilities); SigningDetails fullLineageDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE, FOURTH_SIGNATURE}, fullCapabilities); - SigningDetails expectedDetails = createSigningDetailsWithLineageAndCapabilities( + SigningDetails expectedRestrictedDetails = createSigningDetailsWithLineageAndCapabilities( new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE, FOURTH_SIGNATURE}, - expectedCapabilities); - - SigningDetails result1 = subLineageDetails.mergeLineageWith(fullLineageDetails); - SigningDetails result2 = fullLineageDetails.mergeLineageWith(subLineageDetails); - - assertEquals(expectedDetails, result1); - assertEquals(expectedDetails, result2); + expectedRestrictedCapabilities); + SigningDetails expectedDetails1 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE, FOURTH_SIGNATURE}, + expectedCapabilities1); + SigningDetails expectedDetails2 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE, THIRD_SIGNATURE, FOURTH_SIGNATURE}, + expectedCapabilities2); + + SigningDetails result1 = subLineageDetails.mergeLineageWith(fullLineageDetails, + MERGE_OTHER_CAPABILITY); + SigningDetails result2 = fullLineageDetails.mergeLineageWith(subLineageDetails, + MERGE_SELF_CAPABILITY); + SigningDetails result3 = subLineageDetails.mergeLineageWith(fullLineageDetails, + MERGE_SELF_CAPABILITY); + SigningDetails result4 = fullLineageDetails.mergeLineageWith(subLineageDetails, + MERGE_OTHER_CAPABILITY); + SigningDetails result5 = subLineageDetails.mergeLineageWith(fullLineageDetails, + MERGE_RESTRICTED_CAPABILITY); + SigningDetails result6 = fullLineageDetails.mergeLineageWith(subLineageDetails, + MERGE_RESTRICTED_CAPABILITY); + + assertEquals(expectedDetails1, result1); + assertEquals(expectedDetails1, result2); + assertEquals(expectedDetails2, result3); + assertEquals(expectedDetails2, result4); + assertEquals(expectedRestrictedDetails, result5); + assertEquals(expectedRestrictedDetails, result6); } @Test @@ -466,6 +537,39 @@ public class SigningDetailsTest { } @Test + public void mergeLineageWith_modifiedCaps_returnsCapsFromProvidedLineage() + throws Exception { + // By default, when merging two lineage instances, the initial instance should represent a + // shared lineage while the provided lineage represents that of a newly installed / updated + // package. The shared lineage should contain any previous capability modifications from + // the default while the provided lineage has an opportunity to modify what was previously + // set. Initially, the most restrictive capabilities were always retained by the returned + // lineage, so apps had no mechanism to roll back a restriction to a previous signer. To + // allow this, a merge rule can be specified to indicate how differences in capabilities + // in common signers should be handled with the default using the capabilities from the + // provided lineage. + int[] firstCapabilities = new int[]{INSTALLED_DATA | PERMISSION | AUTH, + CURRENT_SIGNER_CAPABILITIES}; + int[] secondCapabilities = + new int[]{DEFAULT_CAPABILITIES, CURRENT_SIGNER_CAPABILITIES}; + SigningDetails firstDetails = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE}, firstCapabilities); + SigningDetails secondDetails = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE}, secondCapabilities); + // By default, the resulting capabilities should be that of the provided lineage. + SigningDetails expectedDetails1 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE}, secondCapabilities); + SigningDetails expectedDetails2 = createSigningDetailsWithLineageAndCapabilities( + new String[]{FIRST_SIGNATURE, SECOND_SIGNATURE}, firstCapabilities); + + SigningDetails result1 = firstDetails.mergeLineageWith(secondDetails); + SigningDetails result2 = secondDetails.mergeLineageWith(firstDetails); + + assertEquals(expectedDetails1, result1); + assertEquals(expectedDetails2, result2); + } + + @Test public void hasCommonAncestor_noLineageSameSingleSigner_returnsTrue() throws Exception { // If neither SigningDetails have a lineage but they have the same single signer then // hasCommonAncestor should return true. diff --git a/core/tests/coretests/src/android/widget/DateTimeViewTest.java b/core/tests/coretests/src/android/widget/DateTimeViewTest.java index d0bd4b8b0bd5..14b48ed33494 100644 --- a/core/tests/coretests/src/android/widget/DateTimeViewTest.java +++ b/core/tests/coretests/src/android/widget/DateTimeViewTest.java @@ -16,14 +16,20 @@ package android.widget; +import android.view.View; +import android.view.ViewGroup; + import androidx.test.InstrumentationRegistry; import androidx.test.annotation.UiThreadTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import java.time.Duration; + @RunWith(AndroidJUnit4.class) @SmallTest public class DateTimeViewTest { @@ -39,7 +45,33 @@ public class DateTimeViewTest { dateTimeView.detachedFromWindow(); } + @UiThreadTest + @Test + public void noChangeInRelativeText_doesNotTriggerRelayout() { + // Week in the future is chosen because it'll result in a stable string during this test + // run. This should be improved once the class is refactored to be more testable in + // respect of clock retrieval. + final long weekInTheFuture = System.currentTimeMillis() + Duration.ofDays(7).toMillis(); + final TestDateTimeView dateTimeView = new TestDateTimeView(); + dateTimeView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT)); + dateTimeView.setShowRelativeTime(true); + dateTimeView.setTime(weekInTheFuture); + // View needs to be measured to request layout, skipping this would make this test pass + // always. + dateTimeView.measure(View.MeasureSpec.makeMeasureSpec(200, View.MeasureSpec.UNSPECIFIED), + View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.UNSPECIFIED)); + dateTimeView.reset(); + + // This should not change the text content and thus no relayout is expected. + dateTimeView.setTime(weekInTheFuture + 1000); + + Assert.assertFalse(dateTimeView.wasLayoutRequested()); + } + private static class TestDateTimeView extends DateTimeView { + private boolean mRequestedLayout = false; + TestDateTimeView() { super(InstrumentationRegistry.getContext()); } @@ -51,5 +83,18 @@ public class DateTimeViewTest { void detachedFromWindow() { super.onDetachedFromWindow(); } + + public void requestLayout() { + super.requestLayout(); + mRequestedLayout = true; + } + + public boolean wasLayoutRequested() { + return mRequestedLayout; + } + + public void reset() { + mRequestedLayout = false; + } } } diff --git a/core/tests/coretests/src/com/android/internal/app/AbstractResolverComparatorTest.java b/core/tests/coretests/src/com/android/internal/app/AbstractResolverComparatorTest.java index 04b888623732..3e640c1bad39 100644 --- a/core/tests/coretests/src/com/android/internal/app/AbstractResolverComparatorTest.java +++ b/core/tests/coretests/src/com/android/internal/app/AbstractResolverComparatorTest.java @@ -115,11 +115,6 @@ public class AbstractResolverComparatorTest { @Override void handleResultMessage(Message message) {} - - @Override - List<ComponentName> getTopComponentNames(int topK) { - return null; - } }; return testComparator; } diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java index cf78646a466f..b38e1c274b45 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java @@ -81,7 +81,6 @@ import android.net.Uri; import android.os.UserHandle; import android.provider.DeviceConfig; import android.service.chooser.ChooserTarget; -import android.util.Log; import android.view.View; import androidx.annotation.CallSuper; @@ -623,7 +622,7 @@ public class ChooserActivityTest { List<ResolvedComponentInfo> stableCopy = createResolvedComponentsForTestWithOtherProfile(2, /* userId= */ 10); waitForIdle(); - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); onView(first(withText(stableCopy.get(1).getResolveInfoAt(0).activityInfo.name))) .perform(click()); @@ -1437,7 +1436,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat("Chooser should have 3 targets (2 apps, 1 direct)", activity.getAdapter().getCount(), is(3)); @@ -1513,7 +1512,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat("Chooser should have 3 targets (2 apps, 1 direct)", activity.getAdapter().getCount(), is(3)); @@ -1595,7 +1594,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat("Chooser should have 3 targets (2 apps, 1 direct)", wrapper.getAdapter().getCount(), is(3)); @@ -1667,7 +1666,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat("Chooser should have 4 targets (2 apps, 2 direct)", wrapper.getAdapter().getCount(), is(4)); @@ -1754,7 +1753,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat( String.format("Chooser should have %d targets (%d apps, 1 direct, 15 A-Z)", @@ -1879,12 +1878,13 @@ public class ChooserActivityTest { return true; }; - mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test")); + final IChooserWrapper activity = (IChooserWrapper) + mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test")); waitForIdle(); onView(withTextFromRuntimeResource("resolver_work_tab")).perform(click()); waitForIdle(); // wait for the share sheet to expand - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); onView(first(allOf( withText(workResolvedComponentInfos.get(0) @@ -2023,7 +2023,7 @@ public class ChooserActivityTest { .check(matches(isDisplayed())); } - @Test + @Test @Ignore("b/222124533") public void testAppTargetLogging() throws InterruptedException { Intent sendIntent = createSendTextIntent(); List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2); @@ -2042,6 +2042,10 @@ public class ChooserActivityTest { mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); waitForIdle(); + // TODO(b/222124533): other test cases use a timeout to make sure that the UI is fully + // populated; without one, this test flakes. Ideally we should address the need for a + // timeout everywhere instead of introducing one to fix this particular test. + assertThat(activity.getAdapter().getCount(), is(2)); onView(withIdFromRuntimeResource("profile_button")).check(doesNotExist()); @@ -2143,7 +2147,7 @@ public class ChooserActivityTest { // Thread.sleep shouldn't be a thing in an integration test but it's // necessary here because of the way the code is structured // TODO: restructure the tests b/129870719 - Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS); + Thread.sleep(((ChooserActivity) activity).mListViewUpdateDelayMs); assertThat("Chooser should have 3 targets (2 apps, 1 direct)", activity.getAdapter().getCount(), is(3)); @@ -2324,7 +2328,7 @@ public class ChooserActivityTest { assertThat(logger.numCalls(), is(6)); } - @Test + @Test @Ignore("b/222124533") public void testSwitchProfileLogging() throws InterruptedException { // enable the work tab feature flag ResolverActivity.ENABLE_TABBED_VIEW = true; @@ -3069,8 +3073,15 @@ public class ChooserActivityTest { // framework code on the device is up-to-date. // TODO: is there a better way to do this? (Other than abandoning inheritance-based DI wrapper?) private int getRuntimeResourceId(String name, String defType) { - int id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android"); + int id = -1; + if (ChooserActivityOverrideData.getInstance().resources != null) { + id = ChooserActivityOverrideData.getInstance().resources.getIdentifier( + name, defType, "android"); + } else { + id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android"); + } assertThat(id, greaterThan(0)); + return id; } } diff --git a/core/tests/coretests/src/com/android/internal/app/FakeResolverComparatorModel.java b/core/tests/coretests/src/com/android/internal/app/FakeResolverComparatorModel.java new file mode 100644 index 000000000000..fbbe57c8e325 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/app/FakeResolverComparatorModel.java @@ -0,0 +1,61 @@ +/* + * Copyright 2022 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.app; + +import android.content.ComponentName; +import android.content.pm.ResolveInfo; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +/** + * Basic {@link ResolverComparatorModel} implementation that sorts according to a pre-defined (or + * default) {@link java.util.Comparator}. + */ +public class FakeResolverComparatorModel implements ResolverComparatorModel { + private final Comparator<ResolveInfo> mComparator; + + public static FakeResolverComparatorModel makeModelFromComparator( + Comparator<ResolveInfo> comparator) { + return new FakeResolverComparatorModel(comparator); + } + + public static FakeResolverComparatorModel makeDefaultModel() { + return makeModelFromComparator(Comparator.comparing(ri -> ri.activityInfo.name)); + } + + @Override + public Comparator<ResolveInfo> getComparator() { + return mComparator; + } + + @Override + public float getScore(ComponentName name) { + return 0.0f; // Models are not required to provide numerical scores. + } + + @Override + public void notifyOnTargetSelected(ComponentName componentName) { + System.out.println( + "User selected " + componentName + " under model " + System.identityHashCode(this)); + } + + private FakeResolverComparatorModel(Comparator<ResolveInfo> comparator) { + mComparator = comparator; + } +}
\ No newline at end of file diff --git a/core/tests/coretests/src/com/android/internal/jank/FrameTrackerTest.java b/core/tests/coretests/src/com/android/internal/jank/FrameTrackerTest.java index 0f48465e0bdd..09fc7ea6fffd 100644 --- a/core/tests/coretests/src/com/android/internal/jank/FrameTrackerTest.java +++ b/core/tests/coretests/src/com/android/internal/jank/FrameTrackerTest.java @@ -162,7 +162,8 @@ public class FrameTrackerTest { eq(0L) /* missedFrames */, eq(5000000L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(0L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -196,7 +197,8 @@ public class FrameTrackerTest { eq(1L) /* missedFrames */, eq(40000000L) /* maxFrameTimeNanos */, eq(1L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(1L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -230,7 +232,8 @@ public class FrameTrackerTest { eq(0L) /* missedFrames */, eq(4000000L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(0L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -264,7 +267,8 @@ public class FrameTrackerTest { eq(1L) /* missedFrames */, eq(40000000L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(1L) /* missedAppFramesCount */); + eq(1L) /* missedAppFramesCount */, + eq(1L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -301,7 +305,8 @@ public class FrameTrackerTest { eq(1L) /* missedFrames */, eq(50000000L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(1L) /* missedAppFramesCount */); + eq(1L) /* missedAppFramesCount */, + eq(1L) /* maxSuccessiveMissedFramesCount */); } /** @@ -340,7 +345,8 @@ public class FrameTrackerTest { eq(0L) /* missedFrames */, eq(4000000L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(0L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -462,7 +468,8 @@ public class FrameTrackerTest { eq(1L) /* missedFrames */, eq(0L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(1L) /* missedAppFramesCount */); + eq(1L) /* missedAppFramesCount */, + eq(1L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -496,7 +503,8 @@ public class FrameTrackerTest { eq(0L) /* missedFrames */, eq(0L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(0L) /* maxSuccessiveMissedFramesCount */); } @Test @@ -530,7 +538,37 @@ public class FrameTrackerTest { eq(0L) /* missedFrames */, eq(0L) /* maxFrameTimeNanos */, eq(0L) /* missedSfFramesCount */, - eq(0L) /* missedAppFramesCount */); + eq(0L) /* missedAppFramesCount */, + eq(0L) /* maxSuccessiveMissedFramesCount */); + } + + @Test + public void testMaxSuccessiveMissedFramesCount() { + FrameTracker tracker = spyFrameTracker( + CUJ_WALLPAPER_TRANSITION, CUJ_POSTFIX, /* surfaceOnly= */ true); + when(mChoreographer.getVsyncId()).thenReturn(100L); + tracker.begin(); + verify(mSurfaceControlWrapper).addJankStatsListener(any(), any()); + sendFrame(tracker, JANK_SURFACEFLINGER_DEADLINE_MISSED, 100L); + sendFrame(tracker, JANK_SURFACEFLINGER_DEADLINE_MISSED, 101L); + sendFrame(tracker, JANK_APP_DEADLINE_MISSED, 102L); + sendFrame(tracker, JANK_NONE, 103L); + sendFrame(tracker, JANK_APP_DEADLINE_MISSED, 104L); + sendFrame(tracker, JANK_APP_DEADLINE_MISSED, 105L); + when(mChoreographer.getVsyncId()).thenReturn(106L); + tracker.end(FrameTracker.REASON_END_NORMAL); + sendFrame(tracker, JANK_SURFACEFLINGER_DEADLINE_MISSED, 106L); + sendFrame(tracker, JANK_SURFACEFLINGER_DEADLINE_MISSED, 107L); + verify(mSurfaceControlWrapper).removeJankStatsListener(any()); + verify(tracker).triggerPerfetto(); + verify(mStatsLog).write(eq(UI_INTERACTION_FRAME_INFO_REPORTED), + eq(CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_WALLPAPER_TRANSITION]), + eq(6L) /* totalFrames */, + eq(5L) /* missedFrames */, + eq(0L) /* maxFrameTimeNanos */, + eq(2L) /* missedSfFramesCount */, + eq(3L) /* missedAppFramesCount */, + eq(3L) /* maxSuccessiveMissedFramesCount */); } private void sendFirstWindowFrame(FrameTracker tracker, long durationMillis, diff --git a/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java b/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java index 033c3cae5beb..c63d18bfa531 100644 --- a/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java +++ b/core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java @@ -195,6 +195,17 @@ public class LocalImageResolverTest { } @Test + public void resolveImage_smallBitmapIcon_passedSmallerSize_dontResize() { + Icon icon = Icon.createWithResource(mContext.getResources(), R.drawable.test32x24); + Drawable d = LocalImageResolver.resolveImage(icon, mContext, 600, 450); + + assertThat(d).isInstanceOf(BitmapDrawable.class); + BitmapDrawable bd = (BitmapDrawable) d; + assertThat(bd.getBitmap().getWidth()).isEqualTo(32); + assertThat(bd.getBitmap().getHeight()).isEqualTo(24); + } + + @Test public void resolveImage_largeBitmapIcon_passedSize_resizeToDefinedSize() { Icon icon = Icon.createWithBitmap( BitmapFactory.decodeResource(mContext.getResources(), R.drawable.big_a)); diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 9b09616d4630..891c82d2c166 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -3031,6 +3031,12 @@ "group": "WM_DEBUG_FOCUS_LIGHT", "at": "com\/android\/server\/wm\/DisplayContent.java" }, + "873160948": { + "message": "Activity=%s reparent to taskId=%d", + "level": "VERBOSE", + "group": "WM_DEBUG_WINDOW_ORGANIZER", + "at": "com\/android\/server\/wm\/TaskFragmentOrganizerController.java" + }, "873914452": { "message": "goodToGo()", "level": "DEBUG", diff --git a/graphics/TEST_MAPPING b/graphics/TEST_MAPPING index 10bd0ee906fd..abeaf1996ca7 100644 --- a/graphics/TEST_MAPPING +++ b/graphics/TEST_MAPPING @@ -1,7 +1,12 @@ { "presubmit": [ { - "name": "CtsGraphicsTestCases" + "name": "CtsGraphicsTestCases", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] } ] } diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index b04b82629b92..a76d74edc0f4 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -128,6 +128,7 @@ public final class Icon implements Parcelable { // TYPE_RESOURCE: Resources // TYPE_DATA: DataBytes private Object mObj1; + private boolean mCachedAshmem = false; // TYPE_RESOURCE: package name // TYPE_URI: uri string @@ -156,6 +157,8 @@ public final class Icon implements Parcelable { /** * @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} or * {@link #TYPE_ADAPTIVE_BITMAP} Icon. + * + * Note that this will always return an immutable Bitmap. * @hide */ @UnsupportedAppUsage @@ -166,8 +169,20 @@ public final class Icon implements Parcelable { return (Bitmap) mObj1; } + /** + * Sets the Icon's contents to a particular Bitmap. Note that this may make a copy of the Bitmap + * if the supplied Bitmap is mutable. In that case, the value returned by getBitmap() may not + * equal the Bitmap passed to setBitmap(). + * + * @hide + */ private void setBitmap(Bitmap b) { - mObj1 = b; + if (b.isMutable()) { + mObj1 = b.copy(b.getConfig(), false); + } else { + mObj1 = b; + } + mCachedAshmem = false; } /** @@ -488,6 +503,7 @@ public final class Icon implements Parcelable { getBitmap().getAllocationByteCount() >= MIN_ASHMEM_ICON_SIZE) { setBitmap(getBitmap().asShared()); } + mCachedAshmem = true; } /** @@ -913,7 +929,10 @@ public final class Icon implements Parcelable { switch (mType) { case TYPE_BITMAP: case TYPE_ADAPTIVE_BITMAP: - final Bitmap bits = getBitmap(); + if (!mCachedAshmem) { + mObj1 = ((Bitmap) mObj1).asShared(); + mCachedAshmem = true; + } getBitmap().writeToParcel(dest, flags); break; case TYPE_RESOURCE: diff --git a/keystore/java/android/security/GenerateRkpKey.java b/keystore/java/android/security/GenerateRkpKey.java index 2e54e63a5b7a..698133287f63 100644 --- a/keystore/java/android/security/GenerateRkpKey.java +++ b/keystore/java/android/security/GenerateRkpKey.java @@ -16,6 +16,8 @@ package android.security; +import android.annotation.CheckResult; +import android.annotation.IntDef; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -24,6 +26,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.Log; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -57,6 +61,21 @@ public class GenerateRkpKey { private Context mContext; private CountDownLatch mCountDownLatch; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(flag = true, value = { + IGenerateRkpKeyService.Status.OK, + IGenerateRkpKeyService.Status.NO_NETWORK_CONNECTIVITY, + IGenerateRkpKeyService.Status.NETWORK_COMMUNICATION_ERROR, + IGenerateRkpKeyService.Status.DEVICE_NOT_REGISTERED, + IGenerateRkpKeyService.Status.HTTP_CLIENT_ERROR, + IGenerateRkpKeyService.Status.HTTP_SERVER_ERROR, + IGenerateRkpKeyService.Status.HTTP_UNKNOWN_ERROR, + IGenerateRkpKeyService.Status.INTERNAL_ERROR, + }) + public @interface Status { + } + private ServiceConnection mConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName className, IBinder service) { @@ -81,12 +100,14 @@ public class GenerateRkpKey { mContext = context; } - private void bindAndSendCommand(int command, int securityLevel) throws RemoteException { + @Status + private int bindAndSendCommand(int command, int securityLevel) throws RemoteException { Intent intent = new Intent(IGenerateRkpKeyService.class.getName()); ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0); + int returnCode = IGenerateRkpKeyService.Status.OK; if (comp == null) { // On a system that does not use RKP, the RemoteProvisioner app won't be installed. - return; + return returnCode; } intent.setComponent(comp); mCountDownLatch = new CountDownLatch(1); @@ -102,7 +123,7 @@ public class GenerateRkpKey { if (mBinder != null) { switch (command) { case NOTIFY_EMPTY: - mBinder.generateKey(securityLevel); + returnCode = mBinder.generateKey(securityLevel); break; case NOTIFY_KEY_GENERATED: mBinder.notifyKeyGenerated(securityLevel); @@ -112,16 +133,21 @@ public class GenerateRkpKey { } } else { Log.e(TAG, "Binder object is null; failed to bind to GenerateRkpKeyService."); + returnCode = IGenerateRkpKeyService.Status.INTERNAL_ERROR; } mContext.unbindService(mConnection); + return returnCode; } /** * Fulfills the use case of (2) described in the class documentation. Blocks until the * RemoteProvisioner application can get new attestation keys signed by the server. + * @return the status of the key generation */ - public void notifyEmpty(int securityLevel) throws RemoteException { - bindAndSendCommand(NOTIFY_EMPTY, securityLevel); + @CheckResult + @Status + public int notifyEmpty(int securityLevel) throws RemoteException { + return bindAndSendCommand(NOTIFY_EMPTY, securityLevel); } /** diff --git a/keystore/java/android/security/IGenerateRkpKeyService.aidl b/keystore/java/android/security/IGenerateRkpKeyService.aidl index 5f1d6693c23a..eeaeb27a7c77 100644 --- a/keystore/java/android/security/IGenerateRkpKeyService.aidl +++ b/keystore/java/android/security/IGenerateRkpKeyService.aidl @@ -26,11 +26,35 @@ package android.security; * @hide */ interface IGenerateRkpKeyService { + @JavaDerive(toString=true) + @Backing(type="int") + enum Status { + /** No error(s) occurred */ + OK = 0, + /** Unable to provision keys due to a lack of internet connectivity. */ + NO_NETWORK_CONNECTIVITY = 1, + /** An error occurred while communicating with the RKP server. */ + NETWORK_COMMUNICATION_ERROR = 2, + /** The given device was not registered with the RKP backend. */ + DEVICE_NOT_REGISTERED = 4, + /** The RKP server returned an HTTP client error, indicating a misbehaving client. */ + HTTP_CLIENT_ERROR = 5, + /** The RKP server returned an HTTP server error, indicating something went wrong on the server. */ + HTTP_SERVER_ERROR = 6, + /** The RKP server returned an HTTP status that is unknown. This should never happen. */ + HTTP_UNKNOWN_ERROR = 7, + /** An unexpected internal error occurred. This should never happen. */ + INTERNAL_ERROR = 8, + } + /** * Ping the provisioner service to let it know an app generated a key. This may or may not have * consumed a remotely provisioned attestation key, so the RemoteProvisioner app should check. */ oneway void notifyKeyGenerated(in int securityLevel); - /** Ping the provisioner service to indicate there are no remaining attestation keys left. */ - void generateKey(in int securityLevel); + + /** + * Ping the provisioner service to indicate there are no remaining attestation keys left. + */ + Status generateKey(in int securityLevel); } diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java index 3d53cfb388e1..c2cd6ffc622c 100644 --- a/keystore/java/android/security/KeyStore2.java +++ b/keystore/java/android/security/KeyStore2.java @@ -345,6 +345,12 @@ public class KeyStore2 { case ResponseCode.KEY_PERMANENTLY_INVALIDATED: return new KeyStoreException(errorCode, "Key permanently invalidated", serviceErrorMessage); + case ResponseCode.OUT_OF_KEYS: + // Getting a more specific RKP status requires the security level, which we + // don't have here. Higher layers of the stack can interpret this exception + // and add more flavor. + return new KeyStoreException(errorCode, serviceErrorMessage, + KeyStoreException.RKP_TEMPORARILY_UNAVAILABLE); default: return new KeyStoreException(errorCode, String.valueOf(errorCode), serviceErrorMessage); diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java index 5950b5bc7231..40659f5dbfb0 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -28,6 +28,7 @@ import android.hardware.security.keymint.Tag; import android.os.Build; import android.os.RemoteException; import android.security.GenerateRkpKey; +import android.security.IGenerateRkpKeyService; import android.security.KeyPairGeneratorSpec; import android.security.KeyStore2; import android.security.KeyStoreException; @@ -624,7 +625,7 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato * GenerateRkpKey.notifyEmpty() will delay for a while before returning. */ result = generateKeyPairHelper(); - if (result.rkpStatus == KeyStoreException.RKP_SUCCESS) { + if (result.rkpStatus == KeyStoreException.RKP_SUCCESS && result.keyPair != null) { return result.keyPair; } } @@ -706,27 +707,12 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato success = true; KeyPair kp = new KeyPair(publicKey, publicKey.getPrivateKey()); return new GenerateKeyPairHelperResult(0, kp); - } catch (android.security.KeyStoreException e) { + } catch (KeyStoreException e) { switch (e.getErrorCode()) { case KeymasterDefs.KM_ERROR_HARDWARE_TYPE_UNAVAILABLE: throw new StrongBoxUnavailableException("Failed to generated key pair.", e); case ResponseCode.OUT_OF_KEYS: - GenerateRkpKey keyGen = new GenerateRkpKey(ActivityThread - .currentApplication()); - try { - //TODO: When detailed error information is available from the remote - //provisioner, propagate it up. - keyGen.notifyEmpty(securityLevel); - } catch (RemoteException f) { - KeyStoreException ksException = new KeyStoreException( - ResponseCode.OUT_OF_KEYS, - "Remote exception: " + f.getMessage(), - KeyStoreException.RKP_TEMPORARILY_UNAVAILABLE); - throw new ProviderException("Failed to talk to RemoteProvisioner", - ksException); - } - return new GenerateKeyPairHelperResult( - KeyStoreException.RKP_TEMPORARILY_UNAVAILABLE, null); + throw makeOutOfKeysException(e, securityLevel); default: ProviderException p = new ProviderException("Failed to generate key pair.", e); if ((mSpec.getPurposes() & KeyProperties.PURPOSE_WRAP_KEY) != 0) { @@ -752,6 +738,52 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato } } + // In case keystore reports OUT_OF_KEYS, call this handler in an attempt to remotely provision + // some keys. + private ProviderException makeOutOfKeysException(KeyStoreException e, int securityLevel) { + GenerateRkpKey keyGen = new GenerateRkpKey(ActivityThread + .currentApplication()); + KeyStoreException ksException; + try { + final int keyGenStatus = keyGen.notifyEmpty(securityLevel); + // Default stance: temporary error. This is a hint to the caller to try again with + // exponential back-off. + int rkpStatus; + switch (keyGenStatus) { + case IGenerateRkpKeyService.Status.NO_NETWORK_CONNECTIVITY: + rkpStatus = KeyStoreException.RKP_FETCHING_PENDING_CONNECTIVITY; + break; + case IGenerateRkpKeyService.Status.DEVICE_NOT_REGISTERED: + rkpStatus = KeyStoreException.RKP_SERVER_REFUSED_ISSUANCE; + break; + case IGenerateRkpKeyService.Status.OK: + // This will actually retry once immediately, so on "OK" go ahead and return + // "temporarily unavailable". @see generateKeyPair + case IGenerateRkpKeyService.Status.NETWORK_COMMUNICATION_ERROR: + case IGenerateRkpKeyService.Status.HTTP_CLIENT_ERROR: + case IGenerateRkpKeyService.Status.HTTP_SERVER_ERROR: + case IGenerateRkpKeyService.Status.HTTP_UNKNOWN_ERROR: + case IGenerateRkpKeyService.Status.INTERNAL_ERROR: + default: + // These errors really should never happen. The best we can do is assume they + // are transient and hint to the caller to retry with back-off. + rkpStatus = KeyStoreException.RKP_TEMPORARILY_UNAVAILABLE; + break; + } + ksException = new KeyStoreException( + ResponseCode.OUT_OF_KEYS, + "Out of RKP keys due to IGenerateRkpKeyService status: " + keyGenStatus, + rkpStatus); + } catch (RemoteException f) { + ksException = new KeyStoreException( + ResponseCode.OUT_OF_KEYS, + "Remote exception: " + f.getMessage(), + KeyStoreException.RKP_TEMPORARILY_UNAVAILABLE); + } + ksException.initCause(e); + return new ProviderException("Failed to talk to RemoteProvisioner", ksException); + } + private void addAttestationParameters(@NonNull List<KeyParameter> params) throws ProviderException, IllegalArgumentException, DeviceIdAttestationException { byte[] challenge = mSpec.getAttestationChallenge(); diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java index f4e91bae54ee..81caf7786cf5 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java @@ -16,7 +16,6 @@ package androidx.window.extensions.embedding; -import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import android.app.Activity; @@ -49,7 +48,8 @@ import java.util.concurrent.Executor; class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { /** Mapping from the client assigned unique token to the {@link TaskFragmentInfo}. */ - private final Map<IBinder, TaskFragmentInfo> mFragmentInfos = new ArrayMap<>(); + @VisibleForTesting + final Map<IBinder, TaskFragmentInfo> mFragmentInfos = new ArrayMap<>(); /** * Mapping from the client assigned unique token to the TaskFragment parent @@ -70,6 +70,8 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { void onTaskFragmentVanished(@NonNull TaskFragmentInfo taskFragmentInfo); void onTaskFragmentParentInfoChanged(@NonNull IBinder fragmentToken, @NonNull Configuration parentConfig); + void onActivityReparentToTask(int taskId, @NonNull Intent activityIntent, + @NonNull IBinder activityToken); } /** @@ -118,25 +120,29 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { * @param secondaryFragmentBounds the initial bounds for the secondary TaskFragment * @param activityIntent Intent to start the secondary Activity with. * @param activityOptions ActivityOptions to start the secondary Activity with. + * @param windowingMode the windowing mode to set for the TaskFragments. */ void startActivityToSide(@NonNull WindowContainerTransaction wct, @NonNull IBinder launchingFragmentToken, @NonNull Rect launchingFragmentBounds, @NonNull Activity launchingActivity, @NonNull IBinder secondaryFragmentToken, @NonNull Rect secondaryFragmentBounds, @NonNull Intent activityIntent, - @Nullable Bundle activityOptions, @NonNull SplitRule rule) { + @Nullable Bundle activityOptions, @NonNull SplitRule rule, + @WindowingMode int windowingMode) { final IBinder ownerToken = launchingActivity.getActivityToken(); // Create or resize the launching TaskFragment. if (mFragmentInfos.containsKey(launchingFragmentToken)) { resizeTaskFragment(wct, launchingFragmentToken, launchingFragmentBounds); + wct.setWindowingMode(mFragmentInfos.get(launchingFragmentToken).getToken(), + windowingMode); } else { createTaskFragmentAndReparentActivity(wct, launchingFragmentToken, ownerToken, - launchingFragmentBounds, WINDOWING_MODE_MULTI_WINDOW, launchingActivity); + launchingFragmentBounds, windowingMode, launchingActivity); } // Create a TaskFragment for the secondary activity. createTaskFragmentAndStartActivity(wct, secondaryFragmentToken, ownerToken, - secondaryFragmentBounds, WINDOWING_MODE_MULTI_WINDOW, activityIntent, + secondaryFragmentBounds, windowingMode, activityIntent, activityOptions); // Set adjacent to each other so that the containers below will be invisible. @@ -151,6 +157,7 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { void expandTaskFragment(WindowContainerTransaction wct, IBinder fragmentToken) { resizeTaskFragment(wct, fragmentToken, new Rect()); setAdjacentTaskFragments(wct, fragmentToken, null /* secondary */, null /* splitRule */); + setWindowingMode(wct, fragmentToken, WINDOWING_MODE_UNDEFINED); } /** @@ -253,6 +260,15 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { wct.setBounds(mFragmentInfos.get(fragmentToken).getToken(), bounds); } + private void setWindowingMode(WindowContainerTransaction wct, IBinder fragmentToken, + @WindowingMode int windowingMode) { + if (!mFragmentInfos.containsKey(fragmentToken)) { + throw new IllegalArgumentException( + "Can't find an existing TaskFragment with fragmentToken=" + fragmentToken); + } + wct.setWindowingMode(mFragmentInfos.get(fragmentToken).getToken(), windowingMode); + } + void deleteTaskFragment(WindowContainerTransaction wct, IBinder fragmentToken) { if (!mFragmentInfos.containsKey(fragmentToken)) { throw new IllegalArgumentException( @@ -300,4 +316,12 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer { mCallback.onTaskFragmentParentInfoChanged(fragmentToken, parentConfig); } } + + @Override + public void onActivityReparentToTask(int taskId, @NonNull Intent activityIntent, + @NonNull IBinder activityToken) { + if (mCallback != null) { + mCallback.onActivityReparentToTask(taskId, activityIntent, activityToken); + } + } } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index ca420c64e961..b370e59ac7c8 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -112,9 +112,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen */ public void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent intent, @Nullable Bundle options, @NonNull SplitRule sideRule, - @Nullable Consumer<Exception> failureCallback) { + @Nullable Consumer<Exception> failureCallback, boolean isPlaceholder) { try { - mPresenter.startActivityToSide(launchingActivity, intent, options, sideRule); + mPresenter.startActivityToSide(launchingActivity, intent, options, sideRule, + isPlaceholder); } catch (Exception e) { if (failureCallback != null) { failureCallback.accept(e); @@ -222,6 +223,19 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } + @Override + public void onActivityReparentToTask(int taskId, @NonNull Intent activityIntent, + @NonNull IBinder activityToken) { + // If the activity belongs to the current app process, we treat it as a new activity launch. + final Activity activity = ActivityThread.currentActivityThread().getActivity(activityToken); + if (activity != null) { + onActivityCreated(activity); + updateCallbackIfNecessary(); + return; + } + // TODO: handle for activity in other process. + } + /** Called on receiving {@link #onTaskFragmentVanished(TaskFragmentInfo)} for cleanup. */ private void cleanupTaskFragment(@NonNull IBinder taskFragmentToken) { for (int i = mTaskContainers.size() - 1; i >= 0; i--) { @@ -243,9 +257,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (taskContainer == null) { return; } - final boolean wasInPip = isInPictureInPicture(taskContainer.getConfiguration()); + final boolean wasInPip = taskContainer.isInPictureInPicture(); final boolean isInPIp = isInPictureInPicture(config); - taskContainer.setConfiguration(config); + taskContainer.setWindowingMode(config.windowConfiguration.getWindowingMode()); // We need to check the animation override when enter/exit PIP or has bounds changed. boolean shouldUpdateAnimationOverride = wasInPip != isInPIp; @@ -264,8 +278,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen * bounds is large enough for at least one split rule. */ private void updateAnimationOverride(@NonNull TaskContainer taskContainer) { - if (!taskContainer.isTaskBoundsInitialized()) { - // We don't know about the Task bounds yet. + if (!taskContainer.isTaskBoundsInitialized() + || !taskContainer.isWindowingModeInitialized()) { + // We don't know about the Task bounds/windowingMode yet. return; } @@ -279,7 +294,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen private boolean supportSplit(@NonNull TaskContainer taskContainer) { // No split inside PIP. - if (isInPictureInPicture(taskContainer.getConfiguration())) { + if (taskContainer.isInPictureInPicture()) { return false; } // Check if the parent container bounds can support any split rule. @@ -447,8 +462,12 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen if (!taskContainer.setTaskBounds(taskBounds)) { Log.w(TAG, "Can't find bounds from activity=" + activityInTask); } - updateAnimationOverride(taskContainer); } + if (!taskContainer.isWindowingModeInitialized()) { + taskContainer.setWindowingMode(activityInTask.getResources().getConfiguration() + .windowConfiguration.getWindowingMode()); + } + updateAnimationOverride(taskContainer); return container; } @@ -697,8 +716,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } // TODO(b/190433398): Handle failed request - startActivityToSide(activity, placeholderRule.getPlaceholderIntent(), null, - placeholderRule, null); + startActivityToSide(activity, placeholderRule.getPlaceholderIntent(), null /* options */, + placeholderRule, null /* failureCallback */, true /* isPlaceholder */); return true; } diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java index 716a087203d3..e64e5d1c66d5 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java @@ -16,10 +16,11 @@ package androidx.window.extensions.embedding; -import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import android.app.Activity; import android.app.WindowConfiguration; +import android.app.WindowConfiguration.WindowingMode; import android.content.Context; import android.content.Intent; import android.graphics.Rect; @@ -111,13 +112,16 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { primaryActivity, primaryRectBounds, null); // Create new empty task fragment + final int taskId = primaryContainer.getTaskId(); final TaskFragmentContainer secondaryContainer = mController.newContainer( - null /* activity */, primaryActivity, primaryContainer.getTaskId()); + null /* activity */, primaryActivity, taskId); final Rect secondaryRectBounds = getBoundsForPosition(POSITION_END, parentBounds, rule, isLtr(primaryActivity, rule)); + final int windowingMode = mController.getTaskContainer(taskId) + .getWindowingModeForSplitTaskFragment(secondaryRectBounds); createTaskFragment(wct, secondaryContainer.getTaskFragmentToken(), primaryActivity.getActivityToken(), secondaryRectBounds, - WINDOWING_MODE_MULTI_WINDOW); + windowingMode); secondaryContainer.setLastRequestedBounds(secondaryRectBounds); // Set adjacent to each other so that the containers below will be invisible. @@ -173,7 +177,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { final WindowContainerTransaction wct = new WindowContainerTransaction(); createTaskFragment(wct, newContainer.getTaskFragmentToken(), - launchingActivity.getActivityToken(), new Rect(), WINDOWING_MODE_MULTI_WINDOW); + launchingActivity.getActivityToken(), new Rect(), WINDOWING_MODE_UNDEFINED); applyTransaction(wct); return newContainer; @@ -189,15 +193,17 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { @NonNull Rect bounds, @Nullable TaskFragmentContainer containerToAvoid) { TaskFragmentContainer container = mController.getContainerWithActivity( activity.getActivityToken()); + final int taskId = container != null ? container.getTaskId() : activity.getTaskId(); + final int windowingMode = mController.getTaskContainer(taskId) + .getWindowingModeForSplitTaskFragment(bounds); if (container == null || container == containerToAvoid) { - container = mController.newContainer(activity, activity.getTaskId()); - + container = mController.newContainer(activity, taskId); final TaskFragmentCreationParams fragmentOptions = createFragmentOptions( container.getTaskFragmentToken(), activity.getActivityToken(), bounds, - WINDOWING_MODE_MULTI_WINDOW); + windowingMode); wct.createTaskFragment(fragmentOptions); wct.reparentActivityToTaskFragment(container.getTaskFragmentToken(), @@ -206,6 +212,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { container.setLastRequestedBounds(bounds); } else { resizeTaskFragmentIfRegistered(wct, container, bounds); + updateTaskFragmentWindowingModeIfRegistered(wct, container, windowingMode); } return container; @@ -217,12 +224,13 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { * @param launchingActivity An activity that should be in the primary container. If it is not * currently in an existing container, a new one will be created and * the activity will be re-parented to it. - * @param activityIntent The intent to start the new activity. - * @param activityOptions The options to apply to new activity start. - * @param rule The split rule to be applied to the container. + * @param activityIntent The intent to start the new activity. + * @param activityOptions The options to apply to new activity start. + * @param rule The split rule to be applied to the container. + * @param isPlaceholder Whether the launch is a placeholder. */ void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent activityIntent, - @Nullable Bundle activityOptions, @NonNull SplitRule rule) { + @Nullable Bundle activityOptions, @NonNull SplitRule rule, boolean isPlaceholder) { final Rect parentBounds = getParentContainerBounds(launchingActivity); final Rect primaryRectBounds = getBoundsForPosition(POSITION_START, parentBounds, rule, isLtr(launchingActivity, rule)); @@ -236,14 +244,21 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { launchingActivity.getTaskId()); } + final int taskId = primaryContainer.getTaskId(); TaskFragmentContainer secondaryContainer = mController.newContainer(null /* activity */, - launchingActivity, primaryContainer.getTaskId()); + launchingActivity, taskId); + final int windowingMode = mController.getTaskContainer(taskId) + .getWindowingModeForSplitTaskFragment(primaryRectBounds); final WindowContainerTransaction wct = new WindowContainerTransaction(); mController.registerSplit(wct, primaryContainer, launchingActivity, secondaryContainer, rule); startActivityToSide(wct, primaryContainer.getTaskFragmentToken(), primaryRectBounds, launchingActivity, secondaryContainer.getTaskFragmentToken(), secondaryRectBounds, - activityIntent, activityOptions, rule); + activityIntent, activityOptions, rule, windowingMode); + if (isPlaceholder) { + // When placeholder is launched in split, we should keep the focus on the primary. + wct.requestFocusOnTaskFragment(primaryContainer.getTaskFragmentToken()); + } applyTransaction(wct); primaryContainer.setLastRequestedBounds(primaryRectBounds); @@ -272,14 +287,27 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { isLtr); final Rect secondaryRectBounds = getBoundsForPosition(POSITION_END, parentBounds, rule, isLtr); + final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer(); + // Whether the placeholder is becoming side-by-side with the primary from fullscreen. + final boolean isPlaceholderBecomingSplit = splitContainer.isPlaceholderContainer() + && secondaryContainer.areLastRequestedBoundsEqual(null /* bounds */) + && !secondaryRectBounds.isEmpty(); // If the task fragments are not registered yet, the positions will be updated after they // are created again. resizeTaskFragmentIfRegistered(wct, primaryContainer, primaryRectBounds); - final TaskFragmentContainer secondaryContainer = splitContainer.getSecondaryContainer(); resizeTaskFragmentIfRegistered(wct, secondaryContainer, secondaryRectBounds); - setAdjacentTaskFragments(wct, primaryContainer, secondaryContainer, rule); + if (isPlaceholderBecomingSplit) { + // When placeholder is shown in split, we should keep the focus on the primary. + wct.requestFocusOnTaskFragment(primaryContainer.getTaskFragmentToken()); + } + final TaskContainer taskContainer = mController.getTaskContainer( + updatedContainer.getTaskId()); + final int windowingMode = taskContainer.getWindowingModeForSplitTaskFragment( + primaryRectBounds); + updateTaskFragmentWindowingModeIfRegistered(wct, primaryContainer, windowingMode); + updateTaskFragmentWindowingModeIfRegistered(wct, secondaryContainer, windowingMode); } private void setAdjacentTaskFragments(@NonNull WindowContainerTransaction wct, @@ -311,6 +339,15 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { resizeTaskFragment(wct, container.getTaskFragmentToken(), bounds); } + private void updateTaskFragmentWindowingModeIfRegistered( + @NonNull WindowContainerTransaction wct, + @NonNull TaskFragmentContainer container, + @WindowingMode int windowingMode) { + if (container.getInfo() != null) { + wct.setWindowingMode(container.getInfo().getToken(), windowingMode); + } + } + @Override void resizeTaskFragment(@NonNull WindowContainerTransaction wct, @NonNull IBinder fragmentToken, @Nullable Rect bounds) { diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java index be793018d969..3c0762d81494 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskContainer.java @@ -16,9 +16,14 @@ package androidx.window.extensions.embedding; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; + import android.annotation.NonNull; import android.annotation.Nullable; -import android.content.res.Configuration; +import android.app.WindowConfiguration; +import android.app.WindowConfiguration.WindowingMode; import android.graphics.Rect; import android.os.IBinder; import android.util.ArraySet; @@ -37,9 +42,9 @@ class TaskContainer { /** Available window bounds of this Task. */ private final Rect mTaskBounds = new Rect(); - /** Configuration of the Task. */ - @Nullable - private Configuration mConfiguration; + /** Windowing mode of this Task. */ + @WindowingMode + private int mWindowingMode = WINDOWING_MODE_UNDEFINED; /** Active TaskFragments in this Task. */ final List<TaskFragmentContainer> mContainers = new ArrayList<>(); @@ -81,13 +86,42 @@ class TaskContainer { return !mTaskBounds.isEmpty(); } - @Nullable - Configuration getConfiguration() { - return mConfiguration; + void setWindowingMode(int windowingMode) { + mWindowingMode = windowingMode; + } + + /** Whether the Task windowing mode has been initialized. */ + boolean isWindowingModeInitialized() { + return mWindowingMode != WINDOWING_MODE_UNDEFINED; + } + + /** + * Returns the windowing mode for the TaskFragments below this Task, which should be split with + * other TaskFragments. + * + * @param taskFragmentBounds Requested bounds for the TaskFragment. It will be empty when + * the pair of TaskFragments are stacked due to the limited space. + */ + @WindowingMode + int getWindowingModeForSplitTaskFragment(@Nullable Rect taskFragmentBounds) { + // Only set to multi-windowing mode if the pair are showing side-by-side. Otherwise, it + // will be set to UNDEFINED which will then inherit the Task windowing mode. + if (taskFragmentBounds == null || taskFragmentBounds.isEmpty()) { + return WINDOWING_MODE_UNDEFINED; + } + // We use WINDOWING_MODE_MULTI_WINDOW when the Task is fullscreen. + // However, when the Task is in other multi windowing mode, such as Freeform, we need to + // have the activity windowing mode to match the Task, otherwise things like + // DecorCaptionView won't work correctly. As a result, have the TaskFragment to be in the + // Task windowing mode if the Task is in multi window. + // TODO we won't need this anymore after we migrate Freeform caption to WM Shell. + return WindowConfiguration.inMultiWindowMode(mWindowingMode) + ? mWindowingMode + : WINDOWING_MODE_MULTI_WINDOW; } - void setConfiguration(@Nullable Configuration configuration) { - mConfiguration = configuration; + boolean isInPictureInPicture() { + return mWindowingMode == WINDOWING_MODE_PINNED; } /** Whether there is any {@link TaskFragmentContainer} below this Task. */ diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java index b06ce4c19d5c..1f12c4484159 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java @@ -16,15 +16,23 @@ package androidx.window.extensions.embedding; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; + import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import android.content.res.Configuration; +import android.graphics.Point; import android.platform.test.annotations.Presubmit; +import android.window.TaskFragmentInfo; +import android.window.WindowContainerToken; +import android.window.WindowContainerTransaction; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; @@ -35,6 +43,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; + /** * Test class for {@link JetpackTaskFragmentOrganizer}. * @@ -48,6 +58,8 @@ public class JetpackTaskFragmentOrganizerTest { private static final int TASK_ID = 10; @Mock + private WindowContainerTransaction mTransaction; + @Mock private JetpackTaskFragmentOrganizer.TaskFragmentCallback mCallback; private JetpackTaskFragmentOrganizer mOrganizer; @@ -91,4 +103,24 @@ public class JetpackTaskFragmentOrganizerTest { verify(mOrganizer).unregisterRemoteAnimations(TASK_ID); } + + @Test + public void testExpandTaskFragment() { + final TaskFragmentContainer container = new TaskFragmentContainer(null, TASK_ID); + final TaskFragmentInfo info = createMockInfo(container); + mOrganizer.mFragmentInfos.put(container.getTaskFragmentToken(), info); + container.setInfo(info); + + mOrganizer.expandTaskFragment(mTransaction, container.getTaskFragmentToken()); + + verify(mTransaction).setWindowingMode(container.getInfo().getToken(), + WINDOWING_MODE_UNDEFINED); + } + + private TaskFragmentInfo createMockInfo(TaskFragmentContainer container) { + return new TaskFragmentInfo(container.getTaskFragmentToken(), + mock(WindowContainerToken.class), new Configuration(), 0 /* runningActivityCount */, + false /* isVisible */, new ArrayList<>(), new Point(), + false /* isTaskClearedForReuse */, false /* isTaskFragmentClearedForPip */); + } } diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java index 9fb08dffbab8..c7feb7e59de3 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/TaskContainerTest.java @@ -16,6 +16,13 @@ package androidx.window.extensions.embedding; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; + +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -64,6 +71,56 @@ public class TaskContainerTest { } @Test + public void testIsWindowingModeInitialized() { + final TaskContainer taskContainer = new TaskContainer(TASK_ID); + + assertFalse(taskContainer.isWindowingModeInitialized()); + + taskContainer.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + + assertTrue(taskContainer.isWindowingModeInitialized()); + } + + @Test + public void testGetWindowingModeForSplitTaskFragment() { + final TaskContainer taskContainer = new TaskContainer(TASK_ID); + final Rect splitBounds = new Rect(0, 0, 500, 1000); + + assertEquals(WINDOWING_MODE_MULTI_WINDOW, + taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + + taskContainer.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + + assertEquals(WINDOWING_MODE_MULTI_WINDOW, + taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + + taskContainer.setWindowingMode(WINDOWING_MODE_FREEFORM); + + assertEquals(WINDOWING_MODE_FREEFORM, + taskContainer.getWindowingModeForSplitTaskFragment(splitBounds)); + + // Empty bounds means the split pair are stacked, so it should be UNDEFINED which will then + // inherit the Task windowing mode + assertEquals(WINDOWING_MODE_UNDEFINED, + taskContainer.getWindowingModeForSplitTaskFragment(new Rect())); + } + + @Test + public void testIsInPictureInPicture() { + final TaskContainer taskContainer = new TaskContainer(TASK_ID); + + assertFalse(taskContainer.isInPictureInPicture()); + + taskContainer.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + + assertFalse(taskContainer.isInPictureInPicture()); + + taskContainer.setWindowingMode(WINDOWING_MODE_PINNED); + + assertTrue(taskContainer.isInPictureInPicture()); + } + + @Test public void testIsEmpty() { final TaskContainer taskContainer = new TaskContainer(TASK_ID); diff --git a/libs/WindowManager/Shell/res/layout/split_decor.xml b/libs/WindowManager/Shell/res/layout/split_decor.xml index dfb90affe7f6..443ecb2ed3f3 100644 --- a/libs/WindowManager/Shell/res/layout/split_decor.xml +++ b/libs/WindowManager/Shell/res/layout/split_decor.xml @@ -20,8 +20,8 @@ android:layout_width="match_parent"> <ImageView android:id="@+id/split_resizing_icon" - android:layout_height="@*android:dimen/starting_surface_icon_size" - android:layout_width="@*android:dimen/starting_surface_icon_size" + android:layout_height="@dimen/split_icon_size" + android:layout_width="@dimen/split_icon_size" android:layout_gravity="center" android:scaleType="fitCenter" android:padding="0dp" diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 974960708190..6f38ecae674d 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -46,10 +46,10 @@ <string name="accessibility_action_divider_top_50" msgid="8649582798829048946">"Superior 50%"</string> <string name="accessibility_action_divider_top_30" msgid="3572788224908570257">"Superior 30%"</string> <string name="accessibility_action_divider_bottom_full" msgid="2831868345092314060">"Pantalla inferior completa"</string> - <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Usar Modo una mano"</string> + <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Usar modo Una mano"</string> <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Para salir, desliza el dedo hacia arriba desde la parte inferior de la pantalla o toca cualquier zona que haya encima de la aplicación"</string> - <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar Modo una mano"</string> - <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Salir del Modo una mano"</string> + <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Iniciar modo Una mano"</string> + <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Salir del modo Una mano"</string> <string name="bubbles_settings_button_description" msgid="1301286017420516912">"Ajustes de las burbujas de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="bubble_overflow_button_content_description" msgid="8160974472718594382">"Menú adicional"</string> <string name="bubble_accessibility_action_add_back" msgid="1830101076853540953">"Volver a añadir a la pila"</string> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index c21381d1486a..1dac9caba01e 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -87,6 +87,8 @@ <!-- How high we lift the divider when touching --> <dimen name="docked_stack_divider_lift_elevation">4dp</dimen> + <!-- Icon size for split screen --> + <dimen name="split_icon_size">72dp</dimen> <!-- Divider handle size for legacy split screen --> <dimen name="docked_divider_handle_width">16dp</dimen> <dimen name="docked_divider_handle_height">2dp</dimen> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index cfd06243da3c..ced36a705df2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -211,7 +211,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont } else if (action == MotionEvent.ACTION_MOVE) { onMove(event, swipeEdge); } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { - ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Finishing gesture with event: %s", event); + ProtoLog.d(WM_SHELL_BACK_PREVIEW, + "Finishing gesture with event action: %d", action); onGestureFinished(); } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java index 5dc6bd19853a..de30dbbe7e46 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java @@ -73,6 +73,8 @@ public class SplitDecorManager extends WindowlessWindowManager { private Rect mBounds = new Rect(); private ValueAnimator mFadeAnimator; + private int mIconSize; + public SplitDecorManager(Configuration configuration, IconProvider iconProvider, SurfaceSession surfaceSession) { super(configuration, null /* rootSurface */, null /* hostInputToken */); @@ -104,6 +106,7 @@ public class SplitDecorManager extends WindowlessWindowManager { mHostLeash = rootLeash; mViewHost = new SurfaceControlViewHost(context, context.getDisplay(), this); + mIconSize = context.getResources().getDimensionPixelSize(R.dimen.split_icon_size); final FrameLayout rootLayout = (FrameLayout) LayoutInflater.from(context) .inflate(R.layout.split_decor, null); mResizingIconView = rootLayout.findViewById(R.id.split_resizing_icon); @@ -171,14 +174,14 @@ public class SplitDecorManager extends WindowlessWindowManager { WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mViewHost.getView().getLayoutParams(); - lp.width = mIcon.getIntrinsicWidth(); - lp.height = mIcon.getIntrinsicHeight(); + lp.width = mIconSize; + lp.height = mIconSize; mViewHost.relayout(lp); t.setLayer(mIconLeash, Integer.MAX_VALUE); } t.setPosition(mIconLeash, - newBounds.width() / 2 - mIcon.getIntrinsicWidth() / 2, - newBounds.height() / 2 - mIcon.getIntrinsicWidth() / 2); + newBounds.width() / 2 - mIconSize / 2, + newBounds.height() / 2 - mIconSize / 2); boolean show = newBounds.width() > mBounds.width() || newBounds.height() > mBounds.height(); if (show != mShown) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java index 0cea36ed48c8..28f59b53b5b6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java @@ -111,8 +111,7 @@ public class DropZoneView extends FrameLayout { mColorDrawable = new ColorDrawable(); setBackgroundDrawable(mColorDrawable); - final int iconSize = context.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.starting_surface_icon_size); + final int iconSize = context.getResources().getDimensionPixelSize(R.dimen.split_icon_size); mSplashScreenView = new ImageView(context); mSplashScreenView.setScaleType(ImageView.ScaleType.FIT_CENTER); addView(mSplashScreenView, diff --git a/core/java/com/android/internal/policy/KidsModeSettingsObserver.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java index 8a1d407382bc..f8f9d6b8f8a0 100644 --- a/core/java/com/android/internal/policy/KidsModeSettingsObserver.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeSettingsObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.policy; +package com.android.wm.shell.kidsmode; import android.content.ContentResolver; import android.content.Context; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java index 4bb580571145..dc703583a449 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java @@ -40,7 +40,6 @@ import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.policy.KidsModeSettingsObserver; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayInsetsController; @@ -225,6 +224,10 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { @VisibleForTesting void enable() { + // Needed since many Kids apps aren't optimised to support both orientations and it will be + // hard for kids to understand the app compat mode. + // TODO(229961548): Remove ignoreOrientationRequest exception for Kids Mode once possible. + setIsIgnoreOrientationRequestDisabled(true); final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(DEFAULT_DISPLAY); if (displayLayout != null) { mDisplayWidth = displayLayout.width(); @@ -245,6 +248,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { @VisibleForTesting void disable() { + setIsIgnoreOrientationRequestDisabled(false); mDisplayInsetsController.removeInsetsChangedListener(DEFAULT_DISPLAY, mOnInsetsChangedListener); mDisplayController.removeDisplayWindowListener(mOnDisplaysChangedListener); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java index 8ce8f7382ff3..bbec4eccce3c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java @@ -172,7 +172,7 @@ public class PhonePipMenuController implements PipMenuController { detachPipMenuView(); } - private void attachPipMenuView() { + void attachPipMenuView() { // In case detach was not called (e.g. PIP unexpectedly closed) if (mPipMenuView != null) { detachPipMenuView(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index 175a2445f28d..272331b7cd3f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -521,6 +521,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb }; if (mPipTaskOrganizer.isInPip() && saveRestoreSnapFraction) { + mMenuController.attachPipMenuView(); // Calculate the snap fraction of the current stack along the old movement bounds final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm(); final Rect postChangeStackBounds = new Rect(mPipBoundsState.getBounds()); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithm.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithm.kt index 09d202abfbde..07dccd58abfd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithm.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithm.kt @@ -131,10 +131,10 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { val pipSizeWithAllDecors = addDecors(pipSize) val pipAnchorBoundsWithAllDecors = - getNormalPipAnchorBounds(pipSizeWithAllDecors, transformedMovementBounds) + getNormalPipAnchorBounds(pipSizeWithAllDecors, transformedMovementBounds) val pipAnchorBoundsWithPermanentDecors = - removeTemporaryDecorsTransformed(pipAnchorBoundsWithAllDecors) + removeTemporaryDecorsTransformed(pipAnchorBoundsWithAllDecors) val result = calculatePipPositionTransformed( pipAnchorBoundsWithPermanentDecors, transformedRestrictedAreas, @@ -150,7 +150,7 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { return Placement( pipBounds, anchorBounds, - getStashType(pipBounds, movementBounds), + getStashType(pipBounds, unstashedDestBounds), unstashedDestBounds, result.unstashTime ) @@ -185,7 +185,10 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { restrictedAreas: Set<Rect>, unrestrictedAreas: Set<Rect> ): Placement { - if (restrictedAreas.isEmpty() && unrestrictedAreas.isEmpty()) { + // If PiP is not covered by any keep clear areas, we can leave it at the anchor bounds + val keepClearAreas = restrictedAreas + unrestrictedAreas + if (keepClearAreas.none { it.intersects(pipAnchorBounds) }) { + lastAreasOverlappingUnstashPosition = emptySet() return Placement(pipAnchorBounds, pipAnchorBounds) } @@ -204,9 +207,8 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { ?: findFreeMovePosition(pipAnchorBounds, emptySet(), unrestrictedAreas) ?: pipAnchorBounds - val keepClearAreas = restrictedAreas + unrestrictedAreas val areasOverlappingUnstashPosition = - keepClearAreas.filter { Rect.intersects(it, unstashBounds) }.toSet() + keepClearAreas.filterTo(mutableSetOf()) { it.intersects(unstashBounds) } val areasOverlappingUnstashPositionChanged = !lastAreasOverlappingUnstashPosition.containsAll(areasOverlappingUnstashPosition) lastAreasOverlappingUnstashPosition = areasOverlappingUnstashPosition @@ -228,19 +230,22 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { return Placement( stashedBounds, pipAnchorBounds, - getStashType(stashedBounds, transformedMovementBounds), + getStashType(stashedBounds, unstashBounds), unstashBounds, unstashTime ) } @PipBoundsState.StashType - private fun getStashType(stashedBounds: Rect, movementBounds: Rect): Int { + private fun getStashType(stashedBounds: Rect, unstashedDestBounds: Rect?): Int { + if (unstashedDestBounds == null) { + return STASH_TYPE_NONE + } return when { - stashedBounds.left < movementBounds.left -> STASH_TYPE_LEFT - stashedBounds.right > movementBounds.right -> STASH_TYPE_RIGHT - stashedBounds.top < movementBounds.top -> STASH_TYPE_TOP - stashedBounds.bottom > movementBounds.bottom -> STASH_TYPE_BOTTOM + stashedBounds.left < unstashedDestBounds.left -> STASH_TYPE_LEFT + stashedBounds.right > unstashedDestBounds.right -> STASH_TYPE_RIGHT + stashedBounds.top < unstashedDestBounds.top -> STASH_TYPE_TOP + stashedBounds.bottom > unstashedDestBounds.bottom -> STASH_TYPE_BOTTOM else -> STASH_TYPE_NONE } } @@ -368,57 +373,69 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { val areasOverlappingPipX = keepClearAreas.filter { it.intersectsX(bounds) } val areasOverlappingPipY = keepClearAreas.filter { it.intersectsY(bounds) } - if (screenBounds.bottom - bounds.bottom <= bounds.top - screenBounds.top) { - val fullStashTop = screenBounds.bottom - stashOffset + if (areasOverlappingPipX.isNotEmpty()) { + if (screenBounds.bottom - bounds.bottom <= bounds.top - screenBounds.top) { + val fullStashTop = screenBounds.bottom - stashOffset - val maxBottom = areasOverlappingPipX.maxByOrNull { it.bottom }!!.bottom - val partialStashTop = maxBottom + pipAreaPadding + val maxBottom = areasOverlappingPipX.maxByOrNull { it.bottom }!!.bottom + val partialStashTop = maxBottom + pipAreaPadding - val downPosition = Rect(bounds) - downPosition.offsetTo(bounds.left, min(fullStashTop, partialStashTop)) - stashCandidates += downPosition - } - if (screenBounds.bottom - bounds.bottom >= bounds.top - screenBounds.top) { - val fullStashBottom = screenBounds.top - bounds.height() + stashOffset + val newTop = min(fullStashTop, partialStashTop) + if (newTop > bounds.top) { + val downPosition = Rect(bounds) + downPosition.offsetTo(bounds.left, newTop) + stashCandidates += downPosition + } + } + if (screenBounds.bottom - bounds.bottom >= bounds.top - screenBounds.top) { + val fullStashBottom = screenBounds.top - bounds.height() + stashOffset - val minTop = areasOverlappingPipX.minByOrNull { it.top }!!.top - val partialStashBottom = minTop - bounds.height() - pipAreaPadding + val minTop = areasOverlappingPipX.minByOrNull { it.top }!!.top + val partialStashBottom = minTop - bounds.height() - pipAreaPadding - val upPosition = Rect(bounds) - upPosition.offsetTo(bounds.left, max(fullStashBottom, partialStashBottom)) - stashCandidates += upPosition + val newTop = max(fullStashBottom, partialStashBottom) + if (newTop < bounds.top) { + val upPosition = Rect(bounds) + upPosition.offsetTo(bounds.left, newTop) + stashCandidates += upPosition + } + } } - if (screenBounds.right - bounds.right <= bounds.left - screenBounds.left) { - val fullStashRight = screenBounds.right - stashOffset + if (areasOverlappingPipY.isNotEmpty()) { + if (screenBounds.right - bounds.right <= bounds.left - screenBounds.left) { + val fullStashRight = screenBounds.right - stashOffset - val maxRight = areasOverlappingPipY.maxByOrNull { it.right }!!.right - val partialStashRight = maxRight + pipAreaPadding + val maxRight = areasOverlappingPipY.maxByOrNull { it.right }!!.right + val partialStashRight = maxRight + pipAreaPadding - val rightPosition = Rect(bounds) - rightPosition.offsetTo(min(fullStashRight, partialStashRight), bounds.top) - stashCandidates += rightPosition - } - if (screenBounds.right - bounds.right >= bounds.left - screenBounds.left) { - val fullStashLeft = screenBounds.left - bounds.width() + stashOffset - - val minLeft = areasOverlappingPipY.minByOrNull { it.left }!!.left - val partialStashLeft = minLeft - bounds.width() - pipAreaPadding + val newLeft = min(fullStashRight, partialStashRight) + if (newLeft > bounds.left) { + val rightPosition = Rect(bounds) + rightPosition.offsetTo(newLeft, bounds.top) + stashCandidates += rightPosition + } + } + if (screenBounds.right - bounds.right >= bounds.left - screenBounds.left) { + val fullStashLeft = screenBounds.left - bounds.width() + stashOffset - val leftPosition = Rect(bounds) - leftPosition.offsetTo(max(fullStashLeft, partialStashLeft), bounds.top) - stashCandidates += leftPosition - } + val minLeft = areasOverlappingPipY.minByOrNull { it.left }!!.left + val partialStashLeft = minLeft - bounds.width() - pipAreaPadding - if (stashCandidates.isEmpty()) { - return bounds + val newLeft = max(fullStashLeft, partialStashLeft) + if (newLeft < bounds.left) { + val leftPosition = Rect(bounds) + leftPosition.offsetTo(newLeft, bounds.top) + stashCandidates += leftPosition + } + } } return stashCandidates.minByOrNull { val dx = abs(it.left - bounds.left) val dy = abs(it.top - bounds.top) return@minByOrNull dx + dy - }!! + } ?: bounds } /** @@ -768,7 +785,7 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { } /** - * Adds space around [size] to leave space for decorations that will be drawn around the pip + * Adds space around [size] to leave space for decorations that will be drawn around the PiP */ private fun addDecors(size: Size): Size { val bounds = Rect(0, 0, size.width, size.height) @@ -779,7 +796,7 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { } /** - * Removes the space that was reserved for permanent decorations around the pip + * Removes the space that was reserved for permanent decorations around the PiP * @param bounds the bounds (in screen space) to remove the insets from */ private fun removePermanentDecors(bounds: Rect): Rect { @@ -789,19 +806,20 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) { } /** - * Removes the space that was reserved for temporary decorations around the pip + * Removes the space that was reserved for temporary decorations around the PiP * @param bounds the bounds (in base case) to remove the insets from */ private fun removeTemporaryDecorsTransformed(bounds: Rect): Rect { if (pipTemporaryDecorInsets == Insets.NONE) return bounds - var reverseInsets = Insets.subtract(Insets.NONE, pipTemporaryDecorInsets) - var boundsInScreenSpace = fromTransformedSpace(bounds) + val reverseInsets = Insets.subtract(Insets.NONE, pipTemporaryDecorInsets) + val boundsInScreenSpace = fromTransformedSpace(bounds) boundsInScreenSpace.inset(reverseInsets) return toTransformedSpace(boundsInScreenSpace) } private fun Rect.offsetCopy(dx: Int, dy: Int) = Rect(this).apply { offset(dx, dy) } - private fun Rect.intersectsY(other: Rect) = bottom >= other.top && top <= other.bottom private fun Rect.intersectsX(other: Rect) = right >= other.left && left <= other.right + private fun Rect.intersectsY(other: Rect) = bottom >= other.top && top <= other.bottom + private fun Rect.intersects(other: Rect) = intersectsX(other) && intersectsY(other) } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt index 8da6224d990c..37e9344348d9 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt @@ -25,6 +25,8 @@ import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled +import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -81,9 +83,19 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales() /** {@inheritDoc} */ + @FlakyTest(bugId = 197726610) + @Test + override fun pipLayerExpands() { + Assume.assumeFalse(isShellTransitionsEnabled) + super.pipLayerExpands() + } + @Presubmit @Test - override fun pipLayerExpands() = super.pipLayerExpands() + fun pipLayerExpands_ShellTransit() { + Assume.assumeTrue(isShellTransitionsEnabled) + super.pipLayerExpands() + } companion object { /** diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java index 5526d5be7594..440a6f8fb59a 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizerTest.java @@ -44,7 +44,6 @@ import android.window.WindowContainerTransaction; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.internal.policy.KidsModeSettingsObserver; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.ShellExecutor; diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithmTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithmTest.kt index 9919214642fc..46f388d0ce0e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithmTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithmTest.kt @@ -25,6 +25,7 @@ import org.junit.runner.RunWith import com.android.wm.shell.pip.PipBoundsState.STASH_TYPE_NONE import com.android.wm.shell.pip.PipBoundsState.STASH_TYPE_BOTTOM import com.android.wm.shell.pip.PipBoundsState.STASH_TYPE_RIGHT +import com.android.wm.shell.pip.PipBoundsState.STASH_TYPE_TOP import com.android.wm.shell.pip.tv.TvPipKeepClearAlgorithm.Placement import org.junit.Before import org.junit.Test @@ -434,6 +435,28 @@ class TvPipKeepClearAlgorithmTest { } @Test + fun test_ExpandedPiPHeightExceedsMovementBounds_AtAnchor() { + gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL + pipSize = Size(DEFAULT_PIP_SIZE.width, SCREEN_SIZE.height) + testAnchorPosition() + } + + @Test + fun test_ExpandedPiPHeightExceedsMovementBounds_BottomBar_StashedUp() { + gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL + pipSize = Size(DEFAULT_PIP_SIZE.width, SCREEN_SIZE.height) + val bottomBar = makeBottomBar(96) + unrestrictedAreas.add(bottomBar) + + val expectedBounds = getExpectedAnchorBounds() + expectedBounds.offset(0, -bottomBar.height() - PADDING) + val placement = getActualPlacement() + assertEquals(expectedBounds, placement.bounds) + assertEquals(STASH_TYPE_TOP, placement.stashType) + assertEquals(getExpectedAnchorBounds(), placement.unstashDestinationBounds) + } + + @Test fun test_PipInsets() { val permInsets = Insets.of(-1, -2, -3, -4) algorithm.setPipPermanentDecorInsets(permInsets) diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 9dea5b9152b7..32fff1eb270d 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -1247,7 +1247,7 @@ public final class MediaFormat { * A key describing the per-frame average block QP (Quantization Parameter). * This is a part of a video 'Encoding Statistics' export feature. * This value is emitted from video encoder for a video frame. - * The average value is rounded down (using floor()) to integer value. + * The average value is rounded to the nearest integer value. * * The associated value is an integer. */ diff --git a/packages/CompanionDeviceManager/res/values-el/strings.xml b/packages/CompanionDeviceManager/res/values-el/strings.xml index 4713c5d6948d..9bf0b7805b96 100644 --- a/packages/CompanionDeviceManager/res/values-el/strings.xml +++ b/packages/CompanionDeviceManager/res/values-el/strings.xml @@ -24,7 +24,7 @@ <string name="summary_watch" product="tablet" msgid="7113724443198337683">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θα επιτρέπεται να αλληλεπιδρά με τις ειδοποιήσεις σας και να έχει πρόσβαση στις άδειες Τηλεφώνου, SMS, Επαφών και Ημερολογίου."</string> <string name="permission_apps" msgid="6142133265286656158">"Εφαρμογές"</string> <string name="permission_apps_summary" msgid="798718816711515431">"Μεταδώστε σε ροή τις εφαρμογές του τηλεφώνου σας"</string> - <string name="title_app_streaming" msgid="2270331024626446950">"Να επιτρέπεται στην εφαρμογή <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> η πρόσβαση σε αυτές τις πληροφορίες από το τηλέφωνό σας."</string> + <string name="title_app_streaming" msgid="2270331024626446950">"Να επιτρέπεται στο <strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> η πρόσβαση σε αυτές τις πληροφορίες από το τηλέφωνό σας."</string> <string name="helper_title_app_streaming" msgid="4151687003439969765">"Υπηρεσίες πολλών συσκευών"</string> <string name="helper_summary_app_streaming" msgid="7380294597268573523">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> ζητά εκ μέρους της συσκευής σας <xliff:g id="DEVICE_TYPE">%2$s</xliff:g> άδεια για πρόσβαση στις φωτογραφίες, τα αρχεία μέσων και τις ειδοποιήσεις του τηλεφώνου σας"</string> <string name="title_automotive_projection" msgid="3296005598978412847"></string> diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index ce58ff6fc59d..4c313b22f71e 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -61,6 +61,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.UUID; @@ -318,13 +319,19 @@ public class ExternalStorageProvider extends FileSystemProvider { } // Block Download folder from tree - if (TextUtils.equals(Environment.DIRECTORY_DOWNLOADS.toLowerCase(), - path.toLowerCase())) { + if (TextUtils.equals(Environment.DIRECTORY_DOWNLOADS.toLowerCase(Locale.ROOT), + path.toLowerCase(Locale.ROOT))) { return true; } - if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(), - path.toLowerCase())) { + // Block /Android + if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(Locale.ROOT), + path.toLowerCase(Locale.ROOT))) { + return true; + } + + // Block /Android/data, /Android/obb, /Android/sandbox and sub dirs + if (shouldHide(dir)) { return true; } @@ -420,19 +427,21 @@ public class ExternalStorageProvider extends FileSystemProvider { } @VisibleForTesting - static String getPathFromDocId(String docId) { + static String getPathFromDocId(String docId) throws IOException { final int splitIndex = docId.indexOf(':', 1); - final String path = docId.substring(splitIndex + 1); + final String docIdPath = docId.substring(splitIndex + 1); + // Get CanonicalPath and remove the first "/" + final String canonicalPath = new File(docIdPath).getCanonicalPath().substring(1); - if (path.isEmpty()) { - return path; + if (canonicalPath.isEmpty()) { + return canonicalPath; } // remove trailing "/" - if (path.charAt(path.length() - 1) == '/') { - return path.substring(0, path.length() - 1); + if (canonicalPath.charAt(canonicalPath.length() - 1) == '/') { + return canonicalPath.substring(0, canonicalPath.length() - 1); } else { - return path; + return canonicalPath; } } @@ -463,7 +472,12 @@ public class ExternalStorageProvider extends FileSystemProvider { if (!target.exists()) { target.mkdirs(); } - target = new File(target, path); + try { + target = new File(target, path).getCanonicalFile(); + } catch (IOException e) { + throw new FileNotFoundException("Failed to canonicalize path " + path); + } + if (mustExist && !target.exists()) { throw new FileNotFoundException("Missing file for " + docId + " at " + target); } diff --git a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java index ed8320fa7fef..18a8edc5e447 100644 --- a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java +++ b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java @@ -67,5 +67,16 @@ public class ExternalStorageProviderTest { docId = root + ":"; assertTrue(getPathFromDocId(docId).isEmpty()); + + docId = root + ":./" + path; + assertEquals(getPathFromDocId(docId), path); + + final String dotPath = "abc/./def/ghi"; + docId = root + ":" + dotPath; + assertEquals(getPathFromDocId(docId), path); + + final String twoDotPath = "abc/../abc/def/ghi"; + docId = root + ":" + twoDotPath; + assertEquals(getPathFromDocId(docId), path); } } diff --git a/packages/PackageInstaller/res/values-ar/strings.xml b/packages/PackageInstaller/res/values-ar/strings.xml index 51b18d36ad41..d85d15985918 100644 --- a/packages/PackageInstaller/res/values-ar/strings.xml +++ b/packages/PackageInstaller/res/values-ar/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"جارٍ إلغاء التثبيت…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"جارٍ إلغاء تثبيت <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> <string name="uninstall_done" msgid="439354138387969269">"تمّ إلغاء تثبيت التطبيق."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"تم إلغاء تثبيت <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"تم إلغاء تثبيت <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>."</string> <string name="uninstall_failed" msgid="1847750968168364332">"تعذّر إلغاء تثبيت التطبيق."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"لم يتم إلغاء تثبيت <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> بنجاح."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"تعذر إلغاء تثبيت تطبيق مشرف الأجهزة النشطة"</string> diff --git a/packages/PackageInstaller/res/values-as/strings.xml b/packages/PackageInstaller/res/values-as/strings.xml index bde9394e7572..dd776a986df6 100644 --- a/packages/PackageInstaller/res/values-as/strings.xml +++ b/packages/PackageInstaller/res/values-as/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"এপ্ আনইনষ্টল কৰক"</string> <string name="uninstall_update_title" msgid="824411791011583031">"আপডে’ট আনইনষ্টল কৰক"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> হৈছে তলৰ এপটোৰ এটা অংশ:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"আপুনি এই এপটো আনইনষ্টল কৰিব বিচাৰেনে?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"আপুনি এই এপ্টো আনইনষ্টল কৰিব বিচাৰে নেকি?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"আপুনি "<b>"সকলো"</b>" ব্যৱহাৰকাৰীৰ বাবে এই এপটো আনইনষ্টল কৰিব বিচাৰেনে? এপ্লিকেশ্বন আৰু ইয়াৰ ডেটা ডিভাইচটোত থকা "<b>"সকলো"</b>" ব্যৱহাৰকাৰীৰ পৰা আঁতৰোৱা হ\'ব৷"</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"আপুনি ব্যৱহাৰকাৰীৰ <xliff:g id="USERNAME">%1$s</xliff:g> বাবে এই এপটো আনইনষ্টল কৰিব বিচাৰেনে?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"আপুনি নিজৰ কৰ্মস্থানৰ প্ৰ’ফাইলৰ পৰা এই এপ্টো আনইনষ্টল কৰিব বিচাৰেনে?"</string> diff --git a/packages/PackageInstaller/res/values-b+sr+Latn/strings.xml b/packages/PackageInstaller/res/values-b+sr+Latn/strings.xml index 4ac089d23a42..f646b203d1b5 100644 --- a/packages/PackageInstaller/res/values-b+sr+Latn/strings.xml +++ b/packages/PackageInstaller/res/values-b+sr+Latn/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"Deinstaliraj aplikaciju"</string> <string name="uninstall_update_title" msgid="824411791011583031">"Deinstaliraj ažuriranje"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> je deo sledeće aplikacije:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"Želite li da deinstalirate ovu aplikaciju?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"Želite da deinstalirate ovu aplikaciju?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Da li želite da deinstalirate ovu aplikaciju za "<b>"sve"</b>" korisnike? Aplikacija i podaci uz nje biće uklonjeni za "<b>"sve"</b>" korisnike ovog uređaja."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"Želite li da deinstalirate ovu aplikaciju za korisnika <xliff:g id="USERNAME">%1$s</xliff:g>?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"Da li želite da deinstalirate ovu aplikaciju sa poslovnog profila?"</string> diff --git a/packages/PackageInstaller/res/values-bs/strings.xml b/packages/PackageInstaller/res/values-bs/strings.xml index 860218521618..d2bf501b1e9b 100644 --- a/packages/PackageInstaller/res/values-bs/strings.xml +++ b/packages/PackageInstaller/res/values-bs/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Deinstaliranje..."</string> <string name="uninstalling_app" msgid="8866082646836981397">"Deinstaliranje aplikacije <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> <string name="uninstall_done" msgid="439354138387969269">"Deinstaliranje je završeno."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"Deinstaliran je paket <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"Deinstalirana je aplikacija <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> <string name="uninstall_failed" msgid="1847750968168364332">"Deinstaliranje nije uspjelo."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Paket <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> nije uspješno deinstaliran."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Nije moguće deinstalirati aktivnu aplikaciju administratora uređaja"</string> diff --git a/packages/PackageInstaller/res/values-et/strings.xml b/packages/PackageInstaller/res/values-et/strings.xml index 0138219910d1..2324806fd9be 100644 --- a/packages/PackageInstaller/res/values-et/strings.xml +++ b/packages/PackageInstaller/res/values-et/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Desinstallimine …"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Paketi <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> desinstallimine …"</string> <string name="uninstall_done" msgid="439354138387969269">"Desinstallimine on lõpetatud."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"Üksus <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> on desinstallitud"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> on desinstallitud"</string> <string name="uninstall_failed" msgid="1847750968168364332">"Desinstallimine ebaõnnestus."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Üksuse <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> desinstallimine ebaõnnestus."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Aktiivset seadme administraatori rakendust ei saa desinstallida"</string> diff --git a/packages/PackageInstaller/res/values-fr/strings.xml b/packages/PackageInstaller/res/values-fr/strings.xml index 50ca29d8ee34..a02851e11920 100644 --- a/packages/PackageInstaller/res/values-fr/strings.xml +++ b/packages/PackageInstaller/res/values-fr/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Désinstallation…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Désinstallation de <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> <string name="uninstall_done" msgid="439354138387969269">"Désinstallation terminée."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"Le package <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> a été désinstallé"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> a été désinstallé"</string> <string name="uninstall_failed" msgid="1847750968168364332">"Échec de la désinstallation."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Échec de la désinstallation du package <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Impossible de désinstaller une application d\'administration de l\'appareil active"</string> diff --git a/packages/PackageInstaller/res/values-gu/strings.xml b/packages/PackageInstaller/res/values-gu/strings.xml index 4dc7f0b1e910..7851d3d10f0a 100644 --- a/packages/PackageInstaller/res/values-gu/strings.xml +++ b/packages/PackageInstaller/res/values-gu/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"ઍપ્લિકેશન અનઇન્સ્ટૉલ કરો"</string> <string name="uninstall_update_title" msgid="824411791011583031">"અપડેટ અનઇન્સ્ટૉલ કરો"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g>, નીચેની ઍપ્લિકેશનનો ભાગ છે:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"શું તમે આ ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવા માંગો છો?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"શું તમે આ ઍપને અનઇન્સ્ટૉલ કરવા માંગો છો?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"શું તમે "<b>"બધા"</b>" વપરાશકર્તાઓ માટે આ ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવા માગો છો? ડિવાઇસ પરના "<b>"બધા"</b>" વપરાશકર્તાઓની ઍપ્લિકેશન અને તેનો ડેટા કાઢી નાખવામાં આવશે."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"શું તમે <xliff:g id="USERNAME">%1$s</xliff:g> વપરાશકર્તા માટે આ ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવા માગો છો?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"શું તમે તમારી ઑફિસની પ્રોફાઇલમાંથી આ ઍપને અનઇન્સ્ટૉલ કરવા માગો છો?"</string> diff --git a/packages/PackageInstaller/res/values-hi/strings.xml b/packages/PackageInstaller/res/values-hi/strings.xml index 382278eafa97..5981ce966ebb 100644 --- a/packages/PackageInstaller/res/values-hi/strings.xml +++ b/packages/PackageInstaller/res/values-hi/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"ऐप्लिकेशन अनइंस्टॉल करें"</string> <string name="uninstall_update_title" msgid="824411791011583031">"अपडेट अनइंस्टॉल करें"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> इस ऐप्लिकेशन का भाग है:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"क्या आप इस ऐप्लिकेशन को अनइंस्टॉल करना चाहते हैं?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"क्या आपको इस ऐप्लिकेशन को अनइंस्टॉल करना है?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"क्या आप इस ऐप्लिकेशन को "<b>"सभी"</b>" उपयोगकर्ताओं के लिए अनइंस्टॉल करना चाहते हैं? ऐप्लिकेशन और उसके डेटा को डिवाइस पर "<b>"सभी"</b>" उपयोगकर्ताओं से हटा दिया जाएगा."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"क्या आप उपयोगकर्ता <xliff:g id="USERNAME">%1$s</xliff:g> के लिए इस ऐप्लिकेशन को अनइंस्टॉल करना चाहते हैं?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"क्या अपनी वर्क प्रोफ़ाइल से इस ऐप्लिकेशन को अनइंस्टॉल करना है?"</string> diff --git a/packages/PackageInstaller/res/values-ko/strings.xml b/packages/PackageInstaller/res/values-ko/strings.xml index 02e65ab95b94..b1e00a41dbc1 100644 --- a/packages/PackageInstaller/res/values-ko/strings.xml +++ b/packages/PackageInstaller/res/values-ko/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"제거 중..."</string> <string name="uninstalling_app" msgid="8866082646836981397">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> 제거 중…"</string> <string name="uninstall_done" msgid="439354138387969269">"제거를 완료했습니다."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>을(를) 제거했습니다."</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>를 제거했습니다."</string> <string name="uninstall_failed" msgid="1847750968168364332">"제거하지 못했습니다."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>을(를) 제거하지 못했습니다."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"활성 상태의 기기 관리자 앱을 제거할 수 없습니다."</string> diff --git a/packages/PackageInstaller/res/values-mk/strings.xml b/packages/PackageInstaller/res/values-mk/strings.xml index 732df62bbb07..d8f54e9d7945 100644 --- a/packages/PackageInstaller/res/values-mk/strings.xml +++ b/packages/PackageInstaller/res/values-mk/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Се деинсталира…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Се деинсталира <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> <string name="uninstall_done" msgid="439354138387969269">"Деинсталирањето заврши."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> е деинсталиран"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> се деинсталираше"</string> <string name="uninstall_failed" msgid="1847750968168364332">"Деинсталирањето е неуспешно."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Деинсталирањето на <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> е неуспешно."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Не може да се деинсталира активна апликација на администраторот на уредот"</string> diff --git a/packages/PackageInstaller/res/values-ne/strings.xml b/packages/PackageInstaller/res/values-ne/strings.xml index ec9c60ed8999..24303d16e2a7 100644 --- a/packages/PackageInstaller/res/values-ne/strings.xml +++ b/packages/PackageInstaller/res/values-ne/strings.xml @@ -53,9 +53,9 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"एपको स्थापना रद्द गर्नु…"</string> <string name="uninstall_update_title" msgid="824411791011583031">"अद्यावधिकको स्थापना रद्द गर्नु…"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> निम्न एपको अंश हो:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"तपाईं यो एपको स्थापना रद्द गर्न चाहनुहुन्छ?"</string> - <string name="uninstall_application_text_all_users" msgid="575491774380227119">"तपाईं "<b>"सबै"</b>" प्रयोगकर्ताका लागि यो एपको स्थापना रद्द गर्न चाहनुहुन्छ? डिभाइसका "<b>"सबै"</b>" प्रयोगकर्ताहरूबाट उक्त एप र यसको डेटा हटाइने छ।"</string> - <string name="uninstall_application_text_user" msgid="498072714173920526">"तपाईं प्रयोगकर्ता <xliff:g id="USERNAME">%1$s</xliff:g> का लागि यो एपको स्थापना रद्द गर्न चाहनुहुन्छ?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"तपाईं यो एप अनइन्स्टल गर्न चाहनुहुन्छ?"</string> + <string name="uninstall_application_text_all_users" msgid="575491774380227119">"तपाईं "<b>"सबै"</b>" प्रयोगकर्ताका लागि यो एप अनइन्स्टल गर्न चाहनुहुन्छ? डिभाइसका "<b>"सबै"</b>" प्रयोगकर्ताहरूबाट उक्त एप र यसको डेटा हटाइने छ।"</string> + <string name="uninstall_application_text_user" msgid="498072714173920526">"तपाईं प्रयोगकर्ता <xliff:g id="USERNAME">%1$s</xliff:g> का लागि यो एप अनइन्स्टल गर्न चाहनुहुन्छ?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"तपाईं आफ्नो कार्य प्रोफाइलबाट यो एप अनइन्स्टल गर्न चाहनुहुन्छ?"</string> <string name="uninstall_update_text" msgid="863648314632448705">"यस एपलाई फ्याक्ट्रीको संस्करणले बदल्ने हो? सबै डेटा हटाइने छ।"</string> <string name="uninstall_update_text_multiuser" msgid="8992883151333057227">"यस एपलाई फ्याक्ट्रीको संस्करणले बदल्ने हो? सबै डेटा हटाइने छ। यसले यस डिभाइसका कार्य प्रोफाइल भएका लगायत सबै प्रयोगकर्ताहरूमा असर पार्छ।"</string> @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"स्थापना रद्द गर्दै…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> को स्थापना रद्द गर्दै…"</string> <string name="uninstall_done" msgid="439354138387969269">"स्थापना रद्द गर्ने काम सम्पन्न भयो।"</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> को स्थापना रद्द गरियो"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> अनइन्स्टल गरियो"</string> <string name="uninstall_failed" msgid="1847750968168364332">"स्थापना रद्द गर्न सकिएन।"</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> को स्थापना रद्द गर्ने कार्य असफल भयो।"</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"डिभाइसको सक्रिय प्रशासकीय एपको स्थापना रद्द गर्न मिल्दैन"</string> diff --git a/packages/PackageInstaller/res/values-pl/strings.xml b/packages/PackageInstaller/res/values-pl/strings.xml index e0b86378ed0e..6f6469d674c8 100644 --- a/packages/PackageInstaller/res/values-pl/strings.xml +++ b/packages/PackageInstaller/res/values-pl/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Odinstalowuję…"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Odinstalowuję <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string> <string name="uninstall_done" msgid="439354138387969269">"Odinstalowywanie zakończone."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"Odinstalowano pakiet <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"Odinstalowano aplikację <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string> <string name="uninstall_failed" msgid="1847750968168364332">"Nie udało się odinstalować."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Nie udało się odinstalować pakietu <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Nie można odinstalować aktywnej aplikacji do administrowania urządzeniem"</string> diff --git a/packages/PackageInstaller/res/values-pt-rPT/strings.xml b/packages/PackageInstaller/res/values-pt-rPT/strings.xml index 9e3b40d5d781..da4ffd0e3943 100644 --- a/packages/PackageInstaller/res/values-pt-rPT/strings.xml +++ b/packages/PackageInstaller/res/values-pt-rPT/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"Desinstalar app"</string> <string name="uninstall_update_title" msgid="824411791011583031">"Desinstalar atualização"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> faz parte da seguinte app:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"Pretende desinstalar esta app?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"Desinstalar esta app?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Pretende desinstalar esta app para "<b>"todos"</b>" os utilizadores? A app e os respetivos dados serão removidos de "<b>"todos"</b>" os utilizadores do dispositivo."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"Pretende desinstalar esta app para o utilizador <xliff:g id="USERNAME">%1$s</xliff:g>?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"Quer desinstalar esta app do seu perfil de trabalho?"</string> diff --git a/packages/PackageInstaller/res/values-sl/strings.xml b/packages/PackageInstaller/res/values-sl/strings.xml index 6e5c1677fefd..926598a93e23 100644 --- a/packages/PackageInstaller/res/values-sl/strings.xml +++ b/packages/PackageInstaller/res/values-sl/strings.xml @@ -65,7 +65,7 @@ <string name="uninstalling" msgid="8709566347688966845">"Odstranjevanje …"</string> <string name="uninstalling_app" msgid="8866082646836981397">"Odmeščanje aplikacije <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> …"</string> <string name="uninstall_done" msgid="439354138387969269">"Odstranitev je končana."</string> - <string name="uninstall_done_app" msgid="4588850984473605768">"Aplikacija <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> je bila odstranjena"</string> + <string name="uninstall_done_app" msgid="4588850984473605768">"Aplikacija <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> je bila odstranjena."</string> <string name="uninstall_failed" msgid="1847750968168364332">"Odstranitev ni uspela."</string> <string name="uninstall_failed_app" msgid="5506028705017601412">"Odmeščanje aplikacije <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> ni uspelo."</string> <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Aktivne skrbniške aplikacije naprave ni mogoče odstraniti"</string> diff --git a/packages/PackageInstaller/res/values-sr/strings.xml b/packages/PackageInstaller/res/values-sr/strings.xml index 0f5252af57d8..d964d3fa7c8c 100644 --- a/packages/PackageInstaller/res/values-sr/strings.xml +++ b/packages/PackageInstaller/res/values-sr/strings.xml @@ -53,7 +53,7 @@ <string name="uninstall_application_title" msgid="4045420072401428123">"Деинсталирај апликацију"</string> <string name="uninstall_update_title" msgid="824411791011583031">"Деинсталирај ажурирање"</string> <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> је део следеће апликације:"</string> - <string name="uninstall_application_text" msgid="3816830743706143980">"Желите ли да деинсталирате ову апликацију?"</string> + <string name="uninstall_application_text" msgid="3816830743706143980">"Желите да деинсталирате ову апликацију?"</string> <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Да ли желите да деинсталирате ову апликацију за "<b>"све"</b>" кориснике? Апликација и подаци уз ње биће уклоњени за "<b>"све"</b>" кориснике овог уређаја."</string> <string name="uninstall_application_text_user" msgid="498072714173920526">"Желите ли да деинсталирате ову апликацију за корисника <xliff:g id="USERNAME">%1$s</xliff:g>?"</string> <string name="uninstall_application_text_current_user_work_profile" msgid="8788387739022366193">"Да ли желите да деинсталирате ову апликацију са пословног профила?"</string> diff --git a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml index 5f0322f1db4e..07615ae0a660 100644 --- a/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml +++ b/packages/PrintSpooler/res/values-b+sr+Latn/strings.xml @@ -66,7 +66,7 @@ <string name="notification_channel_failure" msgid="9042250774797916414">"Neuspeli zadaci štampanja"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Pravljenje datoteke nije uspelo"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Neke usluge štampanja su onemogućene"</string> - <string name="print_searching_for_printers" msgid="6550424555079932867">"Pretraga štampača"</string> + <string name="print_searching_for_printers" msgid="6550424555079932867">"Traženje štampača"</string> <string name="print_no_print_services" msgid="8561247706423327966">"Nijedna usluga štampanja nije omogućena"</string> <string name="print_no_printers" msgid="4869403323900054866">"Nije pronađen nijedan štampač"</string> <string name="cannot_add_printer" msgid="7840348733668023106">"Nije moguće dodati štampače"</string> diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml index d898b1e62226..96751ea12081 100644 --- a/packages/PrintSpooler/res/values-it/strings.xml +++ b/packages/PrintSpooler/res/values-it/strings.xml @@ -65,7 +65,7 @@ <string name="notification_channel_failure" msgid="9042250774797916414">"Processi di stampa non riusciti"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Impossibile creare il file"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Alcuni servizi di stampa sono disattivati"</string> - <string name="print_searching_for_printers" msgid="6550424555079932867">"Ricerca di stampanti"</string> + <string name="print_searching_for_printers" msgid="6550424555079932867">"Ricerca di stampanti..."</string> <string name="print_no_print_services" msgid="8561247706423327966">"Non è stato attivato alcun servizio di stampa"</string> <string name="print_no_printers" msgid="4869403323900054866">"Nessuna stampante trovata"</string> <string name="cannot_add_printer" msgid="7840348733668023106">"Impossibile aggiungere stampanti"</string> diff --git a/packages/PrintSpooler/res/values-mk/strings.xml b/packages/PrintSpooler/res/values-mk/strings.xml index 3fd32b18ee6f..d96330c43daf 100644 --- a/packages/PrintSpooler/res/values-mk/strings.xml +++ b/packages/PrintSpooler/res/values-mk/strings.xml @@ -52,7 +52,7 @@ <string name="add_print_service_label" msgid="5356702546188981940">"Додајте услуга"</string> <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Полето за пребарување е прикажано"</string> <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Полето за пребарување е скриено"</string> - <string name="print_add_printer" msgid="1088656468360653455">"Додај печатач"</string> + <string name="print_add_printer" msgid="1088656468360653455">"Додајте печатач"</string> <string name="print_select_printer" msgid="7388760939873368698">"Избери печатач"</string> <string name="print_forget_printer" msgid="5035287497291910766">"Заборави го печатачот"</string> <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868"> diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml index c2f99d9efef6..bc29999f8c0c 100644 --- a/packages/PrintSpooler/res/values-sr/strings.xml +++ b/packages/PrintSpooler/res/values-sr/strings.xml @@ -66,7 +66,7 @@ <string name="notification_channel_failure" msgid="9042250774797916414">"Неуспели задаци штампања"</string> <string name="could_not_create_file" msgid="3425025039427448443">"Прављење датотеке није успело"</string> <string name="print_services_disabled_toast" msgid="9089060734685174685">"Неке услуге штампања су онемогућене"</string> - <string name="print_searching_for_printers" msgid="6550424555079932867">"Претрага штампача"</string> + <string name="print_searching_for_printers" msgid="6550424555079932867">"Тражење штампача"</string> <string name="print_no_print_services" msgid="8561247706423327966">"Ниједна услуга штампања није омогућена"</string> <string name="print_no_printers" msgid="4869403323900054866">"Није пронађен ниједан штампач"</string> <string name="cannot_add_printer" msgid="7840348733668023106">"Није могуће додати штампаче"</string> diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java index 7c9a045f4a42..fc0e05f7fb46 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchPreference.java @@ -122,9 +122,10 @@ public class MainSwitchPreference extends TwoStatePreference implements OnMainSw * Adds a listener for switch changes */ public void addOnSwitchChangeListener(OnMainSwitchChangeListener listener) { - if (mMainSwitchBar == null) { + if (!mSwitchChangeListeners.contains(listener)) { mSwitchChangeListeners.add(listener); - } else { + } + if (mMainSwitchBar != null) { mMainSwitchBar.addOnSwitchChangeListener(listener); } } @@ -133,9 +134,8 @@ public class MainSwitchPreference extends TwoStatePreference implements OnMainSw * Remove a listener for switch changes */ public void removeOnSwitchChangeListener(OnMainSwitchChangeListener listener) { - if (mMainSwitchBar == null) { - mSwitchChangeListeners.remove(listener); - } else { + mSwitchChangeListeners.remove(listener); + if (mMainSwitchBar != null) { mMainSwitchBar.removeOnSwitchChangeListener(listener); } } diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/WorkPolicyUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/WorkPolicyUtils.java new file mode 100644 index 000000000000..b038d59e9fe4 --- /dev/null +++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/WorkPolicyUtils.java @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2022 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.settingslib.utils; + + +import android.app.admin.DevicePolicyManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.os.UserHandle; +import android.os.UserManager; +import android.provider.Settings; + +import java.util.List; + +/** + * Utility class for find out when to show WorkPolicyInfo + */ +public class WorkPolicyUtils { + + Context mContext; + PackageManager mPackageManager; + UserManager mUserManager; + DevicePolicyManager mDevicePolicyManager; + + private static final int USER_NULL = -10000; + + public WorkPolicyUtils( + Context applicationContext, + PackageManager mPm, + UserManager mUm, + DevicePolicyManager mDpm + ) { + mContext = applicationContext; + mPackageManager = mPm; + mUserManager = mUm; + mDevicePolicyManager = mDpm; + } + + /** + * Returns {@code true} if it is possilbe to resolve an Intent to launch the "Your work policy + * info" page provided by the active Device Owner or Profile Owner app if it exists, {@code + * false} otherwise. + */ + public boolean hasWorkPolicy() { + return getWorkPolicyInfoIntentDO() != null || getWorkPolicyInfoIntentPO() != null; + } + + /** + * Launches the Device Owner or Profile Owner's activity that displays the "Your work policy + * info" page. Returns {@code true} if the activity has indeed been launched. + */ + public boolean showWorkPolicyInfo(Context activityContext) { + Intent intent = getWorkPolicyInfoIntentDO(); + if (intent != null) { + activityContext.startActivity(intent); + return true; + } + + intent = getWorkPolicyInfoIntentPO(); + final int userId = getManagedProfileUserId(); + if (intent != null && userId != USER_NULL) { + activityContext.startActivityAsUser(intent, UserHandle.of(userId)); + return true; + } + + return false; + } + + private Intent getWorkPolicyInfoIntentDO() { + final ComponentName ownerComponent = getDeviceOwnerComponent(); + if (ownerComponent == null) { + return null; + } + + // Only search for the required action in the Device Owner's package + final Intent intent = + new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO) + .setPackage(ownerComponent.getPackageName()); + final List<ResolveInfo> activities = mPackageManager.queryIntentActivities(intent, 0); + if (activities.size() != 0) { + return intent; + } + + return null; + } + + private Intent getWorkPolicyInfoIntentPO() { + try { + final int managedUserId = getManagedProfileUserId(); + if (managedUserId == USER_NULL) { + return null; + } + + Context managedProfileContext = + mContext.createPackageContextAsUser( + mContext.getPackageName(), 0, UserHandle.of(managedUserId) + ); + + DevicePolicyManager managedProfileDevicePolicyManager = + (DevicePolicyManager) + managedProfileContext.getSystemService(Context.DEVICE_POLICY_SERVICE); + ComponentName ownerComponent = managedProfileDevicePolicyManager.getProfileOwner(); + if (ownerComponent == null) { + return null; + } + + // Only search for the required action in the Profile Owner's package + final Intent intent = + new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO) + .setPackage(ownerComponent.getPackageName()); + final List<ResolveInfo> activities = + mPackageManager.queryIntentActivitiesAsUser( + intent, 0, UserHandle.of(managedUserId)); + if (activities.size() != 0) { + return intent; + } + + return null; + } catch (PackageManager.NameNotFoundException e) { + return null; + } + } + + private ComponentName getDeviceOwnerComponent() { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) { + return null; + } + return mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser(); + } + + private int getManagedProfileUserId() { + List<UserHandle> allProfiles = mUserManager.getAllProfiles(); + for (UserHandle uh : allProfiles) { + int id = uh.getIdentifier(); + if (mUserManager.isManagedProfile(id)) { + return id; + } + } + return USER_NULL; + } + +} diff --git a/packages/SettingsLib/res/values-as/strings.xml b/packages/SettingsLib/res/values-as/strings.xml index b3bba95f949b..e4a6118894cb 100644 --- a/packages/SettingsLib/res/values-as/strings.xml +++ b/packages/SettingsLib/res/values-as/strings.xml @@ -400,9 +400,9 @@ <string name="app_process_limit_title" msgid="8361367869453043007">"নেপথ্যত চলা প্ৰক্ৰিয়াৰ সীমা"</string> <string name="show_all_anrs" msgid="9160563836616468726">"নেপথ্য এএনআৰবোৰ দেখুৱাওক"</string> <string name="show_all_anrs_summary" msgid="8562788834431971392">"নেপথ্য এপসমূহৰ বাবে এপে সঁহাৰি দিয়া নাই ডায়ল\'গ প্ৰদৰ্শন কৰক"</string> - <string name="show_notification_channel_warnings" msgid="3448282400127597331">"জাননী চ্চেনেলৰ সকীয়নিসমূহ দেখুৱাওক"</string> + <string name="show_notification_channel_warnings" msgid="3448282400127597331">"জাননী চেনেলৰ সকীয়নিবোৰ দেখুৱাওক"</string> <string name="show_notification_channel_warnings_summary" msgid="68031143745094339">"কোনো এপে বৈধ চেনেল নোহোৱাকৈ কোনো জাননী প\'ষ্ট কৰিলে স্ক্ৰীনত সকীয়নি প্ৰদৰ্শন হয়"</string> - <string name="force_allow_on_external" msgid="9187902444231637880">"বাহ্যিক সঞ্চয়াগাৰত এপক বলেৰে অনুমতি দিয়ক"</string> + <string name="force_allow_on_external" msgid="9187902444231637880">"বাহ্যিক ষ্ট\'ৰেজত এপক বলেৰে অনুমতি দিয়ক"</string> <string name="force_allow_on_external_summary" msgid="8525425782530728238">"মেনিফেষ্টৰ মান যিয়েই নহওক, বাহ্যিক ষ্ট’ৰেজত লিখিবলৈ যিকোনো এপক উপযুক্ত কৰি তোলে"</string> <string name="force_resizable_activities" msgid="7143612144399959606">"বলেৰে কাৰ্যকলাপসমূহৰ আকাৰ সলনি কৰিব পৰা কৰক"</string> <string name="force_resizable_activities_summary" msgid="2490382056981583062">"মেনিফেষ্টৰ মান যিয়েই নহওক, মাল্টি-ৱিণ্ডৰ বাবে আটাইবোৰ কাৰ্যকলাপৰ আকাৰ সলনি কৰিব পৰা কৰক।"</string> @@ -590,7 +590,7 @@ <string name="add_guest_failed" msgid="8074548434469843443">"নতুন অতিথি সৃষ্টি কৰিব পৰা নগ’ল"</string> <string name="user_nickname" msgid="262624187455825083">"উপনাম"</string> <string name="user_add_user" msgid="7876449291500212468">"ব্যৱহাৰকাৰী যোগ দিয়ক"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"অতিথি যোগ কৰক"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"অতিথি যোগ দিয়ক"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"অতিথি আঁতৰাওক"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"অতিথিৰ ছেশ্বন ৰিছেট কৰক"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"অতিথিৰ ছেশ্বন ৰিছেট কৰিবনে?"</string> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 7c58ee7de9dc..2c681da6d84f 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Адключэнне..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Злучэнне..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Спарванне..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Спалучэнне..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без званкоў)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без аўдыя)"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Падключана прылада <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без паведамленняў)"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index f35ed0e8d0a4..5b6d982492f3 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -568,7 +568,7 @@ <string name="user_add_profile_item_summary" msgid="5418602404308968028">"Можете да ограничите достъпа до приложенията и съдържанието от профила си"</string> <string name="user_add_user_item_title" msgid="2394272381086965029">"Потребител"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"Ограничен потр. профил"</string> - <string name="user_add_user_title" msgid="5457079143694924885">"Да се добави ли нов потреб.?"</string> + <string name="user_add_user_title" msgid="5457079143694924885">"Добавяне на нов потребител?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира с приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например за Wi‑Fi.\n\nКогато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители. Настройките и услугите за достъпност може да не се прехвърлят за новия потребител."</string> <string name="user_add_user_message_short" msgid="3295959985795716166">"Когато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Настройване на потребителя?"</string> diff --git a/packages/SettingsLib/res/values-bn/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml index 7d4208120491..bd812859b538 100644 --- a/packages/SettingsLib/res/values-bn/strings.xml +++ b/packages/SettingsLib/res/values-bn/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"ডিসকানেক্ট হচ্ছে..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"কানেক্ট হচ্ছে..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"কানেক্ট করা আছে<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"চেনানো হচ্ছে..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"যুক্ত করা হচ্ছে..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"কানেক্ট করা আছে (ফোনের অডিও ছাড়া)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"কানেক্ট করা আছে (মিডিয়ার অডিও ছাড়া)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"কানেক্ট করা আছে (মেসেজে অ্যাকসেস নেই)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"সীমাবদ্ধ প্রোফাইল"</string> <string name="user_add_user_title" msgid="5457079143694924885">"নতুন ব্যবহারকারী জুড়বেন?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"আপনি একাধিক ব্যবহারকারীর আইডি তৈরি করে অন্যদের সাথে এই ডিভাইসটি শেয়ার করতে পারেন। ডিভাইসের স্টোরেজে প্রত্যেক ব্যবহারকারী তার নিজস্ব জায়গা পাবেন যা তিনি অ্যাপ, ওয়ালপেপার এবং আরও অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ওয়াই-ফাই এর মতো ডিভাইস সেটিংস, যেগুলি সকলের ক্ষেত্রে প্রযোজ্য হয়, সেগুলি ব্যবহারকারীরা পরিবর্তন করতে পারবেন।\n\nনতুন ব্যবহারকারীর আইডি যোগ করলে সেই ব্যক্তিকে স্টোরেজে তার নিজের জায়গা সেট-আপ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনও ব্যবহারকারী অ্যাপ আপডেট করতে পারবেন। তবে ব্যবহারযোগ্যতার সেটিংস এবং পরিষেবা নতুন ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য নাও হতে পারে।"</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"আপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট-আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"আপনি একজন নতুন ব্যবহারকারী যোগ করলে তাকে তার জায়গা সেট-আপ করে নিতে হবে৷\n\nযেকোনও ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ আপডেট করতে পারবেন৷"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"এখন ব্যবহারকারী সেট-আপ করবেন?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"নিশ্চিত করুন, যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার জায়গা সেট-আপ করার জন্য উপলব্ধ আছেন"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"এখনই প্রোফাইল সেট-আপ করবেন?"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 93941218546a..258120f35cc3 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -589,8 +589,8 @@ <string name="add_user_failed" msgid="4809887794313944872">"Kreiranje novog korisnika nije uspjelo"</string> <string name="add_guest_failed" msgid="8074548434469843443">"Kreiranje novog gosta nije uspjelo"</string> <string name="user_nickname" msgid="262624187455825083">"Nadimak"</string> - <string name="user_add_user" msgid="7876449291500212468">"Dodaj korisnika"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"Dodaj gosta"</string> + <string name="user_add_user" msgid="7876449291500212468">"Dodajte korisnika"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"Dodajte gosta"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Ukloni gosta"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Poništi sesiju gosta"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Poništiti sesiju gosta?"</string> @@ -649,7 +649,7 @@ <string name="physical_keyboard_title" msgid="4811935435315835220">"Fizička tastatura"</string> <string name="keyboard_layout_dialog_title" msgid="3927180147005616290">"Odaberite raspored tastature"</string> <string name="keyboard_layout_default_label" msgid="1997292217218546957">"Zadano"</string> - <string name="turn_screen_on_title" msgid="3266937298097573424">"Uključi ekran"</string> + <string name="turn_screen_on_title" msgid="3266937298097573424">"Uključivanje ekrana"</string> <string name="allow_turn_screen_on" msgid="6194845766392742639">"Dozvolite uključivanje ekrana"</string> <string name="allow_turn_screen_on_description" msgid="43834403291575164">"Dozvolite aplikaciji da uključi ekran. Ako se odobri, aplikacija može uključiti ekran bilo kada bez vaše izričite namjere."</string> <string name="bt_le_audio_scan_qr_code" msgid="3521809854780392679">"Skenirajte QR kôd"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index 7729815c5ff4..36eb472508dd 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -255,12 +255,12 @@ <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Párovací kód Wi‑Fi"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Spárování se nezdařilo"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Zkontrolujte, zda je zařízení připojeno ke stejné síti."</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Spárovat zařízení přes Wi-Fi naskenováním QR kódu"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Spárujte zařízení přes Wi-Fi naskenováním QR kódu"</string> <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Párování zařízení…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Spárování zařízení se nezdařilo. Buď byl QR kód chybný, nebo zařízení není připojeno ke stejné síti."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP adresa a port"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Naskenování QR kódu"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Spárovat zařízení přes Wi-Fi naskenováním QR kódu"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Spárujte zařízení přes Wi-Fi naskenováním QR kódu"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Připojte se k síti Wi-Fi"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, ladění, vývoj"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"Zástupce hlášení chyb"</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 0f04846856bc..ef0f800656f9 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Ακύρωση"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Η σύζευξη παρέχει πρόσβαση στις επαφές σας και το ιστορικό κλήσεων όταν συνδεθείτε."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Δεν ήταν δυνατή η σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Δεν ήταν δυνατή η σύζευξη με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> λόγω εσφαλμένου αριθμού PIN ή κλειδιού πρόσβασης."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Δεν ήταν δυνατή η σύζευξη με το <xliff:g id="DEVICE_NAME">%1$s</xliff:g> λόγω εσφαλμένου PIN ή κλειδιού πρόσβασης."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Δεν είναι δυνατή η σύνδεση με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Η ζεύξη απορρίφθηκε από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Υπολογιστής"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index f9c6121c2eae..c9c1eb18bf3a 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Desconectando…"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Estableciendo conexión…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Conectado<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Vinculando…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Emparejando…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Conectado a <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (sin audio de teléfono)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Conectado (sin audio multimedia) a <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Conectado a <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (sin acceso a mensajes)"</string> @@ -507,7 +507,7 @@ <string name="screen_zoom_summary_extremely_large" msgid="1438045624562358554">"Lo más grande posible"</string> <string name="screen_zoom_summary_custom" msgid="3468154096832912210">"Personalizado (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> <string name="content_description_menu_button" msgid="6254844309171779931">"Menú"</string> - <string name="retail_demo_reset_message" msgid="5392824901108195463">"Escribe una contraseña para restablecer estado de fábrica en modo demostración"</string> + <string name="retail_demo_reset_message" msgid="5392824901108195463">"Escribe una contraseña para restablecer estado de fábrica en modo Demo"</string> <string name="retail_demo_reset_next" msgid="3688129033843885362">"Siguiente"</string> <string name="retail_demo_reset_title" msgid="1866911701095959800">"Contraseña obligatoria"</string> <string name="active_input_method_subtypes" msgid="4232680535471633046">"Métodos de introducción de texto activos"</string> @@ -529,7 +529,7 @@ <string name="alarms_and_reminders_label" msgid="6918395649731424294">"Alarmas y recordatorios"</string> <string name="alarms_and_reminders_switch_title" msgid="4939393911531826222">"Permitir la programación de alarmas y recordatorios"</string> <string name="alarms_and_reminders_title" msgid="8819933264635406032">"Alarmas y recordatorios"</string> - <string name="alarms_and_reminders_footer_title" msgid="6302587438389079695">"Permite que esta aplicación programe alarmas y otras acciones que se llevan a cabo a una hora determinada. Esto hace que la aplicación siga activa en segundo plano, lo que puede usar más batería.\n\nSi este permiso está desactivado, no funcionarán las alarmas ni los eventos que se activan a una hora determinada que programe esta aplicación."</string> + <string name="alarms_and_reminders_footer_title" msgid="6302587438389079695">"Permite que esta aplicación programe alarmas y otras acciones que se llevan a cabo a una hora determinada. Esto hace que la aplicación pueda seguir activa en segundo plano, lo que puede usar más batería.\n\nSi este permiso está desactivado, no funcionarán las alarmas ni los eventos que se activan a una hora determinada que programe esta aplicación."</string> <string name="keywords_alarms_and_reminders" msgid="6633360095891110611">"programar, alarma, recordatorio, reloj"</string> <string name="zen_mode_enable_dialog_turn_on" msgid="6418297231575050426">"Activar"</string> <string name="zen_mode_settings_turn_on_dialog_title" msgid="2760567063190790696">"Activar el modo No molestar"</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Perfil restringido"</string> <string name="user_add_user_title" msgid="5457079143694924885">"¿Añadir nuevo usuario?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Puedes compartir este dispositivo si creas más usuarios. Cada uno tendrá su propio espacio y podrá personalizarlo con aplicaciones, un fondo de pantalla y mucho más. Los usuarios también pueden ajustar opciones del dispositivo, como la conexión Wi‑Fi, que afectan a todos los usuarios.\n\nCuando añadas un usuario, tendrá que configurar su espacio.\n\nCualquier usuario puede actualizar aplicaciones de todos los usuarios. Es posible que no se transfieran los servicios y opciones de accesibilidad al nuevo usuario."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Al añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Al añadir un usuario nuevo, debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"¿Configurar usuario ahora?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"Asegúrate de que la persona está disponible en este momento para usar el dispositivo y configurar su espacio."</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"¿Quieres configurar un perfil ahora?"</string> diff --git a/packages/SettingsLib/res/values-et/strings.xml b/packages/SettingsLib/res/values-et/strings.xml index 29376f30c1fb..37a6db28ee0b 100644 --- a/packages/SettingsLib/res/values-et/strings.xml +++ b/packages/SettingsLib/res/values-et/strings.xml @@ -589,7 +589,7 @@ <string name="add_user_failed" msgid="4809887794313944872">"Uue kasutaja loomine ebaõnnestus"</string> <string name="add_guest_failed" msgid="8074548434469843443">"Uue külalise loomine ei õnnestunud"</string> <string name="user_nickname" msgid="262624187455825083">"Hüüdnimi"</string> - <string name="user_add_user" msgid="7876449291500212468">"Kasutaja lisamine"</string> + <string name="user_add_user" msgid="7876449291500212468">"Lisa kasutaja"</string> <string name="guest_new_guest" msgid="3482026122932643557">"Lisa külaline"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Eemalda külaline"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Lähtesta külastajaseanss"</string> diff --git a/packages/SettingsLib/res/values-eu/arrays.xml b/packages/SettingsLib/res/values-eu/arrays.xml index 23bb76dbf2a2..cc47e27fd485 100644 --- a/packages/SettingsLib/res/values-eu/arrays.xml +++ b/packages/SettingsLib/res/values-eu/arrays.xml @@ -192,7 +192,7 @@ <string-array name="window_animation_scale_entries"> <item msgid="2675263395797191850">"Animazioa desaktibatuta"</item> <item msgid="5790132543372767872">"Animazio-eskala: 0,5x"</item> - <item msgid="2529692189302148746">"Animazio-eskala: 1x"</item> + <item msgid="2529692189302148746">"Animazio-eskala: 1×"</item> <item msgid="8072785072237082286">"Animazio-eskala: 1,5x"</item> <item msgid="3531560925718232560">"Animazio-eskala 2x"</item> <item msgid="4542853094898215187">"Animazio-eskala: 5x"</item> @@ -201,7 +201,7 @@ <string-array name="transition_animation_scale_entries"> <item msgid="3376676813923486384">"Animazioa desaktibatuta"</item> <item msgid="753422683600269114">"Animazio-eskala: 0,5x"</item> - <item msgid="3695427132155563489">"Animazio-eskala: 1x"</item> + <item msgid="3695427132155563489">"Animazio-eskala: 1×"</item> <item msgid="9032615844198098981">"Animazio-eskala: 1,5x"</item> <item msgid="8473868962499332073">"Animazio-eskala: 2x"</item> <item msgid="4403482320438668316">"Animazio-eskala: 5x"</item> @@ -210,7 +210,7 @@ <string-array name="animator_duration_scale_entries"> <item msgid="6416998593844817378">"Animazioa desaktibatuta"</item> <item msgid="875345630014338616">"Animazio-eskala: 0,5x"</item> - <item msgid="2753729231187104962">"Animazio-eskala: 1x"</item> + <item msgid="2753729231187104962">"Animazio-eskala: 1×"</item> <item msgid="1368370459723665338">"Animazio-eskala: 1,5x"</item> <item msgid="5768005350534383389">"Animazio-eskala: 2x"</item> <item msgid="3728265127284005444">"Animazio-eskala: 5x"</item> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index 5386c3513fa4..689cca13afad 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Utzi"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Gailuak parekatzen badituzu, batetik besteko kontaktuak eta deien historia atzitu ahal izango dituzu."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu PIN edo pasakode okerra idatzi delako."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Ezin izan da parekatu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin, PIN edo pasakode okerra idatzi delako."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Ezin da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin komunikatu."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak bikotetzea ukatu du."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Ordenagailua"</string> @@ -338,7 +338,7 @@ <string name="verify_apps_over_usb_title" msgid="6031809675604442636">"Egiaztatu USB bidezko aplik."</string> <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"Egiaztatu ADB/ADT bidez instalatutako aplikazioak portaera kaltegarriak atzemateko"</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Bluetooth bidezko gailuak izenik gabe (MAC helbideak soilik) erakutsiko dira"</string> - <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Bluetooth bidezko bolumen absolutuaren eginbidea desgaitu egiten du urruneko gailuetan arazoak hautematen badira; esaterako, bolumena ozenegia bada edo ezin bada kontrolatu"</string> + <string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Bluetooth bidezko bolumen absolutuaren eginbidea desgaitu egiten du urruneko gailuetan arazoak hautematen badira; esaterako, bolumena ozenegia bada edo kontrolatu ezin bada"</string> <string name="bluetooth_enable_gabeldorsche_summary" msgid="2054730331770712629">"Bluetooth Gabeldorsche eginbide sorta gaitzen du."</string> <string name="enhanced_connectivity_summary" msgid="1576414159820676330">"Konexioak hobetzeko eginbidea gaitzen du."</string> <string name="enable_terminal_title" msgid="3834790541986303654">"Tokiko terminala"</string> @@ -590,7 +590,7 @@ <string name="add_guest_failed" msgid="8074548434469843443">"Ezin izan da sortu beste gonbidatu bat"</string> <string name="user_nickname" msgid="262624187455825083">"Goitizena"</string> <string name="user_add_user" msgid="7876449291500212468">"Gehitu erabiltzaile bat"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"Gehitu gonbidatua"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"Gehitu gonbidatu bat"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Kendu gonbidatua"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Berrezarri gonbidatuentzako saioa"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Gonbidatuentzako saioa berrezarri nahi duzu?"</string> @@ -615,7 +615,7 @@ <string name="carrier_network_change_mode" msgid="4257621815706644026">"Operadorearen sarea aldatzen"</string> <string name="data_connection_3g" msgid="931852552688157407">"3G"</string> <string name="data_connection_edge" msgid="4625509456544797637">"EDGE"</string> - <string name="data_connection_cdma" msgid="9098161966701934334">"1X"</string> + <string name="data_connection_cdma" msgid="9098161966701934334">"1×"</string> <string name="data_connection_gprs" msgid="1251945769006770189">"GPRS"</string> <string name="data_connection_3_5g" msgid="4298721462047921400">"H"</string> <string name="data_connection_3_5g_plus" msgid="6683055858295918170">"H+"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 740e1e69906f..f1419102cecb 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -529,7 +529,7 @@ <string name="alarms_and_reminders_label" msgid="6918395649731424294">"زنگهای هشدار و یادآوریها"</string> <string name="alarms_and_reminders_switch_title" msgid="4939393911531826222">"مجاز کردن تنظیم زنگ ساعت و یادآوری"</string> <string name="alarms_and_reminders_title" msgid="8819933264635406032">"زنگهای ساعت و یادآوریها"</string> - <string name="alarms_and_reminders_footer_title" msgid="6302587438389079695">"به این برنامه اجازه میدهد زنگ ساعت تنظیم کند و کنشهای حساس به زمان زمانبندی کند. این تنظیم به برنامه اجازه میدهد در پسزمینه اجرا شود که ممکن است باتری بیشتری مصرف کند.\n\nاگر این اجازه خاموش باشد، زنگهای ساعت موجود و رویدادهای مبتنی بر زمان که این برنامه زمانبندی کرده است کار نخواهند کرد."</string> + <string name="alarms_and_reminders_footer_title" msgid="6302587438389079695">"به این برنامه اجازه میدهد زنگ ساعت تنظیم کند و کنشهای حساس به زمان را زمانبندی کند. این تنظیم به برنامه اجازه میدهد در پسزمینه اجرا شود که ممکن است باتری بیشتری مصرف کند.\n\nاگر این اجازه خاموش باشد، زنگهای ساعت موجود و رویدادهای مبتنی بر زمان که این برنامه زمانبندی کرده است کار نخواهند کرد."</string> <string name="keywords_alarms_and_reminders" msgid="6633360095891110611">"زمانبندی، زنگ ساعت، یادآوری، ساعت"</string> <string name="zen_mode_enable_dialog_turn_on" msgid="6418297231575050426">"روشن کردن"</string> <string name="zen_mode_settings_turn_on_dialog_title" msgid="2760567063190790696">"روشن کردن «مزاحم نشوید»"</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index e1e731f601e7..51ddb5a1e153 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Annuler"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. NIP ou d\'une clé d\'accès incorrects."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un NIP ou d\'une clé d\'accès incorrects."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Ordinateur"</string> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index a9c4b69b261a..393d6ff8dbbd 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -146,7 +146,7 @@ <string name="bluetooth_hid_profile_summary_use_for" msgid="4289460627406490952">"ઇનપુટ માટે ઉપયોગ કરો"</string> <string name="bluetooth_hearing_aid_profile_summary_use_for" msgid="7689393730163320483">"શ્રવણ યંત્રો માટે ઉપયોગ કરો"</string> <string name="bluetooth_le_audio_profile_summary_use_for" msgid="2778318636027348572">"LE_AUDIO માટે ઉપયોગ કરો"</string> - <string name="bluetooth_pairing_accept" msgid="2054232610815498004">"જોડી"</string> + <string name="bluetooth_pairing_accept" msgid="2054232610815498004">"જોડી કરો"</string> <string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"જોડી કરો"</string> <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"રદ કરો"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"એ કનેક્ટ કરેલ હોય ત્યારે જોડાણ બનાવવાથી તમારા સંપર્કો અને કૉલ ઇતિહાસનો અૅક્સેસ મળે છે."</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"પ્રતિબંધિત પ્રોફાઇલ"</string> <string name="user_add_user_title" msgid="5457079143694924885">"નવા વપરાશકર્તાને ઉમેરીએ?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ડિવાઇસને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેમની પોતાની સ્પેસ છે, જેને તેઓ ઍપ, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ પ્રત્યેક વ્યક્તિને અસર કરતી હોય તેવી ડિવાઇસ સેટિંગ જેમ કે વાઇ-ફાઇને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમની સ્પેસ સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપને અપડેટ કરી શકે છે. નવા વપરાશકર્તાને ઍક્સેસિબિલિટી સેટિંગ અને સેવાઓ ટ્રાન્સફર ન પણ થાય."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ અપ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે એપ્લિકેશન્સને અપડેટ કરી શકે છે."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ અપ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે ઍપને અપડેટ કરી શકે છે."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"અત્યારે જ વપરાશકર્તાને સેટ અપ કરીએ?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"ખાતરી કરો કે વ્યક્તિ ડિવાઇસ લેવા અને તેમના સ્થાનનું સેટ અપ કરવા માટે ઉપલબ્ધ છે"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"હવે પ્રોફાઇલ સેટ કરીએ?"</string> diff --git a/packages/SettingsLib/res/values-hi/arrays.xml b/packages/SettingsLib/res/values-hi/arrays.xml index a449773611a1..61a8f92b792d 100644 --- a/packages/SettingsLib/res/values-hi/arrays.xml +++ b/packages/SettingsLib/res/values-hi/arrays.xml @@ -265,7 +265,7 @@ <item msgid="910925519184248772">"PTP (पिक्चर ट्रांसफर प्रोटोकॉल)"</item> <item msgid="3825132913289380004">"RNDIS (USB ईथरनेट)"</item> <item msgid="8828567335701536560">"ऑडियो स्रोत"</item> - <item msgid="8688681727755534982">"MIDI"</item> + <item msgid="8688681727755534982">"एमआईडीआई"</item> </string-array> <string-array name="avatar_image_descriptions"> </string-array> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 02b78c16aabc..c1c23a577bd3 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"डिस्कनेक्ट हो रहा है..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"कनेक्ट हो रहा है..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> से जुड़ गया"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"युग्मित कर रहा है…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"जोड़ा जा रहा है…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"जुड़ गया (फ़ोन के ऑडियो को छोड़कर)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"जुड़ गया (मीडिया ऑडियो को छोड़कर)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"जुड़ गया (मैसेज का ऐक्सेस नहीं)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"प्रतिबंधित प्रोफ़ाइल"</string> <string name="user_add_user_title" msgid="5457079143694924885">"नया उपयोगकर्ता जोड़ें?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"आप और ज़्यादा उपयोगकर्ता बनाकर इस डिवाइस को दूसरे लोगों के साथ शेयर कर सकते हैं. हर उपयोगकर्ता के पास अपनी जगह होती है, जिसमें वह मनपसंद तरीके से ऐप्लिकेशन, वॉलपेपर और दूसरी चीज़ों में बदलाव कर सकते हैं. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग में भी बदलाव कर सकते हैं, जिसका असर हर किसी पर पड़ेगा.\n\nजब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उन्हें अपनी जगह सेट करनी होगी.\n\nकोई भी उपयोगकर्ता दूसरे सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकता है. ऐसा भी हो सकता है कि सुलभता सेटिंग और सेवाएं नए उपयोगकर्ता को ट्रांसफ़र न हो पाएं."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं, तो उसे अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकता है."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"कोई नया उपयोगकर्ता जोड़ने पर, उसे अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकता है."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"उपयोगकर्ता को अभी सेट करें?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"पक्का करें कि व्यक्ति डिवाइस का इस्तेमाल करने और अपनी जगह सेट करने के लिए मौजूद है"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"प्रोफ़ाइल अभी सेट करें?"</string> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index fdf14b3fab88..82a7443a7050 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -255,12 +255,12 @@ <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Kôd za uparivanje putem Wi-Fija"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Uparivanje nije uspjelo"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Provjerite je li uređaj povezan na istu mrežu."</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Uparivanje uređaja putem Wi-Fija skeniranjem QR koda"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Uparite uređaj putem Wi-Fija skeniranjem QR koda"</string> <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Uparivanje uređaja…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Uparivanje uređaja nije uspjelo. QR kôd je neispravan ili uređaj nije povezan na istu mrežu."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP adresa i priključak"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Skenirajte QR kôd"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Uparivanje uređaja putem Wi-Fija skeniranjem QR koda"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Uparite uređaj putem Wi-Fija skeniranjem QR koda"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Povežite se s Wifi mrežom"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, otklanjanje pogrešaka, razvoj"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"Prečac izvješća o pogreškama"</string> @@ -365,11 +365,11 @@ <string name="show_touches" msgid="8437666942161289025">"Prikaži dodire"</string> <string name="show_touches_summary" msgid="3692861665994502193">"Prikaži vizualne povratne informacije za dodire"</string> <string name="show_screen_updates" msgid="2078782895825535494">"Prikaži ažur. površine"</string> - <string name="show_screen_updates_summary" msgid="2126932969682087406">"Površina prozora bljeska pri ažuriranju."</string> - <string name="show_hw_screen_updates" msgid="2021286231267747506">"Pokaži ažuriranja prikaza"</string> + <string name="show_screen_updates_summary" msgid="2126932969682087406">"Površina prozora bljeska pri ažuriranju"</string> + <string name="show_hw_screen_updates" msgid="2021286231267747506">"Prikaži ažuriranja prikaza"</string> <string name="show_hw_screen_updates_summary" msgid="3539770072741435691">"Bljeskanje prikaza u prozorima pri crtanju"</string> <string name="show_hw_layers_updates" msgid="5268370750002509767">"Prikaži ažuriranja hardverskih slojeva"</string> - <string name="show_hw_layers_updates_summary" msgid="5850955890493054618">"Hardverski slojevi bljeskaju zeleno pri ažuriranju."</string> + <string name="show_hw_layers_updates_summary" msgid="5850955890493054618">"Hardverski slojevi bljeskaju zeleno pri ažuriranju"</string> <string name="debug_hw_overdraw" msgid="8944851091008756796">"Rješavanje GPU preklapanja"</string> <string name="disable_overlays" msgid="4206590799671557143">"Onemogući dijeljenje mem."</string> <string name="disable_overlays_summary" msgid="1954852414363338166">"Uvijek koristi GPU za slaganje zaslona"</string> @@ -378,7 +378,7 @@ <string name="usb_audio_disable_routing" msgid="3367656923544254975">"Onemogući USB audiousmj."</string> <string name="usb_audio_disable_routing_summary" msgid="8768242894849534699">"Onemogući aut. usmjeravanje na USB audioperiferiju"</string> <string name="debug_layout" msgid="1659216803043339741">"Prikaži okvir prikaza"</string> - <string name="debug_layout_summary" msgid="8825829038287321978">"Prikazuju se obrubi, margine itd. isječaka."</string> + <string name="debug_layout_summary" msgid="8825829038287321978">"Prikazuju se obrubi, margine itd. isječaka"</string> <string name="force_rtl_layout_all_locales" msgid="8690762598501599796">"Nametni zdesna ulijevo"</string> <string name="force_rtl_layout_all_locales_summary" msgid="6663016859517239880">"Nametni smjer zdesna ulijevo za sve zemlje/jezike"</string> <string name="window_blurs" msgid="6831008984828425106">"Dopusti zamućenja na razini prozora"</string> @@ -594,7 +594,7 @@ <string name="guest_exit_guest" msgid="5908239569510734136">"Uklanjanje gosta"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Poništi gostujuću sesiju"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Poništiti gostujuću sesiju?"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Ukloniti gosta?"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Želite li ukloniti gosta?"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"Poništi"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"Ukloni"</string> <string name="guest_resetting" msgid="7822120170191509566">"Poništavanje gostujuće sesije…"</string> diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml index 2cd935205664..f48af46f83b8 100644 --- a/packages/SettingsLib/res/values-hy/strings.xml +++ b/packages/SettingsLib/res/values-hy/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Չեղարկել"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Զուգակցում է մուտքի թույլտվությունը դեպի ձեր կոնտակտները և զանգերի պատմությունը, երբ միացված է:"</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Չհաջողվեց զուգակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ:"</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Հնարավոր չեղավ զուգակցվել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ սխալ PIN-ի կամ անցաբառի պատճառով:."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Չհաջողվեց զուգակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ սխալ PIN-ի կամ անցաբառի պատճառով:"</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Հնարավոր չէ կապ հաստատել <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ:"</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Զուգավորումը մերժվեց <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կողմից:"</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Համակարգիչ"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index da3c3e634f20..1a1268c4469f 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Memutus sambungan..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Menghubungkan…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Terhubung<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Menyandingkan..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Menyambungkan..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Terhubung (tanpa ponsel)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Terhubung (tanpa media)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Terhubung (tanpa akses pesan)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -150,8 +150,8 @@ <string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"SAMBUNGKAN"</string> <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Batal"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Penyandingan memberi akses ke kontak dan histori panggilan saat terhubung"</string> - <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Tidak dapat menyambungkan ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Tidak dapat menyambungkan ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string> + <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Tidak dapat menyambungkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Tidak dapat menyambungkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Tidak dapat berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Penyandingan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Komputer"</string> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index 66c7273ab5d3..ca9649d85e91 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Annulla"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"L\'accoppiamento consente l\'accesso ai tuoi contatti e alla cronologia chiamate quando i dispositivi sono connessi."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN sono errati."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La password o il PIN sono errati."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"Impossibile comunicare con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Computer"</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Profilo con limitazioni"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Aggiungere un nuovo utente?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondo e così via. Gli utenti possono anche regolare le impostazioni del dispositivo, come il Wi‑Fi, che riguardano tutti.\n\nQuando crei un nuovo utente, la persona in questione deve configurare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri utenti. I servizi e le impostazioni di accessibilità non potranno essere trasferiti al nuovo utente."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Il nuovo utente, una volta aggiunto, deve impostare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Il nuovo utente, una volta aggiunto, deve configurare il proprio spazio.\n\nQualsiasi utente può aggiornare le app per tutti gli altri."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Configurare l\'utente ora?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"Assicurati che la persona sia disponibile a prendere il dispositivo e configurare il suo spazio"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Configurare il profilo ora?"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 2196c75ddde6..c50b18079f52 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -594,7 +594,7 @@ <string name="guest_exit_guest" msgid="5908239569510734136">"הסרת אורח"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"איפוס הגלישה כאורח"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"לאפס את הגלישה כאורח?"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"להסיר את האורח/ת?"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"להסיר את האורח?"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"איפוס"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"הסרה"</string> <string name="guest_resetting" msgid="7822120170191509566">"מתבצע איפוס של הגלישה כאורח…"</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index ae428df2a285..4464c8752f7b 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -569,8 +569,8 @@ <string name="user_add_user_item_title" msgid="2394272381086965029">"ユーザー"</string> <string name="user_add_profile_item_title" msgid="3111051717414643029">"制限付きプロファイル"</string> <string name="user_add_user_title" msgid="5457079143694924885">"新しいユーザーを追加しますか？"</string> - <string name="user_add_user_message_long" msgid="1527434966294733380">"追加ユーザーを作成して、このデバイスを他のユーザーと共有できます。各ユーザーは各自のスペースを所有して、アプリや壁紙などのカスタマイズを行うことができます。Wi-Fi など、すべてのユーザーに影響するデバイス設定を変更することもできます。\n\n新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。ユーザー補助機能の設定とサービスは新しいユーザーに適用されないことがあります。"</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string> + <string name="user_add_user_message_long" msgid="1527434966294733380">"追加ユーザーを作成して、このデバイスを他のユーザーと共有できます。各ユーザーは各自のスペースを所有して、アプリや壁紙などのカスタマイズを行うことができます。Wi-Fi など、すべてのユーザーに影響するデバイス設定を変更することもできます。\n\n新しく追加したユーザーは各自でスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。ユーザー補助機能の設定とサービスは新しいユーザーに適用されないことがあります。"</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"新しく追加したユーザーは各自でスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"ユーザーを今すぐセットアップ"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"ユーザーがデバイスを使って各自のスペースをセットアップできるようにします"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"プロファイルを今すぐセットアップしますか？"</string> diff --git a/packages/SettingsLib/res/values-kk/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml index f5559d270f0a..b97decaf59b7 100644 --- a/packages/SettingsLib/res/values-kk/strings.xml +++ b/packages/SettingsLib/res/values-kk/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Бас тарту"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Жұптасқан кезде, контактілеріңіз бен қоңыраулар тарихын көру мүмкіндігі беріледі."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жұпталу орындалмады."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптаса алмады, себебі PIN немесе құпия сөз дұрыс емес."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптаса алмады, себебі PIN немесе рұқсат кілті дұрыс емес."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен қатынаса алмайды"</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы жұпталудан бас тартты."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Компьютер"</string> @@ -489,7 +489,7 @@ <string name="disabled_by_admin_summary_text" msgid="5343911767402923057">"Әкімші басқарады"</string> <string name="disabled_by_app_ops_text" msgid="8373595926549098012">"Шектелген параметрлер арқылы басқарылады."</string> <string name="disabled" msgid="8017887509554714950">"Өшірілген"</string> - <string name="external_source_trusted" msgid="1146522036773132905">"Рұқсат етілген"</string> + <string name="external_source_trusted" msgid="1146522036773132905">"Рұқсат берілген"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"Рұқсат етілмеген"</string> <string name="install_other_apps" msgid="3232595082023199454">"Белгісіз қолданбаларды орнату"</string> <string name="home" msgid="973834627243661438">"Параметрлер негізгі беті"</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Шектелген профайл"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Жаңа пайдаланушы қосылсын ба?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Қосымша профильдер жасай отырып, бұл құрылғыны басқалармен ортақ пайдалануға болады. Әр пайдаланушы қолданбаларды, тұсқағаздарды орнатып, профилін өз қалауынша реттей алады. Сондай-ақ барлығы ортақ қолданатын Wi‑Fi сияқты параметрлерді де реттеуге болады.\n\nЖаңа пайдаланушы енгізілгенде, ол өз профилін реттеуі керек болады.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады. Арнайы мүмкіндіктерге қатысты параметрлер мен қызметтер жаңа пайдаланушыға өтпейді."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Жаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Жаңа пайдаланушыны қосқанда, сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Профиль құру керек пе?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"Пайдаланушы құрылғыны алып, өз профилін реттеуі керек."</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Профайл қазір жасақталсын ба?"</string> @@ -655,12 +655,8 @@ <string name="bt_le_audio_scan_qr_code" msgid="3521809854780392679">"QR кодын сканерлеу"</string> <string name="bt_le_audio_scan_qr_code_scanner" msgid="4679500020630341107">"Тыңдай бастау үшін төмендегі QR кодын ортаға орналастырыңыз."</string> <string name="bt_le_audio_qr_code_is_not_valid_format" msgid="6092191081849434734">"QR кодының форматы жарамсыз."</string> - <!-- no translation found for bt_le_audio_broadcast_dialog_title (5392738488989777074) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_sub_title (268234802198852753) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_switch_app (5749813313369517812) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_different_output (2638402023060391333) --> - <skip /> + <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын таратуды тоқтатасыз ба?"</string> + <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> қолданбасын таратсаңыз немесе аудио шығысын өзгертсеңіз, қазіргі тарату сеансы тоқтайды."</string> + <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"<xliff:g id="SWITCHAPP">%1$s</xliff:g> қолданбасын тарату"</string> + <string name="bt_le_audio_broadcast_dialog_different_output" msgid="2638402023060391333">"Аудио шығысын өзгерту"</string> </resources> diff --git a/packages/SettingsLib/res/values-km/strings.xml b/packages/SettingsLib/res/values-km/strings.xml index a770f61f2acf..080fc79a653b 100644 --- a/packages/SettingsLib/res/values-km/strings.xml +++ b/packages/SettingsLib/res/values-km/strings.xml @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"ប្រវត្តិបានដាក់កម្រិត"</string> <string name="user_add_user_title" msgid="5457079143694924885">"បញ្ចូលអ្នកប្រើប្រាស់ថ្មី?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"អ្នកអាចចែករំលែកឧបករណ៍នេះជាមួយមនុស្សផ្សេងទៀតបានដោយបង្កើតអ្នកប្រើប្រាស់បន្ថែម។ អ្នកប្រើប្រាស់ម្នាក់ៗមានទំហំផ្ទុកផ្ទាល់ខ្លួនរបស់គេ ដែលពួកគេអាចប្ដូរតាមបំណងសម្រាប់កម្មវិធី ផ្ទាំងរូបភាព និងអ្វីៗផ្សេងទៀត។ អ្នកប្រើប្រាស់ក៏អាចកែសម្រួលការកំណត់ឧបករណ៍ដូចជា Wi‑Fi ដែលប៉ះពាល់ដល់អ្នកប្រើប្រាស់ផ្សេងទៀតផងដែរ។\n\nនៅពេលដែលអ្នកបញ្ចូលអ្នកប្រើប្រាស់ថ្មី បុគ្គលនោះត្រូវតែរៀបចំទំហំផ្ទុករបស់គេ។\n\nអ្នកប្រើប្រាស់ណាក៏អាចដំឡើងកំណែកម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ទាំងអស់ផ្សេងទៀតបានដែរ។ ការកំណត់ភាពងាយស្រួល និងសេវាកម្មមិនអាចផ្ទេរទៅកាន់អ្នកប្រើប្រាស់ថ្មីបានទេ។"</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"ពេលអ្នកបញ្ចូលអ្នកប្រើប្រាស់ថ្មី អ្នកប្រើប្រាស់នោះត្រូវកំណត់ទំហំផ្ទាល់របស់គេ។\n\nអ្នកប្រើប្រាស់ណាក៏អាចដំឡើងជំនាន់កម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ផ្សេងទាំងអស់បានដែរ។"</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"នៅពេលអ្នកបញ្ចូលអ្នកប្រើប្រាស់ថ្មី អ្នកប្រើប្រាស់នោះចាំបាច់ត្រូវរៀបចំលំហផ្ទាល់ខ្លួនរបស់គាត់។\n\nអ្នកប្រើប្រាស់ណាក៏អាចដំឡើងកំណែកម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ទាំងអស់ផ្សេងទៀតបានដែរ។"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"រៀបចំអ្នកប្រើប្រាស់ឥឡូវនេះ?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"សូមប្រាកដថាអ្នកប្រើប្រាស់នេះអាចយកឧបករណ៍ និងរៀបចំទំហំផ្ទុករបស់គេបាន"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"រៀបចំប្រវត្តិរូបឥឡូវ?"</string> diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml index f4ee0a709e57..f6249a9fd0e1 100644 --- a/packages/SettingsLib/res/values-kn/strings.xml +++ b/packages/SettingsLib/res/values-kn/strings.xml @@ -260,7 +260,7 @@ <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"ಸಾಧನವನ್ನು ಜೋಡಿಸಲು ವಿಫಲವಾಗಿದೆ. QR ಕೋಡ್ ತಪ್ಪಾಗಿದೆ ಅಥವಾ ಸಾಧನವು ಒಂದೇ ನೆಟ್ವರ್ಕ್ಗೆ ಕನೆಕ್ಟ್ ಆಗಿಲ್ಲ."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP ವಿಳಾಸ ಮತ್ತು ಪೋರ್ಟ್"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡುವ ಮೂಲಕ ವೈ-ಫೈನಲ್ಲಿ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡುವ ಮೂಲಕ ವೈ-ಫೈ ಮೂಲಕ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕಿಸಿ"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, ಡೀಬಗ್, dev"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"ಬಗ್ ವರದಿಯ ಶಾರ್ಟ್ಕಟ್"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index 8af2627c8e9c..73830c51d3f2 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Ажыратылууда…"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Туташууда…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Туташып турат<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Жупташтырылууда…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Туташууда…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Туташып турат (телефониясыз)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Туташып турат (медиасыз)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Туташып турат (SMS/MMS жазышуусуз)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -150,7 +150,7 @@ <string name="bluetooth_pairing_accept_all_caps" msgid="2734383073450506220">"ЖУПТАШТЫРУУ"</string> <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Жок"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Жупташканда байланыштарыңыз менен чалуу таржымалыңызды пайдалана аласыз."</string> - <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу мүмкүн эмес."</string> + <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүнө туташуу мүмкүн болгон жок."</string> <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"PIN-код же сырсөз туура эмес болгондуктан, \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" түзмөгүнө туташуу мүмкүн болгон жок."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланышуу мүмкүн эмес."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Жупташтырууну <xliff:g id="DEVICE_NAME">%1$s</xliff:g> четке какты."</string> diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml index 5c0f1921b665..46ce28dab0c0 100644 --- a/packages/SettingsLib/res/values-lo/strings.xml +++ b/packages/SettingsLib/res/values-lo/strings.xml @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"ໂປຣໄຟລ໌ທີ່ຖືກຈຳກັດ"</string> <string name="user_add_user_title" msgid="5457079143694924885">"ເພີ່ມຜູ້ໃຊ້ໃໝ່ບໍ?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"ທ່ານສາມາດໃຊ້ອຸປະກອນນີ້ຮ່ວມກັບຄົນອື່ນໄດ້ໂດຍການສ້າງຜູ້ໃຊ້ເພີ່ມເຕີມ. ຜູ້ໃຊ້ແຕ່ລະຄົນຈະມີພື້ນທີ່ຂອງຕົວເອງ, ເຊິ່ງເຂົາເຈົ້າສາມາດປັບແຕ່ງແອັບ, ຮູບພື້ນຫຼັງ ແລະ ອື່ນໆໄດ້. ຜູ້ໃຊ້ຕ່າງໆ ສາມາດປັບແຕ່ງການຕັ້ງຄ່າອຸປະກອນໄດ້ ເຊັ່ນ: Wi‑Fi ທີ່ມີຜົນກະທົບທຸກຄົນ.\n\nເມື່ອທ່ານເພີ່ມຜູ້ໃຊ້ໃໝ່, ບຸກຄົນນັ້ນຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ຂອງເຂົາເຈົ້າກ່ອນ.\n\nຜູ້ໃຊ້ໃດກໍຕາມສາມາດອັບເດດແອັບສຳລັບຜູ້ໃຊ້ຄົນອື່ນທັງໝົດໄດ້. ການຕັ້ງຄ່າການຊ່ວຍເຂົ້າເຖິງອາດບໍ່ຖືກໂອນຍ້າຍໄປໃຫ້ຜູ້ໃຊ້ໃໝ່."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"ເມື່ອທ່ານເພີ່ມຜູ້ໃຊ້ໃໝ່, ຜູ້ໃຊ້ນັ້ນຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ບ່ອນຈັດເກັບຂໍ້ມູນຂອງລາວ.\n\nຜູ້ໃຊ້ທຸກຄົນສາມາດອັບເດດແອັບຯສຳລັບຜູ້ໃຊ້ຄົນອື່ນທັງໝົດໄດ້."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"ເມື່ອທ່ານເພີ່ມຜູ້ໃຊ້ໃໝ່, ຜູ້ໃຊ້ນັ້ນຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ບ່ອນຈັດເກັບຂໍ້ມູນຂອງລາວ.\n\nຜູ້ໃຊ້ທຸກຄົນສາມາດອັບເດດແອັບສຳລັບຜູ້ໃຊ້ຄົນອື່ນທັງໝົດໄດ້."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"ຕັ້ງຄ່າຜູ້ໃຊ້ຕອນນີ້ບໍ?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"ກວດສອບໃຫ້ແນ່ໃຈວ່າບຸກຄົນດັ່ງກ່າວສາມາດຮັບອຸປະກອນ ແລະ ຕັ້ງຄ່າພື້ນທີ່ຂອງພວກເຂົາໄດ້"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"ຕັ້ງຄ່າໂປຣໄຟລ໌ດຽວນີ້?"</string> diff --git a/packages/SettingsLib/res/values-mk/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml index 376452c78d4a..ac9199970d70 100644 --- a/packages/SettingsLib/res/values-mk/strings.xml +++ b/packages/SettingsLib/res/values-mk/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Се исклучува..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Се поврзува..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Поврзан со <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Поврзување..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Се спарува..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Поврзан со <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без телефон)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Поврзан со <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без аудиовизуелни содржини)"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Поврзан со <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (без пристап до пораките)"</string> @@ -255,12 +255,12 @@ <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Код за спарување преку Wi‑Fi"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Спарувањето е неуспешно"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Погрижете се уредот да биде поврзан на истата мрежа."</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Спарете го уредот преку Wi‑Fi со скенирање QR-код"</string> - <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Се спарува уред…"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Скенирајте QR-код за да го спарите уредот преку Wi‑Fi"</string> + <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Се спарува уредот…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Уредот не успеа да се спари. Или QR-кодот беше погрешен или уредот не е поврзан на истата мрежа."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP-адреса и порта"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Скенирајте QR-код"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Спарете го уредот преку Wi‑Fi со скенирање QR-код"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Скенирајте QR-код за да го спарите уредот преку Wi‑Fi"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Поврзете се на Wi-Fi мрежа"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, отстранува грешка, програмер"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"Кратенка за извештај за грешка"</string> diff --git a/packages/SettingsLib/res/values-ml/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml index e69d25f65c70..ea0d9ee9bda4 100644 --- a/packages/SettingsLib/res/values-ml/strings.xml +++ b/packages/SettingsLib/res/values-ml/strings.xml @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"നിയന്ത്രിത പ്രൊഫൈൽ"</string> <string name="user_add_user_title" msgid="5457079143694924885">"പുതിയ ഉപയോക്താവിനെ ചേർക്കണോ?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"കൂടുതൽ ഉപയോക്താക്കളെ സൃഷ്ടിച്ചുകൊണ്ട് ഈ ഉപകരണം മറ്റുള്ളവരുമായി നിങ്ങൾക്ക് പങ്കിടാം. ആപ്പുകളും വാൾപേപ്പറുകളും മറ്റും ഉപയോഗിച്ച് ഇഷ്ടാനുസൃതമാക്കാൻ ഓരോ ഉപയോക്താവിനും സാധിക്കും. വൈഫൈ പോലെ എല്ലാവരെയും ബാധിക്കുന്ന ഉപകരണ ക്രമീകരണവും ഉപയോക്താക്കൾക്ക് ക്രമീകരിക്കാം.\n\nനിങ്ങളൊരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിക്ക് സ്വന്തമായ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\n എല്ലാ ഉപയോക്താക്കൾക്കുമായി ആപ്പുകൾ അപ്ഡേറ്റ് ചെയ്യാൻ ഏതൊരു ഉപയോക്താവിനുമാവും. ഉപയോഗസഹായി ക്രമീകരണവും സേവനങ്ങളും പുതിയ ഉപയോക്താവിന് കൈമാറുകയില്ല."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"നിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിയ്ക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും അപ്ലിക്കേഷനുകൾ അപ്ഡേറ്റുചെയ്യാനാവും."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"നിങ്ങൾ ഒരു പുതിയ ഉപയോക്താവിനെ ചേർക്കുമ്പോൾ, ആ വ്യക്തിയ്ക്ക് അവരുടെ ഇടം സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nമറ്റ് എല്ലാ ഉപയോക്താക്കൾക്കുമായി ഏതൊരു ഉപയോക്താവിനും ആപ്പുകൾ അപ്ഡേറ്റ് ചെയ്യാനാവും."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"ഉപയോക്താവിനെ ഇപ്പോൾ സജ്ജീകരിക്കണോ?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"ഉപകരണം എടുത്ത് ഇടം സജ്ജീകരിക്കുന്നതിന് വ്യക്തി ലഭ്യമാണെന്ന് ഉറപ്പാക്കുക"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"ഇപ്പോൾ പ്രൊഫൈൽ സജ്ജീകരിക്കണോ?"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index 4006665cb12e..5c3578cea23d 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"डिस्कनेक्ट करत आहे..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"कनेक्ट करत आहे..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>कनेक्ट केले"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"जोडत आहे…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"पेअर करत आहे…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"कनेक्ट केले (फोन नाही)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"कनेक्ट केले (मीडिया नाही)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"कनेक्ट केले (मेसेज अॅक्सेस नाही)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"रद्द करा"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"कनेक्ट केल्यावर पेअरिंग तुमचे संपर्क आणि कॉल इतिहास यामध्ये अॅक्सेस देते."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी जोडू शकलो नाही."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"अयोग्य पिन किंवा पासकीमुळे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडू शकलो नाही."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"अयोग्य पिन किंवा पासकीमुळे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह पेअर करू शकलो नाही."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी संवाद प्रस्थापित करू शकत नाही."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे पेअरिंग नाकारले."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"कॉंप्युटर"</string> diff --git a/packages/SettingsLib/res/values-my/strings.xml b/packages/SettingsLib/res/values-my/strings.xml index 98bac84ac706..c0aafc490564 100644 --- a/packages/SettingsLib/res/values-my/strings.xml +++ b/packages/SettingsLib/res/values-my/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"အဆက်အသွယ်ဖြတ်တောက်သည်"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"ချိတ်ဆက်နေသည်"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ချိတ်ဆက်ပြီးပြီ"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"တွဲချိတ်ပါ"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"တွဲချိတ်နေသည်…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ချိတ်ဆက်ပြီးပြီ (ဖုန်းမရှိပါ)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ချိတ်ဆက်ပြီးပြီ (မီဒီယာ မရှိပါ)"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ချိတ်ဆက်ပြီးပြီ (မက်ဆေ့ဂျ် သုံး၍မရပါ)"</string> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 13bdd7e90dbc..51f5260ca966 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Kobler fra…"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Kobler til…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Koblet til <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Sammenkobles …"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Kobler til …"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Koblet til (ingen telefon) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Koblet til (ingen medier) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Koblet til (ingen meldingstilgang) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -554,7 +554,7 @@ <string name="shared_data_title" msgid="1017034836800864953">"Delte data"</string> <string name="shared_data_summary" msgid="5516326713822885652">"Se og endre delte data"</string> <string name="shared_data_no_blobs_text" msgid="3108114670341737434">"Det finnes ingen delte data for denne brukeren."</string> - <string name="shared_data_query_failure_text" msgid="3489828881998773687">"Det har oppstått en feil ved henting av delte data. Prøv igjen."</string> + <string name="shared_data_query_failure_text" msgid="3489828881998773687">"Det har oppstått en feil ved henting av delte data. Prøv på nytt."</string> <string name="blob_id_text" msgid="8680078988996308061">"Delt data-ID: <xliff:g id="BLOB_ID">%d</xliff:g>"</string> <string name="blob_expires_text" msgid="7882727111491739331">"Utløper <xliff:g id="DATE">%s</xliff:g>"</string> <string name="shared_data_delete_failure_text" msgid="3842701391009628947">"Det har oppstått en feil ved sletting av de delte dataene."</string> @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"Begrenset profil"</string> <string name="user_add_user_title" msgid="5457079143694924885">"Vil du legge til en ny bruker?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"Du kan dele denne enheten med andre folk ved å opprette flere brukere. Hver bruker har sin egen plass de kan tilpasse med apper, bakgrunner og annet. Brukere kan også justere enhetsinnstillinger, for eksempel Wi-Fi, som påvirker alle.\n\nNår du legger til en ny bruker, må vedkommende angi innstillinger for plassen sin.\n\nAlle brukere kan oppdatere apper for alle andre brukere. Innstillinger og tjenester for tilgjengelighet overføres kanskje ikke til den nye brukeren."</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"Når du legger til en ny bruker, må hen konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"Konfigurere brukeren nå?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"Sørg for at brukeren er tilgjengelig for å konfigurere området sitt på enheten"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"Vil du konfigurere profilen nå?"</string> @@ -590,7 +590,7 @@ <string name="add_guest_failed" msgid="8074548434469843443">"Kunne ikke opprette en ny gjest"</string> <string name="user_nickname" msgid="262624187455825083">"Kallenavn"</string> <string name="user_add_user" msgid="7876449291500212468">"Legg til bruker"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"Legg til en gjest"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"Legg til gjest"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Fjern gjesten"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Tilbakestill gjest"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Vil du tilbakestille gjesten?"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index 30401ace32ed..711a8f149e48 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"जडान हटाइँदै ..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"जडान हुँदै..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> सँग जडान गरियो"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"जोडा बाँध्दै..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"कनेक्ट गरिँदै छ..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"जडान गरियो (फोनबाहेेक) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"जडान गरियो (मिडियाबाहेक) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"जडान गरियो (सन्देशमाथि पहुँच छैन) <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -117,7 +117,7 @@ <string name="bluetooth_profile_opp" msgid="6692618568149493430">"फाइल स्थानान्तरण"</string> <string name="bluetooth_profile_hid" msgid="2969922922664315866">"इनपुट उपकरण"</string> <string name="bluetooth_profile_pan" msgid="1006235139308318188">"इन्टरनेट पहुँच"</string> - <string name="bluetooth_profile_pbap" msgid="7064307749579335765">"सम्पर्क ठेगानाको सेयरिङ"</string> + <string name="bluetooth_profile_pbap" msgid="7064307749579335765">"कन्ट्याक्ट सेयरिङ"</string> <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"सम्पर्क साझेदारीका लागि प्रयोग"</string> <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"इन्टरनेट जडान साझेदारी गर्दै"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"टेक्स्ट म्यासेजहरू"</string> @@ -256,7 +256,7 @@ <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"कनेक्ट गर्न सकिएन"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"यन्त्र उही नेटवर्कमा जोडिएको कुरा सुनिश्चित गर्नुहोस्।"</string> <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR कोड स्क्यान गरेर Wi‑Fi प्रयोग गरी डिभाइस कनेक्ट गर्नुहोस्"</string> - <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"डिभाइस कनेक्ट गर्दै…"</string> + <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"डिभाइस कनेक्ट गरिँदै छ…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"यन्त्रसँग जोडा बनाउन सकिएन। कि त QR कोड गलत छ कि यन्त्र उही नेटवर्कमा जोडिएको छैन।"</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP एड्रेस र पोर्ट"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"QR कोड स्क्यान गर्नुहोस्"</string> @@ -591,7 +591,7 @@ <string name="user_nickname" msgid="262624187455825083">"उपनाम"</string> <string name="user_add_user" msgid="7876449291500212468">"प्रयोगकर्ता थप्नुहोस्"</string> <string name="guest_new_guest" msgid="3482026122932643557">"अतिथि थप्नुहोस्"</string> - <string name="guest_exit_guest" msgid="5908239569510734136">"अतिथि हटाउनुहोस्"</string> + <string name="guest_exit_guest" msgid="5908239569510734136">"गेस्ट मोडबाट बाहिर निस्कियोस्"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"अतिथि सत्र रिसेट गर्नुहोस्"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"अतिथिका रूपमा ब्राउज गर्ने सेसन रिसेट गर्ने हो?"</string> <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"यी अतिथि हटाउने हो?"</string> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index c5065cb364bb..c9cbbebe4cba 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -312,7 +312,7 @@ <string name="wifi_display_certification_summary" msgid="8111151348106907513">"Toon opties voor certificering van draadloze weergave"</string> <string name="wifi_verbose_logging_summary" msgid="4993823188807767892">"Verhoog het logniveau voor wifi, toon per SSID RSSI in wifi-kiezer"</string> <string name="wifi_scan_throttling_summary" msgid="2577105472017362814">"Verlaag het batterijverbruik en verbeter de netwerkprestaties"</string> - <string name="wifi_non_persistent_mac_randomization_summary" msgid="2159794543105053930">"Als dit aanstaat, kan het MAC-adres van dit apparaat veranderen telkens als het apparaat verbinding maakt met een netwerk waarvoor MAC-herschikking aanstaat."</string> + <string name="wifi_non_persistent_mac_randomization_summary" msgid="2159794543105053930">"Als dit aanstaat, kan het MAC-adres van dit apparaat veranderen telkens als het apparaat verbinding maakt met een netwerk waarvoor MAC-herschikking aanstaat"</string> <string name="wifi_metered_label" msgid="8737187690304098638">"Met datalimiet"</string> <string name="wifi_unmetered_label" msgid="6174142840934095093">"Gratis"</string> <string name="select_logd_size_title" msgid="1604578195914595173">"Logger-buffergrootten"</string> @@ -326,7 +326,7 @@ <string name="allow_mock_location" msgid="2102650981552527884">"Neplocaties toestaan"</string> <string name="allow_mock_location_summary" msgid="179780881081354579">"Neplocaties toestaan"</string> <string name="debug_view_attributes" msgid="3539609843984208216">"Inspectie van weergavekenmerk aanzetten"</string> - <string name="mobile_data_always_on_summary" msgid="1112156365594371019">"Houd mobiele data altijd actief, ook als wifi actief is (voor sneller schakelen tussen netwerken)."</string> + <string name="mobile_data_always_on_summary" msgid="1112156365594371019">"Houd mobiele data altijd actief, ook als wifi actief is (voor sneller schakelen tussen netwerken)"</string> <string name="tethering_hardware_offload_summary" msgid="7801345335142803029">"Gebruik hardwareversnelling voor tethering indien beschikbaar"</string> <string name="adb_warning_title" msgid="7708653449506485728">"USB-foutopsporing toestaan?"</string> <string name="adb_warning_message" msgid="8145270656419669221">"USB-foutopsporing is alleen bedoeld voor ontwikkeldoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen je computer en je apparaat, apps zonder melding op je apparaat te installeren en loggegevens te lezen."</string> @@ -606,8 +606,8 @@ <string name="failed_attempts_now_wiping_profile" msgid="7626589520888963129">"Te veel onjuiste pogingen. Dit werkprofiel en de bijbehorende gegevens worden verwijderd."</string> <string name="failed_attempts_now_wiping_dialog_dismiss" msgid="2749889771223578925">"Sluiten"</string> <string name="cached_apps_freezer_device_default" msgid="2616594131750144342">"Apparaatstandaard"</string> - <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Uitgezet"</string> - <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"Aangezet"</string> + <string name="cached_apps_freezer_disabled" msgid="4816382260660472042">"Uit"</string> + <string name="cached_apps_freezer_enabled" msgid="8866703500183051546">"Aan"</string> <string name="cached_apps_freezer_reboot_dialog_text" msgid="695330563489230096">"Je apparaat moet opnieuw worden opgestart om deze wijziging toe te passen. Start nu opnieuw op of annuleer de wijziging."</string> <string name="media_transfer_wired_usb_device_name" msgid="7699141088423210903">"Bedrade hoofdtelefoon"</string> <string name="wifi_hotspot_switch_on_text" msgid="9212273118217786155">"Aan"</string> diff --git a/packages/SettingsLib/res/values-or/strings.xml b/packages/SettingsLib/res/values-or/strings.xml index 337dd79735f6..eb58dd27db25 100644 --- a/packages/SettingsLib/res/values-or/strings.xml +++ b/packages/SettingsLib/res/values-or/strings.xml @@ -570,7 +570,7 @@ <string name="user_add_profile_item_title" msgid="3111051717414643029">"ସୀମିତ ସୁବିଧା ଥିବା ପ୍ରୋଫାଇଲ୍"</string> <string name="user_add_user_title" msgid="5457079143694924885">"ନୂତନ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରିବେ?"</string> <string name="user_add_user_message_long" msgid="1527434966294733380">"ଅତିରିକ୍ତ ଉପଯୋଗକର୍ତ୍ତା ଯୋଗ କରି ଆପଣ ଏହି ଡିଭାଇସକୁ ଅନ୍ୟ ଲୋକମାନଙ୍କ ସହିତ ସେୟାର କରିପାରିବେ। ପ୍ରତ୍ୟେକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ନିଜର ସ୍ପେସ୍ ଅଛି ଯାହାକୁ ସେମାନେ ଆପ, ୱାଲପେପର୍ ଓ ଏପରି ଅନେକ କିଛି ସହିତ କଷ୍ଟମାଇଜ କରିପାରିବେ। ଉପଯୋଗକର୍ତ୍ତା ୱାଇ-ଫାଇ ଭଳି ଡିଭାଇସ ସେଟିଂସକୁ ମଧ୍ୟ ଆଡଜଷ୍ଟ କରିପାରିବେ ଯାହା ସମସ୍ତଙ୍କୁ ପ୍ରଭାବିତ କରିଥାଏ। \n\nଯେତେବେଳେ ଆପଣ ଗୋଟିଏ ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରିବେ, ସେତେବେଳେ ସେହି ବ୍ୟକ୍ତିଙ୍କୁ ନିଜର ସ୍ପେସ୍କୁ ସେଟଅପ କରିବାକୁ ପଡ଼ିବ। \n\nଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଯେ କୌଣସି ଉପଯୋଗକର୍ତ୍ତା ଆପକୁ ଅପଡେଟ କରିପାରିବେ। ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସ ଏବଂ ସେବାଗୁଡ଼ିକ ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ସ୍ଥାନାନ୍ତର ହୋଇନପାରେ।"</string> - <string name="user_add_user_message_short" msgid="3295959985795716166">"ଜଣେ ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଡ଼ିବାବେଳେ, ସେହି ବ୍ୟକ୍ତିଙ୍କୁ ସ୍ଥାନ ସେଟ୍ କରିବାକୁ ପଡ଼ିବ।\n\nଅନ୍ୟ ସମସ୍ତ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଯେକୌଣସି ଉପଯୋଗକର୍ତ୍ତା ଆପ୍ଗୁଡ଼ିକୁ ଅପ୍ଡେଟ୍ କରିପାରିବେ।"</string> + <string name="user_add_user_message_short" msgid="3295959985795716166">"ଆପଣ ଜଣେ ନୂଆ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଗ କରିବା ବେଳେ, ସେହି ବ୍ୟକ୍ତିଙ୍କୁ ତାଙ୍କ ସ୍ପେସ ସେଟ ଅପ କରିବାକୁ ପଡ଼ିବ।\n\nଅନ୍ୟ ସମସ୍ତ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ, ଆପଗୁଡ଼ିକୁ ଯେ କୌଣସି ଉପଯୋଗକର୍ତ୍ତା ଅପଡେଟ କରିପାରିବେ।"</string> <string name="user_setup_dialog_title" msgid="8037342066381939995">"ଏବେ ଉପଯୋଗକର୍ତ୍ତା ସେଟଅପ କରିବେ?"</string> <string name="user_setup_dialog_message" msgid="269931619868102841">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ ଯେ, ବ୍ୟକ୍ତି ଜଣକ ଡିଭାଇସ୍ ଓ ନିଜର ସ୍ଥାନ ସେଟଅପ୍ କରିବା ପାଇଁ ଉପଲବ୍ଧ ଅଛନ୍ତି।"</string> <string name="user_setup_profile_dialog_message" msgid="4788197052296962620">"ପ୍ରୋଫାଇଲ୍କୁ ଏବେ ସେଟ୍ କରିବେ?"</string> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index 0da516c80698..a4e2aa79c198 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"ਪੇਅਰ ਕਰ ਰਿਹਾ ਹੈ…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"ਜੋੜਾਬੱਧ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ (ਕੋਈ ਫ਼ੋਨ ਨਹੀਂ)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ (ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ (ਸੁਨੇਹੇ \'ਤੇ ਪਹੁੰਚ ਨਹੀਂ)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index aa5359af1fc2..b40308e792e9 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Rozłączanie..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Łączenie..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Połączono – <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Parowanie..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Paruję…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Połączono (bez telefonu) – <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Połączono (bez multimediów) – <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Połączono (bez dostępu do wiadomości) – <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index 9c7a2ce0dce6..5a773cf7f7ad 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"În curs de deconectare..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Se conectează..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"V-ați conectat la <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Se conectează…"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Se asociază…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Conectat (fără telefon) la <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Conectat (fără conținut media) la <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Conectat (fără acces la mesaje) la <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 72a9f40ff5a6..143941de20cb 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Prebieha odpájanie..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Prebieha pripájanie…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"Pripojené k zariadeniu <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Párovanie..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Páruje sa..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"Pripojené k zariadeniu <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (bez telefónu)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"Pripojené k zariadeniu <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (bez médií)"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"Pripojené k <xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> (bez prístupu k správam)"</string> @@ -403,9 +403,9 @@ <string name="show_notification_channel_warnings" msgid="3448282400127597331">"Zobraziť hlásenia kanála upozornení"</string> <string name="show_notification_channel_warnings_summary" msgid="68031143745094339">"Zobrazovať na obrazovke varovné hlásenie, keď aplikácia zverejní upozornenie bez platného kanála"</string> <string name="force_allow_on_external" msgid="9187902444231637880">"Vynútiť povolenie aplikácií na externom úložisku"</string> - <string name="force_allow_on_external_summary" msgid="8525425782530728238">"Umožňuje zapísať akúkoľvek aplikáciu do externého úložiska bez ohľadu na hodnoty v manifeste"</string> + <string name="force_allow_on_external_summary" msgid="8525425782530728238">"Umožniť zapísať akúkoľvek aplikáciu do externého úložiska bez ohľadu na hodnoty v manifeste"</string> <string name="force_resizable_activities" msgid="7143612144399959606">"Vynútiť možnosť zmeny veľkosti aktivít"</string> - <string name="force_resizable_activities_summary" msgid="2490382056981583062">"Veľkosti všetkých aktivít bude možné zmeniť na niekoľko okien (bez ohľadu na hodnoty manifestu)."</string> + <string name="force_resizable_activities_summary" msgid="2490382056981583062">"Umožniť veľkosť všetkých aktivít na niekoľko okien (bez ohľadu na hodnoty manifestu)"</string> <string name="enable_freeform_support" msgid="7599125687603914253">"Povoliť okná s voľným tvarom"</string> <string name="enable_freeform_support_summary" msgid="1822862728719276331">"Povoliť podporu pre experimentálne okná s voľným tvarom"</string> <string name="local_backup_password_title" msgid="4631017948933578709">"Heslo pre zálohy v počítači"</string> diff --git a/packages/SettingsLib/res/values-sl/arrays.xml b/packages/SettingsLib/res/values-sl/arrays.xml index c16d6384f4a1..8db3e99b77fc 100644 --- a/packages/SettingsLib/res/values-sl/arrays.xml +++ b/packages/SettingsLib/res/values-sl/arrays.xml @@ -247,7 +247,7 @@ <item msgid="5023908510820531131">"Čez <xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>"</item> </string-array> <string-array name="debug_hw_overdraw_entries"> - <item msgid="1968128556747588800">"Izklop"</item> + <item msgid="1968128556747588800">"Izklopljeno"</item> <item msgid="3033215374382962216">"Pokaži risanje zunaj vidnega območja"</item> <item msgid="3474333938380896988">"Pokaži območja za devteranomalijo"</item> </string-array> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index e49f0c4e5e02..2ffa8bf097f4 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -590,8 +590,8 @@ <string name="add_guest_failed" msgid="8074548434469843443">"Ustvarjanje novega gosta ni uspelo."</string> <string name="user_nickname" msgid="262624187455825083">"Vzdevek"</string> <string name="user_add_user" msgid="7876449291500212468">"Dodaj uporabnika"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"Dodajanje gosta"</string> - <string name="guest_exit_guest" msgid="5908239569510734136">"Odstranitev gosta"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"Dodaj gosta"</string> + <string name="guest_exit_guest" msgid="5908239569510734136">"Odstrani gosta"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Ponastavi gosta"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Želite ponastaviti gosta?"</string> <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Želite odstraniti gosta?"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index 9b62de269bb9..208da7a7e133 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -590,8 +590,8 @@ <string name="add_guest_failed" msgid="8074548434469843443">"Profili i vizitorit të ri nuk u krijua"</string> <string name="user_nickname" msgid="262624187455825083">"Pseudonimi"</string> <string name="user_add_user" msgid="7876449291500212468">"Shto përdorues"</string> - <string name="guest_new_guest" msgid="3482026122932643557">"Shto të ftuar"</string> - <string name="guest_exit_guest" msgid="5908239569510734136">"Hiq të ftuarin"</string> + <string name="guest_new_guest" msgid="3482026122932643557">"Shto vizitor"</string> + <string name="guest_exit_guest" msgid="5908239569510734136">"Hiq vizitorin"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Rivendos vizitorin"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Të rivendoset vizitori?"</string> <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Të hiqet vizitori?"</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index 187e1794de93..c25966c2d429 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"డిస్కనెక్ట్ చేస్తోంది..."</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"కనెక్ట్ చేస్తోంది..."</string> <string name="bluetooth_connected" msgid="8065345572198502293">"కనెక్ట్ చేయబడిన<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"జత చేస్తోంది..."</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"పెయిరింగ్..."</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"కనెక్ట్ చేయబడింది (ఫోన్ కాదు)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"కనెక్ట్ చేయబడింది (మీడియా కాదు)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"కనెక్ట్ చేయబడింది (సందేశ యాక్సెస్ లేదు)<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g>"</string> @@ -594,7 +594,7 @@ <string name="guest_exit_guest" msgid="5908239569510734136">"గెస్ట్ను తీసివేయండి"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"గెస్ట్ సెషన్ను రీసెట్ చేయండి"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"గెస్ట్ సెషన్ను రీసెట్ చేయాలా?"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"అతిథిని తీసివేయాలా?"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"గెస్ట్ను తీసివేయాలా?"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"రీసెట్ చేయండి"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"తీసివేయండి"</string> <string name="guest_resetting" msgid="7822120170191509566">"గెస్ట్ సెషన్ను రీసెట్ చేస్తోంది…"</string> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index 41ef1e41b90f..8c3d6f3798ca 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -594,7 +594,7 @@ <string name="guest_exit_guest" msgid="5908239569510734136">"นำผู้ใช้ชั่วคราวออก"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"รีเซ็ตผู้เข้าร่วม"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"รีเซ็ตผู้เข้าร่วมไหม"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"นำผู้เข้าร่วมออกไหม"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"นำผู้ใช้ชั่วคราวออกไหม"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"รีเซ็ต"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"นำออก"</string> <string name="guest_resetting" msgid="7822120170191509566">"กำลังรีเซ็ตผู้เข้าร่วม…"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index 5e5b42756043..15c9cac8237b 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"İptal"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Eşleme işlemi, bağlantı kurulduğunda kişilerinize ve çağrı geçmişine erişim izni verir."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlenemedi."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"PIN veya parola yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlenemedi"</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"PIN veya parola yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlenemedi."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile iletişim kurulamıyor."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"Eşleme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Bilgisayar"</string> @@ -367,7 +367,7 @@ <string name="show_screen_updates" msgid="2078782895825535494">"Yüzey güncellemelerini göster"</string> <string name="show_screen_updates_summary" msgid="2126932969682087406">"Güncellenirken tüm pencere yüzeylerini yakıp söndür"</string> <string name="show_hw_screen_updates" msgid="2021286231267747506">"Görünüm güncellemelerini göster"</string> - <string name="show_hw_screen_updates_summary" msgid="3539770072741435691">"Çizim yapılırken görünümleri pencerede çiz"</string> + <string name="show_hw_screen_updates_summary" msgid="3539770072741435691">"Çizildiğinde pencerelerin içini yakıp söndür"</string> <string name="show_hw_layers_updates" msgid="5268370750002509767">"Donanım katmanı güncellemelerini göster"</string> <string name="show_hw_layers_updates_summary" msgid="5850955890493054618">"Güncellenirken donanım katmanlarını yeşil renkte yanıp söndür"</string> <string name="debug_hw_overdraw" msgid="8944851091008756796">"GPU fazla çizim hatasını ayıkla"</string> @@ -594,7 +594,7 @@ <string name="guest_exit_guest" msgid="5908239569510734136">"Misafir oturumunu kaldır"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Misafir oturumunu sıfırla"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Misafir oturumu sıfırlansın mı?"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Konuk çıkarılsın mı?"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Misafir oturumu kaldırılsın mı?"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"Sıfırla"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"Kaldır"</string> <string name="guest_resetting" msgid="7822120170191509566">"Misafir oturumu sıfırlanıyor…"</string> @@ -644,7 +644,7 @@ <string name="dream_complication_title_weather" msgid="598609151677172783">"Hava durumu"</string> <string name="dream_complication_title_aqi" msgid="4587552608957834110">"Hava Kalitesi"</string> <string name="dream_complication_title_cast_info" msgid="4038776652841885084">"Yayın Bilgisi"</string> - <string name="avatar_picker_title" msgid="8492884172713170652">"Profil fotoğrafı seç"</string> + <string name="avatar_picker_title" msgid="8492884172713170652">"Profil fotoğrafı seçin"</string> <string name="default_user_icon_description" msgid="6554047177298972638">"Varsayılan kullanıcı simgesi"</string> <string name="physical_keyboard_title" msgid="4811935435315835220">"Fiziksel klavye"</string> <string name="keyboard_layout_dialog_title" msgid="3927180147005616290">"Klavye düzenini seçin"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index b068670f8036..0cbbae82aabf 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -589,7 +589,7 @@ <string name="add_user_failed" msgid="4809887794313944872">"Не вдалося створити користувача"</string> <string name="add_guest_failed" msgid="8074548434469843443">"Не вдалося створити гостя"</string> <string name="user_nickname" msgid="262624187455825083">"Псевдонім"</string> - <string name="user_add_user" msgid="7876449291500212468">"Додати користувача"</string> + <string name="user_add_user" msgid="7876449291500212468">"Додати користувача"</string> <string name="guest_new_guest" msgid="3482026122932643557">"Додати гостя"</string> <string name="guest_exit_guest" msgid="5908239569510734136">"Видалити гостя"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Скинути сеанс у режимі \"Гість\""</string> @@ -655,12 +655,8 @@ <string name="bt_le_audio_scan_qr_code" msgid="3521809854780392679">"Сканування QR-коду"</string> <string name="bt_le_audio_scan_qr_code_scanner" msgid="4679500020630341107">"Щоб почати слухати аудіо, наведіть камеру на QR-код нижче"</string> <string name="bt_le_audio_qr_code_is_not_valid_format" msgid="6092191081849434734">"Недійсний формат QR-коду"</string> - <!-- no translation found for bt_le_audio_broadcast_dialog_title (5392738488989777074) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_sub_title (268234802198852753) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_switch_app (5749813313369517812) --> - <skip /> - <!-- no translation found for bt_le_audio_broadcast_dialog_different_output (2638402023060391333) --> - <skip /> + <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"Зупинити трансляцію з додатка <xliff:g id="APP_NAME">%1$s</xliff:g>?"</string> + <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"Якщо ви зміните додаток (<xliff:g id="SWITCHAPP">%1$s</xliff:g>) або аудіовихід, поточну трансляцію буде припинено"</string> + <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"Змінити додаток для трансляції на <xliff:g id="SWITCHAPP">%1$s</xliff:g>"</string> + <string name="bt_le_audio_broadcast_dialog_different_output" msgid="2638402023060391333">"Змінити аудіовихід"</string> </resources> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index 1386e05985b5..6652e0812bdf 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -255,12 +255,12 @@ <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Wi-Fi سے جوڑا بنانے کا کوڈ"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"جوڑا بنانے میں ناکام"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"یقینی بنائیں کہ آلہ اسی نیٹ ورک سے منسلک ہے۔"</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR کوڈ اسکین کر کے Wi-Fi پر آلہ کا جوڑا بنائیں"</string> - <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"آلہ کا جوڑا بنایا جا رہا ہے…"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR کوڈ اسکین کر کے Wi-Fi پر آلے سے جوڑا بنائیں"</string> + <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"آلے سے جوڑا بنایا جا رہا ہے…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"آلہ کا جوڑا بنانے میں ناکام۔ یا تو QR کوڈ غلط تھا، یا آلہ اسی نیٹ ورک سے منسلک نہیں ہے۔"</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP پتہ اور پورٹ"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"QR کوڈ اسکین کریں"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR کوڈ اسکین کر کے Wi-Fi پر آلہ کا جوڑا بنائیں"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR کوڈ اسکین کر کے Wi-Fi پر آلے سے جوڑا بنائیں"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"براہ کرم ایک Wi-Fi نیٹ ورک سے منسلک ہوں"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb، ڈیبگ، dev"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"بگ رپورٹ کا شارٹ کٹ"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 52cc9cbd7c03..348e7950a0e6 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -95,7 +95,7 @@ <string name="bluetooth_disconnecting" msgid="7638892134401574338">"Uzilyapti…"</string> <string name="bluetooth_connecting" msgid="5871702668260192755">"Ulanmoqda…"</string> <string name="bluetooth_connected" msgid="8065345572198502293">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ulandi"</string> - <string name="bluetooth_pairing" msgid="4269046942588193600">"Biriktirilmoqda"</string> + <string name="bluetooth_pairing" msgid="4269046942588193600">"Juftlanmoqda…"</string> <string name="bluetooth_connected_no_headset" msgid="2224101138659967604">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ulandi (telefondan tashqari)"</string> <string name="bluetooth_connected_no_a2dp" msgid="8566874395813947092">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ulandi (mediadan tashqari)"</string> <string name="bluetooth_connected_no_map" msgid="3381860077002724689">"<xliff:g id="ACTIVE_DEVICE">%1$s</xliff:g> ulandi (xabarlarga ruxsatsiz)"</string> @@ -151,7 +151,7 @@ <string name="bluetooth_pairing_decline" msgid="6483118841204885890">"Bekor qilish"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="3064334458659165176">"Agar ulanishga ruxsat bersangiz, ulangan vaqtda kontakt va qo‘ng‘iroqlaringiz tarixiga kirishi mumkin."</string> <string name="bluetooth_pairing_error_message" msgid="6626399020672335565">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan biriktirib bo‘lmadi."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanilmadi, chunki PIN kod yoki parol xato kiritildi."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="264422127613704940">"PIN kod yoki parol xato kiritilgani sababli <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga juftlanmadi."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="2554424863101358857">"“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” qurilmasi bilan aloqa o‘rnatib bo‘lmayapti."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="5943444352777314442">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> biriktirish so‘rovini rad qildi."</string> <string name="bluetooth_talkback_computer" msgid="3736623135703893773">"Kompyuter"</string> @@ -255,12 +255,12 @@ <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Wi‑Fi ulanish kodi"</string> <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Ulanmadi"</string> <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Qurilma bir xil tarmoqqa ulanganini tekshiring."</string> - <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR kodni skanerlab, Wi-Fi orqali qurilmani ulang"</string> - <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Qurilma ulanmoqda…"</string> + <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR kodni skanerlab, Wi-Fi orqali qurilmani juftlang"</string> + <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Qurilma juftlanmoqda…"</string> <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Qurilma ulanmadi. QR kod xato yoki qurilma bir xil tarmoqqa ulanmagan."</string> <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP manzil va port"</string> <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"QR kodni skanerlash"</string> - <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR kodni skanerlab, Wi-Fi orqali qurilmani ulang"</string> + <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR kodni skanerlab, Wi-Fi orqali qurilmani juftlang"</string> <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Wi-Fi tarmoqqa ulaning"</string> <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, debag, dev"</string> <string name="bugreport_in_power" msgid="8664089072534638709">"Xatoliklar hisoboti"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 1965942b82e8..5c4932fb0eaa 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -591,10 +591,10 @@ <string name="user_nickname" msgid="262624187455825083">"Biệt hiệu"</string> <string name="user_add_user" msgid="7876449291500212468">"Thêm người dùng"</string> <string name="guest_new_guest" msgid="3482026122932643557">"Thêm khách"</string> - <string name="guest_exit_guest" msgid="5908239569510734136">"Xóa phiên khách"</string> + <string name="guest_exit_guest" msgid="5908239569510734136">"Xóa khách"</string> <string name="guest_reset_guest" msgid="6110013010356013758">"Đặt lại phiên khách"</string> <string name="guest_reset_guest_dialog_title" msgid="8047270010895437534">"Đặt lại phiên khách?"</string> - <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Loại bỏ khách?"</string> + <string name="guest_remove_guest_dialog_title" msgid="4548511006624088072">"Xoá khách?"</string> <string name="guest_reset_guest_confirm_button" msgid="2989915693215617237">"Đặt lại"</string> <string name="guest_remove_guest_confirm_button" msgid="7858123434954143879">"Xoá"</string> <string name="guest_resetting" msgid="7822120170191509566">"Đang đặt lại phiên khách…"</string> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index 726827cc1054..8a581b7c4eb6 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -655,8 +655,8 @@ <string name="bt_le_audio_scan_qr_code" msgid="3521809854780392679">"掃瞄 QR 碼"</string> <string name="bt_le_audio_scan_qr_code_scanner" msgid="4679500020630341107">"如要開始收聽，請將掃瞄器對準下方的 QR 碼"</string> <string name="bt_le_audio_qr_code_is_not_valid_format" msgid="6092191081849434734">"QR 碼格式無效"</string> - <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"要停止播送「<xliff:g id="APP_NAME">%1$s</xliff:g>」的內容嗎？"</string> - <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"如果播送「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容或變更輸出來源，系統就會停止播送目前的內容"</string> - <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"播送「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容"</string> + <string name="bt_le_audio_broadcast_dialog_title" msgid="5392738488989777074">"要停止廣播「<xliff:g id="APP_NAME">%1$s</xliff:g>」的內容嗎？"</string> + <string name="bt_le_audio_broadcast_dialog_sub_title" msgid="268234802198852753">"如要廣播「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容或變更輸出來源，系統就會停止廣播目前的內容"</string> + <string name="bt_le_audio_broadcast_dialog_switch_app" msgid="5749813313369517812">"廣播「<xliff:g id="SWITCHAPP">%1$s</xliff:g>」的內容"</string> <string name="bt_le_audio_broadcast_dialog_different_output" msgid="2638402023060391333">"變更輸出來源"</string> </resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index 091e3228d437..bdeb4740d305 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -230,7 +230,9 @@ public class RestrictedSwitchPreference extends SwitchPreference { final int mode = mAppOpsManager.noteOpNoThrow( AppOpsManager.OP_ACCESS_RESTRICTED_SETTINGS, uid, packageName); - final boolean appOpsAllowed = mode == AppOpsManager.MODE_ALLOWED; + final boolean ecmEnabled = getContext().getResources().getBoolean( + com.android.internal.R.bool.config_enhancedConfirmationModeEnabled); + final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED; if (appOpsAllowed || isEnabled) { setEnabled(true); } else { diff --git a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java index 43ec1e23daad..d19469575296 100644 --- a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java @@ -181,10 +181,12 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> { public void createAnimation(final View view, long delay, long duration, float translationY, boolean appearing, Interpolator interpolator, final Runnable endRunnable) { if (view != null) { - view.setAlpha(appearing ? 0f : 1.0f); - view.setTranslationY(appearing ? translationY : 0); + float targetAlpha = appearing ? 1f : 0f; + float targetTranslationY = appearing ? 0 : translationY; + view.setAlpha(1.0f - targetAlpha); + view.setTranslationY(translationY - targetTranslationY); Animator alphaAnim; - float targetAlpha = appearing ? 1f : 0f; + if (view.isHardwareAccelerated()) { RenderNodeAnimator alphaAnimRt = new RenderNodeAnimator(RenderNodeAnimator.ALPHA, targetAlpha); @@ -205,14 +207,21 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> { } }); } - if (endRunnable != null) { - alphaAnim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { + alphaAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationCancel(Animator animation) { + // If Animation is canceled, we want to ensure UI is reset. + view.setAlpha(targetAlpha); + view.setTranslationY(targetTranslationY); + } + + @Override + public void onAnimationEnd(Animator animation) { + if (endRunnable != null) { endRunnable.run(); } - }); - } + } + }); alphaAnim.start(); startTranslationYAnimation(view, delay, duration, appearing ? 0 : translationY, interpolator); diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 2fb534ddfe96..440a54435fc3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -250,6 +250,15 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { } /** + * Check if the device is Bluetooth LE Audio device. + * + * @return true if the RouteInfo equals TYPE_BLE_HEADSET. + */ + public boolean isBLEDevice() { + return mRouteInfo.getType() == TYPE_BLE_HEADSET; + } + + /** * Get application label from MediaDevice. * * @return application label. diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiPermissionChecker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiPermissionChecker.java new file mode 100644 index 000000000000..2fe6e4695b3c --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiPermissionChecker.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2022 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.settingslib.wifi; + +import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static android.Manifest.permission.ACCESS_WIFI_STATE; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + +import android.app.Activity; +import android.app.ActivityManager; +import android.app.IActivityManager; +import android.content.pm.PackageManager; +import android.os.RemoteException; +import android.text.TextUtils; +import android.util.Log; + +/** + * Helper class to check Wi-Fi permissions. + */ +public class WifiPermissionChecker { + + private static final String TAG = "WifiPermChecker"; + + private IActivityManager mActivityManager; + private PackageManager mPackageManager; + private String mLaunchedPackage; + + public WifiPermissionChecker(Activity activity) { + this(activity, ActivityManager.getService()); + } + + public WifiPermissionChecker(Activity activity, IActivityManager activityManager) { + mActivityManager = activityManager; + mPackageManager = activity.getPackageManager(); + mLaunchedPackage = getLaunchedFromPackage(activity); + } + + /** + * Returns the launched package name + */ + public String getLaunchedPackage() { + return mLaunchedPackage; + } + + /** + * Returns whether the launched package can access Wi-Fi information + */ + public boolean canAccessWifiState() { + return checkPermission(ACCESS_WIFI_STATE); + } + + /** + * Returns whether the launched package can access precise location + */ + public boolean canAccessFineLocation() { + return checkPermission(ACCESS_FINE_LOCATION); + } + + private boolean checkPermission(String permission) { + if (mPackageManager == null || TextUtils.isEmpty(mLaunchedPackage)) { + Log.e(TAG, "Failed to check package permission!" + + " {PackageManager:" + mPackageManager + + ", LaunchedPackage:" + mLaunchedPackage + "}"); + return false; + } + + if (mPackageManager.checkPermission(permission, mLaunchedPackage) == PERMISSION_GRANTED) { + return true; + } + + Log.w(TAG, "The launched package does not have the required permission!" + + " {LaunchedPackage:" + mLaunchedPackage + ", Permission:" + permission + "}"); + return false; + } + + private String getLaunchedFromPackage(Activity activity) { + try { + return mActivityManager.getLaunchedFromPackage(activity.getActivityToken()); + } catch (RemoteException e) { + Log.e(TAG, "Can not get the launched package from activity manager!"); + return null; + } + } +} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiPermissionCheckerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiPermissionCheckerTest.java new file mode 100644 index 000000000000..ec84141360e4 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiPermissionCheckerTest.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 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.settingslib.wifi; + +import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static android.Manifest.permission.ACCESS_WIFI_STATE; +import static android.content.pm.PackageManager.PERMISSION_DENIED; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +import android.app.Activity; +import android.app.IActivityManager; +import android.content.pm.PackageManager; +import android.os.RemoteException; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class WifiPermissionCheckerTest { + + static final String LAUNCHED_PACKAGE = "TestPackage"; + + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + @Mock + PackageManager mPackageManager; + @Mock + IActivityManager mActivityManager; + @Mock + Activity mActivity; + + WifiPermissionChecker mWifiPermissionChecker; + + @Before + public void setUp() { + when(mActivity.getPackageManager()).thenReturn(mPackageManager); + fakeGetLaunchedFromPackage(LAUNCHED_PACKAGE); + + mWifiPermissionChecker = new WifiPermissionChecker(mActivity, mActivityManager); + } + + @Test + public void getLaunchedPackage_returnLaunchedFromPackage() { + assertThat(mWifiPermissionChecker.getLaunchedPackage()).isEqualTo(LAUNCHED_PACKAGE); + } + + @Test + public void canAccessWifiState_noPermission_returnFalse() { + when(mPackageManager.checkPermission(ACCESS_WIFI_STATE, LAUNCHED_PACKAGE)) + .thenReturn(PERMISSION_DENIED); + + assertThat(mWifiPermissionChecker.canAccessWifiState()).isFalse(); + } + + @Test + public void canAccessWifiState_hasPermission_returnTrue() { + when(mPackageManager.checkPermission(ACCESS_WIFI_STATE, LAUNCHED_PACKAGE)) + .thenReturn(PERMISSION_GRANTED); + + assertThat(mWifiPermissionChecker.canAccessWifiState()).isTrue(); + } + + @Test + public void canAccessFineLocation_noPermission_returnFalse() { + when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, LAUNCHED_PACKAGE)) + .thenReturn(PERMISSION_DENIED); + + assertThat(mWifiPermissionChecker.canAccessFineLocation()).isFalse(); + } + + @Test + public void canAccessFineLocation_hasPermission_returnTrue() { + when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, LAUNCHED_PACKAGE)) + .thenReturn(PERMISSION_GRANTED); + + assertThat(mWifiPermissionChecker.canAccessFineLocation()).isTrue(); + } + + void fakeGetLaunchedFromPackage(String packageName) { + try { + when(mActivityManager.getLaunchedFromPackage(any())).thenReturn(packageName); + } catch (RemoteException e) { + // Do nothing + } + } +} diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index 6c8a92d9485c..4b07eaf780e4 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -73,6 +73,7 @@ xuqiu@google.com zakcohen@google.com jernej@google.com jglazier@google.com +peskal@google.com #Android Auto hseog@google.com diff --git a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index d4b4a746a5a2..f492c069ac7e 100644 --- a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java @@ -94,6 +94,12 @@ public interface BcSmartspaceDataPlugin extends Plugin { void setPrimaryTextColor(int color); /** + * When the view is displayed on Dream, set the flag to true, immediately after the view is + * created. + */ + void setIsDreaming(boolean isDreaming); + + /** * Range [0.0 - 1.0] when transitioning from Lockscreen to/from AOD */ void setDozeAmount(float amount); diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index 5d7ac0dd6539..f0bbf516eaa1 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -50,7 +50,7 @@ <string name="error_disable_esim_title" msgid="3802652622784813119">"يتعذّر إيقاف eSIM."</string> <string name="error_disable_esim_msg" msgid="2441188596467999327">"يتعذّر إيقاف eSIM بسبب خطأ."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter"</string> - <string name="kg_wrong_pattern" msgid="5907301342430102842">"النقش غير صحيح"</string> + <string name="kg_wrong_pattern" msgid="5907301342430102842">"النقش غير صحيح."</string> <string name="kg_wrong_password" msgid="4143127991071670512">"كلمة مرور غير صحيحة"</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"رقم تعريف شخصي خاطئ"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{أعِد المحاولة خلال ثانية واحدة.}zero{أعِد المحاولة خلال # ثانية.}two{أعِد المحاولة خلال ثانيتين.}few{أعِد المحاولة خلال # ثوانٍ.}many{أعِد المحاولة خلال # ثانية.}other{أعِد المحاولة خلال # ثانية.}}"</string> diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml index 3702be2050b8..84016da04a75 100644 --- a/packages/SystemUI/res-keyguard/values-es/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es/strings.xml @@ -80,7 +80,7 @@ <string name="kg_password_pin_failed" msgid="5136259126330604009">"No se ha podido desbloquear la tarjeta SIM con el código PIN."</string> <string name="kg_password_puk_failed" msgid="6778867411556937118">"No se ha podido desbloquear la tarjeta SIM con el código PUK."</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="airplane_mode" msgid="2528005343938497866">"Modo Avió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-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml index b312706306b8..c8d6b71eb485 100644 --- a/packages/SystemUI/res-keyguard/values-nb/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml @@ -53,7 +53,7 @@ <string name="kg_wrong_pattern" msgid="5907301342430102842">"Feil mønster"</string> <string name="kg_wrong_password" msgid="4143127991071670512">"Feil passord"</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"Feil PIN-kode"</string> - <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Prøv igjen om # sekund.}other{Prøv igjen om # sekunder.}}"</string> + <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{Prøv på nytt om # sekund.}other{Prøv på nytt om # sekunder.}}"</string> <string name="kg_sim_pin_instructions" msgid="1942424305184242951">"Skriv inn PIN-koden for SIM-kortet."</string> <string name="kg_sim_pin_instructions_multi" msgid="3639863309953109649">"Skriv inn PIN-koden for SIM-kortet «<xliff:g id="CARRIER">%1$s</xliff:g>»."</string> <string name="kg_sim_lock_esim_instructions" msgid="5577169988158738030">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Deaktiver e-SIM-kortet for å bruke enheten uten mobiltjeneste."</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index 145bd2b9f6d4..ca1e6b2f27db 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -21,7 +21,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"請輸入 PIN"</string> - <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"請畫出圖案"</string> + <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"請畫出圖形"</string> <string name="keyguard_enter_your_password" msgid="7225626204122735501">"請輸入密碼"</string> <string name="keyguard_sim_error_message_short" msgid="633630844240494070">"SIM 卡無效。"</string> <string name="keyguard_charged" msgid="5478247181205188995">"已完成充電"</string> @@ -50,7 +50,7 @@ <string name="error_disable_esim_title" msgid="3802652622784813119">"無法停用 eSIM 卡"</string> <string name="error_disable_esim_msg" msgid="2441188596467999327">"發生錯誤，因此無法停用此 eSIM 卡。"</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Enter 鍵 (輸入)"</string> - <string name="kg_wrong_pattern" msgid="5907301342430102842">"圖案錯誤"</string> + <string name="kg_wrong_pattern" msgid="5907301342430102842">"圖形錯誤"</string> <string name="kg_wrong_password" msgid="4143127991071670512">"密碼錯誤"</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"PIN 碼錯誤"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="2038195171919795529">"{count,plural, =1{請在 # 秒後再試一次。}other{請在 # 秒後再試一次。}}"</string> @@ -66,7 +66,7 @@ <string name="kg_invalid_sim_puk_hint" msgid="5319756880543857694">"PUK 碼應由 8 個或以上數字組成。"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="544687656831558971">"您已輸入錯誤的 PIN 碼 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%2$d</xliff:g> 秒後再試一次。"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="190984061975729494">"您已輸入錯誤的密碼 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%2$d</xliff:g> 秒後再試一次。"</string> - <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="4252405904570284368">"您已畫錯解鎖圖案 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%2$d</xliff:g> 秒後再試一次。"</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="4252405904570284368">"您已畫錯解鎖圖形 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%2$d</xliff:g> 秒後再試一次。"</string> <string name="kg_password_wrong_pin_code_pukked" msgid="8047350661459040581">"SIM 卡 PIN 碼不正確，您現在必須聯絡流動網絡供應商為您的裝置解鎖。"</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="7030584350995485026"> <item quantity="other">SIM 卡的 PIN 碼不正確，您還有 <xliff:g id="NUMBER_1">%d</xliff:g> 次輸入機會。</item> @@ -81,10 +81,10 @@ <string name="kg_password_puk_failed" msgid="6778867411556937118">"無法使用 SIM 卡 PUK 碼解鎖！"</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"轉換輸入方法"</string> <string name="airplane_mode" msgid="2528005343938497866">"飛行模式"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"裝置重新啟動後，必須畫出上鎖圖案才能使用"</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> - <string name="kg_prompt_reason_timeout_pattern" msgid="9170360502528959889">"請務必畫出上鎖圖案，以進一步確保安全"</string> + <string name="kg_prompt_reason_timeout_pattern" msgid="9170360502528959889">"請務必畫出上鎖圖形，以進一步確保安全"</string> <string name="kg_prompt_reason_timeout_pin" msgid="5945186097160029201">"請務必輸入 PIN 碼，以進一步確保安全"</string> <string name="kg_prompt_reason_timeout_password" msgid="2258263949430384278">"請務必輸入密碼，以進一步確保安全"</string> <string name="kg_prompt_reason_device_admin" msgid="6961159596224055685">"裝置已由管理員鎖定"</string> diff --git a/packages/SystemUI/res-product/values-zh-rHK/strings.xml b/packages/SystemUI/res-product/values-zh-rHK/strings.xml index 27eda7705f20..53f92c3cbb7f 100644 --- a/packages/SystemUI/res-product/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-product/values-zh-rHK/strings.xml @@ -38,8 +38,8 @@ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="3280816298678433681">"您嘗試解鎖手機已失敗 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。如果之後再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統將移除此工作設定檔，而所有設定檔資料亦會一併刪除。"</string> <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4417100487251371559">"您嘗試解鎖平板電腦已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次。系統將移除此工作設定檔，而所有設定檔資料亦會一併刪除。"</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4682221342671290678">"您嘗試解鎖手機已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次。系統將移除此工作設定檔，而所有設定檔資料亦會一併刪除。"</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="1860049973474855672">"您已畫錯解鎖圖案 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。如果之後再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統會要求您透過電郵帳戶解鎖平板電腦。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="44112553371516141">"您已畫錯解鎖圖案 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。如果之後再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統會要求您透過電郵帳戶解鎖手機。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="1860049973474855672">"您已畫錯解鎖圖形 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。如果之後再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統會要求您透過電郵帳戶解鎖平板電腦。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="44112553371516141">"您已畫錯解鎖圖形 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次。如果之後再嘗試 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次仍未成功，系統會要求您透過電郵帳戶解鎖手機。\n\n請在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒後再試一次。"</string> <string name="global_action_lock_message" product="default" msgid="7092460751050168771">"解鎖手機以存取更多選項"</string> <string name="global_action_lock_message" product="tablet" msgid="1024230056230539493">"解鎖平板電腦以存取更多選項"</string> <string name="global_action_lock_message" product="device" msgid="3165224897120346096">"解鎖裝置以存取更多選項"</string> diff --git a/packages/SystemUI/res/layout/media_long_press_menu.xml b/packages/SystemUI/res/layout/media_long_press_menu.xml new file mode 100644 index 000000000000..99c5e4707338 --- /dev/null +++ b/packages/SystemUI/res/layout/media_long_press_menu.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 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. + --> + +<merge + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="0dp" + android:layout_marginStart="@dimen/qs_media_padding" + android:layout_marginEnd="@dimen/qs_media_padding" + android:id="@+id/remove_text" + android:fontFamily="@*android:string/config_headlineFontFamily" + android:singleLine="true" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:text="@string/controls_media_close_session" + android:gravity="center_horizontal|top" + app:layout_constraintTop_toBottomOf="@id/settings" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/cancel" /> + + <ImageButton + android:id="@+id/settings" + android:src="@drawable/ic_settings" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginEnd="4dp" + android:background="@drawable/qs_media_light_source" + android:contentDescription="@string/controls_media_settings_button" + android:layout_gravity="top" + app:layout_constraintWidth_min="@dimen/min_clickable_item_size" + app:layout_constraintHeight_min="@dimen/min_clickable_item_size" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> + </ImageButton> + + <FrameLayout + android:id="@+id/dismiss" + android:background="@drawable/qs_media_light_source" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/qs_media_padding" + android:layout_marginEnd="@dimen/qs_media_action_spacing" + android:layout_marginBottom="@dimen/qs_media_padding" + app:layout_constrainedWidth="true" + app:layout_constraintWidth_min="@dimen/min_clickable_item_size" + app:layout_constraintHeight_min="@dimen/min_clickable_item_size" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/cancel" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/remove_text"> + <TextView + android:id="@+id/dismiss_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center|top" + style="@style/MediaPlayer.SolidButton" + android:background="@drawable/qs_media_solid_button" + android:text="@string/controls_media_dismiss_button" /> + </FrameLayout> + <FrameLayout + android:id="@+id/cancel" + android:background="@drawable/qs_media_light_source" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/qs_media_action_spacing" + android:layout_marginEnd="@dimen/qs_media_padding" + android:layout_marginBottom="@dimen/qs_media_padding" + app:layout_constrainedWidth="true" + app:layout_constraintWidth_min="@dimen/min_clickable_item_size" + app:layout_constraintHeight_min="@dimen/min_clickable_item_size" + app:layout_constraintStart_toEndOf="@id/dismiss" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/remove_text"> + <TextView + android:id="@+id/cancel_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center|top" + style="@style/MediaPlayer.OutlineButton" + android:text="@string/cancel" /> + </FrameLayout> + +</merge>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml index 665edac65afc..534c80de73f4 100644 --- a/packages/SystemUI/res/layout/media_session_view.xml +++ b/packages/SystemUI/res/layout/media_session_view.xml @@ -80,7 +80,7 @@ android:background="@drawable/qs_media_light_source" android:forceHasOverlappingRendering="false" android:layout_width="wrap_content" - android:layout_height="48dp" + android:layout_height="@dimen/min_clickable_item_size" android:layout_marginStart="@dimen/qs_center_guideline_padding" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -92,8 +92,9 @@ <LinearLayout android:id="@+id/media_seamless_button" android:layout_width="wrap_content" - android:layout_height="@dimen/qs_seamless_height" + android:layout_height="wrap_content" android:minHeight="@dimen/qs_seamless_height" + android:maxHeight="@dimen/min_clickable_item_size" android:theme="@style/MediaPlayer.SolidButton" android:background="@drawable/qs_media_seamless_background" android:orientation="horizontal" @@ -300,87 +301,7 @@ android:layout_marginBottom="@dimen/qs_media_padding" android:layout_marginTop="0dp" /> - <!-- Long press menu --> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="0dp" - android:layout_marginStart="@dimen/qs_media_padding" - android:layout_marginEnd="@dimen/qs_media_padding" - android:id="@+id/remove_text" - android:fontFamily="@*android:string/config_headlineFontFamily" - android:singleLine="true" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:text="@string/controls_media_close_session" - android:gravity="center_horizontal|top" - app:layout_constraintTop_toBottomOf="@id/settings" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toTopOf="@id/cancel" /> + <include + layout="@layout/media_long_press_menu" /> - <ImageButton - android:id="@+id/settings" - android:src="@drawable/ic_settings" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_marginEnd="4dp" - android:background="@drawable/qs_media_light_source" - android:contentDescription="@string/controls_media_settings_button" - android:layout_gravity="top" - app:layout_constraintWidth_min="@dimen/min_clickable_item_size" - app:layout_constraintHeight_min="@dimen/min_clickable_item_size" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"> - </ImageButton> - - <FrameLayout - android:id="@+id/dismiss" - android:background="@drawable/qs_media_light_source" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/qs_media_padding" - android:layout_marginEnd="@dimen/qs_media_action_spacing" - android:layout_marginBottom="@dimen/qs_media_padding" - app:layout_constrainedWidth="true" - app:layout_constraintWidth_min="@dimen/min_clickable_item_size" - app:layout_constraintHeight_min="@dimen/min_clickable_item_size" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/cancel" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/remove_text"> - <TextView - android:id="@+id/dismiss_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|top" - style="@style/MediaPlayer.SolidButton" - android:background="@drawable/qs_media_solid_button" - android:text="@string/controls_media_dismiss_button" /> - </FrameLayout> - <FrameLayout - android:id="@+id/cancel" - android:background="@drawable/qs_media_light_source" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/qs_media_action_spacing" - android:layout_marginEnd="@dimen/qs_media_padding" - android:layout_marginBottom="@dimen/qs_media_padding" - app:layout_constrainedWidth="true" - app:layout_constraintWidth_min="@dimen/min_clickable_item_size" - app:layout_constraintHeight_min="@dimen/min_clickable_item_size" - app:layout_constraintStart_toEndOf="@id/dismiss" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/remove_text"> - <TextView - android:id="@+id/cancel_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|top" - style="@style/MediaPlayer.OutlineButton" - android:text="@string/cancel" /> - </FrameLayout> </com.android.systemui.util.animation.TransitionLayout> diff --git a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml index 5510f24870bb..79ba7ead1ec3 100644 --- a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml +++ b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml @@ -16,6 +16,8 @@ --> <!-- Layout for media recommendations inside QSPanel carousel --> +<!-- See media_recommendation_expanded.xml and media_recommendation_collapsed.xml for the + constraints. --> <com.android.systemui.util.animation.TransitionLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -46,14 +48,6 @@ <FrameLayout android:id="@+id/media_cover1_container" style="@style/MediaPlayer.Recommendation.AlbumContainer" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@+id/media_title1" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/media_cover2_container" - android:layout_marginEnd="@dimen/qs_media_rec_album_side_margin" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintVertical_bias="0.5" > <ImageView android:id="@+id/media_cover1" @@ -71,31 +65,16 @@ <TextView android:id="@+id/media_title1" style="@style/MediaPlayer.Recommendation.Text.Title" - app:layout_constraintStart_toStartOf="@+id/media_cover1_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover1_container" - app:layout_constraintTop_toBottomOf="@+id/media_cover1_container" - app:layout_constraintBottom_toTopOf="@+id/media_subtitle1" /> <TextView android:id="@+id/media_subtitle1" style="@style/MediaPlayer.Recommendation.Text.Subtitle" - app:layout_constraintStart_toStartOf="@+id/media_cover1_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover1_container" - app:layout_constraintTop_toBottomOf="@+id/media_title1" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/qs_media_padding" /> <FrameLayout android:id="@+id/media_cover2_container" style="@style/MediaPlayer.Recommendation.AlbumContainer" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/media_title2" - app:layout_constraintStart_toEndOf="@id/media_cover1_container" - app:layout_constraintEnd_toStartOf="@id/media_cover3_container" - android:layout_marginEnd="@dimen/qs_media_rec_album_side_margin" - app:layout_constraintVertical_bias="0.5" > <ImageView android:id="@+id/media_cover2" @@ -111,31 +90,16 @@ <TextView android:id="@+id/media_title2" style="@style/MediaPlayer.Recommendation.Text.Title" - app:layout_constraintStart_toStartOf="@+id/media_cover2_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover2_container" - app:layout_constraintTop_toBottomOf="@+id/media_cover2_container" - app:layout_constraintBottom_toTopOf="@+id/media_subtitle2" /> <TextView android:id="@+id/media_subtitle2" style="@style/MediaPlayer.Recommendation.Text.Subtitle" - app:layout_constraintStart_toStartOf="@+id/media_cover2_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover2_container" - app:layout_constraintTop_toBottomOf="@+id/media_title2" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/qs_media_padding" /> <FrameLayout android:id="@+id/media_cover3_container" style="@style/MediaPlayer.Recommendation.AlbumContainer" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/media_title3" - app:layout_constraintStart_toEndOf="@id/media_cover2_container" - app:layout_constraintEnd_toEndOf="parent" - android:layout_marginEnd="@dimen/qs_media_padding" - app:layout_constraintVertical_bias="0.5" > <ImageView android:id="@+id/media_cover3" @@ -151,113 +115,14 @@ <TextView android:id="@+id/media_title3" style="@style/MediaPlayer.Recommendation.Text.Title" - app:layout_constraintStart_toStartOf="@+id/media_cover3_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover3_container" - app:layout_constraintTop_toBottomOf="@+id/media_cover3_container" - app:layout_constraintBottom_toTopOf="@+id/media_subtitle3" /> <TextView android:id="@+id/media_subtitle3" style="@style/MediaPlayer.Recommendation.Text.Subtitle" - app:layout_constraintStart_toStartOf="@+id/media_cover3_container" - app:layout_constraintEnd_toEndOf="@+id/media_cover3_container" - app:layout_constraintTop_toBottomOf="@+id/media_title3" - app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/qs_media_padding" /> - <!-- Long press menu --> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/qs_media_padding" - android:layout_marginStart="@dimen/qs_media_padding" - android:layout_marginEnd="@dimen/qs_media_padding" - android:id="@+id/remove_text" - android:fontFamily="@*android:string/config_headlineFontFamily" - android:singleLine="true" - android:ellipsize="marquee" - android:marqueeRepeatLimit="marquee_forever" - android:text="@string/controls_media_close_session" - android:gravity="center_horizontal|top" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toTopOf="@id/cancel"/> - - <FrameLayout - android:id="@+id/settings" - android:background="@drawable/qs_media_light_source" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/qs_media_padding" - android:layout_marginEnd="@dimen/qs_media_action_spacing" - android:layout_marginBottom="@dimen/qs_media_padding" - app:layout_constrainedWidth="true" - app:layout_constraintWidth_min="48dp" - app:layout_constraintHeight_min="48dp" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@id/cancel" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/remove_text"> - - <TextView - android:id="@+id/settings_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|bottom" - style="@style/MediaPlayer.OutlineButton" - android:text="@string/controls_media_settings_button" /> - </FrameLayout> - - <FrameLayout - android:id="@+id/cancel" - android:background="@drawable/qs_media_light_source" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/qs_media_action_spacing" - android:layout_marginEnd="@dimen/qs_media_action_spacing" - android:layout_marginBottom="@dimen/qs_media_padding" - app:layout_constrainedWidth="true" - app:layout_constraintWidth_min="48dp" - app:layout_constraintHeight_min="48dp" - app:layout_constraintStart_toEndOf="@id/settings" - app:layout_constraintEnd_toStartOf="@id/dismiss" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/remove_text"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|bottom" - style="@style/MediaPlayer.OutlineButton" - android:text="@string/cancel" /> - </FrameLayout> - - <FrameLayout - android:id="@+id/dismiss" - android:background="@drawable/qs_media_light_source" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/qs_media_action_spacing" - android:layout_marginEnd="@dimen/qs_media_padding" - android:layout_marginBottom="@dimen/qs_media_padding" - app:layout_constrainedWidth="true" - app:layout_constraintWidth_min="48dp" - app:layout_constraintHeight_min="48dp" - app:layout_constraintStart_toEndOf="@id/cancel" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/remove_text"> + <include + layout="@layout/media_long_press_menu" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center|bottom" - style="@style/MediaPlayer.OutlineButton" - android:text="@string/controls_media_dismiss_button" - /> - </FrameLayout> </com.android.systemui.util.animation.TransitionLayout> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 0cb773531459..a32914ad6af8 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -39,9 +39,9 @@ <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Opneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel opneem. As jy <xliff:g id="APPLICATION">%1$s</xliff:g> met hierdie toestel gebruik, kan dit verhinder dat jy oproepe, kennisgewings en wekkers hoor."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"As jy <xliff:g id="APPLICATION">%1$s</xliff:g> met hierdie toestel gebruik, kan dit verhinder dat jy oproepe, kennisgewings en wekkers hoor."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?"</string> + <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Hanteer <xliff:g id="USB_DEVICE">%2$s</xliff:g> met <xliff:g id="APPLICATION">%1$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?\nOpneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel vasvang."</string> - <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> te hanteer?"</string> + <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Hanteer <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> met <xliff:g id="APPLICATION">%1$s</xliff:g>?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Geen geïnstalleerde programme werk met hierdie USB-toebehoorsel nie. Vind meer uit oor hierdie toebehoorsel by <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"USB-toebehoorsel"</string> <string name="label_view" msgid="6815442985276363364">"Sien"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Jou organisasie besit hierdie toestel en kan netwerkverkeer monitor"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> besit hierdie toestel en kan netwerkverkeer monitor"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Hierdie toestel word verskaf deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Hierdie toestel behoort aan jou organisasie en is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Hierdie toestel behoort aan <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> en is gekoppel aan <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Hierdie toestel behoort aan jou organisasie"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Hierdie toestel behoort aan <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Hierdie toestel behoort aan jou organisasie en is gekoppel aan VPN\'e"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Hierdie toestel behoort aan <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> en is gekoppel aan VPN\'e"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Jou organisasie kan netwerkverkeer in jou werkprofiel monitor"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kan netwerkverkeer in jou werkprofiel monitor"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Jou IT-admin kan netwerkaktiwiteit op jou werkprofiel sien"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Netwerk kan gemonitor word"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Hierdie toestel is gekoppel aan VPN\'e"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Jou werkprofiel is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Jou persoonlike profiel is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Hierdie toestel is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Hierdie toestel word verskaf deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Toestelbestuur"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"\'n Sertifikaatoutoriteit is op hierdie toestel geïnstalleer. Jou veilige netwerkverkeer kan gemonitor of gewysig word."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Jou administrateur het netwerkloginskrywing aangeskakel, wat verkeer op jou toestel monitor."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Jou administrateur het netwerkloglêers aangeskakel wat verkeer in jou werkprofiel monitor, maar nie in jou persoonlike profiel nie."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Jy is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>, wat jou netwerkaktiwiteit, insluitend e-posse, programme en webwerwe, kan monitor."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Jy is gekoppel aan <xliff:g id="VPN_APP_0">%1$s</xliff:g> en <xliff:g id="VPN_APP_1">%2$s</xliff:g>, wat jou netwerkaktiwiteit, insluitend e-posse, programme en webwerwe, kan monitor."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Jou werkprofiel is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>, wat jou netwerkaktiwiteit, insluitend e-posse, programme en webwerwe, kan monitor."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Jy persoonlike profiel is gekoppel aan <xliff:g id="VPN_APP">%1$s</xliff:g>, wat jou netwerkaktiwiteit, insluitend e-posse, programme en webwerwe, kan monitor."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Maak VPN-instellings oop"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Hierdie toestel word deur jou ouer bestuur. Jou ouer kan inligting sien en bestuur soos die programme wat jy gebruik, jou ligging en jou skermtyd."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Uitsaainaam"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Wagwoord"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Stoor"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Bounommer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Bounommer is na knipbord gekopieer."</string> <string name="basic_status" msgid="2315371112182658176">"Maak gesprek oop"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Voeg teël by"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Moenie teël byvoeg nie"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Kies gebruiker"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> programme is aktief</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> program is aktief</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nuwe inligting"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiewe programme"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Hierdie programme is steeds aktief en beïnvloed dalk batterylewe, selfs al gebruik jy hulle nie"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Gestop"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Klaar"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 4cd2a3d40829..660c8bdc809e 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"የእርስዎ ድርጅት የዚህ መሣሪያ ባለቤት ነው፣ እና የአውታረ መረብ ትራፊክን ሊከታተል ይችላል"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> የዚህ መሣሪያ ባለቤት ነው፣ እና የአውታረ መረብ ትራፊክን ሊከታተል ይችላል"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚቀርብ ነው"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ይህ መሣሪያ የድርጅትዎ ሲሆን ከ<xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ይህ መሳሪያ ንብረትነቱ የ<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ሲሆን ከ<xliff:g id="VPN_APP">%2$s</xliff:g> ጋር ተገናኝቷል"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ይህ መሣሪያ የድርጅትዎ ነው"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ይህ መሳሪያ ንብረትነቱ የ<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ነው"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ይህ መሣሪያ የድርጅትዎ ሲሆን ከቪፒኤን ጋር ተገናኝቷል"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ይህ መሳሪያ ንብረትነቱ የ<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ሲሆን ከቪፒኤን ጋር ተገናኝቷል"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"የእርስዎ ድርጅት በእርስዎ የሥራ መገለጫ ያለን የአውታረ መረብ ትራፊክን ሊቆጣጠር ይችል ይሆናል"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> በእርስዎ የሥራ መገለጫ ውስጥ የአውታረ መረብ ትራፊክ ላይ ክትትል ሊያደርግ ይችላል"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"የስራ መገለጫ አውታረ መረብ እንቅስቃሴ ለአይቲ አስተዳዳሪዎ ይታያል"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"አውታረ መረብ ክትትል የሚደረግበት ሊሆን ይችላል"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ይህ መሳሪያ ከቪፒኤን ጋር ተገናኝቷል"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"የእርስዎ የሥራ መገለጫ ከ<xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል።"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"የእርስዎ የግል መገለጫ ከ<xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ይህ መሳሪያ ከ<xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚቀርብ ነው"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"የመሣሪያ አስተዳደር"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"የእውቅና ማረጋገጫ ሰጪ ባለሥልጣን በዚህ መሣሪያ ላይ ተጭኗል። የእርስዎ ደኅንነቱ የተጠበቀ አውታረ መረብ ትራፊክ ክትትል ሊደረግበት እና ሊሻሻል ይችላል።"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"የእርስዎ አስተዳዳሪ የአውታረ መረብ ምዝግብ ማስታወሻ መያዝን አብርተዋል፣ ይህም በመሣሪያዎ ላይ ያለውን ትራፊክ ይከታተላል።"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"የእርስዎ አስተዳዳሪ በስራ መገለጫዎ ውስጥ፣ ግን በግል መገለጫዎ ላይ ሳይሆን፣ ትራፊክን የሚቆጣጠር የአውታረ መረብ ምዝግብ ማስታወሻ አብርተዋል።"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"እርስዎ ኢሜይሎችን፣ መተግበሪያዎችን እና ድር ጣቢያዎችንም ጨምሮ የግል የአውታረ መረብ እንቅስቃሴዎን መከታተል ከሚችለው <xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝተዋል።"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ኢሜይሎችን፣ መተግበሪያዎችን እና ድር ጣቢያዎችንም ጨምሮ የግል የአውታረ መረብ እንቅስቃሴዎን መከታተል ከሚችሉት <xliff:g id="VPN_APP_0">%1$s</xliff:g> እና <xliff:g id="VPN_APP_1">%2$s</xliff:g> ጋር ተገናኝተዋል።"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"የእርስዎ የሥራ መገለጫ የእርስዎን ኢሜይሎችን፣ መተግበሪያዎችን እና ድር ጣቢያዎችንም ጨምሮ የግል የአውታረ መረብ እንቅስቃሴዎን መከታተል ከሚችለው <xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል።"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"የእርስዎ የግል መገለጫ ኢሜይሎችን፣ መተግበሪያዎችን እና ድር ጣቢያዎችንም ጨምሮ የግል የአውታረ መረብ እንቅስቃሴዎን መከታተል ከሚችለው <xliff:g id="VPN_APP">%1$s</xliff:g> ጋር ተገናኝቷል።"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"የቪፒኤን ቅንብሮችን ይክፈቱ"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ይህ መሣሪያ በእርስዎ ወላጅ የሚተዳደር ነው። ወላጅዎ የሚጠቀሙባቸውን መተግበሪያዎች፣ አካባቢዎን እና የማያ ገጽ ጊዜዎን የመሳሰሉ መረጃዎችን ማየት እና ማስተዳደር ይችላል።"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"የስርጭት ስም"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"የይለፍ ቃል"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"አስቀምጥ"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"የግንብ ቁጥር"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"የገንባ ቁጥር ወደ ቅንጥብ ሰሌዳ ተቀድቷል።"</string> <string name="basic_status" msgid="2315371112182658176">"ውይይት ይክፈቱ"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ሰቅ አክል"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ሰቅ አታክል"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ተጠቃሚን ይምረጡ"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> መተግበሪያዎች ንቁ ናቸው</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> መተግበሪያዎች ንቁ ናቸው</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"አዲስ መረጃ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ገቢር መተግበሪያዎች"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"እነዚህን መተግበሪያዎች እየተጠቀሙ ባይሆኑ እንኳ፣ አሁኑም ንቁ ናቸው እናም የባትሪው ጤና ላይ ተፅዕኖ ሊያሳድሩ ይችላሉ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"መቆሚያ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ቆሟል"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ተከናውኗል"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 60bf24742a1d..e7befd460e92 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -36,7 +36,7 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"هل تريد السماح لتطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> بالدخول إلى <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟\nلم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"هل تريد السماح لتطبيق \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" بالوصول إلى <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"هل تريد فتح تطبيق \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" لإدارة <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"لم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا. قد يحول استخدام التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> على هذا الجهاز دون سماع المكالمات والإشعارات والمنبّهات."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"لم يتم منح هذا التطبيق الإذن بتسجيل الصوت، ولكن يمكنه التقاط الصوت من خلال جهاز USB هذا. إنّ استخدام التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> مع هذا الجهاز قد يحول دون سماع المكالمات والإشعارات والمنبّهات."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"قد يحول استخدام التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> على هذا الجهاز دون سماع المكالمات والإشعارات والمنبّهات."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"هل تريد السماح لتطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> بالدخول إلى <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>؟"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"هل تريد فتح <xliff:g id="APPLICATION">%1$s</xliff:g> للتعامل مع <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟"</string> @@ -141,7 +141,7 @@ <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"استخدام نقش"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"استخدام كلمة المرور"</string> <string name="biometric_dialog_wrong_pin" msgid="1878539073972762803">"رقم تعريف شخصي خاطئ"</string> - <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"نقش غير صحيح"</string> + <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"النقش غير صحيح."</string> <string name="biometric_dialog_wrong_password" msgid="69477929306843790">"كلمة مرور غير صحيحة"</string> <string name="biometric_dialog_credential_too_many_attempts" msgid="3083141271737748716">"تم إجراء عدد كبير جدًا من المحاولات غير الصحيحة.\nأعد المحاولة خلال <xliff:g id="NUMBER">%d</xliff:g> ثانية."</string> <string name="biometric_dialog_credential_attempts_before_wipe" msgid="6751859711975516999">"يُرجى إعادة المحاولة. المحاولة <xliff:g id="ATTEMPTS_0">%1$d</xliff:g> من <xliff:g id="MAX_ATTEMPTS">%2$d</xliff:g>"</string> @@ -377,20 +377,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"تملك مؤسستك هذا الجهاز ويمكنها تتبّع حركة بيانات الشبكة."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"تملك مؤسسة <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> هذا الجهاز ويمكنها تتبّع حركة بيانات الشبكة"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"توفر مؤسسة \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\" هذا الجهاز."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"هذا الجهاز يخص مؤسستك وتم ربطه بشبكة <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"هذا الجهاز يخص <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> وتم ربطه بشبكة <xliff:g id="VPN_APP">%2$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"هذا الجهاز يخص مؤسستك."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"هذا الجهاز يخص <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"هذا الجهاز يخص مؤسستك وتم ربطه بشبكات افتراضية خاصة (VPN)."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"هذا الجهاز يخص <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> وتم ربطه بشبكات افتراضية خاصة (VPN)."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"يمكن لمؤسستك مراقبة حركة بيانات الشبكة في الملف الشخصي للعمل"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"يمكن لـ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> مراقبة حركة بيانات الشبكة في ملفك الشخصي للعمل"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"تكون أنشطة شبكة الملف الشخصي للعمل مرئية لمشرف تكنولوجيا المعلومات."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"قد تكون الشبكة خاضعة للمراقبة"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"تم ربط هذا الجهاز بشبكات افتراضية خاصة (VPN)."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"تم ربط الملف الشخصي للعمل بشبكة <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"تم ربط ملفك الشخصي بشبكة <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"تم ربط هذا الجهاز بشبكة <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"توفر مؤسسة \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\" هذا الجهاز"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"إدارة الأجهزة"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"شبكة افتراضية خاصة (VPN)"</string> @@ -406,10 +414,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"تم تثبيت مرجع مصدّق على هذا الجهاز. قد تتم مراقبة حركة بيانات شبكتك الآمنة أو تعديلها."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"شغَّل المشرف ميزة تسجيل بيانات الشبكة، والتي يتم من خلالها مراقبة حركة البيانات على جهازك."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"شغَّل المشرف ميزة تسجيل بيانات الشبكة، والتي يتم من خلالها مراقبة حركة البيانات في ملفك الشخصي للعمل ولكن لا تتم مراقبتها في ملفك الشخصي."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"لقد اتصلت بتطبيق <xliff:g id="VPN_APP">%1$s</xliff:g>، الذي يمكن أن يراقب نشاط شبكتك، بما في ذلك رسائل البريد الإلكتروني والتطبيقات والمواقع الإلكترونية."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"لقد اتصلت بتطبيق <xliff:g id="VPN_APP_0">%1$s</xliff:g> و<xliff:g id="VPN_APP_1">%2$s</xliff:g> اللذين يمكنهما مراقبة نشاط شبكتك، بما في ذلك رسائل البريد الإلكتروني والتطبيقات والمواقع الإلكترونية."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"تم ربط الملف الشخصي للعمل بـ <xliff:g id="VPN_APP">%1$s</xliff:g>، الذي يمكنه مراقبة أنشطتك الشخصية على الشبكة، بما في ذلك الرسائل الإلكترونية والتطبيقات ومواقع الويب."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"تم ربط ملفك الشخصي بـ <xliff:g id="VPN_APP">%1$s</xliff:g>، الذي يمكنه مراقبة أنشطة شبكتك، بما في ذلك رسائل البريد الإلكتروني والتطبيقات والمواقع الإلكترونية."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"فتح إعدادات الشبكة الافتراضية الخاصة (VPN)"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"يتولّى أحد الوالدين إدارة هذا الجهاز. يمكن للوالدين عرض وإدارة معلوماتك، مثلاً التطبيقات التي تستخدمها وموقعك الجغرافي ووقت النظر إلى الشاشة."</string> @@ -503,7 +515,7 @@ <string name="notification_alert_title" msgid="3656229781017543655">"تلقائية"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"تلقائي"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"بدون صوت أو اهتزاز"</string> - <string name="notification_conversation_summary_low" msgid="1734433426085468009">"بدون صوت أو اهتزاز وتظهر في موضع أسفل في قسم المحادثات"</string> + <string name="notification_conversation_summary_low" msgid="1734433426085468009">"بدون صوت أو اهتزاز وتظهر في موضع أسفل في قسم المحادثات."</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"يمكن إصدار رنين أو اهتزاز بناءً على إعدادات الهاتف."</string> <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"يمكن إصدار رنين أو اهتزاز بناءً على إعدادات الهاتف. تظهر المحادثات من <xliff:g id="APP_NAME">%1$s</xliff:g> كفقاعات تلقائيًا."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"السماح للنظام بتحديد ما إذا يجب اهتزاز الجهاز أو إصدار رنين عند تلقّي هذا الإشعار"</string> @@ -867,6 +879,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"اسم البث"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"كلمة المرور"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"حفظ"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"رقم الإصدار"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"تم نسخ رقم الإصدار إلى الحافظة."</string> <string name="basic_status" msgid="2315371112182658176">"محادثة مفتوحة"</string> @@ -935,11 +951,17 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"إضافة المربّع"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"عدم إضافة المربّع"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"اختيار المستخدم"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="zero"><xliff:g id="COUNT_1">%s</xliff:g> تطبيق نشط</item> + <item quantity="two">تطبيقَان نشطَان (<xliff:g id="COUNT_1">%s</xliff:g>)</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> تطبيقات نشطة</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> تطبيقًا نشطًا</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> تطبيق نشط</item> + <item quantity="one">تطبيق واحد نشط (<xliff:g id="COUNT_0">%s</xliff:g>)</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"معلومات جديدة"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"التطبيقات النشطة"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"حتى لو لم تكن تستخدم هذه التطبيقات، فإنّها ستظل نشطة وقد تؤثر على عمر البطارية."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"إيقاف"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"متوقّف"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"تم"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index b9ba840f00c5..f8b7b2e4e61f 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -34,8 +34,8 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"স্বয়ং-ঘূৰ্ণন স্ক্ৰীন"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ত প্ৰৱেশ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g>ক অনুমতি দিবনে?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g>ক <xliff:g id="USB_DEVICE">%2$s</xliff:g> এক্সেছ কৰিবলৈ অনুমতি দিবনে?\nএই এপ্টোক ৰেকর্ড কৰাৰ অনুমতি দিয়া হোৱা নাই কিন্তু ই এই ইউএছবি ডিভাইচটোৰ জৰিয়তে অডিঅ\' ৰেকর্ড কৰিব পাৰে।"</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g>ক <xliff:g id="USB_DEVICE">%2$s</xliff:g>ত প্ৰৱেশ কৰিবলৈ অনুমতি দিবনে?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ক ব্যৱহাৰ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g>ক খুলিবনে?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g>ক <xliff:g id="USB_DEVICE">%2$s</xliff:g> এক্সেছ কৰিবলৈ অনুমতি দিবনে?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> নিয়ন্ত্ৰণ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g> খুলিবনে?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"এই এপ্টোক ৰেকর্ড কৰাৰ অনুমতি দিয়া হোৱা নাই কিন্তু ই এই ইউএছবি ডিভাইচটোৰ জৰিয়তে অডিঅ\' ৰেকর্ড কৰিব পাৰে। এইটো ডিভাইচৰ সৈতে <xliff:g id="APPLICATION">%1$s</xliff:g> ব্যৱহাৰ কৰিলে কল, জাননী আৰু এলাৰ্ম শুনাটো অৱৰুদ্ধ হ’ব পাৰে।"</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"এইটো ডিভাইচৰ সৈতে <xliff:g id="APPLICATION">%1$s</xliff:g> ব্যৱহাৰ কৰিলে কল, জাননী আৰু এলাৰ্ম শুনাটো অৱৰুদ্ধ হ’ব পাৰে।"</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g>ক <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ত প্ৰৱেশ কৰিবলৈ অনুমতি দিবনে?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"এই ডিভাইচটোৰ গৰাকী আপোনাৰ প্ৰতিষ্ঠান আৰু ই নেটৱৰ্কৰ ট্ৰেফিক নিৰীক্ষণ কৰিব পাৰে"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"এই ডিভাইচটোৰ গৰাকী <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> আৰু এইটোৱে নেটৱৰ্কৰ ট্ৰেফিক নিৰীক্ষণ কৰিব পাৰে"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>এ প্ৰদান কৰিছে"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ আৰু এইটো <xliff:g id="VPN_APP">%1$s</xliff:g>ৰ সৈতে সংযুক্ত হৈ আছে"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ৰ আৰু এইটো <xliff:g id="VPN_APP">%2$s</xliff:g>ৰ সৈতে সংযুক্ত হৈ আছে"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ৰ"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ আৰু এইটো VPNসমূহৰ সৈতে সংযুক্ত হৈ আছে"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ৰ আৰু এইটো VPNসমূহৰ সৈতে সংযুক্ত হৈ আছে"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"আপোনাৰ প্ৰতিষ্ঠানে আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ নেটৱৰ্ক ট্ৰেফিক পৰ্যবেক্ষণ কৰিব পাৰে"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>এ আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ নেটৱৰ্ক ট্ৰেফিক পৰ্যবেক্ষণ কৰিব পাৰে"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ নেটৱৰ্কৰ কাৰ্যকলাপ আপোনাৰ আইটি প্ৰশাসকৰ বাবে দৃশ্যমান হয়"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"নেটৱৰ্ক নিৰীক্ষণ কৰা হ\'ব পাৰে"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"এই ডিভাইচটো VPNসমূহৰ সৈতে সংযুক্ত হৈ আছে"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"আপোনাৰ কৰ্মস্থানৰ প্ৰ’ফাইলটো <xliff:g id="VPN_APP">%1$s</xliff:g>ৰ সৈতে সংযুক্ত হৈ আছে"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"আপোনাৰ ব্যক্তিগত প্ৰ’ফাইলটো <xliff:g id="VPN_APP">%1$s</xliff:g>ৰ সৈতে সংযুক্ত হৈ আছে"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"এই ডিভাইচটো <xliff:g id="VPN_APP">%1$s</xliff:g>ৰ সৈতে সংযুক্ত হৈ আছে"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>এ প্ৰদান কৰিছে"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ডিভাইচৰ পৰিচালনা"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"ভিপিএন"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"এই ডিভাইচটোত এটা প্ৰমাণপত্ৰ সম্পৰ্কীয় কৰ্তৃপক্ষ ইনষ্টল কৰা হৈছে। আপোনাৰ সুৰক্ষিত নেটৱৰ্কৰ ট্ৰেফিক পৰ্যবেক্ষণ বা সংশোধন কৰা হ\'ব পাৰে।"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"আপোনাৰ প্ৰশাসকে নেটৱৰ্ক লগিং অন কৰিছে, যিয়ে আপোনাৰ ডিভাইচটোত নেটৱৰ্ক ট্ৰেফিক পৰ্যবেক্ষণ কৰে।"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"আপোনাৰ প্ৰশাসকে নেটৱৰ্ক লগিং অন কৰিছে, যিয়ে আপোনাৰ কৰ্মস্থানৰ প্ৰ’ফাইলত ট্ৰেফিক নিৰীক্ষণ কৰে কিন্তু আপোনাৰ ব্যক্তিগত প্ৰ’ফাইলত নকৰে।"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"আপুনি <xliff:g id="VPN_APP">%1$s</xliff:g>ৰে সংযুক্ত হৈ আছে যিয়ে আপোনাৰ ইমেইল, এপ্ আৰু ৱেবছাইটকে ধৰি নেটৱর্কৰ কাৰ্যকলাপ পৰ্যবেক্ষণ কৰিব পাৰে।"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"আপুনি <xliff:g id="VPN_APP_0">%1$s</xliff:g> আৰু <xliff:g id="VPN_APP_1">%2$s</xliff:g>ৰে সংযুক্ত হৈ আছে, যিয়ে আপোনাৰ ইমেইল, এপ্ আৰু ৱেবছাইটকে ধৰি নেটৱর্কৰ কাৰ্যকলাপ পৰ্যবেক্ষণ কৰিব পাৰে।"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"আপুনি <xliff:g id="VPN_APP">%1$s</xliff:g>ৰে সংযুক্ত হৈ আছে যিয়ে আপোনাৰ ইমেইল, এপ্ আৰু ৱেবছাইটকে ধৰি নেটৱর্কৰ কাৰ্যকলাপ পৰ্যবেক্ষণ কৰিব পাৰে।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"আপোনাৰ ব্যক্তিগত প্ৰ\'ফাইলটো <xliff:g id="VPN_APP">%1$s</xliff:g>ৰে সংযুক্ত হৈ আছে, যিয়ে আপোনাৰ ইমেইল, এপ্ আৰু ৱেবছাইটকে ধৰি নেটৱর্কৰ কাৰ্যকলাপ পৰ্যবেক্ষণ কৰিব পাৰে।"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ছেটিং খোলক"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"এই ডিভাইচটো আপোনাৰ অভিভাৱকে পৰিচালনা কৰে। আপোনাৰ অভিভাৱকে আপুনি ব্যৱহাৰ কৰা এপ্, আপোনাৰ অৱস্থান আৰু আপুনি ডিভাইচত অতিবাহিত কৰা সময়ৰ দৰে তথ্য চাব আৰু পৰিচালনা কৰিব পাৰে।"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"সম্প্ৰচাৰ নাম"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"পাছৱৰ্ড"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ছেভ কৰক"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"বিল্ডৰ নম্বৰ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ক্লিপব’ৰ্ডলৈ বিল্ডৰ নম্বৰ প্ৰতিলিপি কৰা হ’ল।"</string> <string name="basic_status" msgid="2315371112182658176">"বাৰ্তালাপ খোলক"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"টাইল যোগ দিয়ক"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"টাইল যোগ নিদিব"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ব্যৱহাৰকাৰী বাছনি কৰক"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> টা এপ্ সক্ৰিয় হৈ আছে</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> টা এপ্ সক্ৰিয় হৈ আছে</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"নতুন তথ্য"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"সক্ৰিয় এপ্"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"আপুনি এই এপ্সমূহ ব্যৱহাৰ কৰি নাথাকিলেও, সেইসমূহ এতিয়াও সক্ৰিয় হৈ আছে আৰু সেইসমূহে বেটাৰিৰ জীৱনকাল প্ৰভাৱিত কৰিব পাৰে"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"বন্ধ কৰক"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"বন্ধ হ’ল"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"হ’ল"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index c0735cc6dec3..51bd3efe81c8 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -33,14 +33,14 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"Xeyr, təşəkkür"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Ekranın avtomatik dönməsi"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş icazəsi verilsin?"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş icazəsi verilsin?\nBu tətbiqə qeydə almaq icazəsi verilməyib lakin, bu USB vasitəsilə səs yaza bilər."</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş verilsin?\nTətbiqə qeydə almaq icazəsi verilməsə də, bu USB vasitəsilə səsi qeydə ala bilər."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş icazəsi verilsin?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Bu tətbiqə yazmaq icazəsi verilməyib, lakin, bu USB vasitəsilə səs yaza bilər. <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqindən bu cihazla istifadə etsəniz zənglər, bildirişlər və siqnallar eşidilməyə bilər."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Tətbiqə qeydə almaq icazəsi verilməsə də, bu USB vasitəsilə səsi qeydə ala bilər. <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinin bu cihazla istifadəsi zənglərin və bildirişlərin eşidilməməsinə səbəb ola bilər."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqindən bu cihazla istifadə etsəniz zənglər, bildirişlər və siqnallar eşidilməyə bilər."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> cihazına giriş icazəsi verilsin?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?\nBu tətbiqə yazmaq icazəsi verilməyib, lakin, bu USB vasitəsilə səs yaza bilər."</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş verilsin?\nTətbiqə qeydə almaq icazəsi verilməsə də, bu USB vasitəsilə səsi qeydə ala bilər."</string> <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Heç bir quraşdırılmış tətbiq bu USB aksesuar ilə işləmir. Bu aksesuar haqqında daha ətraflı məlumatı <xliff:g id="URL">%1$s</xliff:g> adresindən öyrənin"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"USB aksesuar"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Təşkilatınız bu cihazın sahibidir və şəbəkə trafikinə nəzarət edə bilər"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> bu cihazın sahibidir və şəbəkə trafikinə nəzarət edə bilər"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən təmin edilib"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Bu cihaz təşkilatınıza məxsusdur və <xliff:g id="VPN_APP">%1$s</xliff:g> şəbəkəsinə qoşulub"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> təşkilatına məxsusdur və <xliff:g id="VPN_APP">%2$s</xliff:g> şəbəkəsinə qoşulub"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Bu cihaz təşkilatınıza məxsusdur"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> təşkilatına məxsusdur"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Bu cihaz təşkilatınıza məxsusdur və VPN şəbəkəsinə qoşulub"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> təşkilatına məxsusdur və VPN şəbəkəsinə qoşulub"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Təşkilat iş profilində şəbəkə ötürülməsinə nəzarət edə bilər"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> iş profilində şəbəkə ötürülməsinə nəzarət edə bilər"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"İş profili şəbəkəsi fəalliyyətini IT admini görə bilir"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Şəbəkəyə nəzarət edilə bilər"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Bu cihaz VPN şəbəkəsinə qoşulub"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"İş profiliniz <xliff:g id="VPN_APP">%1$s</xliff:g> şəbəkəsinə qoşulub"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Şəxsi profiliniz <xliff:g id="VPN_APP">%1$s</xliff:g> şəbəkəsinə qoşulub"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Bu cihaz <xliff:g id="VPN_APP">%1$s</xliff:g> şəbəkəsinə qoşulub"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən təmin edilib"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Cihaz idarəetməsi"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN (Virtual Şəxsi Şəbəkələr)"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Bu cihazda sertifikat səlahiyyəti quraşdırıldı. Təhlükəsiz şəbəkə ötürülməsinə nəzarət edilə və ya dəyişdirilə bilər."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Admin cihazda şəbəkə ötürülməsinə nəzarət edən şəbəkə qeydlərini aktiv etdi."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Admininiz şəxsi profilinizdəki deyil, iş profilinizdəki trafikə nəzarət edən şəbəkə qeydiyyatını aktiv edib."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"E-poçt, tətbiq və veb saytlar daxil olmaqla şəbəkə fəaliyyətinə nəzarət edən <xliff:g id="VPN_APP">%1$s</xliff:g> tətbiqinə qoşulusunuz."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"E-poçt, tətbiq və veb saytlar daxil olmaqla şəbəkə fəaliyyətinə nəzarət edən <xliff:g id="VPN_APP_0">%1$s</xliff:g> və <xliff:g id="VPN_APP_1">%2$s</xliff:g> tətbiqlərinə qoşulusunuz."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"İş profili e-poçt, tətbiq və veb saytlar da daxil olmaqla şəbəkə fəaliyyətinə nəzarət edən <xliff:g id="VPN_APP">%1$s</xliff:g> tətbiqinə qoşuludur."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Şəxsi profil e-poçt, tətbiq və veb saytlar daxil olmaqla şəbəkə fəaliyyətinə nəzarət edən <xliff:g id="VPN_APP">%1$s</xliff:g> tətbiqinə qoşuludur."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" ("</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ayarlarını açın"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu cihaz valideyniniz tərəfindən idarə olunur. Valideyniniz işlətdiyiniz tətbiqlər, məkanınız və ekran vaxtınız kimi bilgiləri görə və idarə edə bilər."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Yayım Adı"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Parol"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Saxlayın"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Montaj nömrəsi"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versiya nömrəsi mübadilə buferinə kopyalandı."</string> <string name="basic_status" msgid="2315371112182658176">"Açıq söhbət"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Mozaik əlavə edin"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Mozaik əlavə etməyin"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"İstifadəçi seçin"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> tətbiq aktivdir</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> tətbiq aktivdir</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yeni məlumat"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiv tətbiqlər"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Bu tətbiqləri istifadə etməsəniz belə, onlar hələ də aktivdir və batareyanın ömrünə təsir edə bilər"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Dayandırın"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dayandırılıb"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Oldu"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 585b8798798d..04b51ebc8082 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organizacija je vlasnik uređaja i može da nadgleda mrežni saobraćaj"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> je vlasnik ovog uređaja i može da nadgleda mrežni saobraćaj"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Ovaj uređaj pruža <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Ovaj uređaj pripada organizaciji i povezan je sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je sa aplikacijom <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Ovaj uređaj pripada organizaciji"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Ovaj uređaj pripada organizaciji i povezan je sa VPN-ovima"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je sa VPN-ovima"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organizacija može da prati mrežni saobraćaj na poslovnom profilu"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> može da nadgleda mrežni saobraćaj na poslovnom profilu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktivnost na mreži poslovnog profila je vidljiva IT administratoru"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Mreža se možda nadgleda"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Ovaj uređaj je povezan sa VPN-ovima"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Poslovni profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Vaš lični profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Ovaj uređaj je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Ovaj uređaj pruža <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Upravljanje uređajima"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Na ovom uređaju je instaliran autoritet za izdavanje sertifikata. Bezbedni mrežni saobraćaj može da se prati ili menja."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrator je uključio evidentiranje mreže, koje prati saobraćaj na uređaju."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrator je uključio evidentiranje mreže, koje prati saobraćaj na poslovnom profilu, ali ne i na ličnom profilu."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Povezani ste sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Povezani ste sa aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>, koje mogu da nadgledaju aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Poslovni profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Lični profil je povezan sa aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može da nadgleda aktivnosti na mreži, uključujući imejlove, aplikacije i veb-sajtove."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otvori podešavanja VPN-a"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Ovim uređajem upravlja roditelj. Roditelj može da vidi informacije, kao što su aplikacije koje koristiš, tvoju lokaciju i vreme ispred ekrana, i da upravlja njima."</string> @@ -849,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Naziv emitovanja"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Lozinka"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Sačuvaj"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj verzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj verzije je kopiran u privremenu memoriju."</string> <string name="basic_status" msgid="2315371112182658176">"Otvorite konverzaciju"</string> @@ -917,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Dodaj pločicu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ne dodaj pločicu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Izaberite korisnika"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivna</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikacije su aktivne</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivno</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Čak i ako ne koristite ove aplikacije, one su i dalje aktivne i mogu da utiču na trajanje baterije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gotovo"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 08379979bf09..098bc320881e 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Ваша арганізацыя валодае гэтай прыладай і можа кантраляваць сеткавы трафік"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> валодае гэтай прыладай і можа кантраляваць сеткавы трафік"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Гэта прылада належыць вашай арганізацыі і падключана да праграмы \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" і падключана да праграмы \"<xliff:g id="VPN_APP">%2$s</xliff:g>\""</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Гэта прылада належыць вашай арганізацыі"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Гэта прылада належыць вашай арганізацыі і падключана да VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" і падключана да VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ваша арганізацыя можа сачыць за сеткавым трафікам у вашым працоўным профілі"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> можа сачыць за сеткавым трафікам у вашым працоўным профілі"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Дзеянні працоўнага профілю ў сетцы бачныя IT-адміністратару"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"За сеткай могуць сачыць"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Гэта прылада падключана да VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Ваш працоўны профіль падключаны да праграмы \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Ваш асабісты профіль падключаны да праграмы \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Гэта прылада падключана да праграмы \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Кіраванне прыладай"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На гэтай прыладзе ўсталяваны цэнтр сертыфікацыі. Ваш абаронены сеткавы трафік могуць праглядваць ці змяняць."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ваш адміністратар уключыў вядзенне журнала сеткі, з дапамогай якога адсочваецца трафік на вашай прыладзе."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ваш адміністратар уключыў вядзенне журнала сеткі, з дапамогай якога адсочваецца трафік у вашым працоўным профілі. Трафік вашага асабістага профілю застаецца недаступным."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Вы падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Вы падключаны да праграм <xliff:g id="VPN_APP_0">%1$s</xliff:g> і <xliff:g id="VPN_APP_1">%2$s</xliff:g>, якія могуць сачыць за вашай сеткавай дзейнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Ваш працоўны профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Ваш асабісты профіль падключаны да праграмы <xliff:g id="VPN_APP">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" ,"</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Адкрыйце налады VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Гэта прылада знаходзіцца пад кантролем бацькоў. Бацькі могуць праглядаць і кантраляваць тваю інфармацыю, напрыклад пра праграмы, якія ты выкарыстоўваеш, даныя пра тваё месцазнаходжанне і час карыстання прыладай."</string> @@ -855,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Назва трансляцыі"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Пароль"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Захаваць"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Нумар зборкі"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Нумар зборкі скапіраваны ў буфер абмену."</string> <string name="basic_status" msgid="2315371112182658176">"Адкрытая размова"</string> @@ -923,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Дадаць плітку"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Не дадаваць плітку"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Выбар карыстальніка"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> праграма актыўная</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> праграмы актыўныя</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> праграм актыўныя</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> праграмы актыўныя</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Новая інфармацыя"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Актыўныя праграмы"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Нават калі вы не карыстаецеся гэтымі праграмамі, яны застаюцца актыўнымі і могуць памяншаць час працы ад акумулятара"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Спыніць"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Спынена"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Гатова"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index c9d1e81e7c29..c6b8c2e3f8f4 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Организацията ви притежава това устройство и може да наблюдава трафика в мрежата"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> притежава това устройство и може да наблюдава трафика в мрежата"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Това устройство е предоставено от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Това устройство принадлежи на организацията ви и е свързано с(ъс) <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Това устройство принадлежи на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и е свързано с(ъс) <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Това устройство принадлежи на организацията ви"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Това устройство принадлежи на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Това устройство принадлежи на организацията ви и е свързано с виртуални частни мрежи (VPN)"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Това устройство принадлежи на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и е свързано с виртуални частни мрежи (VPN)"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Организацията ви може да наблюдава трафика в мрежата в служебния ви потребителски профил"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> може да наблюдава трафика в мрежата в служебния ви потребителски профил"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Мрежовата активност в служебния потребителски профил е видима за системния ви администратор"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Мрежата може да се наблюдава"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Това устройство е свързано с виртуални частни мрежи (VPN)"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Служебният ви потребителски профил е свързан с(ъс) <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Личният ви потребителски профил е свързан с(ъс) <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Това устройство е свързано с(ъс) <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Това устройство е предоставено от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Управление на устройствата"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На това устройство е инсталиран сертифициращ орган. Трафикът в защитената ви мрежа може да бъде наблюдаван или променян."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Администраторът ви е включил функцията за регистриране на мрежовата активност, която следи трафика на устройството ви."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Администраторът ви е включил функцията за регистриране на мрежовата активност, която следи трафика в служебния ви потребителски профил, но не и в личния."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Установена е връзка с приложението <xliff:g id="VPN_APP">%1$s</xliff:g>, което може да наблюдава активността ви в мрежата, включително имейли, приложения и уебсайтове."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Установена е връзка с приложенията <xliff:g id="VPN_APP_0">%1$s</xliff:g> и <xliff:g id="VPN_APP_1">%2$s</xliff:g>, които могат да наблюдават активността ви в мрежата, включително имейли, приложения и уебсайтове."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Служебният ви потребителски профил е свързан с приложението <xliff:g id="VPN_APP">%1$s</xliff:g>, което може да наблюдава активността ви в мрежата, включително имейли, приложения и уебсайтове."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Личният ви потребителски профил е свързан с приложението <xliff:g id="VPN_APP">%1$s</xliff:g>, което може да наблюдава активността ви в мрежата, включително имейли, приложения и уебсайтове."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Отваряне на настройките за VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Това устройство се управлява от родителя ви. Той може да вижда и управлява информация, като например приложенията, които използвате, местоположението ви и времето на ползване."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Име на предаването"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Парола"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Запазване"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер на компилацията"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номерът на компилацията е копиран в буферната памет."</string> <string name="basic_status" msgid="2315371112182658176">"Отворен разговор"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Добавяне на панел"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Отмяна на добавянето"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Избор на потребител"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> приложения са активни</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> приложение е активно</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нова информация"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активни приложения"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Дори и да не използвате тези приложения, те са активни и може да окажат влияние върху живота на батерията"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Спиране"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Спряно"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Готово"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index e5920fcdd734..df5df595d25d 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"এই ডিভাইসটি আপনার প্রতিষ্ঠানের এবং এরা ডিভাইসের নেটওয়ার্ক ট্রাফিক মনিটর করতে পারে"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> এই ডিভাইসের মালিক এবং এটির নেটওয়ার্ক ট্রাফিক মনিটর করতে পারে"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"এই ডিভাইস <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দিয়েছে"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"এই ডিভাইসটি আপনার প্রতিষ্ঠানের এবং <xliff:g id="VPN_APP">%1$s</xliff:g>-এ কানেক্ট করা আছে"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"এই ডিভাইস <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-এর এবং <xliff:g id="VPN_APP">%2$s</xliff:g>-এ কানেক্ট করা আছে"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"এই ডিভাইসটি আপনার প্রতিষ্ঠানের"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-এর"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"এই ডিভাইসটি আপনার প্রতিষ্ঠানের এবং একাধিক VPN-এ কানেক্ট করা আছে"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"এই ডিভাইস <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-এর এবং একাধিক VPN-এ কানেক্ট করা আছে"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"আপনার প্রতিষ্ঠান আপনার কর্মস্থলের প্রোফাইলের নেটওয়ার্ক ট্রাফিকে নজর রাখতে পারে"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> আপনার কর্মস্থলের প্রোফাইলের নেটওয়ার্ক ট্রাফিকে নজর রাখতে পারে"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"আপনার আইটি অ্যাডমিন অফিস প্রোফাইল নেটওয়ার্ক অ্যাক্টিভিটি দেখতে পারবেন"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"নেটওয়ার্কের উপরে নজর রাখা হতে পারে"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"এই ডিভাইস একাধিক VPN-এ কানেক্ট করা আছে"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"<xliff:g id="VPN_APP">%1$s</xliff:g>-এ আপনার অফিস প্রোফাইল কানেক্ট করা রয়েছে"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"আপনার ব্যক্তিগত প্রোফাইল <xliff:g id="VPN_APP">%1$s</xliff:g>-এ কানেক্ট করা আছে"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"এই ডিভাইস <xliff:g id="VPN_APP">%1$s</xliff:g>-এ কানেক্ট করা আছে"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"এই ডিভাইস <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দিয়েছে"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ডিভাইসের পরিচালনা"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"এই ডিভাইসে একটি সার্টিফিকেট কর্তৃপক্ষ ইনস্টল করা আছে। আপনার নিরাপদ নেটওয়ার্ক ট্রাফিকে নজর রাখা হতে পারে বা তাতে পরিবর্তন করা হতে পারে।"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"আপনার প্রশাসক নেটওয়ার্ক লগিং চালু করেছেন, যা আপনার ডিভাইসের ট্রাফিকের উপরে নজর রাখে।"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"আপনার অ্যাডমিন নেটওয়ার্ক লগ করা চালু করেছেন যা আপনার অফিস প্রোফাইলে ট্রাফিক মনিটর করে তবে ব্যক্তিগত প্রোফাইলে করে না।"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"আপনি <xliff:g id="VPN_APP">%1$s</xliff:g> এ সংযুক্ত রয়েছেন, যা আপনার ইমেল, অ্যাপ, এবং ওয়েবসাইট সহ আপনার নেটওয়ার্ক অ্যাক্টিভিটির উপর নজর রাখতে পারে।"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"আপনি <xliff:g id="VPN_APP_0">%1$s</xliff:g> এবং <xliff:g id="VPN_APP_1">%2$s</xliff:g> এর সাথে সংযুক্ত রয়েছেন, যেগুলি আপনার ইমেল, অ্যাপ, এবং ওয়েবসাইট সহ আপনার নেটওয়ার্ক অ্যাক্টিভিটির উপর নজর রাখতে পারে।"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"আপনার কর্মস্থলের প্রোফাইল <xliff:g id="VPN_APP">%1$s</xliff:g> এর সাথে সংযুক্ত রয়েছে, যেটি ইমেল, অ্যাপ, এবং ওয়েবসাইট সহ আপনার নেটওয়ার্ক কার্যকলাপে নজর রাখতে পারে।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"আপনার ব্যক্তিগত প্রোফাইল <xliff:g id="VPN_APP">%1$s</xliff:g> এর সাথে সংযুক্ত রয়েছে, যেটি ইমেল, অ্যাপ, এবং ওয়েবসাইট সহ আপনার নেটওয়ার্ক কার্যকলাপে নজর রাখতে পারে৷"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN সেটিংস খুলুন"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"আপনার অভিভাবক এই ডিভাইস ম্যানেজ করেন। আপনার অভিভাবক আপনার ব্যবহার করা অ্যাপ, লোকেশন ও স্ক্রিন টাইমের মতো তথ্যগুলি দেখতে এবং ম্যানেজ করতে পারেন।"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"অগ্রাধিকার"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এ কথোপকথন ফিচার কাজ করে না"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"এই বিজ্ঞপ্তিগুলি পরিবর্তন করা যাবে না।"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"কল বিজ্ঞপ্তি পরিবর্তন করা যাবে না।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"এই সমস্ত বিজ্ঞপ্তিকে এখানে কনফিগার করা যাবে না"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"প্রক্সি করা বিজ্ঞপ্তি"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g> সংক্রান্ত সমস্ত বিজ্ঞপ্তি"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ব্রডকাস্টের নাম"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"পাসওয়ার্ড"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"সেভ করুন"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"বিল্ড নম্বর"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"বিল্ড নম্বর ক্লিপবোর্ডে কপি করা হয়েছে।"</string> <string name="basic_status" msgid="2315371112182658176">"খোলা কথোপকথন"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"টাইল যোগ করুন"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"টাইল যোগ করবেন না"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ব্যবহারকারী বেছে নিন"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g>টি অ্যাপ চালু আছে</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>টি অ্যাপ চালু আছে</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"নতুন তথ্য"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"অ্যাক্টিভ অ্যাপ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"আপনি এইসব অ্যাপ ব্যবহার না করলেও, সেগুলি এখনও চালু থাকতে পারে এবং তার জন্য ব্যাটারির চার্জ কমতে পারে"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"বন্ধ করুন"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"থামানো হয়েছে"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"হয়ে গেছে"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 3d84113d1900..b88e9bf5929e 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -34,14 +34,14 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Automatsko rotiranje ekrana"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup uređaju: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup uređaju <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nOvoj aplikaciji nije dato odobrenje za snimanje, ali može snimati zvuk putem ovog USB uređaja."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup dodatku: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje uređajem: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Dozvoliti da <xliff:g id="APPLICATION">%1$s</xliff:g> pristupa uređaju <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> da upravlja uređajem <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Ovoj aplikaciji nije dato odobrenje za snimanje, ali može snimati zvuk putem ovog USB uređaja. Korištenje aplikacije <xliff:g id="APPLICATION">%1$s</xliff:g> s ovim uređajem može vas spriječiti da čujete pozive, obavještenja i alarme."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Korištenje aplikacije <xliff:g id="APPLICATION">%1$s</xliff:g> s ovim uređajem može vas spriječiti da čujete pozive, obavještenja i alarme."</string> - <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup dodatku: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje uređajem: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Dozvoliti da <xliff:g id="APPLICATION">%1$s</xliff:g> pristupa uređaju <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> + <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> da upravlja uređajem <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Želite li upravljati uređajem <xliff:g id="USB_DEVICE">%2$s</xliff:g> putem aplikacije <xliff:g id="APPLICATION">%1$s</xliff:g>?\nOvoj aplikaciji nije dato odobrenje za snimanje, ali može snimati zvuk putem ovog USB uređaja."</string> - <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje uređajem: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> + <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> da upravlja uređajem <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Nema instaliranih aplikacija za ovaj USB uređaj. Saznajte više o uređaju na <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"USB periferni uređaj"</string> <string name="label_view" msgid="6815442985276363364">"Prikaži"</string> @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Vaša organizacija je vlasnik ovog uređaja i može nadzirati mrežni saobraćaj"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> upravlja ovim uređajem i može nadzirati mrežni saobraćaj"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Ovaj uređaj pruža <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Ovaj uređaj pripada vašoj organizaciji i povezan je s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je s aplikacijom <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Ovaj uređaj pripada vašoj organizaciji"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Ovaj uređaj pripada vašoj organizaciji i povezan je s VPN-ovima"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je VPN-ovima"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Vaša organizacija može pratiti mrežni saobraćaj na vašem profilu."</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> može pratiti mrežni saobraćaj na vašem radnom profilu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Mrežna aktivnost radnog profila je vidljiva vašem IT administratoru"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Mreža može biti nadzirana"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Ovaj uređaj je povezan VPN-ovima"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Vaš radni profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Vaš lični profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Ovaj uređaj je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Ovaj uređaj pruža <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Upravljanje uređajem"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN mreža"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"CA certifikat je instaliran na ovom uređaju. Vaš saobraćaj preko sigurne mreže može se pratiti."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Vaš administrator je uključio zapisivanje na mreži, čime se prati saobraćaj na vašem uređaju."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrator je uključio zapisivanje na mreži, čime se nadzire saobraćaj na vašem radnom profilu, ali ne i na ličnom profilu."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Povezani ste s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g> koja može pratiti vašu aktivnost na mreži, uključujući e-poštu i web lokacije."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Povezani ste s aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g> koje mogu pratiti vašu aktivnost na mreži, uključujući e-poštu, aplikacije i web lokacije."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Vaš radni profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke i web lokacije."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Vaš lični profil je povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g>, koja može pratiti vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web lokacije."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otvorite postavke VPN mreže"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Ovim uređajem upravlja tvoj roditelj. Roditelj može vidjeti i upravljati informacijama kao što su aplikacije koje koristiš, lokacija i vrijeme korištenja uređaja."</string> @@ -495,8 +507,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Automatski"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Bez zvuka ili vibracije"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Bez zvuka ili vibracije i pojavljuje se pri dnu odjeljka razgovora"</string> - <string name="notification_channel_summary_default" msgid="3282930979307248890">"Može zvoniti ili vibrirati na osnovu postavki vašeg telefona"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Može zvoniti ili vibrirati na osnovu postavki vašeg telefona. Razgovori iz oblačića u aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> kao zadana opcija."</string> + <string name="notification_channel_summary_default" msgid="3282930979307248890">"Može zvoniti ili vibrirati na osnovu postavki telefona"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Može zvoniti ili vibrirati na osnovu postavki telefona. Razgovori iz oblačića u aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> kao zadana opcija."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Neka sistem odluči treba li se ovo obavještenje oglasiti zvukom ili vibracijom"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Status:</b> je unaprijeđen u Zadano"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Status:</b> je unazađen u Nečujno"</string> @@ -849,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Naziv emitiranja"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Lozinka"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Sačuvaj"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj verzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj verzije je kopiran u međumemoriju."</string> <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> @@ -917,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Dodaj karticu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nemoj dodati karticu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Odaberite korisnika"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivna</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikacije su aktivne</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivno</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Čak i ako ne koristite ove aplikacije, one su i dalje aktivne te mogu uticati na vijek trajanja baterije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gotovo"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 88228753a1f6..727712b0b6b7 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"La teva organització és propietària del dispositiu i és possible que supervisi el trànsit de xarxa"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> és propietària d\'aquest dispositiu i és possible que supervisi el trànsit de xarxa"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona aquest dispositiu"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Aquest dispositiu pertany a la teva organització i està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Aquest dispositiu pertany a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i està connectat a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Aquest dispositiu pertany a la teva organització"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Aquest dispositiu pertany a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Aquest dispositiu pertany a la teva organització i està connectat a xarxes VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Aquest dispositiu pertany a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i està connectat a xarxes VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"És possible que la teva organització supervisi el trànsit de xarxa al teu perfil de treball"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"És possible que <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> supervisi el trànsit de xarxa del teu perfil de treball"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"L\'administrador de TI pot veure l\'activitat de la xarxa del perfil de treball"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"És possible que la xarxa estigui supervisada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Aquest dispositiu està connectat a xarxes VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"El teu perfil de treball està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"El teu perfil personal està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Aquest dispositiu està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona aquest dispositiu"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestió del dispositiu"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"S\'ha instal·lat una autoritat de certificació en aquest dispositiu. És possible que el trànsit de xarxa segura se supervisi o es modifiqui."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"L\'administrador ha activat el registre de xarxa, que supervisa el trànsit del teu dispositiu."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"L\'administrador ha activat el registre de xarxa, que monitora el trànsit al teu perfil de treball, però no al personal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Estàs connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pot supervisar la teva activitat a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Estàs connectat a <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que poden supervisar la teva activitat a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"El teu perfil de treball està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pot supervisar la teva activitat a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"El teu perfil personal està connectat a <xliff:g id="VPN_APP">%1$s</xliff:g>,que pot supervisar la teva activitat a la xarxa, com ara els correus electrònics, les aplicacions i els llocs web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Obre la configuració de la VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"El teu pare o mare gestionen aquest dispositiu, i poden veure i gestionar informació com ara les aplicacions que utilitzes, la teva ubicació i el teu temps de connexió."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioritat"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admet les funcions de converses"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Aquestes notificacions no es poden modificar."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Les notificacions de trucades no es poden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Aquest grup de notificacions no es pot configurar aquí"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificació mitjançant aplicació intermediària"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Totes les notificacions de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -519,7 +530,7 @@ <string name="feedback_prompt" msgid="3656728972307896379">"Fes saber els teus suggeriments al desenvolupador. La informació ha estat correcta?"</string> <string name="notification_channel_controls_opened_accessibility" msgid="6111817750774381094">"S\'han obert els controls de notificació per a <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="notification_channel_controls_closed_accessibility" msgid="1561909368876911701">"S\'han tancat els controls de notificació per a <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="notification_more_settings" msgid="4936228656989201793">"Més opcions"</string> + <string name="notification_more_settings" msgid="4936228656989201793">"Més opcions de configuració"</string> <string name="notification_app_settings" msgid="8963648463858039377">"Personalitza"</string> <string name="notification_conversation_bubble" msgid="2242180995373949022">"Mostra com a bombolla"</string> <string name="notification_conversation_unbubble" msgid="6908427185031099868">"Suprimeix les bombolles"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nom de l\'emissió"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Contrasenya"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Desa"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilació"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"El número de compilació s\'ha copiat al porta-retalls."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa oberta"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Afegeix la icona"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"No afegeixis la icona"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Selecciona un usuari"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplicacions estan actives</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicació està activa</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informació nova"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicacions actives"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Encara que no utilitzis aquestes aplicacions, estan actives i poden afectar la durada de la bateria"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Atura"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Aturada"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Fet"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 820749f71d42..e61e3b58fe5f 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Toto zařízení vlastní vaše organizace, která může sledovat síťový provoz"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Toto zařízení spravuje organizace <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, která může sledovat síťový provoz"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Toto zařízení poskytuje <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Toto zařízení patří vaší organizaci a je připojené k síti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Toto zařízení patří organizaci <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> a je připojené k síti <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Toto zařízení patří vaší organizaci"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Toto zařízení patří organizaci <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Toto zařízení patří vaší organizaci a je připojené k sítím VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Toto zařízení patří organizaci <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> a je připojené k sítím VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organizace může ve vašem pracovním profilu sledovat síťový provoz"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> může ve vašem pracovním profilu sledovat síťový provoz"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktivitu pracovního profilu na síti vidí administrátor IT"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Síť může být sledována"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Toto zařízení je připojené k sítím VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Váš pracovní profil je připojen k síti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Váš osobní profil je připojený k síti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Toto zařízení je připojené k síti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Toto zařízení poskytuje <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Správa zařízení"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"V zařízení je nainstalována certifikační autorita. Zabezpečený síťový provoz může být sledován nebo upravován."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrátor zapnul protokolování sítě, které monitoruje síťový provoz v zařízení."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrátor zapnul protokolování sítě, které monitoruje síťový provoz ve vašem pracovním profilu (ale ne v osobním)."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Jste připojeni k aplikaci <xliff:g id="VPN_APP">%1$s</xliff:g>, která může sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a webů."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Jste připojeni k aplikacím <xliff:g id="VPN_APP_0">%1$s</xliff:g> a <xliff:g id="VPN_APP_1">%2$s</xliff:g>, které mohou sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a webů."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Váš pracovní profil je připojen k aplikaci <xliff:g id="VPN_APP">%1$s</xliff:g>, která může sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a webů."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Váš osobní profil je připojen k aplikaci <xliff:g id="VPN_APP">%1$s</xliff:g>, která může sledovat vaši aktivitu v síti, včetně e-mailů, aplikací a webů."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otevřít nastavení VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Toto zařízení spravuje rodič. Rodič může zobrazit údaje, jako jsou používané aplikace, tvá poloha a čas strávený na zařízení."</string> @@ -419,7 +431,7 @@ <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikace je připnutá"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Obsah bude připnut v zobrazení, dokud jej neuvolníte. Uvolníte jej stisknutím a podržením tlačítek Zpět a Přehled."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Obsah bude připnut v zobrazení, dokud ho neuvolníte. Uvolníte ho podržením tlačítek Zpět a Plocha."</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Díky připnutí bude vidět, dokud ji neodepnete. Odepnout ji můžete přejetím nahoru a podržením."</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Díky připnutí bude aplikace vidět, dokud ji neodepnete. Odepnout ji můžete přejetím prstem nahoru a podržením."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"Obsah bude připnut v zobrazení, dokud jej neuvolníte. Uvolníte jej stisknutím a podržením tlačítka Přehled."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"Obsah bude připnut v zobrazení, dokud ho neuvolníte. Uvolníte ho podržením tlačítka Plocha."</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Může mít přístup k soukromým datům (například kontaktům a obsahu e-mailů)."</string> @@ -855,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Název vysílání"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Heslo"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Uložit"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Číslo sestavení"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Číslo sestavení bylo zkopírováno do schránky."</string> <string name="basic_status" msgid="2315371112182658176">"Otevřít konverzaci"</string> @@ -923,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Přidat dlaždici"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nepřidávat dlaždici"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Zvolte uživatele"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikace jsou aktivní</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> aplikace je aktivních</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikací je aktivních</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikace je aktivní</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nové informace"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivní aplikace"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"I když tyto aplikace nepoužíváte, jsou stále aktivní a mohou mít vliv na výdrž baterie"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Konec"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zastaveno"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Hotovo"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 135b480a3015..dcaebc73178d 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Din organisation ejer denne enhed og overvåger muligvis netværkstrafikken"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ejer denne enhed og overvåger muligvis netværkstrafikken"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Denne enhed er leveret af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Denne enhed tilhører din organisation og har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Denne enhed tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og har forbindelse til <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Denne enhed tilhører din organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Denne enhed tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Denne enhed tilhører din organisation og har forbindelse til VPN-netværk"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Denne enhed tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og har forbindelse til VPN-netværk"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Din organisation kan overvåge netværkstrafikken på din arbejdsprofil"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kan overvåge netværkstrafik på din arbejdsprofil"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Din it-administrator kan se netværksaktivitet på din arbejdsprofil"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Netværket kan være overvåget"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Denne enhed har forbindelse til VPN-netværk"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Din arbejdsprofil har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Din personlige profil har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Denne enhed har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Denne enhed er leveret af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Administration af enheder"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Der er installeret et nøglecenter på denne enhed. Din sikre netværkstrafik kan overvåges eller ændres."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Din administrator har aktiveret netværksregistrering, som overvåger trafik på din enhed."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Din administrator har aktiveret netværkslogging, som overvåger trafik på din arbejdsprofil, men ikke på din personlige profil."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Du har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåge din netværksaktivitet, bl.a. mails, apps og websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Du har forbindelse til <xliff:g id="VPN_APP_0">%1$s</xliff:g> og <xliff:g id="VPN_APP_1">%2$s</xliff:g>, som kan overvåge din netværksaktivitet, bl.a. mails, apps og websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Din arbejdsprofil har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåge din netværksaktivitet, bl.a. mails, apps og websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Din personlige profil har forbindelse til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåge din netværksaktivitet, bl.a. mails, apps og websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Åbn VPN-indstillinger"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Denne enhed administreres af din forælder. Din forælder kan se og administrere oplysninger såsom de apps, du bruger, din lokation og din skærmtid."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Navn på udsendelse"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Adgangskode"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Gem"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Buildnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Buildnummeret blev kopieret til udklipsholderen."</string> <string name="basic_status" msgid="2315371112182658176">"Åben samtale"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tilføj handlingsfelt"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Tilføj ikke felt"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Vælg bruger"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app er aktiv</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps er aktive</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nye oplysninger"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Disse apps er stadig aktive og kan påvirke batteritiden, også hvis du ikke bruger dem"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppet"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Udfør"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 50061fb75849..962be162109e 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -34,8 +34,8 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Bildschirm automatisch drehen"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_DEVICE">%2$s</xliff:g> gewähren?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_DEVICE">%2$s</xliff:g> gewähren?\nDiese App hat noch nicht die Berechtigung zum Aufnehmen erhalten, könnte jedoch Audio über dieses USB-Gerät aufnehmen."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_DEVICE">%2$s</xliff:g> gewähren?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> für <xliff:g id="USB_DEVICE">%2$s</xliff:g> öffnen?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> Zugriff auf <xliff:g id="USB_DEVICE">%2$s</xliff:g> gewähren?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> öffnen zur Verwendung von <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Diese App hat noch keine Berechtigung zum Aufnehmen erhalten, könnte aber Audioaufnahmen über dieses USB-Gerät machen. Wenn du <xliff:g id="APPLICATION">%1$s</xliff:g> mit diesem Gerät verwendest, hörst du möglicherweise keine Anrufe, Benachrichtigungen und Wecker mehr."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Wenn du <xliff:g id="APPLICATION">%1$s</xliff:g> mit diesem Gerät verwendest, hörst du möglicherweise keine Anrufe, Benachrichtigungen und Wecker mehr."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> gewähren?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Deine Organisation verwaltet dieses Gerät und kann den Netzwerkverkehr überwachen"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ist der Eigentümer dieses Geräts und kann den Netzwerkverkehr überwachen"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> zur Verfügung gestellt"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Dieses Gerät gehört deiner Organisation und ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Dieses Gerät gehört <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> und ist mit <xliff:g id="VPN_APP">%2$s</xliff:g> verbunden"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Dieses Gerät gehört deiner Organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Dieses Gerät gehört <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Dieses Gerät gehört deiner Organisation und ist mit VPNs verbunden"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Dieses Gerät gehört <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> und ist mit VPNs verbunden"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Deine Organisation kann den Netzwerkverkehr in deinem Arbeitsprofil überwachen"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kann den Netzwerkverkehr in deinem Arbeitsprofil überwachen"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Dein IT-Administrator kann die Netzwerkaktivitäten deines Arbeitsprofils sehen"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Das Netzwerk wird eventuell überwacht"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Dieses Gerät ist mit VPNs verbunden"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Dein Arbeitsprofil ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Dein privates Profil ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Dieses Gerät ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> zur Verfügung gestellt"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Geräteverwaltung"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Auf dem Gerät ist das Zertifikat einer Zertifizierungsstelle installiert. Eventuell wird dein sicherer Netzwerkverkehr überwacht oder bearbeitet."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Dein Administrator hat die Netzwerkprotokollierung aktiviert. Damit wird der Netzwerkverkehr auf deinem Gerät überwacht."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Dein Administrator hat die Netzwerkprotokollierung aktiviert. Damit werden die Zugriffe in deinem Arbeitsprofil erfasst, jedoch nicht in deinem privaten Profil."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Du bist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden. Die App kann deine Netzwerkaktivitäten (E-Mails, Apps und Websites) erfassen."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Du bist mit <xliff:g id="VPN_APP_0">%1$s</xliff:g> und <xliff:g id="VPN_APP_1">%2$s</xliff:g> verbunden. Die Apps können deine Netzwerkaktivitäten (E-Mails, Apps und Websites) erfassen."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Dein Arbeitsprofil ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden, die deine Netzwerkaktivitäten wie E-Mails, Apps und Websites überwachen kann."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Dein persönliches Profil ist mit <xliff:g id="VPN_APP">%1$s</xliff:g> verbunden, die deine Netzwerkaktivitäten wie E-Mails, Apps und Websites überwachen kann."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN-Einstellungen öffnen"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Dieses Gerät wird von deinen Eltern verwaltet. Sie können unter anderem Informationen über deine genutzten Apps, deinen Standort und deine Gerätenutzungsdauer einsehen und verwalten."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Priorität"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> unterstützt keine Funktionen für Unterhaltungen"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Diese Benachrichtigungen können nicht geändert werden."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Anrufbenachrichtigungen können nicht geändert werden."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Die Benachrichtigungsgruppe kann hier nicht konfiguriert werden"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Weitergeleitete Benachrichtigung"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Alle Benachrichtigungen von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Name für Nachricht an alle"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Passwort"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Speichern"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build-Nummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build-Nummer in Zwischenablage kopiert."</string> <string name="basic_status" msgid="2315371112182658176">"Offene Unterhaltung"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Hinzufügen"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nicht hinzufügen"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Nutzer auswählen"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> Apps sind aktiv</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> App ist aktiv</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Neue Informationen"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive Apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Auch wenn du diese Apps nicht verwendest, sind sie trotzdem aktiv und können sich auf die Akkulaufzeit auswirken"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Beenden"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Beendet"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Fertig"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index d82a28cad763..43e124e3920b 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -33,8 +33,8 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"Όχι, ευχαριστώ"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Αυτόματη περιστροφή οθόνης"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Να επιτρέπεται η πρόσβαση της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> να έχει πρόσβαση στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;\nΔεν έχει εκχωρηθεί άδεια εγγραφής σε αυτήν την εφαρμογή, αλλά μέσω αυτής της συσκευής USB θα μπορεί να εγγράφει ήχο."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> η πρόσβαση στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Να επιτρέπεται στο <xliff:g id="APPLICATION">%1$s</xliff:g> να έχει πρόσβαση στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;\nΔεν έχει εκχωρηθεί άδεια εγγραφής σε αυτήν την εφαρμογή, αλλά μέσω αυτής της συσκευής USB θα μπορεί να εγγράφει ήχο."</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Να επιτρέπεται στο <xliff:g id="APPLICATION">%1$s</xliff:g> η πρόσβαση στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Άνοιγμα <xliff:g id="APPLICATION">%1$s</xliff:g> για διαχείριση συσκευής <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Δεν έχει εκχωρηθεί άδεια εγγραφής σε αυτήν την εφαρμογή, αλλά μέσω αυτής της συσκευής USB θα μπορεί να εγγράφει ήχο. Η χρήση της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> με αυτήν τη συσκευή μπορεί να σας εμποδίσει να ακούσετε κλήσεις, ειδοποιήσεις και ξυπνητήρια."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Η χρήση της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> με αυτήν τη συσκευή μπορεί να σας εμποδίσει να ακούσετε κλήσεις, ειδοποιήσεις και ξυπνητήρια."</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Ο οργανισμός σας κατέχει αυτήν τη συσκευή και μπορεί να παρακολουθεί την επισκεψιμότητα δικτύου."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> κατέχει αυτήν τη συσκευή και μπορεί να παρακολουθεί την επισκεψιμότητα δικτύου."</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Αυτή η συσκευή παρέχεται από τον οργανισμό <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Αυτή η συσκευή ανήκει στον οργανισμό σας και είναι συνδεδεμένη στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Αυτή η συσκευή ανήκει στον οργανισμό <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> και είναι συνδεδεμένη στην εφαρμογή <xliff:g id="VPN_APP">%2$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Αυτή η συσκευή ανήκει στον οργανισμό σας."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Αυτή η συσκευή ανήκει στον οργανισμό <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Αυτή η συσκευή ανήκει στον οργανισμό σας και είναι συνδεδεμένη σε ορισμένα VPN."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Αυτή η συσκευή ανήκει στον οργανισμό <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> και είναι συνδεδεμένη σε ορισμένα VPN."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ο οργανισμός σας μπορεί να παρακολουθεί την επισκεψιμότητα δικτύου στο προφίλ εργασίας σας"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> μπορεί να παρακολουθεί την επισκεψιμότητα δικτύου στο προφίλ εργασίας σας"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Η δραστηριότητα δικτύου του προφίλ εργασίας είναι ορατή στον διαχειριστή IT σας"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Το δίκτυο ενδέχεται να παρακολουθείται"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Αυτή η συσκευή είναι συνδεδεμένη σε ορισμένα VPN."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Το προφίλ εργασίας σας είναι συνδεδεμένο στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Το προσωπικό σας προφίλ είναι συνδεδεμένο στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Αυτή η συσκευή είναι συνδεδεμένη στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Αυτή η συσκευή παρέχεται από τον οργανισμό <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Διαχείριση συσκευών"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Μια αρχή έκδοσης πιστοποιητικών έχει εγκατασταθεί σε αυτήν τη συσκευή. Η ασφαλής επισκεψιμότητα δικτύου σας μπορεί να παρακολουθείται ή να τροποποιείται."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ο διαχειριστής σας ενεργοποίησε την καταγραφή δικτύου, η οποία παρακολουθεί την επισκεψιμότητα στη συσκευή σας."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ο διαχειριστής σας έχει ενεργοποιήσει την καταγραφή δικτύου, η οποία παρακολουθεί την επισκεψιμότητα στο προφίλ εργασίας σας, αλλά όχι στο προσωπικό προφίλ σας."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Έχετε συνδεθεί στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>, η οποία μπορεί να παρακολουθεί τη δραστηριότητα δικτύου σας, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, εφαρμογών και ιστοτόπων."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Έχετε συνδεθεί στις εφαρμογές <xliff:g id="VPN_APP_0">%1$s</xliff:g> και <xliff:g id="VPN_APP_1">%2$s</xliff:g>, οι οποίες μπορούν να παρακολουθούν τη δραστηριότητα του δικτύου σας, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, εφαρμογών και ιστοτόπων."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Το προφίλ εργασίας σας είναι συνδεδεμένο στο <xliff:g id="VPN_APP">%1$s</xliff:g>, το οποίο μπορεί να παρακολουθεί τη δραστηριότητα δικτύου σας, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, εφαρμογών και ιστοτόπων."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Το προσωπικό προφίλ σας είναι συνδεμένο στην εφαρμογή <xliff:g id="VPN_APP">%1$s</xliff:g>, η οποία μπορεί να παρακολουθεί τη δραστηριότητα δικτύου σας, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, συμπεριλαμβανομένων μηνυμάτων ηλεκτρονικού ταχυδρομείου, εφαρμογών και ιστοτόπων."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Άνοιγμα Ρυθμίσεων VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Αυτή η συσκευή είναι διαχειριζόμενη από τον γονέα σου. Ο γονέας σου μπορεί να βλέπει και να διαχειρίζεται πληροφορίες όπως οι εφαρμογές που χρησιμοποιείς, η τοποθεσία σου και ο χρόνος χρήσης."</string> @@ -708,10 +720,10 @@ <string name="mobile_data_disable_message" msgid="8604966027899770415">"Δεν θα έχετε πρόσβαση σε δεδομένα ή στο διαδίκτυο μέσω της εταιρείας κινητής τηλεφωνίας <xliff:g id="CARRIER">%s</xliff:g>. Θα έχετε πρόσβαση στο διαδίκτυο μόνο μέσω Wi-Fi."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"η εταιρεία κινητής τηλεφωνίας"</string> <string name="touch_filtered_warning" msgid="8119511393338714836">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string> - <string name="slice_permission_title" msgid="3262615140094151017">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> να εμφανίζει τμήματα της εφαρμογής <xliff:g id="APP_2">%2$s</xliff:g>;"</string> + <string name="slice_permission_title" msgid="3262615140094151017">"Να επιτρέπεται στο <xliff:g id="APP_0">%1$s</xliff:g> να εμφανίζει τμήματα της εφαρμογής <xliff:g id="APP_2">%2$s</xliff:g>;"</string> <string name="slice_permission_text_1" msgid="6675965177075443714">"- Μπορεί να διαβάζει πληροφορίες από την εφαρμογή <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="slice_permission_text_2" msgid="6758906940360746983">"- Μπορεί να εκτελεί ενέργειες εντός της εφαρμογής <xliff:g id="APP">%1$s</xliff:g>"</string> - <string name="slice_permission_checkbox" msgid="4242888137592298523">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APP">%1$s</xliff:g> να εμφανίζει τμήματα από οποιαδήποτε εφαρμογή"</string> + <string name="slice_permission_checkbox" msgid="4242888137592298523">"Να επιτρέπεται στο <xliff:g id="APP">%1$s</xliff:g> να εμφανίζει τμήματα από οποιαδήποτε εφαρμογή"</string> <string name="slice_permission_allow" msgid="6340449521277951123">"Επιτρέπεται"</string> <string name="slice_permission_deny" msgid="6870256451658176895">"Δεν επιτρέπεται"</string> <string name="auto_saver_title" msgid="6873691178754086596">"Πατήστε για προγραμματισμό της Εξοικονόμησης μπαταρίας"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Όνομα μετάδοσης"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Κωδικός πρόσβασης"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Αποθήκευση"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Αριθμός έκδοσης"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Ο αριθμός έκδοσης αντιγράφηκε στο πρόχειρο."</string> <string name="basic_status" msgid="2315371112182658176">"Άνοιγμα συνομιλίας"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Προσθήκη πλακιδίου"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Χωρίς προσθ. πλακιδ."</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Επιλογή χρήστη"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> εφαρμογές είναι ενεργές</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> εφαρμογή είναι ενεργή</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Νέες πληροφορίες"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ενεργές εφαρμογές"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Ακόμη και αν δεν χρησιμοποιείτε αυτές τις εφαρμογές, εξακολουθούν να είναι ενεργές και ενδέχεται να επηρεάζουν τη διάρκεια ζωής της μπαταρίας"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Διακοπή"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Διακόπηκε"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Τέλος"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 2ca4d809fe58..68375c11ac34 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Your organisation owns this device and may monitor network traffic"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"This device belongs to your organisation and is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"This device belongs to your organisation and is connected to VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organisation may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"This device is connected to VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"This device is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps that you use, your location and your screen time."</string> @@ -843,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Can’t broadcast"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Add tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Do not add tile"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Select user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is active</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Even if you’re not using these apps, they’re still active and might affect battery life"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Done"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index d7a4dece9140..2b20555b9cde 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Your organisation owns this device and may monitor network traffic"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"This device belongs to your organisation and is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"This device belongs to your organisation and is connected to VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organisation may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"This device is connected to VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"This device is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps that you use, your location and your screen time."</string> @@ -843,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Can’t broadcast"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Add tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Do not add tile"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Select user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is active</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Even if you’re not using these apps, they’re still active and might affect battery life"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Done"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 2ca4d809fe58..68375c11ac34 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Your organisation owns this device and may monitor network traffic"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"This device belongs to your organisation and is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"This device belongs to your organisation and is connected to VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organisation may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"This device is connected to VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"This device is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps that you use, your location and your screen time."</string> @@ -843,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Can’t broadcast"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Add tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Do not add tile"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Select user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is active</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Even if you’re not using these apps, they’re still active and might affect battery life"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Done"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 2ca4d809fe58..68375c11ac34 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Your organisation owns this device and may monitor network traffic"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"This device belongs to your organisation and is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"This device belongs to your organisation and is connected to VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organisation may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"This device is connected to VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"This device is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps and websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps that you use, your location and your screen time."</string> @@ -843,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Can’t broadcast"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Add tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Do not add tile"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Select user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is active</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Even if you’re not using these apps, they’re still active and might affect battery life"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Done"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index be94028c3381..3e774d9b51e0 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -365,20 +365,20 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Your organization owns this device and may monitor network traffic"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> owns this device and may monitor network traffic"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"This device belongs to your organization and is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="4137564460025113168">"This device belongs to your organization and is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the internet through <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"This device belongs to your organization"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"This device belongs to your organization and is connected to VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to VPNs"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="929181757984262902">"This device belongs to your organization and is connected to the internet through VPNs"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="3312645578322079185">"This device belongs to <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and is connected to the internet through VPNs"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Your organization may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Work profile network activity is visible to your IT admin"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Network may be monitored"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"This device is connected to VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"This device is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_vpns" msgid="3586175303518266301">"This device is connected to the internet through VPNs"</string> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="153393105176944100">"Your work apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="451254750289172191">"Your personal apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6191822916936028208">"This device is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"This device is provided by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Device management"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +394,10 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Your admin has turned on network logging, which monitors traffic on your device."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Your admin has turned on network logging, which monitors traffic in your work profile but not in your personal profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string> + <string name="monitoring_description_named_vpn" msgid="7502657784155456414">"This device is connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> + <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"This device is connected to the internet through <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your IT admin."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"Your work apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity in work apps, including emails and browsing data, is visible to your IT admin and VPN provider."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="5083909710727365452">"Your personal apps are connected to the internet through <xliff:g id="VPN_APP">%1$s</xliff:g>. Your network activity, including emails and browsing data, is visible to your VPN provider."</string> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Open VPN settings"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"This device is managed by your parent. Your parent can see and manage information such as the apps you use, your location, and your screen time."</string> @@ -843,6 +843,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Broadcast Name"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Save"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Starting…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Can’t broadcast"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Build number"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Build number copied to clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> @@ -911,11 +913,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Add tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Do not add tile"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Select user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is active</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"New information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Active apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Even if you’re not using these apps, they’re still active and might affect battery life"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stopped"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Done"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index ec3c79a562db..276f1890d4cc 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Tu organización es propietaria de este dispositivo y podría controlar el tráfico de red"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> es la organización propietaria de este dispositivo y podría controlar el tráfico de red"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertenece a tu organización y está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertenece a tu organización"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertenece a tu organización y está conectado a VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tu organización puede controlar el tráfico de red en tu perfil de trabajo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Es posible que <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> controle el tráfico de red en tu perfil de trabajo"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"El administrador de TI puede ver la actividad de red de tu perfil de trabajo"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Es posible que la red esté supervisada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Tu perfil personal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Administración del dispositivo"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Hay una autoridad de certificación instalada en este dispositivo. Es posible que se controle o modifique el tráfico de tu red segura."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Tu administrador activó el registro de red, que supervisa el tráfico en tu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"El administrador activó el registro de red, que supervisa el tráfico de tu perfil de trabajo, pero no el de tu perfil personal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Estás conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede controlar la actividad de tu red, incluidos los correos electrónicos, las apps y los sitios web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Estás conectado a <xliff:g id="VPN_APP_0">%1$s</xliff:g> y <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que pueden controlar tu actividad de red, incluidos los correos electrónicos, las apps y los sitios web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede controlar tu actividad de red, incluidos los correos electrónicos, las apps y los sitios web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Tu perfil personal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede controlar tu actividad de red, incluidos los correos electrónicos, las apps y los sitios web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir configuración de VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Tu padre o madre administra este dispositivo. Esa persona puede ver y administrar información, como las apps que usas, tu ubicación y el tiempo de uso."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nombre de transmisión"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Contraseña"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Guardar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Se copió el número de compilación en el portapapeles."</string> <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Agregar tarjeta"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"No agregar tarjeta"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Seleccionar usuario"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps están activas</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app está activa</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nueva información"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps activas"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Incluso aunque no uses estas apps, todavía están activas y podrían afectar la duración de batería"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Detener"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detenida"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Listo"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 98394056eefc..2abbcded555d 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -33,15 +33,15 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"No, gracias"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Girar pantalla automáticamente"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"¿Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"¿Quieres que <xliff:g id="APPLICATION">%1$s</xliff:g> pueda acceder a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsta aplicación no tiene permisos para grabar, pero podría captar audio a través de este dispositivo USB."</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"¿Quieres que <xliff:g id="APPLICATION">%1$s</xliff:g> pueda acceder a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsta aplicación no tiene permisos para grabar, pero podría capturar audio a través de este dispositivo USB."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"¿Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"¿Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para gestionar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esta aplicación no tiene permiso para grabar, pero podría registrar audio con este dispositivo USB. Si usas <xliff:g id="APPLICATION">%1$s</xliff:g> en este dispositivo, puede que no oigas llamadas, notificaciones ni alarmas."</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"¿Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esta aplicación no tiene permiso para grabar, pero podría capturar audio con este dispositivo USB. Si usas <xliff:g id="APPLICATION">%1$s</xliff:g> en este dispositivo, puede que no oigas llamadas, notificaciones ni alarmas."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Si usas <xliff:g id="APPLICATION">%1$s</xliff:g> en este dispositivo, puede que no oigas llamadas, notificaciones ni alarmas."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"¿Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"¿Quieres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"¿Quieres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para gestionar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsta aplicación no tiene permisos para grabar, pero puede capturar audio mediante este dispositivo USB."</string> - <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"¿Quieres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> + <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"¿Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para usar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"¿Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsta aplicación no tiene permisos para grabar, pero puede capturar audio mediante este dispositivo USB."</string> + <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"¿Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para usar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Ninguna aplicación instalada funciona con este accesorio USB. Más información: <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"Accesorio USB"</string> <string name="label_view" msgid="6815442985276363364">"Ver"</string> @@ -167,7 +167,7 @@ <string name="accessibility_not_connected" msgid="4061305616351042142">"No conectado"</string> <string name="data_connection_roaming" msgid="375650836665414797">"Roaming"</string> <string name="cell_data_off" msgid="4886198950247099526">"Desactivados"</string> - <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Modo avión"</string> + <string name="accessibility_airplane_mode" msgid="1899529214045998505">"Modo Avión"</string> <string name="accessibility_vpn_on" msgid="8037549696057288731">"La red VPN está activada."</string> <string name="accessibility_battery_level" msgid="5143715405241138822">"<xliff:g id="NUMBER">%d</xliff:g> por ciento de batería"</string> <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"Queda un <xliff:g id="PERCENTAGE">%1$s</xliff:g> por ciento de batería (<xliff:g id="TIME">%2$s</xliff:g> aproximadamente según tu uso)"</string> @@ -175,7 +175,7 @@ <string name="accessibility_overflow_action" msgid="8555835828182509104">"Ver todas las notificaciones"</string> <string name="accessibility_tty_enabled" msgid="1123180388823381118">"Teletipo habilitado"</string> <string name="accessibility_ringer_vibrate" msgid="6261841170896561364">"Modo vibración"</string> - <string name="accessibility_ringer_silent" msgid="8994620163934249882">"Modo silencio"</string> + <string name="accessibility_ringer_silent" msgid="8994620163934249882">"Modo Silencio"</string> <!-- no translation found for accessibility_casting (8708751252897282313) --> <skip /> <string name="accessibility_desc_notification_shade" msgid="5355229129428759989">"Pantalla de notificaciones"</string> @@ -284,7 +284,7 @@ <string name="quick_settings_screen_record_label" msgid="8650355346742003694">"Grabar pantalla"</string> <string name="quick_settings_screen_record_start" msgid="1574725369331638985">"Iniciar"</string> <string name="quick_settings_screen_record_stop" msgid="8087348522976412119">"Detener"</string> - <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo una mano"</string> + <string name="quick_settings_onehanded_label" msgid="2416537930246274991">"Modo Una mano"</string> <string name="sensor_privacy_start_use_mic_dialog_title" msgid="563796653825944944">"¿Desbloquear el micrófono del dispositivo?"</string> <string name="sensor_privacy_start_use_camera_dialog_title" msgid="8807639852654305227">"¿Desbloquear la cámara del dispositivo?"</string> <string name="sensor_privacy_start_use_mic_camera_dialog_title" msgid="4316471859905020023">"¿Desbloquear la cámara y el micrófono del dispositivo?"</string> @@ -334,8 +334,8 @@ <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Base de carga • En <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> terminará de cargar"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Cambiar de usuario"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Se eliminarán todas las aplicaciones y datos de esta sesión."</string> - <string name="guest_wipe_session_title" msgid="7147965814683990944">"Hola de nuevo, invitado"</string> - <string name="guest_wipe_session_message" msgid="3393823610257065457">"¿Quieres continuar con la sesión?"</string> + <string name="guest_wipe_session_title" msgid="7147965814683990944">"¡Hola de nuevo, invitado!"</string> + <string name="guest_wipe_session_message" msgid="3393823610257065457">"¿Quieres continuar con tu sesión?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Volver a empezar"</string> <string name="guest_wipe_session_dontwipe" msgid="3211052048269304205">"Sí, continuar"</string> <string name="user_limit_reached_title" msgid="2429229448830346057">"Has alcanzado el límite de usuarios"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"El dispositivo pertenece a tu organización, que puede monitorizar su tráfico de red"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"El dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, que puede monitorizar su tráfico de red"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Este dispositivo lo proporciona <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertenece a tu organización y está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertenece a tu organización"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertenece a tu organización y está conectado a varias VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a varias VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tu organización puede supervisar el tráfico de red de tu perfil de trabajo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> puede supervisar el tráfico de red de tu perfil de trabajo"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Tu administrador de TI puede ver la actividad de red del perfil de trabajo"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Puede que la red esté supervisada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a varias VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Tu perfil personal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Este dispositivo lo proporciona <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Administración de dispositivos"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Se ha instalado una entidad de certificación en este dispositivo. Es posible que se supervise o se modifique tu tráfico de red seguro."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"El administrador ha activado el registro de la red para supervisar el tráfico en tu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Tu administrador ha activado el registro de la red, por lo que se monitorizará el tráfico de tu perfil de trabajo, aunque no el de tu perfil personal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Te has conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede supervisar tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Te has conectado a <xliff:g id="VPN_APP_0">%1$s</xliff:g> y <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que pueden supervisar tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede supervisar tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Tu perfil personal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que puede supervisar tu actividad de red, como los correos electrónicos, las aplicaciones y los sitios web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir ajustes de VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Tu padre o madre gestionan este dispositivo y pueden ver y controlar cierta información, como las aplicaciones que utilizas, tu ubicación y tu tiempo de pantalla."</string> @@ -405,7 +417,7 @@ <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"Desbloqueado por TrustAgent"</string> <string name="zen_mode_and_condition" msgid="5043165189511223718">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="accessibility_volume_settings" msgid="1458961116951564784">"Ajustes de sonido"</string> - <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Transcripción instantánea"</string> + <string name="volume_odi_captions_tip" msgid="8825655463280990941">"Subtitular automáticamente"</string> <string name="accessibility_volume_close_odi_captions_tip" msgid="8924753283621160480">"Cerrar las recomendaciones de subtítulos"</string> <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"Superposición de subtítulos"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"activar"</string> @@ -450,9 +462,9 @@ <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"Las llamadas y las notificaciones sonarán (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Configurador de UI del sistema"</string> <string name="status_bar" msgid="4357390266055077437">"Barra de estado"</string> - <string name="demo_mode" msgid="263484519766901593">"Modo de demostración de UI del sistema"</string> - <string name="enable_demo_mode" msgid="3180345364745966431">"Habilitar modo demo"</string> - <string name="show_demo_mode" msgid="3677956462273059726">"Mostrar modo demo"</string> + <string name="demo_mode" msgid="263484519766901593">"Modo Demo de UI del sistema"</string> + <string name="enable_demo_mode" msgid="3180345364745966431">"Habilitar modo Demo"</string> + <string name="show_demo_mode" msgid="3677956462273059726">"Mostrar modo Demo"</string> <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Alarma"</string> <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> @@ -465,7 +477,7 @@ <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Ajustes de pantalla de bloqueo"</string> <string name="qr_code_scanner_title" msgid="5290201053875420785">"Escanear código QR"</string> <string name="status_bar_work" msgid="5238641949837091056">"Perfil de trabajo"</string> - <string name="status_bar_airplane" msgid="4848702508684541009">"Modo avión"</string> + <string name="status_bar_airplane" msgid="4848702508684541009">"Modo Avión"</string> <string name="zen_alarm_warning" msgid="7844303238486849503">"No oirás la próxima alarma (<xliff:g id="WHEN">%1$s</xliff:g>)"</string> <string name="alarm_template" msgid="2234991538018805736">"a las <xliff:g id="WHEN">%1$s</xliff:g>"</string> <string name="alarm_template_far" msgid="3561752195856839456">"<xliff:g id="WHEN">%1$s</xliff:g>"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioridad"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admite funciones de conversación"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Estas notificaciones no se pueden modificar."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Las notificaciones de llamada no se pueden modificar."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Este grupo de notificaciones no se puede configurar aquí"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificación mediante proxy"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Todas las notificaciones de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -581,7 +592,7 @@ <string name="keyboard_shortcut_group_applications_music" msgid="9032078456666204025">"Música"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="4229602992120154157">"Calendario"</string> <string name="volume_and_do_not_disturb" msgid="502044092739382832">"No molestar"</string> - <string name="volume_dnd_silent" msgid="4154597281458298093">"Combinación de teclas para los botones de volumen"</string> + <string name="volume_dnd_silent" msgid="4154597281458298093">"Acceso directo de los botones de volumen"</string> <string name="battery" msgid="769686279459897127">"Batería"</string> <string name="headset" msgid="4485892374984466437">"Auriculares"</string> <string name="accessibility_long_click_tile" msgid="210472753156768705">"Abrir ajustes"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nombre de emisión"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Contraseña"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Guardar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número de compilación copiado en el portapapeles."</string> <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> @@ -907,16 +922,18 @@ <string name="see_all_networks" msgid="3773666844913168122">"Ver todo"</string> <string name="to_switch_networks_disconnect_ethernet" msgid="6698111101156951955">"Para cambiar de red, desconecta el cable Ethernet"</string> <string name="wifi_scan_notify_message" msgid="3753839537448621794">"Para mejorar la experiencia con el dispositivo, las aplicaciones y los servicios podrán buscar redes Wi-Fi en cualquier momento, aunque la conexión Wi-Fi esté desactivada. Puedes cambiar esto en los ajustes de búsqueda de redes Wi-Fi. "<annotation id="link">"Cambiar"</annotation></string> - <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Desactivar modo avión"</string> + <string name="turn_off_airplane_mode" msgid="8425587763226548579">"Desactivar modo Avión"</string> <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> quiere añadir el siguiente recuadro a ajustes rápidos"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Añadir recuadro"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"No añadir recuadro"</string> - <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Seleccionar usuario"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Selecciona un usuario"</string> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplicaciones activas</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicación activa</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Información nueva"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicaciones activas"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Aunque no estés usando estas aplicaciones, siguen estando activas y pueden afectar a la duración de la batería"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Detener"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detenida"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Hecho"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 42842fca72e6..c66ca8fd49bb 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Teie organisatsioon on selle seadme omanik ja võib jälgida võrguliiklust"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> on selle seadme omanik ja võib jälgida võrguliiklust"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Selle seadme on andnud <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"See seade kuulub teie organisatsioonile ja on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"See seade kuulub organisatsioonile <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ja on ühendatud rakendusega <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"See seade kuulub teie organisatsioonile"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Selle seadme omanik on <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"See seade kuulub teie organisatsioonile ja on ühendatud VPN-idega"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"See seade kuulub organisatsioonile <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ja on ühendatud VPN-idega"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Teie organisatsioon võib jälgida teie tööprofiilil võrguliiklust"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> võib jälgida võrguliiklust teie tööprofiilil"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Tööprofiili võrgutegevused on teie IT-administraatorile nähtavad"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Võrku võidakse jälgida"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"See seade on ühendatud VPN-idega"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Teie tööprofiil on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Teie isiklik profiil on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"See seade on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Selle seadme on andnud <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Seadmehaldus"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Sertifikaadi volitus on sellesse seadmesse installitud. Teie turvalist võrguliiklust võidakse jälgida ja muuta."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Teie administraator lülitas sisse võrgu logimise funktsiooni, mis jälgib teie seadmes liiklust."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Teie administraator on sisse lülitanud võrgu logimise funktsiooni, mis jälgib liiklust teie võrguprofiilil, kuid mitte teie isiklikul profiilil."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Teil on ühendus rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>, mis saab jälgida teie võrgutegevusi, sh meile, rakendusi ja veebisaite."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Teil on ühendus rakendustega <xliff:g id="VPN_APP_0">%1$s</xliff:g> ja <xliff:g id="VPN_APP_1">%2$s</xliff:g>, mis saavad jälgida teie võrgutegevusi, sh meile, rakendusi ja veebisaite."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Teie tööprofiil on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>, mis saab jälgida teie võrgutegevusi, sh meile, rakendusi ja veebisaite."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Teie isiklik profiil on ühendatud rakendusega <xliff:g id="VPN_APP">%1$s</xliff:g>, mis saab jälgida teie võrgutegevusi, sh meile, rakendusi ja veebisaite."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN-i seadete avamine"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Seda seadet haldab sinu vanem. Sinu vanem näeb ja saab hallata teavet, näiteks kasutatavaid rakendusi, sinu asukohta ja ekraaniaega."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioriteetne"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ei toeta vestlusfunktsioone"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Neid märguandeid ei saa muuta."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Kõnemärguandeid ei saa muuta."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Seda märguannete rühma ei saa siin seadistada"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Puhvriga märguanne"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Kõik rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> märguanded"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Ülekande nimi"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Parool"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Salvesta"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Järgunumber"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Järgunumber kopeeriti lõikelauale."</string> <string name="basic_status" msgid="2315371112182658176">"Avage vestlus"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Lisa paan"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ära lisa paani"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Kasutaja valimine"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> rakendust on aktiivsed</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> rakendus on aktiivne</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Uus teave"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiivsed rakendused"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Isegi kui te neid rakendusi ei kasuta, on need siiski aktiivsed ja võivad mõjutada aku tööiga"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Peata"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Peatatud"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Valmis"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 53c3698697d7..d35bd8e7b073 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -278,7 +278,7 @@ <string name="quick_settings_dark_mode_secondary_label_until" msgid="2289774641256492437">"Desaktibatze-ordua: <xliff:g id="TIME">%s</xliff:g>"</string> <string name="quick_settings_dark_mode_secondary_label_on_at_bedtime" msgid="2274300599408864897">"Aktibatuta lo egiteko garaian"</string> <string name="quick_settings_dark_mode_secondary_label_until_bedtime_ends" msgid="1790772410777123685">"Lo egiteko garaia amaitzen den arte"</string> - <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFC"</string> + <string name="quick_settings_nfc_label" msgid="1054317416221168085">"NFCa"</string> <string name="quick_settings_nfc_off" msgid="3465000058515424663">"Desgaituta dago NFC"</string> <string name="quick_settings_nfc_on" msgid="1004976611203202230">"Gaituta dago NFC"</string> <string name="quick_settings_screen_record_label" msgid="8650355346742003694">"Pantaila-grabaketa"</string> @@ -313,7 +313,7 @@ <string name="keyguard_unlock_press" msgid="9140109453735019209">"Irekitzeko, sakatu desblokeatzeko ikonoa"</string> <string name="keyguard_face_successful_unlock_press" msgid="25520941264602588">"Aurpegiaren bidez desblokeatu da. Irekitzeko, sakatu desblokeatzeko ikonoa."</string> <string name="keyguard_retry" msgid="886802522584053523">"Berriro saiatzeko, pasatu hatza gora"</string> - <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Desblokea ezazu NFC erabiltzeko"</string> + <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Desblokea ezazu NFCa erabiltzeko"</string> <string name="do_disclosure_generic" msgid="4896482821974707167">"Gailu hau zure erakundearena da"</string> <string name="do_disclosure_with_name" msgid="2091641464065004091">"Gailu hau <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundearena da"</string> <string name="do_financed_disclosure_with_name" msgid="6723004643314467864">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak eman du gailu hau"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Gailu hau zure erakundearena da, eta baliteke hark sareko trafikoa gainbegiratzea"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Gailu hau <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> erakundearena da, eta baliteke sareko trafikoa gainbegiratzea"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak eman du gailu hau"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Gailu hau zure erakundearena da, eta <xliff:g id="VPN_APP">%1$s</xliff:g> sarera dago konektatuta"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Gailu hau <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> erakundearena da, eta <xliff:g id="VPN_APP">%2$s</xliff:g> sarera dago konektatuta"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Gailu hau zure erakundearena da"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Gailu hau <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> erakundearena da"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Gailu hau zure erakundearena da, eta VPN sareetara dago konektatuta"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Gailu hau <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> erakundearena da, eta VPN sareetara dago konektatuta"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Baliteke erakundeak laneko profileko sareko trafikoa gainbegiratzea"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Baliteke <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> erakundeak laneko profilaren sareko trafikoa gainbegiratzea"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IKT saileko administratzaileak laneko profilaren sareko jarduera ikus dezake"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Baliteke sarea gainbegiratuta egotea"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Gailu hau VPN sareetara dago konektatuta"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"<xliff:g id="VPN_APP">%1$s</xliff:g> sarera konektatuta daukazu laneko profila"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"<xliff:g id="VPN_APP">%1$s</xliff:g> sarera konektatuta daukazu profil pertsonala"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Gailu hau <xliff:g id="VPN_APP">%1$s</xliff:g> sarera dago konektatuta"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak eman du gailu hau"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gailuaren kudeaketa"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPNa"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Ziurtagiri-emaile bat dago instalatuta gailuan. Baliteke sareko trafiko segurua gainbegiratzea edo aldatzea."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratzaileak sarearen erregistroak aktibatu ditu; horrela, zure gailuko trafikoa gainbegira dezake."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratzaileak sarearen erregistroak aktibatu ditu; horrela, zure laneko profileko trafikoa gainbegira dezake, baina ez zure profil pertsonalekoa."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"<xliff:g id="VPN_APP">%1$s</xliff:g> aplikaziora konektatuta zaude eta hark sareko jarduerak gainbegira ditzake, mezu elektronikoak, aplikazioak eta webguneak barne."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> eta <xliff:g id="VPN_APP_1">%2$s</xliff:g> aplikazioetara konektatuta zaude, eta haiek sareko jarduerak gainbegira ditzakete, mezu elektronikoak, aplikazioak eta webguneak barne."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"<xliff:g id="VPN_APP">%1$s</xliff:g> aplikaziora dago konektatuta laneko profila, eta aplikazio horrek sareko jarduerak gainbegira ditzake, mezu elektronikoak, aplikazioak eta webguneak barne."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"<xliff:g id="VPN_APP">%1$s</xliff:g> aplikaziora konektatuta daukazu profil pertsonala, eta aplikazio horrek sareko jarduerak gainbegira ditzake, mezu elektronikoak, aplikazioak eta webguneak barne."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Ireki VPN ezarpenak"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Zure gurasoak kudeatzen du gailua. Zure gurasoak gailuko informazioa ikusi eta kudea dezake; besteak beste, zer aplikazio erabiltzen dituzun, zure kokapena zein den eta pantaila aurrean zenbat eta noiz egoten zaren."</string> @@ -424,7 +436,7 @@ <string name="screen_pinning_positive" msgid="3285785989665266984">"Ados"</string> <string name="screen_pinning_negative" msgid="6882816864569211666">"Ez, eskerrik asko"</string> <string name="screen_pinning_start" msgid="7483998671383371313">"Ainguratu da aplikazioa"</string> - <string name="screen_pinning_exit" msgid="4553787518387346893">"Kendu da aplikazioaren aingura"</string> + <string name="screen_pinning_exit" msgid="4553787518387346893">"Kendu zaio aingura aplikazioari"</string> <string name="stream_voice_call" msgid="7468348170702375660">"Deia"</string> <string name="stream_system" msgid="7663148785370565134">"Sistema"</string> <string name="stream_ring" msgid="7550670036738697526">"Jo tonua"</string> @@ -491,7 +503,7 @@ <string name="notification_alert_title" msgid="3656229781017543655">"Lehenetsia"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Automatikoa"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ez du tonurik jotzen edo dar-dar egiten"</string> - <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ez du tonurik jotzen edo dar-dar egiten, eta elkarrizketaren atalaren behealdean agertzen da"</string> + <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ez du tonurik jotzen edo dar-dar egiten, eta elkarrizketen atalaren behealdean agertzen da"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Tonua jo edo dar-dar egin dezake, telefonoaren ezarpenen arabera"</string> <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Tonua jo edo dar-dar egin dezake, telefonoaren ezarpenen arabera. Modu lehenetsian, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioko elkarrizketak burbuila gisa agertzen dira."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Ezarri sistemak zehaztu dezala jakinarazpen honek soinua edo dardara egin behar duen ala ez"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Lehentasuna"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak ez ditu onartzen elkarrizketetarako eginbideak"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Jakinarazpen horiek ezin dira aldatu."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Deien jakinarazpenak ezin dira aldatu."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Jakinarazpen talde hau ezin da konfiguratu hemen"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxy bidezko jakinarazpena"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren jakinarazpen guztiak"</string> @@ -836,7 +847,7 @@ <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Parekatu beste gailu batekin"</string> <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Saioa ireki nahi baduzu, ireki aplikazioa."</string> <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Aplikazio ezezaguna"</string> - <string name="media_output_dialog_button_stop_casting" msgid="6581379537930199189">"Utzi igortzeari"</string> + <string name="media_output_dialog_button_stop_casting" msgid="6581379537930199189">"Gelditu igorpena"</string> <string name="media_output_first_broadcast_title" msgid="6292237789860753022">"Nola funtzionatzen dute iragarpenek?"</string> <string name="media_output_broadcast" msgid="3555580945878071543">"Iragarri"</string> <string name="media_output_first_notify_broadcast_message" msgid="6353857724136398494">"Bluetooth bidezko gailu bateragarriak dituzten inguruko pertsonek iragartzen ari zaren multimedia-edukia entzun dezakete"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Iragarpenaren izena"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Pasahitza"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Gorde"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Konpilazio-zenbakia"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Kopiatu da konpilazio-zenbakia arbelean."</string> <string name="basic_status" msgid="2315371112182658176">"Elkarrizketa irekia"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Gehitu lauza"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ez gehitu lauza"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Hautatu erabiltzaile bat"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikazio aktibo daude</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikazio aktibo dago</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informazio berria"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktibo dauden aplikazioak"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Aplikazio horiek erabiltzen ari ez bazara ere, aktibo daude eta bateria kontsumitzen jarraitzen dute"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Gelditu"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Geldituta"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Eginda"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 38b1f9fcb8c4..ea2fb8b668ca 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4811759950673118541">"میانای کاربر سیستم"</string> + <string name="app_label" msgid="4811759950673118541">"واسط کاربری سیستم"</string> <string name="battery_low_title" msgid="5319680173344341779">"«بهینهسازی باتری» روشن شود؟"</string> <string name="battery_low_description" msgid="3282977755476423966">"<xliff:g id="PERCENTAGE">%s</xliff:g> از باتریتان باقی مانده است. «بهینهسازی باتری» زمینه تیره را روشن میکند، فعالیتهای پسزمینه را محدود میکند، و اعلانها را بهتأخیر میاندازد."</string> <string name="battery_low_intro" msgid="5148725009653088790">"«بهینهسازی باتری» زمینه «تیره» را روشن میکند، فعالیتهای پسزمینه را محدود میکند، و اعلانها را بهتأخیر میاندازد."</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"مالک این دستگاه سازمان شما است و ممکن است ترافیک شبکه را پایش کند"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"مالک این دستگاه <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> است و ممکن است ترافیک شبکه را پایش کند"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"این دستگاه را <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> تأمین شده است"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"این دستگاه به سازمان شما تعلق دارد و به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"این دستگاه به <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> تعلق دارد و به <xliff:g id="VPN_APP">%2$s</xliff:g> متصل است"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"این دستگاه به سازمان شما تعلق دارد"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"این دستگاه به <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> تعلق دارد"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"این دستگاه به سازمان شما تعلق دارد و به شبکههای VPN متصل است"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"این دستگاه به <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> تعلق دارد و به VPN متصل است"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ممکن است سازمان شما ترافیک شبکه را در نمایه کاریتان پایش کند"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ممکن است ترافیک شبکه را در نمایه کاری شما پایش کند"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"سرپرست سیستم میتواند فعالیت شبکه نمایه کاری را ببیند"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ممکن است شبکه پایش شود"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"این دستگاه به شبکههای VPN متصل است"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"نمایه کاری به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"نمایه شخصی شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"این دستگاه به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"این دستگاه را <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> تأمین کرده است"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"مدیریت دستگاه"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"مرجع گواهینامهای در این دستگاه نصب شده است. ممکن است ترافیک امن شبکه شما پایش یا تغییر داده شود."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"سرپرست سیستم شما گزارشگیری از شبکه را (که ترافیک دستگاه شما را پایش میکند) روشن کرده است."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"سرپرست شما گزارشگیری شبکه را که بر ترافیک نمایه کاریتان نظارت میکند، اما بر ترافیک نمایه شخصیتان نظارت نمیکند روشن کرده است."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شدهاید، که میتواند فعالیت شبکه شما را (ازجمله ایمیلها، برنامهها و وبسایتها) پایش کند."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"به <xliff:g id="VPN_APP_0">%1$s</xliff:g> و <xliff:g id="VPN_APP_1">%2$s</xliff:g> متصل شدهاید، که میتوانند فعالیت شما را در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) پایش کنند."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"نمایه کاری شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل است، که میتواند فعالیت شما در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) را پایش کند."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"نمایه شخصی شما به <xliff:g id="VPN_APP">%1$s</xliff:g> متصل شده است، که میتواند فعالیت شما در شبکه (ازجمله ایمیلها، برنامهها و وبسایتها) را پایش کند."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"باز کردن تنظیمات VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"این دستگاه را ولیتان مدیریت میکند. ولیتان میتواند اطلاعاتی مثل برنامههایی که استفاده میکنید، مکانتان، و مدت تماشای صفحهتان را ببیند و مدیریت کند."</string> @@ -448,9 +460,9 @@ <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"لرزش"</string> <string name="volume_dialog_title" msgid="6502703403483577940">"%s کنترلهای میزان صدا"</string> <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"تماسها و اعلانها زنگ میخورند (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> - <string name="system_ui_tuner" msgid="1471348823289954729">"تنظیمکننده میانای کاربری سیستم"</string> + <string name="system_ui_tuner" msgid="1471348823289954729">"تنظیمکننده واسط کاربری سیستم"</string> <string name="status_bar" msgid="4357390266055077437">"نوار وضعیت"</string> - <string name="demo_mode" msgid="263484519766901593">"حالت نمایشی میانای کاربر سیستم"</string> + <string name="demo_mode" msgid="263484519766901593">"حالت نمایشی واسط کاربری سیستم"</string> <string name="enable_demo_mode" msgid="3180345364745966431">"فعال کردن حالت نمایشی"</string> <string name="show_demo_mode" msgid="3677956462273059726">"نمایش حالت نمایشی"</string> <string name="status_bar_ethernet" msgid="5690979758988647484">"اترنت"</string> @@ -472,12 +484,12 @@ <string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"نقطه اتصال"</string> <string name="accessibility_managed_profile" msgid="4703836746209377356">"نمایه کاری"</string> <string name="tuner_warning_title" msgid="7721976098452135267">"برای بعضی افراد سرگرمکننده است اما نه برای همه"</string> - <string name="tuner_warning" msgid="1861736288458481650">"«تنظیمکننده میانای کاربری سیستم» روشهای بیشتری برای تنظیم دقیق و سفارشی کردن واسط کاربری Android در اختیار شما قرار میدهد. ممکن است این ویژگیهای آزمایشی تغییر کنند، خراب شوند یا در نسخههای آینده جود نداشته باشند. با احتیاط ادامه دهید."</string> + <string name="tuner_warning" msgid="1861736288458481650">"«تنظیمکننده واسط کاربری سیستم» روشهای بیشتری برای تنظیم دقیق و سفارشی کردن واسط کاربری Android در اختیار شما قرار میدهد. ممکن است این ویژگیهای آزمایشی تغییر کنند، خراب شوند یا در نسخههای آینده جود نداشته باشند. با احتیاط ادامه دهید."</string> <string name="tuner_persistent_warning" msgid="230466285569307806">"ممکن است این قابلیتهای آزمایشی تغییر کنند، خراب شوند یا در نسخههای آینده وجود نداشته باشد. بااحتیاط ادامه دهید."</string> <string name="got_it" msgid="477119182261892069">"متوجه شدم"</string> - <string name="tuner_toast" msgid="3812684836514766951">"تبریک میگوییم! «تنظیمکننده میانای کاربری سیستم» به «تنظیمات» اضافه شد"</string> + <string name="tuner_toast" msgid="3812684836514766951">"تبریک! «تنظیمکننده واسط کاربری سیستم» به «تنظیمات» اضافه شد"</string> <string name="remove_from_settings" msgid="633775561782209994">"حذف از تنظیمات"</string> - <string name="remove_from_settings_prompt" msgid="551565437265615426">"«تنظیمکننده میانای کاربری سیستم» از تنظیمات حذف شود و همه ویژگیهای آن متوقف شوند؟"</string> + <string name="remove_from_settings_prompt" msgid="551565437265615426">"«تنظیمکننده واسط کاربری سیستم» از «تنظیمات» حذف شود و استفاده از همه ویژگیهای آن متوقف شود؟"</string> <string name="enable_bluetooth_title" msgid="866883307336662596">"بلوتوث روشن شود؟"</string> <string name="enable_bluetooth_message" msgid="6740938333772779717">"برای مرتبط کردن صفحهکلید با رایانه لوحی، ابتدا باید بلوتوث را روشن کنید."</string> <string name="enable_bluetooth_confirmation_ok" msgid="2866408183324184876">"روشن کردن"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"نام همهفرستی"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"گذرواژه"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ذخیره کردن"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"شماره ساخت"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"شماره ساخت در بریدهدان کپی شد."</string> <string name="basic_status" msgid="2315371112182658176">"باز کردن مکالمه"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"کاشی اضافه شود"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"کاشی اضافه نشود"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"انتخاب کاربر"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> برنامه فعال است</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> برنامه فعال است</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"اطلاعات جدید"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"برنامههای فعال"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"حتی اگر از این برنامهها استفاده نمیکنید، این برنامهها همچنان فعال هستند و ممکن است بر عمر باتری تأثیر بگذارند"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"متوقف کردن"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"متوقف شده"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"تمام"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index c10bfcb7e362..698031f7f37e 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organisaatiosi omistaa laitteen ja voi valvoa verkkoliikennettä"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> omistaa laitteen ja voi valvoa verkkoliikennettä"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Tämän laitteen tarjoaa <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Organisaatiosi omistaa laitteen, joka on yhdistetty tähän: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> omistaa laitteen, joka on yhdistetty tähän: <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Organisaatiosi omistaa tämän laitteen"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> omistaa tämän laitteen"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Organisaatiosi omistaa tämän laitteen, joka on yhdistetty VPN:iin"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> omistaa tämän laitteen, joka on yhdistetty VPN:iin"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organisaatiosi voi valvoa työprofiilisi verkkoliikennettä."</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> voi valvoa työprofiilisi verkkoliikennettä."</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT-järjestelmänvalvoja näkee, mitä työprofiililla tehdään verkossa"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Verkkoa saatetaan valvoa"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Tämä laite on yhdistetty VPN:iin"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Työprofiilisi on yhdistetty tähän: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Henkilökohtainen profiilisi on yhdistetty tähän: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Laite on yhdistetty tähän: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Tämän laitteen tarjoaa <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Laitehallinta"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Laitteeseen on asennettu varmenteen myöntäjä. Suojattua verkkoliikennettäsi voidaan valvoa tai muuttaa."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Järjestelmänvalvoja on ottanut käyttöön verkkolokitietojen tallentamisen, joka valvoo laitteellasi tapahtuvaa liikennettä."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Järjestelmänvalvoja on ottanut käyttöön verkkolokitietojen tallentamisen. Sen avulla seurataan liikennettä työprofiilissasi mutta ei henkilökohtaisessa profiilissasi."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Olet yhteydessä sovellukseen <xliff:g id="VPN_APP">%1$s</xliff:g>, joka voi valvoa verkkotoimintaasi, esimerkiksi sähköposteja, sovelluksia ja verkkosivustoja."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Olet yhteydessä sovelluksiin <xliff:g id="VPN_APP_0">%1$s</xliff:g> ja <xliff:g id="VPN_APP_1">%2$s</xliff:g>, jotka voivat valvoa verkkotoimintaasi, esimerkiksi sähköposteja, sovelluksia ja verkkosivustoja."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Työprofiilisi on yhteydessä sovellukseen <xliff:g id="VPN_APP">%1$s</xliff:g>, joka voi valvoa toimintaasi verkossa, esimerkiksi sähköposteja, sovelluksia ja verkkosivustoja."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Henkilökohtainen profiilisi on yhteydessä sovellukseen <xliff:g id="VPN_APP">%1$s</xliff:g>, joka voi valvoa verkkotoimintaasi, esimerkiksi sähköposteja, sovelluksia ja verkkosivustoja."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Avaa VPN-asetukset"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Vanhempasi ylläpitää tätä laitetta. Vanhempasi voi nähdä ja ylläpitää tietoja, esim. käyttämiäsi sovelluksia, sijaintiasi ja käyttöaikaasi."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Lähetyksen nimi"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Salasana"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Tallenna"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Koontiversion numero"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Koontiversion numero kopioitu leikepöydälle"</string> <string name="basic_status" msgid="2315371112182658176">"Avaa keskustelu"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Lisää laatta"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Älä lisää laattaa"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Valitse käyttäjä"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> sovellusta on aktiivisia</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> sovellus on aktiivinen</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Uutta tietoa"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiiviset sovellukset"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Vaikka et käyttäisikään näitä sovelluksia, ne ovat silti aktiivisia ja saattavat vaikuttaa akunkestoon."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Lopeta"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Pysäytetty"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Valmis"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 75e48690c1c2..4058db797042 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Votre organisation possède cet appareil et peut contrôler le trafic réseau"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> possède cet appareil et peut contrôler le trafic réseau"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Cet appareil est fourni par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Cet appareil appartient à votre organisation et est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> et est connecté à <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Cet appareil appartient à votre organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Cet appareil appartient à votre organisation et est connecté à des RPV"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> et est connecté à des RPV"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Votre organisation peut contrôler le trafic réseau dans votre profil professionnel"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> peut contrôler votre trafic réseau dans votre profil professionnel"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Votre administrateur informatique a accès à l\'activité sur le réseau de votre profil professionnel"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Le réseau peut être surveillé"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Cet appareil est connecté à des RPV"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Votre profil professionnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Votre profil personnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Cet appareil est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Cet appareil est fourni par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestion d\'appareils"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"RPV"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Une autorité de certification est installée sur cet appareil. Votre trafic sur le réseau sécurisé peut être contrôlé ou modifié."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Votre administrateur a activé la journalisation réseau, qui surveille le trafic sur votre appareil."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Votre administrateur a activé la journalisation réseau, qui surveille le trafic dans votre profil professionnel, mais pas dans votre profil personnel."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Vous êtes connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité réseau, y compris les courriels, les applications et les sites Web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Vous êtes connecté à <xliff:g id="VPN_APP_0">%1$s</xliff:g> et à <xliff:g id="VPN_APP_1">%2$s</xliff:g>, qui peuvent contrôler votre activité sur le réseau, y compris l\'activité relative aux courriels, aux applications et aux sites Web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Votre profil professionnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité réseau, y compris les courriels, les applications et les sites Web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Votre profil professionnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité réseau, y compris les courriels, les applications et les sites Web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Ouvrir les paramètres RPV"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Cet appareil est géré par ton parent. Ton parent peut voir et gérer de l\'information, comme les applications que tu utilises, ta position et ton temps d\'utilisation des écrans."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioritaire"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge les fonctionnalités de conversation"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ces notifications ne peuvent pas être modifiées"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Les notifications d\'appel ne peuvent pas être modifiées."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ce groupe de notifications ne peut pas être configuré ici"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notification par mandataire"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Toutes les notifications de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nom de diffusion"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Mot de passe"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Enregistrer"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numéro de version"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Le numéro de version a été copié dans le presse-papiers."</string> <string name="basic_status" msgid="2315371112182658176">"Ouvrir la conversation"</string> @@ -911,12 +926,14 @@ <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> veut ajouter la tuile suivante au menu Paramètres rapides"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Ajouter la tuile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ne pas ajouter de tuile"</string> - <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Sélect. utilisateur"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Choisir utilisateur"</string> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> application est active</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> applications sont actives</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nouvelle information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Applications actives"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Même si vous n\'utilisez pas ces applications, elles sont toujours actives et peuvent réduire l\'autonomie de la pile"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Arrêter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Arrêtée"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"OK"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 8854de269557..6d29da65fbb0 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -313,7 +313,7 @@ <string name="keyguard_unlock_press" msgid="9140109453735019209">"Appuyez sur l\'icône de déverrouillage pour ouvrir"</string> <string name="keyguard_face_successful_unlock_press" msgid="25520941264602588">"Déverrouillé par visage. Appuyez sur icône déverrouillage pour ouvrir."</string> <string name="keyguard_retry" msgid="886802522584053523">"Balayez l\'écran vers le haut pour réessayer"</string> - <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Déverrouillez l\'écran pour pouvoir utiliser NFC"</string> + <string name="require_unlock_for_nfc" msgid="1305686454823018831">"Déverrouillez l\'écran pour pouvoir utiliser la NFC"</string> <string name="do_disclosure_generic" msgid="4896482821974707167">"Cet appareil appartient à votre organisation"</string> <string name="do_disclosure_with_name" msgid="2091641464065004091">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="do_financed_disclosure_with_name" msgid="6723004643314467864">"Cet appareil est fourni par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Cet appareil appartient à votre organisation, qui peut contrôler votre trafic réseau"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, qui peut contrôler votre trafic réseau"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Cet appareil est fourni par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Cet appareil appartient à votre organisation et il est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> et il est connecté à <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Cet appareil appartient à votre organisation"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Cet appareil appartient à votre organisation et il est connecté à des VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Cet appareil appartient à <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> et il est connecté à des VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Votre entreprise peut contrôler votre trafic réseau dans votre profil professionnel"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> peut contrôler votre trafic réseau dans votre profil professionnel"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Votre administrateur IT peut voir l\'activité sur le réseau de votre profil professionnel"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Il est possible que le réseau soit surveillé"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Cet appareil est connecté à des VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Votre profil professionnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Votre profil personnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Cet appareil est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Cet appareil est fourni par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestion des appareils"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Une autorité de certification est installée sur cet appareil. Votre trafic sur le réseau sécurisé peut être contrôlé ou modifié."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Votre administrateur a activé la journalisation du réseau, pour contrôler le trafic sur votre appareil."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Votre administrateur a activé la journalisation réseau, qui surveille le trafic de votre profil professionnel, mais pas celui de votre profil personnel."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Vous êtes connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité sur le réseau, y compris l\'activité relative aux e-mails, aux applications et aux sites Web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Vous êtes connecté à <xliff:g id="VPN_APP_0">%1$s</xliff:g> et à <xliff:g id="VPN_APP_1">%2$s</xliff:g>, qui peuvent contrôler votre activité sur le réseau, y compris l\'activité relative aux e-mails, aux applications et aux sites Web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Votre profil professionnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité sur le réseau, y compris l\'activité relative aux e-mails, aux applications et aux sites Web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Votre profil personnel est connecté à <xliff:g id="VPN_APP">%1$s</xliff:g>, qui peut contrôler votre activité sur le réseau, y compris l\'activité relative aux e-mails, aux applications et aux sites Web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Ouvrir les paramètres VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Cet appareil est géré par tes parents. Ils peuvent voir et gérer certaines informations, telles que les applications que tu utilises, ta position et ton temps d\'utilisation de l\'appareil."</string> @@ -490,8 +502,8 @@ <string name="notification_silence_title" msgid="8608090968400832335">"Silencieux"</string> <string name="notification_alert_title" msgid="3656229781017543655">"Par défaut"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Automatique"</string> - <string name="notification_channel_summary_low" msgid="4860617986908931158">"Aucun son ni vibration"</string> - <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Aucun son ni vibration, s\'affiche plus bas dans la section des conversations"</string> + <string name="notification_channel_summary_low" msgid="4860617986908931158">"Ni son, ni vibreur"</string> + <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Ni son, ni vibreur ; s\'affiche plus bas dans la section des conversations"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Son ou vibreur, selon les paramètres du téléphone"</string> <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Son ou vibreur, selon les paramètres du téléphone. Les conversations provenant de <xliff:g id="APP_NAME">%1$s</xliff:g> s\'affichent sous forme de bulles par défaut."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Laisser le système déterminer si cette notification doit être accompagnée d\'un son ou d\'une vibration"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nom de l\'annonce"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Mot de passe"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Enregistrer"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numéro de build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numéro de build copié dans le presse-papiers."</string> <string name="basic_status" msgid="2315371112182658176">"Conversation ouverte"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Ajouter le bloc"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ne pas ajouter bloc"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Choisir utilisateur"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> appli est active</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> applis sont actives</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nouvelles informations"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Applis actives"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Même si vous n\'utilisez pas ces applis, elles restent actives et peuvent affecter l\'autonomie de la batterie"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Arrêter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Arrêtée"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"OK"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index d56e2bad2cc7..4cbb06659801 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -33,14 +33,14 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"Non, grazas"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Xirar pantalla automaticamente"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Queres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Queres permitir que a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda ao dispositivo (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?\nEsta aplicación non está autorizada para realizar gravacións, pero pode capturar audio a través deste dispositivo USB."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Queres permitir que a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Queres abrir a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esta aplicación non está autorizada a realizar gravacións, pero pode capturar audio a través deste dispositivo USB. Ao usar a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> con este dispositivo, é posible que non se escoiten chamadas, notificacións nin alarmas."</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Queres permitir que a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda ao dispositivo (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?\nEsta aplicación non está autorizada para realizar gravacións, pero podería capturar audio a través deste dispositivo USB."</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para usar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esta aplicación non está autorizada a realizar gravacións, pero podería capturar audio a través deste dispositivo USB. Ao usar a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> con este dispositivo, é posible que non se escoiten chamadas, notificacións nin alarmas."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Ao usar a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> con este dispositivo, é posible que non se escoiten chamadas, notificacións nin alarmas."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Queres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Queres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Queres abrir a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> para xestionar o dispositivo (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?\nEsta aplicación non está autorizada a realizar gravacións, pero pode capturar audio a través deste dispositivo USB."</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Queres abrir a aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> para xestionar o dispositivo (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?\nEsta aplicación non está autorizada a realizar gravacións, pero podería capturar audio a través deste dispositivo USB."</string> <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Queres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Ningunha aplicación instalada funciona co accesorio USB. Máis información: <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"Accesorio USB"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"A túa organización é propietaria deste dispositivo e pode controlar o tráfico de rede"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> é a organización propietaria deste dispositivo e pode controlar o tráfico de rede"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertence á túa organización e está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertence a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertence á túa organización"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertence a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertence á túa organización e está conectado a varias VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertence a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a varias VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"A túa organización pode controlar o tráfico de rede do teu perfil de traballo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> pode controlar o tráfico de rede do teu perfil de traballo"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"O teu administrador de TI pode ver a actividade de rede do perfil de traballo"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"É posible que se controle a rede"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a varias VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"O teu perfil de traballo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"O teu perfil persoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> proporciona este dispositivo"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Xestión de dispositivos"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Este dispositivo ten unha autoridade de certificación instalada. É posible que se controle ou se modifique o teu tráfico de rede segura."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"O administrador activou o rexistro na rede, que controla o tráfico do teu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"O administrador activou o rexistro na rede, que supervisa o tráfico do teu perfil de traballo, pero non o do perfil persoal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Estás conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode controlar a túa actividade na rede, mesmo os correos electrónicos, as aplicacións e os sitios web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Estás conectado a <xliff:g id="VPN_APP_0">%1$s</xliff:g> e a <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que poden controlar a túa actividade na rede, mesmo os correos electrónicos, as aplicacións e os sitios web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"O teu perfil de traballo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode controlar a túa actividade na rede, mesmo os correos electrónicos, as aplicacións e os sitios web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"O teu perfil persoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode controlar a túa actividade na rede, mesmo os correos electrónicos, as aplicacións e os sitios web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir configuración da VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"O teu pai ou nai xestiona este dispositivo e pode ver e xestionar información como as aplicacións que usas, a túa localización e o tempo diante da pantalla."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nome da difusión"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Contrasinal"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Gardar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número de compilación"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Copiouse o número de compilación no portapapeis."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Engadir atallo"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Non engadir atallo"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Seleccionar usuario"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">Hai <xliff:g id="COUNT_1">%s</xliff:g> aplicacións activas</item> + <item quantity="one">Hai <xliff:g id="COUNT_0">%s</xliff:g> aplicación activa</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova información"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicacións activas"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Aínda que non as esteas utilizando, estas aplicacións seguen estando activas, o que podería afectarlle á duración da batería"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Deter"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Detida"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Feito"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 9981769b1ab4..379632ad64bf 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"તમારી સંસ્થા આ ડિવાઇસની માલિકી ધરાવે છે અને નેટવર્ક ટ્રાફિકનું નિરીક્ષણ કરી શકે છે"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ની માલિકીનું છે અને નેટવર્ક ટ્રાફિકનું નિરીક્ષણ કરી શકે છે"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા પ્રદાન કરવામાં આવેલું છે"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"આ ડિવાઇસ તમારી સંસ્થાની માલિકીનું છે અને <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલું છે"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ની માલિકીનું છે અને <xliff:g id="VPN_APP">%2$s</xliff:g>થી કનેક્ટ કરેલું છે"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"આ ડિવાઇસ તમારી સંસ્થાની માલિકીનું છે"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ની માલિકીનું છે"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"આ ડિવાઇસ તમારી સંસ્થાની માલિકીનું છે અને VPNsથી કનેક્ટ કરેલું છે"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ની માલિકીનું છે અને VPNsથી કનેક્ટ કરેલું છે"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"તમારી સંસ્થા તમારી કાર્ય પ્રોફાઇલમાં નેટવર્ક ટ્રાફિકનું નિયમન કરી શકે છે"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> તમારી કાર્ય પ્રોફાઇલમાં નેટવર્ક ટ્રાફિકનું નિયમન કરી શકે છે"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ઑફિસ માટેની ઍપની નેટવર્ક પ્રવૃત્તિને તમારા IT વ્યવસ્થાપક જોઈ શકે છે"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"નેટવર્કનું નિયમન કરવામાં આવી શકે છે"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"આ ડિવાઇસ VPNsથી કનેક્ટ કરેલું છે"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"તમારી ઑફિસની પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલી છે"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"તમારી વ્યક્તિગત પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલી છે"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"આ ડિવાઇસ <xliff:g id="VPN_APP">%1$s</xliff:g>થી કનેક્ટ કરેલું છે"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"આ ડિવાઇસ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા પ્રદાન કરવામાં આવેલું છે"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ડિવાઇસ મેનેજમેન્ટ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"આ ઉપકરણ પર પ્રમાણપત્ર સત્તાધિકારી ઇન્સ્ટૉલ કરેલ છે. તમારા સુરક્ષિત નેટવર્ક ટ્રાફિકનું નિયમન થઈ શકે છે અથવા તેમાં ફેરફાર કરવામાં આવી શકે છે."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગિંગ ચાલુ કર્યું છે, જે તમારા ઉપકરણ પર નેટવર્ક ટ્રાફિકનું નિયમન કરે છે."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગ ઇન ચાલુ કર્યું છે, જે તમારી વ્યક્તિગત પ્રોફાઇલમાં નહીં, પરંતુ ઑફિસની પ્રોફાઇલમાં ટ્રાફિકનું નિરીક્ષણ કરે છે."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"તમે <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ થયાં છો, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટ સહિત તમારી નેટવર્ક પ્રવૃત્તિનું નિરીક્ષણ કરી શકે છે."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"તમે <xliff:g id="VPN_APP_0">%1$s</xliff:g> અને <xliff:g id="VPN_APP_1">%2$s</xliff:g> સાથે કનેક્ટ થયાં છો, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટ સહિત તમારી નેટવર્ક પ્રવૃત્તિનું નિરીક્ષણ કરી શકે છે."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"તમારી કાર્યાલયની પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ કરેલ છે, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટો સહિતની તમારી નેટવર્ક પ્રવૃત્તિનું નિયમન કરી શકે છે."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"તમારી વ્યક્તિગત પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ કરેલ છે, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટો સહિતની તમારી નેટવર્ક પ્રવૃત્તિનું નિયમન કરી શકે છે."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN સેટિંગ ખોલો"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"આ ડિવાઇસ તમારા માતાપિતા દ્વારા મેનેજ કરવામાં આવે છે. તમે જેનો ઉપયોગ કરો છો તે ઍપ, તમારું સ્થાન અને તમારા સ્ક્રીન સમય જેવી માહિતીને તમારા માતાપિતા જોઈ અને મેનેજ કરી શકે છે."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"પ્રાધાન્યતા"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> વાતચીતની સુવિધાઓને સપોર્ટ આપતી નથી"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"આ નોટિફિકેશનમાં કોઈ ફેરફાર થઈ શકશે નહીં."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"કૉલના નોટિફિકેશનમાં કોઈ ફેરફાર કરી શકાતો નથી."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"નોટિફિકેશનના આ ગ્રૂપની ગોઠવણી અહીં કરી શકાશે નહીં"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"પ્રૉક્સી નોટિફિકેશન"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g>ના બધા નોટિફિકેશન"</string> @@ -807,8 +818,7 @@ <string name="controls_media_button_pause" msgid="8614887780950376258">"થોભાવો"</string> <string name="controls_media_button_prev" msgid="8126822360056482970">"પહેલાનો ટ્રૅક"</string> <string name="controls_media_button_next" msgid="6662636627525947610">"આગલો ટ્રૅક"</string> - <!-- no translation found for controls_media_button_connecting (3138354625847598095) --> - <skip /> + <string name="controls_media_button_connecting" msgid="3138354625847598095">"કનેક્ટ કરી રહ્યાં છીએ"</string> <string name="controls_media_smartspace_rec_title" msgid="1699818353932537407">"ચલાવો"</string> <string name="controls_media_smartspace_rec_description" msgid="4136242327044070732">"<xliff:g id="APP_LABEL">%1$s</xliff:g> ખોલો"</string> <string name="controls_media_smartspace_rec_item_description" msgid="2189271793070870883">"<xliff:g id="APP_LABEL">%3$s</xliff:g> પર <xliff:g id="ARTIST_NAME">%2$s</xliff:g>નું <xliff:g id="SONG_NAME">%1$s</xliff:g> ગીત ચલાવો"</string> @@ -845,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"બ્રોડકાસ્ટનું નામ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"પાસવર્ડ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"સાચવો"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"શરૂ થઈ રહ્યું છે…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"બ્રોડકાસ્ટ કરી શકતા નથી"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"બિલ્ડ નંબર"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"બિલ્ડ નંબર ક્લિપબૉર્ડ પર કૉપિ કર્યો."</string> <string name="basic_status" msgid="2315371112182658176">"વાતચીત ખોલો"</string> @@ -913,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ટાઇલ ઉમેરો"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ટાઇલ ઉમેરશો નહીં"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"વપરાશકર્તા પસંદ કરો"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ઍપ સક્રિય છે</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ઍપ સક્રિય છે</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"નવી માહિતી"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"સક્રિય ઍપ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ભલે તમે આ બધી ઍપનો ઉપયોગ ન કરી રહ્યાં હો, તેમ છતાં તે સક્રિય રહે છે અને તેને કારણે બૅટરી આવરદા પર અસર થઈ શકે છે"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"રોકો"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"બંધ કરેલી છે"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"થઈ ગયું"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 416e0c400ce0..f1ea573e7e96 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_DEVICE">%2$s</xliff:g> के ऐक्सेस की अनुमति दें?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"आप <xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_DEVICE">%2$s</xliff:g> ऐक्सेस करने की अनुमति देना चाहते हैं?\nइस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऑडियो कैप्चर कर सकता है."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"क्या <xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_DEVICE">%2$s</xliff:g> का ऐक्सेस देना है?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"क्या <xliff:g id="USB_DEVICE">%2$s</xliff:g> का इस्तेमाल करने के लिए <xliff:g id="APPLICATION">%1$s</xliff:g> को खोलना है?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> का इस्तेमाल करने के लिए <xliff:g id="APPLICATION">%1$s</xliff:g> खोलना है?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"इस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऑडियो रिकॉर्ड कर सकता है. <xliff:g id="APPLICATION">%1$s</xliff:g> का इस्तेमाल इस डिवाइस के साथ करने पर, हो सकता है कि कॉल, सूचनाएं, और अलार्म की आवाज़ सुनाई न दे."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"<xliff:g id="APPLICATION">%1$s</xliff:g> का इस्तेमाल इस डिवाइस के साथ करने पर, हो सकता है कि कॉल, सूचनाएं, और अलार्म की आवाज़ सुनाई न दे."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> के ऐक्सेस की अनुमति दें?"</string> @@ -333,7 +333,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • धीरे चार्ज हो रहा है • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> में पूरा चार्ज हो जाएगा"</string> <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • डॉक पर चार्ज हो रहा है • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> में पूरा चार्ज हो जाएगा"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"उपयोगकर्ता बदलें"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"इस सत्र के सभी ऐप्लिकेशन और डेटा को हटा दिया जाएगा."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"इस सेशन के सभी ऐप्लिकेशन और डेटा को हटा दिया जाएगा."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"मेहमान, आपका फिर से स्वागत है!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"क्या आप अपना सत्र जारी रखना चाहते हैं?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"फिर से शुरू करें"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"इस डिवाइस का मालिकाना हक आपके संगठन के पास है. आपका संगठन, नेटवर्क के ट्रैफ़िक की निगरानी कर सकता है"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"इस डिवाइस का मालिकाना हक <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> के पास है. आपका संगठन, नेटवर्क के ट्रैफ़िक की निगरानी कर सकता है"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"यह डिवाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने दिया है"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"इस डिवाइस का मालिकाना हक आपके संगठन के पास है. इस डिवाइस को <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट किया गया है"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"इस डिवाइस का मालिकाना हक <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> के पास है. इस डिवाइस को <xliff:g id="VPN_APP">%2$s</xliff:g> से कनेक्ट किया गया है"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"इस डिवाइस का मालिकाना हक आपके संगठन के पास है"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"इस डिवाइस का मालिकाना हक <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> के पास है"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"इस डिवाइस का मालिकाना हक आपके संगठन के पास है. इस डिवाइस को वीपीएन से कनेक्ट किया गया है"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"इस डिवाइस का मालिकाना हक <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> के पास है. इस डिवाइस को वीपीएन से कनेक्ट किया गया है"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"आपका संगठन आपकी वर्क प्रोफ़ाइल में नेटवर्क ट्रैफ़िक की निगरानी कर सकता है"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> आपकी वर्क प्रोफ़ाइल में नेटवर्क ट्रैफ़िक की निगरानी कर सकता है"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"आईटी एडमिन आपकी वर्क प्रोफ़ाइल के नेटवर्क से जुड़ी गतिविधि देख सकता है"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"नेटवर्क की निगरानी की जा सकती है"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"इस डिवाइस को वीपीएन से कनेक्ट किया गया है"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"आपकी वर्क प्रोफ़ाइल <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट की गई है"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"आपकी निजी प्रोफ़ाइल <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट की गई है"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"इस डिवाइस को <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट किया गया है"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"यह डिवाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने दिया है"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"डिवाइस मैनेजमेंट"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"वीपीएन"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"इस डिवाइस पर एक प्रमाणपत्र अनुमति इंस्टॉल की है. आपके सुरक्षित नेटवर्क ट्रैफ़िक की निगरानी या उसमें बदलाव किया जा सकता है."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"आपके व्यवस्थापक ने नेटवर्क लॉगिंग चालू किया है, जो आपके डिवाइस पर ट्रैफ़िक की निगरानी करता है."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"आपके एडमिन ने नेटवर्क लॉगिंग की सुविधा चालू कर दी है. इससे आपकी वर्क प्रोफ़ाइल पर आने वाले ट्रैफ़िक की निगरानी की जाती है. हालांकि, इससे आपकी निजी प्रोफ़ाइल की निगरानी नहीं की जाती."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"आप <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट हैं, जो ईमेल, ऐप्लिकेशन और वेबसाइटों सहित आपकी नेटवर्क गतिविधि की निगरानी कर सकते हैं."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"आप <xliff:g id="VPN_APP_0">%1$s</xliff:g> और <xliff:g id="VPN_APP_1">%2$s</xliff:g> से कनेक्ट हैं, जो ईमेल, ऐप्लिकेशन और वेबसाइटों सहित आपकी नेटवर्क गतिविधि की निगरानी कर सकते हैं."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"आपकी वर्क प्रोफ़ाइल <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट है, जो ईमेल, ऐप्लिकेशन और वेबसाइटों सहित आपकी नेटवर्क गतिविधि की निगरानी कर सकता है."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"आपकी व्यक्तिगत प्रोफ़ाइल <xliff:g id="VPN_APP">%1$s</xliff:g> से कनेक्ट है, जो ईमेल, ऐप्लिकेशन और वेबसाइटों सहित आपकी नेटवर्क गतिविधि की निगरानी कर सकता है."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN सेटिंग खोलें"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"इस डिवाइस का प्रबंधन आपके अभिभावक करते हैं. अभिभावक आपके डिवाइस से जुड़ी जानकारी देख सकते हैं. साथ ही, इसे प्रबंधित कर सकते हैं. इनमें आपके इस्तेमाल किए गए ऐप्लिकेशन, जगह की जानकारी, और डिवाइस के इस्तेमाल में बिताए गए समय जैसी जानकारी शामिल है."</string> @@ -413,7 +425,7 @@ <string name="screen_pinning_title" msgid="9058007390337841305">"ऐप्लिकेशन पिन किया गया है"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"इससे वह तब तक दिखता रहता है, जब तक कि आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, \'वापस जाएं\' और \'खास जानकारी\' को दबाकर रखें."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"इससे वह तब तक दिखाई देती है जब तक आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, होम और वापस जाएं वाले बटन को दबाकर रखें."</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"इससे ऐप्लिकेशन की स्क्रीन तब तक दिखाई देती है, जब तक आप उसे अनपिन नहीं करते. अनपिन करने के लिए ऊपर स्वाइप करें और स्क्रीन दबाकर रखें."</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"इससे ऐप्लिकेशन की स्क्रीन तब तक दिखती है, जब तक उसे अनपिन नहीं किया जाता. अनपिन करने के लिए ऊपर स्वाइप करें और स्क्रीन दबाकर रखें."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"इससे वह तब तक दिखता रहता है जब तक कि आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, \'खास जानकारी\' को दबाकर रखें."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"इससे वह तब तक दिखाई देती है जब तक आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए, होम बटन को दबाकर रखें."</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"निजी डेटा ऐक्सेस किया जा सकता है, जैसे कि संपर्क और ईमेल का कॉन्टेंट."</string> @@ -502,12 +514,11 @@ <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"यह कई तरीकों से दिखती है, जैसे कि लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर और बातचीत वाली सूचनाओं में सबसे ऊपर"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"यह कई तरीकों से दिखती है, जैसे कि बातचीत वाली सूचनाओं में सबसे ऊपर, बबल के तौर पर, और लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर"</string> <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"यह कई तरीकों से दिखती है, जैसे कि लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर और बातचीत वाली सूचनाओं में सबसे ऊपर. साथ ही, इसकी वजह से, \'परेशान न करें\' सुविधा में भी रुकावट आती है"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"यह कई तरीकों से दिखती है, जैसे कि बातचीत वाली सूचनाओं में सबसे ऊपर, बबल के तौर पर, और लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर. साथ ही, इसकी वजह से, \'परेशान न करें\' सुविधा में भी रुकावट आती है"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"यह कई तरीकों से दिखती है, जैसे कि बातचीत वाली सूचनाओं में सबसे ऊपर, बबल के तौर पर, और लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो के तौर पर. साथ ही, यह \'परेशान न करें\' मोड को बायपास कर सकती है"</string> <string name="notification_priority_title" msgid="2079708866333537093">"प्राथमिकता"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> पर बातचीत की सुविधाएं काम नहीं करतीं"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ये सूचनाएं नहीं बदली जा सकती हैं."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"कॉल से जुड़ी सूचनाओं को ब्लॉक नहीं किया जा सकता."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"सूचनाओं के इस समूह को यहां कॉन्फ़िगर नहीं किया जा सकता"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रॉक्सी सूचना"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"सभी <xliff:g id="APP_NAME">%1$s</xliff:g> सूचनाएं"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ब्रॉडकास्ट का नाम"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"पासवर्ड"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"सेव करें"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नंबर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नंबर को क्लिपबोर्ड पर कॉपी किया गया."</string> <string name="basic_status" msgid="2315371112182658176">"ऐसी बातचीत जिसमें इंटरैक्शन डेटा मौजूद नहीं है"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"टाइल जोड़ें"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"टाइल न जोड़ें"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"उपयोगकर्ता चुनें"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ऐप्लिकेशन चालू है</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ऐप्लिकेशन चालू हैं</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"नई जानकारी"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ये ऐप्लिकेशन चालू हैं"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"अगर इन ऐप्लिकेशन का इस्तेमाल नहीं किया जा रहा है, तो भी वे चालू रहते हैं और हो सकता है कि इनसे डिवाइस की बैटरी लाइफ़ पर असर पड़े"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"बंद करें"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"बंद है"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"हो गया"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 66613d408711..cac79b0be578 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -335,7 +335,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • sporo punjenje • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napunjenosti"</string> <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Priključna stanica za punjenje • <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> do napunjenosti"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Promjena korisnika"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Sve aplikacije i podaci u ovoj sesiji bit će izbrisani."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Izbrisat će se sve aplikacije i podaci u ovoj sesiji."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Dobro došli natrag, gostu!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Želite li nastaviti sesiju?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Počni ispočetka"</string> @@ -351,8 +351,8 @@ <string name="user_remove_user_remove" msgid="8387386066949061256">"Ukloni"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"Aplikacija <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> imat će pristup svim podacima koji su vidljivi na vašem zaslonu ili koji se reproduciraju s vašeg uređaja tijekom snimanja ili emitiranja. To uključuje podatke kao što su zaporke, podaci o plaćanju, fotografije, poruke i audiozapisi koje reproducirate."</string> <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Usluga koja pruža ovu funkcionalnost imat će pristup svim podacima koji su vidljivi na vašem zaslonu ili koji se reproduciraju s vašeg uređaja tijekom snimanja ili emitiranja. To uključuje podatke kao što su zaporke, podaci o plaćanju, fotografije, poruke i audiozapisi koje reproducirate."</string> - <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Započeti snimanje ili emitiranje?"</string> - <string name="media_projection_dialog_title" msgid="3316063622495360646">"Započeti snimanje ili emitiranje pomoću aplikacije <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> + <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Želite li započeti snimanje ili emitiranje?"</string> + <string name="media_projection_dialog_title" msgid="3316063622495360646">"Želite li započeti snimanje ili emitiranje pomoću aplikacije <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>?"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"Izbriši sve"</string> <string name="manage_notifications_text" msgid="6885645344647733116">"Upravljajte"</string> <string name="manage_notifications_history_text" msgid="57055985396576230">"Povijest"</string> @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Vaša je organizacija vlasnik ovog uređaja i može nadzirati mrežni promet"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Organizacija <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> vlasnik je ovog uređaja i može nadzirati mrežni promet"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Ovaj uređaj pruža organizacija <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Ovaj uređaj pripada vašoj organizaciji i povezan je s mrežom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je s mrežom <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Ovaj uređaj pripada vašoj organizaciji"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Ovaj uređaj pripada vašoj organizaciji i povezan je s VPN-ovima"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Ovaj uređaj pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i povezan je s VPN-ovima"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Vaša organizacija može nadzirati mrežni promet na vašem radnom profilu"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Organizacija <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> može nadzirati mrežni promet na vašem radnom profilu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Mrežna aktivnost poslovnog profila vidljiva je vašem IT administratoru"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Mreža se možda nadzire"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Ovaj je uređaj povezan s VPN-ovima"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Vaš poslovni profil povezan je s mrežom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Vaš osobni profil povezan je s mrežom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Ovaj uređaj povezan je s mrežom <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Ovaj uređaj pruža <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Upravljanje uređajem"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Na ovom je uređaju instaliran izdavač certifikata. Vaš sigurni mrežni promet možda se nadzire ili modificira."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrator je uključio mrežni zapisnik koji nadzire promet na vašem uređaju."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrator je uključio mrežni zapisnik koji prati promet na vašem poslovnom profilu, ali ne i na osobnom profilu."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Povezani ste s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g> koja može nadzirati vašu aktivnost na mreži, uključujući e-poštu, aplikacije i web-lokacije."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Povezani ste s aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g> koje mogu nadzirati vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web-lokacije."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Vaš je poslovni profil povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g> koja može nadzirati vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web-lokacije."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Vaš je osobni profil povezan s aplikacijom <xliff:g id="VPN_APP">%1$s</xliff:g> koja može nadzirati vašu aktivnost na mreži, uključujući e-poruke, aplikacije i web-lokacije."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otvorite postavke VPN-a"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Ovim uređajem upravlja tvoj roditelj. Tvoj roditelj može vidjeti podatke kao što su aplikacije kojima se koristiš, lokaciju i vrijeme upotrebe te upravljati njima."</string> @@ -571,7 +583,7 @@ <string name="notif_inline_reply_remove_attachment_description" msgid="7954075334095405429">"Ukloni privitak"</string> <string name="keyboard_shortcut_group_system" msgid="1583416273777875970">"Sustav"</string> <string name="keyboard_shortcut_group_system_home" msgid="7465138628692109907">"Početni zaslon"</string> - <string name="keyboard_shortcut_group_system_recents" msgid="8628108256824616927">"Najnovije"</string> + <string name="keyboard_shortcut_group_system_recents" msgid="8628108256824616927">"Nedavno"</string> <string name="keyboard_shortcut_group_system_back" msgid="1055709713218453863">"Natrag"</string> <string name="keyboard_shortcut_group_system_notifications" msgid="3615971650562485878">"Obavijesti"</string> <string name="keyboard_shortcut_group_system_shortcuts_helper" msgid="4856808328618265589">"Tipkovni prečaci"</string> @@ -849,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Naziv emitiranja"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Zaporka"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Spremi"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Broj međuverzije"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Broj međuverzije kopiran je u međuspremnik."</string> <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> @@ -917,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Dodaj pločicu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nemoj dodati pločicu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Odabir korisnika"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivna</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikacije su aktivne</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivno</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Čak i ako ne korististite te aplikacije, one su i dalje aktivne i mogu utjecati na trajanje baterije"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zaustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zaustavljeno"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gotovo"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 89693de7b5ff..dcb0db194fe2 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -34,7 +34,7 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Képernyő automatikus forgatása"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Engedélyezi a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> számára, hogy hozzáférjen a következőhöz: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Lehetővé teszi a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazásnak, hogy hozzáférjen a következőhöz: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEz az alkalmazás nem rendelkezik rögzítési engedéllyel, de ezzel az USB-eszközzel képes a hangfelvételre."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> hozzáférhet ehhez: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"A(z) <xliff:g id="APPLICATION">%1$s</xliff:g> hozzáférhet ehhez: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Megnyitja a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> appot a(z) <xliff:g id="USB_DEVICE">%2$s</xliff:g> kezeléséhez?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Ez az alkalmazás nem rendelkezik rögzítési engedéllyel, de ezzel az USB-eszközzel képes a hangfelvételre. Ha a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazást használja ezzel az eszközzel, előfordulhat, hogy nem hallja meg a hívásokat, értesítéseket és riasztásokat."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Ha a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazást használja ezzel az eszközzel, előfordulhat, hogy nem hallja meg a hívásokat, értesítéseket és riasztásokat."</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Az eszköz az Ön szervezetének tulajdonában van, és lehetséges, hogy a hálózati forgalmat is figyelik"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Az eszköz a(z) <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tulajdonában van, és lehetséges, hogy a hálózati forgalmat is figyelik"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Ezt az eszközt a(z) <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> szervezet biztosítja"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Ez az eszköz az Ön szervezetének tulajdonában van, és össze van kapcsolva a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazással"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Ez az eszköz a(z) <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tulajdonában van, és össze van kapcsolva a(z) <xliff:g id="VPN_APP">%2$s</xliff:g> alkalmazással"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Ez az eszköz az Ön szervezetének tulajdonában van"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Ez az eszköz a(z) <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tulajdonában van"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Ez az eszköz az Ön szervezetének tulajdonában van, és VPN-ekhez van csatlakoztatva"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Ez az eszköz a(z) <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tulajdonában van, és VPN-ekhez van csatlakoztatva"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Szervezete figyelheti a munkaprofil hálózati forgalmát"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"A(z) <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> figyelheti a munkaprofil hálózati forgalmát"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Munkaprofilja hálózati tevékenységét láthatja a rendszergazdája"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Elképzelhető, hogy a hálózatot figyelik"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Ez az eszköz VPN-ekhez van csatlakoztatva"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Munkaprofilja össze van kapcsolva a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazással"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Személyes profilja össze van kapcsolva a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazással"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Ez az eszköz össze van kapcsolva a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazással"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Ezt az eszközt a(z) <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> szervezet biztosítja"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Eszközkezelés"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Az eszközre tanúsítványkibocsátó van telepítve. Ezáltal figyelhetik és befolyásolhatják az Ön biztonságos hálózati forgalmát."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"A rendszergazda bekapcsolta az eszköz forgalmát figyelő hálózati naplózást."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"A rendszergazda bekapcsolta a hálózati naplózást, amely a munkaprofilban figyeli a forgalmat, a személyes profilban azonban nem."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Ön kapcsolódik a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazáshoz, amely figyelheti hálózati tevékenységét, beleértve a levelezést, valamint az alkalmazás- és webhelyhasználatot."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Ön csatlakozik a(z) <xliff:g id="VPN_APP_0">%1$s</xliff:g> és a(z) <xliff:g id="VPN_APP_1">%2$s</xliff:g> alkalmazásokhoz, amelyek figyelhetik hálózati tevékenységét, beleértve a levelezést, valamint az alkalmazás- és webhelyhasználatot."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Munkaprofilja csatlakozik a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazáshoz, amely figyelheti hálózati tevékenységét, beleértve a levelezést, az alkalmazásokat és a webhelyeket."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Az Ön személyes profilja csatlakozik a(z) <xliff:g id="VPN_APP">%1$s</xliff:g> alkalmazáshoz, amely figyelheti hálózati tevékenységeit, beleértve a levelezést, az alkalmazásokat és a webhelyeket."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN-beállítások megnyitása"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Az eszközt a szülőd felügyeli. A szülőd megtekintheti és kezelheti például a használt alkalmazásokra, a tartózkodási helyre és a képernyőidőre vonatkozó adatokat."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Közvetítés neve"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Jelszó"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Mentés"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Buildszám"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Buildszám a vágólapra másolva."</string> <string name="basic_status" msgid="2315371112182658176">"Beszélgetés megnyitása"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Mozaik hozzáadása"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ne legyen hozzáadva"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Felhasználóválasztás"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> alkalmazás aktív</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> alkalmazás aktív</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Új információ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktív alkalmazások"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Még ha nem is használja ezeket az alkalmazásokat, továbbra is aktívak maradnak, és hatással lehetnek az akkumulátor élettartamára"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Leállítás"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Leállítva"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Kész"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index e21f8e0f044f..6dc481c4c177 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -333,7 +333,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Դանդաղ լիցքավորում • Մնացել է <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Լիցքավորում դոկ-կայանի միջոցով • Մնացել է <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Անջատել օգտվողին"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Այս աշխատաշրջանի բոլոր ծրագրերն ու տվյալները կջնջվեն:"</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Այս աշխատաշրջանի բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Բարի վերադարձ, հյուր"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Շարունակե՞լ աշխատաշրջանը։"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Վերսկսել"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Ձեր կազմակերպությունը այս սարքի սեփականատերն է և կարող է վերահսկել ցանցային թրաֆիկը"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"«<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>» կազմակերպությունը այս սարքի սեփականատերն է և կարող է վերահսկել ցանցային թրաֆիկը"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Այս սարքը տրամադրվել է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպության կողմից"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Այս սարքը պատկանում է ձեր կազմակերպությանը և միացված է <xliff:g id="VPN_APP">%1$s</xliff:g> ցանցին"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Այս սարքը պատկանում է «<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>» կազմակերպությանը և միացված է <xliff:g id="VPN_APP">%2$s</xliff:g> ցանցին"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Այս սարքը պատկանում է ձեր կազմակերպությանը"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Այս սարքը պատկանում է «<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>» կազմակերպությանը"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Այս սարքը պատկանում է ձեր կազմակերպությանը և միացված է վիրտուալ մասնավոր ցանցերի"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Այս սարքը պատկանում է «<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>» կազմակերպությանը և միացված է վիրտուալ մասնավոր ցանցերի"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ձեր կազմակերպությունը կարող է վերահսկել ձեր աշխատանքային պրոֆիլի ցանցային թրաֆիկը"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> կազմակերպությունը կարող է վերահսկել ձեր աշխատանքային պրոֆիլի ցանցային թրաֆիկը"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Աշխատանքային պրոֆիլով կատարված գործողությունները տեսանելի են ՏՏ ադմինիստրատորին"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Ցանցը կարող է վերահսկվել"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Այս սարքը միացված է վիրտուալ մասնավոր ցանցերի"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Ձեր աշխատանքային պրոֆիլը միացված է <xliff:g id="VPN_APP">%1$s</xliff:g> ցանցին"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Ձեր անձնական պրոֆիլը միացված է <xliff:g id="VPN_APP">%1$s</xliff:g> ցանցին"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Այս սարքը միացված է <xliff:g id="VPN_APP">%1$s</xliff:g> ցանցին"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Այս սարքը տրամադրվել է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպության կողմից"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Սարքերի կառավարում"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Այս սարքում տեղադրված է վկայագրման կենտրոն։ Ձեր ցանցի ապահով թրաֆիկը կարող է վերահսկվել կամ փոփոխվել։"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ձեր ադմինիստրատորը միացրել է ցանցային իրադարձությունների գրանցումը, որը վերահսկում է ձեր սարքի թրաֆիկը։"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ձեր ադմինիստրատորը միացրել է ցանցային իրադարձությունների գրանցումը, որը վերահսկում է ձեր աշխատանքային պրոֆիլի թրաֆիկը (այլ ոչ անձնական պրոֆիլը)։"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Դուք կապակցված եք <xliff:g id="VPN_APP">%1$s</xliff:g> հավելվածին, որը կարող է վերահսկել ձեր ցանցային գործողությունը, այդ թվում նաև էլփոստը, հավելվածները և կայքերը:"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Դուք կապակցված եք <xliff:g id="VPN_APP_0">%1$s</xliff:g> և <xliff:g id="VPN_APP_1">%2$s</xliff:g> հավելվածներին, որոնք կարող են վերահսկել ձեր ցանցային գործունեությունը, այդ թվում նաև էլփոստը, հավելվածները և կայքերը:"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Ձեր աշխատանքային պրոֆիլը կապակցված է <xliff:g id="VPN_APP">%1$s</xliff:g> հավելվածին, որը կարող է վերահսկել ձեր ցանցային գործունեությունը, այդ թվում նաև էլփոստը, հավելվածները և կայքերը:"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Ձեր անձնական պրոֆիլը կապակցված է <xliff:g id="VPN_APP">%1$s</xliff:g> հավելվածին, որը կարող է վերահսկել ձեր ցանցային գործունեությունը, այդ թվում նաև էլփոստը, հավելվածները և կայքերը:"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Բացել VPN-ի կարգավորումները"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Այս սարքը կառավարում է ձեր ծնողը։ Նա կարող է դիտել և փոփոխել որոշակի տեղեկություններ, օրինակ՝ հավելվածները, որոնք դուք օգտագործում եք, ձեր տեղադրությունը և սարքի օգտագործման ժամանակը։"</string> @@ -491,7 +503,7 @@ <string name="notification_alert_title" msgid="3656229781017543655">"Կանխադրված"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Ավտոմատ"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Առանց ձայնի կամ թրթռոցի"</string> - <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Հայտնվում է զրույցների ցանկի ներքևում, առանց ձայնի և թրթռոցի"</string> + <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Առանց ձայնի և թրթռոցի, հայտնվում է զրույցների ցանկի ներքևում"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Կարող է զնգալ կամ թրթռալ (հեռախոսի կարգավորումներից կախված)"</string> <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Կարող է զնգալ կամ թրթռալ (հեռախոսի կարգավորումներից կախված)։ <xliff:g id="APP_NAME">%1$s</xliff:g>-ի զրույցներն ըստ կանխադրման հայտնվում են ամպիկների տեսքով։"</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Թող համակարգն ավտոմատ որոշի՝ արդյոք այս ծանուցումը ձայնով, թե թրթռոցով է պետք մատուցել"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Հեռարձակման անվանումը"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Գաղտնաբառ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Պահել"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Կառուցման համարը"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Կառուցման համարը պատճենվեց սեղմատախտակին։"</string> <string name="basic_status" msgid="2315371112182658176">"Բաց զրույց"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Ավելացնել սալիկ"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Չավելացնել սալիկ"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Ընտրեք օգտատեր"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> հավելված ակտիվ է</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> հավելված ակտիվ է</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Նոր տեղեկություն"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ակտիվ հավելվածներ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Այս հավելվածներն ակտիվ են և կարող են ազդել մարտկոցի աշխատաժամանակի վրա, նույնիսկ երբ չեք օգտվում դրանցից։"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Կանգնեցնել"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Կանգնեցված է"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Պատրաստ է"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 3a15692f3e58..8a16afb4149a 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -36,7 +36,7 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Izinkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nAplikasi ini belum diberi izin merekam, tetapi dapat merekam audio melalui perangkat USB ini."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Izinkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk menangani <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Aplikasi ini tidak diberi izin merekam, tetapi dapat merekam audio melalui perangkat USB ini. Menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan perangkat ini dapat mencegah Anda mendengar panggilan, notifikasi, dan alarm."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Aplikasi ini tidak diberi izin merekam, tetapi dapat merekam audio melalui perangkat USB ini. Menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan perangkat ini mungkin dapat mencegah Anda mendengar panggilan, notifikasi, dan alarm."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan perangkat ini dapat mencegah Anda mendengar panggilan, notifikasi, dan alarm."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Izinkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk menangani <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> @@ -263,7 +263,7 @@ <string name="quick_settings_cellular_detail_over_limit" msgid="4561921367680636235">"Melebihi batas"</string> <string name="quick_settings_cellular_detail_data_used" msgid="6798849610647988987">"<xliff:g id="DATA_USED">%s</xliff:g> digunakan"</string> <string name="quick_settings_cellular_detail_data_limit" msgid="1791389609409211628">"Batas <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> - <string name="quick_settings_cellular_detail_data_warning" msgid="7957253810481086455">"Peringatan <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> + <string name="quick_settings_cellular_detail_data_warning" msgid="7957253810481086455">"Peringatan <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6440531507319809121">"Aplikasi kerja"</string> <string name="quick_settings_night_display_label" msgid="8180030659141778180">"Cahaya Malam"</string> <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="3358706312129866626">"Aktif saat malam"</string> @@ -333,7 +333,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi daya dengan lambat • Penuh dalam waktu <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Mengisi Daya dengan Dok • Penuh dalam waktu <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Beralih pengguna"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Semua aplikasi dan data di sesi ini akan dihapus."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Semua aplikasi dan data dalam sesi ini akan dihapus."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Selamat datang kembali, tamu!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Lanjutkan sesi Anda?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Mulai ulang"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organisasi Anda memiliki perangkat ini dan mungkin memantau traffic jaringan"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> memiliki perangkat ini dan mungkin memantau traffic jaringan"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Perangkat ini disediakan oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Perangkat ini milik organisasi Anda dan terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Perangkat ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dan terhubung ke <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Perangkat ini milik organisasi Anda"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Perangkat ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Perangkat ini milik organisasi Anda dan terhubung ke VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Perangkat ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dan terhubung ke VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organisasi dapat memantau traffic jaringan di profil kerja"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> mungkin memantau traffic jaringan di profil kerja Anda"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktivitas jaringan profil kerja dapat dilihat oleh admin IT Anda"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Jaringan mungkin dipantau"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Perangkat ini terhubung ke VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Profil kerja Anda terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Profil pribadi Anda terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Perangkat ini terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Perangkat ini disediakan oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Pengelolaan perangkat"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Otoritas sertifikat diinstal di perangkat. Traffic jaringan aman Anda mungkin dipantau atau diubah."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Admin telah mengaktifkan pencatatan log jaringan, yang memantau traffic di perangkat."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Admin telah mengaktifkan pencatatan log jaringan, yang memantau traffic di profil kerja, tetapi tidak di profil pribadi."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Anda terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang dapat memantau aktivitas jaringan, termasuk email, aplikasi, dan situs web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Anda terhubung ke <xliff:g id="VPN_APP_0">%1$s</xliff:g> dan <xliff:g id="VPN_APP_1">%2$s</xliff:g>, yang dapat memantau aktivitas jaringan, termasuk email, aplikasi, dan situs web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Profil kerja Anda terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang dapat memantau aktivitas jaringan, termasuk email, aplikasi, dan situs."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Profil pribadi Anda terhubung ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang dapat memantau aktivitas jaringan, termasuk email, aplikasi, dan situs."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Buka setelan VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Perangkat ini dikelola oleh orang tuamu. Orang tuamu bisa melihat dan mengelola berbagai informasi, seperti aplikasi yang kamu gunakan, lokasimu, dan lama pemakaian perangkat."</string> @@ -501,8 +513,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> Diberi Peringkat Lebih Rendah"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, ditampilkan sebagai balon"</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, mengganggu fitur Jangan Ganggu"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, ditampilkan sebagai balon, mengganggu fitur Jangan Ganggu"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, mengganggu mode Jangan Ganggu"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Muncul di atas notifikasi percakapan dan sebagai foto profil di layar kunci, ditampilkan sebagai balon, mengganggu mode Jangan Ganggu"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritas"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak mendukung fitur percakapan"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Notifikasi ini tidak dapat diubah."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nama Siaran"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Sandi"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Simpan"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nomor build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nomor versi disalin ke papan klip."</string> <string name="basic_status" msgid="2315371112182658176">"Membuka percakapan"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tambahkan kartu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Jangan tambah kartu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Pilih pengguna"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikasi aktif</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikasi aktif</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informasi baru"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplikasi aktif"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Aplikasi ini tetap aktif dan dapat memengaruhi masa pakai baterai meskipun tidak sedang digunakan"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Hentikan"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dihentikan"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Selesai"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index 5ddb0a358735..9a0458506564 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Fyrirtækið þitt á þetta tæki og fylgist hugsanlega með netumferð"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> á þetta tæki og fylgist hugsanlega með netumferð"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Þetta tæki er frá <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Þetta tæki tilheyrir fyrirtækinu þínu og er tengt við <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Þetta tæki tilheyrir <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og er tengt við <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Þetta tæki tilheyrir fyrirtækinu þínu"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Þetta tæki tilheyrir <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Þetta tæki tilheyrir fyrirtækinu þínu og er tengt við VPN-net"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Þetta tæki tilheyrir <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og er tengt við VPN-net"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Fyrirtækið þitt kann að fylgjast með netnotkun á vinnusniðinu þínu"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kann að fylgjast með netnotkun á vinnusniðinu þínu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Kerfisstjóri getur séð netvirkni á vinnusniðinu þínu"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Hugsanlega er fylgst með netinu"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Þetta tæki er tengt við VPN-net"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Vinnusniðið þitt er tengt við <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Einkaprófíllinn þinn er tengdur við <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Þetta tæki er tengt við <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Þetta tæki er frá <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Tækjastjórnun"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"CA-vottorð er uppsett á þessu tæki. Eftirlit kann að vera haft með öruggri netnotkun þinni eða henni kann að vera breytt."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Kerfisstjóri hefur kveikt á eftirliti netkerfa, sem fylgist með netumferð á tækinu þínu."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Stjórnandinn kveikti á eftirliti netkerfa sem fylgist með netumferð á vinnusniðinu þínu en ekki á eigin sniði."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Þú ert með tengingu við <xliff:g id="VPN_APP">%1$s</xliff:g>, sem getur fylgst með netnotkun þinni, þ. á m. tölvupósti, forritum og vefsvæðum."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Þú ert með tengingu við <xliff:g id="VPN_APP_0">%1$s</xliff:g> og <xliff:g id="VPN_APP_1">%2$s</xliff:g>, sem geta fylgst með netnotkun þinni, þar á meðal tölvupósti, forritum og vefsvæðum."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Vinnusniðið þitt er tengt <xliff:g id="VPN_APP">%1$s</xliff:g>, sem getur fylgst með netnotkun þinni, þ. á m. tölvupósti, forritum og vefsvæðum."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Einkaprófíllinn þinn er tengdur við <xliff:g id="VPN_APP">%1$s</xliff:g>, sem getur fylgst með netnotkun þinni, þar á meðal tölvupósti, forritum og vefsvæðum."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Opna VPN-stillingar"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Foreldri þitt stjórnar þessu tæki. Foreldri þitt getur séð og stjórnað upplýsingum eins og forritunum sem þú notar, staðsetningu þinni og skjátímanum."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Heiti útsendingar"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Aðgangsorð"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Vista"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Útgáfunúmer smíðar"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Útgáfunúmer smíðar afritað á klippiborð."</string> <string name="basic_status" msgid="2315371112182658176">"Opna samtal"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Bæta reit við"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ekki bæta reit við"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Velja notanda"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> forrit virkt</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> forrit virk</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nýjar upplýsingar"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Virk forrit"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Forritin eru virk og geta haft áhrif á rafhlöðuendingu jafnvel þótt þú sért ekki að nota þau"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stöðva"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stöðvað"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Lokið"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 55c854b5d361..4309653065aa 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Questo dispositivo appartiene alla tua organizzazione, che potrebbe monitorare il traffico di rete"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Questo dispositivo appartiene a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, che potrebbe monitorare il traffico di rete"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Questo dispositivo è fornito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Questo dispositivo appartiene alla tua organizzazione ed è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Questo dispositivo appartiene a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ed è collegato a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Questo dispositivo appartiene alla tua organizzazione"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Questo dispositivo appartiene a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Questo dispositivo appartiene alla tua organizzazione ed è collegato a VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Questo dispositivo appartiene a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ed è collegato a VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"La tua organizzazione potrebbe monitorare il traffico di rete nel tuo profilo di lavoro"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> potrebbe monitorare il traffico di rete nel tuo profilo di lavoro"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"L\'attività di rete del tuo profilo di lavoro è visibile all\'amministratore IT"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"La rete potrebbe essere monitorata"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Questo dispositivo è collegato a VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Il tuo profilo di lavoro è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Il tuo profilo personale è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Questo dispositivo è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Questo dispositivo è fornito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestione dei dispositivi"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Sul dispositivo è installata un\'autorità di certificazione. Il tuo traffico di rete protetto potrebbe essere monitorato o modificato."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"L\'amministratore ha attivato i log di rete, che consentono di monitorare il traffico sul dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"L\'amministratore ha attivato i log di rete, che consentono di monitorare il traffico nel profilo di lavoro, ma non nel profilo personale."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Sei connesso a <xliff:g id="VPN_APP">%1$s</xliff:g>, che consente di monitorare le attività di rete, inclusi siti web, email e app."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Sei connesso a <xliff:g id="VPN_APP_0">%1$s</xliff:g> e <xliff:g id="VPN_APP_1">%2$s</xliff:g>, che consentono di monitorare le attività di rete, inclusi siti web, email e app."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Il tuo profilo di lavoro è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>, da cui è possibile monitorare la tua attività di rete, inclusi siti web, email e app."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Il tuo profilo personale è collegato a <xliff:g id="VPN_APP">%1$s</xliff:g>, da cui è possibile monitorare la tua attività di rete, inclusi siti web, email e app."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Apri impostazioni VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Questo dispositivo è gestito da uno dei tuoi genitori, il quale può visualizzare e gestire informazioni come le app che usi, la tua posizione e il tuo tempo di utilizzo."</string> @@ -417,7 +429,7 @@ <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"La schermata rimane visibile finché non viene sganciata. Per sganciarla, tieni premuto Panoramica."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"La schermata rimane visibile finché non viene disattivato il blocco su schermo. Per disattivarlo, tocca e tieni premuto Home."</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"I dati personali potrebbero essere accessibili (ad esempio i contatti e i contenuti delle email)."</string> - <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"L\'app bloccata su schermo potrebbe aprire altre app."</string> + <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"L\'app bloccata sullo schermo potrebbe aprire altre app."</string> <string name="screen_pinning_toast" msgid="8177286912533744328">"Per sbloccare questa app, tocca e tieni premuti i pulsanti Indietro e Panoramica"</string> <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"Per sbloccare questa app, tocca e tieni premuti i pulsanti Indietro e Home"</string> <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"Per sbloccare questa app, scorri verso l\'alto e tieni premuto"</string> @@ -502,7 +514,7 @@ <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Appare in cima alle notifiche delle conversazioni e compare come immagine del profilo nella schermata di blocco"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Appare in cima alle notifiche delle conversazioni, nonché compare come immagine del profilo nella schermata di blocco e come bolla"</string> <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Appare in cima alle notifiche delle conversazioni, interrompe la modalità Non disturbare e compare come immagine del profilo nella schermata di blocco"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Appare in cima alle notifiche delle conversazioni, interrompe la modalità Non disturbare, nonché compare come immagine del profilo nella schermata di blocco e come bolla"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Appare in cima alle notifiche delle conversazioni, come immagine del profilo nella schermata di blocco e sotto forma di bolla, inoltre interrompe la modalità Non disturbare"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Priorità"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> non supporta le funzionalità delle conversazioni"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Impossibile modificare queste notifiche."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nome annuncio"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Salva"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numero build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numero build copiato negli appunti."</string> <string name="basic_status" msgid="2315371112182658176">"Apri conversazione"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Aggiungi riquadro"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Non aggiungerlo"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Seleziona utente"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">Ci sono <xliff:g id="COUNT_1">%s</xliff:g> app attive</item> + <item quantity="one">C\'è <xliff:g id="COUNT_0">%s</xliff:g> app attiva</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nuove informazioni"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"App attive"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Queste app sono ancora attive anche se non le stai usando e potrebbero incidere sulla durata della batteria"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Interrompi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Interrotta"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Fine"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 6cbc0a57f535..d79d012e76b4 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"הארגון שלך הוא הבעלים של המכשיר הזה והוא עשוי לנטר את התנועה ברשת"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"הארגון <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> הוא הבעלים של המכשיר הזה והוא עשוי לנטר את התנועה ברשת"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"המכשיר הזה התקבל מ-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"המכשיר הזה שייך לארגון שלך, והוא מחובר ל-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"המכשיר הזה שייך לארגון <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> והוא מחובר ל-<xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"המכשיר הזה שייך לארגון שלך"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"המכשיר הזה שייך לארגון <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"המכשיר הזה שייך לארגון שלך והוא מחובר לרשתות VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"המכשיר הזה שייך לארגון <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> והוא מחובר לרשתות VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"הארגון שלך יכול לנטר את התנועה ברשת בפרופיל העבודה שלך"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"הארגון <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> עשוי לנטר את התנועה ברשת בפרופיל העבודה שלך"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"מנהל ה-IT יכול לראות את הפעילות ברשת"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ייתכן שהרשת מנוטרת"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"המכשיר הזה מחובר לרשתות VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"פרופיל העבודה שלך מחובר ל-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"הפרופיל האישי שלך מחובר ל-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"המכשיר הזה מחובר ל-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"המכשיר הזה התקבל מ-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ניהול מכשירים"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"במכשיר זה מותקנת רשות אישורים. ניתן לעקוב אחר התנועה ברשת המאובטחת או לשנות אותה."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"מנהל המערכת הפעיל את התכונה \'רישום התנועה ברשת\', שמנטרת את תנועת הנתונים במכשיר."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"מנהל המערכת הפעיל את תכונת רישום התנועה ברשת, שמנטרת את תנועת הנתונים בפרופיל העבודה, אבל לא בפרופיל האישי."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"התחברת לאפליקציה <xliff:g id="VPN_APP">%1$s</xliff:g>, שיכולה לעקוב אחר הפעילות שלך ברשת, כולל הודעות אימייל, אפליקציות ואתרים."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"התחברת לאפליקציות <xliff:g id="VPN_APP_0">%1$s</xliff:g> ו-<xliff:g id="VPN_APP_1">%2$s</xliff:g>, שיכולות לעקוב אחר הפעילות שלך ברשת, כולל הודעות אימייל, אפליקציות ואתרים."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"פרופיל העבודה שלך מחובר לאפליקציה <xliff:g id="VPN_APP">%1$s</xliff:g>, שיכולה לעקוב אחר הפעילות שלך ברשת, כולל הודעות אימייל, אפליקציות ואתרים."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"הפרופיל האישי שלך מחובר לאפליקציה <xliff:g id="VPN_APP">%1$s</xliff:g>, שיכולה לעקוב אחר הפעילות שלך ברשת, כולל הודעות אימייל, אפליקציות ואתרים."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"להגדרות ה-VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"מכשיר זה מנוהל על ידי ההורה שלך. להורה שלך יש אפשרות לצפות בפרטים כמו האפליקציות שבשימוש, המיקום וזמן המסך שלך, ולנהל אותם."</string> @@ -512,8 +524,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"בעדיפות גבוהה"</string> <string name="no_shortcut" msgid="8257177117568230126">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לא תומכת בתכונות השיחה"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"לא ניתן לשנות את ההתראות האלה."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"לא ניתן לשנות את התראות השיחה."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"לא ניתן להגדיר כאן את קבוצת ההתראות הזו"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"התראה דרך שרת proxy"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"כל ההתראות של <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -856,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"שם השידור"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"סיסמה"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"שמירה"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"מספר Build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"מספר ה-Build הועתק ללוח."</string> <string name="basic_status" msgid="2315371112182658176">"פתיחת שיחה"</string> @@ -924,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"הוספת אריח"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"לא להוסיף אריח"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"בחירת משתמש"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="two"><xliff:g id="COUNT_1">%s</xliff:g> אפליקציות פעילות</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> אפליקציות פעילות</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> אפליקציות פעילות</item> + <item quantity="one">אפליקציה אחת (<xliff:g id="COUNT_0">%s</xliff:g>) פעילה</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"מידע חדש"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"אפליקציות פעילות"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"גם אם לא נעשה שימוש באפליקציות האלו, הן עדיין פעילות ועשויות להשפיע על חיי הסוללה"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"עצירה"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"הופסקה"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"סיום"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 4b7e130c5c04..8ab93db9928a 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"これは組織が所有するデバイスで、ネットワーク トラフィックが監視されることもあります"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"これは <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> が所有するデバイスで、ネットワーク トラフィックが監視されることもあります"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"このデバイスは <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> から提供されています"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"これは組織が所有するデバイスで、<xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"これは <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> が所有するデバイスで、<xliff:g id="VPN_APP">%2$s</xliff:g> に接続しています"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"これは組織が所有するデバイスです"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"これは <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> が所有するデバイスです"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"これは組織が所有するデバイスで、VPN に接続しています"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"これは <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> が所有するデバイスで、VPN に接続しています"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"組織は仕事用プロファイルのネットワーク トラフィックを監視することがあります"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> によってこの仕事用プロファイルのネットワーク トラフィックが監視されることもあります"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"仕事用プロファイルのネットワーク アクティビティは IT 管理者に公開されます"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ネットワークが監視されることもあります"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"このデバイスは VPN に接続しています"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"この仕事用プロファイルは <xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"この個人用プロファイルは <xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"このデバイスは <xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"このデバイスは <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> から提供されています"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"デバイス管理"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"このデバイスには認証局がインストールされています。保護されたネットワーク トラフィックが監視、変更される可能性があります。"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"管理者がネットワーク ログを有効にしているため、このデバイスのトラフィックが監視されています。"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"管理者がネットワーク ログを有効にしているため、仕事用プロファイルのトラフィックは監視されています（個人用プロファイルは対象外）。"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"<xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています。このアプリはあなたのネットワーク アクティビティ（メール、アプリ、ウェブサイトなど）を監視できます。"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> と <xliff:g id="VPN_APP_1">%2$s</xliff:g> に接続しています。これらのアプリは、あなたのネットワーク アクティビティ（メール、アプリ、ウェブサイト）を監視できます。"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"この仕事用プロファイルは <xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています。このアプリはあなたのネットワーク アクティビティ（メール、アプリ、ウェブサイトなど）を監視できます。"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"この個人用プロファイルは <xliff:g id="VPN_APP">%1$s</xliff:g> に接続しています。このアプリはあなたのネットワーク アクティビティ（メール、アプリ、ウェブサイト）を監視できます。"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN 設定を開く"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"このデバイスは保護者によって管理されています。保護者は、あなたが使用するアプリ、あなたの現在地、デバイスの利用時間などの情報を確認したり、管理したりできます。"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"優先"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>は会話機能に対応していません"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"これらの通知は変更できません。"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"着信通知は変更できません。"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"このグループの通知はここでは設定できません"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"代理通知"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g> のすべての通知"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ブロードキャストの名前"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"パスワード"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"保存"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ビルド番号"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ビルド番号をクリップボードにコピーしました。"</string> <string name="basic_status" msgid="2315371112182658176">"空の会話"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"タイルを追加"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"タイルを追加しない"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ユーザーの選択"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 個のアプリがアクティブです</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 個のアプリがアクティブです</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"最新情報"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"実行中のアプリ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"これらのアプリは、使用していない場合でもアクティブのままになるため、バッテリー駆動時間に影響する可能性があります"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"停止中"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"完了"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 160927f13492..7106b5f9724e 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ამ მოწყობილობას ფლობს თქვენი ორგანიზაცია და მას ქსელის ტრაფიკის მონიტორინგი შეუძლია"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"ამ მოწყობილობას ფლობს <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> და მას ქსელის ტრაფიკის მონიტორინგი შეუძლია"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ამ მოწყობილობის მომწოდებელია <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ამ მოწყობილობას ფლობს თქვენი ორგანიზაცია და ის დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ამ მოწყობილობას ფლობს <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> და ის დაკავშირებულია <xliff:g id="VPN_APP">%2$s</xliff:g>-თან"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ამ მოწყობილობას ფლობს თქვენი ორგანიზაცია"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ამ მოწყობილობას ფლობს <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ამ მოწყობილობას ფლობს თქვენი ორგანიზაცია და ის დაკავშირებულია VPN-ებთან"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ამ მოწყობილობას ფლობს <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> და ის დაკავშირებულია VPN-ებთან"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"თქვენს ორგანიზაციას სამსახურის პროფილში ქსელის ტრაფიკის მონიტორინგი შეუძლია"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-ს სამსახურის პროფილში ქსელის ტრაფიკის მონიტორინგი შეუძლია"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"სამსახურის პროფილის ქსელის აქტივობა ხილულია თქვენი IT ადმინისტრატორისთვის"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ქსელზე შესაძლოა ხორციელდებოდეს მონიტორინგი"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ეს მოწყობილობა დაკავშირებულია VPN-ებთან"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"თქვენი სამსახურის პროფილი დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"თქვენი პერსონალური პროფილი დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ეს მოწყობილობა დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ამ მოწყობილობის მომწოდებელია <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"მოწყობილობის მართვა"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ამ მოწყობილობაზე დაინსტალირებულია სერტიფიცირების ორგანო. თქვენი ქსელის დაცული ტრაფიკი შეიძლება შეიცვალოს, ან მასზე მონიტორინგი განხორციელდეს."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"თქვენმა ადმინისტრატორმა ჩართო ქსელის ჟურნალირება, რომელიც თქვენი მოწყობილობის ტრაფიკის მონიტორინგს ახორციელებს."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"თქვენმა ადმინისტრატორმა ქსელის ჟურნალირება ჩართო, რომელიც ახორციელებს თქვენი სამსახურის პროფილის, მაგრამ არა პირადი პროფილის, ტრაფიკის მონიტორინგს."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"თქვენ დაკავშირებული ხართ <xliff:g id="VPN_APP">%1$s</xliff:g>-თან, რომელსაც შეუძლია თქვენი ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და ვებსაიტების) მონიტორინგი."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"თქვენ დაკავშირებული ხართ <xliff:g id="VPN_APP_0">%1$s</xliff:g>-სა და <xliff:g id="VPN_APP_1">%2$s</xliff:g>-თან, რომელთაც შეუძლია თქვენი ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და ვებსაიტების) მონიტორინგი."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"თქვენი სამსახურის პროფილი დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან, რომელსაც შეუძლია თქვენი ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და ვებსაიტების) მონიტორინგი."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"თქვენი პირადი პროფილი დაკავშირებულია <xliff:g id="VPN_APP">%1$s</xliff:g>-თან, რომელსაც შეუძლია თქვენი ქსელის აქტივობის (მათ შორის, ელფოსტის, აპებისა და ვებსაიტების) მონიტორინგი."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN-ის პარამეტრების გახსნა"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ამ მოწყობილობას თქვენი მშობელი მართავს. თქვენი მშობელი ხედავს და მართავს ისეთ ინფორმაციას, როგორიც არის თქვენ მიერ გამოყენებული აპები, თქვენი მდებარეობა და თქვენ მიერ ეკრანთან გატარებული დრო."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ტრანსლაციის სახელი"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"პაროლი"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"შენახვა"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ანაწყობის ნომერი"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ანაწყობის ნომერი დაკოპირებულია გაცვლის ბუფერში."</string> <string name="basic_status" msgid="2315371112182658176">"მიმოწერის გახსნა"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"დაემატოს"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"არ დაემატოს"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"მომხმარებლის არჩევა"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">აქტიურია <xliff:g id="COUNT_1">%s</xliff:g> აპი</item> + <item quantity="one">აქტიურია <xliff:g id="COUNT_0">%s</xliff:g> აპი</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ახალი ინფორმაცია"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"აქტიური აპები"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"თუნდაც ამ აპებს არ იყენებდეთ, ისინი მაინც აქტიურია და ბატარეის მუშაობის ხანგრძლივობაზე ზემოქმედება შეუძლია"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"შეწყვეტა"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"შეწყვეტილია"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"მზადაა"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 6b233c89f536..d003de878960 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -34,8 +34,8 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Авто айналатын экран"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысына кіруге рұқсат берілсін бе?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысын пайдалануға рұқсат етілсін бе?\nҚолданбаның жазу рұқсаты жоқ, бірақ осы USB құрылғысы арқылы аудио жаза алады."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысына кіруге рұқсат берілсін бе?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысын басқару үшін <xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасы ашылсын ба?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысын <xliff:g id="APPLICATION">%1$s</xliff:g> пайдалансын ба?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> басқару үшін <xliff:g id="APPLICATION">%1$s</xliff:g> ашылсын ба?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Қолданбаға жазу рұқсаты берілмеді, бірақ ол осы USB құрылғысы арқылы дыбыс жаза алады. Осы құрылғыда <xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасын пайдаланған кезде, қоңырау, хабарландыру және дабыл дыбыстары естілмей қалуы мүмкін."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Осы құрылғыда <xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасын пайдаланған кезде, қоңырау, хабарландыру және дабыл дыбыстары естілмей қалуы мүмкін."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> жабдығына кіруге рұқсат берілсін бе?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Ұйымыңыз осы құрылғыны басқарады және желі трафигін бақылауы мүмкін."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> осы құрылғыны басқарады және желі трафигін бақылауы мүмкін."</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ұсынады."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Бұл құрылғы ұйымыңызға тиесілі және <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Бұл құрылғы <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ұйымына тиесілі және <xliff:g id="VPN_APP">%2$s</xliff:g> қолданбасына қосылған."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Бұл құрылғы ұйымыңызға тиесілі."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Бұл құрылғы <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ұйымына тиесілі."</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Бұл құрылғы ұйымыңызға тиесілі және VPN-дерге қосылған."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Бұл құрылғы <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ұйымына тиесілі және VPN-дерге қосылған."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ұйымыңыз жұмыс профиліңіздегі желі трафигін бақылауы мүмкін"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> жұмыс профиліңіздегі желі трафигін бақылауы мүмкін"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Желіде жұмыс профилі арқылы не істелгені әкімшіге көрініп тұрады."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Желі бақылануы мүмкін"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Бұл құрылғы VPN-дерге қосылған."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Жұмыс профиліңіз <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Жеке профиліңіз <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Бұл құрылғы <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ұсынады"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Құрылғыны басқару"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Осы құрылғыда сертификат орнатылған. Қорғалған желі трафигіңіз бақылануы немесе өзгертілуі мүмкін."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Әкімші құрылғыңыздағы трафикті бақылайтын желі журналын жүргізуді қосқан."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Әкімші жұмыс профиліндегі трафикті (жеке профильдегі трафик қаралмайды) қадағалау үшін желі журналын жүргізуді қосып қойған."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Желідегі әрекеттеріңізді, соның ішінде электрондық хабарларды, қолданбаларды және вебсайттарды бақылай алатын <xliff:g id="VPN_APP">%1$s</xliff:g> желісіне қосылдыңыз."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Желідегі әрекеттеріңізді, соның ішінде электрондық хабарларды, қолданбаларды және вебсайттарды бақылай алатын <xliff:g id="VPN_APP_0">%1$s</xliff:g> және <xliff:g id="VPN_APP_1">%2$s</xliff:g> желілеріне қосылдыңыз."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Жұмыс профиліңіз желідегі белсенділігіңізді, соның ішінде электрондық хабарларды, қолданбаларды және веб-сайттарды бақылай алатын <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Жеке профиліңіз желідегі белсенділігіңізді, соның ішінде электрондық хабарларды, қолданбаларды және веб-сайттарды бақылай алатын <xliff:g id="VPN_APP">%1$s</xliff:g> қолданбасына қосылған."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN параметрлерін ашу"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Бұл құрылғыны ата-анаңыз басқарады. Ата-анаңыз сіз пайдаланатын қолданбалар, геодерегіңіз және пайдалану уақытыңыз сияқты ақпаратты көре және басқара алады."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Маңызды"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> әңгіме функцияларын қолдамайды."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Бұл хабарландыруларды өзгерту мүмкін емес."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Қоңырау туралы хабарландыруларды өзгерту мүмкін емес."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Мұндай хабарландырулар бұл жерде конфигурацияланбайды."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Прокси-сервер арқылы жіберілген хабарландыру"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Барлық <xliff:g id="APP_NAME">%1$s</xliff:g> хабарландырулары"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Тарату хабарының аты"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Құпия сөз"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Сақтау"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Құрама нөмірі"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Құрама нөмірі буферге көшірілді."</string> <string name="basic_status" msgid="2315371112182658176">"Ашық әңгіме"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Бөлшек қосу"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Бөлшек қоспау"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Пайдаланушыны таңдау"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> қолданба қосылып тұр.</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> қолданба қосылып тұр.</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Жаңа ақпарат"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Істеп тұрған қолданбалар"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Бұл қолданбаларды қолданып жатпасаңыз да, олар қосылып тұр және батарея жұмысының ұзақтығына әсер етуі мүмкін."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Тоқтату"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Тоқтатылған"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Дайын"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 7dcf066e2891..be16b12ac616 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ស្ថាប័នរបស់អ្នកជាម្ចាស់ឧបករណ៍នេះ ហើយអាចនឹងតាមដានចរាចរណ៍បណ្តាញ"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ជាម្ចាស់ឧបករណ៍នេះ ហើយអាចនឹងតាមដានចរាចរណ៍បណ្តាញ"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ឧបករណ៍នេះត្រូវបានផ្ដល់ដោយ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ស្ថាប័នអ្នក និងត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> និងត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ស្ថាប័នអ្នក"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ស្ថាប័នអ្នក និងត្រូវបានភ្ជាប់ទៅ VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ឧបករណ៍នេះគឺជាកម្មសិទ្ធិរបស់ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> និងត្រូវបានភ្ជាប់ទៅ VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ស្ថាប័នរបស់អ្នកអាចនឹងតាមដានចរាចរណ៍បណ្តាញនៅក្នុងកម្រងព័ត៌មានការងាររបស់អ្នក"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> អាចនឹងតាមដានចរាចរណ៍បណ្តាញនៅក្នុងកម្រងព័ត៌មានការងាររបស់អ្នក"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"អ្នកគ្រប់គ្រងផ្នែកព័ត៌មានវិទ្យារបស់អ្នកអាចមើលឃើញសកម្មភាពបណ្ដាញនៃកម្រងព័ត៌មានការងារ"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"បណ្ដាញអាចត្រូវតាមដាន"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ឧបករណ៍នេះត្រូវបានភ្ជាប់ទៅ VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"កម្រងព័ត៌មានការងាររបស់អ្នកត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"កម្រងព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នកត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ឧបករណ៍នេះត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ឧបករណ៍នេះត្រូវបានផ្ដល់ដោយ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ការគ្រប់គ្រងឧបករណ៍"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"បានដំឡើងអាជ្ញាធរវិញ្ញាបនបត្រនៅលើឧបករណ៍នេះ។ ចរាចរណ៍បណ្តាញដែលមានសុវត្ថិភាពរបស់អ្នកអាចត្រូវបានតាមដាន ឬកែសម្រួល។"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"អ្នកគ្រប់គ្រងរបស់អ្នកបានបើកការធ្វើកំណត់ហេតុបណ្តាញ ដែលនឹងតាមដានចរាចរណ៍នៅលើឧបករណ៍របស់អ្នក។"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"អ្នកគ្រប់គ្រងរបស់អ្នកបានបើកការធ្វើកំណត់ហេតុបណ្តាញ ដែលតាមដានចរាចរណ៍នៅក្នុងកម្រងព័ត៌មានការងាររបស់អ្នក ប៉ុន្តែមិនតាមដាននៅក្នុងកម្រងព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នកឡើយ។"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"អ្នកបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g> ដែលអាចតាមដានសកម្មភាពក្នុងបណ្តាញរបស់អ្នក រួមទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រផងដែរ។"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"អ្នកបានភ្ជាប់ទៅ <xliff:g id="VPN_APP_0">%1$s</xliff:g> និង <xliff:g id="VPN_APP_1">%2$s</xliff:g> ដែលអាចតាមដានសកម្មភាពបណ្តាញរបស់អ្នក រួមទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រផងដែរ។"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"កម្រងព័ត៌មានការងាររបស់អ្នកត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g> ដែលអាចតាមដានសកម្មភាពបណ្តាញរបស់អ្នក រួមទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រផងដែរ។"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"កម្រងព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នកត្រូវបានភ្ជាប់ទៅ <xliff:g id="VPN_APP">%1$s</xliff:g> ដែលអាចតាមដានសកម្មភាពបណ្តាញរបស់អ្នក រួមទាំងអ៊ីមែល កម្មវិធី និងគេហទំព័រផងដែរ។"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"បើកការកំណត់ VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់មាតាបិតាអ្នក។ មាតាបិតារបស់អ្នកអាចមើល និងគ្រប់គ្រងព័ត៌មានដូចជា កម្មវិធីដែលអ្នកប្រើ ទីតាំងរបស់អ្នក និងរយៈពេលប្រើប្រាស់ឧបករណ៍របស់អ្នកជាដើម។"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"អាទិភាព"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> មិនអាចប្រើមុខងារសន្ទនាបានទេ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"មិនអាចកែប្រែការជូនដំណឹងទាំងនេះបានទេ។"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"មិនអាចកែប្រែការជូនដំណឹងអំពីការហៅទូរសព្ទបានទេ។"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"មិនអាចកំណត់រចនាសម្ព័ន្ធក្រុមការជូនដំណឹងនេះនៅទីនេះបានទេ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ការជូនដំណឹងជាប្រូកស៊ី"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"ការជូនដំណឹងទាំងអស់ពី<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ឈ្មោះការផ្សាយ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"ពាក្យសម្ងាត់"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"រក្សាទុក"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"លេខកំណែបង្កើត"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"បានចម្លងលេខកំណែបង្កើតទៅឃ្លីបបត។"</string> <string name="basic_status" msgid="2315371112182658176">"បើកការសន្ទនា"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"បញ្ចូលប្រអប់"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"កុំបញ្ចូលប្រអប់"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ជ្រើសរើសអ្នកប្រើប្រាស់"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">កម្មវិធី <xliff:g id="COUNT_1">%s</xliff:g> កំពុងដំណើរការ</item> + <item quantity="one">កម្មវិធី <xliff:g id="COUNT_0">%s</xliff:g> កំពុងដំណើរការ</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ព័ត៌មានថ្មី"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"កម្មវិធីសកម្ម"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ទោះបីជាអ្នកមិនកំពុងប្រើកម្មវិធីទាំងនេះក៏ដោយ ក៏កម្មវិធីទាំងនេះនៅតែដំណើរការដដែល ហើយអាចប៉ះពាល់ដល់កម្រិតថាមពលថ្ម"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ឈប់"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"បានឈប់"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"រួចរាល់"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index f6a38b84d699..4fa0fb9b906b 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಸಾಧನದ ಮಾಲೀಕತ್ವವನ್ನು ಹೊಂದಿದೆ ಮತ್ತು ಅದು ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ನ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ಈ ಸಾಧನದ ಮಾಲೀಕತ್ವವನ್ನು ಹೊಂದಿದೆ ಮತ್ತು ಅದು ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ನ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ಒದಗಿಸಿದ್ದಾರೆ"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ಈ ಸಾಧನವು ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಸೇರಿದೆ ಮತ್ತು <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ಈ ಸಾಧನವು <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ಗೆ ಸೇರಿದೆ ಮತ್ತು <xliff:g id="VPN_APP">%2$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ಈ ಸಾಧನವು ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಸೇರಿದೆ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ಈ ಸಾಧನವು <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ಗೆ ಸೇರಿದೆ"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ಈ ಸಾಧನವು ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಸೇರಿದೆ ಮತ್ತು VPN ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ಈ ಸಾಧನವು <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ಗೆ ಸೇರಿದೆ ಮತ್ತು VPN ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ನ ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ ಅನ್ನು ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ ಅನ್ನು <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆ ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ನೆಟ್ವರ್ಕ್ನ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದಾಗಿದೆ"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ಈ ಸಾಧನವು VPN ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"ನಿಮ್ಮ ಉದ್ಯೋಗದ ಪ್ರೊಫೈಲ್ <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ಈ ಸಾಧನವು <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ಒದಗಿಸಿದ್ದಾರೆ"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ಸಾಧನ ನಿರ್ವಹಣೆ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಮಾಣಪತ್ರ ಅಂಗೀಕಾರವನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸುರಕ್ಷಿತ ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ ಅನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಅಥವಾ ಮಾರ್ಪಡಿಸಬಹುದು."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನೆಟ್ವರ್ಕ್ ಲಾಗಿಂಗ್ ಆನ್ ಮಾಡಿದ್ದಾರೆ. ಇದು ನಿಮ್ಮ ಸಾಧನದ ಟ್ರಾಫಿಕ್ ಅನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡುತ್ತದೆ."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನೆಟ್ವರ್ಕ್ ಲಾಗಿಂಗ್ ಆನ್ ಮಾಡಿದ್ದಾರೆ, ಅದು ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ನಲ್ಲಿ ಇರುವ ಟ್ರಾಫಿಕ್ ಮೇಲೆ ನಿಗಾ ಇರಿಸುತ್ತದೆ ಆದರೆ ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ಇರುವ ಟ್ರಾಫಿಕ್ ಮೇಲೆ ಅಲ್ಲ."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"ನೀವು <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದೀರಿ. ಇದು ನಿಮ್ಮ ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ವೆಬ್ಸೈಟ್ಗಳೂ ಸೇರಿದಂತೆ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ನೀವು <xliff:g id="VPN_APP_0">%1$s</xliff:g> ಹಾಗೂ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದೀರಿ. ಇವು ನಿಮ್ಮ ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ವೆಬ್ಸೈಟ್ಗಳೂ ಸೇರಿದಂತೆ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ. ಇದು ನಿಮ್ಮ ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ವೆಬ್ಸೈಟ್ಗಳೂ ಸೇರಿದಂತೆ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ <xliff:g id="VPN_APP">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ. ಇದು ನಿಮ್ಮ ಇಮೇಲ್ಗಳು, ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮತ್ತು ವೆಬ್ಸೈಟ್ಗಳೂ ಸೇರಿದಂತೆ ನೆಟ್ವರ್ಕ್ ಚಟುವಟಿಕೆಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ತೆರೆಯಿರಿ"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ. ನೀವು ಬಳಸುವ ಆ್ಯಪ್ಗಳು, ನಿಮ್ಮ ಸ್ಥಳ ಮತ್ತು ನಿಮ್ಮ ವೀಕ್ಷಣಾ ಅವಧಿಯಂತಹ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಪೋಷಕರು ನೋಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"ಆದ್ಯತೆ"</string> <string name="no_shortcut" msgid="8257177117568230126">"ಸಂವಾದ ಫೀಚರ್ಗಳನ್ನು <xliff:g id="APP_NAME">%1$s</xliff:g> ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"ಕರೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ಈ ಗುಂಪಿನ ಅಧಿಸೂಚನೆಗಳನ್ನು ಇಲ್ಲಿ ಕಾನ್ಫಿಗರ್ ಮಾಡಲಾಗಿರುವುದಿಲ್ಲ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ಪ್ರಾಕ್ಸಿ ಮಾಡಿದ ಅಧಿಸೂಚನೆಗಳು"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನ ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳು"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ಪ್ರಸಾರದ ಹೆಸರು"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"ಪಾಸ್ವರ್ಡ್"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ಉಳಿಸಿ"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ಬಿಲ್ಡ್ ಸಂಖ್ಯೆ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ಬಿಲ್ಡ್ ಸಂಖ್ಯೆಯನ್ನು ಕ್ಲಿಪ್ಬೋರ್ಡ್ನಲ್ಲಿ ನಕಲಿಸಲಾಗಿದೆ."</string> <string name="basic_status" msgid="2315371112182658176">"ಸಂಭಾಷಣೆಯನ್ನು ತೆರೆಯಿರಿ"</string> @@ -911,12 +926,14 @@ <string name="qs_tile_request_dialog_text" msgid="3501359944139877694">"<xliff:g id="APPNAME">%1$s</xliff:g> ಈ ಕೆಳಗಿನ ಟೈಲ್ ಅನ್ನು ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಸೇರಿಸಲು ಬಯಸುತ್ತದೆ"</string> <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ಟೈಲ್ ಅನ್ನು ಸೇರಿಸಿ"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ಟೈಲ್ ಅನ್ನು ಸೇರಿಸಬೇಡಿ"</string> - <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ಬಳಕೆದಾರ ಆಯ್ಕೆಮಾಡಿ"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ಬಳಕೆದಾರರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ಆ್ಯಪ್ಗಳು ಸಕ್ರಿಯವಾಗಿವೆ</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ಆ್ಯಪ್ಗಳು ಸಕ್ರಿಯವಾಗಿವೆ</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ಹೊಸ ಮಾಹಿತಿ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ಸಕ್ರಿಯ ಆ್ಯಪ್ಗಳು"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ನೀವು ಈ ಆ್ಯಪ್ಗಳನ್ನು ಬಳಸದೇ ಇದ್ದರೂ ಸಹ ಅವುಗಳು ಈಗಲೂ ಸಕ್ರಿಯವಾಗಿವೆ ಹಾಗೂ ಅವು ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯ ಮೇಲೆ ಪ್ರಭಾವ ಬೀರಬಹುದು"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ನಿಲ್ಲಿಸಿ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ನಿಲ್ಲಿಸಲಾಗಿದೆ"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ಮುಗಿದಿದೆ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 1f4f913a5ae2..9cf436d145a9 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱이 <xliff:g id="USB_DEVICE">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g>에서 <xliff:g id="USB_DEVICE">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?\n이 앱에는 녹음 권한이 부여되지 않았지만, 이 USB 기기를 통해 오디오를 녹음할 수 있습니다."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱이 <xliff:g id="USB_DEVICE">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 열어 <xliff:g id="USB_DEVICE">%2$s</xliff:g>을 처리하시겠습니까?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 열어 <xliff:g id="USB_DEVICE">%2$s</xliff:g>을(를) 처리하시겠습니까?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"이 앱에는 녹음 권한이 부여되지 않았지만, 이 USB 기기를 통해 오디오를 녹음할 수 있습니다. 이 기기와 함께 <xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 사용하면 전화, 알림, 알람 소리가 들리지 않을 수 있습니다."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"이 기기와 함께 <xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 사용하면 전화, 알림, 알람 소리가 들리지 않을 수 있습니다."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱이 <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"내 조직에서 이 기기를 소유하며 네트워크 트래픽을 모니터링할 수 있습니다."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>에서 이 기기를 소유하며 네트워크 트래픽을 모니터링할 수 있습니다."</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 제공하는 기기"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"내 조직에 속한 기기이며 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>에 속한 기기이며 <xliff:g id="VPN_APP">%2$s</xliff:g>에 연결되었습니다."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"내 조직에 속한 기기입니다."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>에 속한 기기입니다."</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"내 조직에 속한 기기이며 VPN에 연결되었습니다."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>에 속한 기기이며 VPN에 연결되었습니다."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"조직에서 직장 프로필의 네트워크 트래픽을 모니터링할 수 있습니다."</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>에서 내 직장 프로필의 네트워크 트래픽을 모니터링할 수 있습니다."</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"직장 프로필의 네트워크 활동은 IT 관리자에게 공개됩니다."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"네트워크가 모니터링될 수 있습니다."</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"기기가 VPN에 연결되었습니다."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"직장 프로필이 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"개인 프로필이 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"기기가 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 제공하는 기기"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"기기 관리"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"이 기기에는 인증기관이 설치되어 있습니다. 보안 네트워크 트래픽을 모니터링 또는 수정할 수 있습니다."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"관리자가 기기에서 발생하는 트래픽을 모니터링하는 네트워크 로깅을 사용 설정했습니다."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"관리자가 직장 프로필에서 발생하는 트래픽을 모니터링하는 네트워크 로깅을 사용 설정했습니다. 하지만 개인 프로필은 모니터링되지 않습니다."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"<xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다. 이 앱은 이메일, 앱, 웹사이트와 같은 내 네트워크 활동을 모니터링할 수 있습니다."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> 및 <xliff:g id="VPN_APP_1">%2$s</xliff:g>에 연결되었습니다. 이 앱은 이메일, 앱, 웹사이트와 같은 내 네트워크 활동을 모니터링할 수 있습니다."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"직장 프로필이 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다. 이 앱은 이메일, 앱, 웹사이트와 같은 내 네트워크 활동을 모니터링할 수 있습니다."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"개인 프로필이 <xliff:g id="VPN_APP">%1$s</xliff:g>에 연결되었습니다. 이 앱은 이메일, 앱, 웹사이트와 같은 내 네트워크 활동을 모니터링할 수 있습니다."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"공개 VPN 설정"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"부모님이 관리하는 기기입니다. 부모님이 내가 사용하는 앱, 내 위치, 기기 사용 시간과 같은 정보를 보고 관리할 수 있습니다."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"우선순위"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> 앱은 대화 기능을 지원하지 않습니다."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"이 알림은 수정할 수 없습니다."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"전화 알림은 수정할 수 없습니다."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"이 알림 그룹은 여기에서 설정할 수 없습니다."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"프록시를 통한 알림"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"모든 <xliff:g id="APP_NAME">%1$s</xliff:g> 알림"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"브로드캐스트 이름"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"비밀번호"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"저장"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"빌드 번호"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"빌드 번호가 클립보드에 복사되었습니다."</string> <string name="basic_status" msgid="2315371112182658176">"대화 열기"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"타일 추가"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"타일 추가 안함"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"사용자 선택"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">활성 상태인 앱 <xliff:g id="COUNT_1">%s</xliff:g>개</item> + <item quantity="one">활성 상태인 앱 <xliff:g id="COUNT_0">%s</xliff:g>개</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"새로운 정보"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"활성 상태의 앱"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"앱을 사용하고 있지 않아도 활성 상태가 유지되므로 배터리 수명에 영향을 줄 수 있습니다."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"중지"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"중지됨"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"완료"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 9314c9d0f9f7..1caca3aa2f9d 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -33,14 +33,14 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"Жок, рахмат"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Экранды авто буруу"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүн колдоно берсинби?"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу үчүн <xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүнө мүмкүнчүлүк алууга уруксат бересизби?\nБул колдонмонун жаздырууга уруксаты жок, бирок бул USB түзмөгү аркылуу аудиону жаздыра алат."</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүн колдоно берсинби?\nБул колдонмого жаздырууга уруксат берилген эмес, бирок ушул USB түзмөгү аркылуу үндөрдү жаза алат."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_DEVICE">%2$s</xliff:g> кабелин колдоно берсинби?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүн колдонуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосун ачасызбы?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Бул колдонмонун жаздырууга уруксаты жок, бирок бул USB түзмөгү аркылуу аудиону жаздыра алат. <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосун бул түзмөктө иштетсеңиз, чалууларды, билдирмелерди жана ойготкучтарды уга албай калышыңыз мүмкүн."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Колдонмо аудио жаздырууга уруксат алган эмес, бирок ушул USB түзмөк аркылуу жаза алат. \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" колдонмосун ушул түзмөк менен колдонуп жатканда, билдирмелердин, чалуулардын жана ойготкучтардын үнүн укпай калышыңыз мүмкүн."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосун бул түзмөктө иштетсеңиз, чалууларды, билдирмелерди жана ойготкучтарды уга албай калышыңыз мүмкүн."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> кабелин колдоно берсинби?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүнө туташуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу ачылсынбы?"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> кабелине туташуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> ачылсынбы?\nБул колдонмонун жаздырууга уруксаты жок, бирок бул USB түзмөгү аркылуу аудиону жаздыра алат."</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүн колдонуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосун ачасызбы?\nБул колдонмого жаздырууга уруксат берилген эмес, бирок ушул USB түзмөгү аркылуу үндөрдү жаза алат."</string> <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> колдонуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосун ачасызбы?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Эч бир орнотулган колдонмо USB аксессуар м-н иштебейт. Кенен маалыматтар: <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"USB шайманы"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Бул түзмөк уюмуңузга таандык. Уюмуңуз тармактын трафигин көзөмөлдөй алат"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> уюмуна таандык. Уюм тармактын трафигин көзөмөлдөй алат"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Бул түзмөктү <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> камсыздады."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Бул түзмөк уюмуңузга таандык жана <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташтырылган"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> уюмуна таандык жана <xliff:g id="VPN_APP">%2$s</xliff:g> колдонмосуна туташтырылган"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Бул түзмөк уюмуңузга таандык"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Бул түзмөк төмөнкүгө таандык: <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Бул түзмөк уюмуңузга таандык жана VPN\'дерге туташтырылган"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> уюмуна таандык жана VPN\'дерге туташтырылган"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ишканаңыз жумуш профилиңиздин тармак трафигин көзөмөлдөй алат"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> жумуш профилиңиздеги тармак трафигин көзөмөлдөй алат"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Жумуш профилинин тармактагы аракеттери IT администраторуна көрүнөт"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Тармак көзөмөлдөнүшү мүмкүн"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Бул түзмөк VPN\'дерге туташтырылган"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Жумуш профилиңиз <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташып турат"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Жеке профилиңиз <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташтырылган"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Бул түзмөк <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташтырылган"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Бул түзмөктү <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> камсыздады."</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Түзмөктү башкаруу"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Бул түзмөктө тастыктоочу борбор орнотулган. Коопсуз тармагыңыздын трафиги көзөмөлдөнүп же өзгөртүлүшү мүмкүн."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Администраторуңуз түзмөгүңүздөгү трафикти көзөмөлдөөчү тармактын таржымалын каттоо функциясын иштетти."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Администраторуңуз жумуш профилиңиздеги трафикке көз салуу үчүн, тармактын таржымалын иштетип койду (жеке профилиңизден маалымат алынбайт)."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Электрондук почта, колдонмолор жана вебсайттар сыяктуу тармактагы аракеттериңизди тескей турган <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташып турасыз."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Электрондук почта, колдонмолор жана вебсайттар сыяктуу тармактагы аракеттериңизди көзөмөлдөй турган <xliff:g id="VPN_APP_0">%1$s</xliff:g> жана <xliff:g id="VPN_APP_1">%2$s</xliff:g> колдонмолоруна туташып турасыз."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Жумуш профилиңиз электрондук почта, колдонмолор жана вебсайттар сыяктуу тармактык аракеттериңизди көзөмөлдөй турган <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташып турат."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Жеке профилиңиз электрондук почта, колдонмолор жана вебсайттар сыяктуу тармактагы аракеттериңизди көзөмөлдөй турган <xliff:g id="VPN_APP">%1$s</xliff:g> колдонмосуна туташып турат."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN жөндөөлөрүн ачуу"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Бул түзмөктү ата-энең башкарат. Ата-энең сен иштеткен колдонмолорду, кайда жүргөнүңдү жана түзмөктү канча убакыт колдонгонуңду көрүп, башкарып турат."</string> @@ -459,7 +471,7 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Телефонуңуз менен тез жана коопсуз сатып алуу үчүн жөндөңүз"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Баарын көрсөтүү"</string> <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Картаны кошуу"</string> - <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Жаңыртылууда"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Жаңырууда"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Колдонуу үчүн кулпусун ачыңыз"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Кыйытмаларды алууда ката кетти. Бир аздан кийин кайталап көрүңүз."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Кулпуланган экран жөндөөлөрү"</string> @@ -492,8 +504,8 @@ <string name="notification_automatic_title" msgid="3745465364578762652">"Автоматтык"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Үнү чыкпайт жана дирилдебейт"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Үнү чыкпайт же дирилдебейт жана сүйлөшүүлөр тизмесинин ылдый жагында көрүнөт"</string> - <string name="notification_channel_summary_default" msgid="3282930979307248890">"Телефондун жөндөөлөрүнө жараша шыңгырап же дирилдеши мүмкүн"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Телефондун жөндөөлөрүнө жараша шыңгырап же дирилдеши мүмкүн. <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосундагы жазышуулар демейки жөндөө боюнча калкып чыкма билдирмелер түрүндө көрүнөт."</string> + <string name="notification_channel_summary_default" msgid="3282930979307248890">"Телефондун параметрлерине жараша шыңгырап же дирилдеши мүмкүн"</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Телефондун параметрлерине жараша шыңгырап же дирилдеши мүмкүн. <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосундагы жазышуулар демейки жөндөө боюнча калкып чыкма билдирмелер түрүндө көрүнөт."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Билдирменин үнүн чыгартууну же басууну тутумга тапшырыңыз"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Абалы:</b> Демейкиге өзгөрдү"</string> <string name="notification_channel_summary_automatic_silenced" msgid="7403004439649872047">"<b>Абалы:</b> Үнсүз абалга төмөндөдү"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Кабарлоонун аталышы"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Сырсөз"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Сактоо"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Курама номери"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Курама номери алмашуу буферине көчүрүлдү."</string> <string name="basic_status" msgid="2315371112182658176">"Ачык сүйлөшүү"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Ыкчам баскыч кошуу"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ыкчам баскыч кошулбасын"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Колдонуучуну тандоо"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> колдонмо иштеп жатат</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> колдонмо иштеп жатат</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Жаңы маалымат"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Жигердүү колдонмолор"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Бул колдонмолорду пайдаланбасаңыз да, алар иштеп, батареянын кубатынын мөөнөтүн азайтып жатышы мүмкүн"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Токтотуу"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Токтотулду"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Бүттү"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 2a52ab60364e..ce978d6b877f 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ອົງການຂອງທ່ານເປັນເຈົ້າຂອງອຸປະກອນນີ້ ແລະ ສາມາດຕິດຕາມທຣາບຟິກເຄືອຂ່າຍໄດ້"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ເປັນເຈົ້າຂອງອຸປະກອນນີ້ ແລະ ສາມາດຕິດຕາມທຣາບຟິກເຄືອຂ່າຍໄດ້"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ອຸປະກອນນີ້ແມ່ນສະໜອງໃຫ້ໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ອຸປະກອນນີ້ເປັນຂອງອົງການທ່ານ ແລະ ເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ອຸປະກອນນີ້ເປັນຂອງ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ແລະ ເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%2$s</xliff:g> ແລ້ວ"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ອຸປະກອນນີ້ເປັນຂອງອົງການທ່ານ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ອຸປະກອນນີ້ເປັນຂອງ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ອຸປະກອນນີ້ເປັນຂອງອົງການທ່ານ ແລະ ເຊື່ອມຕໍ່ຫາ VPN ແລ້ວ"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ອຸປະກອນນີ້ເປັນຂອງ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ແລະ ເຊື່ອມຕໍ່ຫາ VPN ແລ້ວ"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ອົງກອນຂອງທ່ານສາມາດຕິດຕາມທຣາບຟິກເຄືອຂ່າຍໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານໄດ້"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ສາມາດຕິດຕາມທຣາບຟິກເຄືອຂ່າຍໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານໄດ້"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ການເຄື່ອນໄຫວເຄືອຂ່າຍໂປຣໄຟລ໌ບ່ອນເຮັດວຽກແມ່ນສະແດງໃຫ້ຜູ້ເບິ່ງແຍງໄອທີຂອງທ່ານເຫັນໄດ້"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ເຄືອຂ່າຍອາດຖືກຕິດຕາມ"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານເຊື່ອມຕໍ່ຫາ VPN ແລ້ວ"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"ໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ອຸປະກອນນີ້ເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ອຸປະກອນນີ້ແມ່ນສະໜອງໃຫ້ໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ການຈັດການອຸປະກອນ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ມີອຳນາດໃບຮັບຮອງຕິດຕັ້ງຢູ່ໃນອຸປະກອນນີ້. ທຣາບຟິກເຄືອຂ່າຍທີ່ເຂົ້າລະຫັດໄວ້ຂອງທ່ານອາດຖືກຕິດຕາມ ຫຼື ແກ້ໄຂໄດ້."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ຜູ້ເບິ່ງແຍງຂອງທ່ານໄດ້ເປີດໃຊ້ການບັນທຶກເຄືອຂ່າຍໄວ້, ເຊິ່ງຈະຕິດຕາມທຣາບຟິກໃນອຸປະກອນຂອງທ່ານ."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ຜູ້ເບິ່ງແຍງຂອງທ່ານໄດ້ເປີດໃຊ້ການບັນທຶກເຄືອຂ່າຍໄວ້, ເຊິ່ງຈະຕິດຕາມທຣາບຟິກໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ ແຕ່ຈະບໍ່ຕິດຕາມໃນໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານ."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"ທ່ານເຊື່ອມຕໍ່ກັບ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ, ເຊິ່ງຈະສາມາດຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍ, ຮວມທັງອີເມວ, ແອັບ ແລະ ເວັບໄຊຕ່າງໆຂອງທ່ານໄດ້."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ທ່ານເຊື່ອມຕໍ່ກັບ <xliff:g id="VPN_APP_0">%1$s</xliff:g> ແລະ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ແລ້ວ, ເຊິ່ງຈະສາມາດຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍ, ຮວມທັງອີເມວ, ແອັບ ແລະ ເວັບໄຊຕ່າງໆຂອງທ່ານໄດ້."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານເຊື່ອມຕໍ່ຫາ <xliff:g id="VPN_APP">%1$s</xliff:g>, ເຊິ່ງສາມາດຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍຂອງທ່ານ, ຮວມເຖິງອີເມວ, ແອັບ ແລະ ເວັບໄຊ."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"ໂປຣໄຟລ໌ສ່ວນຕົວຂອງທ່ານເຊື່ອມຕໍ່ກັບ <xliff:g id="VPN_APP">%1$s</xliff:g> ແລ້ວ, ເຊິ່ງສາມາດຕິດຕາມການເຄື່ອນໄຫວເຄືອຂ່າຍ, ຮວມທັງອີເມວ, ແອັບ ແລະ ເວັບໄຊຕ່າງໆຂອງທ່ານໄດ້."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"ເປີດການຕັ້ງຄ່າ VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍພໍ່ແມ່ຂອງທ່ານ. ພໍ່ແມ່ຂອງທ່ານສາມາດເບິ່ງ ແລະ ຈັດການຂໍ້ມູນໄດ້ ເຊັ່ນ: ແອັບທີ່ທ່ານໃຊ້, ສະຖານທີ່ ແລະ ເວລາໜ້າຈໍຂອງທ່ານ."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ຊື່ການອອກອາກາດ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"ລະຫັດຜ່ານ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ບັນທຶກ"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ໝາຍເລກສ້າງ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ສຳເນົາໝາຍເລກສ້າງໄປໃສ່ຄລິບບອດແລ້ວ."</string> <string name="basic_status" msgid="2315371112182658176">"ເປີດການສົນທະນາ"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ເພີ່ມແຜ່ນ"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ຢ່າເພີ່ມແຜ່ນ"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ເລືອກຜູ້ໃຊ້"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ແອັບນຳໃຊ້ຢູ່</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ແອັບນຳໃຊ້ຢູ່</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ຂໍ້ມູນໃໝ່"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ແອັບທີ່ນຳໃຊ້ຢູ່"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ເຖິງແມ່ນວ່າທ່ານຈະບໍ່ໄດ້ກຳລັງໃຊ້ແອັບເຫຼົ່ານີ້, ພວກມັນກໍຍັງຄົງນຳໃຊ້ຢູ່ ແລະ ອາດກະທົບກັບອາຍຸແບັດເຕີຣີໄດ້"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ຢຸດ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ຢຸດແລ້ວ"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ແລ້ວໆ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 6a7898a2e2fe..8177a90e443c 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -353,7 +353,7 @@ <string name="user_remove_user_message" msgid="6702834122128031833">"Bus ištrinti visi šio naudotojo duomenys ir programos."</string> <string name="user_remove_user_remove" msgid="8387386066949061256">"Pašalinti"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> galės pasiekti visą informaciją, matomą ekrane ir leidžiamą iš įrenginio įrašant ar perduodant turinį. Tai apima įvairią informaciją, pvz., slaptažodžius, išsamią mokėjimo informaciją, nuotraukas, pranešimus ir leidžiamus garso įrašus."</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Šią funkcija teikianti paslauga galės pasiekti visą informaciją, matomą ekrane ir leidžiamą iš įrenginio įrašant ar perduodant turinį. Tai apima įvairią informaciją, pvz., slaptažodžius, išsamią mokėjimo informaciją, nuotraukas, pranešimus ir leidžiamus garso įrašus."</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"Šią funkciją teikianti paslauga galės pasiekti visą informaciją, matomą ekrane ir leidžiamą iš įrenginio įrašant ar perduodant turinį. Tai apima įvairią informaciją, pvz., slaptažodžius, išsamią mokėjimo informaciją, nuotraukas, pranešimus ir leidžiamus garso įrašus."</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"Pradėti įrašyti ar perduoti turinį?"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"Pradėti įrašyti ar perduoti turinį naudojant „<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>“?"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"Viską išvalyti"</string> @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Šis įrenginys priklauso jūsų organizacijai ir ji gali stebėti tinklo srautą"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Šis įrenginys priklauso „<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>“ ir ji gali stebėti tinklo srautą"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Šį įrenginį teikia „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Šis įrenginys priklauso jūsų organizacijai ir yra susietas su „<xliff:g id="VPN_APP">%1$s</xliff:g>“"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Šis įrenginys priklauso „<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>“ ir yra susietas su „<xliff:g id="VPN_APP">%2$s</xliff:g>“"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Šis įrenginys priklauso jūsų organizacijai"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Šis įrenginys priklauso „<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>“"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Šis įrenginys priklauso jūsų organizacijai ir yra prijungtas prie VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Šis įrenginys priklauso „<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>“ ir yra prijungtas prie VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Jūsų organizacija darbo profilyje gali stebėti tinklo srautą"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"„<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>“ darbo profilyje gali stebėti tinklo srautą"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Darbo profilio tinklo veiklą mato jūsų IT administratorius"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Tinklas gali būti stebimas"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Šis įrenginys prijungtas prie VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Darbo profilis susietas su „<xliff:g id="VPN_APP">%1$s</xliff:g>“"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Asmeninis profilis susietas su „<xliff:g id="VPN_APP">%1$s</xliff:g>“"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Šis įrenginys susietas su „<xliff:g id="VPN_APP">%1$s</xliff:g>“"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Šį įrenginį teikia „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Įrenginio tvarkymas"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Šiame įrenginyje įdiegtas sertifikato įgaliojimas. Jūsų saugaus tinklo srautas gali būti stebimas arba keičiamas."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratorius įjungė tinklo duomenų įrašymą į žurnalą. Įjungus šią funkciją stebimas srautas jūsų įrenginyje."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratorius įjungė tinklo duomenų įrašymą į žurnalą. Įjungus šią funkciją stebimas srautas jūsų darbo, bet ne asmeniniame profilyje."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Esate prisijungę prie programos „<xliff:g id="VPN_APP">%1$s</xliff:g>“, kuri gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir svetaines."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Esate prisijungę prie programų „<xliff:g id="VPN_APP_0">%1$s</xliff:g>“ ir „<xliff:g id="VPN_APP_1">%2$s</xliff:g>“, kurios gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir svetaines."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Darbo profilis susietas su programa „<xliff:g id="VPN_APP">%1$s</xliff:g>“, kuri gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir svetaines."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Asmeninis profilis susietas su programa „<xliff:g id="VPN_APP">%1$s</xliff:g>“, kuri gali stebėti tinklo veiklą, įskaitant el. laiškus, programas ir svetaines."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Atidaryti VPN nustatymus"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Šį įrenginį tvarko vienas iš tavo tėvų. Jis gali peržiūrėti ir tvarkyti informaciją, pvz., tavo naudojamas programas, vietovę ir įrenginio naudojimo laiką."</string> @@ -508,12 +520,11 @@ <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, burbule"</string> <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, pertraukia netrukdymo režimą"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, debesėlyje, pertraukia netrukdymo režimą"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Rodoma pokalbių pranešimų viršuje ir kaip profilio nuotrauka užrakinimo ekrane, burbule, pertraukia netrukdymo režimą"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritetiniai"</string> <string name="no_shortcut" msgid="8257177117568230126">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ nepalaiko pokalbių funkcijų"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šių pranešimų keisti negalima."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Skambučių pranešimų keisti negalima."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Šios grupės pranešimai čia nekonfigūruojami"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Per tarpinį serverį gautas pranešimas"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Visi „<xliff:g id="APP_NAME">%1$s</xliff:g>“ pranešimai"</string> @@ -856,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Transliacijos pavadinimas"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Slaptažodis"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Išsaugoti"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versijos numeris"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versijos numeris nukopijuotas į iškarpinę."</string> <string name="basic_status" msgid="2315371112182658176">"Atidaryti pokalbį"</string> @@ -924,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Pridėti išklotinės elementą"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nepridėti išklotinės elemento"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Naudotojo pasirinkimas"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> programa yra aktyvi</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> programos yra aktyvios</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> programos yra aktyvi</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> programų yra aktyvios</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nauja informacija"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktyvios programos"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Net jei nenaudojate šių programų, jos vis tiek yra aktyvios ir gali paveikti akumuliatoriaus veikimo laiką"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Sustabdyti"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Sustabdyta"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Atlikta"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index b53e763470dc..56387ff7a60e 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Šī ierīce pieder jūsu organizācijai, un jūsu organizācija var uzraudzīt tīkla datplūsmu."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Šī ierīce pieder organizācijai<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, un šī organizācija var uzraudzīt tīkla datplūsmu."</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Šo ierīci nodrošina <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Šī ierīce pieder jūsu organizācijai un ir saistīta ar: <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Šī ierīce pieder organizācijai <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> un ir savienota ar: <xliff:g id="VPN_APP">%2$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Šī ierīce pieder jūsu organizācijai."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Šī ierīce pieder organizācijai <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Šī ierīce pieder jūsu organizācijai un ir savienota ar virtuālajiem privātajiem tīkliem."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Šī ierīce pieder organizācijai<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> un ir savienota ar virtuālajiem privātajiem tīkliem."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Jūsu organizācija var uzraudzīt jūsu darba profila tīkla datplūsmu."</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> var uzraudzīt jūsu profila tīkla datplūsmu."</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT administrators var skatīt tīklā veiktās darbības, kurām izmantojat darba profilu"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Var tikt pārraudzītas tīklā veiktās darbības."</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Šī ierīce ir saistīta ar virtuālajiem privātajiem tīkliem."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Jūsu darba profils ir savienots ar: <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Jūsu personīgais profils ir saistīts ar: <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Šī ierīce ir savienota ar: <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Šo ierīci nodrošina <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Ierīces pārvaldība"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Šajā ierīcē ir instalēts sertifikāts. Drošā tīkla datplūsma var tikt uzraudzīta."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrators ieslēdza tīkla reģistrēšanu, kuru izmanto, lai pārraudzītu datplūsmu jūsu ierīcē."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrators ir ieslēdzis tīkla reģistrēšanu, kuru izmanto, lai pārraudzītu datplūsmu jūsu darba profilā, bet ne personīgajā profilā."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Ir izveidots savienojums ar lietotni <xliff:g id="VPN_APP">%1$s</xliff:g>, kas var pārraudzīt jūsu darbības tīklā, tostarp e-pasta ziņojumus, lietotnes un vietnes."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Ir izveidots savienojums ar lietotnēm <xliff:g id="VPN_APP_0">%1$s</xliff:g> un <xliff:g id="VPN_APP_1">%2$s</xliff:g>, kas var pārraudzīt jūsu darbības tīklā, tostarp e-pasta ziņojumus, lietotnes un vietnes."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Jūsu darba profilam ir izveidots savienojums ar lietotni <xliff:g id="VPN_APP">%1$s</xliff:g>, kas var pārraudzīt jūsu darbības tīklā, tostarp saņemtos un nosūtītos e-pasta ziņojumus, instalētās lietotnes un apmeklētās tīmekļa vietnes."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Jūsu personīgais profils ir piesaistīts lietotnei <xliff:g id="VPN_APP">%1$s</xliff:g>, kas var pārraudzīt jūsu darbības tīklā, tostarp saņemtos un nosūtītos e-pasta ziņojumus, instalētās lietotnes un apmeklētās tīmekļa vietnes."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Atvērt VPN iestatījumus"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Šo ierīci pārvalda viens no jūsu vecākiem. Vecāki var skatīt un pārvaldīt tādu informāciju kā jūsu izmantotās lietotnes, atrašanās vieta un izmantošanas ilgums."</string> @@ -509,8 +521,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioritārs"</string> <string name="no_shortcut" msgid="8257177117568230126">"Lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> netiek atbalstītas sarunu funkcijas."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Šos paziņojumus nevar modificēt."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Paziņojumus par zvaniem nevar modificēt."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Šeit nevar konfigurēt šo paziņojumu grupu."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Starpniekservera paziņojums"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Visi lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> paziņojumi"</string> @@ -850,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Apraides nosaukums"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Parole"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Saglabāt"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versijas numurs"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versijas numurs ir kopēts starpliktuvē."</string> <string name="basic_status" msgid="2315371112182658176">"Atvērt sarunu"</string> @@ -918,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Pievienot elementu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nepievienot elementu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Lietotāja atlase"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="zero"><xliff:g id="COUNT_1">%s</xliff:g> lietotnes ir aktīvas</item> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> lietotne ir aktīva</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> lietotnes ir aktīvas</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Jauna informācija"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktīvās lietotnes"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Pat ja neizmantojat šīs lietotnes, tās joprojām ir aktīvas un var ietekmēt akumulatora darbības ilgumu."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Apturēt"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Apturēta"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gatavs"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 2dee0e053d2c..5af019983496 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -242,7 +242,7 @@ <string name="quick_settings_brightness_dialog_title" msgid="4980669966716685588">"Осветленост"</string> <string name="quick_settings_inversion_label" msgid="3501527749494755688">"Инверзија на боите"</string> <string name="quick_settings_color_correction_label" msgid="5636617913560474664">"Корекција на боите"</string> - <string name="quick_settings_more_user_settings" msgid="1064187451100861954">"Поставки на корисникот"</string> + <string name="quick_settings_more_user_settings" msgid="1064187451100861954">"Кориснички поставки"</string> <string name="quick_settings_done" msgid="2163641301648855793">"Готово"</string> <string name="quick_settings_close_user_panel" msgid="5599724542275896849">"Затвори"</string> <string name="quick_settings_connected" msgid="3873605509184830379">"Поврзано"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Организацијата е сопственик на уредов и може да го следи мрежниот сообраќај"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> е сопственик на уредов и може да го следи мрежниот сообраќај"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> го обезбедува уредов"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Уредов е во сопственост на организацијата и е поврзан со <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Уредов е во сопственост на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и е поврзан со <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Уредов е во сопственост на организацијата"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Уредов е во сопственост на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Уредов е во сопственост на организацијата и е поврзан со VPN-мрежи"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Уредов е во сопственост на <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и е поврзан со VPN-мрежи"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Вашата организација може да го следи мрежниот сообраќај на вашиот работен профил"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> може да го следи мрежниот сообраќај на вашиот работен профил"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Мрежната активност на работниот профил е видлива за IT-администраторот"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Мрежата можеби се следи"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Уредов е поврзан со VPN-мрежи"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Вашиот работен профил е поврзан со <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Вашиот личен профил е поврзан со <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Уредов е поврзан со <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> го обезбедува уредов"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Управување со уреди"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На уредов е инсталиран авторитет за сертификат. Вашиот безбеден мрежен сообраќај можно е да се следи или изменува."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Вашиот администратор вклучил евиденција на мрежата, што подразбира следење на сообраќајот на вашиот уред."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Вашиот администратор вклучил мрежна евиденција, што подразбира следење на сообраќајот во работниот, но не и во личниот профил."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Поврзани сте на <xliff:g id="VPN_APP">%1$s</xliff:g>, што може да ја следи вашата активност на мрежата, вклучувајќи ги е-пораките, апликациите и веб-сајтовите."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Поврзани сте на <xliff:g id="VPN_APP_0">%1$s</xliff:g> и <xliff:g id="VPN_APP_1">%2$s</xliff:g>, што може да ја следат вашата активност на мрежата, вклучувајќи ги е-пораките, апликациите и веб-сајтовите."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Вашиот работен профил е поврзан на <xliff:g id="VPN_APP">%1$s</xliff:g>, што може да ја следи вашата активност на мрежата, заедно со е-пораките, апликациите и веб-сајтовите."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Вашиот личен профил е поврзан на <xliff:g id="VPN_APP">%1$s</xliff:g>, што може да ја следи вашата активност на мрежата, заедно со е-пораките, апликациите и веб-сајтовите."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Отворете „Поставки за VPN“"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Родителот управува со уредов. Родителот може да прегледува и управува со податоците, како што се апликациите што ги користиш, твојата локација и времето поминато на уредот."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Приоритетно"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не поддржува функции за разговор"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Овие известувања не може да се изменат"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Известувањата за повици не може да се изменат."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Оваа група известувања не може да се конфигурира тука"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Известување преку прокси"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Сите известувања од <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Назив на емитувањето"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Лозинка"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Зачувај"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Број на верзија"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Бројот на верзијата е копиран во привремената меморија."</string> <string name="basic_status" msgid="2315371112182658176">"Започни разговор"</string> @@ -894,7 +909,7 @@ <string name="mobile_data_settings_title" msgid="3955246641380064901">"Мобилен интернет"</string> <string name="preference_summary_default_combination" msgid="8453246369903749670">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string> <string name="mobile_data_connection_active" msgid="944490013299018227">"Поврзано"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Мобилниот интернет не може автоматски да се поврзе"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Мобилниот интернет не може да се поврзе автоматски"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Нема интернет-врска"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Нема други достапни мрежи"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Нема достапни мрежи"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Додајте плочка"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Не додавајте плочка"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Изберете корисник"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one">Активни се <xliff:g id="COUNT_1">%s</xliff:g> апликација</item> + <item quantity="other">Активни се <xliff:g id="COUNT_1">%s</xliff:g> апликации</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нови информации"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активни апликации"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Дури и ако не ги користите овие апликации, тие сè уште се активни и може да влијаат на траењето на батеријата"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Запри"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Запрено"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Готово"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index e32e3051e7ea..fa241857aeed 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ഈ ഉപകരണം നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ ഉടമസ്ഥതയിലായതിനാൽ നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിച്ചേക്കാം"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"ഈ ഉപകരണം <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> എന്ന സ്ഥാപനത്തിന്റെ ഉടമസ്ഥതയിലായതിനാൽ നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിച്ചേക്കാം"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> നൽകിയ ഉപകരണമാണിത്"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ഈ ഉപകരണം നിങ്ങളുടെ സ്ഥാപനത്തിന്റേതാണ്, കൂടാതെ <xliff:g id="VPN_APP">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ഈ ഉപകരണം <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> എന്ന സ്ഥാപനത്തിന്റേതാണ്, കൂടാതെ <xliff:g id="VPN_APP">%2$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ഈ ഉപകരണം നിങ്ങളുടെ സ്ഥാപനത്തിന്റേതാണ്"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ഈ ഉപകരണം <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> എന്ന സ്ഥാപനത്തിന്റേതാണ്"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ഈ ഉപകരണം നിങ്ങളുടെ സ്ഥാപനത്തിന്റേതാണ്, കൂടാതെ VPN-കളിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ഈ ഉപകരണം <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> എന്ന സ്ഥാപനത്തിന്റേതാണ്, കൂടാതെ VPN-കളിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിലെ നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിക്കാൻ നിങ്ങളുടെ സ്ഥാപനത്തിന് കഴിഞ്ഞേക്കാം"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിലെ നെറ്റ്വർക്ക് ട്രാഫിക്ക് <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> നിരീക്ഷിച്ചേക്കാം"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ഔദ്യോഗിക പ്രൊഫൈലിലെ നെറ്റ്വര്ക്ക് ആക്റ്റിവിറ്റി ഐടി അഡ്മിന് കാണാനാകും"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"നെറ്റ്വർക്ക് നിരീക്ഷിക്കപ്പെടാം"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ഈ ഉപകരണം VPN-കളിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"<xliff:g id="VPN_APP">%1$s</xliff:g> എന്നതിലേക്ക് നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"നിങ്ങളുടെ വ്യക്തിപരമായ പ്രൊഫൈൽ <xliff:g id="VPN_APP">%1$s</xliff:g> ആപ്പിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ഈ ഉപകരണം <xliff:g id="VPN_APP">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുന്നു"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> നൽകിയ ഉപകരണമാണിത്"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ഉപകരണ മാനേജ്മെന്റ്"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിരിക്കുന്നു. നിങ്ങളുടെ സുരക്ഷിത നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിക്കപ്പെടുകയോ പരിഷ്കരിക്കപ്പെടുയോ ചെയ്തേക്കാം."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"നിങ്ങളുടെ അഡ്മിൻ, നെറ്റ്വർക്ക് ലോഗിംഗ് ഓണാക്കിയിട്ടുണ്ട്, ഇതിന് നിങ്ങളുടെ ഉപകരണത്തിലെ ട്രാഫിക്ക് നിരീക്ഷിക്കാൻ കഴിയും."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"നിങ്ങളുടെ അഡ്മിൻ നെറ്റ്വർക്ക് ലോഗിംഗ് ഓണാക്കി, ഇത് നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിലെ ട്രാഫിക് നിരീക്ഷിക്കുന്നു എന്നാൽ വ്യക്തിപരമായ പ്രൊഫൈലിലെ ട്രാഫിക് നിരീക്ഷിക്കുന്നില്ല."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"നിങ്ങൾ <xliff:g id="VPN_APP">%1$s</xliff:g> എന്ന ആപ്പിലേക്ക് കണക്റ്റുചെയ്തിരിക്കുന്നു, ഇമെയിലുകൾ, ആപ്പുകൾ, വെബ്സൈറ്റുകൾ എന്നിവ ഉൾപ്പെടെ നിങ്ങളുടെ നെറ്റ്വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കാൻ ഈ ആപ്പിന് കഴിയും."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"നിങ്ങൾ <xliff:g id="VPN_APP_0">%1$s</xliff:g>, <xliff:g id="VPN_APP_1">%2$s</xliff:g> എന്നീ ആപ്പുകളിലേക്ക് കണക്റ്റുചെയ്തിരിക്കുന്നു, ഇമെയിലുകൾ, ആപ്പുകൾ, വെബ്സൈറ്റുകൾ എന്നിവ ഉൾപ്പെടെ നിങ്ങളുടെ നെറ്റ്വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കാൻ ഈ ആപ്പിന് കഴിയും."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"<xliff:g id="VPN_APP">%1$s</xliff:g> ആപ്പിലേക്ക് നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ കണക്റ്റുചെയ്തിരിക്കുന്നു, ഇമെയിലുകൾ, ആപ്സ്, വെബ്സൈറ്റുകൾ എന്നിവ ഉൾപ്പെടെ നിങ്ങളുടെ നെറ്റ്വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കാൻ ഈ ആപ്പിന് കഴിയും."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"<xliff:g id="VPN_APP">%1$s</xliff:g> ആപ്പിലേക്ക് നിങ്ങളുടെ വ്യക്തിഗത പ്രൊഫൈൽ കണക്റ്റുചെയ്തിരിക്കുന്നു, ഇമെയിലുകൾ, ആപ്പുകൾ, വെബ്സൈറ്റുകൾ എന്നിവ ഉൾപ്പെടെ നിങ്ങളുടെ നെറ്റ്വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കാൻ ഈ ആപ്പിന് കഴിയും."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" 5"</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ക്രമീകരണം തുറക്കുക"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ഈ ഉപകരണം മാനേജ് ചെയ്യുന്നത് നിങ്ങളുടെ രക്ഷിതാവാണ്. നിങ്ങൾ ഉപയോഗിക്കുന്ന ആപ്പുകൾ, സ്ക്രീൻ സമയം, ലൊക്കേഷൻ എന്നിവ പോലുള്ള വിവരങ്ങൾ നിങ്ങളുടെ രക്ഷിതാവിന് കാണാനും നിയന്ത്രിക്കാനുമാകും."</string> @@ -843,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ബ്രോഡ്കാസ്റ്റിന്റെ പേര്"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"പാസ്വേഡ്"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"സംരക്ഷിക്കുക"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"ആരംഭിക്കുന്നു…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"ബ്രോഡ്കാസ്റ്റ് ചെയ്യാനാകുന്നില്ല"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ബിൽഡ് നമ്പർ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ക്ലിപ്പ്ബോർഡിലേക്ക് ബിൽഡ് നമ്പർ പകർത്തി."</string> <string name="basic_status" msgid="2315371112182658176">"സംഭാഷണം തുറക്കുക"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ടൈൽ ചേർക്കുക"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ടൈൽ ചേർക്കരുത്"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ഉപയോക്താവിനെ തിരഞ്ഞെടുക്കൂ"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ആപ്പുകൾ സജീവമാണ്</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ആപ്പ് സജീവമാണ്</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"പുതിയ വിവരങ്ങൾ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"സജീവമായ ആപ്പുകൾ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"നിങ്ങൾ ഈ ആപ്പുകൾ ഉപയോഗിക്കുന്നില്ലെങ്കിൽ പോലും അവ ഇപ്പോഴും സജീവമാണ്, ഇത് ബാറ്ററി ലൈഫിനെ ബാധിച്ചേക്കാം"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"നിർത്തുക"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"നിർത്തി"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"പൂർത്തിയായി"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index b953a28fee35..0bb6ecb851cc 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Танай байгууллага энэ төхөөрөмжийг эзэмшдэг бөгөөд сүлжээний ачааллыг хянаж болно"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> энэ төхөөрөмжийг эзэмшдэг бөгөөд сүлжээний ачааллыг хянаж болно"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>-с нийлүүлдэг"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Энэ төхөөрөмж танай байгууллагад харьяалагддаг бөгөөд <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Энэ төхөөрөмж <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-д харьяалагддаг бөгөөд <xliff:g id="VPN_APP">%2$s</xliff:g>-д холбогдсон байна"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Энэ төхөөрөмж танай байгууллагад харьяалагддаг"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Энэ төхөөрөмж <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-д харьяалагддаг"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Энэ төхөөрөмж танай байгууллагад харьяалагддаг бөгөөд VPN-д холбогдсон байна"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Энэ төхөөрөмж <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>-д харьяалагддаг бөгөөд VPN-д холбогдсон байна"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Таны байгууллага таны ажлын профайлын сүлжээний ачааллыг хянадаг"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> таны ажлын профайлын сүлжээний ачааллыг хянадаг"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Таны IT админд ажлын профайлын сүлжээний үйл ажиллагаа харагдана"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Сүлжээг хянаж байж болзошгүй"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Энэ төхөөрөмж VPN-д холбогдсон байна"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Таны ажлын профайл <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Таны хувийн профайл <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Энэ төхөөрөмж <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>-с нийлүүлдэг"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Төхөөрөмжийн удирдлага"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Сертификатын зөвшөөрлийг энэ төхөөрөмжид суулгасан байна. Таны аюулгүй сүлжээний ачааллыг өөрчлөх эсвэл хянах боломжтой."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Таны админ төхөөрөмжийн ачааллыг хянадаг сүлжээний логийг асаасан байна."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Таны админ ажлын профайлын тань ачааллыг хянадаг сүлжээний логийг асаасан бөгөөд энэ нь хувийн профайлын ачааллыг хянахгүй."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Та имэйл, апп, веб хуудас зэрэг сүлжээний үйл ажиллагааг хянах боломжтой <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Та имэйл, апп, веб хуудас зэрэг сүлжээний үйл ажиллагааг хянах боломжтой <xliff:g id="VPN_APP_0">%1$s</xliff:g>, <xliff:g id="VPN_APP_1">%2$s</xliff:g>-д холбогдсон байна."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Таны ажлын профайл <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбогдсон байна. Энэ нь таны имэйл, апп, веб хуудас зэрэг сүлжээний үйл ажиллагааг хянах боломжтой."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Таны хувийн профайлыг имэйл, апп, веб хуудас зэрэг сүлжээний үйл ажиллагааг хянах боломжтой <xliff:g id="VPN_APP">%1$s</xliff:g>-д холбосон байна."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN тохиргоог нээх"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Энэ төхөөрөмжийг таны эцэг эх удирддаг. Таны эцэг эх таны хэрэглэдэг апп, байршил, дэлгэцийн цаг зэрэг мэдээллийг харж, удирдах боломжтой."</string> @@ -843,10 +855,12 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Нэвтрүүлэлтийн нэр"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Нууц үг"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Хадгалах"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"Эхлүүлж байна…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"Нэвтрүүлэх боломжгүй"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Хийцийн дугаар"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Хийцийн дугаарыг түр санах ойд хуулсан."</string> <string name="basic_status" msgid="2315371112182658176">"Харилцан яриаг нээх"</string> - <string name="select_conversation_title" msgid="6716364118095089519">"Харилцан ярианы жижиг хэрэгслүүд"</string> + <string name="select_conversation_title" msgid="6716364118095089519">"Харилцан ярианы виджетүүд"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Үндсэн нүүрэндээ нэмэх харилцан яриаг товшино уу"</string> <string name="no_conversations_text" msgid="5354115541282395015">"Таны сүүлийн харилцан яриа энд харагдана"</string> <string name="priority_conversations" msgid="3967482288896653039">"Чухал харилцан яриа"</string> @@ -911,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Хавтан нэмэх"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Хавтанг бүү нэм"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Хэрэглэгч сонгох"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> апп идэвхтэй байна</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> апп идэвхтэй байна</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Шинэ мэдээлэл"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Идэвхтэй аппууд"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Та эдгээр аппыг ашиглаагүй байсан ч тэдгээр нь идэвхтэй хэвээр байгаа бөгөөд батарейн ажиллах хугацаанд нөлөөлж болзошгүй"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Зогсоох"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Зогсоосон"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Болсон"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 4add96d210e8..3f1d07de419c 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -36,7 +36,7 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> ला <xliff:g id="USB_DEVICE">%2$s</xliff:g> अॅक्सेस करण्याची अनुमती द्यायची का?\nया अॅपला रेकॉर्ड करण्याची परवानगी दिलेली नाही पण या USB डिव्हाइसद्वारे ऑडिओ कॅप्चर केला जाऊ शकतो."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> ला <xliff:g id="USB_DEVICE">%2$s</xliff:g> अॅक्सेस करण्याची अनुमती द्यायची आहे का?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> हाताळण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> उघडायचे आहे का?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"या अॅपला रेकॉर्ड करण्याची परवानगी दिलेली नाही पण या USB डिव्हाइसद्वारे ऑडिओ कॅप्चर केला जाऊ शकतो. <xliff:g id="APPLICATION">%1$s</xliff:g> चा वापर या डिव्हाइससह केल्याने कॉल, सूचना आणि अलार्मचा आवाज कदाचित ऐकू येणार नाही."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"या अॅपला रेकॉर्ड करण्याची परवानगी दिलेली नाही, पण या USB डिव्हाइसद्वारे ऑडिओ कॅप्चर केला जाऊ शकतो. <xliff:g id="APPLICATION">%1$s</xliff:g> चा वापर या डिव्हाइससह केल्याने कॉल, सूचना आणि अलार्मचा आवाज कदाचित ऐकू येणार नाही."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"<xliff:g id="APPLICATION">%1$s</xliff:g> चा वापर या डिव्हाइससह केल्याने कॉल, सूचना आणि अलार्मचा आवाज कदाचित ऐकू येणार नाही."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> ला <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> अॅक्सेस करण्याची अनुमती द्यायची का?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> हाताळण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> उघडायचे का?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"तुमच्या संस्थेकडे या डिव्हाइसची मालकी आहे आणि ती नेटवर्क ट्रॅफिकचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> च्या मालकीचे आहे आणि ती नेटवर्क ट्रॅफिकचे परीक्षण करू शकते"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे पुरवले गेले आहे"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"हे डिव्हाइस तुमच्या संस्थेचे आहे आणि ते <xliff:g id="VPN_APP">%1$s</xliff:g> ला कनेक्ट केले आहे"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> चे आहे आणि ते <xliff:g id="VPN_APP">%2$s</xliff:g> ला कनेक्ट केले आहे"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"हे डिव्हाइस तुमच्या संस्थेचे आहे"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> चे आहे"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"हे डिव्हाइस तुमच्या संस्थेचे आहे आणि ते VPN ना कनेक्ट केले आहे"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> चे आहे आणि ते VPN ना कनेक्ट केले आहे"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"तुमची संस्था आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"तुमच्या IT ॲडमिनला कार्य प्रोफाइलची नेटवर्क अॅक्टिव्हिटी दृश्यमान आहे"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"हे डिव्हाइस VPN ला कनेक्ट केले आहे"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"तुमची कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> ला कनेक्ट केली"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"तुमची वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> ला कनेक्ट केली आहे"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"हे डिव्हाइस <xliff:g id="VPN_APP">%1$s</xliff:g> ला कनेक्ट केले आहे"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे पुरवले गेले आहे"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"डिव्हाइस व्यवस्थापन"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"या डिव्हाइसवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"आपल्या प्रशासकाने नेटवर्क लॉगिंग सुरू केले आहे, जे आपल्या डिव्हाइसवरील रहदारीचे परीक्षण करते."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"तुमच्या ॲडमिनने नेटवर्क लॉग इन सुरू केले आहे, जे तुमच्या कार्य प्रोफाइलमधील रहदारीचे निरीक्षण करत असले तरी तुमच्या वैयक्तिक प्रोफाइलमधील रहदारीचे निरीक्षण करत नाही."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"तुम्ही <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसहित आपल्या नेटवर्क क्रिया मॉनिटर करू शकते."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"तुम्ही <xliff:g id="VPN_APP_0">%1$s</xliff:g> आणि <xliff:g id="VPN_APP_1">%2$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसहित आपल्या नेटवर्क क्रिया मॉनिटर करू शकते."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"तुमचे कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"तुमचे वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN सेटिंग्ज उघडा"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"हे डिव्हाइस तुमच्या पालकाने व्यवस्थापित केले आहे. तुम्ही वापरत असलेली ॲप्स, तुमचे स्थान आणि तुमचा स्क्रीन वेळ यांसारखी माहिती तुमचे पालक पाहू आणि व्यवस्थापित करू शकतात."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"प्राधान्य"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> हे संभाषण वैशिष्ट्यांना सपोर्ट करत नाही"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"या सूचनांमध्ये सुधारणा केली जाऊ शकत नाही."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"कॉलशी संबंधित सूचनांमध्ये फेरबदल केला जाऊ शकत नाही."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"या सूचनांचा संच येथे कॉंफिगर केला जाऊ शकत नाही"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रॉक्सी केलेल्या सूचना"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"सर्व <xliff:g id="APP_NAME">%1$s</xliff:g> वरील सूचना"</string> @@ -844,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ब्रॉडकास्टचे नाव"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"पासवर्ड"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"सेव्ह करा"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"सुरू करत आहे…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"ब्रॉडकास्ट करू शकत नाही"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नंबर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नंबर क्लिपबोर्डवर कॉपी केला."</string> <string name="basic_status" msgid="2315371112182658176">"संभाषण उघडा"</string> @@ -912,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"टाइल जोडा"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"टाइल जोडू नका"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"वापरकर्ता निवडा"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> अॅप्स अॅक्टिव्ह आहेत</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> अॅप अॅक्टिव्ह आहे</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"नवीन माहिती"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"अॅक्टिव्ह ॲप्स"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"तुम्ही ही अॅप्स वापरत नसलात तरीही, ती अॅक्टिव्ह असतात आणि बॅटरी लाइफवर त्याचा परिणाम होऊ शकतो"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"थांबवा"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"थांबवले"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"पूर्ण झाले"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 4b31112a58f4..665e0e660065 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -36,7 +36,7 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Benarkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nApl ini belum diberikan kebenaran merakam tetapi dapat merakam audio melalui peranti USB ini."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Benarkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk mengendalikan <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Apl ini belum diberikan kebenaran merakam tetapi dapat merakam audio melalui peranti USB ini. Tindakan menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan peranti ini mungkin menghalang anda daripada mendengar panggilan, pemberitahuan dan penggera."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Apl ini belum diberi kebenaran merakam tetapi dapat merakam audio melalui peranti USB ini. Tindakan menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan peranti ini mungkin menghalang anda daripada mendengar panggilan, pemberitahuan dan penggera."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Tindakan menggunakan <xliff:g id="APPLICATION">%1$s</xliff:g> dengan peranti ini mungkin menghalang anda daripada mendengar panggilan, pemberitahuan dan penggera."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Benarkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk mengendalikan <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organisasi anda memiliki peranti ini dan mungkin memantau trafik rangkaian"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> memiliki peranti ini dan mungkin memantau trafik rangkaian"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Peranti ini disediakan oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Peranti ini milik organisasi anda dan dihubungkan dengan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Peranti ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dan dihubungkan dengan <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Peranti ini milik organisasi anda"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Peranti ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Peranti ini milik organisasi anda dan dihubungkan dengan VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Peranti ini milik <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dan dihubungkan dengan VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organisasi anda mungkin memantau trafik rangkaian dalam profil kerja anda"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> mungkin memantau trafik rangkaian dalam profil kerja anda"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktiviti rangkaian profil kerja boleh dilihat oleh pentadbir IT anda"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Rangkaian mungkin dipantau"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Peranti ini dihubungkan dengan VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Profil kerja anda dihubungkan dengan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Profil peribadi anda dihubungkan dengan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Peranti ini dihubungkan dengan <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Peranti ini disediakan oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Pengurusan peranti"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Sijil kuasa dipasang pada peranti ini. Trafik rangkaian selamat anda mungkin dipantau atau diubah suai."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Pentadbir anda telah menghidupkan pengelogan rangkaian yang memantau trafik pada peranti anda."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Pentadbir anda telah menghidupkan pengelogan rangkaian yang memantau trafik dalam profil kerja anda tetapi bukan dalam profil peribadi anda."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Anda dihubungkan ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang boleh memantau aktiviti rangkaian anda, termasuk e-mel, apl dan laman web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Anda dihubungkan ke <xliff:g id="VPN_APP_0">%1$s</xliff:g> dan <xliff:g id="VPN_APP_1">%2$s</xliff:g>, yang boleh memantau aktiviti rangkaian anda, termasuk e-mel, apl dan laman web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Profil kerja anda dihubungkan ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang dapat memantau aktiviti rangkaian anda, termasuk e-mel, apl dan laman web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Profil peribadi anda dihubungkan ke <xliff:g id="VPN_APP">%1$s</xliff:g>, yang boleh memantau aktiviti rangkaian anda, termasuk e-mel, apl dan laman web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Buka tetapan VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Peranti ini diurus oleh ibu bapa anda. Ibu bapa anda dapat melihat dan mengurus maklumat seperti apl yang anda gunakan, lokasi dan masa skrin anda."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nama Siaran"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Kata Laluan"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Simpan"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nombor binaan"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nombor binaan disalin ke papan keratan."</string> <string name="basic_status" msgid="2315371112182658176">"Buka perbualan"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tambahkan jubin"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Jangan tambah jubin"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Pilih pengguna"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apl aktif</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> apl aktif</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Maklumat baharu"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apl aktif"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Walaupun anda tidak menggunakan apl ini, apl masih lagi aktif dan mungkin menjejaskan hayat bateri"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Berhenti"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Dihentikan"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Selesai"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 6f9250cc2c36..c92a2dd98350 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -34,7 +34,7 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"ဖန်သားပြင် အလိုအလျောက်လှည့်ရန်"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> အား ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုပါသလား။"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> အား <xliff:g id="USB_DEVICE">%2$s</xliff:g> ကို သုံးခွင့်ပြုမလား။\nဤအက်ပ်ကို အသံဖမ်းခွင့် ပေးမထားသော်လည်း ၎င်းသည် ဤ USB စက်ပစ္စည်းမှတစ်ဆင့် အသံများကို ဖမ်းယူနိုင်ပါသည်။"</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုမလား။"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> ကို <xliff:g id="USB_DEVICE">%2$s</xliff:g> ဝင်သုံးခွင့်ပြုမလား။"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ဆောင်ရွက်ရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ဖွင့်လိုပါသလား။"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"ဤအက်ပ်ကို အသံဖမ်းခွင့် ပေးမထားသော်လည်း ၎င်းသည် ဤ USB စက်ပစ္စည်းမှတစ်ဆင့် အသံများကို ဖမ်းယူနိုင်ပါသည်။ ဤစက်ဖြင့် <xliff:g id="APPLICATION">%1$s</xliff:g> အသုံးပြုခြင်းက ဖုန်းအဝင်၊ အကြောင်းကြားချက်နှင့် နှိုးစက်သံ မကြားခြင်းများ ဖြစ်စေနိုင်သည်။"</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"ဤစက်ဖြင့် <xliff:g id="APPLICATION">%1$s</xliff:g> အသုံးပြုခြင်းက ဖုန်းအဝင်၊ အကြောင်းကြားချက်နှင့် နှိုးစက်သံ မကြားခြင်းများ ဖြစ်စေနိုင်သည်။"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ဤစက်ကို သင့်အဖွဲ့အစည်းကပိုင်ဆိုင်ပြီး ကွန်ရက်ဒေတာ စီးဆင်းမှုကို စောင့်ကြည့်နိုင်ပါသည်"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"ဤစက်ကို <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> က ပိုင်ဆိုင်ပြီး ကွန်ရက်ဒေတာ စီးဆင်းမှုကို စောင့်ကြည့်နိုင်ပါသည်"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က ပံ့ပိုးထားသည်"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ဤစက်ကို သင့်အဖွဲ့အစည်းကပိုင်ဆိုင်ပြီး <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ဤစက်ကို <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> က ပိုင်ဆိုင်ပြီး <xliff:g id="VPN_APP">%2$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ဤစက်ကို သင့်အဖွဲ့အစည်းက ပိုင်ဆိုင်သည်"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ဤစက်ကို <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> က ပိုင်ဆိုင်သည်"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ဤစက်ကို သင့်အဖွဲ့အစည်းကပိုင်ဆိုင်ပြီး VPN များသို့ ချိတ်ဆက်ထားပါသည်"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ဤစက်ကို <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> က ပိုင်ဆိုင်ပြီး VPN များသို့ ချိတ်ဆက်ထားပါသည်"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"သင်၏ အဖွဲ့အစည်းက သင့်အလုပ်ပရိုဖိုင်ရှိ ကွန်ရက်ဒေတာ စီးဆင်းမှုကို စောင့်ကြည့်နိုင်သည်"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> သည် သင်၏ အလုပ်ပရိုဖိုင်ရှိ ကွန်ရက်ဒေတာ စီးဆင်းမှုကို စောင့်ကြည့်နိုင်ပါသည်"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"အလုပ်ပရိုဖိုင်ကွန်ရက် လုပ်ဆောင်ချက်ကို သင့် IT စီမံခန့်ခွဲသူက မြင်နိုင်သည်"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ကွန်ရက်ကို စောင့်ကြည့်နိုင်ပါသည်"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ဤစက်ကို VPN များသို့ ချိတ်ဆက်ထားပါသည်"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"သင်၏အလုပ်ပရိုဖိုင်သည် <xliff:g id="VPN_APP">%1$s</xliff:g> ကို ချိတ်ဆက်ထားပါသည်"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"သင်၏ ကိုယ်ပိုင်ပရိုဖိုင်ကို <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ဤစက်ကို <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က ပံ့ပိုးထားသည်"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"စက်ပစ္စည်း စီမံခန့်ခွဲမှု"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ဤစက်ပစ္စည်းတွင် စီမံခန့်ခွဲမှုဆိုင်ရာ အသိအမှတ်ပြုလက်မှတ်ကို ထည့်သွင်းထားပါသည်။ လုံခြုံမှုရှိသော ကွန်ရက်ဒေတာစီးဆင်းမှုကို စောင့်ကြည့်ခြင်း သို့မဟုတ် ပြုပြင်ခြင်းများ ပြုလုပ်နိုင်ပါသည်။"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"စက်ပစ္စည်းပေါ်ရှိ ဒေတာစီးဆင်းမှုများကို စောင့်ကြည့်နိုင်သည့် ကွန်ရက်မှတ်တမ်းတင်ခြင်းစနစ်ကို သင်၏ စီမံခန့်ခွဲသူက ဖွင့်ထားပါသည်။"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"သင်၏စီမံခန့်ခွဲသူက ကွန်ရက်မှတ်တမ်းတင်ခြင်းကို ဖွင့်လိုက်သည်။ ၎င်းသည် သင့်အလုပ်ပရိုဖိုင်ရှိ ဒေတာစီးဆင်းမှုကို စောင့်ကြည့်သော်လည်း ကိုယ်ပိုင်ပရိုဖိုင်တွင် မစောင့်ကြည့်ပါ။"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"သင်သည် သင်၏ အီးမေးလ်၊ အက်ပ်နှင့် ဝဘ်ဆိုက်များအပါအဝင် ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည့် <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်။"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"သင်သည် သင်၏ အီးမေးလ်၊ အက်ပ်နှင့် ဝဘ်ဆိုက်များအပါအဝင် သင်၏ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည့် <xliff:g id="VPN_APP_0">%1$s</xliff:g> နှင့် <xliff:g id="VPN_APP_1">%2$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်။"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"သင်၏အလုပ်ပရိုဖိုင်သည် အီးမေးလ်၊ အက်ပ်နှင့် ဝဘ်ဆိုက်များအပါအဝင် သင်၏ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည့် <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်။"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"သင်၏ ကိုယ်ပိုင်ပရိုဖိုင်သည် အီးမေးလ်၊ အက်ပ်နှင့် ဝဘ်ဆိုက်များအပါအဝင် သင်၏ကွန်ရက်လုပ်ဆောင်ချက်ကို စောင့်ကြည့်နိုင်သည့် <xliff:g id="VPN_APP">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားပါသည်။"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ဆက်တင်များကို ဖွင့်ရန်"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ဤစက်ပစ္စည်းကို သင့်မိဘက စီမံခန့်ခွဲသည်။ သင့်မိဘက သင်သုံးသောအက်ပ်များ၊ သင်၏တည်နေရာနှင့် အသုံးပြုချိန် ကဲ့သို့သော အချက်အလက်များကို မြင်နိုင်ပြီး စီမံခန့်ခွဲနိုင်သည်။"</string> @@ -501,8 +513,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>အခြေအနေ-</b> အဆင့်လျှော့ထားသည်"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြသည်"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ပူဖောင်းကွက်အဖြစ် မြင်ရသည်"</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ‘မနှောင့်ယှက်ရ’ ကို ရပ်တန့်သည်"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းတွင် ပြ၍ လော့ခ်မျက်နှာပြင်တွင် ပရိုဖိုင်ပုံအဖြစ် ပြကာ ပူဖောင်းကွက်အဖြစ် မြင်ရပြီး ‘မနှောင့်ယှက်ရ’ ကို ရပ်တန့်သည်"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းနှင့် ပရိုဖိုင်ပုံအဖြစ် လော့ခ်မျက်နှာပြင်တွင် ပြသည်။ ပူဖောင်းကွက်အဖြစ် မြင်ရပြီး ‘မနှောင့်ယှက်ရ’ ကို ကြားဖြတ်သည်"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"စကားဝိုင်း အကြောင်းကြားချက်များ၏ ထိပ်ပိုင်းနှင့် ပရိုဖိုင်ပုံအဖြစ် လော့ခ်မျက်နှာပြင်တွင် ပြသည်။ ပူဖောင်းကွက်အဖြစ် မြင်ရပြီး ‘မနှောင့်ယှက်ရ’ ကို ကြားဖြတ်သည်"</string> <string name="notification_priority_title" msgid="2079708866333537093">"ဦးစားပေး"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စကားဝိုင်းဝန်ဆောင်မှုများကို မပံ့ပိုးပါ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ဤအကြောင်းကြားချက်များကို ပြုပြင်၍ မရပါ။"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ထုတ်လွှင့်မှုအမည်"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"စကားဝှက်"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"သိမ်းရန်"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"တည်ဆောက်မှုနံပါတ်"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"တည်ဆောက်မှုနံပါတ်ကို ကလစ်ဘုတ်သို့ မိတ္တူကူးပြီးပါပြီ။"</string> <string name="basic_status" msgid="2315371112182658176">"စကားဝိုင်းကို ဖွင့်ရန်"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"အကွက်ငယ် ထည့်ရန်"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"အကွက်ငယ် မထည့်ပါ"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"အသုံးပြုသူ ရွေးခြင်း"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">အက်ပ် <xliff:g id="COUNT_1">%s</xliff:g> ခု ပွင့်နေသည်</item> + <item quantity="one">အက်ပ် <xliff:g id="COUNT_0">%s</xliff:g> ခု ပွင့်နေသည်</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"အချက်အလက်သစ်"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ပွင့်နေသည့်အက်ပ်များ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ဤအက်ပ်များကို သင်က သုံးမနေသော်လည်း ၎င်းတို့ပွင့်နေသေးသဖြင့် ဘက်ထရီသက်တမ်း ထိခိုက်စေနိုင်သည်"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ရပ်ရန်"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ရပ်ထားသည်"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ပြီးပြီ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index c946ca58c262..94b9b3ae758c 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -130,7 +130,7 @@ <string name="biometric_dialog_confirm" msgid="2005978443007344895">"Bekreft"</string> <string name="biometric_dialog_try_again" msgid="8575345628117768844">"Prøv på nytt"</string> <string name="biometric_dialog_empty_space_description" msgid="3330555462071453396">"Trykk for å avbryte autentiseringen"</string> - <string name="biometric_dialog_face_icon_description_idle" msgid="4351777022315116816">"Prøv igjen"</string> + <string name="biometric_dialog_face_icon_description_idle" msgid="4351777022315116816">"Prøv på nytt"</string> <string name="biometric_dialog_face_icon_description_authenticating" msgid="3401633342366146535">"Ser etter ansiktet ditt"</string> <string name="biometric_dialog_face_icon_description_authenticated" msgid="2242167416140740920">"Ansiktet er autentisert"</string> <string name="biometric_dialog_face_icon_description_confirmed" msgid="7918067993953940778">"Bekreftet"</string> @@ -333,7 +333,7 @@ <string name="keyguard_indication_charging_time_slowly" msgid="301936949731705417">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Lader sakte • Fulladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="keyguard_indication_charging_time_dock" msgid="6150404291427377863">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Ladedokk • Fulladet om <xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g>"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Bytt bruker"</string> - <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle appene og all informasjon i denne økten slettes."</string> + <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle apper og data i denne økten blir slettet."</string> <string name="guest_wipe_session_title" msgid="7147965814683990944">"Velkommen tilbake, gjest!"</string> <string name="guest_wipe_session_message" msgid="3393823610257065457">"Vil du fortsette økten?"</string> <string name="guest_wipe_session_wipe" msgid="8056836584445473309">"Start på nytt"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organisasjonen din eier denne enheten og kan overvåke nettverkstrafikken"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> eier denne enheten og kan overvåke nettverkstrafikken"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Denne enheten leveres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Denne enheten tilhører organisasjonen din og er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Denne enheten tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og er koblet til <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Denne enheten tilhører organisasjonen din"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Denne enheten tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Denne enheten tilhører organisasjonen din og er koblet til VPN-er"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Denne enheten tilhører <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> og er koblet til VPN-er"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organisasjonen din kan overvåke nettverkstrafikken i jobbprofilen din"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kan overvåke nettverkstrafikken i jobbprofilen din"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT-administratoren kan se nettverksaktivitet i jobbprofilen din"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Nettverket kan bli overvåket"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Denne enheten er koblet til VPN-er"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Jobbprofilen din er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Den personlige profilen din er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Denne enheten er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Denne enheten leveres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Enhetsadministrasjon"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"En sertifiseringsinstans er installert på denne enheten. Den sikre nettverkstrafikken din kan overvåkes eller endres."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratoren din har slått på loggføring av nettverk, som overvåker trafikken på enheten din."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratoren din har slått på loggføring av nettverk, som overvåker trafikken i jobbprofilen din, men ikke i den personlige profilen din."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Du er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåke nettverksaktiviteten din, inkludert e-post, apper og nettsteder."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Du er koblet til <xliff:g id="VPN_APP_0">%1$s</xliff:g> og <xliff:g id="VPN_APP_1">%2$s</xliff:g>, som kan overvåke nettverksaktiviteten din, inkludert e-post, apper og nettsteder."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Jobbprofilen din er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåke nettverksaktiviteten din, inkludert e-poster, apper og nettsteder."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Den personlige profilen din er koblet til <xliff:g id="VPN_APP">%1$s</xliff:g>, som kan overvåke nettverksaktiviteten din, inkludert e-post, apper og nettsteder."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Åpne VPN-innstillingene"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Denne enheten administreres av forelderen din. Forelderen din kan se og administrere informasjon, for eksempel appene du bruker, posisjonen din og skjermtiden din."</string> @@ -461,7 +473,7 @@ <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Legg til et kort"</string> <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Oppdaterer"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås opp for å bruke"</string> - <string name="wallet_error_generic" msgid="257704570182963611">"Det oppsto et problem med henting av kortene. Prøv igjen senere"</string> + <string name="wallet_error_generic" msgid="257704570182963611">"Det oppsto et problem med henting av kortene. Prøv på nytt senere"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Innstillinger for låseskjermen"</string> <string name="qr_code_scanner_title" msgid="5290201053875420785">"Skann QR-koden"</string> <string name="status_bar_work" msgid="5238641949837091056">"Work-profil"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Kringkastingsnavn"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Passord"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Lagre"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Delversjonsnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Delversjonsnummeret er kopiert til utklippstavlen."</string> <string name="basic_status" msgid="2315371112182658176">"Åpen samtale"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Legg til brikke"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ikke legg til brikke"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Velg bruker"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apper er aktive</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app er aktiv</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ny informasjon"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktive apper"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Selv om du ikke bruker disse appene, er de fremdeles aktive og kan påvirke batterilevetiden"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stopp"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppet"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Ferdig"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index d285c76e49f8..07cb7d46da3a 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -365,20 +365,21 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ र उक्त सङ्गठनले यसको नेटवर्क ट्राफिक अनुगमन गर्न सक्छ"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ र उक्त सङ्गठनले यसको नेटवर्क ट्राफिक अनुगमन गर्न सक्छ"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले यो डिभाइस उपलब्ध गराएको हो"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ र <xliff:g id="VPN_APP">%1$s</xliff:g> मा कनेक्ट गरिएको छ"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ र <xliff:g id="VPN_APP">%2$s</xliff:g> मा कनेक्ट गरिएको छ"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="4137564460025113168">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ र <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ र <xliff:g id="VPN_APP">%2$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ र VPN हरूमा कनेक्ट गरिएको छ"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ र VPN हरूमा कनेक्ट गरिएको छ"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="929181757984262902">"यो डिभाइस तपाईंको सङ्गठनको स्वामित्वमा छ र VPN हरूमार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="3312645578322079185">"यो डिभाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> को स्वामित्वमा छ र VPN हरूमार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"तपाईंको संगठनले तपाईंको कार्य प्रोफाइलमा नेटवर्कको ट्राफिकको अनुगमन गर्न पनि सक्छ"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ले तपाईंको कार्य प्रोफाइलमा नेटवर्क ट्राफिकको अनुगमन गर्न पनि सक्छ"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"तपाईंका IT एड्मिन कार्य प्रोफाइलमा हुने नेटवर्कसम्बन्धी क्रियाकलाप देख्न सक्नुहुन्छ"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"नेटवर्कको अनुगमन हुनसक्छ"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"यो डिभाइस VPN हरूमा कनेक्ट गरिएको छ"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"तपाईंको कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> मा कनेक्ट गरिएको छ"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"तपाईंको व्यक्तिगत प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> मा कनेक्ट गरिएको छ"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"यो डिभाइस <xliff:g id="VPN_APP">%1$s</xliff:g> मा कनेक्ट गरिएको छ"</string> + <string name="quick_settings_disclosure_vpns" msgid="3586175303518266301">"यो डिभाइस VPN हरूमार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="451254750289172191">"तपाईंका व्यक्तिगत एपहरू <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएका छन्"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6191822916936028208">"यो डिभाइस <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएको छ"</string> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले यो डिभाइस उपलब्ध गराएको हो"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"डिभाइसको व्यवस्थापन"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +395,10 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"यस डिभाइसमा एउटा प्रमाणपत्र सम्बन्धी अख्तियार सुविधा स्थापना गरिएको छ। तपाईंको सुरक्षित नेटवर्कको ट्राफिकको अनुगमन वा परिमार्जन हुनसक्छ।"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"तपाईंका प्रशासकले तपाईंको डिभाइसमा ट्राफिकको अनुगमन गर्ने नेटवर्क लग गर्ने प्रक्रियालाई सक्रिय गर्नुभएको छ।"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"तपाईंका एड्मिनले \'नेटवर्क लगिङ\' सुविधा अन गर्नुभएको छ। यो सुविधाले तपाईंको कार्य प्रोफाइलको ट्राफिक अनुगमन गर्छ तर व्यक्तिगत प्रोफाइलको ट्राफिक भने अनुगमन गर्दैन।"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"तपाईं इमेल, एप र वेबसाइटहरू लगायत तपाईंको नेटवर्कको गतिविधिको अनुगमन गर्नसक्ने <xliff:g id="VPN_APP">%1$s</xliff:g> मा जडान हुनुहुन्छ।"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"तपाईं इमेल, एप र वेबसाइटहरू लगायत तपाईंको नेटवर्कको गतिविधिको अनुगमन गर्नसक्ने <xliff:g id="VPN_APP_0">%1$s</xliff:g> र <xliff:g id="VPN_APP_1">%2$s</xliff:g> मा जडान हुनुहुन्छ।"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"तपाईंको कार्य प्रोफाइल तपाईंका इमेल, एप र वेबसाइटहरू लगायत तपाईंको नेटवर्कको गतिविधिको अनुगमन गर्नसक्ने <xliff:g id="VPN_APP">%1$s</xliff:g> मा जडान छ।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"तपाईंको व्यक्तिगत प्रोफाइल इमेल, एप र वेबसाइटहरू लगायत तपाईंको नेटवर्कको गतिविधिको अनुगमन गर्नसक्ने <xliff:g id="VPN_APP">%1$s</xliff:g> मा जडान छ।"</string> + <string name="monitoring_description_named_vpn" msgid="7502657784155456414">"यो डिभाइस <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएको छ। तपाईंको सूचना प्रविधि व्यवस्थापक तपाईंको इमेल र ब्राउजिङ डेटासहित नेटवर्कसम्बन्धी क्रियाकलाप हेर्न सक्छन्।"</string> + <string name="monitoring_description_two_named_vpns" msgid="6726394451199620634">"तपाईंको डिभाइस <xliff:g id="VPN_APP_0">%1$s</xliff:g> र <xliff:g id="VPN_APP_1">%2$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएको छ। तपाईंको सूचना प्रविधि व्यवस्थापक तपाईंको इमेल र ब्राउजिङ डेटासहित नेटवर्कसम्बन्धी क्रियाकलाप हेर्न सक्छन्।"</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="7254359257263069766">"तपाईंका कामसम्बन्धी एपहरू <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएका छन्। तपाईंको सूचना प्रविधि व्यवस्थापक र VPN प्रदायक कामसम्बन्धी एपहरूमा भएका तपाईंका इमेल र ब्राउजिङ डेटासहित नेटवर्कसम्बन्धी क्रियाकलाप हेर्न सक्छन्।"</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="5083909710727365452">"तपाईंका व्यक्तिगत एपहरू <xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत इन्टरनेटमा कनेक्ट गरिएका छन्। तपाईंको VPN प्रदायक तपाईंको इमेल र ब्राउजिङ डेटासहित नेटवर्कसम्बन्धी क्रियाकलाप हेर्न सक्छन्।"</string> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN सम्बन्धी सेटिङहरू खोल्नुहोस्"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"यो डिभाइस तपाईंका अभिभावक व्यवस्थापन गर्नुहुन्छ। तपाईंका अभिभावक तपाईंले प्रयोग गर्ने एप, तपाईंको स्थान र तपाईंले यन्त्र चलाएर बिताउने समय जस्ता जानकारी हेर्न तथा व्यवस्थापन गर्न सक्नुहुन्छ।"</string> @@ -423,7 +424,7 @@ <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"यो एप अनपिन गर्न माथितिर स्वाइप गरी स्क्रिनमा टच एण्ड होल्ड गर्नुहोस्"</string> <string name="screen_pinning_positive" msgid="3285785989665266984">"बुझेँ"</string> <string name="screen_pinning_negative" msgid="6882816864569211666">"धन्यवाद पर्दैन"</string> - <string name="screen_pinning_start" msgid="7483998671383371313">"एप पिन गरियो"</string> + <string name="screen_pinning_start" msgid="7483998671383371313">"पिन गरिएको एप"</string> <string name="screen_pinning_exit" msgid="4553787518387346893">"एप अनपिन गरियो"</string> <string name="stream_voice_call" msgid="7468348170702375660">"कल"</string> <string name="stream_system" msgid="7663148785370565134">"प्रणाली"</string> @@ -506,8 +507,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"प्राथमिकता"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा वार्तालापसम्बन्धी सुविधा प्रयोग गर्न मिल्दैन"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"यी सूचनाहरू परिमार्जन गर्न मिल्दैन।"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"कलसम्बन्धी सूचनाहरू परिमार्जन गर्न मिल्दैन।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"यहाँबाट सूचनाहरूको यो समूह कन्फिगर गर्न सकिँदैन"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"प्रोक्सीमार्फत आउने सूचना"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"<xliff:g id="APP_NAME">%1$s</xliff:g> सम्बन्धी सबै सूचनाहरू"</string> @@ -844,6 +844,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"प्रसारणको नाम"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"पासवर्ड"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"सेभ गर्नुहोस्"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"सुरु गरिँदै छ…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"प्रसारण गर्न सकिएन"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"बिल्ड नम्बर"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"बिल्ड नम्बर कपी गरी क्लिपबोर्डमा सारियो।"</string> <string name="basic_status" msgid="2315371112182658176">"वार्तालाप खोल्नुहोस्"</string> @@ -912,11 +914,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"टाइल हाल्नुहोस्"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"टाइल नहाल्नुहोस्"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"प्रयोगकर्ता चयन गर्नु…"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> वटा एप सक्रिय छन्</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> एप सक्रिय छ</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"नयाँ जानकारी"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"सक्रिय एपहरू"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"तपाईंले यी एपहरू प्रयोग गरिरहनुभएको छैन भने पनि ती एपहरू सक्रिय रहिरहन्छन् र तिनले ब्याट्रीको आयुमा असर गर्न सक्छन्"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"रोक्नुहोस्"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"रोकिएको छ"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"सम्पन्न भयो"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index af703fda6c78..82f3be3f3f36 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nDeze app heeft geen opnamerechten gekregen, maar zou audio kunnen vastleggen via dit USB-apparaat."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> openen om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te verwerken?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="APPLICATION">%1$s</xliff:g> openen om te werken met <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Deze app heeft geen opnamerechten gekregen, maar zou audio kunnen vastleggen via dit USB-apparaat. Als je <xliff:g id="APPLICATION">%1$s</xliff:g> gebruikt met dit apparaat, hoor je misschien geen gesprekken, meldingen en wekkers."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Als je <xliff:g id="APPLICATION">%1$s</xliff:g> gebruikt met dit apparaat, hoor je misschien geen gesprekken, meldingen en wekkers."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Je organisatie is eigenaar van dit apparaat en kan het netwerkverkeer bijhouden"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> is eigenaar van dit apparaat en kan het netwerkverkeer bijhouden"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Dit apparaat wordt geleverd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Dit apparaat is eigendom van je organisatie en is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Dit apparaat is eigendom van <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> en is verbonden met <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Dit apparaat is eigendom van je organisatie"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Dit apparaat is eigendom van <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Dit apparaat is eigendom van je organisatie en is verbonden met VPN\'s"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Dit apparaat is eigendom van <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> en is verbonden met VPN\'s"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Je organisatie kan het netwerkverkeer in je werkprofiel bijhouden"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kan het netwerkverkeer in je werkprofiel bijhouden"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"De netwerkactiviteit van je werkprofiel is zichtbaar voor je IT-beheerder"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Netwerk kan worden bijgehouden"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Dit apparaat is verbonden met VPN\'s"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Je werkprofiel is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Je persoonlijke profiel is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Dit apparaat is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Dit apparaat wordt geleverd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Apparaatbeheer"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Er is een certificeringsinstantie geïnstalleerd op dit apparaat. Je beveiligde netwerkverkeer kan worden bijgehouden of aangepast."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Je beheerder heeft de netwerkregistratie aangezet, waarmee het verkeer op je apparaat wordt gecontroleerd."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Je beheerder heeft netwerkregistratie aangezet. Hiermee wordt verkeer in je werkprofiel bijgehouden, maar niet in je persoonlijke profiel."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Je bent verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden gecontroleerd."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Je bent verbonden met <xliff:g id="VPN_APP_0">%1$s</xliff:g> en <xliff:g id="VPN_APP_1">%2$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden bijgehouden."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Je werkprofiel is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden bijgehouden."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Je persoonlijke profiel is verbonden met <xliff:g id="VPN_APP">%1$s</xliff:g>, waarmee je netwerkactiviteit (waaronder e-mails, apps en websites) kan worden bijgehouden."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN-instellingen openen"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Dit apparaat wordt beheerd door je ouder. Je ouder kan informatie bekijken en beheren, zoals de apps die je gebruikt, je locatie en je schermtijd."</string> @@ -447,7 +459,7 @@ <string name="volume_ringer_hint_unmute" msgid="6119086890306456976">"geluid aanzetten"</string> <string name="volume_ringer_hint_vibrate" msgid="6211609047099337509">"trillen"</string> <string name="volume_dialog_title" msgid="6502703403483577940">"%s-volumeknoppen"</string> - <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"Gesprekken en meldingen gaan over (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> + <string name="volume_dialog_ringer_guidance_ring" msgid="9143194270463146858">"Geluid bij gesprekken en meldingen (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string> <string name="system_ui_tuner" msgid="1471348823289954729">"Systeem-UI-tuner"</string> <string name="status_bar" msgid="4357390266055077437">"Statusbalk"</string> <string name="demo_mode" msgid="263484519766901593">"Demomodus voor systeemgebruikersinterface"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Naam van uitzending"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Wachtwoord"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Opslaan"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Buildnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Buildnummer naar klembord gekopieerd."</string> <string name="basic_status" msgid="2315371112182658176">"Gesprek openen"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tegel toevoegen"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Tegel niet toevoegen"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Gebruiker selecteren"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps zijn actief</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app is actief</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nieuwe informatie"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Actieve apps"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Ook als je deze apps niet gebruikt, zijn ze actief en kunnen ze de batterijduur beïnvloeden"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stoppen"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Gestopt"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Klaar"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index 61be8439ccf7..7c9534877591 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ଏହି ଡିଭାଇସର ମାଲିକାନା ଆପଣଙ୍କ ସଂସ୍ଥା ପାଖରେ ଅଛି ଏବଂ ଏହା ନେଟୱାର୍କ ଟ୍ରାଫିକର ନିରୀକ୍ଷଣ କରିପାରେ"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"ଏହି ଡିଭାଇସଟି <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ର ଅଟେ ଏବଂ ଏହା ନେଟୱାର୍କ ଟ୍ରାଫିକକୁ ନିରୀକ୍ଷଣ କରିପାରେ"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ଏହି ଡିଭାଇସ୍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପ୍ରଦାନ କରାଯାଇଛି"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ଏହି ଡିଭାଇସଟି ଆପଣଙ୍କ ସଂସ୍ଥାର ଅଟେ ଏବଂ ଏହା <xliff:g id="VPN_APP">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ଅଛି"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ଏହି ଡିଭାଇସଟି <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ର ଅଟେ ଏବଂ ଏହା <xliff:g id="VPN_APP">%2$s</xliff:g> ସହ ସଂଯୁକ୍ତ ଅଛି"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ଏହି ଡିଭାଇସଟି ଆପଣଙ୍କ ସଂସ୍ଥାର ଅଟେ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ଏହି ଡିଭାଇସଟି <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ର ଅଟେ"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ଏହି ଡିଭାଇସଟି ଆପଣଙ୍କ ସଂସ୍ଥାର ଅଟେ ଏବଂ ଏହା VPNଗୁଡ଼ିକ ସହ ସଂଯୁକ୍ତ ଅଛି"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ଏହି ଡିଭାଇସଟି <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>ର ଅଟେ ଏବଂ ଏହା VPNଗୁଡ଼ିକ ସହ ସଂଯୁକ୍ତ ଅଛି"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲରେ ଆପଣଙ୍କ ସଂସ୍ଥା ନେଟୱର୍କ ଟ୍ରାଫିକ୍ ନୀରିକ୍ଷଣ କରିପାରନ୍ତି"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲରେ ନେଟୱର୍କ ଟ୍ରାଫିକ୍ ନୀରିକ୍ଷଣ କରିପାରନ୍ତି"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯିବ"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ନେଟୱର୍କ ନୀରିକ୍ଷଣ କରାଯାଇପାରେ"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ଏହି ଡିଭାଇସଟି VPNଗୁଡ଼ିକ ସହ ସଂଯୁକ୍ତ ଅଛି"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲ୍ <xliff:g id="VPN_APP">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ଅଛି"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍ <xliff:g id="VPN_APP">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ଅଛି"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ଏହି ଡିଭାଇସଟି <xliff:g id="VPN_APP">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ଅଛି"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ଏହି ଡିଭାଇସ୍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପ୍ରଦାନ କରାଯାଇଛି"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ଡିଭାଇସ୍ ପରିଚାଳନା"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ଏହି ଡିଭାଇସରେ ଏକ ସର୍ଟିଫିକେଟ୍ ଅଥରିଟି ଇନଷ୍ଟଲ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ସୁରକ୍ଷିତ ନେଟୱର୍କ ଟ୍ରାଫିକ୍ ନୀରିକ୍ଷଣ କିମ୍ବା ସଂଶୋଧନ କରାଯାଇ ପାରେ।"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ଆପଣଙ୍କ ଆଡମିନ୍ ନେଟୱର୍କ ଲଗଇନ୍ କରିବା ଅନ୍ କରିଛନ୍ତି, ଯାହା ଆପଣଙ୍କ ଡିଭାଇସରେ ଟ୍ରାଫିକ୍ ନୀରିକ୍ଷଣ କରେ।"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ଆପଣଙ୍କ ଆଡମିନ୍ ନେଟୱାର୍କ ଲଗିଂ ଚାଲୁ କରିଛନ୍ତି, ଯାହା ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲରେ ଟ୍ରାଫିକ୍ ନିରୀକ୍ଷଣ କରେ କିନ୍ତୁ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲରେ ନୁହେଁ।"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"ଆପଣ <xliff:g id="VPN_APP">%1$s</xliff:g>ରେ ସଂଯୁକ୍ତ, ଯାହା ଇମେଲ୍, ଆପ୍ ଓ ୱେବସାଇଟ୍ ସମେତ ଆପଣଙ୍କ ନେଟୱର୍କ ଗତିବିଧିକୁ ନିରୀକ୍ଷଣ କରିପାରେ।"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ଆପଣ <xliff:g id="VPN_APP_0">%1$s</xliff:g> ଏବଂ <xliff:g id="VPN_APP_1">%2$s</xliff:g>ରେ ସଂଯୁକ୍ତ, ଯାହା ଇମେଲ୍, ଆପ୍ ଓ ୱେବସାଇଟ୍ ସମେତ ଆପଣଙ୍କ ନେଟୱର୍କ ଗତିବିଧିକୁ ନିରୀକ୍ଷଣ କରିପାରେ।"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍ <xliff:g id="VPN_APP">%1$s</xliff:g>ରେ ସଂଯୁକ୍ତ, ଯାହା ଇମେଲ୍, ଆପ୍ ଓ ୱେବସାଇଟ୍ ସମେତ ଆପଣଙ୍କ ନେଟୱର୍କ ଗତିବିଧିକୁ ନିରୀକ୍ଷଣ କରିପାରେ।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ପ୍ରୋଫାଇଲ୍ <xliff:g id="VPN_APP">%1$s</xliff:g>ରେ ସଂଯୁକ୍ତ, ଯାହା ଇମେଲ୍, ଆପ୍ ଓ ୱେବସାଇଟ୍ ସମେତ ଆପଣଙ୍କ ନେଟୱର୍କ ଗତିବିଧିକୁ ନିରୀକ୍ଷଣ କରିପାରେ।"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ସେଟିଂସ୍ ଖୋଲନ୍ତୁ"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ଏହି ଡିଭାଇସ୍ ଆପଣଙ୍କ ବାପାମାଙ୍କ ଦ୍ୱାରା ପରିଚାଳିତ। ଆପଣଙ୍କ ବାପାମା ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଆପ୍ସ, ଆପଣଙ୍କ ଲୋକେସନ୍ ଓ ସ୍କ୍ରିନ୍ ସମୟ ପରି ସୂଚନା ଦେଖିପାରିବେ ଏବଂ ପରିଚାଳନା କରିପାରିବେ।"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"ପ୍ରାଥମିକତା"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ବାର୍ତ୍ତାଳାପ ଫିଚରଗୁଡ଼ିକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପରିବର୍ତ୍ତନ କରିହେବ ନାହିଁ।"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"କଲ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରାଯାଇପାରିବ ନାହିଁ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ଏଠାରେ ଏହି ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକର ଗ୍ରୁପ୍ କନଫ୍ୟୁଗର୍ କରାଯାଇପାରିବ ନାହିଁ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ବିଜ୍ଞପ୍ତି ପ୍ରକ୍ସୀ ହୋଇଛି"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"ସମସ୍ତ <xliff:g id="APP_NAME">%1$s</xliff:g>ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ବ୍ରଡକାଷ୍ଟର ନାମ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"ପାସୱାର୍ଡ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ସେଭ କରନ୍ତୁ"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ବିଲ୍ଡ ନମ୍ୱର"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"କ୍ଲିପବୋର୍ଡକୁ କପି କରାଯାଇଥିବା ବିଲ୍ଡ ନମ୍ୱର।"</string> <string name="basic_status" msgid="2315371112182658176">"ବାର୍ତ୍ତାଳାପ ଖୋଲନ୍ତୁ"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ଟାଇଲ୍ ଯୋଗ କରନ୍ତୁ"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ଟାଇଲ୍ ଯୋଗ କର ନାହିଁ"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ଉପଯୋଗକର୍ତ୍ତା ଚୟନ କର"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>ଟି ଆପ ସକ୍ରିୟ ଅଛି</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g>ଟି ଆପ ସକ୍ରିୟ ଅଛି</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ନୂଆ ସୂଚନା"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ସକ୍ରିୟ ଆପଗୁଡ଼ିକ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ଆପଣ ଏହି ଆପ୍ସ ବ୍ୟବହାର କରୁନଥିଲେ ମଧ୍ୟ, ସେଗୁଡ଼ିକ ଏବେ ବି ସକ୍ରିୟ ଅଛି ଏବଂ ତାହା ବ୍ୟାଟେରୀ ଲାଇଫକୁ ପ୍ରଭାବିତ କରିପାରେ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ବନ୍ଦ ହୋଇଛି"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ହୋଇଗଲା"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index e03dbf34fd96..9a5c151f6fcb 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -34,7 +34,7 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"ਸਕ੍ਰੀਨ ਸਵੈ-ਘੁਮਾਓ"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"ਕੀ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਤੱਕ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"ਕੀ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?\nਇਸ ਐਪ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਪਰ ਇਹ USB ਡੀਵਾਈਸ ਰਾਹੀਂ ਆਡੀਓ ਕੈਪਚਰ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"ਕੀ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"ਕੀ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"ਕੀ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ <xliff:g id="APPLICATION">%1$s</xliff:g> ਖੋਲ੍ਹਣੀ ਹੈ?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"ਇਸ ਐਪ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਪਰ ਇਹ USB ਡੀਵਾਈਸ ਰਾਹੀਂ ਆਡੀਓ ਕੈਪਚਰ ਕਰ ਸਕਦੀ ਹੈ। ਸ਼ਾਇਦ ਇਸ ਡੀਵਾਈਸ ਨਾਲ <xliff:g id="APPLICATION">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰਨ \'ਤੇ ਕਾਲਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਅਲਾਰਮਾਂ ਦੀ ਅਵਾਜ਼ ਸੁਣਾਈ ਨਾ ਦੇਵੇ।"</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"ਸ਼ਾਇਦ ਇਸ ਡੀਵਾਈਸ ਨਾਲ <xliff:g id="APPLICATION">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰਨ \'ਤੇ ਕਾਲਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਅਲਾਰਮਾਂ ਦੀ ਅਵਾਜ਼ ਸੁਣਾਈ ਨਾ ਦੇਵੇ।"</string> @@ -359,26 +359,34 @@ <string name="notification_section_header_conversations" msgid="821834744538345661">"ਗੱਲਾਂਬਾਤਾਂ"</string> <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="media_projection_action_text" msgid="3634906766918186440">"ਹੁਣੇ ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="empty_shade_text" msgid="8935967157319717412">"ਕੋਈ ਸੂਚਨਾਵਾਂ ਨਹੀਂ"</string> <string name="quick_settings_disclosure_parental_controls" msgid="2114102871438223600">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string> <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਕੋਲ ਇਸ ਡੀਵਾਈਸ ਦੀ ਮਲਕੀਅਤ ਹੈ ਅਤੇ ਇਹ ਨੈੱਟਵਰਕ ਟਰੈਫ਼ਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਕੋਲ ਇਸ ਡੀਵਾਈਸ ਦੀ ਮਲਕੀਅਤ ਹੈ ਅਤੇ ਇਹ ਨੈੱਟਵਰਕ ਟਰੈਫ਼ਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਮੁਹੱਈਆ ਕੀਤਾ ਗਿਆ ਹੈ"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ਇਹ ਡੀਵਾਈਸ ਤੁਹਾਡੀ ਸੰਸਥਾ ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ ਅਤੇ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ ਅਤੇ <xliff:g id="VPN_APP">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ਇਹ ਡੀਵਾਈਸ ਤੁਹਾਡੀ ਸੰਸਥਾ ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ਇਹ ਡੀਵਾਈਸ ਤੁਹਾਡੀ ਸੰਸਥਾ ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ ਅਤੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ ਅਤੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ਤੁਹਾਡੀ ਸੰਸਥਾ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦੀ ਹੈ"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ਨੈੱਟਵਰਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ਇਹ ਡੀਵਾਈਸ VPN ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"ਤੁਹਾਡਾ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ਇਹ ਡੀਵਾਈਸ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਮੁਹੱਈਆ ਕੀਤਾ ਗਿਆ ਹੈ"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਨ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ਇੱਕ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਟੀ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ ਜਾਂ ਉਸਨੂੰ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਨੈੱਟਵਰਕ ਲੌਗਿੰਗ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਜੋ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰਦਾ ਹੈ।"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਨੈੱਟਵਰਕ ਲੌਗ-ਇਨ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਜੋ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਟਰੈਫ਼ਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰਦਾ ਹੈ ਪਰ ਤੁਹਾਡੀ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਨਹੀਂ।"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"ਤੁਸੀਂ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ਤੁਸੀਂ <xliff:g id="VPN_APP_0">%1$s</xliff:g> ਅਤੇ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"ਤੁਹਾਡੀ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ <xliff:g id="VPN_APP">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ, ਜੋ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ਸੈਟਿੰਗਾਂ ਖੋਲ੍ਹੋ"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਤੁਹਾਡੇ ਮਾਂ-ਪਿਓ ਤੁਹਾਡੀਆਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ, ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਅਤੇ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਸਮੇਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖ ਅਤੇ ਉਸਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦੇ ਹਨ।"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"ਤਰਜੀਹ"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਗੱਲਬਾਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"ਕਾਲ ਸੰਬੰਧੀ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ਇਹ ਸੂਚਨਾਵਾਂ ਦਾ ਗਰੁੱਪ ਇੱਥੇ ਸੰਰੂਪਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ਇੱਕ ਐਪ ਦੀ ਥਾਂ \'ਤੇ ਦੂਜੀ ਐਪ ਰਾਹੀਂ ਦਿੱਤੀ ਗਈ ਸੂਚਨਾ"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"ਸਾਰੀਆਂ <xliff:g id="APP_NAME">%1$s</xliff:g> ਸੂਚਨਾਵਾਂ"</string> @@ -844,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ਪ੍ਰਸਾਰਨ ਦਾ ਨਾਮ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"ਪਾਸਵਰਡ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"ਰੱਖਿਅਤ ਕਰੋ"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"ਪ੍ਰਸਾਰਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"ਬਿਲਡ ਨੰਬਰ"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"ਬਿਲਡ ਨੰਬਰ ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ।"</string> <string name="basic_status" msgid="2315371112182658176">"ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"</string> @@ -912,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ਟਾਇਲ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ਟਾਇਲ ਸ਼ਾਮਲ ਨਾ ਕਰੋ"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"ਵਰਤੋਂਕਾਰ ਚੁਣੋ"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> ਐਪ ਕਿਰਿਆਸ਼ੀਲ ਹੈ</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ਐਪਾਂ ਕਿਰਿਆਸ਼ੀਲ ਹਨ</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ਨਵੀਂ ਜਾਣਕਾਰੀ"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ਭਾਵੇਂ ਤੁਸੀਂ ਇਨ੍ਹਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਨਾ ਵੀ ਕਰ ਰਹੇ ਹੋਵੋ, ਉਹ ਫਿਰ ਵੀ ਕਿਰਿਆਸ਼ੀਲ ਰਹਿੰਦੀਆਂ ਹਨ ਅਤੇ ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ਬੰਦ ਕਰੋ"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ਬੰਦ ਹੈ"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ਹੋ ਗਿਆ"</string> diff --git a/packages/SystemUI/res/values-pa/tiles_states_strings.xml b/packages/SystemUI/res/values-pa/tiles_states_strings.xml index 2706d023dfb2..737b2b60ac60 100644 --- a/packages/SystemUI/res/values-pa/tiles_states_strings.xml +++ b/packages/SystemUI/res/values-pa/tiles_states_strings.xml @@ -47,7 +47,7 @@ <item msgid="287997784730044767">"ਚਾਲੂ ਹੈ"</item> </string-array> <string-array name="tile_states_battery"> - <item msgid="6311253873330062961">"ਅਣਉਪਲਬਧ ਹੈ"</item> + <item msgid="6311253873330062961">"ਅਣਉਪਲਬਧ"</item> <item msgid="7838121007534579872">"ਬੰਦ ਹੈ"</item> <item msgid="1578872232501319194">"ਚਾਲੂ ਹੈ"</item> </string-array> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 0ebbb4999c1b..aad11d66df17 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -34,7 +34,7 @@ <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Autoobracanie ekranu"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Zezwolić aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na dostęp do: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Zezwolić aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na dostęp do urządzenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nTa aplikacja nie ma uprawnień do nagrywania, ale może rejestrować dźwięk za pomocą tego urządzenia USB."</string> - <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Zezwolić aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na dostęp do: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="APPLICATION">%1$s</xliff:g> ma mieć dostęp do: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Otworzyć <xliff:g id="APPLICATION">%1$s</xliff:g> dla urządzenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Ta aplikacja nie ma uprawnień do nagrywania, ale może rejestrować dźwięk za pomocą tego urządzenia USB. Używanie aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na tym urządzeniu może zakłócać słyszenie połączeń, powiadomień i alertów."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Używanie aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na tym urządzeniu może zakłócać słyszenie połączeń, powiadomień i alertów."</string> @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Twoja organizacja jest właścicielem tego urządzenia i może monitorować ruch w sieci"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Organizacja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> jest właścicielem tego urządzenia i może monitorować ruch w sieci"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"To urządzenie dostarcza organizacja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"To urządzenie należy do Twojej organizacji i jest połączone z siecią <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"To urządzenie należy do organizacji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i jest połączone z siecią <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"To urządzenie należy do Twojej organizacji"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Właściciel tego urządzenia: <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"To urządzenie należy do Twojej organizacji i jest połączone z sieciami VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"To urządzenie należy do organizacji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> i jest połączone z sieciami VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Twoja organizacja może monitorować ruch w sieci w Twoim profilu służbowym"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Organizacja <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> może monitorować ruch w sieci w Twoim profilu służbowym"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktywność w sieci w profilu służbowym jest widoczna dla administratora IT"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Sieć może być monitorowana"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"To urządzenie jest połączone z sieciami VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Twój profil służbowy jest połączony z siecią <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Twój profil osobisty jest połączony z siecią <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"To urządzenie jest połączone z siecią <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"To urządzenie dostarcza organizacja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Zarządzanie urządzeniami"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Urząd certyfikacji zainstalowany na tym urządzeniu. Twój zabezpieczony ruch w sieci może być monitorowany i zmieniany."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrator włączył rejestrowanie sieciowe, które pozwala monitorować ruch na Twoim urządzeniu."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrator włączył rejestrowanie sieciowe, które pozwala monitorować ruch na Twoim profilu służbowym, ale nie na profilu osobistym."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Łączysz się z aplikacją <xliff:g id="VPN_APP">%1$s</xliff:g>, która może monitorować Twoją aktywność w sieci, w tym e-maile, aplikacje i strony internetowe."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Łączysz się z aplikacjami <xliff:g id="VPN_APP_0">%1$s</xliff:g> i <xliff:g id="VPN_APP_1">%2$s</xliff:g>, które mogą monitorować Twoją aktywność w sieci, w tym e-maile, aplikacje i strony internetowe."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Twój profil służbowy jest połączony z aplikacją <xliff:g id="VPN_APP">%1$s</xliff:g>, która może monitorować Twoją aktywność w sieci, w tym e-maile, aplikacje i strony internetowe."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Twój profil osobisty jest połączony z aplikacją <xliff:g id="VPN_APP">%1$s</xliff:g>, która może monitorować Twoją aktywność w sieci, w tym e-maile, aplikacje i strony internetowe."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otwórz ustawienia VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Tym urządzeniem zarządza Twój rodzic. Rodzic może zobaczyć różne informacje, np. o aplikacjach, których używasz, lokalizacji i czasie korzystania z urządzenia, a także zarządzać tymi danymi."</string> @@ -422,7 +434,7 @@ <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Ekran będzie widoczny, dopóki go nie odepniesz. Przesuń palcem w górę i przytrzymaj, by odpiąć."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, kliknij i przytrzymaj Przegląd."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, naciśnij i przytrzymaj Ekran główny."</string> - <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Dostępne mogą być dane osobiste (np. kontakty czy treść e-maili)."</string> + <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Dostępne mogą być dane prywatne (np. kontakty czy treść e-maili)."</string> <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"Przypięta aplikacja może otwierać inne aplikacje."</string> <string name="screen_pinning_toast" msgid="8177286912533744328">"Aby odpiąć tę aplikację, naciśnij i przytrzymaj przyciski Wstecz oraz Przegląd"</string> <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"Aby odpiąć tę aplikację, naciśnij i przytrzymaj przyciski Wstecz oraz Ekran główny"</string> @@ -512,8 +524,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Priorytetowe"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> nie obsługuje funkcji rozmów"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Tych powiadomień nie można zmodyfikować."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Powiadomień o połączeniach nie można modyfikować."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Tej grupy powiadomień nie można tu skonfigurować"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Powiadomienie w zastępstwie"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Wszystkie powiadomienia z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -856,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nazwa transmisji"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Hasło"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Zapisz"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numer kompilacji"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numer kompilacji został skopiowany do schowka."</string> <string name="basic_status" msgid="2315371112182658176">"Otwarta rozmowa"</string> @@ -924,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Dodaj kafelek"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nie dodawaj kafelka"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Wybierz użytkownika"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikacje są aktywne</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> aplikacji jest aktywnych</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacji jest aktywne</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikacja jest aktywna</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nowa informacja"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktywne aplikacje"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Nawet jeśli nie korzystasz z tych aplikacji, są one wciąż aktywne i mogą mieć wpływ na żywotność baterii"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Zatrzymaj"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zatrzymano"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gotowe"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 8ae76bc6381d..f1f0532647c4 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsse app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse este dispositivo: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com este dispositivo: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esse app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB. O uso do app <xliff:g id="APPLICATION">%1$s</xliff:g> com esse dispositivo pode impedir que você ouça chamadas, notificações e alarmes."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"O uso do app <xliff:g id="APPLICATION">%1$s</xliff:g> com esse dispositivo pode impedir que você ouça chamadas, notificações e alarmes."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Sua organização é dona deste dispositivo e pode monitorar o tráfego de rede"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"A organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> é dona deste dispositivo e pode monitorar o tráfego de rede"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Este dispositivo é fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertence à sua organização e está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertence à organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertence à sua organização"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertence à organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertence à sua organização e está conectado a VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertence á organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Sua organização pode monitorar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> pode monitorar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"A atividade de rede do perfil de trabalho fica visível para o administrador de TI"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"A rede pode ser monitorada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Seu perfil de trabalho está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Seu perfil pessoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Este dispositivo é fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gerenciamento de dispositivos"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Uma autoridade de certificação foi instalada neste dispositivo. É possível monitorar ou modificar seu tráfego de rede seguro."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"O administrador ativou o registro de rede, que monitora o tráfego no seu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"O administrador ativou o registro de rede, que monitora o tráfego no seu perfil de trabalho, mas não no perfil pessoal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Você está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade na rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Você está conectado a <xliff:g id="VPN_APP_0">%1$s</xliff:g> e <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que podem monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Seu perfil de trabalho está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Seu perfil pessoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir configurações de VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Este dispositivo é gerenciado pelo seu pai/mãe, que pode ver e gerenciar informações como os apps que você usa, sua localização e seu tempo de uso."</string> @@ -501,8 +513,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> classificada com menor prioridade"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão"</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompe o Não perturbe"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompe o Não perturbe"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparecem na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompem o Não perturbe."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparecem na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompem o Não perturbe."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritárias"</string> <string name="no_shortcut" msgid="8257177117568230126">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> não é compatível com recursos de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nome da transmissão"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Senha"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Salvar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da versão"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da versão copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Adicionar bloco"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Não adicionar bloco"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Selecionar usuário"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app está ativo</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps estão ativos</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova informação"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativos"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Mesmo que você não esteja usando esses apps, eles ainda ficam ativos e podem afetar a duração da bateria"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parado"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Concluído"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index f9c4bee31359..ef9b01d03c20 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"A sua entidade gere este dispositivo e pode monitorizar o tráfego de rede."</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"A entidade <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> é proprietária deste dispositivo e pode monitorizar o tráfego de rede."</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Este dispositivo foi fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertence à sua entidade e está ligado a <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertence à entidade <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está ligado a <xliff:g id="VPN_APP">%2$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertence à sua entidade."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertence à entidade <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertence à sua entidade e está ligado a VPNs."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertence à entidade <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está ligado a VPNs."</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"A sua entidade pode monitorizar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"A <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> pode monitorizar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"A atividade da rede do perfil de trabalho fica visível para o administrador de TI"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"A rede pode ser monitorizada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está ligado a VPNs."</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"O seu perfil de trabalho está ligado a <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"O seu perfil pessoal está ligado a <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está ligado a <xliff:g id="VPN_APP">%1$s</xliff:g>."</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Este dispositivo foi fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestão de dispositivos"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Está instalada uma autoridade de certificação neste dispositivo. O tráfego da sua rede segura pode ser monitorizado ou alterado."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"O gestor ativou os registos de rede, que monitorizam o tráfego no seu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"O seu administrador ativou os registos de rede, que monitorizam o tráfego no seu perfil de trabalho, mas não no seu perfil pessoal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Está ligado à rede <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorizar a sua atividade de rede, incluindo emails, aplicações e Sites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Está ligado às redes <xliff:g id="VPN_APP_0">%1$s</xliff:g> e <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que podem monitorizar a sua atividade de rede, incluindo emails, aplicações e Sites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"O seu perfil de trabalho está ligado à rede <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorizar a sua atividade de rede, incluindo emails, aplicações e Sites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"O seu perfil pessoal está ligado à rede <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorizar a sua atividade de rede, incluindo emails, aplicações e Sites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir as definições de VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Este dispositivo é gerido pelos teus pais, que podem ver e gerir informações como as apps que utilizas, a tua localização e o tempo de utilização."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Prioridade"</string> <string name="no_shortcut" msgid="8257177117568230126">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> não suporta funcionalidades de conversa."</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar estas notificações."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Não é possível modificar as notificações de chamadas."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Não é possível configurar este grupo de notificações aqui."</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Notificação de app proxy"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Todas as notificações da app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nome da transmissão"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Palavra-passe"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Guardar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da compilação"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da compilação copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Abrir conversa"</string> @@ -894,7 +909,7 @@ <string name="mobile_data_settings_title" msgid="3955246641380064901">"Dados móveis"</string> <string name="preference_summary_default_combination" msgid="8453246369903749670">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string> <string name="mobile_data_connection_active" msgid="944490013299018227">"Ligado"</string> - <string name="mobile_data_off_summary" msgid="3663995422004150567">"Não é efetuada ligação de dados móveis automática"</string> + <string name="mobile_data_off_summary" msgid="3663995422004150567">"Sem ligação automática com dados móveis"</string> <string name="mobile_data_no_connection" msgid="1713872434869947377">"Sem ligação"</string> <string name="non_carrier_network_unavailable" msgid="770049357024492372">"Nenhuma outra rede disponível"</string> <string name="all_network_unavailable" msgid="4112774339909373349">"Sem redes disponíveis"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Adicionar mosaico"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Não adicion. mosaico"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Selecione utilizador"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps estão ativas</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app está ativa</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Novas informações"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativas"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Mesmo que não esteja a usar estas apps, continuam ativas e podem afetar a autonomia da bateria"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parada"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Concluir"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 8ae76bc6381d..f1f0532647c4 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nEsse app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse este dispositivo: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com este dispositivo: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Esse app não tem permissão de gravação, mas pode capturar áudio pelo dispositivo USB. O uso do app <xliff:g id="APPLICATION">%1$s</xliff:g> com esse dispositivo pode impedir que você ouça chamadas, notificações e alarmes."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"O uso do app <xliff:g id="APPLICATION">%1$s</xliff:g> com esse dispositivo pode impedir que você ouça chamadas, notificações e alarmes."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Sua organização é dona deste dispositivo e pode monitorar o tráfego de rede"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"A organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> é dona deste dispositivo e pode monitorar o tráfego de rede"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Este dispositivo é fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Este dispositivo pertence à sua organização e está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Este dispositivo pertence à organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Este dispositivo pertence à sua organização"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Este dispositivo pertence à organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Este dispositivo pertence à sua organização e está conectado a VPNs"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertence á organização <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e está conectado a VPNs"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Sua organização pode monitorar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> pode monitorar o tráfego de rede no seu perfil de trabalho"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"A atividade de rede do perfil de trabalho fica visível para o administrador de TI"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"A rede pode ser monitorada"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a VPNs"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Seu perfil de trabalho está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Seu perfil pessoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Este dispositivo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Este dispositivo é fornecido pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gerenciamento de dispositivos"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Uma autoridade de certificação foi instalada neste dispositivo. É possível monitorar ou modificar seu tráfego de rede seguro."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"O administrador ativou o registro de rede, que monitora o tráfego no seu dispositivo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"O administrador ativou o registro de rede, que monitora o tráfego no seu perfil de trabalho, mas não no perfil pessoal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Você está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade na rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Você está conectado a <xliff:g id="VPN_APP_0">%1$s</xliff:g> e <xliff:g id="VPN_APP_1">%2$s</xliff:g>, que podem monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Seu perfil de trabalho está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Seu perfil pessoal está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>, que pode monitorar sua atividade de rede, incluindo e-mails, apps e websites."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Abrir configurações de VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Este dispositivo é gerenciado pelo seu pai/mãe, que pode ver e gerenciar informações como os apps que você usa, sua localização e seu tempo de uso."</string> @@ -501,8 +513,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Status:</b> classificada com menor prioridade"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão"</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparece na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompe o Não perturbe"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparece na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompe o Não perturbe"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Aparecem na parte superior das notificações de conversa e como uma foto do perfil na tela de bloqueio. Interrompem o Não perturbe."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Aparecem na parte superior das notificações de conversa, como uma foto do perfil na tela de bloqueio e como um balão. Interrompem o Não perturbe."</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prioritárias"</string> <string name="no_shortcut" msgid="8257177117568230126">"O app <xliff:g id="APP_NAME">%1$s</xliff:g> não é compatível com recursos de conversa"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Não é possível modificar essas notificações."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Nome da transmissão"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Senha"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Salvar"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Número da versão"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Número da versão copiado para a área de transferência."</string> <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Adicionar bloco"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Não adicionar bloco"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Selecionar usuário"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app está ativo</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps estão ativos</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nova informação"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Apps ativos"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Mesmo que você não esteja usando esses apps, eles ainda ficam ativos e podem afetar a duração da bateria"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Parar"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Parado"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Concluído"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index d37b52bf5cde..17ae47eab25f 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organizația dvs. deține acest dispozitiv și poate monitoriza traficul de rețea"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> deține acest dispozitiv și poate monitoriza traficul din rețea"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Acest dispozitiv este oferit de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Dispozitivul aparține organizației dvs. și este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Dispozitivul aparține organizației <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> și este conectat la <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Dispozitivul aparține organizației dvs."</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Acest dispozitiv aparține organizației <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Dispozitivul aparține organizației dvs. și este conectat la VPN-uri"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Dispozitivul aparține organizației <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> și este conectat la VPN-uri"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Este posibil ca organizația dvs. să monitorizeze traficul de rețea în profilul dvs. de serviciu"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Este posibil ca <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> să monitorizeze traficul de rețea din profilul dvs. de serviciu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Adminul IT poate vedea profilul de serviciu"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Este posibil ca rețeaua să fie monitorizată"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Dispozitivul este conectat la VPN-uri"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Profilul dvs. de serviciu este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Profilul dvs. personal este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Dispozitivul este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Acest dispozitiv este oferit de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Gestionarea dispozitivului"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Pe acest dispozitiv este instalat un certificat CA. Traficul dvs. sigur de rețea poate fi monitorizat sau modificat."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratorul dvs. a activat înregistrarea în jurnal pentru rețea, funcție ce monitorizează traficul de pe dispozitivul dvs."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratorul a activat înregistrarea în jurnal pentru rețea, funcție ce monitorizează traficul în profilul dvs. de serviciu, dar nu și în profilul personal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"V-ați conectat la aplicația <xliff:g id="VPN_APP">%1$s</xliff:g>, care vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile accesate."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"V-ați conectat la <xliff:g id="VPN_APP_0">%1$s</xliff:g> și la <xliff:g id="VPN_APP_1">%2$s</xliff:g>, care vă pot monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile accesate."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Profilul dvs. de serviciu este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>, care vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile accesate."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Profilul dvs. personal este conectat la <xliff:g id="VPN_APP">%1$s</xliff:g>, care vă poate monitoriza activitatea în rețea, inclusiv e-mailurile, aplicațiile și site-urile accesate."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Deschideți Setări VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Dispozitivul este gestionat de unul dintre părinți. Părintele poate să vadă și să gestioneze informații cum ar fi aplicațiile pe care le folosești, locația ta și durata de folosire a dispozitivului."</string> @@ -849,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Numele transmisiei"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Parolă"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Salvați"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numărul versiunii"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numărul versiunii s-a copiat în clipboard."</string> <string name="basic_status" msgid="2315371112182658176">"Deschideți conversația"</string> @@ -917,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Adăugați un card"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nu adăugați un card"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Alegeți utilizatorul"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplicații sunt active</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> de aplicații sunt active</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplicație este activă</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informații noi"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplicații active"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Chiar dacă nu folosiți aceste aplicații, ele sunt active și pot influența autonomia bateriei"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Opriți"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Oprită"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Gata"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index e1b48cd88376..523b25b2d7d2 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Ваша организация управляет этим устройством и может отслеживать сетевой трафик"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Организация \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" управляет этим устройством и может отслеживать сетевой трафик"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Устройство предоставлено компанией \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\"."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Это устройство принадлежит вашей организации и подключено к приложению \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Это устройство принадлежит организации \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" и подключено к приложению \"<xliff:g id="VPN_APP">%2$s</xliff:g>\""</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Это устройство принадлежит вашей организации"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Это устройство принадлежит организации \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Это устройство принадлежит вашей организации и подключено к приложениям для VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Это устройство принадлежит организации \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" и подключено к приложениям для VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Ваша организация может отслеживать сетевой трафик в рабочем профиле"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Организация \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" может отслеживать сетевой трафик в вашем рабочем профиле"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"История действий в сети доступна администратору в рабочем аккаунте."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Сеть может отслеживаться"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Это устройство подключено к приложениям для VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Ваш рабочий профиль подключен к приложению \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Ваш личный профиль подключен к приложению \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Это устройство подключено к приложению \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Устройство предоставлено компанией \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Управление устройством"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"Настройки VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На устройстве установлен сертификат ЦС. Ваш защищенный сетевой трафик могут отслеживать и изменять."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Администратор включил ведение сетевого журнала, чтобы отслеживать трафик на вашем устройстве."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Администратор включил ведение сетевого журнала, чтобы отслеживать трафик в вашем рабочем профиле (информация из личного профиля не собирается)."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Запущено приложение \"<xliff:g id="VPN_APP">%1$s</xliff:g>\". Оно может отслеживать ваши действия в сети, включая работу с электронной почтой, приложениями и сайтами."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Запущены приложения \"<xliff:g id="VPN_APP_0">%1$s</xliff:g>\" и \"<xliff:g id="VPN_APP_1">%2$s</xliff:g>\". Они могут отслеживать ваши действия в сети, включая работу с электронной почтой, приложениями и сайтами."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"В рабочем профиле запущено приложение \"<xliff:g id="VPN_APP">%1$s</xliff:g>\", которое может отслеживать ваши действия в сети, включая работу с электронной почтой, приложениями и веб-сайтами."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"В личном профиле запущено приложение \"<xliff:g id="VPN_APP">%1$s</xliff:g>\", которое может отслеживать ваши действия в сети, включая работу с электронной почтой, приложениями и сайтами."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Открыть настройки VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Этим устройством управляет один из твоих родителей. Он может видеть, например, какими приложениями ты пользуешься и где находишься, а также задавать определенные настройки (например, ограничивать время использования устройства)."</string> @@ -855,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Название трансляции"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Пароль"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Сохранить"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер сборки"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номер сборки скопирован в буфер обмена."</string> <string name="basic_status" msgid="2315371112182658176">"Открытый чат"</string> @@ -923,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Добавить параметр"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Не добавлять"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Выберите профиль"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> приложение активно</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> приложения активно</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> приложений активно</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> приложения активно</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Новая информация"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активные приложения"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Эти приложения активны и могут влиять на время работы от батареи, даже когда вы ими не пользуетесь."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Остановить"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Остановлено"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Готово"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index a3a8534d4136..85ac4a866129 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ඔබේ සංවිධානයට මෙම උපාංගය අයිති අතර ජාල තදබදය නිරීක්ෂණය කළ හැකිය"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> සංවිධානයට මෙම උපාංගය අයිති අතර ජාල තදබදය නිරීක්ෂණය කළ හැකිය"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් සැපයේ"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"මෙම උපාංගය ඔබේ සංවිධානයට අයිති අතර <xliff:g id="VPN_APP">%1$s</xliff:g> වෙත සම්බන්ධ කර ඇත"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> සංවිධානයට අයිති අතර <xliff:g id="VPN_APP">%2$s</xliff:g> වෙත සම්බන්ධ කර ඇත"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"මෙම උපාංගය ඔබේ සංවිධානයට අයිතිය"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> සංවිධානයට අයිතිය"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"මෙම උපාංගය ඔබේ සංවිධානයට අයිති අතර VPNs වෙත සම්බන්ධ කර ඇත"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> සංවිධානයට අයිති අතර VPNs වෙත සම්බන්ධ කර ඇත"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"ඔබගේ කාර්යාල පැතිකඩ තුළ ඔබේ සංවිධානය ජාල තදබදය නිරීක්ෂණය කිරීමට හැක"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ඔබේ කාර්යාල පැතිකඩ තුළ ජාල තදබදය නිරීක්ෂණය කළ හැක"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"කාර්යාල පැතිකඩ ජාල ක්රියාකාරකම් ඔබගේ IT පරිපාලකට දෘශ්යමානය"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"ඇතැම් විට ජාලය නිරීක්ෂණය විය හැක"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"මෙම උපාංගය VPNs වෙත සම්බන්ධ කර ඇත"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"ඔබේ කාර්යාල පැතිකඩ <xliff:g id="VPN_APP">%1$s</xliff:g> වෙත සම්බන්ධ කර ඇත"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"ඔබේ පෞද්ගලික පැතිකඩ <xliff:g id="VPN_APP">%1$s</xliff:g> වෙත සම්බන්ධ කර ඇත"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"මෙම උපාංගය <xliff:g id="VPN_APP">%1$s</xliff:g> වෙත සම්බන්ධ කර ඇත"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් සැපයේ"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"උපාංග කළමනාකරණය"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"මෙම උපාංගය තුළ සහතික අධිකාරියක් ස්ථාපනය කර තිබේ. ඔබගේ ආරක්ෂක ජාල තදබදය නිරීක්ෂණය හෝ වෙනස් කිරීමට පුළුවනි."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ඔබගේ පරිපාලක ඔබගේ උපාංගය මත තදබදය නිරීක්ෂණය කරන ජාල ලොග් කිරීම ක්රියාත්මක කර ඇත."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ඔබගේ පරිපාලක ඔබගේ පුද්ගලික පැතිකඩෙහි නොව කාර්යාල පැතිකඩෙහි තදබදය නිරීක්ෂණය කරන, ජාල පිරීම ක්රියාත්මක කර ඇත."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"ඊ-තැපැල්, යෙදුම් සහ වෙබ් අඩවි ඇතුළු ඔබේ ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැකි <xliff:g id="VPN_APP">%1$s</xliff:g>, වෙත ඔබ සම්බන්ධ වී ඇත."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"ඊ-තැපැල්, යෙදුම් සහ වෙබ් අඩවි ඇතුළු ඔබේ ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැකි <xliff:g id="VPN_APP_0">%1$s</xliff:g> සහ <xliff:g id="VPN_APP_1">%2$s</xliff:g> වෙත ඔබ සම්බන්ධ වී ඇත."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"ඊ-තැපැල්, යෙදුම් සහ වෙබ් අඩවි ඇතුළු ඔබේ ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැකි <xliff:g id="VPN_APP">%1$s</xliff:g>, වෙත ඔබේ කාර්යාල පැතිකඩ සම්බන්ධ වී ඇත."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"ඊ-තැපැල්, යෙදුම් සහ වෙබ් අඩවි ඇතුළු ඔබේ ජාල ක්රියාකාරකම් නිරීක්ෂණය කළ හැකි <xliff:g id="VPN_APP">%1$s</xliff:g> වෙත ඔබේ පුද්ගලික පැතිකඩ සම්බන්ධ වී ඇත."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN සැකසීම් විවෘත කරන්න"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"මෙම උපාංගය ඔබගේ මාපියන් විසින් කළමනාකරණය කෙරේ. ඔබ භාවිත කරන යෙදුම්, ඔබගේ ස්ථානය සහ ඔබගේ තිර කාලය වැනි තොරතුරු ඔබගේ මාපියන්ට බැලීමට සහ කළමනාකරණය කිරීමට හැකිය."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"විකාශන නම"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"මුරපදය"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"සුරකින්න"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"නිමැවුම් අංකය"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"නිමැවුම් අංකය පසුරු පුවරුවට පිටපත් කරන ලදි."</string> <string name="basic_status" msgid="2315371112182658176">"සංවාදය විවෘත කරන්න"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ටයිල් එක් කරන්න"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ටයිල් එක් නොකරන්න"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"පරිශීලක තෝරන්න"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one">යෙදුම් <xliff:g id="COUNT_1">%s</xliff:g>ක් සක්රියයි</item> + <item quantity="other">යෙදුම් <xliff:g id="COUNT_1">%s</xliff:g>ක් සක්රියයි</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"නව තොරතුරු"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"සක්රිය යෙදුම්"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"ඔබ මෙම යෙදුම් භාවිත නොකරන්නේ නම් පවා, ඒවා තවමත් සක්රියව පවතින අතර බැටරි ආයු කාලයට බලපෑ හැකිය"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"නවත්වන්න"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"නවත්වන ලදි"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"නිමයි"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 2d468298a21f..512d9a56d0eb 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -35,7 +35,7 @@ <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Povoliť aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> prístup k zariadeniu <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Povoliť aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> pristupovať k zariadeniu <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nTejto aplikácii nebolo udelené povolenie na nahrávanie, môže však snímať zvuk cez toto zariadenie USB."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Povoliť apl. <xliff:g id="APPLICATION">%1$s</xliff:g> prístup k zar. <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Otvoriť <xliff:g id="APPLICATION">%1$s</xliff:g> na spravovanie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Otvoriť aplikáciu <xliff:g id="APPLICATION">%1$s</xliff:g> na spravovanie zariadenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Tejto aplikácii nebolo udelené povolenie na nahrávanie, ale môže nahrávať zvuk cez toto zariadenie USB. Ak budete s týmto zariadením používať aplikáciu <xliff:g id="APPLICATION">%1$s</xliff:g>, nemusíte počuť hovory, upozornenia ani budíky."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Ak budete s týmto zariadením používať aplikáciu <xliff:g id="APPLICATION">%1$s</xliff:g>, nemusíte počuť hovory, upozornenia ani budíky."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Povoliť aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> prístup k zariadeniu <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Vaša organizácia spravuje toto zariadenie a môže sledovať sieťovú premávku"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> vlastní toto zariadenie a môže sledovať sieťovú premávku"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Toto zariadenie poskytuje <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Toto zariadenie patrí vašej organizácii a je pripojené k sieti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Toto zariadenie patrí organizácii <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> a je pripojené k sieti <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Toto zariadenie patrí vašej organizácii"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Toto zariadení patrí organizácii <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Toto zariadenie patrí vašej organizácii a je pripojené k sieťam VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Toto zariadenie patrí organizácii <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> a je pripojené k sieťam VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organizácia môže sledovať sieťovú premávku vo vašom pracovnom profile"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Organizácia <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> môže sledovať sieťovú premávku vo vašom pracovnom profile"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktivitu pracovného profilu na sieti vidí váš správca IT"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Sieť môže byť sledovaná"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Toto zariadenie je pripojené k sieťam VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Váš pracovný profil je pripojený k sieti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Váš osobný profil je pripojený k sieti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Toto zariadenie je pripojené k sieti <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Toto zariadenie poskytuje <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Správa zariadení"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"V tomto zariadení je nainštalovaná certifikačná autorita. Zabezpečená sieťová premávka môže byť sledovaná či upravená."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Správca aktivoval zapisovanie do denníka siete, ktoré sleduje premávku na vašom zariadení."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Správca aktivoval zapisovanie do denníka siete, ktoré sleduje premávku vo vašom pracovnom profile, ale nie osobnom."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Pripojili ste sa k aplikácii <xliff:g id="VPN_APP">%1$s</xliff:g>, ktorá môže sledovať vašu aktivitu v sieti, vrátane správ, aplikácií a webových stránok."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Pripojili ste sa k aplikáciám <xliff:g id="VPN_APP_0">%1$s</xliff:g> a <xliff:g id="VPN_APP_1">%2$s</xliff:g>, ktoré môžu sledovať vašu aktivitu v sieti, vrátane správ, aplikácií a webových stránok."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Váš pracovný profil je pripojený k aplikácii <xliff:g id="VPN_APP">%1$s</xliff:g>, ktorá môže sledovať vašu aktivitu v sieti vrátane správ, aplikácií a webových stránok."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Váš osobný profil je pripojený k aplikácii <xliff:g id="VPN_APP">%1$s</xliff:g>, ktorá môže sledovať vašu aktivitu v sieti vrátane správ, aplikácií a webových stránok."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Otvoriť nastavenia pripojenia VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Toto zariadenie spravuje tvoj rodič. Vidí a môže spravovať informácie, napríklad aplikácie, ktoré používaš, tvoju polohu a čas používania."</string> @@ -419,7 +431,7 @@ <string name="screen_pinning_title" msgid="9058007390337841305">"Aplikácia je pripnutá"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho stlačením a podržaním tlačidiel Späť a Prehľad."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho pridržaním tlačidiel Späť a Domov."</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Táto možnosť ponechá položku v zobrazení, dokým ju neodopnete. Odpojíte ju potiahnutím nahor a pridržaním."</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Táto možnosť ponechá položku v zobrazení, dokým ju neodopnete potiahnutím nahor a pridržaním."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho stlačením a podržaním tlačidla Prehľad."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho pridržaním tlačidla Domov."</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Môže mať prístup k osobným údajom (napríklad kontaktom a obsahu správ)."</string> @@ -855,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Názov vysielania"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Heslo"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Uložiť"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Číslo zostavy"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Číslo zostavy bolo skopírované do schránky."</string> <string name="basic_status" msgid="2315371112182658176">"Otvorená konverzácia"</string> @@ -923,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Pridať kartu"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Nepridať kartu"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Vyberte používateľa"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikácie sú aktívne</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> apps are active</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikácií je aktívnych</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikácia je aktívna</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nové informácie"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktívne aplikácie"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Aj keď tieto aplikácie nepoužívate, stále sú aktívne a môžu ovplyvňovať výdrž batérie"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ukončiť"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Zastavená"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Hotovo"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index aab95f10a162..87bb64d7f121 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Vaša organizacija je lastnica te naprave in lahko nadzira omrežni promet"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Organizacija <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> je lastnica te naprave in lahko nadzira omrežni promet"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"To napravo zagotavlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Ta naprava pripada vaši organizaciji in je povezana v aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Ta naprava pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> in je povezana v aplikacijo <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Ta naprava pripada vaši organizaciji"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Ta naprava pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Ta naprava pripada vaši organizaciji in je povezana v omrežja VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Ta naprava pripada organizaciji <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> in je povezana v omrežja VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Vaša organizacija lahko nadzira omrežni promet v vašem delovnem profilu"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> lahko nadzira omrežni promet v vašem delovnem profilu"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Omrežna dejavnost delovnega profila je vidna skrbniku za IT."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Omrežje je morda nadzorovano"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Ta naprava je povezana v omrežja VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Delovni profil je povezan v aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Osebni profil je povezan v aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Ta naprava je povezava v aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"To napravo zagotavlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Upravljanje naprav"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"V tej napravi je nameščen overitelj potrdil. Varni omrežni promet se lahko nadzira ali spreminja."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Skrbnik je vklopil beleženje omrežnega prometa, ki nadzira promet v napravi."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Skrbnik je vklopil beleženje omrežnega prometa, ki nadzoruje samo promet v delovnem profilu, tistega v osebnem profilu pa ne."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Povezani ste z aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>, ki lahko nadzira omrežno dejavnost, vključno z e-pošto, aplikacijami in spletnimi mesti."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Povezani ste z aplikacijama <xliff:g id="VPN_APP_0">%1$s</xliff:g> in <xliff:g id="VPN_APP_1">%2$s</xliff:g>, ki lahko nadzirata omrežno dejavnost, vključno z e-pošto, aplikacijami in spletnimi mesti."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Delovni profil je povezan z aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>, ki lahko nadzira omrežno dejavnost, vključno z e-pošto, aplikacijami in spletnimi mesti."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Osebni profil je povezan z aplikacijo <xliff:g id="VPN_APP">%1$s</xliff:g>, ki lahko nadzira omrežno dejavnost, vključno z e-pošto, aplikacijami in spletnimi mesti."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Odpri nastavitve omrežja VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"To napravo upravlja tvoj starš. Lahko si ogleda in upravlja podatke, na primer katere aplikacije uporabljaš, tvojo lokacijo in koliko časa uporabljaš napravo."</string> @@ -855,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Ime oddajanja"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Geslo"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Shrani"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Delovna različica"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Delovna različica je bila kopirana v odložišče."</string> <string name="basic_status" msgid="2315371112182658176">"Odprt pogovor"</string> @@ -923,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Dodaj ploščico"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ne dodaj ploščice"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Izberite uporabnika"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> aplikacija je aktivna</item> + <item quantity="two"><xliff:g id="COUNT_1">%s</xliff:g> aplikaciji sta aktivni</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> aplikacije so aktivne</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacij je aktivnih</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Nove informacije"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktivne aplikacije"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Tudi če teh aplikacij ne uporabljate, so še vedno aktivne in morda vplivajo na čas delovanja baterije."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ustavi"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Ustavljeno"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Končano"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 42aae9f736cb..9ce51057329d 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organizata jote e zotëron këtë pajisje dhe mund të monitorojë trafikun e rrjetit"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> e zotëron këtë pajisje dhe mund të monitorojë trafikun e rrjetit"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Kjo pajisje ofrohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Kjo pajisje i përket organizatës sate dhe është e lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Kjo pajisje i përket <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dhe është e lidhur me <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Kjo pajisje i përket organizatës sate"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Kjo pajisje i përket <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Kjo pajisje i përket organizatës sate dhe është e lidhur me rrjetet VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Kjo pajisje i përket <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> dhe është e lidhur me rrjetet VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organizata jote mund të monitorojë trafikun e rrjetit në profilin tënd të punës"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> mund të monitorojë trafikun e rrjetit në profilin tënd të punës"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Aktiviteti i rrjetit të profilit të punës është i dukshëm për administratorin tënd të teknologjisë së informacionit"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Rrjeti mund të jetë i monitoruar"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Kjo pajisje është e lidhur me rrjetet VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Profili yt i punës është i lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Profili yt personal është i lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Kjo pajisje është e lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Kjo pajisje ofrohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Menaxhimi i pajisjes"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Në këtë pajisje është instaluar një autoritet certifikate. Trafiku i rrjetit tënd të sigurt mund të monitorohet ose modifikohet."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratori ka aktivizuar regjistrimin e rrjetit, i cili monitoron trafikun në pajisjen tënde."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratori yt ka aktivizuar regjistrimin e rrjetit, i cili monitoron trafikun në profilin tënd të punës, por jo në profilin tënd personal."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Je lidhur me aplikacionin <xliff:g id="VPN_APP">%1$s</xliff:g>, i cili mund të monitorojë aktivitetin tënd në rrjet, duke përfshirë mail-et, aplikacionet dhe sajtet e uebit."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Je lidhur me aplikacionet <xliff:g id="VPN_APP_0">%1$s</xliff:g> dhe <xliff:g id="VPN_APP_1">%2$s</xliff:g>, të cilat mund të monitorojnë aktivitetin tënd në rrjet, duke përfshirë mail-et, aplikacionet dhe sajtet e uebit."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Profili yt i punës është i lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>, i cili mund të monitorojë aktivitetin tënd në rrjet, duke përfshirë mail-et, aplikacionet dhe sajtet e uebit."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Profili yt personal është i lidhur me <xliff:g id="VPN_APP">%1$s</xliff:g>, i cili mund të monitorojë aktivitetin tënd në rrjet, duke përfshirë mail-et, aplikacionet dhe sajtet e uebit."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Hap cilësimet e VPN-së"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Kjo pajisje menaxhohet nga prindi yt. Prindi yt mund të shikojë dhe menaxhojë informacionet, si p.sh. aplikacionet që përdor, vendndodhjen tënde dhe kohën para ekranit."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Emri i transmetimit"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Fjalëkalimi"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Ruaj"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numri i ndërtimit"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Numri i ndërtimit u kopjua te kujtesa e fragmenteve"</string> <string name="basic_status" msgid="2315371112182658176">"Hap bisedën"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Shto një pllakëz"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Mos e shto pllakëzën"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Zgjidh përdoruesin"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> aplikacione janë aktive</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> aplikacion është aktiv</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Informacion i ri"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aplikacionet aktive"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Edhe nëse nuk je duke i përdorur këto aplikacione, ato janë ende aktive dhe mund të ndikojnë në kohëzgjatjen e baterisë"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ndalo"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Ndaluar"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"U krye"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 8b9b08841b3b..c40e3d51b407 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -368,20 +368,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Организација је власник уређаја и може да надгледа мрежни саобраћај"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> је власник овог уређаја и може да надгледа мрежни саобраћај"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Овај уређај пружа <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Овај уређај припада организацији и повезан је са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Овај уређај припада организацији <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и повезан је са апликацијом <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Овај уређај припада организацији"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Овај уређај припада организацији <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Овај уређај припада организацији и повезан је са VPN-овима"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Овај уређај припада организацији <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> и повезан је са VPN-овима"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Организација може да прати мрежни саобраћај на пословном профилу"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> може да надгледа мрежни саобраћај на пословном профилу"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Активност на мрежи пословног профила је видљива ИТ администратору"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Мрежа се можда надгледа"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Овај уређај је повезан са VPN-овима"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Пословни профил је повезан са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Ваш лични профил је повезан са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Овај уређај је повезан са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Овај уређај пружа <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Управљање уређајима"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -397,10 +405,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На овом уређају је инсталиран ауторитет за издавање сертификата. Безбедни мрежни саобраћај може да се прати или мења."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Администратор је укључио евидентирање мреже, које прати саобраћај на уређају."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Администратор је укључио евидентирање мреже, које прати саобраћај на пословном профилу, али не и на личном профилу."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Повезани сте са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>, која може да надгледа активности на мрежи, укључујући имејлове, апликације и веб-сајтове."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Повезани сте са апликацијама <xliff:g id="VPN_APP_0">%1$s</xliff:g> и <xliff:g id="VPN_APP_1">%2$s</xliff:g>, које могу да надгледају активности на мрежи, укључујући имејлове, апликације и веб-сајтове."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Пословни профил је повезан са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>, која може да надгледа активности на мрежи, укључујући имејлове, апликације и веб-сајтове."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Лични профил је повезан са апликацијом <xliff:g id="VPN_APP">%1$s</xliff:g>, која може да надгледа активности на мрежи, укључујући имејлове, апликације и веб-сајтове."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Отвори подешавања VPN-а"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Овим уређајем управља родитељ. Родитељ може да види информације, као што су апликације које користиш, твоју локацију и време испред екрана, и да управља њима."</string> @@ -849,6 +861,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Назив емитовања"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Лозинка"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Сачувај"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Број верзије"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Број верзије је копиран у привремену меморију."</string> <string name="basic_status" msgid="2315371112182658176">"Отворите конверзацију"</string> @@ -917,11 +933,14 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Додај плочицу"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Не додај плочицу"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Изаберите корисника"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> апликација је активна</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> апликације су активне</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> апликација је активно</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нове информације"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активне апликације"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Чак и ако не користите ове апликације, оне су и даље активне и могу да утичу на трајање батерије"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Заустави"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Заустављено"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Готово"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 9206685be801..82f09a97efab 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Organisationen äger den här enheten och kan övervaka nätverkstrafiken"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> äger den här enheten och kan övervaka nätverkstrafiken"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Enheten tillhandahålls av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Den här enheten tillhör organisationen och är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Den här enheten tillhör <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> och är ansluten till <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Den här enheten tillhör organisationen"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Den här enheten tillhör <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Den här enheten tillhör organisationen och är ansluten till VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Den här enheten tillhör <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> och är ansluten till VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Organisationen kan övervaka nätverkstrafik i jobbprofilen"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kan övervaka nätverkstrafiken i jobbprofilen"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Jobbprofilens nätverksaktivitet är synlig för IT-administratören"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Nätverket kan vara övervakat"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Den här enheten är ansluten till VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Jobbprofilen är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Din personliga profil är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Den här enheten är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Enheten tillhandahålls av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Enhetshantering"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"En certifikatutfärdare är installerad på enheten. Din säkra nätverkstrafik kan övervakas och ändras."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administratören har aktiverat nätverksloggning som övervakar trafik på enheten."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administratören har aktiverat nätverksloggning som övervakar trafik i jobbprofilen men inte den privata profilen."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Du är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g> som kan övervaka din nätverksaktivitet, inklusive e-postmeddelanden, appar och webbplatser."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Du är ansluten till <xliff:g id="VPN_APP_0">%1$s</xliff:g> och <xliff:g id="VPN_APP_1">%2$s</xliff:g> som kan övervaka din nätverksaktivitet, inklusive e-postmeddelanden, appar och webbplatser."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Jobbprofilen är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g> som kan övervaka din nätverksaktivitet, exempelvis e-post, appar och webbplatser."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Din personliga profil är ansluten till <xliff:g id="VPN_APP">%1$s</xliff:g> som kan övervaka din nätverksaktivitet, exempelvis e-post, appar och webbplatser."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Öppna VPN-inställningarna"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Den här enheten hanteras av din förälder. Föräldern kan se och hantera information som vilka appar du använder, din plats och din skärmtid."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Utsändningsnamn"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Lösenord"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Spara"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Versionsnummer"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Versionsnumret har kopierats till urklipp."</string> <string name="basic_status" msgid="2315371112182658176">"Öppen konversation"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Lägg till ruta"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Lägg inte till ruta"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Välj användare"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> apps är aktiva</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> app är aktiv</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ny information"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Aktiva appar"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Apparna är aktiva och kan påverka batteritiden även om du inte använder dem."</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stoppa"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Stoppad"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Klar"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index ad5d132f2fcb..561daa280470 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -36,8 +36,8 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Ungependa kuruhusu <xliff:g id="APPLICATION">%1$s</xliff:g> ifikie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nProgramu hii haijapewa ruhusa ya kurekodi lakini inaweza kurekodi sauti kupitia kifaa hiki cha USB."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Ungependa kuruhusu <xliff:g id="APPLICATION">%1$s</xliff:g> ifikie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Ungependa kufungua <xliff:g id="APPLICATION">%1$s</xliff:g> ishughulikie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Programu hii haijapewa ruhusa ya kurekodi lakini inaweza kurekodi sauti kupitia kifaa hiki cha USB. Ukitumia <xliff:g id="APPLICATION">%1$s</xliff:g> kwenye kifaa hiki kunaweza kuzuia kusikia simu, arifa na kengele."</string> - <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Ukitumia <xliff:g id="APPLICATION">%1$s</xliff:g> kwenye kifaa hiki kunaweza kuzuia kusikia simu, arifa na kengele."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Programu hii haijapewa ruhusa ya kurekodi lakini inaweza kurekodi sauti kupitia kifaa hiki cha USB. Ukitumia <xliff:g id="APPLICATION">%1$s</xliff:g> kwenye kifaa hiki huenda usisikie simu, arifa na kengele."</string> + <string name="usb_audio_device_prompt" msgid="7944987408206252949">"Ukitumia <xliff:g id="APPLICATION">%1$s</xliff:g> kwenye kifaa hiki huenda usisikie simu, arifa na kengele."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Ungependa kuruhusu <xliff:g id="APPLICATION">%1$s</xliff:g> ifikie <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Ungependa kufungua <xliff:g id="APPLICATION">%1$s</xliff:g> ili itumie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Ungependa kufungua <xliff:g id="APPLICATION">%1$s</xliff:g> ishughulikie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nProgramu hii haijapewa ruhusa ya kurekodi lakini inaweza kurekodi sauti kupitia kifaa hiki cha USB."</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Shirika lako linamiliki kifaa hiki na huenda likafuatilia trafiki ya mtandao"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> inamiliki kifaa hiki na huenda ikafuatilia trafiki ya mtandao"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Kifaa hiki kimetolewa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Kifaa hiki kinamilikiwa na shirika lako na kimeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Kifaa hiki kinamilikiwa na <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> na kimeunganishwa kwenye <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Kifaa hiki kinamilikiwa na shirika lako"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Kifaa hiki kinamilikiwa na <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Kifaa hiki kinamilikiwa na shirika lako na kimeunganishwa kwenye VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Kifaa hiki kinamilikiwa na <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> na kimeunganishwa kwenye VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Huenda shirika lako likafuatilia shughuli kwenye mtandao katika wasifu wako wa kazini"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Huenda <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ikafuatilia shughuli kwenye mtandao katika wasifu wako wa kazini"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Shughuli za mtandao za wasifu wa kazini zinaonekana kwa msimamizi wako wa TEHAMA."</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Huenda mtandao unafuatiliwa"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Kifaa hiki kimeunganishwa kwenye VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Wasifu wako wa kazini umeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Wasifu wako wa binafsi umeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Kifaa hiki kimeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Kifaa hiki kimetolewa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Udhibiti wa kifaa"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Mamlaka ya cheti imesakinishwa kwenye kifaa hiki. Huenda shughuli kwenye mtandao wako salama zikafuatiliwa au kubadilishwa."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Msimamizi wako amewasha kumbukumbu ya kuingia mtandaoni, ambayo hufuatilia shughuli kwenye kifaa chako."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Msimamizi wako amewasha kumbukumbu ya kuingia mtandaoni ambayo hufuatilia shughuli kwenye wasifu wako wa kazini ila si kwenye wasifu wako wa binafsi."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Umeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>, ambayo inaweza kufuatilia shughuli za mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Umeunganishwa kwenye <xliff:g id="VPN_APP_0">%1$s</xliff:g> na <xliff:g id="VPN_APP_1">%2$s</xliff:g>, ambazo zinaweza kufuatilia shughuli za mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Wasifu wako wa kazini umeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>, ambayo inaweza kufuatilia shughuli za mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Wasifu wako wa binafsi umeunganishwa kwenye <xliff:g id="VPN_APP">%1$s</xliff:g>, ambayo inaweza kufuatilia shughuli za mtandao wako, ikiwa ni pamoja na barua pepe, programu na tovuti."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Fungua mipangilio ya VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Kifaa hiki kinadhibitiwa na mzazi wako. Mzazi wako anaweza kuona na kudhibiti maelezo kama vile programu unazotumia, mahali ulipo na muda unaotumia kwenye kifaa."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Jina la Tangazo"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Nenosiri"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Hifadhi"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nambari ya muundo"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nambari ya muundo imewekwa kwenye ubao wa kunakili."</string> <string name="basic_status" msgid="2315371112182658176">"Fungua mazungumzo"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Kiongeze"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Kisiongezwe"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Chagua mtumiaji"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">Programu <xliff:g id="COUNT_1">%s</xliff:g> zinatumika</item> + <item quantity="one">Programu <xliff:g id="COUNT_0">%s</xliff:g> inatumika</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Maelezo mapya"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Programu zinazotumika"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Hata ikiwa hutumii programu hizi, bado zinatumika na huenda zikaathiri muda wa matumizi ya betri"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Simamisha"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Imesimamishwa"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Imemaliza"</string> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 2264671e5067..21e56976a074 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -65,6 +65,8 @@ <dimen name="qs_security_footer_single_line_height">48dp</dimen> <dimen name="qs_security_footer_background_inset">0dp</dimen> + <dimen name="qs_panel_padding_top">8dp</dimen> + <!-- The width of large/content heavy dialogs (e.g. Internet, Media output, etc) --> <dimen name="large_dialog_width">472dp</dimen> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index d66bc4117897..2a1c830638c7 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"இந்த சாதனம் உங்கள் நிறுவனத்துக்கு உரியது, நெட்வொர்க் ட்ராஃபிக்கையும் நிறுவனமே கண்காணிக்கக்கூடும்"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"இந்த சாதனம் <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> நிறுவனத்துக்கு உரியது, நெட்வொர்க் ட்ராஃபிக்கையும் நிறுவனமே கண்காணிக்கக்கூடும்"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"இந்தச் சாதனம் <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> நிறுவனத்தால் வழங்கப்பட்டது"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"இந்த சாதனம் உங்கள் நிறுவனத்துக்கு சொந்தமானது, அது <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"இந்த சாதனம் <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> நிறுவனத்துக்கு சொந்தமானது, அது <xliff:g id="VPN_APP">%2$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"இந்த சாதனம் உங்கள் நிறுவனத்துக்கு சொந்தமானது"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"இந்த சாதனம் <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> நிறுவனத்துக்கு சொந்தமானது"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"இந்த சாதனம் உங்கள் நிறுவனத்துக்கு சொந்தமானது, அது VPNகளுடன் இணைக்கப்பட்டுள்ளது"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"இந்த சாதனம் <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> நிறுவனத்துக்கு சொந்தமானது, அது VPNகளுடன் இணைக்கப்பட்டுள்ளது"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"உங்கள் நிறுவனம் பணிக் கணக்கில் நெட்வொர்க் ட்ராஃபிக்கைக் கண்காணிக்கலாம்"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> உங்கள் பணிக் கணக்கில் நெட்வொர்க் ட்ராஃபிக்கைக் கண்காணிக்கலாம்"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"பணிக் கணக்கின் நெட்வொர்க் செயல்பாட்டை IT நிர்வாகியால் பார்க்க முடியும்"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"நெட்வொர்க் கண்காணிக்கப்படலாம்"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"இந்த சாதனம் VPNகளுடன் இணைக்கப்பட்டுள்ளது"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"உங்கள் பணிக் கணக்கு <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"உங்கள் தனிப்பட்ட சுயவிவரம் <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"இந்த சாதனம் <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"இந்தச் சாதனம் <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> நிறுவனத்தால் வழங்கப்பட்டது"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"சாதன நிர்வாகம்"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"இந்தச் சாதனத்தில் சான்றிதழ் அங்கீகாரம் நிறுவப்பட்டுள்ளது. உங்களின் பாதுகாப்பான நெட்வொர்க் ட்ராஃபிக் கண்காணிக்கப்படலாம் அல்லது மாற்றப்படலாம்."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"உங்கள் நிர்வாகி, நெட்வொர்க் பதிவெடுத்தலை இயக்கியுள்ளார். இது சாதனத்தில் ட்ராஃபிக்கைக் கண்காணிக்கும்."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"உங்கள் நிர்வாகி \'நெட்வொர்க் பதிவெடுத்தலை\' இயக்கியுள்ளார், இது உங்கள் பணிக் கணக்கில் டிராஃபிக்கைக் கண்காணிக்கும். ஆனால் தனிப்பட்ட கணக்கில் கண்காணிக்காது."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP_0">%1$s</xliff:g> மற்றும் <xliff:g id="VPN_APP_1">%2$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்கள் பணிக் கணக்கு இணைக்கப்பட்டுள்ளது."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்களின் தனிப்பட்ட சுயவிவரம் இணைக்கப்பட்டுள்ளது."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN அமைப்புகளைத் திற"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"இந்தச் சாதனம் உங்கள் பெற்றோரால் நிர்வகிக்கப்படுகிறது. நீங்கள் பயன்படுத்தும் ஆப்ஸ், இருப்பிடம், பயன்படுத்திய நேரம் ஆகியவற்றைப் பார்க்கவும் நிர்வகிக்கவும் உங்கள் பெற்றோரால் முடியும்."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"முன்னுரிமை"</string> <string name="no_shortcut" msgid="8257177117568230126">"உரையாடல் அம்சங்களை <xliff:g id="APP_NAME">%1$s</xliff:g> ஆதரிக்காது"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"இந்த அறிவிப்புகளை மாற்ற இயலாது."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"அழைப்பு அறிவிப்புகளை மாற்ற முடியாது."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"இந்த அறிவுப்புக் குழுக்களை இங்கே உள்ளமைக்க இயலாது"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ப்ராக்ஸியான அறிவிப்பு"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"அனைத்து <xliff:g id="APP_NAME">%1$s</xliff:g> அறிவிப்புகளும்"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"பிராட்காஸ்ட்டின் பெயர்"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"கடவுச்சொல்"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"சேமி"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"பதிப்பு எண்"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"பதிப்பு எண் கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது."</string> <string name="basic_status" msgid="2315371112182658176">"திறந்தநிலை உரையாடல்"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"கட்டத்தைச் சேர்"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"கட்டத்தை சேர்க்காதே"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"பயனரைத் தேர்வுசெய்க"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ஆப்ஸ் செயலிலுள்ளன</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ஆப்ஸ் செயலிலுள்ளது</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"புதிய தகவல்கள்"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"செயலிலுள்ள ஆப்ஸ்"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"இந்த ஆப்ஸைப் பயன்படுத்தாமல் இருந்தாலும்கூட, அவை செயலிலிருந்துகொண்டு பேட்டரி ஆயுளைப் பாதிக்கக்கூடும்"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"நிறுத்து"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"இயங்கவில்லை"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"முடிந்தது"</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 871282538090..d04d33f071b1 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -36,7 +36,7 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>యాక్సెస్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ను అనుమతించాలా?\nఈ యాప్నకు రికార్డ్ చేసే అనుమతి మంజూరు చేయబడలేదు, కానీ ఈ USB పరికరం ద్వారా ఆడియోను క్యాప్చర్ చేయగలదు."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ను యాక్సెస్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ను అనుమతించాలా?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ను హ్యాండిల్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ను తెరవాలా?"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"ఈ యాప్నకు రికార్డ్ చేసే అనుమతి మంజూరు కాలేదు, అయినా ఈ USB పరికరం ద్వారా ఆడియోను క్యాప్చర్ చేయగలదు. ఈ పరికరంలో <xliff:g id="APPLICATION">%1$s</xliff:g>ను ఉపయోగించడం వలన కాల్స్, నోటిఫికేషన్లు, అలారంలను వినబడనీయకుండా నివారించవచ్చు."</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"ఈ యాప్నకు రికార్డ్ చేసే అనుమతి మంజూరు కాలేదు, అయినా ఈ USB పరికరం ద్వారా ఆడియోను క్యాప్చర్ చేయగలదు. ఈ పరికరంలో <xliff:g id="APPLICATION">%1$s</xliff:g>ను ఉపయోగించడం వలన కాల్స్, నోటిఫికేషన్లు, అలారాలను వినబడనీయకుండా నివారించవచ్చు."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"ఈ పరికరంలో <xliff:g id="APPLICATION">%1$s</xliff:g>ను ఉపయోగించడం వలన కాల్స్, నోటిఫికేషన్లు, అలారంలను వినబడనీయకుండా నివారించవచ్చు."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ని యాక్సెస్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని అనుమతించాలా?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ని హ్యాండిల్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని తెరవాలా?"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"ఈ పరికరం మీ సంస్థకు చెందినది, కాబట్టి అది నెట్వర్క్ ట్రాఫిక్ను పర్యవేక్షించవచ్చు"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"మీ పరికరం <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>కు చెందినది, కాబట్టి అది నెట్వర్క్ ట్రాఫిక్ను పర్యవేక్షించవచ్చు"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా అందించబడింది"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"ఈ పరికరం మీ సంస్థకు చెందినది, ఇది <xliff:g id="VPN_APP">%1$s</xliff:g>కు కనెక్ట్ అయి ఉంది"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>కు చెందినది, ఇది <xliff:g id="VPN_APP">%2$s</xliff:g>కు కనెక్ట్ అయి ఉంది"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"ఈ పరికరం మీ సంస్థకు చెందినది"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>కు చెందినది"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"ఈ పరికరం మీ సంస్థకు చెందినది, ఇది VPNలకు కనెక్ట్ అయి ఉంది"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>కు చెందినది, ఇది VPNలకు కనెక్ట్ అయి ఉంది"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"మీ కార్యాలయ ప్రొఫైల్లోని నెట్వర్క్ ట్రాఫిక్ని మీ సంస్థ పర్యవేక్షించవచ్చు"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"మీ కార్యాలయ ప్రొఫైల్లోని నెట్వర్క్ ట్రాఫిక్ని <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> పర్యవేక్షించవచ్చు"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"వర్క్ ప్రొఫైల్ నెట్వర్క్ యాక్టివిటీ మీ IT అడ్మిన్కు కనిపిస్తుంది"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"నెట్వర్క్ పర్యవేక్షించబడవచ్చు"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"ఈ పరికరం VPNలకు కనెక్ట్ అయి ఉంది"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"మీ వర్క్ ప్రొఫైల్ <xliff:g id="VPN_APP">%1$s</xliff:g>కు కనెక్ట్ చేయబడింది"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"<xliff:g id="VPN_APP">%1$s</xliff:g>కు మీ వ్యక్తిగత ప్రొఫైల్ కనెక్ట్ చేయబడింది"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"ఈ పరికరం <xliff:g id="VPN_APP">%1$s</xliff:g>కు కనెక్ట్ అయి ఉంది"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా అందించబడింది"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"పరికర నిర్వహణ"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ఈ పరికరంలో ప్రమాణపత్ర అధికారం ఇన్స్టాల్ చేయబడింది. మీ సురక్షిత నెట్వర్క్ ట్రాఫిక్ పర్యవేక్షించబడవచ్చు లేదా సవరించబడవచ్చు."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"మీ నిర్వాహకులు మీ పరికరంలోని ట్రాఫిక్ని పర్యవేక్షించగల నెట్వర్క్ లాగింగ్ని ఆన్ చేశారు."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"మీ అడ్మిన్ నెట్వర్క్ లాగింగ్ను ఆన్ చేశారు, ఇది మీ వర్క్ ప్రొఫైల్లోని ట్రాఫిక్ను పర్యవేక్షిస్తుంది కానీ మీ వ్యక్తిగత ప్రొఫైల్లో కాదు."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"మీరు <xliff:g id="VPN_APP">%1$s</xliff:g>కి కనెక్ట్ చేయబడ్డారు, ఇది ఈమెయిళ్లు, యాప్లు మరియు వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగలదు."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"మీరు ఈమెయిళ్లు, యాప్లు మరియు వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగల <xliff:g id="VPN_APP_0">%1$s</xliff:g> మరియు <xliff:g id="VPN_APP_1">%2$s</xliff:g>కి కనెక్ట్ చేయబడ్డారు."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"మీ కార్యాలయ ప్రొఫైల్ ఈమెయిళ్లు, యాప్లు మరియు వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగల <xliff:g id="VPN_APP">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"మీ వ్యక్తిగత ప్రొఫైల్ ఈమెయిళ్లు, యాప్లు మరియు వెబ్సైట్లతో సహా మీ నెట్వర్క్ కార్యాచరణను పర్యవేక్షించగల <xliff:g id="VPN_APP">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN సెట్టింగ్లను తెరవండి"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"ఈ పరికరాన్ని మీ తల్లి/తండ్రి మేనేజ్ చేస్తున్నారు. మీ తల్లి/తండ్రి, మీరు ఉపయోగించే యాప్లు, మీ లొకేషన్, అలాగే మీ పరికర వినియోగ వ్యవధి వంటి సమాచారాన్ని చూడగలరు, మేనేజ్ చేయగలరు."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"ప్రాధాన్యత"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> సంభాషణ ఫీచర్లను సపోర్ట్ చేయదు"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"ఈ నోటిఫికేషన్లను సవరించడం వీలుపడదు."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"కాల్ నోటిఫికేషన్లను ఎడిట్ చేయడం సాధ్యం కాదు."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"ఈ నోటిఫికేషన్ల సమూహాన్ని ఇక్కడ కాన్ఫిగర్ చేయలేము"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"ప్రాక్సీ చేయబడిన నోటిఫికేషన్"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"అన్ని <xliff:g id="APP_NAME">%1$s</xliff:g> నోటిఫికేషన్లు"</string> @@ -844,6 +855,8 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ప్రసారం పేరు"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"పాస్వర్డ్"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"సేవ్ చేయండి"</string> + <string name="media_output_broadcast_starting" msgid="8130153654166235557">"ప్రారంభించబడుతోంది…"</string> + <string name="media_output_broadcast_start_failed" msgid="3670835946856129775">"ప్రసారం చేయడం సాధ్యపడలేదు"</string> <string name="build_number_clip_data_label" msgid="3623176728412560914">"బిల్డ్ నంబర్"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"బిల్డ్ నంబర్, క్లిప్బోర్డ్కు కాపీ చేయబడింది."</string> <string name="basic_status" msgid="2315371112182658176">"సంభాషణను తెరవండి"</string> @@ -912,11 +925,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"టైల్ను జోడించండి"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"టైల్ను జోడించవద్దు"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"యూజర్ను ఎంచుకోండి"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> యాప్లు యాక్టివ్గా ఉన్నాయి</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> యాప్ యాక్టివ్గా ఉంది</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"కొత్త సమాచారం"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"యాక్టివ్గా ఉన్న యాప్లు"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"మీరు ఈ యాప్లను ఉపయోగించకపోయినా, అవి ఇప్పటికీ యాక్టివ్గా ఉంటాయి, బ్యాటరీ జీవితకాలాన్ని ప్రభావితం చేయవచ్చు"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"ఆపివేయండి"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"ఆపివేయబడింది"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"పూర్తయింది"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 434c4f01c3a4..622697e81c7e 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -33,14 +33,15 @@ <string name="battery_saver_dismiss_action" msgid="7199342621040014738">"ไม่เป็นไร"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"หมุนหน้าจออัตโนมัติ"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม\nแอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่จะอัดเสียงผ่านอุปกรณ์ USB นี้ได้"</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม\nแอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่อาจเก็บเสียงผ่านอุปกรณ์ USB นี้ได้"</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_DEVICE">%2$s</xliff:g> ใช่ไหม"</string> - <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ใช่ไหม"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"แอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่จะอัดเสียงผ่านอุปกรณ์ USB นี้ได้ การใช้ <xliff:g id="APPLICATION">%1$s</xliff:g> กับอุปกรณ์นี้อาจทำให้คุณไม่ได้ยินเสียงสายเรียกเข้า การแจ้งเตือน และการปลุก"</string> + <!-- no translation found for usb_audio_device_confirm_prompt_title (8828406516732985696) --> + <skip /> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"แอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่อาจเก็บเสียงเสียงผ่านอุปกรณ์ USB นี้ได้ การใช้ <xliff:g id="APPLICATION">%1$s</xliff:g> กับอุปกรณ์นี้อาจทำให้คุณไม่ได้ยินเสียงสายเรียกเข้า การแจ้งเตือน และการปลุก"</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"การใช้ <xliff:g id="APPLICATION">%1$s</xliff:g> กับอุปกรณ์นี้อาจทำให้คุณไม่ได้ยินเสียงสายเรียกเข้า การแจ้งเตือน และการปลุก"</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ไหม"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ใช่ไหม\nแอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่จะอัดเสียงผ่านอุปกรณ์ USB นี้ได้"</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม\nแอปนี้ไม่ได้รับอนุญาตให้อัดเสียงแต่อาจเก็บเสียงผ่านอุปกรณ์ USB นี้ได้"</string> <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ไหม"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"แอปพลิเคชันที่ติดตั้งใช้กับอุปกรณ์ USB นี้ไม่ได้ ดูข้อมูลเพิ่มเติมเกี่ยวกับอุปกรณ์เสริมนี้ที่ <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"อุปกรณ์เสริม USB"</string> @@ -365,20 +366,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"องค์กรของคุณเป็นเจ้าของอุปกรณ์นี้และอาจตรวจสอบการจราจรของข้อมูลในเครือข่าย"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> เป็นเจ้าของอุปกรณ์นี้และอาจตรวจสอบการจราจรของข้อมูลในเครือข่าย"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"อุปกรณ์นี้ให้บริการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"องค์กรของคุณเป็นเจ้าของอุปกรณ์นี้ และอุปกรณ์เชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> เป็นเจ้าของอุปกรณ์นี้ และอุปกรณ์เชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"องค์กรของคุณเป็นเจ้าของอุปกรณ์นี้"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> เป็นเจ้าของอุปกรณ์นี้"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"องค์กรของคุณเป็นเจ้าของอุปกรณ์นี้ และอุปกรณ์เชื่อมต่ออยู่กับ VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> เป็นเจ้าของอุปกรณ์นี้ และอุปกรณ์เชื่อมต่ออยู่กับ VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"องค์กรของคุณอาจตรวจสอบการจราจรของข้อมูลในเครือข่ายในโปรไฟล์งาน"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> อาจตรวจสอบการจราจรของข้อมูลในเครือข่ายในโปรไฟล์งานของคุณ"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"ผู้ดูแลระบบไอทีจะเห็นกิจกรรมในเครือข่ายโปรไฟล์งาน"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"อาจมีการตรวจสอบเครือข่าย"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"อุปกรณ์นี้เชื่อมต่ออยู่กับ VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"โปรไฟล์งานของคุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"โปรไฟล์ส่วนตัวของคุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"อุปกรณ์นี้เชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"อุปกรณ์นี้ให้บริการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"การจัดการอุปกรณ์"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +403,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"มีการติดตั้งผู้ออกใบรับรองในอุปกรณ์นี้ อาจมีการตรวจสอบหรือแก้ไขการจราจรของข้อมูลในเครือข่ายที่ปลอดภัยของคุณ"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"ผู้ดูแลระบบได้เปิดการบันทึกกิจกรรมของเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในอุปกรณ์ของคุณ"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"ผู้ดูแลระบบได้เปิดการบันทึกกิจกรรมของเครือข่าย ซึ่งจะตรวจสอบการรับส่งข้อมูลในโปรไฟล์งานแต่ไม่ตรวจสอบในโปรไฟล์ส่วนตัวของคุณ"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"คุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"คุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP_0">%1$s</xliff:g> และ <xliff:g id="VPN_APP_1">%2$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"โปรไฟล์งานของคุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"โปรไฟล์ส่วนตัวของคุณเชื่อมต่ออยู่กับ <xliff:g id="VPN_APP">%1$s</xliff:g> ซึ่งสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ รวมถึงอีเมล แอป และเว็บไซต์"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"เปิดการตั้งค่า VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"อุปกรณ์นี้จัดการโดยผู้ปกครอง ผู้ปกครองจะดูและจัดการข้อมูลต่างๆ ได้ เช่น แอปที่คุณใช้ ตำแหน่งของคุณ และเวลาอยู่หน้าจอ"</string> @@ -843,6 +856,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"ชื่อการออกอากาศ"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"รหัสผ่าน"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"บันทึก"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"หมายเลขบิลด์"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"คัดลอกหมายเลขบิลด์ไปยังคลิปบอร์ดแล้ว"</string> <string name="basic_status" msgid="2315371112182658176">"เปิดการสนทนา"</string> @@ -911,11 +928,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"เพิ่มชิ้นส่วน"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ไม่ต้องเพิ่มชิ้นส่วน"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"เลือกผู้ใช้"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">ทำงานอยู่ <xliff:g id="COUNT_1">%s</xliff:g> แอป</item> + <item quantity="one">ทำงานอยู่ <xliff:g id="COUNT_0">%s</xliff:g> แอป</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"ข้อมูลใหม่"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"แอปที่ใช้งานอยู่"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"แม้ว่าคุณจะไม่ได้ใช้งาน แอปเหล่านี้ก็ยังทำงานอยู่และอาจส่งผลต่ออายุการใช้งานแบตเตอรี่"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"หยุด"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"หยุดแล้ว"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"เสร็จ"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 65c09eb558ea..ae2c4f136f71 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Pagmamay-ari ng organisasyon mo ang device na ito at puwede nitong subaybayan ang trapiko sa network"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Pagmamay-ari ng <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ang device na ito at puwede nitong subaybayan ang trapiko sa network"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Nagmula sa <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Pagmamay-ari ng iyong organisasyon ang device na ito at nakakonekta ito sa <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Pagmamay-ari ng <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ang device na ito at nakakonekta ito sa <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Pagmamay-ari ng iyong organisasyon ang device na ito"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Pagmamay-ari ng <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ang device na ito"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Pagmamay-ari ng iyong organisasyon ang device na ito nakakonekta ito sa mga VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Pagmamay-ari ng <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ang device na ito at nakakonekta ito sa mga VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Maaaring sumubaybay ang iyong organisasyon ng trapiko sa network sa profile sa trabaho mo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Maaaring subaybayan ng <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ang trapiko sa network sa iyong profile sa trabaho"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Nakikita ng IT admin ang aktibidad sa network"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Maaaring sinusubaybayan ang network"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Nakakonekta sa mga VPN ang device na ito"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Nakakonekta sa <xliff:g id="VPN_APP">%1$s</xliff:g> ang iyong profile sa trabaho"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Nakakonekta sa <xliff:g id="VPN_APP">%1$s</xliff:g> ang iyong personal na profile"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Nakakonekta sa <xliff:g id="VPN_APP">%1$s</xliff:g> ang device na ito"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Nagmula sa <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Pamamahala ng device"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"May naka-install sa device na ito na isang awtoridad sa certificate. Maaaring subaybayan o baguhin ang iyong ligtas na trapiko sa network."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Na-on ng iyong admin ang pag-log sa network, na sumusubaybay sa trapiko sa device mo."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Na-on ng iyong admin ang pag-log sa network, na sumusubaybay sa trapiko sa profile mo sa trabaho pero hindi sa iyong personal na profile."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Nakakonekta ka sa <xliff:g id="VPN_APP">%1$s</xliff:g>, na maaaring sumubaybay sa iyong aktibidad sa network, kabilang ang mga email, app, at website."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Nakakonekta ka sa <xliff:g id="VPN_APP_0">%1$s</xliff:g> at <xliff:g id="VPN_APP_1">%2$s</xliff:g>, na maaaring sumubaybay sa iyong aktibidad sa network, kabilang ang mga email, app, at website."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Nakakonekta sa <xliff:g id="VPN_APP">%1$s</xliff:g> ang iyong profile sa trabaho, na maaaring sumubaybay sa aktibidad sa iyong network, kasama ang mga email, app, at website."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Nakakonekta sa <xliff:g id="VPN_APP">%1$s</xliff:g> ang iyong personal na profile, na maaaring sumubaybay sa aktibidad mo sa network, kasama ang mga email, app at website."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Buksan ang mga setting ng VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Pinapamahalaan ng iyong magulang ang device na ito. Makikita at mapapamahalaan ng iyong magulang ang impormasyon tulad ng mga app na ginagamit mo, iyong lokasyon, at tagal ng paggamit mo sa device."</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Pangalan ng Broadcast"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Password"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"I-save"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Numero ng build"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nakopya sa clipboard ang numero ng build."</string> <string name="basic_status" msgid="2315371112182658176">"Buksan ang pag-uusap"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Idagdag ang tile"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Huwag idagdag"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Pumili ng user"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> app ang aktibo</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> na app ang aktibo</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Bagong impormasyon"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Mga aktibong app"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Kahit na hindi mo ginagamit ang mga app na ito, aktibo pa rin ang mga ito at posibleng maapektuhan ng mga ito ang tagal ng baterya"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Ihinto"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Inihinto"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Tapos na"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index b7415fd4ee94..dbd6f6b4e115 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Bu cihaz, kuruluşunuza ait olup ağ trafiği kuruluşunuz tarafından izlenebilir"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Bu cihaz, <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> adlı kuruluşa ait olup ağ trafiği bu kuruluş tarafından izlenebilir"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Bu cihaz, <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından sağlanmaktadır"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Bu cihaz, kuruluşunuza ait olup <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Bu cihaz, <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kuruluşuna ait olup <xliff:g id="VPN_APP">%2$s</xliff:g> uygulamasına bağlı"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Bu cihaz, kuruluşunuza ait"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> adlı kuruluşa ait"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Bu cihaz, kuruluşunuza ait olup VPN\'lere bağlı."</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> kuruluşuna ait olup VPN\'lere bağlı"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Kuruluşunuz, iş profilinizdeki ağ trafiğini izleyebilir"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, iş profilinizdeki ağ trafiğini izleyebilir"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"BT yöneticiniz, iş profilinizin ağ etkinliğini görebilir"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Ağ trafiği izlenebilir"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Bu cihaz VPN\'lere bağlı"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"İş profiliniz <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Kişisel profiliniz <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Bu cihaz <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Bu cihaz, <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından sağlanmaktadır"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Cihaz yönetimi"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Bu cihazda bir sertifika yetkilisi yüklü. Güvenli ağ trafiğiniz izlenebilir veya değiştirilebilir."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Yöneticiniz,cihazınızdaki trafiği izleyen ağ günlük kaydını açtı."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Yöneticiniz, iş profilinizdeki trafiği izleyen ancak kişisel profilinizdeki trafiği izlemeyen ağ günlük kaydını açtı."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"E-postalarınız, uygulamalarınız ve web siteleriniz de dahil olmak üzere ağ etkinliğinizi takip edebilen <xliff:g id="VPN_APP">%1$s</xliff:g> ağına bağlısınız."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"E-postalar, uygulamalar ve web siteleri de dahil olmak üzere ağ etkinliğinizi izleyebilen <xliff:g id="VPN_APP_0">%1$s</xliff:g> ve <xliff:g id="VPN_APP_1">%2$s</xliff:g> uygulamalarına bağlısınız."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"İş profiliniz, e-postalar, uygulamalar ve web siteleri dahil olmak üzere ağ etkinliğinizi izleyebilen <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Kişisel profiliniz; e-postalar, uygulamalar ve web siteleri de dahil olmak üzere ağ etkinliğinizi izleyebilen <xliff:g id="VPN_APP">%1$s</xliff:g> uygulamasına bağlı."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN ayarlarını aç"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu cihaz ebeveyniniz tarafından yönetiliyor. Kullandığınız uygulamalar, konumunuz ve ekran başında kalma süreniz gibi bilgiler ebeveyniniz tarafından görülüp yönetilebilir."</string> @@ -410,14 +422,14 @@ <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"Altyazı yer paylaşımı"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"etkinleştir"</string> <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"devre dışı bırak"</string> - <string name="screen_pinning_title" msgid="9058007390337841305">"Uygulama sabitlenmiştir"</string> + <string name="screen_pinning_title" msgid="9058007390337841305">"Uygulama sabitlendi"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Geri\'ye ve Genel Bakış\'a dokunup basılı tutun."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Geri\'ye ve Ana sayfaya dokunup basılı tutun."</string> <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Bu, sabitleme kaldırılana kadar öğenin görünmesini sağlar. Sabitlemeyi kaldırmak için yukarı kaydırıp basılı tutun."</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Genel bakış\'a dokunup basılı tutun."</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Ana sayfaya dokunup basılı tutun."</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"Kişisel verilere erişilebilir (ör. kişiler ve e-posta içerikleri)."</string> - <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"Sabitlenmiş uygulama diğer uygulamaları açabilir."</string> + <string name="screen_pinning_can_open_other_apps" msgid="7529756813231421455">"Sabitlenen uygulama diğer uygulamaları açabilir."</string> <string name="screen_pinning_toast" msgid="8177286912533744328">"Bu uygulamanın sabitlemesini kaldırmak için Geri ve Genel Bakış düğmelerine dokunup basılı tutun"</string> <string name="screen_pinning_toast_recents_invisible" msgid="6850978077443052594">"Bu uygulamanın sabitlemesini kaldırmak için Geri ve Ana sayfa düğmelerine dokunup basılı tutun"</string> <string name="screen_pinning_toast_gesture_nav" msgid="170699893395336705">"Bu uygulamanın sabitlemesini kaldırmak için yukarı kaydırıp tutun"</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Öncelikli"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g>, sohbet özelliklerini desteklemiyor"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirimler değiştirilemez."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Arama bildirimleri değiştirilemez."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Bu bildirim grubu burada yapılandırılamaz"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Proxy uygulanan bildirim"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Tüm <xliff:g id="APP_NAME">%1$s</xliff:g> bildirimleri"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Yayın Adı"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Şifre"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Kaydet"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Derleme numarası"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Derleme numarası panoya kopyalandı."</string> <string name="basic_status" msgid="2315371112182658176">"Görüşmeyi aç"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Kart ekle"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Kart ekleme"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Kullanıcı seçin"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> uygulama etkin</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> uygulama etkin</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yeni bilgi"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Etkin uygulamalar"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Bu uygulamaları kullanmıyor olsanız bile uygulamalar etkin kalmaya devam eder ve pil ömrünü etkileyebilir"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Durdur"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Durduruldu"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Bitti"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 7a2419117d2e..a9c7fe0f12da 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -371,20 +371,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Цей пристрій належить вашій організації. Її адміністратор може відстежувати мережевий трафік"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Цей пристрій належить організації \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\". Її адміністратор може відстежувати мережевий трафік"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Цей пристрій надано компанією \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Цей пристрій належить вашій організації. Його підключено до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Цей пристрій належить організації \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\". Його підключено до додатка <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Цей пристрій належить вашій організації"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Цей пристрій належить організації \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\""</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Цей пристрій належить вашій організації. Його підключено до мереж VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Цей пристрій належить організації \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\". Його підключено до мереж VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Адміністратор вашої організації може відстежувати мережевий трафік у вашому робочому профілі"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Адміністратор організації <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> мож відстежувати мережевий трафік у вашому робочому профілі"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Дії в мережі в робочому профілі може бачити ваш системний адміністратор"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Мережевий трафік може відстежуватися"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Цей пристрій підключено до мереж VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Ваш робочий профіль підключено до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Ваш особистий профіль підключено до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Цей пристрій підключено до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Цей пристрій надано компанією \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Керування пристроями"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"Мережа VPN"</string> @@ -400,10 +408,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"На цьому пристрої встановлено центр сертифікації. Захищений мережевий трафік може відстежуватися або змінюватися."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Ваш адміністратор увімкнув журнал мережі, щоб відстежувати трафік на вашому пристрої."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Ваш адміністратор увімкнув журнал мережі, щоб відстежувати трафік вашого робочого профілю (не особистого)."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Під’єднано додаток <xliff:g id="VPN_APP">%1$s</xliff:g>, який може відстежувати вашу активність у мережі, як-от відкривання електронних листів, додатків і веб-сайтів."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Під’єднано додатки <xliff:g id="VPN_APP_1">%2$s</xliff:g> та <xliff:g id="VPN_APP_0">%1$s</xliff:g>, які можуть відстежувати вашу активність у мережі, як-от відкривання електронних листів, додатків і веб-сайтів."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Ваш робочий профіль під’єднано до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>, який може відстежувати вашу активність у мережі, зокрема в електронній пошті, додатках і на веб-сайтах."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Ваш особистий профіль під’єднано до додатка <xliff:g id="VPN_APP">%1$s</xliff:g>, який може відстежувати вашу активність у мережі, зокрема в електронній пошті, додатках і на веб-сайтах."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Відкрити налаштування мережі VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Цим пристроєм керують твої батьки. Вони можуть бачити та контролювати, якими додатками ти користуєшся, де перебуваєш і скільки часу проводиш за пристроєм."</string> @@ -512,8 +524,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Пріоритет"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> не підтримує функції розмов"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Ці сповіщення не можна змінити."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Сповіщення про виклик не можна змінити."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Цю групу сповіщень не можна налаштувати тут"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Проксі-сповіщення"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Усі сповіщення від додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -856,6 +867,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Назва трансляції"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Пароль"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Зберегти"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Номер складання"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Номер складання скопійовано в буфер обміну."</string> <string name="basic_status" msgid="2315371112182658176">"Відкрита розмова"</string> @@ -924,11 +939,15 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Додати параметр"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Не додавати параметр"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Виберіть користувача"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> додаток активний</item> + <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> додатки активні</item> + <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> додатків активні</item> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> додатка активні</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Нова інформація"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Активні додатки"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Навіть якщо ви не використовуєте ці додатки, вони залишаються активними й можуть впливати на час роботи акумулятора"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Зупинити"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Зупинено"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Готово"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 6ba3c4fa3163..6b3b3c077e67 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -347,7 +347,7 @@ <string name="user_remove_user_message" msgid="6702834122128031833">"اس صارف کی سبھی ایپس اور ڈیٹا حذف کر دیا جائے گا۔"</string> <string name="user_remove_user_remove" msgid="8387386066949061256">"ہٹائیں"</string> <string name="media_projection_dialog_text" msgid="1755705274910034772">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> کو ان تمام معلومات تک رسائی حاصل ہوگی جو آپ کی اسکرین پر مرئی ہے یا ریکارڈنگ یا کاسٹنگ کے دوران آپ کے آلے سے چلائے گئے ہوں۔ اس میں پاس ورڈز، ادائیگی کی تفصیلات، تصاویر، پیغامات، اور آپ کے ذریعے چلائی جانے والی آڈیو جیسی معلومات شامل ہے۔"</string> - <string name="media_projection_dialog_service_text" msgid="958000992162214611">"یہ فنکشن فراہم کرنے والی سروس کو ان تمام معلومات تک رسائی حاصل ہوگی جو آپ کی اسکرین پر مرئی ہے یا ریکارڈنگ یا کاسٹنگ کے دوران آپ کے آلے سے چلائے گئے ہوں۔ اس میں پاس ورڈز، ادائیگی کی تفصیلات، تصاویر، پیغامات، اور آپ کے ذریعے چلائی جانے والی آڈیو جیسی معلومات شامل ہے۔"</string> + <string name="media_projection_dialog_service_text" msgid="958000992162214611">"یہ فنکشن فراہم کرنے والی سروس کو اس تمام معلومات تک رسائی حاصل ہوگی جو آپ کی اسکرین پر نظر آتی ہے یا ریکارڈنگ یا کاسٹنگ کے دوران آپ کے آلے سے چلائی جاتی ہے۔ اس میں پاس ورڈز، ادائیگی کی تفصیلات، تصاویر، پیغامات اور وہ آڈیو جو آپ چلاتے ہیں جیسی معلومات شامل ہے۔"</string> <string name="media_projection_dialog_service_title" msgid="2888507074107884040">"ریکارڈنگ یا کاسٹنگ شروع کریں؟"</string> <string name="media_projection_dialog_title" msgid="3316063622495360646">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> کے ذریعے ریکارڈنگ یا کاسٹنگ شروع کریں؟"</string> <string name="clear_all_notifications_text" msgid="348312370303046130">"سبھی کو صاف کریں"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"آپ کی تنظیم اس آلے کی مالک ہے اور نیٹ ورک ٹریفک کی نگرانی کر سکتی ہے"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> اس آلے کی مالک ہے اور نیٹ ورک ٹریفک کی نگرانی کر سکتی ہے"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> نے فراہم کیا ہے"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"یہ آلہ آپ کی تنظیم کا ہے اور <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> کا ہے اور <xliff:g id="VPN_APP">%2$s</xliff:g> سے منسلک ہے"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"یہ آلہ آپ کی تنظیم کا ہے"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> کا ہے"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"یہ آلہ آپ کی تنظیم کا ہے اور VPNs سے منسلک ہے"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> کا ہے اور VPNs سے منسلک ہے"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"آپ کی تنظیم آپ کے دفتری پروفائل میں نیٹ ورک ٹریفک مانیٹر کر سکتی ہے"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> آپ کے دفتری پروفائل میں نیٹ ورک ٹریفک مانیٹر کر سکتی ہے"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"آپ کا IT منتظم دفتری پروفائل نیٹ ورک کی سرگرمی دیکھ سکتا ہے۔"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"نیٹ ورک کو مانیٹر کیا جا سکتا ہے"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"یہ آلہ VPNs سے منسلک ہے"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"آپ کی دفتری پروفائل <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"آپ کی ذاتی پروفائل <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"یہ آلہ <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> نے فراہم کیا ہے"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"آلے کا نظم و نسق"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"ایک سرٹیفکیٹ کی اتھارٹی اس آلہ پر انسٹال ہے۔ آپ کا محفوظ نیٹ ورک ٹریفک مانیٹر ہو سکتا ہے یا اس میں ترمیم کی جا سکتی ہے۔"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"آپ کے منتظم نے نیٹ ورک لاگنگ کو آن کر دیا ہے، جو آپ کے آلے پر ٹریفک مانیٹر کرتی ہے۔"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"آپ کے منتظم نے نیٹ ورک لاگنگ آن کر دی ہے، جو آپ کے ذاتی پروفائل پر نہیں بلکہ دفتری پروفائل پر ٹریفک کو مانیٹر کرتی ہے۔"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"آپ <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہیں جو ای میلز، ایپس اور ویب سائٹس سمیت آپ کے نیٹ ورک کی سرگرمی مانیٹر کر سکتی ہے۔"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"آپ <xliff:g id="VPN_APP_0">%1$s</xliff:g> اور <xliff:g id="VPN_APP_1">%2$s</xliff:g> سے منسلک ہیں، جو ای میلز، ایپس اور ویب سائٹس سمیت آپ کے نیٹ ورک کی سرگرمی مانیٹر کر سکتی ہیں۔"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"آپ کا دفتری پروفائل <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے، جو ای میلز، ایپس اور ویب سائٹس سمیت آپ کے نیٹ ورک کی سرگرمی مانیٹر کر سکتی ہے۔"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"آپ کا ذاتی پروفائل <xliff:g id="VPN_APP">%1$s</xliff:g> سے منسلک ہے جو ای میلز، ایپس اور ویب سائٹس سمیت آپ کے نیٹ ورک کی سرگرمی مانیٹر کر سکتی ہے۔"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN کی ترتیبات کھولیں"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"یہ آلہ آپ کے والدین کے زیر انتظام ہے۔ آپ کے والدین آپ کی استعمال والی ایپس، آپ کا مقام اور آپ کے اسکرین کے وقت جیسی معلومات کو دیکھ اور اس کا نظم کر سکتے ہیں۔"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"براڈکاسٹ کا نام"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"پاس ورڈ"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"محفوظ کریں"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"بلڈ نمبر"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"بلڈ نمبر کلپ بورڈ میں کاپی ہو گیا۔"</string> <string name="basic_status" msgid="2315371112182658176">"گفتگو کھولیں"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"ٹائل شامل کریں"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"ٹائل شامل نہ کریں"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"صارف منتخب کریں"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ایپس فعال ہیں</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ایپ فعال ہے</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"نئی معلومات"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"فعال ایپس"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"آپ کے ان ایپس کے استعمال نہ کرنے کے باوجود بھی یہ فعال رہتی ہیں اور بیٹری کی لائف کو متاثر کر سکتی ہیں"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"روکیں"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"رکی ہوئی ہے"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"ہو گیا"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index a2831e036505..8c8eca852004 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -365,20 +365,27 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Bu qurilma tashkilotingizga tegishli va tarmoq trafigi tashkilotingiz tomonidan kuzatilishi mumkin"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tashkilotiga tegishli va tarmoq trafigi tashkilot tomonidan kuzatilishi mumkin"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan berilgan."</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Bu qurilma tashkilotingizga tegishli va <xliff:g id="VPN_APP">%1$s</xliff:g> tarmogʻiga ulangan"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tashkilotiga tegishli va <xliff:g id="VPN_APP">%2$s</xliff:g> tarmogʻiga ulangan"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Bu qurilma tashkilotingizga tegishli"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tashkilotiga tegishli"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Bu qurilma tashkilotingizga tegishli va VPN tarmoqlarga ulangan"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> tashkilotiga tegishli va VPN tarmoqlarga ulangan"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tashkilotingiz ishchi profilingizda tarmoq trafigini nazorat qilishi mumkin"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ishchi profilingizda tarmoq trafigini nazorat qilishi mumkin"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Ish profilida tarmoqqa oid harakatlar AT administratoriga koʻrinadi"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Tarmoq kuzatilishi mumkin"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Bu qurilma VPN tarmoqlarga ulangan"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Ish profilingiz <xliff:g id="VPN_APP">%1$s</xliff:g> tarmogʻiga ulangan"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Shaxsiy profilingiz <xliff:g id="VPN_APP">%1$s</xliff:g> tarmogʻiga ulangan"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Bu qurilma <xliff:g id="VPN_APP">%1$s</xliff:g> tarmogʻiga ulangan"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="153393105176944100">"Ishga oid ilovalar internetga <xliff:g id="VPN_APP">%1$s</xliff:g> orqali ulangan"</string> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Bu qurilma <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan berilgan."</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Qurilmalar boshqaruvi"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +401,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Qurilmada CA sertifikati o‘rnatilgan. U himoyalangan tarmoq trafigini nazorat qilishi va o‘zgartirishi mumkin."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Administrator qurilmangizdagi trafikni nazorat qiluvchi tarmoq jurnalini yuritishni faollashtirgan."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Administrator ish profilingizdagi trafikni nazorat qiluvchi tarmoq jurnalini yuritishni faollashtirgan (shaxsiy profildan maʼlumotlar olinmaydi)."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"<xliff:g id="VPN_APP">%1$s</xliff:g> ilovasi ishga tushirilgan. U internetdagi harakatlaringiz, jumladan, e-pochta, ilova va veb-saytlardagi xatti-harakatlaringizni kuzatishi mumkin."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> va <xliff:g id="VPN_APP_1">%2$s</xliff:g> ilovalari ishga tushirilgan. Ular tarmoqdagi, jumladan, e-pochta, ilova va veb-saytlardagi xatti-harakatlaringizni kuzatishi mumkin."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Ishchi profilingizda tarmoqdagi, jumladan, e-pochta, ilova va veb-saytlardagi xatti-harakatlaringizni kuzatishi mumkin bo‘lgan <xliff:g id="VPN_APP">%1$s</xliff:g> ilovasi ishga tushirilgan."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Shaxsiy profilingizda tarmoqdagi, jumladan, e-pochta, ilova va veb-saytlardagi xatti-harakatlaringizni kuzatishi mumkin bo‘lgan <xliff:g id="VPN_APP">%1$s</xliff:g> ilovasi ishga tushirilgan."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN sozlamalarini ochish"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Bu – ota-onangiz tomonidan boshqariladigan qurilma. Ota-onangiz siz foydalangan ilovalar, joylashuvingiz va qurilmadan foydalanish vaqti kabi axborotlarni koʻrishi va boshqarishi mumkin."</string> @@ -485,7 +496,7 @@ <string name="rotation_lock_camera_rotation_on" msgid="789434807790534274">"Yoqish - Yuz asosida"</string> <string name="power_notification_controls_description" msgid="1334963837572708952">"Bildirishnomalar uchun kengaytirilgan boshqaruv yordamida ilova bildirishnomalarining muhimlik darajasini (0-5) sozlash mumkin. \n\n"<b>"5-daraja"</b>" \n- Bildirishnomani ro‘yxatning boshida ko‘rsatish \n- To‘liq ekranli bildirishnomalarni ko‘rsatish \n- Qalqib chiquvchi bildirishnomalarni ko‘rsatish \n\n"<b>"4-daraja"</b>" \n- To‘liq ekranli bildirishnomalarni ko‘rsatmaslik \n- Qalqib chiquvchi bildirishnomalarni ko‘rsatish \n\n"<b>"3-daraja"</b>" \n- To‘liq ekranli bildirishnomalarni ko‘rsatmaslik \n- Qalqib chiquvchi bildirishnomalarni ko‘rsatmaslik \n\n"<b>"2-daraja"</b>" \n- To‘liq ekranli bildirishnomalarni ko‘rsatmaslik \n- Qalqib chiquvchi bildirishnomalarni ko‘rsatmaslik \n- Ovoz va tebranishdan foydalanmaslik \n\n"<b>"1-daraja"</b>" \n- To‘liq ekranli bildirishnomalarni ko‘rsatmaslik \n- Qalqib chiquvchi bildirishnomalarni ko‘rsatmaslik \n- Ovoz va tebranishdan foydalanmaslik \n- Ekran qulfi va holat qatorida ko‘rsatmaslik \n- Bildirishnomani ro‘yxatning oxirida ko‘rsatish \n\n"<b>"0-daraja"</b>" \n- Ilovadan keladigan barcha bildirishnomalarni bloklash"</string> <string name="inline_done_button" msgid="6043094985588909584">"Tayyor"</string> - <string name="inline_ok_button" msgid="603075490581280343">"Joriy qilish"</string> + <string name="inline_ok_button" msgid="603075490581280343">"Tatbiq etish"</string> <string name="inline_turn_off_notifications" msgid="8543989584403106071">"Bildirishnoma kelmasin"</string> <string name="notification_silence_title" msgid="8608090968400832335">"Sokin"</string> <string name="notification_alert_title" msgid="3656229781017543655">"Standart"</string> @@ -506,8 +517,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Muhim"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasida suhbat funksiyalari ishlamaydi"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Bu bildirishnomalarni tahrirlash imkonsiz."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Chaqiruv bildirishnomalarini tahrirlash imkonsiz."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ushbu bildirishnomalar guruhi bu yerda sozlanmaydi"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Ishonchli bildirishnoma"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Barcha <xliff:g id="APP_NAME">%1$s</xliff:g> bildirishnomalari"</string> @@ -833,7 +843,7 @@ <string name="media_output_dialog_multiple_devices" msgid="1093771040315422350">"<xliff:g id="COUNT">%1$d</xliff:g> ta qurilma tanlandi"</string> <string name="media_output_dialog_disconnected" msgid="7090512852817111185">"(uzildi)"</string> <string name="media_output_dialog_connect_failed" msgid="3080972621975339387">"Xatolik. Qayta urinish uchun bosing."</string> - <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Yangi qurilmani ulash"</string> + <string name="media_output_dialog_pairing_new" msgid="9099497976087485862">"Yangi qurilmani juftlash"</string> <string name="media_output_dialog_launch_app_text" msgid="1527413319632586259">"Bu seansni translatsiya qilish uchun ilovani oching."</string> <string name="media_output_dialog_unknown_launch_app_name" msgid="1084899329829371336">"Notanish ilova"</string> <string name="media_output_dialog_button_stop_casting" msgid="6581379537930199189">"Toʻxtatish"</string> @@ -844,6 +854,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Translatsiya nomi"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Parol"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Saqlash"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Nashr raqami"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Nashr raqami vaqtinchalik xotiraga nusxalandi."</string> <string name="basic_status" msgid="2315371112182658176">"Suhbatni ochish"</string> @@ -912,11 +926,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Tugma kiritish"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Tugma kiritilmasin"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Foydalanuvchini tanlang"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> ta ilova faol</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> ta ilova faol</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Yangi axborot"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Faol ilovalar"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Foydalanmasangiz ham ular faol qoladi va batareya quvvatiga taʼsir qiladi"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Stop"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Toʻxtatildi"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Tayyor"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index ef782a2a9c77..eb038411edbf 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Tổ chức của bạn sở hữu thiết bị này và có thể giám sát lưu lượng truy cập mạng"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> sở hữu thiết bị này và có thể giám sát lưu lượng truy cập mạng"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Thiết bị này do <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> cung cấp"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Thiết bị này thuộc về tổ chức của bạn và đã kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Thiết bị này thuộc về <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> và đã kết nối với <xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Thiết bị này thuộc về tổ chức của bạn"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Thiết bị này thuộc về <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Thiết bị này thuộc về tổ chức của bạn và đã kết nối với VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Thiết bị này thuộc về <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> và đã kết nối với VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tổ chức của bạn có thể giám sát lưu lượng truy cập mạng trong hồ sơ công việc của bạn"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> có thể giám sát lưu lượng truy cập mạng trong hồ sơ công việc của bạn"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Quản trị viên CNTT có thể xem hoạt động trên mạng của hồ sơ công việc"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Mạng có thể được giám sát"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Thiết bị này đã kết nối với VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Hồ sơ công việc của bạn đã kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Hồ sơ cá nhân của bạn đã kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Thiết bị này đã kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Thiết bị này do <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> cung cấp"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Quản lý thiết bị"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Một tổ chức phát hành chứng chỉ được cài đặt trên thiết bị này. Lưu lượng truy cập mạng bảo mật của bạn có thể được giám sát hoặc sửa đổi."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Quản trị viên của bạn đã bật tính năng ghi nhật ký mạng. Tính năng này giám sát lưu lượng truy cập trên thiết bị của bạn."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Quản trị viên của bạn đã bật tính năng ghi nhật ký mạng. Tính năng này giám sát lưu lượng truy cập trong hồ sơ công việc chứ không giám sát lưu lượng truy cập trong hồ sơ cá nhân của bạn."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Bạn đang kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>. Ứng dụng này có thể giám sát hoạt động mạng của bạn, bao gồm email, ứng dụng và trang web."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Bạn đang kết nối với <xliff:g id="VPN_APP_0">%1$s</xliff:g> và <xliff:g id="VPN_APP_1">%2$s</xliff:g>. Các ứng dụng này có thể giám sát hoạt động mạng của bạn, bao gồm email, ứng dụng và trang web."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Hồ sơ công việc của bạn được kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>, ứng dụng này có thể giám sát hoạt động mạng của bạn, bao gồm email, ứng dụng và trang web."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Hồ sơ cá nhân của bạn được kết nối với <xliff:g id="VPN_APP">%1$s</xliff:g>. Ứng dụng này có thể giám sát hoạt động mạng của bạn, bao gồm email, ứng dụng và trang web."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Mở cài đặt VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Thiết bị này do cha mẹ bạn quản lý. Cha mẹ có thể có thể xem và quản lý những thông tin như ứng dụng bạn dùng, vị trí của bạn và thời gian bạn sử dụng thiết bị."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Mức độ ưu tiên"</string> <string name="no_shortcut" msgid="8257177117568230126">"<xliff:g id="APP_NAME">%1$s</xliff:g> không hỗ trợ các tính năng trò chuyện"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Không thể sửa đổi các thông báo này."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Không thể sửa đổi các thông báo cuộc gọi."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Không thể định cấu hình nhóm thông báo này tại đây"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Thông báo đã xử lý qua máy chủ proxy"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Tất cả thông báo của <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Tên thiết bị truyền"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Mật khẩu"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Lưu"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Số bản dựng"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Đã sao chép số bản dựng vào bảng nhớ tạm."</string> <string name="basic_status" msgid="2315371112182658176">"Mở cuộc trò chuyện"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Thêm ô"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Không thêm ô"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Chọn người dùng"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">Ứng dụng <xliff:g id="COUNT_1">%s</xliff:g> đang hoạt động</item> + <item quantity="one">Ứng dụng <xliff:g id="COUNT_0">%s</xliff:g> đang hoạt động</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Thông tin mới"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ứng dụng đang hoạt động"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Ngay cả khi bạn không sử dụng, những ứng dụng này vẫn hoạt động và có thể ảnh hưởng đến tuổi thọ pin"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Dừng"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Đã dừng"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Xong"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index ac1b79087b08..d0f914d42c6f 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -36,8 +36,8 @@ <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"是否允许<xliff:g id="APPLICATION">%1$s</xliff:g>访问<xliff:g id="USB_DEVICE">%2$s</xliff:g>？\n此应用未获得录音权限，但能通过此 USB 设备录制音频。"</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"允许“<xliff:g id="APPLICATION">%1$s</xliff:g>”访问<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"打开“<xliff:g id="APPLICATION">%1$s</xliff:g>”来处理<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？"</string> - <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"此应用未获得录音权限，但能通过此 USB 设备录制音频。在此设备上使用“<xliff:g id="APPLICATION">%1$s</xliff:g>”可能会将来电、通知和闹钟静音。"</string> - <string name="usb_audio_device_prompt" msgid="7944987408206252949">"在此设备上使用“<xliff:g id="APPLICATION">%1$s</xliff:g>”可能会将来电、通知和闹钟静音。"</string> + <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"此应用未获得录音权限，但能通过此 USB 设备录制音频。如果在此设备上使用“<xliff:g id="APPLICATION">%1$s</xliff:g>”，您可能无法听见来电、通知和闹钟的音效。"</string> + <string name="usb_audio_device_prompt" msgid="7944987408206252949">"如果在此设备上使用“<xliff:g id="APPLICATION">%1$s</xliff:g>”，您可能无法听见来电、通知和闹钟的音效。"</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"要允许<xliff:g id="APPLICATION">%1$s</xliff:g>访问<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>吗？"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"要打开<xliff:g id="APPLICATION">%1$s</xliff:g>来处理<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？"</string> <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"要打开<xliff:g id="APPLICATION">%1$s</xliff:g>来使用<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？\n此应用未获得录音权限，但能通过此 USB 设备录制音频。"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"贵单位拥有此设备，且可能会监控网络流量"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>拥有此设备，且可能会监控网络流量"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"此设备由<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>提供"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"此设备归贵单位所有，且已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"此设备归<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>所有，且已连接到“<xliff:g id="VPN_APP">%2$s</xliff:g>”"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"此设备归贵单位所有"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"此设备归<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>所有"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"此设备归贵单位所有，且已连接到多个 VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"此设备归<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>所有，且已连接到多个 VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"您所在的单位可能会监控您工作资料中的网络流量"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"“<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>”可能会监控您工作资料中的网络流量"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT 管理员可以看到工作资料的网络活动记录"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"网络可能会受到监控"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"此设备已连接到多个 VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"您的工作资料已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"您的个人资料已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"此设备已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"此设备由<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>提供"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"设备管理"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"此设备上已安装证书授权中心。您的安全网络流量可能会受到监控或修改。"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"您的管理员已开启网络日志记录功能（该功能会监控您设备上的流量）。"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"您的管理员已开启网络日志记录功能，该功能会监控您的工作资料的流量，但不会监控您个人资料的流量。"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"您已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”（该应用能够监控您的网络活动，其中包括收发电子邮件、使用应用和浏览网站）。"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"您已连接到“<xliff:g id="VPN_APP_0">%1$s</xliff:g>”和“<xliff:g id="VPN_APP_1">%2$s</xliff:g>”（这两个应用能够监控您的网络活动，其中包括收发电子邮件、使用应用和浏览网站）。"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"您的工作资料已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”（该应用能够监控您的网络活动，其中包括收发电子邮件、使用应用和浏览网站）。"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"您的个人资料已连接到“<xliff:g id="VPN_APP">%1$s</xliff:g>”（该应用能够监控您的网络活动，其中包括收发电子邮件、使用应用和浏览网站）。"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"打开 VPN 设置"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"此设备由您的家长管理。您的家长可以查看和管理相关信息，例如您使用的应用、您的位置信息和设备使用时间。"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"广播名称"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"密码"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"保存"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本号"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"已将版本号复制到剪贴板。"</string> <string name="basic_status" msgid="2315371112182658176">"开放式对话"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"添加图块"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"不添加图块"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"选择用户"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 个应用处于活动状态</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 个应用处于活动状态</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"新信息"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的应用"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"即使您未使用这些应用，它们仍会处于活动状态，并可能会影响电池续航时间"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"完成"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 436e29389694..669cc3ed5221 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -138,21 +138,21 @@ <string name="biometric_dialog_tap_confirm_with_face" msgid="1092050545851021991">"已使用面孔解鎖。按解鎖圖示即可繼續。"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"驗證咗"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"使用 PIN"</string> - <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用圖案"</string> + <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"使用圖形"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"使用密碼"</string> <string name="biometric_dialog_wrong_pin" msgid="1878539073972762803">"PIN 錯誤"</string> - <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"圖案錯誤"</string> + <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"圖形錯誤"</string> <string name="biometric_dialog_wrong_password" msgid="69477929306843790">"密碼錯誤"</string> <string name="biometric_dialog_credential_too_many_attempts" msgid="3083141271737748716">"輸入錯誤的次數太多，\n請於 <xliff:g id="NUMBER">%d</xliff:g> 秒後再試。"</string> <string name="biometric_dialog_credential_attempts_before_wipe" msgid="6751859711975516999">"請再試一次。您已嘗試 <xliff:g id="ATTEMPTS_0">%1$d</xliff:g> 次，最多可試 <xliff:g id="MAX_ATTEMPTS">%2$d</xliff:g> 次。"</string> <string name="biometric_dialog_last_attempt_before_wipe_dialog_title" msgid="2874250099278693477">"您的資料將會刪除"</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_device" msgid="6562299244825817598">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此裝置上的資料。"</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_device" msgid="6562299244825817598">"如果您下次畫出錯誤的上鎖圖形，系統將會刪除此裝置上的資料。"</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_device" msgid="9151756675698215723">"如果您下次輸入錯誤的 PIN，系統將會刪除此裝置上的資料。"</string> <string name="biometric_dialog_last_password_attempt_before_wipe_device" msgid="2363778585575998317">"如果您下次輸入錯誤的密碼，系統將會刪除此裝置上的資料。"</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_user" msgid="8400180746043407270">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此使用者。"</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_user" msgid="8400180746043407270">"如果您下次畫出錯誤的上鎖圖形，系統將會刪除此使用者。"</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_user" msgid="4159878829962411168">"如果您下次輸入錯誤的 PIN，系統將會刪除此使用者。"</string> <string name="biometric_dialog_last_password_attempt_before_wipe_user" msgid="4695682515465063885">"如果您下次輸入錯誤的密碼，系統將會刪除此使用者。"</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile" msgid="6045224069529284686">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除工作設定檔和相關資料。"</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile" msgid="6045224069529284686">"如果您下次畫出錯誤的上鎖圖形，系統將會刪除工作設定檔和相關資料。"</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_profile" msgid="545567685899091757">"如果您下次輸入錯誤的 PIN，系統將會刪除工作設定檔和相關資料。"</string> <string name="biometric_dialog_last_password_attempt_before_wipe_profile" msgid="8538032972389729253">"如果您下次輸入錯誤的密碼，系統將會刪除工作設定檔和相關資料。"</string> <string name="fingerprint_dialog_touch_sensor" msgid="2817887108047658975">"請輕觸指紋感應器"</string> @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"您的機構擁有此裝置，並可能會監察網絡流量"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」擁有此裝置，並可能會監察網絡流量"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 提供"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"此裝置屬於您的機構，並已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"此裝置屬於「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」，並已連結至「<xliff:g id="VPN_APP">%2$s</xliff:g>」"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"此裝置屬於您的機構"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"此裝置屬於「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"此裝置屬於您的機構，並已連結至 VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"此裝置屬於「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」，並已連結至 VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"您的機構可能監控您工作設定檔上的網絡流量"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>可能會監控您工作設定檔上的網絡流量"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT 管理員可以查看工作設定檔的網絡活動"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"網絡可能會受到監控"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"此裝置已連結至 VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"您的工作設定檔已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"您的個人設定檔已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"此裝置已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 提供"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"裝置管理"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"此裝置已安裝憑證授權單位。您的安全網絡流量可能會受監控或修改。"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"您的管理員已開啟網絡記錄功能，以監控您裝置上的流量。"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"您的管理員已開啟網絡記錄功能，可監控您工作設定檔 (而非個人設定檔) 的流量。"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"您已連接至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，此應用程式可以監控您的網絡活動，包括電郵、應用程式及網站。"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"您已連接至「<xliff:g id="VPN_APP_0">%1$s</xliff:g>」和「<xliff:g id="VPN_APP_1">%2$s</xliff:g>」，這些應用程式可以監控您的網絡活動，包括電郵、應用程式及網站。"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"您的工作設定檔已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，此應用程式可以監控您的網絡活動，包括電郵、應用程式及網站。"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"您的個人設定檔已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，此應用程式可以監控您的網絡活動，包括電郵、應用程式及網站。"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"開啟 VPN 設定"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"此裝置由您的家長管理。家長可以查看及管理裝置上的資料，例如您使用的應用程式、位置和裝置使用時間。"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"廣播名稱"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"密碼"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"儲存"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本號碼"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"版本號碼已複製到剪貼簿。"</string> <string name="basic_status" msgid="2315371112182658176">"開啟對話"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"新增圖塊"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"不要新增圖塊"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"選取使用者"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other">已啟用 <xliff:g id="COUNT_1">%s</xliff:g> 個應用程式</item> + <item quantity="one">已啟用 <xliff:g id="COUNT_0">%s</xliff:g> 個應用程式</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"新資料"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的應用程式"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"即使您並非正在使用這些應用程式，它們仍然在啟用狀態，而且可能會影響電池壽命"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"完成"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 297715d64e15..6442e998ccac 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"貴機構擁有這部裝置，而且可能會監控網路流量"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"這部裝置的擁有者為「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」，而且該機構可能會監控網路流量"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"這是「<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>」提供的裝置"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"這部裝置的擁有者為貴機構，並且已連線到「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"這部裝置的擁有者為「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」，並且已連線到「<xliff:g id="VPN_APP">%2$s</xliff:g>」"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"這部裝置的擁有者為貴機構"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"這部裝置的擁有者為「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"這部裝置的擁有者為貴機構，並且已連線到 VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"這部裝置的擁有者為「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」，並且已連線到 VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"貴機構可能會監控你工作資料夾的網路流量"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"「<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>」可能會監控你工作資料夾的網路流量"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"IT 管理員可以查看工作資料夾的網路活動"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"網路可能會受到監控"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"這部裝置已連線到 VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"你的工作資料夾已連線到「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"你的個人資料夾已連線到「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"這部裝置已連線到「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"這是「<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>」提供的裝置"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"裝置管理"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"這個裝置已安裝憑證授權單位憑證。你的安全網路流量可能會受到監控或修改。"</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"你的管理員已啟用網路記錄功能，可監控你裝置的流量。"</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"你的管理員已啟用網路記錄功能，可監控你的工作資料夾流量，但不會監控個人資料夾的流量。"</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"由於你已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，因此你的網路活動 (包括收發電子郵件、使用應用程式及瀏覽網站) 可能會受到這個應用程式監控。"</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"由於你已連結至「<xliff:g id="VPN_APP_0">%1$s</xliff:g>」和「<xliff:g id="VPN_APP_1">%2$s</xliff:g>」，因此你的網路活動 (包括收發電子郵件、使用應用程式及瀏覽網站) 可能會受到這兩個應用程式監控。"</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"由於你的工作資料夾已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，因此你的網路活動 (包括收發電子郵件、使用應用程式及瀏覽網站) 可能會受到這個應用程式監控。"</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"由於你的個人設定檔已連結至「<xliff:g id="VPN_APP">%1$s</xliff:g>」，因此你的網路活動 (包括收發電子郵件、使用應用程式及瀏覽網站) 可能會受到這個應用程式監控。"</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"開啟 VPN 設定"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"這個裝置是由你的家長管理。家長可以查看及管理裝置上的資訊，例如你使用的應用程式、所在位置和裝置使用時間。"</string> @@ -413,7 +425,7 @@ <string name="screen_pinning_title" msgid="9058007390337841305">"應用程式已固定"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"這會讓目前的螢幕畫面保持顯示狀態，直到取消固定為止。按住 [返回] 按鈕和 [總覽] 按鈕即可取消固定。"</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"這會讓應用程式顯示在螢幕上，直到取消固定為止。按住 [返回] 按鈕和主畫面按鈕即可取消固定。"</string> - <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"這會讓目前的螢幕畫面保持顯示，直到取消固定為止。向上滑動並按住即可取消固定。"</string> + <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"這會讓應用程式一直顯示在螢幕畫面上，直到你取消固定為止。向上滑動並按住即可取消固定。"</string> <string name="screen_pinning_description_accessible" msgid="7386449191953535332">"這會讓目前的螢幕畫面保持顯示狀態，直到取消固定為止。按住 [總覽] 按鈕即可取消固定。"</string> <string name="screen_pinning_description_recents_invisible_accessible" msgid="2857071808674481986">"這會讓應用程式顯示在螢幕上，直到取消固定為止。按住主畫面按鈕即可取消固定。"</string> <string name="screen_pinning_exposes_personal_data" msgid="8189852022981524789">"該應用程式或許可存取個人資料 (例如聯絡人和電子郵件內容)。"</string> @@ -843,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"廣播名稱"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"密碼"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"儲存"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"版本號碼"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"已將版本號碼複製到剪貼簿。"</string> <string name="basic_status" msgid="2315371112182658176">"開放式對話"</string> @@ -911,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"新增設定方塊"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"不要新增設定方塊"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"選取使用者"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> 個應用程式正在運作</item> + <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> 個應用程式正在運作</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"新資訊"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"使用中的應用程式"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"即使你並未使用這些應用程式，這些應用程式仍會持續運作，並可能影響電池續航力"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"停止"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"已停止"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"完成"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index d932406f1059..9b7e203850e0 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -365,20 +365,28 @@ <string name="quick_settings_disclosure_management_monitoring" msgid="8231336875820702180">"Inhlangano yakho ingumnikazi wale divayisi futhi ingaqapha ithrafikhi yenethiwekhi"</string> <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"I-<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ingumnikazi wale divayisi futhi ingaqapha ithrafikhi yenethiwekhi"</string> <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Le divayisi ihlinzekwa yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="6096715329056415588">"Le divayisi ngeyenhlangano yakho futhi ixhunywe ku-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="5302786161534380104">"Le divayisi ngeye-<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> futhi ixhunywe ku-<xliff:g id="VPN_APP">%2$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_management_named_vpn (4137564460025113168) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_named_vpn (2169227918166358741) --> + <skip /> <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Le divayisi eyenhlangano yakho"</string> <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Le divayisi ngeye-<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="371835422690053154">"Le divayisi ngeyenhlangano yakho futhi ixhunywe kuma-VPN"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Le divayisi ngeye-<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> futhi ixhunywe kuma-VPN"</string> + <!-- no translation found for quick_settings_disclosure_management_vpns (929181757984262902) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_management_vpns (3312645578322079185) --> + <skip /> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Inhlangano yakho ingaqapha ithrafikhi yenethiwekhi kuphrofayela yakho yomsebenzi"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"I-<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> ingaqaphela ithrafikhi yenethiwekhi kuphrofayela yakho yomsebenzi"</string> <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"Umsebenzi wenethiwekhi yephrofayela yomsebenzi uyabonakala kumphathi wakho we-IT"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Inethiwekhi kungenzeka iqashiwe"</string> - <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Le divayisi ixhunywe kuma-VPN"</string> - <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Iphrofayela yakho yomsebenzi ixhunywe ku-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="5481763430080807797">"Iphrofayela yakho yomuntu ixhunywe ku-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="2350838218824492465">"Le divayisi ixhunywe ku-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> + <!-- no translation found for quick_settings_disclosure_vpns (3586175303518266301) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_managed_profile_named_vpn (153393105176944100) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_personal_profile_named_vpn (451254750289172191) --> + <skip /> + <!-- no translation found for quick_settings_disclosure_named_vpn (6191822916936028208) --> + <skip /> <string name="monitoring_title_financed_device" msgid="3659962357973919387">"Le divayisi ihlinzekwa yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string> <string name="monitoring_title_device_owned" msgid="7029691083837606324">"Ukuphathwa kwedivayisi"</string> <string name="monitoring_subtitle_vpn" msgid="800485258004629079">"I-VPN"</string> @@ -394,10 +402,14 @@ <string name="monitoring_description_ca_certificate" msgid="448923057059097497">"Ukugunyaza kwesitifiketi kufakwe kule divayisi. Ithrafikhi yenethiwekhi yakho evikelekile ingaqashelwa noma ilungiswe."</string> <string name="monitoring_description_management_network_logging" msgid="216983105036994771">"Umlawuli wakho uvule ukungena kwedivayisi yakho, okuqapha ithrafikhi kudivayisi yakho."</string> <string name="monitoring_description_managed_profile_network_logging" msgid="6932303843097006037">"Umlawuli wakho uvule ukungena kwenethiwekhi, okuhlola ithrafikhi kudivayisi yakho yephrofayela yomsebenzi kodwa hhayi kuphrofayela yakho yomuntu siqu."</string> - <string name="monitoring_description_named_vpn" msgid="5749932930634037027">"Uxhumeke ku-<xliff:g id="VPN_APP">%1$s</xliff:g>, engaqapha umsebenzi wenethiwekhi yakho, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi."</string> - <string name="monitoring_description_two_named_vpns" msgid="3516830755681229463">"Uxhumeke ku-<xliff:g id="VPN_APP_0">%1$s</xliff:g> naku-<xliff:g id="VPN_APP_1">%2$s</xliff:g>, okungaqaphela umsebenzi wakho wenethiwekhi, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="368812367182387320">"Iphrofayela yakho yomsebenzi ixhumeke ku-<xliff:g id="VPN_APP">%1$s</xliff:g>, engaqapha umsebenzi wenethiwekhi yakho, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"Iphrofayela yakho siqu ixhumeke ku-<xliff:g id="VPN_APP">%1$s</xliff:g>, engaqapha umsebenzi wakho wenethiwekhi, ofaka ama-imeyili, izinhlelo zokusebenza, namawebhusayithi."</string> + <!-- no translation found for monitoring_description_named_vpn (7502657784155456414) --> + <skip /> + <!-- no translation found for monitoring_description_two_named_vpns (6726394451199620634) --> + <skip /> + <!-- no translation found for monitoring_description_managed_profile_named_vpn (7254359257263069766) --> + <skip /> + <!-- no translation found for monitoring_description_personal_profile_named_vpn (5083909710727365452) --> + <skip /> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"Vula izilungiselelo ze-VPN"</string> <string name="monitoring_description_parental_controls" msgid="8184693528917051626">"Le divayisi iphethwe ngumzali wakho. Umzali wakho angabona futhi aphathe ulwazi olunjengezinhlelo zokusebenza ozisebenzisayo, indawo yakho, kanye nesikhathi sesikrini."</string> @@ -410,7 +422,7 @@ <string name="volume_odi_captions_content_description" msgid="4172765742046013630">"Imbondela yamagama-ncazo"</string> <string name="volume_odi_captions_hint_enable" msgid="2073091194012843195">"nika amandla"</string> <string name="volume_odi_captions_hint_disable" msgid="2518846326748183407">"khubaza"</string> - <string name="screen_pinning_title" msgid="9058007390337841305">"Uhlelo lokusebenza luphiniwe"</string> + <string name="screen_pinning_title" msgid="9058007390337841305">"I-app iphiniwe"</string> <string name="screen_pinning_description" msgid="8699395373875667743">"Lokhu kuyigcina ibukeka uze ususe ukuphina. Thinta uphinde ubambe okuthi Emuva Nokubuka konke ukuze ususe ukuphina."</string> <string name="screen_pinning_description_recents_invisible" msgid="4564466648700390037">"Lokhu kuyigcina ibonakala uze uyisuse. Thinta uphinde ubambe okuthi Emuva nokuthi Ekhaya ukuze ususe ukuphina."</string> <string name="screen_pinning_description_gestural" msgid="7246323931831232068">"Lokhu kuyigcina ibonakala uze ususe ukuphina. Swayiphela phezulu uphinde ubambe ukuze ususe ukuphina."</string> @@ -506,8 +518,7 @@ <string name="notification_priority_title" msgid="2079708866333537093">"Okubalulekile"</string> <string name="no_shortcut" msgid="8257177117568230126">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> ayisekeli izici zengxoxo"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Lezi zaziso azikwazi ukushintshwa."</string> - <!-- no translation found for notification_unblockable_call_desc (5907328164696532169) --> - <skip /> + <string name="notification_unblockable_call_desc" msgid="5907328164696532169">"Izaziso zekholi azikwazi ukushintshwa."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Leli qembu lezaziso alikwazi ukulungiselelwa lapha"</string> <string name="notification_delegate_header" msgid="1264510071031479920">"Isaziso sommeli"</string> <string name="notification_channel_dialog_title" msgid="6856514143093200019">"Zonke izaziso ze-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string> @@ -844,6 +855,10 @@ <string name="media_output_broadcast_name" msgid="8786127091542624618">"Londoloza Igama"</string> <string name="media_output_broadcast_code" msgid="870795639644728542">"Iphasiwedi"</string> <string name="media_output_broadcast_dialog_save" msgid="7910865591430010198">"Londoloza"</string> + <!-- no translation found for media_output_broadcast_starting (8130153654166235557) --> + <skip /> + <!-- no translation found for media_output_broadcast_start_failed (3670835946856129775) --> + <skip /> <string name="build_number_clip_data_label" msgid="3623176728412560914">"Yakha inombolo"</string> <string name="build_number_copy_toast" msgid="877720921605503046">"Yakha inombolo ekopishelwe kubhodi yokunamathisela."</string> <string name="basic_status" msgid="2315371112182658176">"Vula ingxoxo"</string> @@ -912,11 +927,13 @@ <string name="qs_tile_request_dialog_add" msgid="4888460910694986304">"Engeza ithayela"</string> <string name="qs_tile_request_dialog_not_add" msgid="4168716573114067296">"Ungafaki ithayela"</string> <string name="qs_user_switch_dialog_title" msgid="3045189293587781366">"Khetha umsebenzisi"</string> - <!-- no translation found for fgs_manager_footer_label (790443735462280164) --> + <plurals name="fgs_manager_footer_label" formatted="false" msgid="790443735462280164"> + <item quantity="one">Ama-app angu-<xliff:g id="COUNT_1">%s</xliff:g> ayasebenza</item> + <item quantity="other">Ama-app angu-<xliff:g id="COUNT_1">%s</xliff:g> ayasebenza</item> + </plurals> <string name="fgs_dot_content_description" msgid="2865071539464777240">"Ulwazi olusha"</string> <string name="fgs_manager_dialog_title" msgid="5879184257257718677">"Ama-app asebenzayo"</string> - <!-- no translation found for fgs_manager_dialog_message (6839542063522121108) --> - <skip /> + <string name="fgs_manager_dialog_message" msgid="6839542063522121108">"Ngisho noma ungawasebenzisi lama-app, asasebenza futhi angathinta impilo yebhethri"</string> <string name="fgs_manager_app_item_stop_button_label" msgid="7188317969020801156">"Misa"</string> <string name="fgs_manager_app_item_stop_button_stopped_label" msgid="6950382004441263922">"Imisiwe"</string> <string name="clipboard_edit_text_done" msgid="4551887727694022409">"Kwenziwe"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 83b1b52fff3d..c8fff39cc8e5 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -711,4 +711,10 @@ <item>@*android:string/status_bar_alarm_clock</item> <item>@*android:string/status_bar_call_strength</item> </string-array> + + <!-- Packages of SystemUI --> + <string-array name="system_ui_packages" translatable="false"> + <item>com.android.keyguard</item> + <item>com.android.systemui</item> + </string-array> </resources> diff --git a/packages/SystemUI/res/xml/media_recommendation_collapsed.xml b/packages/SystemUI/res/xml/media_recommendation_collapsed.xml index a6113473b065..b7d4b3aac079 100644 --- a/packages/SystemUI/res/xml/media_recommendation_collapsed.xml +++ b/packages/SystemUI/res/xml/media_recommendation_collapsed.xml @@ -25,8 +25,10 @@ /> <!-- Only the constraintBottom and marginBottom are different. The rest of the constraints are - the same as the constraints in media_smartspace_recommendations. But due to how - ConstraintSets work, all the constraints need to be in the same place. + the same as the constraints in media_recommendations_expanded.xml. But, due to how + ConstraintSets work, all the constraints need to be in the same place. So, the shared + constraints can't be put in the shared layout file media_smartspace_recommendations.xml and + the constraints are instead duplicated between here and media_recommendations_expanded.xml. Ditto for the other cover containers. --> <Constraint android:id="@+id/media_cover1_container" diff --git a/packages/SystemUI/res/xml/media_recommendation_expanded.xml b/packages/SystemUI/res/xml/media_recommendation_expanded.xml index 09ffebb8b4a9..ce25a7d01bf7 100644 --- a/packages/SystemUI/res/xml/media_recommendation_expanded.xml +++ b/packages/SystemUI/res/xml/media_recommendation_expanded.xml @@ -15,7 +15,9 @@ ~ limitations under the License --> <ConstraintSet - xmlns:android="http://schemas.android.com/apk/res/android" > + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + > <Constraint android:id="@+id/sizing_view" @@ -23,4 +25,99 @@ android:layout_height="@dimen/qs_media_session_height_expanded" /> + <Constraint + android:id="@+id/media_cover1_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@+id/media_title1" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/media_cover2_container" + android:layout_marginEnd="@dimen/qs_media_rec_album_side_margin" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintVertical_bias="0.4" + /> + + <Constraint + android:id="@+id/media_title1" + style="@style/MediaPlayer.Recommendation.Text.Title" + app:layout_constraintStart_toStartOf="@+id/media_cover1_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover1_container" + app:layout_constraintTop_toBottomOf="@+id/media_cover1_container" + app:layout_constraintBottom_toTopOf="@+id/media_subtitle1" + /> + + <Constraint + android:id="@+id/media_subtitle1" + style="@style/MediaPlayer.Recommendation.Text.Subtitle" + app:layout_constraintStart_toStartOf="@+id/media_cover1_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover1_container" + app:layout_constraintTop_toBottomOf="@+id/media_title1" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="@dimen/qs_media_padding" + /> + + <Constraint + android:id="@+id/media_cover2_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/media_title2" + app:layout_constraintStart_toEndOf="@id/media_cover1_container" + app:layout_constraintEnd_toStartOf="@id/media_cover3_container" + android:layout_marginEnd="@dimen/qs_media_rec_album_side_margin" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintVertical_bias="0.4" + /> + + <Constraint + android:id="@+id/media_title2" + style="@style/MediaPlayer.Recommendation.Text.Title" + app:layout_constraintStart_toStartOf="@+id/media_cover2_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover2_container" + app:layout_constraintTop_toBottomOf="@+id/media_cover2_container" + app:layout_constraintBottom_toTopOf="@+id/media_subtitle2" + /> + + <Constraint + android:id="@+id/media_subtitle2" + style="@style/MediaPlayer.Recommendation.Text.Subtitle" + app:layout_constraintStart_toStartOf="@+id/media_cover2_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover2_container" + app:layout_constraintTop_toBottomOf="@+id/media_title2" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="@dimen/qs_media_padding" + /> + + <Constraint + android:id="@+id/media_cover3_container" + style="@style/MediaPlayer.Recommendation.AlbumContainer" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/media_title3" + app:layout_constraintStart_toEndOf="@id/media_cover2_container" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="@dimen/qs_media_padding" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintVertical_bias="0.4" + /> + + <Constraint + android:id="@+id/media_title3" + style="@style/MediaPlayer.Recommendation.Text.Title" + app:layout_constraintStart_toStartOf="@+id/media_cover3_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover3_container" + app:layout_constraintTop_toBottomOf="@+id/media_cover3_container" + app:layout_constraintBottom_toTopOf="@+id/media_subtitle3" + /> + + <Constraint + android:id="@+id/media_subtitle3" + style="@style/MediaPlayer.Recommendation.Text.Subtitle" + app:layout_constraintStart_toStartOf="@+id/media_cover3_container" + app:layout_constraintEnd_toEndOf="@+id/media_cover3_container" + app:layout_constraintTop_toBottomOf="@+id/media_title3" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="@dimen/qs_media_padding" + /> + </ConstraintSet> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt index fc6bb500562e..d7a0b473ead6 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt @@ -52,7 +52,7 @@ class UnfoldMoveFromCenterAnimator @JvmOverloads constructor( private val animatedViews: MutableList<AnimatedView> = arrayListOf() - private var lastAnimationProgress: Float = 0f + private var lastAnimationProgress: Float = 1f /** * Updates display properties in order to calculate the initial position for the views diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java index e253360a5364..b8319e51ec3b 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/view/RecentsTransition.java @@ -45,7 +45,7 @@ public class RecentsTransition { private boolean mHandled; @Override - public void onAnimationStarted() { + public void onAnimationStarted(long elapsedRealTime) { // OnAnimationStartedListener can be called numerous times, so debounce here to // prevent multiple callbacks if (mHandled) { diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java index 461c2dc2c2af..be3dfdcf05d5 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java @@ -23,6 +23,7 @@ import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; import static android.app.ActivityTaskManager.getService; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityClient; import android.app.ActivityManager; @@ -154,11 +155,15 @@ public class ActivityManagerWrapper { /** * Removes the outdated snapshot of home task. + * + * @param homeActivity The home task activity, or null if you have the + * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS} permission and + * want us to find the home task for you. */ - public void invalidateHomeTaskSnapshot(final Activity homeActivity) { + public void invalidateHomeTaskSnapshot(@Nullable final Activity homeActivity) { try { ActivityClient.getInstance().invalidateHomeTaskSnapshot( - homeActivity.getActivityToken()); + homeActivity == null ? null : homeActivity.getActivityToken()); } catch (Throwable e) { Log.w(TAG, "Failed to invalidate home snapshot", e); } diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java index e38d2bad11b3..add2d022e893 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java @@ -67,7 +67,7 @@ public abstract class ActivityOptionsCompat { callbackHandler, new ActivityOptions.OnAnimationStartedListener() { @Override - public void onAnimationStarted() { + public void onAnimationStarted(long elapsedRealTime) { if (callback != null) { callbackHandler.post(callback); } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index f4355798a381..fd7a6e624e2d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -315,6 +315,7 @@ public class KeyguardSecurityContainer extends FrameLayout { Log.i(TAG, "Switching mode from " + modeToString(mCurrentMode) + " to " + modeToString(mode)); mCurrentMode = mode; + mViewMode.onDestroy(); switch (mode) { case MODE_ONE_HANDED: @@ -710,7 +711,6 @@ public class KeyguardSecurityContainer extends FrameLayout { * Enscapsulates the differences between bouncer modes for the container. */ interface ViewMode { - default void init(@NonNull ViewGroup v, @NonNull GlobalSettings globalSettings, @NonNull KeyguardSecurityViewFlipper viewFlipper, @NonNull FalsingManager falsingManager, @@ -738,6 +738,9 @@ public class KeyguardSecurityContainer extends FrameLayout { default int getChildWidthMeasureSpec(int parentWidthMeasureSpec) { return parentWidthMeasureSpec; } + + /** Called when we are setting a new ViewMode */ + default void onDestroy() {}; } /** @@ -781,6 +784,8 @@ public class KeyguardSecurityContainer extends FrameLayout { private UserSwitcherController mUserSwitcherController; private KeyguardUserSwitcherPopupMenu mPopup; private Resources mResources; + private UserSwitcherController.UserSwitchCallback mUserSwitchCallback = + this::setupUserSwitcher; @Override public void init(@NonNull ViewGroup v, @NonNull GlobalSettings globalSettings, @@ -805,6 +810,7 @@ public class KeyguardSecurityContainer extends FrameLayout { mUserSwitcher = mView.findViewById(R.id.user_switcher_header); setupUserSwitcher(); + mUserSwitcherController.addUserSwitchCallback(mUserSwitchCallback); } @Override @@ -813,7 +819,11 @@ public class KeyguardSecurityContainer extends FrameLayout { mPopup.dismiss(); mPopup = null; } - setupUserSwitcher(); + } + + @Override + public void onDestroy() { + mUserSwitcherController.removeUserSwitchCallback(mUserSwitchCallback); } private Drawable findUserIcon(int userId) { diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java b/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java index f925eaa0e40b..eb6705a2e979 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java @@ -15,6 +15,8 @@ */ package com.android.keyguard; +import static com.android.systemui.util.ColorUtilKt.getPrivateAttrColorIfUnset; + import android.animation.AnimatorSet; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; @@ -152,7 +154,7 @@ class NumPadAnimator { ContextThemeWrapper ctw = new ContextThemeWrapper(context, mStyle); TypedArray a = ctw.obtainStyledAttributes(customAttrs); - mNormalColor = Utils.getPrivateAttrColorIfUnset(ctw, a, 0, 0, + mNormalColor = getPrivateAttrColorIfUnset(ctw, a, 0, 0, com.android.internal.R.attr.colorSurface); mHighlightColor = a.getColor(1, 0); a.recycle(); diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt b/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt index 3641e1d52144..0df2730a48eb 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt @@ -380,7 +380,7 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec ) { if (hasTopRoundedCorner == hasTop && hasBottomRoundedCorner == hasBottom && - roundedCornerBottomSize == bottomSize && + roundedCornerTopSize == topSize && roundedCornerBottomSize == bottomSize) { return } diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index b98fc03e3acd..8d6509874776 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -348,7 +348,8 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab @Override public void onDisplayChanged(int displayId) { final int newRotation = mContext.getDisplay().getRotation(); - if (mOverlays != null && mRotation != newRotation) { + if ((mOverlays != null || mScreenDecorHwcWindow != null) + && mRotation != newRotation) { // We cannot immediately update the orientation. Otherwise // WindowManager is still deferring layout until it has finished dispatching // the config changes, which may cause divergence between what we draw @@ -362,11 +363,13 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab + mRotation); } - for (int i = 0; i < BOUNDS_POSITION_LENGTH; i++) { - if (mOverlays[i] != null) { - final ViewGroup overlayView = mOverlays[i].getRootView(); - overlayView.getViewTreeObserver().addOnPreDrawListener( - new RestartingPreDrawListener(overlayView, i, newRotation)); + if (mOverlays != null) { + for (int i = 0; i < BOUNDS_POSITION_LENGTH; i++) { + if (mOverlays[i] != null) { + final ViewGroup overlayView = mOverlays[i].getRootView(); + overlayView.getViewTreeObserver().addOnPreDrawListener( + new RestartingPreDrawListener(overlayView, i, newRotation)); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 9d5b93c2b329..7c2673c31bf5 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -187,6 +187,14 @@ public class AssistManager { } @Override + public void onVoiceSessionWindowVisibilityChanged(boolean visible) + throws RemoteException { + if (VERBOSE) { + Log.v(TAG, "Window visibility changed: " + visible); + } + } + + @Override public void onSetUiHints(Bundle hints) { if (VERBOSE) { Log.v(TAG, "UI hints received"); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 8e1132600a64..d4dad73a49f2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -149,7 +149,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba final TaskStackListener mTaskStackListener = new TaskStackListener() { @Override public void onTaskStackChanged() { - mHandler.post(AuthController.this::handleTaskStackChanged); + mHandler.post(AuthController.this::cancelIfOwnerIsNotInForeground); } }; @@ -200,7 +200,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba } }; - private void handleTaskStackChanged() { + private void cancelIfOwnerIsNotInForeground() { mExecution.assertIsMainThread(); if (mCurrentDialog != null) { try { @@ -212,7 +212,7 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba final String topPackage = runningTasks.get(0).topActivity.getPackageName(); if (!topPackage.contentEquals(clientPackage) && !Utils.isSystem(mContext, clientPackage)) { - Log.w(TAG, "Evicting client due to: " + topPackage); + Log.e(TAG, "Evicting client due to: " + topPackage); mCurrentDialog.dismissWithoutCallback(true /* animate */); mCurrentDialog = null; mOrientationListener.disable(); @@ -919,6 +919,10 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba mCurrentDialog = newDialog; mCurrentDialog.show(mWindowManager, savedState); mOrientationListener.enable(); + + if (!promptInfo.isAllowBackgroundAuthentication()) { + mHandler.post(this::cancelIfOwnerIsNotInForeground); + } } private void onDialogDismissed(@DismissedReason int reason) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt index ac81633cdb2b..5cfbdb0caf2d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt @@ -54,14 +54,13 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>( private var dialogAlphaAnimator: ValueAnimator? = null private val dialogListener = SystemUIDialogManager.Listener { runDialogAlphaAnimator() } - private val panelExpansionListener = - PanelExpansionListener { fraction, expanded, tracking -> - // Notification shade can be expanded but not visible (fraction: 0.0), for example - // when a heads-up notification (HUN) is showing. - notificationShadeVisible = expanded && fraction > 0f - view.onExpansionChanged(fraction) - updatePauseAuth() - } + private val panelExpansionListener = PanelExpansionListener { event -> + // Notification shade can be expanded but not visible (fraction: 0.0), for example + // when a heads-up notification (HUN) is showing. + notificationShadeVisible = event.expanded && event.fraction > 0f + view.onExpansionChanged(event.fraction) + updatePauseAuth() + } /** If the notification shade is visible. */ var notificationShadeVisible: Boolean = false diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java index dbfce2ed2532..2f097924817e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java @@ -112,17 +112,16 @@ public class UdfpsDialogMeasureAdapter { if (child.getId() == R.id.biometric_icon_frame) { final FrameLayout iconFrame = (FrameLayout) child; final View icon = iconFrame.getChildAt(0); - - // Ensure that the icon is never larger than the sensor. - icon.measure( - MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST)); - // Create a frame that's exactly the height of the sensor circle. iconFrame.measure( MeasureSpec.makeMeasureSpec( child.getLayoutParams().width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY)); + + // Ensure that the icon is never larger than the sensor. + icon.measure( + MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST), + MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST)); } else if (child.getId() == R.id.space_above_icon) { child.measure( MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), @@ -208,16 +207,15 @@ public class UdfpsDialogMeasureAdapter { if (child.getId() == R.id.biometric_icon_frame) { final FrameLayout iconFrame = (FrameLayout) child; final View icon = iconFrame.getChildAt(0); + // Create a frame that's exactly the height of the sensor circle. + iconFrame.measure( + MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY)); // Ensure that the icon is never larger than the sensor. icon.measure( MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.AT_MOST)); - - // Create a frame that's exactly the height of the sensor circle. - iconFrame.measure( - MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY)); } else if (child.getId() == R.id.space_above_icon) { // Adjust the width and height of the top spacer if necessary. final int newTopSpacerHeight = child.getLayoutParams().height diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java index 67d0db22b3cf..937b81337cbb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java @@ -127,19 +127,20 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { mBurnInProgress = MathUtils.lerp(0f, getBurnInProgressOffset(), darkAmountForAnimation); if (mAnimatingBetweenAodAndLockscreen && !mPauseAuth) { - mBgProtection.setAlpha(1f - mInterpolatedDarkAmount); - mLockScreenFp.setTranslationX(mBurnInOffsetX); mLockScreenFp.setTranslationY(mBurnInOffsetY); - mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount); + mBgProtection.setAlpha(1f - mInterpolatedDarkAmount); mLockScreenFp.setAlpha(1f - mInterpolatedDarkAmount); } else if (mInterpolatedDarkAmount == 0f) { + mLockScreenFp.setTranslationX(0); + mLockScreenFp.setTranslationY(0); mBgProtection.setAlpha(mAlpha / 255f); mLockScreenFp.setAlpha(mAlpha / 255f); } else { mBgProtection.setAlpha(0f); mLockScreenFp.setAlpha(0f); } + mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount); mAodFp.setTranslationX(mBurnInOffsetX); mAodFp.setTranslationY(mBurnInOffsetY); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java index e8cfd422cc8a..416b8ee60fd9 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java @@ -38,6 +38,7 @@ import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.SystemUIDialogManager; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -491,8 +492,8 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud private final PanelExpansionListener mPanelExpansionListener = new PanelExpansionListener() { @Override - public void onPanelExpansionChanged( - float fraction, boolean expanded, boolean tracking) { + public void onPanelExpansionChanged(PanelExpansionChangeEvent event) { + float fraction = event.getFraction(); mPanelExpansionFraction = mKeyguardViewManager.isBouncerInTransit() ? BouncerPanelExpansionCalculator .aboutToShowBouncerProgress(fraction) : fraction; diff --git a/packages/SystemUI/src/com/android/systemui/dagger/AndroidInternalsModule.java b/packages/SystemUI/src/com/android/systemui/dagger/AndroidInternalsModule.java index 48c54bca69ee..09928829b195 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/AndroidInternalsModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/AndroidInternalsModule.java @@ -19,9 +19,13 @@ package com.android.systemui.dagger; import android.content.Context; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.UiEventLogger; +import com.android.internal.logging.UiEventLoggerImpl; import com.android.internal.util.NotificationMessagingUtil; import com.android.internal.widget.LockPatternUtils; +import javax.inject.Singleton; + import dagger.Module; import dagger.Provides; @@ -32,14 +36,14 @@ import dagger.Provides; public class AndroidInternalsModule { /** */ @Provides - @SysUISingleton + @Singleton public LockPatternUtils provideLockPatternUtils(Context context) { return new LockPatternUtils(context); } /** */ @Provides - @SysUISingleton + @Singleton public MetricsLogger provideMetricsLogger() { return new MetricsLogger(); } @@ -50,4 +54,10 @@ public class AndroidInternalsModule { return new NotificationMessagingUtil(context); } + /** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */ + @Provides + @Singleton + static UiEventLogger provideUiEventLogger() { + return new UiEventLoggerImpl(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java index 31ad36fb21d8..19e98f26cacb 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java @@ -27,7 +27,6 @@ import dagger.Module; */ @Deprecated @Module(includes = { - AndroidInternalsModule.class, BroadcastDispatcherModule.class, LeakModule.class, NightDisplayListenerModule.class, diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java index e512b7cf3a20..5b6ddd8471da 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java @@ -90,6 +90,7 @@ import com.android.internal.util.LatencyTracker; import com.android.systemui.Prefs; import com.android.systemui.dagger.qualifiers.DisplayId; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.dagger.qualifiers.TestHarness; import com.android.systemui.shared.system.PackageManagerWrapper; import java.util.Optional; @@ -445,6 +446,13 @@ public class FrameworkServicesModule { @Provides @Singleton + @TestHarness + static boolean provideIsTestHarness() { + return ActivityManager.isRunningInUserTestHarness(); + } + + @Provides + @Singleton static TrustManager provideTrustManager(Context context) { return context.getSystemService(TrustManager.class); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java b/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java index 620feec8fbb8..ca725c0e39ff 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java @@ -16,23 +16,15 @@ package com.android.systemui.dagger; -import android.app.ActivityManager; import android.content.Context; import android.util.DisplayMetrics; +import android.view.Display; -import com.android.internal.logging.UiEventLogger; -import com.android.internal.logging.UiEventLoggerImpl; -import com.android.systemui.dagger.qualifiers.TestHarness; -import com.android.systemui.dagger.qualifiers.UiBackground; +import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.plugins.PluginsModule; import com.android.systemui.unfold.UnfoldTransitionModule; import com.android.systemui.util.concurrency.GlobalConcurrencyModule; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import javax.inject.Singleton; - import dagger.Module; import dagger.Provides; @@ -52,43 +44,29 @@ import dagger.Provides; * Please use discretion when adding things to the global scope. */ @Module(includes = { + AndroidInternalsModule.class, FrameworkServicesModule.class, GlobalConcurrencyModule.class, UnfoldTransitionModule.class, PluginsModule.class, }) public class GlobalModule { - - /** */ - @Provides - public DisplayMetrics provideDisplayMetrics(Context context) { - DisplayMetrics displayMetrics = new DisplayMetrics(); - context.getDisplay().getMetrics(displayMetrics); - return displayMetrics; - } - - /** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */ - @Provides - @Singleton - static UiEventLogger provideUiEventLogger() { - return new UiEventLoggerImpl(); - } - + /** + * TODO(b/229228871): This should be the default. No undecorated context should be available. + */ @Provides - @TestHarness - static boolean provideIsTestHarness() { - return ActivityManager.isRunningInUserTestHarness(); + @Application + public Context provideApplicationContext(Context context) { + return context.getApplicationContext(); } /** - * Provide an Executor specifically for running UI operations on a separate thread. - * - * Keep submitted runnables short and to the point, just as with any other UI code. + * @deprecated Deprecdated because {@link Display#getMetrics} is deprecated. */ @Provides - @Singleton - @UiBackground - public static Executor provideUiBackgroundExecutor() { - return Executors.newSingleThreadExecutor(); + public DisplayMetrics provideDisplayMetrics(Context context) { + DisplayMetrics displayMetrics = new DisplayMetrics(); + context.getDisplay().getMetrics(displayMetrics); + return displayMetrics; } } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/qualifiers/Application.java b/packages/SystemUI/src/com/android/systemui/dagger/qualifiers/Application.java new file mode 100644 index 000000000000..21e53a5b51d0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/dagger/qualifiers/Application.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.dagger.qualifiers; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import android.content.Context; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Qualifier; + +/** + * Used to qualify a context as {@link Context#getApplicationContext} + */ +@Qualifier +@Documented +@Retention(RUNTIME) +public @interface Application { +} diff --git a/packages/SystemUI/src/com/android/systemui/decor/RoundedCornerDecorProviderImpl.kt b/packages/SystemUI/src/com/android/systemui/decor/RoundedCornerDecorProviderImpl.kt index 9dbeb77ebc00..e316722b64ea 100644 --- a/packages/SystemUI/src/com/android/systemui/decor/RoundedCornerDecorProviderImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/decor/RoundedCornerDecorProviderImpl.kt @@ -105,7 +105,7 @@ private fun Int.toLayoutGravity(@Surface.Rotation rotation: Int): Int = when (ro DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.BOTTOM DisplayCutout.BOUNDS_POSITION_TOP -> Gravity.LEFT DisplayCutout.BOUNDS_POSITION_RIGHT -> Gravity.TOP - else /* DisplayCutout.BOUNDS_POSITION_BOTTOM */ -> Gravity.LEFT + else /* DisplayCutout.BOUNDS_POSITION_BOTTOM */ -> Gravity.RIGHT } Surface.ROTATION_270 -> when (this) { DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.TOP diff --git a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt index 9b99c522aab9..a3095472783b 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt @@ -98,6 +98,7 @@ class DreamsSmartspaceController @Inject constructor( view.setPrimaryTextColor(Color.WHITE) smartspaceViews.add(view) connectSession() + view.setDozeAmount(0f) } override fun onViewDetachedFromWindow(v: View) { @@ -127,6 +128,7 @@ class DreamsSmartspaceController @Inject constructor( } val view = buildView(parent) + connectSession() return view @@ -136,12 +138,13 @@ class DreamsSmartspaceController @Inject constructor( return if (plugin != null) { var view = smartspaceViewComponentFactory.create(parent, plugin, stateChangeListener) .getView() - - if (view is View) { - return view + if (view !is View) { + return null } - return null + view.setIsDreaming(true) + + return view } else { null } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java index 54b9430eb445..fbca7b1d86d3 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java @@ -40,6 +40,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.wm.shell.animation.FlingAnimationUtils; import java.util.Optional; @@ -141,19 +142,27 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { // bouncer. As that view's expansion shrinks, the bouncer appears. The bouncer // is fully hidden at full expansion (1) and fully visible when fully collapsed // (0). + final float dragDownAmount = e2.getY() - e1.getY(); final float screenTravelPercentage = Math.abs(e1.getY() - e2.getY()) / mCentralSurfaces.get().getDisplayHeight(); setPanelExpansion(mBouncerInitiallyShowing - ? screenTravelPercentage : 1 - screenTravelPercentage); + ? screenTravelPercentage : 1 - screenTravelPercentage, dragDownAmount); return true; } }; - private void setPanelExpansion(float expansion) { + private void setPanelExpansion(float expansion, float dragDownAmount) { mCurrentExpansion = expansion; - mStatusBarKeyguardViewManager.onPanelExpansionChanged(mCurrentExpansion, false, true); + PanelExpansionChangeEvent event = + new PanelExpansionChangeEvent( + /* fraction= */ mCurrentExpansion, + /* expanded= */ false, + /* tracking= */ true, + /* dragDownPxAmount= */ dragDownAmount); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(event); } + @VisibleForTesting public enum DreamEvent implements UiEventLogger.UiEventEnum { @UiEvent(doc = "The screensaver has been swiped up.") @@ -283,12 +292,14 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { } } - private ValueAnimator createExpansionAnimator(float targetExpansion) { + private ValueAnimator createExpansionAnimator(float targetExpansion, float expansionHeight) { final ValueAnimator animator = mValueAnimatorCreator.create(mCurrentExpansion, targetExpansion); animator.addUpdateListener( animation -> { - setPanelExpansion((float) animation.getAnimatedValue()); + float expansionFraction = (float) animation.getAnimatedValue(); + float dragDownAmount = expansionFraction * expansionHeight; + setPanelExpansion(expansionFraction, dragDownAmount); }); if (!mBouncerInitiallyShowing && targetExpansion == KeyguardBouncer.EXPANSION_VISIBLE) { animator.addListener( @@ -321,8 +332,8 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler { final float viewHeight = mCentralSurfaces.get().getDisplayHeight(); final float currentHeight = viewHeight * mCurrentExpansion; final float targetHeight = viewHeight * expansion; - - final ValueAnimator animator = createExpansionAnimator(expansion); + final float expansionHeight = targetHeight - currentHeight; + final ValueAnimator animator = createExpansionAnimator(expansion, expansionHeight); if (expansion == KeyguardBouncer.EXPANSION_HIDDEN) { // Hides the bouncer, i.e., fully expands the space above the bouncer. mFlingAnimationUtilsClosing.apply(animator, currentHeight, targetHeight, velocity, diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index afa7d5e0a9c4..e963c39329ca 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -151,7 +151,7 @@ public class Flags { /***************************************/ // 900 - media public static final BooleanFlag MEDIA_TAP_TO_TRANSFER = new BooleanFlag(900, true); - public static final BooleanFlag MEDIA_SESSION_ACTIONS = new BooleanFlag(901, false); + public static final BooleanFlag MEDIA_SESSION_ACTIONS = new BooleanFlag(901, true); public static final BooleanFlag MEDIA_NEARBY_DEVICES = new BooleanFlag(903, true); public static final BooleanFlag MEDIA_MUTE_AWAIT = new BooleanFlag(904, true); diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index 3ae11ff28345..9c7411bf3649 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -54,7 +54,7 @@ public class FragmentHostManager { private final View mRootView; private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE - | ActivityInfo.CONFIG_LAYOUT_DIRECTION | ActivityInfo.CONFIG_ASSETS_PATHS); + | ActivityInfo.CONFIG_ASSETS_PATHS); private final FragmentService mManager; private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager(); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 0f5022df17d8..29e940f24df6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -119,6 +119,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.dagger.KeyguardModule; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NotificationShadeDepthController; @@ -848,7 +849,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @Override public void onLaunchAnimationCancelled() { - setOccluded(true /* occluded */, false /* animate */); + Log.d(TAG, "Occlude launch animation cancelled. " + + "Occluded state is now: " + mOccluded); } @NonNull @@ -893,7 +895,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, }; private IRemoteAnimationRunner mOccludeAnimationRunner = - new ActivityLaunchRemoteAnimationRunner(mOccludeAnimationController); + new OccludeActivityLaunchRemoteAnimationRunner(mOccludeAnimationController); /** * Animation controller for activities that unocclude the keyguard. This does not use the @@ -918,13 +920,17 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException { - final RemoteAnimationTarget primary = apps[0]; + if (apps == null || apps.length == 0 || apps[0] == null) { + Log.d(TAG, "No apps provided to unocclude runner; " + + "skipping animation and unoccluding."); - if (primary == null) { finishedCallback.onAnimationFinished(); + setOccluded(false /* isOccluded */, true /* animate */); return; } + final RemoteAnimationTarget primary = apps[0]; + final SyncRtSurfaceTransactionApplier applier = new SyncRtSurfaceTransactionApplier( mKeyguardViewControllerLazy.get().getViewRootImpl().getView()); @@ -964,6 +970,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @Override public void onAnimationEnd(Animator animation) { try { + setOccluded(false /* isOccluded */, true /* animate */); finishedCallback.onAnimationFinished(); mUnoccludeAnimator = null; } catch (RemoteException e) { @@ -2603,6 +2610,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, finishSurfaceBehindRemoteAnimation(cancelled); mSurfaceBehindRemoteAnimationRequested = false; + + // The remote animation is over, so we're not going away anymore. + mKeyguardStateController.notifyKeyguardGoingAway(false); }); mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation( @@ -2621,6 +2631,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, ActivityTaskManager.getService().keyguardGoingAway( WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS | WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER); + mKeyguardStateController.notifyKeyguardGoingAway(true); } catch (RemoteException e) { mSurfaceBehindRemoteAnimationRequested = false; e.printStackTrace(); @@ -2784,6 +2795,13 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, public void onWakeAndUnlocking() { Trace.beginSection("KeyguardViewMediator#onWakeAndUnlocking"); mWakeAndUnlocking = true; + + // We're going to animate in the Launcher, so ask WM to clear the task snapshot so we don't + // initially display an old snapshot with all of the icons visible. We're System UI, so + // we're allowed to pass in null to ask WM to find the home activity for us to prevent + // needing to IPC to Launcher. + ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(null /* homeActivity */); + keyguardDone(); Trace.endSection(); } @@ -3113,4 +3131,36 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, mRunner.onAnimationStart(transit, apps, wallpapers, nonApps, finishedCallback); } } + + /** + * Subclass of {@link ActivityLaunchRemoteAnimationRunner} that calls {@link #setOccluded} when + * onAnimationStart is called. + */ + private class OccludeActivityLaunchRemoteAnimationRunner + extends ActivityLaunchRemoteAnimationRunner { + + OccludeActivityLaunchRemoteAnimationRunner( + ActivityLaunchAnimator.Controller controller) { + super(controller); + } + + @Override + public void onAnimationStart(int transit, RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps, + IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException { + super.onAnimationStart(transit, apps, wallpapers, nonApps, finishedCallback); + + // This is the first signal we have from WM that we're going to be occluded. Set our + // internal state to reflect that immediately, vs. waiting for the launch animator to + // begin. Otherwise, calls to setShowingLocked, etc. will not know that we're about to + // be occluded and might re-show the keyguard. + setOccluded(true /* isOccluded */, false /* animate */); + } + + @Override + public void onAnimationCancelled() throws RemoteException { + super.onAnimationCancelled(); + Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: " + mOccluded); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java index 39f00f45aac2..24671696f3bd 100644 --- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java @@ -208,6 +208,16 @@ public class LogModule { return factory.create("MediaView", 100); } + /** + * Provides a buffer for media playback state changes + */ + @Provides + @SysUISingleton + @MediaTimeoutListenerLog + public static LogBuffer providesMediaTimeoutListenerLogBuffer(LogBufferFactory factory) { + return factory.create("MediaTimeout", 100); + } + /** Allows logging buffers to be tweaked via adb on debug builds but not on prod builds. */ @Provides @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java new file mode 100644 index 000000000000..53963fc8d431 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/log/dagger/MediaTimeoutListenerLog.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 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.log.dagger; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import com.android.systemui.log.LogBuffer; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import javax.inject.Qualifier; + +/** + * A {@link LogBuffer} for {@link com.android.systemui.media.MediaTimeoutLogger} + */ +@Qualifier +@Documented +@Retention(RUNTIME) +public @interface MediaTimeoutListenerLog { +} diff --git a/packages/SystemUI/src/com/android/systemui/media/ColorSchemeTransition.kt b/packages/SystemUI/src/com/android/systemui/media/ColorSchemeTransition.kt index 2ae1806f3b3d..70052fd45abf 100644 --- a/packages/SystemUI/src/com/android/systemui/media/ColorSchemeTransition.kt +++ b/packages/SystemUI/src/com/android/systemui/media/ColorSchemeTransition.kt @@ -21,24 +21,41 @@ import android.animation.ValueAnimator.AnimatorUpdateListener import android.animation.ValueAnimator import android.content.Context import android.content.res.ColorStateList +import android.graphics.drawable.GradientDrawable import com.android.internal.R import com.android.internal.annotations.VisibleForTesting import com.android.settingslib.Utils import com.android.systemui.monet.ColorScheme +import com.android.systemui.util.getColorWithAlpha /** - * ColorTransition is responsible for managing the animation between two specific colors. + * A [ColorTransition] is an object that updates the colors of views each time [updateColorScheme] + * is triggered. + */ +interface ColorTransition { + fun updateColorScheme(scheme: ColorScheme?) +} + +/** A generic implementation of [ColorTransition] so that we can define a factory method. */ +open class GenericColorTransition( + private val applyTheme: (ColorScheme?) -> Unit +) : ColorTransition { + override fun updateColorScheme(scheme: ColorScheme?) = applyTheme(scheme) +} + +/** + * A [ColorTransition] that animates between two specific colors. * It uses a ValueAnimator to execute the animation and interpolate between the source color and * the target color. * * Selection of the target color from the scheme, and application of the interpolated color * are delegated to callbacks. */ -open class ColorTransition( +open class AnimatingColorTransition( private val defaultColor: Int, private val extractColor: (ColorScheme) -> Int, private val applyColor: (Int) -> Unit -) : AnimatorUpdateListener { +) : AnimatorUpdateListener, ColorTransition { private val argbEvaluator = ArgbEvaluator() private val valueAnimator = buildAnimator() @@ -53,7 +70,7 @@ open class ColorTransition( applyColor(currentColor) } - fun updateColorScheme(scheme: ColorScheme?) { + override fun updateColorScheme(scheme: ColorScheme?) { val newTargetColor = if (scheme == null) defaultColor else extractColor(scheme) if (newTargetColor != targetColor) { sourceColor = currentColor @@ -76,7 +93,9 @@ open class ColorTransition( } } -typealias ColorTransitionFactory = (Int, (ColorScheme) -> Int, (Int) -> Unit) -> ColorTransition +typealias AnimatingColorTransitionFactory = + (Int, (ColorScheme) -> Int, (Int) -> Unit) -> AnimatingColorTransition +typealias GenericColorTransitionFactory = ((ColorScheme?) -> Unit) -> GenericColorTransition /** * ColorSchemeTransition constructs a ColorTransition for each color in the scheme @@ -86,79 +105,110 @@ typealias ColorTransitionFactory = (Int, (ColorScheme) -> Int, (Int) -> Unit) -> class ColorSchemeTransition internal constructor( private val context: Context, mediaViewHolder: MediaViewHolder, - colorTransitionFactory: ColorTransitionFactory + animatingColorTransitionFactory: AnimatingColorTransitionFactory, + genericColorTransitionFactory: GenericColorTransitionFactory ) { constructor(context: Context, mediaViewHolder: MediaViewHolder) : - this(context, mediaViewHolder, ::ColorTransition) + this(context, mediaViewHolder, ::AnimatingColorTransition, ::GenericColorTransition) val bgColor = context.getColor(com.android.systemui.R.color.material_dynamic_secondary95) - val surfaceColor = colorTransitionFactory( + val surfaceColor = animatingColorTransitionFactory( bgColor, - { colorScheme -> colorScheme.accent2[9] }, // A2-800 - { surfaceColor -> - val colorList = ColorStateList.valueOf(surfaceColor) - mediaViewHolder.player.backgroundTintList = colorList - mediaViewHolder.albumView.foregroundTintList = colorList - mediaViewHolder.albumView.backgroundTintList = colorList - mediaViewHolder.seamlessIcon.imageTintList = colorList - mediaViewHolder.seamlessText.setTextColor(surfaceColor) - mediaViewHolder.dismissText.setTextColor(surfaceColor) - }) - - val accentPrimary = colorTransitionFactory( + ::surfaceFromScheme + ) { surfaceColor -> + val colorList = ColorStateList.valueOf(surfaceColor) + mediaViewHolder.player.backgroundTintList = colorList + mediaViewHolder.seamlessIcon.imageTintList = colorList + mediaViewHolder.seamlessText.setTextColor(surfaceColor) + mediaViewHolder.gutsViewHolder.setSurfaceColor(surfaceColor) + } + + val accentPrimary = animatingColorTransitionFactory( loadDefaultColor(R.attr.textColorPrimary), - { colorScheme -> colorScheme.accent1[2] }, // A1-100 - { accentPrimary -> - val accentColorList = ColorStateList.valueOf(accentPrimary) - mediaViewHolder.actionPlayPause.backgroundTintList = accentColorList - mediaViewHolder.seamlessButton.backgroundTintList = accentColorList - mediaViewHolder.settings.imageTintList = accentColorList - mediaViewHolder.cancelText.backgroundTintList = accentColorList - mediaViewHolder.dismissText.backgroundTintList = accentColorList - }) - - val textPrimary = colorTransitionFactory( + ::accentPrimaryFromScheme + ) { accentPrimary -> + val accentColorList = ColorStateList.valueOf(accentPrimary) + mediaViewHolder.actionPlayPause.backgroundTintList = accentColorList + mediaViewHolder.seamlessButton.backgroundTintList = accentColorList + mediaViewHolder.gutsViewHolder.setAccentPrimaryColor(accentPrimary) + } + + val textPrimary = animatingColorTransitionFactory( loadDefaultColor(R.attr.textColorPrimary), - { colorScheme -> colorScheme.neutral1[1] }, // N1-50 - { textPrimary -> - mediaViewHolder.titleText.setTextColor(textPrimary) - val textColorList = ColorStateList.valueOf(textPrimary) - mediaViewHolder.seekBar.thumb.setTintList(textColorList) - mediaViewHolder.seekBar.progressTintList = textColorList - mediaViewHolder.longPressText.setTextColor(textColorList) - mediaViewHolder.cancelText.setTextColor(textColorList) - mediaViewHolder.scrubbingElapsedTimeView.setTextColor(textColorList) - mediaViewHolder.scrubbingTotalTimeView.setTextColor(textColorList) - for (button in mediaViewHolder.getTransparentActionButtons()) { - button.imageTintList = textColorList - } - }) - - val textPrimaryInverse = colorTransitionFactory( + ::textPrimaryFromScheme + ) { textPrimary -> + mediaViewHolder.titleText.setTextColor(textPrimary) + val textColorList = ColorStateList.valueOf(textPrimary) + mediaViewHolder.seekBar.thumb.setTintList(textColorList) + mediaViewHolder.seekBar.progressTintList = textColorList + mediaViewHolder.scrubbingElapsedTimeView.setTextColor(textColorList) + mediaViewHolder.scrubbingTotalTimeView.setTextColor(textColorList) + for (button in mediaViewHolder.getTransparentActionButtons()) { + button.imageTintList = textColorList + } + mediaViewHolder.gutsViewHolder.setTextPrimaryColor(textPrimary) + } + + val textPrimaryInverse = animatingColorTransitionFactory( loadDefaultColor(R.attr.textColorPrimaryInverse), - { colorScheme -> colorScheme.neutral1[10] }, // N1-900 - { textPrimaryInverse -> - mediaViewHolder.actionPlayPause.imageTintList = - ColorStateList.valueOf(textPrimaryInverse) - }) + ::textPrimaryInverseFromScheme + ) { textPrimaryInverse -> + mediaViewHolder.actionPlayPause.imageTintList = ColorStateList.valueOf(textPrimaryInverse) + } - val textSecondary = colorTransitionFactory( + val textSecondary = animatingColorTransitionFactory( loadDefaultColor(R.attr.textColorSecondary), - { colorScheme -> colorScheme.neutral2[3] }, // N2-200 - { textSecondary -> mediaViewHolder.artistText.setTextColor(textSecondary) }) + ::textSecondaryFromScheme + ) { textSecondary -> mediaViewHolder.artistText.setTextColor(textSecondary) } - val textTertiary = colorTransitionFactory( + val textTertiary = animatingColorTransitionFactory( loadDefaultColor(R.attr.textColorTertiary), - { colorScheme -> colorScheme.neutral2[5] }, // N2-400 - { textTertiary -> - mediaViewHolder.seekBar.progressBackgroundTintList = - ColorStateList.valueOf(textTertiary) - }) + ::textTertiaryFromScheme + ) { textTertiary -> + mediaViewHolder.seekBar.progressBackgroundTintList = ColorStateList.valueOf(textTertiary) + } + + // Note: This background gradient currently doesn't animate between colors. + val backgroundGradient = genericColorTransitionFactory { scheme -> + val defaultTintColor = ColorStateList.valueOf(bgColor) + if (scheme == null) { + mediaViewHolder.albumView.foregroundTintList = defaultTintColor + mediaViewHolder.albumView.backgroundTintList = defaultTintColor + return@genericColorTransitionFactory + } + + // If there's no album art, just hide the gradient so we show the solid background. + val showGradient = mediaViewHolder.albumView.drawable != null + val startColor = getColorWithAlpha( + backgroundStartFromScheme(scheme), + alpha = if (showGradient) .25f else 0f + ) + val endColor = getColorWithAlpha( + backgroundEndFromScheme(scheme), + alpha = if (showGradient) .90f else 0f + ) + val gradientColors = intArrayOf(startColor, endColor) + + val foregroundGradient = mediaViewHolder.albumView.foreground.mutate() + if (foregroundGradient is GradientDrawable) { + foregroundGradient.colors = gradientColors + } + val backgroundGradient = mediaViewHolder.albumView.background.mutate() + if (backgroundGradient is GradientDrawable) { + backgroundGradient.colors = gradientColors + } + } val colorTransitions = arrayOf( - surfaceColor, accentPrimary, textPrimary, - textPrimaryInverse, textSecondary, textTertiary) + surfaceColor, + accentPrimary, + textPrimary, + textPrimaryInverse, + textSecondary, + textTertiary, + backgroundGradient + ) private fun loadDefaultColor(id: Int): Int { return Utils.getColorAttr(context, id).defaultColor @@ -167,4 +217,4 @@ class ColorSchemeTransition internal constructor( fun updateColorScheme(colorScheme: ColorScheme?) { colorTransitions.forEach { it.updateColorScheme(colorScheme) } } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/media/GutsViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/GutsViewHolder.kt new file mode 100644 index 000000000000..1a48a84aff23 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/GutsViewHolder.kt @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2022 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.media + +import android.content.res.ColorStateList +import android.util.Log +import android.view.View +import android.view.ViewGroup +import android.widget.ImageButton +import android.widget.TextView +import com.android.systemui.R +import com.android.systemui.monet.ColorScheme + +/** + * A view holder for the guts menu of a media player. The guts are shown when the user long-presses + * on the media player. + * + * Both [MediaViewHolder] and [RecommendationViewHolder] use the same guts menu layout, so this + * class helps share logic between the two. + */ +class GutsViewHolder constructor(itemView: View) { + val gutsText: TextView = itemView.requireViewById(R.id.remove_text) + val cancel: View = itemView.requireViewById(R.id.cancel) + val cancelText: TextView = itemView.requireViewById(R.id.cancel_text) + val dismiss: ViewGroup = itemView.requireViewById(R.id.dismiss) + val dismissText: TextView = itemView.requireViewById(R.id.dismiss_text) + val settings: ImageButton = itemView.requireViewById(R.id.settings) + + /** Marquees the main text of the guts menu. */ + fun marquee(start: Boolean, delay: Long, tag: String) { + val gutsTextHandler = gutsText.handler + if (gutsTextHandler == null) { + Log.d(tag, "marquee while longPressText.getHandler() is null", Exception()) + return + } + gutsTextHandler.postDelayed( { gutsText.isSelected = start }, delay) + } + + /** Sets the right colors on all the guts views based on the given [ColorScheme]. */ + fun setColors(colorScheme: ColorScheme) { + setSurfaceColor(surfaceFromScheme(colorScheme)) + setTextPrimaryColor(textPrimaryFromScheme(colorScheme)) + setAccentPrimaryColor(accentPrimaryFromScheme(colorScheme)) + } + + /** Sets the surface color on all guts views that use it. */ + fun setSurfaceColor(surfaceColor: Int) { + dismissText.setTextColor(surfaceColor) + } + + /** Sets the primary accent color on all guts views that use it. */ + fun setAccentPrimaryColor(accentPrimary: Int) { + val accentColorList = ColorStateList.valueOf(accentPrimary) + settings.imageTintList = accentColorList + cancelText.backgroundTintList = accentColorList + dismissText.backgroundTintList = accentColorList + } + + /** Sets the primary text color on all guts views that use it. */ + fun setTextPrimaryColor(textPrimary: Int) { + val textColorList = ColorStateList.valueOf(textPrimary) + gutsText.setTextColor(textColorList) + cancelText.setTextColor(textColorList) + } + + companion object { + val ids = setOf( + R.id.remove_text, + R.id.cancel, + R.id.dismiss, + R.id.settings + ) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaColorSchemes.kt b/packages/SystemUI/src/com/android/systemui/media/MediaColorSchemes.kt new file mode 100644 index 000000000000..5e767b0458b9 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/MediaColorSchemes.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2022 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.media + +import com.android.systemui.monet.ColorScheme + +/** Returns the surface color for media controls based on the scheme. */ +internal fun surfaceFromScheme(scheme: ColorScheme) = scheme.accent2[9] // A2-800 + +/** Returns the primary accent color for media controls based on the scheme. */ +internal fun accentPrimaryFromScheme(scheme: ColorScheme) = scheme.accent1[2] // A1-100 + +/** Returns the primary text color for media controls based on the scheme. */ +internal fun textPrimaryFromScheme(scheme: ColorScheme) = scheme.neutral1[1] // N1-50 + +/** Returns the inverse of the primary text color for media controls based on the scheme. */ +internal fun textPrimaryInverseFromScheme(scheme: ColorScheme) = scheme.neutral1[10] // N1-900 + +/** Returns the secondary text color for media controls based on the scheme. */ +internal fun textSecondaryFromScheme(scheme: ColorScheme) = scheme.neutral2[3] // N2-200 + +/** Returns the tertiary text color for media controls based on the scheme. */ +internal fun textTertiaryFromScheme(scheme: ColorScheme) = scheme.neutral2[5] // N2-400 + +/** Returns the color for the start of the background gradient based on the scheme. */ +internal fun backgroundStartFromScheme(scheme: ColorScheme) = scheme.accent2[8] // A2-700 + +/** Returns the color for the end of the background gradient based on the scheme. */ +internal fun backgroundEndFromScheme(scheme: ColorScheme) = scheme.accent1[8] // A1-700 diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index 12369e514de5..d9ee8f3f06b4 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -30,10 +30,12 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.ColorStateList; +import android.graphics.Color; import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; import android.graphics.Rect; import android.graphics.drawable.Animatable; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.graphics.drawable.TransitionDrawable; @@ -60,7 +62,6 @@ import androidx.constraintlayout.widget.ConstraintSet; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.logging.InstanceId; -import com.android.settingslib.Utils; import com.android.settingslib.widget.AdaptiveIcon; import com.android.systemui.ActivityIntentHelper; import com.android.systemui.R; @@ -160,6 +161,7 @@ public class MediaControlPanel { private MetadataAnimationHandler mMetadataAnimationHandler; private ColorSchemeTransition mColorSchemeTransition; private Drawable mPrevArtwork = null; + private boolean mIsArtworkBound = false; private int mArtworkBoundId = 0; private int mArtworkNextBindRequestId = 0; @@ -337,17 +339,6 @@ public class MediaControlPanel { return true; } }); - vh.getCancel().setOnClickListener(v -> { - if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { - closeGuts(); - } - }); - vh.getSettings().setOnClickListener(v -> { - if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { - mLogger.logLongPressSettings(mUid, mPackageName, mInstanceId); - mActivityStarter.startActivity(SETTINGS_INTENT, true /* dismissShade */); - } - }); TextView titleText = mMediaViewHolder.getTitleText(); TextView artistText = mMediaViewHolder.getArtistText(); @@ -392,17 +383,6 @@ public class MediaControlPanel { return true; } }); - mRecommendationViewHolder.getCancel().setOnClickListener(v -> { - if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { - closeGuts(); - } - }); - mRecommendationViewHolder.getSettings().setOnClickListener(v -> { - if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { - mLogger.logLongPressSettings(mUid, mPackageName, mInstanceId); - mActivityStarter.startActivity(SETTINGS_INTENT, true /* dismissShade */); - } - }); } /** Bind this player view based on the data given. */ @@ -462,7 +442,7 @@ public class MediaControlPanel { mBackgroundExecutor.execute(() -> mSeekBarViewModel.updateController(controller)); bindOutputSwitcherChip(data); - bindLongPressMenu(data); + bindGutsMenuForPlayer(data); bindScrubbingTime(data); bindActionButtons(data); @@ -532,24 +512,8 @@ public class MediaControlPanel { }); } - private void bindLongPressMenu(MediaData data) { - boolean isDismissible = data.isClearable(); - String dismissText; - if (isDismissible) { - dismissText = mContext.getString(R.string.controls_media_close_session, data.getApp()); - } else { - dismissText = mContext.getString(R.string.controls_media_active_session); - } - mMediaViewHolder.getLongPressText().setText(dismissText); - - // Dismiss button - mMediaViewHolder.getDismissText().setAlpha(isDismissible ? 1 : DISABLED_ALPHA); - mMediaViewHolder.getDismiss().setEnabled(isDismissible); - mMediaViewHolder.getDismiss().setOnClickListener(v -> { - if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) return; - logSmartspaceCardReported(SMARTSPACE_CARD_DISMISS_EVENT); - mLogger.logLongPressDismiss(mUid, mPackageName, mInstanceId); - + private void bindGutsMenuForPlayer(MediaData data) { + Runnable onDismissClickedRunnable = () -> { if (mKey != null) { closeGuts(); if (!mMediaDataManagerLazy.get().dismissMediaData(mKey, @@ -562,7 +526,13 @@ public class MediaControlPanel { Log.w(TAG, "Dismiss media with null notification. Token uid=" + data.getToken().getUid()); } - }); + }; + + bindGutsMenuCommon( + /* isDismissible= */ data.isClearable(), + data.getApp(), + mMediaViewHolder.getGutsViewHolder(), + onDismissClickedRunnable); } private boolean bindSongMetadata(MediaData data) { @@ -619,6 +589,9 @@ public class MediaControlPanel { private void bindArtworkAndColors(MediaData data, boolean updateBackground) { final int reqId = mArtworkNextBindRequestId++; + if (updateBackground) { + mIsArtworkBound = false; + } // Capture width & height from views in foreground for artwork scaling in background int width = mMediaViewHolder.getPlayer().getWidth(); @@ -630,15 +603,18 @@ public class MediaControlPanel { // Album art ColorScheme mutableColorScheme = null; Drawable artwork; + boolean isArtworkBound; Icon artworkIcon = data.getArtwork(); if (artworkIcon != null) { WallpaperColors wallpaperColors = WallpaperColors .fromBitmap(artworkIcon.getBitmap()); mutableColorScheme = new ColorScheme(wallpaperColors, true); artwork = getScaledBackground(artworkIcon, width, height); + isArtworkBound = true; } else { // If there's no artwork, use colors from the app icon - artwork = null; + artwork = new ColorDrawable(Color.TRANSPARENT); + isArtworkBound = false; try { Drawable icon = mContext.getPackageManager() .getApplicationIcon(data.getPackageName()); @@ -658,16 +634,20 @@ public class MediaControlPanel { ImageView albumView = mMediaViewHolder.getAlbumView(); albumView.setPadding(0, 0, 0, 0); albumView.setClipToOutline(true); - if (updateBackground) { - if (mPrevArtwork == null || artwork == null) { + if (updateBackground || (!mIsArtworkBound && isArtworkBound)) { + if (mPrevArtwork == null) { albumView.setImageDrawable(artwork); } else { + // Since we throw away the last transition, this'll pop if you backgrounds + // are cycled too fast (or the correct background arrives very soon after + // the metadata changes). TransitionDrawable transitionDrawable = new TransitionDrawable( - new Drawable[] { mPrevArtwork, artwork }); + new Drawable[]{mPrevArtwork, artwork}); albumView.setImageDrawable(transitionDrawable); - transitionDrawable.startTransition(333); + transitionDrawable.startTransition(isArtworkBound ? 333 : 80); } mPrevArtwork = artwork; + mIsArtworkBound = isArtworkBound; } // Transition Colors to current color scheme @@ -973,8 +953,6 @@ public class MediaControlPanel { mPackageName = data.getPackageName(); mInstanceId = data.getInstanceId(); TransitionLayout recommendationCard = mRecommendationViewHolder.getRecommendations(); - recommendationCard.setBackgroundTintList( - Utils.getColorAttr(mContext, com.android.internal.R.attr.colorSurface)); List<SmartspaceAction> mediaRecommendationList = data.getRecommendations(); if (mediaRecommendationList == null || mediaRecommendationList.isEmpty()) { @@ -998,6 +976,7 @@ public class MediaControlPanel { Drawable icon = packageManager.getApplicationIcon(applicationInfo); ImageView headerLogoImageView = mRecommendationViewHolder.getCardIcon(); headerLogoImageView.setImageDrawable(icon); + fetchAndUpdateRecommendationColors(icon); // Set up media source app's label text. CharSequence appName = getAppName(data.getCardAction()); @@ -1025,6 +1004,9 @@ public class MediaControlPanel { List<ViewGroup> mediaCoverContainers = mRecommendationViewHolder.getMediaCoverContainers(); int mediaRecommendationNum = Math.min(mediaRecommendationList.size(), MEDIA_RECOMMENDATION_MAX_NUM); + + boolean hasTitle = false; + boolean hasSubtitle = false; int uiComponentIndex = 0; for (int itemIndex = 0; itemIndex < mediaRecommendationNum && uiComponentIndex < mediaRecommendationNum; @@ -1070,37 +1052,35 @@ public class MediaControlPanel { // Set up title CharSequence title = recommendation.getTitle(); + hasTitle |= !TextUtils.isEmpty(title); TextView titleView = mRecommendationViewHolder.getMediaTitles().get(uiComponentIndex); titleView.setText(title); - titleView.setTextColor(Utils.getColorAttrDefaultColor( - mContext, com.android.internal.R.attr.textColorPrimary)); - // TODO(b/223603970): If none of them have titles, should we then hide the views? // Set up subtitle - CharSequence subtitle = recommendation.getSubtitle(); - TextView subtitleView = - mRecommendationViewHolder.getMediaSubtitles().get(uiComponentIndex); // It would look awkward to show a subtitle if we don't have a title. boolean shouldShowSubtitleText = !TextUtils.isEmpty(title); - CharSequence subtitleText = shouldShowSubtitleText ? subtitle : ""; - subtitleView.setText(subtitleText); - subtitleView.setTextColor(Utils.getColorAttrDefaultColor( - mContext, com.android.internal.R.attr.textColorSecondary)); - // TODO(b/223603970): If none of them have subtitles, should we then hide the views? + CharSequence subtitle = shouldShowSubtitleText ? recommendation.getSubtitle() : ""; + hasSubtitle |= !TextUtils.isEmpty(subtitle); + TextView subtitleView = + mRecommendationViewHolder.getMediaSubtitles().get(uiComponentIndex); + subtitleView.setText(subtitle); uiComponentIndex++; } - mSmartspaceMediaItemsCount = uiComponentIndex; - // Set up long press to show guts setting panel. - mRecommendationViewHolder.getDismiss().setOnClickListener(v -> { - if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) return; - mLogger.logLongPressDismiss(mUid, mPackageName, mInstanceId); - logSmartspaceCardReported( - 761 // SMARTSPACE_CARD_DISMISS - ); + // If there's no subtitles and/or titles for any of the albums, hide those views. + ConstraintSet expandedSet = mMediaViewController.getExpandedLayout(); + final boolean titlesVisible = hasTitle; + final boolean subtitlesVisible = hasSubtitle; + mRecommendationViewHolder.getMediaTitles().forEach((titleView) -> + setVisibleAndAlpha(expandedSet, titleView.getId(), titlesVisible)); + mRecommendationViewHolder.getMediaSubtitles().forEach((subtitleView) -> + setVisibleAndAlpha(expandedSet, subtitleView.getId(), subtitlesVisible)); + + // Guts + Runnable onDismissClickedRunnable = () -> { closeGuts(); mMediaDataManagerLazy.get().dismissSmartspaceRecommendation( data.getTargetId(), MediaViewController.GUTS_ANIMATION_DURATION + 100L); @@ -1120,7 +1100,12 @@ public class MediaControlPanel { } else { mBroadcastSender.sendBroadcast(dismissIntent); } - }); + }; + bindGutsMenuCommon( + /* isDismissible= */ true, + appName.toString(), + mRecommendationViewHolder.getGutsViewHolder(), + onDismissClickedRunnable); mController = null; if (mMetadataAnimationHandler == null || !mMetadataAnimationHandler.isRunning()) { @@ -1128,6 +1113,74 @@ public class MediaControlPanel { } } + private void fetchAndUpdateRecommendationColors(Drawable appIcon) { + mBackgroundExecutor.execute(() -> { + ColorScheme colorScheme = new ColorScheme( + WallpaperColors.fromDrawable(appIcon), /* darkTheme= */ true); + mMainExecutor.execute(() -> setRecommendationColors(colorScheme)); + }); + } + + private void setRecommendationColors(ColorScheme colorScheme) { + if (mRecommendationViewHolder == null) { + return; + } + + int backgroundColor = MediaColorSchemesKt.surfaceFromScheme(colorScheme); + int textPrimaryColor = MediaColorSchemesKt.textPrimaryFromScheme(colorScheme); + int textSecondaryColor = MediaColorSchemesKt.textSecondaryFromScheme(colorScheme); + + mRecommendationViewHolder.getRecommendations() + .setBackgroundTintList(ColorStateList.valueOf(backgroundColor)); + mRecommendationViewHolder.getMediaTitles().forEach( + (title) -> title.setTextColor(textPrimaryColor)); + mRecommendationViewHolder.getMediaSubtitles().forEach( + (subtitle) -> subtitle.setTextColor(textSecondaryColor)); + + mRecommendationViewHolder.getGutsViewHolder().setColors(colorScheme); + } + + private void bindGutsMenuCommon( + boolean isDismissible, + String appName, + GutsViewHolder gutsViewHolder, + Runnable onDismissClickedRunnable) { + // Text + String text; + if (isDismissible) { + text = mContext.getString(R.string.controls_media_close_session, appName); + } else { + text = mContext.getString(R.string.controls_media_active_session); + } + gutsViewHolder.getGutsText().setText(text); + + // Dismiss button + gutsViewHolder.getDismissText().setAlpha(isDismissible ? 1 : DISABLED_ALPHA); + gutsViewHolder.getDismiss().setEnabled(isDismissible); + gutsViewHolder.getDismiss().setOnClickListener(v -> { + if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) return; + logSmartspaceCardReported(SMARTSPACE_CARD_DISMISS_EVENT); + mLogger.logLongPressDismiss(mUid, mPackageName, mInstanceId); + + onDismissClickedRunnable.run(); + }); + + // Cancel button + gutsViewHolder.getCancel().setOnClickListener(v -> { + if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { + closeGuts(); + } + }); + + // Settings button + gutsViewHolder.getSettings().setOnClickListener(v -> { + if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { + mLogger.logLongPressSettings(mUid, mPackageName, mInstanceId); + mActivityStarter.startActivity(SETTINGS_INTENT, /* dismissShade= */true); + } + }); + } + /** * Close the guts for this player. * diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt b/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt index 51755065d4b6..8c6710a6fd68 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt @@ -19,7 +19,6 @@ package com.android.systemui.media import android.media.session.MediaController import android.media.session.PlaybackState import android.os.SystemProperties -import android.util.Log import com.android.internal.annotations.VisibleForTesting import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main @@ -28,9 +27,6 @@ import com.android.systemui.util.concurrency.DelayableExecutor import java.util.concurrent.TimeUnit import javax.inject.Inject -private const val DEBUG = true -private const val TAG = "MediaTimeout" - @VisibleForTesting val PAUSED_MEDIA_TIMEOUT = SystemProperties .getLong("debug.sysui.media_timeout", TimeUnit.MINUTES.toMillis(10)) @@ -45,7 +41,8 @@ val RESUME_MEDIA_TIMEOUT = SystemProperties @SysUISingleton class MediaTimeoutListener @Inject constructor( private val mediaControllerFactory: MediaControllerFactory, - @Main private val mainExecutor: DelayableExecutor + @Main private val mainExecutor: DelayableExecutor, + private val logger: MediaTimeoutLogger ) : MediaDataManager.Listener { private val mediaListeners: MutableMap<String, PlaybackStateListener> = mutableMapOf() @@ -75,9 +72,7 @@ class MediaTimeoutListener @Inject constructor( } // If listener was destroyed previously, we'll need to re-register it - if (DEBUG) { - Log.d(TAG, "Reusing destroyed listener $key") - } + logger.logReuseListener(key) reusedListener = it } @@ -86,16 +81,12 @@ class MediaTimeoutListener @Inject constructor( val migrating = oldKey != null && key != oldKey if (migrating) { reusedListener = mediaListeners.remove(oldKey) - if (reusedListener != null) { - if (DEBUG) Log.d(TAG, "migrating key $oldKey to $key, for resumption") - } else { - Log.w(TAG, "Old key $oldKey for player $key doesn't exist. Continuing...") - } + logger.logMigrateListener(oldKey, key, reusedListener != null) } reusedListener?.let { val wasPlaying = it.playing ?: false - if (DEBUG) Log.d(TAG, "updating listener for $key, was playing? $wasPlaying") + logger.logUpdateListener(key, wasPlaying) it.mediaData = data it.key = key mediaListeners[key] = it @@ -105,7 +96,7 @@ class MediaTimeoutListener @Inject constructor( // until we're done. mainExecutor.execute { if (mediaListeners[key]?.playing == true) { - if (DEBUG) Log.d(TAG, "deliver delayed playback state for $key") + logger.logDelayedUpdate(key) timeoutCallback.invoke(key, false /* timedOut */) } } @@ -169,10 +160,7 @@ class MediaTimeoutListener @Inject constructor( } override fun onSessionDestroyed() { - if (DEBUG) { - Log.d(TAG, "Session destroyed for $key") - } - + logger.logSessionDestroyed(key) if (resumption == true) { // Some apps create a session when MBS is queried. We should unregister the // controller since it will no longer be valid, but don't cancel the timeout @@ -185,9 +173,7 @@ class MediaTimeoutListener @Inject constructor( } private fun processState(state: PlaybackState?, dispatchEvents: Boolean) { - if (DEBUG) { - Log.v(TAG, "processState $key: $state") - } + logger.logPlaybackState(key, state) val isPlaying = state != null && isPlayingState(state.state) val resumptionChanged = resumption != mediaData.resumption @@ -198,12 +184,10 @@ class MediaTimeoutListener @Inject constructor( resumption = mediaData.resumption if (!isPlaying) { - if (DEBUG) { - Log.v(TAG, "schedule timeout for $key playing $isPlaying, $resumption") - } + logger.logScheduleTimeout(key, isPlaying, resumption!!) if (cancellation != null && !resumptionChanged) { // if the media changed resume state, we'll need to adjust the timeout length - if (DEBUG) Log.d(TAG, "cancellation already exists, continuing.") + logger.logCancelIgnored(key) return } expireMediaTimeout(key, "PLAYBACK STATE CHANGED - $state, $resumption") @@ -214,9 +198,7 @@ class MediaTimeoutListener @Inject constructor( } cancellation = mainExecutor.executeDelayed({ cancellation = null - if (DEBUG) { - Log.v(TAG, "Execute timeout for $key") - } + logger.logTimeout(key) timedOut = true // this event is async, so it's safe even when `dispatchEvents` is false timeoutCallback(key, timedOut) @@ -232,9 +214,7 @@ class MediaTimeoutListener @Inject constructor( private fun expireMediaTimeout(mediaKey: String, reason: String) { cancellation?.apply { - if (DEBUG) { - Log.v(TAG, "media timeout cancelled for $mediaKey, reason: $reason") - } + logger.logTimeoutCancelled(mediaKey, reason) run() } cancellation = null diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutLogger.kt b/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutLogger.kt new file mode 100644 index 000000000000..a86515990fcb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/media/MediaTimeoutLogger.kt @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2022 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.media + +import android.media.session.PlaybackState +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.LogLevel +import com.android.systemui.log.dagger.MediaTimeoutListenerLog +import javax.inject.Inject + +private const val TAG = "MediaTimeout" + +/** + * A buffered log for [MediaTimeoutListener] events + */ +@SysUISingleton +class MediaTimeoutLogger @Inject constructor( + @MediaTimeoutListenerLog private val buffer: LogBuffer +) { + fun logReuseListener(key: String) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + }, + { + "reuse listener: $str1" + } + ) + + fun logMigrateListener(oldKey: String?, newKey: String?, hadListener: Boolean) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = oldKey + str2 = newKey + bool1 = hadListener + }, + { + "migrate from $str1 to $str2, had listener? $bool1" + } + ) + + fun logUpdateListener(key: String, wasPlaying: Boolean) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + bool1 = wasPlaying + }, + { + "updating $str1, was playing? $bool1" + } + ) + + fun logDelayedUpdate(key: String) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + }, + { + "deliver delayed playback state for $str1" + } + ) + + fun logSessionDestroyed(key: String) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + }, + { + "session destroyed $str1" + } + ) + + fun logPlaybackState(key: String, state: PlaybackState?) = buffer.log( + TAG, + LogLevel.VERBOSE, + { + str1 = key + str2 = state?.toString() + }, + { + "state update: key=$str1 state=$str2" + } + ) + + fun logScheduleTimeout(key: String, playing: Boolean, resumption: Boolean) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + bool1 = playing + bool2 = resumption + }, + { + "schedule timeout $str1, playing=$bool1 resumption=$bool2" + } + ) + + fun logCancelIgnored(key: String) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + }, + { + "cancellation already exists for $str1" + } + ) + + fun logTimeout(key: String) = buffer.log( + TAG, + LogLevel.DEBUG, + { + str1 = key + }, + { + "execute timeout for $str1" + } + ) + + fun logTimeoutCancelled(key: String, reason: String) = buffer.log( + TAG, + LogLevel.VERBOSE, + { + str1 = key + str2 = reason + }, + { + "media timeout cancelled for $str1, reason: $str2" + } + ) +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt index 327268bcbd47..1437c965512e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt @@ -261,10 +261,7 @@ class MediaViewController @Inject constructor( TYPE.PLAYER -> MediaViewHolder.controlsIds TYPE.RECOMMENDATION -> RecommendationViewHolder.controlsIds } - val gutsIds = when (type) { - TYPE.PLAYER -> MediaViewHolder.gutsIds - TYPE.RECOMMENDATION -> RecommendationViewHolder.gutsIds - } + val gutsIds = GutsViewHolder.ids controlsIds.forEach { id -> viewState.widgetStates.get(id)?.let { state -> // Make sure to use the unmodified state if guts are not visible. diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt index b8b731868e5c..5c93cdaeb0da 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt @@ -16,7 +16,6 @@ package com.android.systemui.media -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -56,13 +55,7 @@ class MediaViewHolder constructor(itemView: View) { val scrubbingTotalTimeView: TextView = itemView.requireViewById(R.id.media_scrubbing_total_time) - // Settings screen - val longPressText = itemView.requireViewById<TextView>(R.id.remove_text) - val cancel = itemView.requireViewById<View>(R.id.cancel) - val cancelText = itemView.requireViewById<TextView>(R.id.cancel_text) - val dismiss = itemView.requireViewById<ViewGroup>(R.id.dismiss) - val dismissText = itemView.requireViewById<TextView>(R.id.dismiss_text) - val settings = itemView.requireViewById<ImageButton>(R.id.settings) + val gutsViewHolder = GutsViewHolder(itemView) // Action Buttons val actionPlayPause = itemView.requireViewById<ImageButton>(R.id.actionPlayPause) @@ -79,9 +72,9 @@ class MediaViewHolder constructor(itemView: View) { init { (player.background as IlluminationDrawable).let { it.registerLightSource(seamless) - it.registerLightSource(cancel) - it.registerLightSource(dismiss) - it.registerLightSource(settings) + it.registerLightSource(gutsViewHolder.cancel) + it.registerLightSource(gutsViewHolder.dismiss) + it.registerLightSource(gutsViewHolder.settings) it.registerLightSource(actionPlayPause) it.registerLightSource(actionNext) it.registerLightSource(actionPrev) @@ -122,12 +115,7 @@ class MediaViewHolder constructor(itemView: View) { } fun marquee(start: Boolean, delay: Long) { - val longPressTextHandler = longPressText.getHandler() - if (longPressTextHandler == null) { - Log.d(TAG, "marquee while longPressText.getHandler() is null", Exception()) - return - } - longPressTextHandler.postDelayed({ longPressText.setSelected(start) }, delay) + gutsViewHolder.marquee(start, delay, TAG) } companion object { @@ -172,12 +160,7 @@ class MediaViewHolder constructor(itemView: View) { R.id.media_scrubbing_elapsed_time, R.id.media_scrubbing_total_time ) - val gutsIds = setOf( - R.id.remove_text, - R.id.cancel, - R.id.dismiss, - R.id.settings - ) + // Buttons used for notification-based actions val genericButtonIds = setOf( diff --git a/packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt index a83984036f60..52ac4e0682a3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt @@ -24,6 +24,8 @@ import android.widget.TextView import com.android.systemui.R import com.android.systemui.util.animation.TransitionLayout +private const val TAG = "RecommendationViewHolder" + /** ViewHolder for a Smartspace media recommendation. */ class RecommendationViewHolder private constructor(itemView: View) { @@ -52,26 +54,19 @@ class RecommendationViewHolder private constructor(itemView: View) { itemView.requireViewById(R.id.media_subtitle3) ) - // Settings/Guts screen - val longPressText = itemView.requireViewById<TextView>(R.id.remove_text) - val cancel = itemView.requireViewById<View>(R.id.cancel) - val dismiss = itemView.requireViewById<ViewGroup>(R.id.dismiss) - val dismissLabel = dismiss.getChildAt(0) - val settings = itemView.requireViewById<View>(R.id.settings) - val settingsText = itemView.requireViewById<TextView>(R.id.settings_text) + val gutsViewHolder = GutsViewHolder(itemView) init { (recommendations.background as IlluminationDrawable).let { background -> mediaCoverContainers.forEach { background.registerLightSource(it) } - background.registerLightSource(cancel) - background.registerLightSource(dismiss) - background.registerLightSource(dismissLabel) - background.registerLightSource(settings) + background.registerLightSource(gutsViewHolder.cancel) + background.registerLightSource(gutsViewHolder.dismiss) + background.registerLightSource(gutsViewHolder.settings) } } fun marquee(start: Boolean, delay: Long) { - longPressText.getHandler().postDelayed({ longPressText.setSelected(start) }, delay) + gutsViewHolder.marquee(start, delay, TAG) } companion object { @@ -104,14 +99,12 @@ class RecommendationViewHolder private constructor(itemView: View) { R.id.media_cover1_container, R.id.media_cover2_container, R.id.media_cover3_container, - ) - - // Res Ids for the components on the guts panel. - val gutsIds = setOf( - R.id.remove_text, - R.id.cancel, - R.id.dismiss, - R.id.settings + R.id.media_title1, + R.id.media_title2, + R.id.media_title3, + R.id.media_subtitle1, + R.id.media_subtitle2, + R.id.media_subtitle3 ) } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/media/SeekBarViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/SeekBarViewModel.kt index 193166b8d331..0359c6325749 100644 --- a/packages/SystemUI/src/com/android/systemui/media/SeekBarViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/SeekBarViewModel.kt @@ -151,13 +151,21 @@ class SeekBarViewModel @Inject constructor( } /** - * Event indicating that the user has moved the seek bar but hasn't yet finished the gesture. + * Event indicating that the user has moved the seek bar. + * * @param position Current location in the track. */ @AnyThread fun onSeekProgress(position: Long) = bgExecutor.execute { if (scrubbing) { + // The user hasn't yet finished their touch gesture, so only update the data for visual + // feedback and don't update [controller] yet. _data = _data.copy(elapsedTime = position.toInt()) + } else { + // The seek progress came from an a11y action and we should immediately update to the + // new position. (a11y actions to change the seekbar position don't trigger + // SeekBar.OnSeekBarChangeListener.onStartTrackingTouch or onStopTrackingTouch.) + onSeek(position) } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java index 72488f3dc823..357ff3834fcb 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java @@ -197,6 +197,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements private final Optional<Pip> mPipOptional; private final Optional<Recents> mRecentsOptional; private final DeviceConfigProxy mDeviceConfigProxy; + private final NavigationBarTransitions mNavigationBarTransitions; private final Optional<BackAnimation> mBackAnimation; private final Handler mHandler; private final NavigationBarOverlayController mNavbarOverlayController; @@ -329,7 +330,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public void onConnectionChanged(boolean isConnected) { mView.onOverviewProxyConnectionChange( - mOverviewProxyService.isEnabled(), mOverviewProxyService.shouldShowSwipeUpUI()); + mOverviewProxyService.isEnabled()); + mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI()); updateScreenPinningGestures(); } @@ -513,6 +515,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements InputMethodManager inputMethodManager, DeadZone deadZone, DeviceConfigProxy deviceConfigProxy, + NavigationBarTransitions navigationBarTransitions, Optional<BackAnimation> backAnimation) { super(navigationBarView); mFrame = navigationBarFrame; @@ -537,6 +540,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mRecentsOptional = recentsOptional; mDeadZone = deadZone; mDeviceConfigProxy = deviceConfigProxy; + mNavigationBarTransitions = navigationBarTransitions; mBackAnimation = backAnimation; mHandler = mainHandler; mNavbarOverlayController = navbarOverlayController; @@ -561,6 +565,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements public void onInit() { // TODO: A great deal of this code should probably live in onViewAttached. // It should also has corresponding cleanup in onViewDetached. + mView.setBarTransitions(mNavigationBarTransitions); mView.setTouchHandler(mTouchHandler); mView.setNavBarMode(mNavBarMode); mView.updateRotationButton(); @@ -632,7 +637,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mView.setOnVerticalChangedListener(this::onVerticalChanged); mView.setOnTouchListener(this::onNavigationTouch); if (mSavedState != null) { - mView.getLightTransitionsController().restoreState(mSavedState); + getBarTransitions().getLightTransitionsController().restoreState(mSavedState); } setNavigationIconHints(mNavigationIconHints); mView.setWindowVisible(isNavBarWindowVisible()); @@ -705,8 +710,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mView.getRotationButtonController(); rotationButtonController.setRotationCallback(null); mView.setUpdateActiveTouchRegionsCallback(null); - mView.getBarTransitions().destroy(); - mView.getLightTransitionsController().destroy(mContext); + getBarTransitions().destroy(); mOverviewProxyService.removeCallback(mOverviewProxyListener); mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); if (mOrientationHandle != null) { @@ -732,7 +736,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements outState.putInt(EXTRA_APPEARANCE, mAppearance); outState.putInt(EXTRA_BEHAVIOR, mBehavior); outState.putBoolean(EXTRA_TRANSIENT_STATE, mTransientShown); - mView.getLightTransitionsController().saveState(outState); + getBarTransitions().getLightTransitionsController().saveState(outState); } /** @@ -893,7 +897,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements pw.println(" mTransientShown=" + mTransientShown); pw.println(" mTransientShownFromGestureOnSystemBar=" + mTransientShownFromGestureOnSystemBar); - dumpBarTransitions(pw, "mNavigationBarView", mView.getBarTransitions()); + dumpBarTransitions(pw, "mNavigationBarView", getBarTransitions()); mView.dump(pw); } @@ -1430,7 +1434,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mLightBarController = lightBarController; if (mLightBarController != null) { mLightBarController.setNavigationBar( - mView.getLightTransitionsController()); + getBarTransitions().getLightTransitionsController()); } } @@ -1472,7 +1476,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive) .orElse(false) && mNavigationBarWindowState != WINDOW_STATE_HIDDEN; - mView.getBarTransitions().transitionTo(mTransitionMode, anim); + getBarTransitions().transitionTo(mTransitionMode, anim); } public void disableAnimationsDuringHide(long delay) { @@ -1492,11 +1496,11 @@ public class NavigationBar extends ViewController<NavigationBarView> implements } public NavigationBarTransitions getBarTransitions() { - return mView.getBarTransitions(); + return mNavigationBarTransitions; } public void finishBarAnimations() { - mView.getBarTransitions().finishAnimations(); + getBarTransitions().finishAnimations(); } private WindowManager.LayoutParams getBarLayoutParams(int rotation) { @@ -1654,6 +1658,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements } if (mView != null) { mView.setNavBarMode(mode); + mView.setShouldShowSwipeUpUi(mOverviewProxyService.shouldShowSwipeUpUI()); } } }; diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java index 58e07db09c62..11a4b3bd9274 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java @@ -29,19 +29,20 @@ import android.view.IWallpaperVisibilityListener; import android.view.IWindowManager; import android.view.View; -import com.android.systemui.Dependency; import com.android.systemui.R; +import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope; import com.android.systemui.navigationbar.buttons.ButtonDispatcher; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.BarTransitions; import com.android.systemui.statusbar.phone.LightBarTransitionsController; -import com.android.systemui.statusbar.policy.KeyguardStateController; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + +/** */ +@NavigationBarScope public final class NavigationBarTransitions extends BarTransitions implements LightBarTransitionsController.DarkIntensityApplier { @@ -60,6 +61,8 @@ public final class NavigationBarTransitions extends BarTransitions implements } private final NavigationBarView mView; + @org.jetbrains.annotations.NotNull + private final IWindowManager mWindowManagerService; private final LightBarTransitionsController mLightTransitionsController; private final boolean mAllowAutoDimWallpaperNotVisible; private boolean mWallpaperVisible; @@ -81,22 +84,21 @@ public final class NavigationBarTransitions extends BarTransitions implements } }; - public NavigationBarTransitions(NavigationBarView view, CommandQueue commandQueue) { + @Inject + public NavigationBarTransitions( + NavigationBarView view, + IWindowManager windowManagerService, + LightBarTransitionsController.Factory lightBarTransitionsControllerFactory) { super(view, R.drawable.nav_background); mView = view; - mLightTransitionsController = new LightBarTransitionsController( - view.getContext(), - this, - commandQueue, - Dependency.get(KeyguardStateController.class), - Dependency.get(StatusBarStateController.class)); + mWindowManagerService = windowManagerService; + mLightTransitionsController = lightBarTransitionsControllerFactory.create(this); mAllowAutoDimWallpaperNotVisible = view.getContext().getResources() .getBoolean(R.bool.config_navigation_bar_enable_auto_dim_no_visible_wallpaper); mDarkIntensityListeners = new ArrayList(); - IWindowManager windowManagerService = Dependency.get(IWindowManager.class); try { - mWallpaperVisible = windowManagerService.registerWallpaperVisibilityListener( + mWallpaperVisible = mWindowManagerService.registerWallpaperVisibilityListener( mWallpaperVisibilityListener, Display.DEFAULT_DISPLAY); } catch (RemoteException e) { } @@ -121,12 +123,12 @@ public final class NavigationBarTransitions extends BarTransitions implements @Override public void destroy() { - IWindowManager windowManagerService = Dependency.get(IWindowManager.class); try { - windowManagerService.unregisterWallpaperVisibilityListener(mWallpaperVisibilityListener, + mWindowManagerService.unregisterWallpaperVisibilityListener(mWallpaperVisibilityListener, Display.DEFAULT_DISPLAY); } catch (RemoteException e) { } + mLightTransitionsController.destroy(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index abff914693d4..f3a3f1018a9f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -85,7 +85,6 @@ import com.android.systemui.shared.rotation.RotationButtonController; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.WindowManagerWrapper; -import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.LightBarTransitionsController; @@ -140,7 +139,7 @@ public class NavigationBarView extends FrameLayout { private EdgeBackGestureHandler mEdgeBackGestureHandler; private final DeadZone mDeadZone; private boolean mDeadZoneConsuming = false; - private final NavigationBarTransitions mBarTransitions; + private NavigationBarTransitions mBarTransitions; @Nullable private AutoHideController mAutoHideController; @@ -370,7 +369,6 @@ public class NavigationBarView extends FrameLayout { mConfiguration.updateFrom(context.getResources().getConfiguration()); mScreenPinningNotify = new ScreenPinningNotify(mContext); - mBarTransitions = new NavigationBarTransitions(this, Dependency.get(CommandQueue.class)); mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back)); mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home)); @@ -418,12 +416,12 @@ public class NavigationBarView extends FrameLayout { } } - public void setAutoHideController(AutoHideController autoHideController) { - mAutoHideController = autoHideController; + void setBarTransitions(NavigationBarTransitions navigationBarTransitions) { + mBarTransitions = navigationBarTransitions; } - public NavigationBarTransitions getBarTransitions() { - return mBarTransitions; + public void setAutoHideController(AutoHideController autoHideController) { + mAutoHideController = autoHideController; } public LightBarTransitionsController getLightTransitionsController() { @@ -888,8 +886,11 @@ public class NavigationBarView extends FrameLayout { } } - void onOverviewProxyConnectionChange(boolean enabled, boolean showSwipeUpUi) { + void onOverviewProxyConnectionChange(boolean enabled) { mOverviewProxyEnabled = enabled; + } + + void setShouldShowSwipeUpUi(boolean showSwipeUpUi) { mShowSwipeUpUi = showSwipeUpUi; updateStates(); } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java index cdc6b3b89f0c..363baaa5ef70 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java @@ -264,7 +264,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, mWindowContext = null; } mAutoHideController.setNavigationBar(null); - mLightBarTransitionsController.destroy(mContext); + mLightBarTransitionsController.destroy(); mLightBarController.setNavigationBar(null); mPipOptional.ifPresent(this::removePipExclusionBoundsChangeListener); mInitialized = false; diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index 34f771ce0431..ce50ddff7b0f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -39,6 +39,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { private static final boolean DEBUG = false; private static final String CURRENT_PAGE = "current_page"; + private static final int NO_PAGE = -1; private static final String TAG = "PagedTileLayout"; private static final int REVEAL_SCROLL_DURATION_MILLIS = 750; @@ -109,13 +110,14 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { } public void saveInstanceState(Bundle outState) { - outState.putInt(CURRENT_PAGE, getCurrentItem()); + int resolvedPage = mPageToRestore != NO_PAGE ? mPageToRestore : getCurrentPageNumber(); + outState.putInt(CURRENT_PAGE, resolvedPage); } public void restoreInstanceState(Bundle savedInstanceState) { // There's only 1 page at this point. We want to restore the correct page once the // pages have been inflated - mPageToRestore = savedInstanceState.getInt(CURRENT_PAGE, -1); + mPageToRestore = savedInstanceState.getInt(CURRENT_PAGE, NO_PAGE); } @Override @@ -151,12 +153,15 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { @Override public void onRtlPropertiesChanged(int layoutDirection) { + // The configuration change will change the flag in the view (that's returned in + // isLayoutRtl). As we detect the change, we use the cached direction to store the page + // before setting it. + final int page = getPageNumberForDirection(mLayoutDirection == LAYOUT_DIRECTION_RTL); super.onRtlPropertiesChanged(layoutDirection); if (mLayoutDirection != layoutDirection) { mLayoutDirection = layoutDirection; setAdapter(mAdapter); - setCurrentItem(0, false); - mPageToRestore = 0; + setCurrentItem(page, false); } } @@ -172,8 +177,12 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { * Obtains the current page number respecting RTL */ private int getCurrentPageNumber() { + return getPageNumberForDirection(isLayoutRtl()); + } + + private int getPageNumberForDirection(boolean isLayoutRTL) { int page = getCurrentItem(); - if (mLayoutDirection == LAYOUT_DIRECTION_RTL) { + if (isLayoutRTL) { page = mPages.size() - 1 - page; } return page; @@ -388,9 +397,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { mPageIndicator.setNumPages(mPages.size()); setAdapter(mAdapter); mAdapter.notifyDataSetChanged(); - if (mPageToRestore != -1) { + if (mPageToRestore != NO_PAGE) { setCurrentItem(mPageToRestore, false); - mPageToRestore = -1; + mPageToRestore = NO_PAGE; } } @@ -479,9 +488,27 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { maxHeight = height; } } + if (mPages.get(0).getParent() == null) { + // Measure page 0 so we know how tall it is if it's not attached to the pager. + mPages.get(0).measure(widthMeasureSpec, heightMeasureSpec); + int height = mPages.get(0).getMeasuredHeight(); + if (height > maxHeight) { + maxHeight = height; + } + } setMeasuredDimension(getMeasuredWidth(), maxHeight + getPaddingBottom()); } + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + super.onLayout(changed, l, t, r, b); + if (mPages.get(0).getParent() == null) { + // Layout page 0, so we can get the bottom of the tiles. We only do this if the page + // is not attached. + mPages.get(0).layout(l, t, r, b); + } + } + public int getColumnCount() { if (mPages.size() == 0) return 0; return mPages.get(0).mColumns; @@ -625,8 +652,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { if (mPageIndicator == null) return; if (mPageListener != null) { int pageNumber = isLayoutRtl() ? mPages.size() - 1 - position : position; - mPageListener.onPageChanged(isLayoutRtl() ? position == mPages.size() - 1 - : position == 0, pageNumber); + mPageListener.onPageChanged(pageNumber == 0, pageNumber); } } @@ -645,8 +671,8 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { mPageIndicator.setLocation(mPageIndicatorPosition); if (mPageListener != null) { int pageNumber = isLayoutRtl() ? mPages.size() - 1 - position : position; - mPageListener.onPageChanged(positionOffsetPixels == 0 && - (isLayoutRtl() ? position == mPages.size() - 1 : position == 0), + mPageListener.onPageChanged( + positionOffsetPixels == 0 && pageNumber == 0, // Send only valid page number on integer pages positionOffsetPixels == 0 ? pageNumber : PageListener.INVALID_PAGE ); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 8ca095d9a609..6eb54f799a24 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -24,7 +24,6 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.net.Network; import android.net.NetworkCapabilities; -import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; import android.telephony.ServiceState; @@ -90,8 +89,6 @@ public class InternetDialog extends SystemUIDialog implements @VisibleForTesting protected InternetAdapter mAdapter; @VisibleForTesting - protected WifiManager mWifiManager; - @VisibleForTesting protected View mDialogView; @VisibleForTesting protected boolean mCanConfigWifi; @@ -179,7 +176,6 @@ public class InternetDialog extends SystemUIDialog implements mSubscriptionManager = mInternetDialogController.getSubscriptionManager(); mDefaultDataSubId = mInternetDialogController.getDefaultDataSubscriptionId(); mTelephonyManager = mInternetDialogController.getTelephonyManager(); - mWifiManager = mInternetDialogController.getWifiManager(); mCanConfigMobileData = canConfigMobileData; mCanConfigWifi = canConfigWifi; mCanChangeWifiState = WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(context); @@ -332,7 +328,7 @@ public class InternetDialog extends SystemUIDialog implements showProgressBar(); final boolean isDeviceLocked = mInternetDialogController.isDeviceLocked(); - final boolean isWifiEnabled = mWifiManager != null && mWifiManager.isWifiEnabled(); + final boolean isWifiEnabled = mInternetDialogController.isWifiEnabled(); final boolean isWifiScanEnabled = mInternetDialogController.isWifiScanEnabled(); updateWifiToggle(isWifiEnabled, isDeviceLocked); updateConnectedWifi(isWifiEnabled, isDeviceLocked); @@ -362,9 +358,8 @@ public class InternetDialog extends SystemUIDialog implements mSeeAllLayout.setOnClickListener(this::onClickSeeMoreButton); mWiFiToggle.setOnCheckedChangeListener( (buttonView, isChecked) -> { - if (mWifiManager == null) return; - buttonView.setChecked(isChecked); - mWifiManager.setWifiEnabled(isChecked); + if (mInternetDialogController.isWifiEnabled() == isChecked) return; + mInternetDialogController.setWifiEnabled(isChecked); }); mDoneButton.setOnClickListener(v -> dismiss()); mAirplaneModeButton.setOnClickListener(v -> { @@ -388,7 +383,7 @@ public class InternetDialog extends SystemUIDialog implements Log.d(TAG, "setMobileDataLayout, isCarrierNetworkActive = " + isCarrierNetworkActive); } - boolean isWifiEnabled = mWifiManager != null && mWifiManager.isWifiEnabled(); + boolean isWifiEnabled = mInternetDialogController.isWifiEnabled(); if (!mInternetDialogController.hasActiveSubId() && (!isWifiEnabled || !isCarrierNetworkActive)) { mMobileNetworkLayout.setVisibility(View.GONE); @@ -444,7 +439,9 @@ public class InternetDialog extends SystemUIDialog implements @MainThread private void updateWifiToggle(boolean isWifiEnabled, boolean isDeviceLocked) { - mWiFiToggle.setChecked(isWifiEnabled); + if (mWiFiToggle.isChecked() != isWifiEnabled) { + mWiFiToggle.setChecked(isWifiEnabled); + } if (isDeviceLocked) { mWifiToggleTitleText.setTextAppearance((mConnectedWifiEntry != null) ? R.style.TextAppearance_InternetDialog_Active @@ -572,7 +569,7 @@ public class InternetDialog extends SystemUIDialog implements } protected void showProgressBar() { - if (mWifiManager == null || !mWifiManager.isWifiEnabled() + if (!mInternetDialogController.isWifiEnabled() || mInternetDialogController.isDeviceLocked()) { setProgressBarVisible(false); return; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index d97ce7757d8c..90a3d4586fd3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -22,6 +22,7 @@ import static com.android.wifitrackerlib.WifiEntry.CONNECTED_STATE_CONNECTED; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; +import android.annotation.AnyThread; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -157,6 +158,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi private LocationController mLocationController; private DialogLaunchAnimator mDialogLaunchAnimator; private boolean mHasWifiEntries; + private WifiStateWorker mWifiStateWorker; @VisibleForTesting static final float TOAST_PARAMS_HORIZONTAL_WEIGHT = 1.0f; @@ -210,7 +212,9 @@ public class InternetDialogController implements AccessPointController.AccessPoi @Background Handler workerHandler, CarrierConfigTracker carrierConfigTracker, LocationController locationController, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogLaunchAnimator dialogLaunchAnimator, + WifiStateWorker wifiStateWorker + ) { if (DEBUG) { Log.d(TAG, "Init InternetDialogController"); } @@ -241,6 +245,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi mLocationController = locationController; mDialogLaunchAnimator = dialogLaunchAnimator; mConnectedWifiInternetMonitor = new ConnectedWifiInternetMonitor(); + mWifiStateWorker = wifiStateWorker; } void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) { @@ -323,7 +328,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi @Nullable CharSequence getSubtitleText(boolean isProgressBarVisible) { - if (mCanConfigWifi && !mWifiManager.isWifiEnabled()) { + if (mCanConfigWifi && !isWifiEnabled()) { // When Wi-Fi is disabled. // Sub-Title: Wi-Fi is off if (DEBUG) { @@ -648,6 +653,27 @@ public class InternetDialogController implements AccessPointController.AccessPoi startActivity(intent, view); } + /** + * Enable or disable Wi-Fi. + * + * @param enabled {@code true} to enable, {@code false} to disable. + */ + @AnyThread + public void setWifiEnabled(boolean enabled) { + mWifiStateWorker.setWifiEnabled(enabled); + } + + /** + * Return whether Wi-Fi is enabled or disabled. + * + * @return {@code true} if Wi-Fi is enabled or enabling + * @see WifiManager#getWifiState() + */ + @AnyThread + public boolean isWifiEnabled() { + return mWifiStateWorker.isWifiEnabled(); + } + void connectCarrierNetwork() { final MergedCarrierEntry mergedCarrierEntry = mAccessPointController.getMergedCarrierEntry(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/WifiStateWorker.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/WifiStateWorker.java new file mode 100644 index 000000000000..a7ea50e5e6dd --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/WifiStateWorker.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2022 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.qs.tiles.dialog; + +import static android.net.wifi.WifiManager.EXTRA_WIFI_STATE; +import static android.net.wifi.WifiManager.WIFI_STATE_CHANGED_ACTION; +import static android.net.wifi.WifiManager.WIFI_STATE_DISABLED; +import static android.net.wifi.WifiManager.WIFI_STATE_DISABLING; +import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED; +import static android.net.wifi.WifiManager.WIFI_STATE_ENABLING; +import static android.net.wifi.WifiManager.WIFI_STATE_UNKNOWN; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.net.wifi.WifiManager; +import android.util.Log; + +import androidx.annotation.AnyThread; +import androidx.annotation.Nullable; + +import com.android.systemui.broadcast.BroadcastDispatcher; +import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Background; +import com.android.systemui.util.concurrency.DelayableExecutor; + +import javax.inject.Inject; + +/** + * Worker for the Wi-Fi enabled state cache. + */ +@SysUISingleton +public class WifiStateWorker extends BroadcastReceiver { + + private static final String TAG = "WifiStateWorker"; + + private DelayableExecutor mBackgroundExecutor; + private WifiManager mWifiManager; + private int mWifiState = WIFI_STATE_DISABLED; + + @Inject + public WifiStateWorker( + BroadcastDispatcher broadcastDispatcher, + @Background DelayableExecutor backgroundExecutor, + @Nullable WifiManager wifiManager) { + mWifiManager = wifiManager; + mBackgroundExecutor = backgroundExecutor; + + broadcastDispatcher.registerReceiver(this, new IntentFilter(WIFI_STATE_CHANGED_ACTION)); + mBackgroundExecutor.execute(() -> { + if (mWifiManager == null) return; + + mWifiState = mWifiManager.getWifiState(); + Log.i(TAG, "WifiManager.getWifiState():" + mWifiState); + }); + } + + /** + * Enable or disable Wi-Fi. + * + * @param enabled {@code true} to enable, {@code false} to disable. + */ + @AnyThread + public void setWifiEnabled(boolean enabled) { + mBackgroundExecutor.execute(() -> { + if (mWifiManager == null) return; + + mWifiState = (enabled) ? WIFI_STATE_ENABLING : WIFI_STATE_DISABLING; + if (!mWifiManager.setWifiEnabled(enabled)) { + Log.e(TAG, "Failed to WifiManager.setWifiEnabled(" + enabled + ");"); + } + }); + } + + /** + * Gets the Wi-Fi enabled state. + * + * @return One of {@link WifiManager#WIFI_STATE_DISABLED}, + * {@link WifiManager#WIFI_STATE_DISABLING}, {@link WifiManager#WIFI_STATE_ENABLED}, + * {@link WifiManager#WIFI_STATE_ENABLING} + */ + @AnyThread + public int getWifiState() { + return mWifiState; + } + + /** + * Return whether Wi-Fi is enabled or disabled. + * + * @return {@code true} if Wi-Fi is enabled or enabling + * @see WifiManager#getWifiState() + */ + @AnyThread + public boolean isWifiEnabled() { + return (mWifiState == WIFI_STATE_ENABLED || mWifiState == WIFI_STATE_ENABLING); + } + + @Override + public void onReceive(Context context, Intent intent) { + if (intent == null) return; + + if (WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) { + final int wifiState = intent.getIntExtra(EXTRA_WIFI_STATE, WIFI_STATE_DISABLED); + if (wifiState == WIFI_STATE_UNKNOWN) return; + + mWifiState = wifiState; + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt index 270bdc785178..0a616c095551 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt @@ -17,6 +17,7 @@ import android.util.MathUtils.lerp import android.view.View import com.android.systemui.animation.Interpolators import com.android.systemui.statusbar.LightRevealEffect.Companion.getPercentPastThreshold +import com.android.systemui.util.getColorWithAlpha import java.util.function.Consumer /** @@ -367,7 +368,7 @@ class LightRevealScrim(context: Context?, attrs: AttributeSet?) : View(context, } if (startColorAlpha > 0f) { - canvas.drawColor(updateColorAlpha(revealGradientEndColor, startColorAlpha)) + canvas.drawColor(getColorWithAlpha(revealGradientEndColor, startColorAlpha)) } with(shaderGradientMatrix) { @@ -383,15 +384,7 @@ class LightRevealScrim(context: Context?, attrs: AttributeSet?) : View(context, private fun setPaintColorFilter() { gradientPaint.colorFilter = PorterDuffColorFilter( - updateColorAlpha(revealGradientEndColor, revealGradientEndColorAlpha), + getColorWithAlpha(revealGradientEndColor, revealGradientEndColorAlpha), PorterDuff.Mode.MULTIPLY) } - - private fun updateColorAlpha(color: Int, alpha: Float): Int = - Color.argb( - (alpha * 255).toInt(), - Color.red(color), - Color.green(color), - Color.blue(color) - ) }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt index 6ef938285263..f6c4a316b211 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -42,6 +42,7 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.ScrimController +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController @@ -340,7 +341,9 @@ class NotificationShadeDepthController @Inject constructor( /** * Update blurs when pulling down the shade */ - override fun onPanelExpansionChanged(rawFraction: Float, expanded: Boolean, tracking: Boolean) { + override fun onPanelExpansionChanged(event: PanelExpansionChangeEvent) { + val rawFraction = event.fraction + val tracking = event.tracking val timestamp = SystemClock.elapsedRealtimeNanos() val expansion = MathUtils.saturate( (rawFraction - panelPullDownMinFraction) / (1f - panelPullDownMinFraction)) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt index 74aedb23bf5f..a8d685229b32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt @@ -28,6 +28,7 @@ import com.android.systemui.statusbar.notification.stack.StackStateAnimator import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.KeyguardBypassController import com.android.systemui.statusbar.phone.ScreenOffAnimationController +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener import com.android.systemui.statusbar.policy.HeadsUpManager import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener @@ -292,8 +293,8 @@ class NotificationWakeUpCoordinator @Inject constructor( this.state = newState } - override fun onPanelExpansionChanged(fraction: Float, expanded: Boolean, tracking: Boolean) { - val collapsedEnough = fraction <= 0.9f + override fun onPanelExpansionChanged(event: PanelExpansionChangeEvent) { + val collapsedEnough = event.fraction <= 0.9f if (collapsedEnough != this.collapsedEnoughToHide) { val couldShowPulsingHuns = canShowPulsingHuns this.collapsedEnoughToHide = collapsedEnough diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index cf3783e05384..36cd173d2d1c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -85,8 +85,8 @@ import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.NotificationShelfController; import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.notification.LaunchAnimationParameters; import com.android.systemui.statusbar.notification.FakeShadowView; +import com.android.systemui.statusbar.notification.LaunchAnimationParameters; import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorController; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.ShadeViewRefactor; @@ -415,6 +415,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable private boolean mForwardScrollable; private boolean mBackwardScrollable; private NotificationShelf mShelf; + /** + * Limits the number of visible notifications. The remaining are collapsed in the notification + * shelf. -1 when there is no limit. + */ private int mMaxDisplayedNotifications = -1; private float mKeyguardBottomPadding = -1; @VisibleForTesting int mStatusBarHeight; @@ -1323,7 +1327,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } private float updateStackEndHeight(float height, float bottomMargin, float topPadding) { - final float stackEndHeight = Math.max(0f, height - bottomMargin - topPadding); + final float stackEndHeight; + if (mMaxDisplayedNotifications != -1) { + // The stack intrinsic height already contains the correct value when there is a limit + // in the max number of notifications (e.g. as in keyguard). + stackEndHeight = mIntrinsicContentHeight; + } else { + stackEndHeight = Math.max(0f, height - bottomMargin - topPadding); + } mAmbientState.setStackEndHeight(stackEndHeight); return stackEndHeight; } @@ -3615,7 +3626,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable @ShadeViewRefactor(RefactorComponent.INPUT) protected boolean isInsideQsHeader(MotionEvent ev) { mQsHeader.getBoundsOnScreen(mQsHeaderBound); - return mQsHeaderBound.contains((int) ev.getX(), (int) ev.getY()); + return mQsHeaderBound.contains((int) ev.getRawX(), (int) ev.getRawY()); } @ShadeViewRefactor(RefactorComponent.INPUT) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index ae1fd2b180e5..c2750c2d2a6f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -1207,7 +1207,7 @@ public class NotificationStackScrollLayoutController { */ public void updateShowEmptyShadeView() { Trace.beginSection("NSSLC.updateShowEmptyShadeView"); - mShowEmptyShadeView = mBarState != KEYGUARD + mShowEmptyShadeView = mStatusBarStateController.getCurrentOrUpcomingState() != KEYGUARD && !mView.isQsFullScreen() && getVisibleNotificationCount() == 0; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 5e81b5da2455..83017c41629c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -110,6 +110,7 @@ import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.view.accessibility.AccessibilityManager; import android.widget.DateTimeView; +import android.window.SplashScreen; import androidx.annotation.NonNull; import androidx.lifecycle.Lifecycle; @@ -225,6 +226,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent; import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneModule; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BrightnessMirrorController; @@ -1417,7 +1419,9 @@ public class CentralSurfaces extends CoreStartable implements } } - private void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking) { + private void onPanelExpansionChanged(PanelExpansionChangeEvent event) { + float fraction = event.getFraction(); + boolean tracking = event.getTracking(); dispatchPanelExpansionForKeyguardDismiss(fraction, tracking); if (fraction == 0 || fraction == 1) { @@ -1744,6 +1748,23 @@ public class CentralSurfaces extends CoreStartable implements } @Override + public void onLaunchAnimationStart(boolean isExpandingFullyAbove) { + super.onLaunchAnimationStart(isExpandingFullyAbove); + + // Double check that the keyguard is still showing and not going away, but if so + // set the keyguard occluded. Typically, WM will let KeyguardViewMediator know + // directly, but we're overriding that to play the custom launch animation, so + // we need to take care of that here. The unocclude animation is not overridden, + // so WM will call KeyguardViewMediator's unocclude animation runner when the + // activity is exited. + if (mKeyguardStateController.isShowing() + && !mKeyguardStateController.isKeyguardGoingAway()) { + mKeyguardViewMediator.setOccluded(true /* isOccluded */, + true /* animate */); + } + } + + @Override public void onLaunchAnimationEnd(boolean isExpandingFullyAbove) { // Set mIsLaunchingActivityOverLockscreen to false before actually finishing the // animation so that we can assume that mIsLaunchingActivityOverLockscreen @@ -4096,6 +4117,7 @@ public class CentralSurfaces extends CoreStartable implements } else { options = ActivityOptions.makeBasic(); } + options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR); return options; } @@ -4509,9 +4531,12 @@ public class CentralSurfaces extends CoreStartable implements * @return UserHandle */ private UserHandle getActivityUserHandle(Intent intent) { - if (intent.getComponent() != null - && mContext.getPackageName().equals(intent.getComponent().getPackageName())) { - return new UserHandle(UserHandle.myUserId()); + String[] packages = mContext.getResources().getStringArray(R.array.system_ui_packages); + for (String pkg : packages) { + if (intent.getComponent() == null) break; + if (pkg.equals(intent.getComponent().getPackageName())) { + return new UserHandle(UserHandle.myUserId()); + } } return UserHandle.CURRENT; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java index b6ad9f704bcd..16fddb420fc4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java @@ -93,7 +93,8 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, mDisplayId = mContext.getDisplayId(); } - public void destroy(Context context) { + /** Call to cleanup the LightBarTransitionsController when done with it. */ + public void destroy() { mCommandQueue.removeCallback(this); mStatusBarStateController.removeCallback(this); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 29fdfdb65be2..0b46f07f8e8b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -1233,6 +1233,11 @@ public class NotificationPanelViewController extends PanelViewController { mKeyguardBottomArea.initQRCodeScanner(mQRCodeScannerController); } + @VisibleForTesting + void setMaxDisplayedNotifications(int maxAllowed) { + mMaxAllowedKeyguardNotifications = maxAllowed; + } + private void updateMaxDisplayedNotifications(boolean recompute) { if (recompute) { mMaxAllowedKeyguardNotifications = Math.max(computeMaxKeyguardNotifications(), 1); @@ -1463,7 +1468,11 @@ public class NotificationPanelViewController extends PanelViewController { /** * @return the maximum keyguard notifications that can fit on the screen */ - private int computeMaxKeyguardNotifications() { + @VisibleForTesting + int computeMaxKeyguardNotifications() { + if (mAmbientState.getFractionToShade() > 0 || mAmbientState.getDozeAmount() > 0) { + return mMaxAllowedKeyguardNotifications; + } float topPadding = mNotificationStackScrollLayoutController.getTopPadding(); float shelfIntrinsicHeight = mNotificationShelfController.getVisibility() == View.GONE @@ -1735,6 +1744,11 @@ public class NotificationPanelViewController extends PanelViewController { return false; } + @VisibleForTesting + boolean isQsTracking() { + return mQsTracking; + } + @Override protected boolean isInContentBounds(float x, float y) { float stackScrollerX = mNotificationStackScrollLayoutController.getX(); @@ -2812,16 +2826,16 @@ public class NotificationPanelViewController extends PanelViewController { private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) { if (!isQsExpansionEnabled() || mCollapsedOnDown || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled()) - || (mKeyguardShowing && mShouldUseSplitNotificationShade)) { + || mShouldUseSplitNotificationShade) { return false; } View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader(); - + int frameTop = mKeyguardShowing || mQs == null ? 0 : mQsFrame.getTop(); mQsInterceptRegion.set( /* left= */ (int) mQsFrame.getX(), - /* top= */ header.getTop(), + /* top= */ header.getTop() + frameTop, /* right= */ (int) mQsFrame.getX() + mQsFrame.getWidth(), - /* bottom= */ header.getBottom()); + /* bottom= */ header.getBottom() + frameTop); // Also allow QS to intercept if the touch is near the notch. mStatusBarTouchableRegionManager.updateRegionForNotch(mQsInterceptRegion); final boolean onHeader = mQsInterceptRegion.contains((int) x, (int) y); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index 4ba8441fc9a6..9e707644782c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -120,6 +120,7 @@ public abstract class PanelViewController { private float mInitialOffsetOnTouch; private boolean mCollapsedAndHeadsUpOnDown; private float mExpandedFraction = 0; + private float mExpansionDragDownAmountPx = 0; protected float mExpandedHeight = 0; private boolean mPanelClosedOnDown; private boolean mHasLayoutedSinceDown; @@ -793,6 +794,7 @@ public abstract class PanelViewController { mHeightAnimator.end(); } } + mExpansionDragDownAmountPx = h; mExpandedFraction = Math.min(1f, maxPanelHeight == 0 ? 0 : mExpandedHeight / maxPanelHeight); mAmbientState.setExpansionFraction(mExpandedFraction); @@ -1109,7 +1111,7 @@ public abstract class PanelViewController { */ public void updatePanelExpansionAndVisibility() { mPanelExpansionStateManager.onPanelExpansionChanged( - mExpandedFraction, isExpanded(), mTracking); + mExpandedFraction, isExpanded(), mTracking, mExpansionDragDownAmountPx); updateVisibility(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 35aee6645289..f9e17da9773f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -306,7 +306,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump } }); panelExpansionStateManager.addExpansionListener( - (fraction, expanded, tracking) -> setRawPanelExpansionFraction(fraction) + event -> setRawPanelExpansionFraction(event.getFraction()) ); mColors = new GradientColors(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index dd166dd3610e..639be24ac46e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -65,6 +65,7 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.notification.ViewGroupFadeHelper; import com.android.systemui.statusbar.phone.KeyguardBouncer.BouncerExpansionCallback; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -353,7 +354,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } @Override - public void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking) { + public void onPanelExpansionChanged(PanelExpansionChangeEvent event) { + float fraction = event.getFraction(); + boolean tracking = event.getTracking(); // Avoid having the shade and the bouncer open at the same time over a dream. final boolean hideBouncerOverDream = mDreamOverlayStateController.isOverlayActive() @@ -387,6 +390,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb && !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) { mBouncer.show(false /* resetSecuritySelection */, false /* scrimmed */); } + } else if (!mShowing && mBouncer.inTransit()) { + // Keyguard is not visible anymore, but expansion animation was still running. + // We need to keep propagating the expansion state to the bouncer, otherwise it will be + // stuck in transit. + mBouncer.setExpansion(fraction); } else if (mPulsing && fraction == KeyguardBouncer.EXPANSION_VISIBLE) { // Panel expanded while pulsing but didn't translate the bouncer (because we are // unlocked.) Let's simply wake-up to dismiss the lock screen. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionChangeEvent.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionChangeEvent.kt new file mode 100644 index 000000000000..c0384b444511 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionChangeEvent.kt @@ -0,0 +1,14 @@ +package com.android.systemui.statusbar.phone.panelstate + +import android.annotation.FloatRange + +data class PanelExpansionChangeEvent( + /** 0 when collapsed, 1 when fully expanded. */ + @FloatRange(from = 0.0, to = 1.0) val fraction: Float, + /** Whether the panel should be considered expanded */ + val expanded: Boolean, + /** Whether the user is actively dragging the panel. */ + val tracking: Boolean, + /** The amount of pixels that the user has dragged during the expansion. */ + val dragDownPxAmount: Float +) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionListener.kt index b9f806d201b7..d0038243122b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionListener.kt @@ -13,19 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.systemui.statusbar.phone.panelstate; +package com.android.systemui.statusbar.phone.panelstate /** A listener interface to be notified of expansion events for the notification panel. */ -public interface PanelExpansionListener { +fun interface PanelExpansionListener { /** - * Invoked whenever the notification panel expansion changes, at every animation frame. - * This is the main expansion that happens when the user is swiping up to dismiss the - * lock screen and swiping to pull down the notification shade. - * - * @param fraction 0 when collapsed, 1 when fully expanded. - * @param expanded true if the panel should be considered expanded. - * @param tracking {@code true} when the user is actively dragging the panel. + * Invoked whenever the notification panel expansion changes, at every animation frame. This is + * the main expansion that happens when the user is swiping up to dismiss the lock screen and + * swiping to pull down the notification shade. */ - void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking); + fun onPanelExpansionChanged(event: PanelExpansionChangeEvent) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt index 2c7c8e113fc5..911e750f666e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManager.kt @@ -37,6 +37,7 @@ class PanelExpansionStateManager @Inject constructor() { @FloatRange(from = 0.0, to = 1.0) private var fraction: Float = 0f private var expanded: Boolean = false private var tracking: Boolean = false + private var dragDownPxAmount: Float = 0f /** * Adds a listener that will be notified when the panel expansion fraction has changed. @@ -45,7 +46,8 @@ class PanelExpansionStateManager @Inject constructor() { */ fun addExpansionListener(listener: PanelExpansionListener) { expansionListeners.add(listener) - listener.onPanelExpansionChanged(fraction, expanded, tracking) + listener.onPanelExpansionChanged( + PanelExpansionChangeEvent(fraction, expanded, tracking, dragDownPxAmount)) } /** Removes an expansion listener. */ @@ -77,7 +79,8 @@ class PanelExpansionStateManager @Inject constructor() { fun onPanelExpansionChanged( @FloatRange(from = 0.0, to = 1.0) fraction: Float, expanded: Boolean, - tracking: Boolean + tracking: Boolean, + dragDownPxAmount: Float ) { require(!fraction.isNaN()) { "fraction cannot be NaN" } val oldState = state @@ -85,6 +88,7 @@ class PanelExpansionStateManager @Inject constructor() { this.fraction = fraction this.expanded = expanded this.tracking = tracking + this.dragDownPxAmount = dragDownPxAmount var fullyClosed = true var fullyOpened = false @@ -110,14 +114,17 @@ class PanelExpansionStateManager @Inject constructor() { "f=$fraction " + "expanded=$expanded " + "tracking=$tracking" + + "drawDownPxAmount=$dragDownPxAmount " + "${if (fullyOpened) " fullyOpened" else ""} " + if (fullyClosed) " fullyClosed" else "" ) - expansionListeners.forEach { it.onPanelExpansionChanged(fraction, expanded, tracking) } + val expansionChangeEvent = + PanelExpansionChangeEvent(fraction, expanded, tracking, dragDownPxAmount) + expansionListeners.forEach { it.onPanelExpansionChanged(expansionChangeEvent) } } - /** Updates the panel state if necessary. */ + /** Updates the panel state if necessary. */ fun updateState(@PanelState state: Int) { debugLog("update state: ${this.state.stateToString()} -> ${state.stateToString()}") if (this.state != state) { @@ -137,7 +144,7 @@ class PanelExpansionStateManager @Inject constructor() { } } -/** Enum for the current state of the panel. */ +/** Enum for the current state of the panel. */ @Retention(AnnotationRetention.SOURCE) @IntDef(value = [STATE_CLOSED, STATE_OPENING, STATE_OPEN]) internal annotation class PanelState diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java index 050b67016d09..233778dbfeb6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.policy; +import android.app.IActivityTaskManager; + import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.policy.KeyguardStateController.Callback; @@ -234,6 +236,12 @@ public interface KeyguardStateController extends CallbackController<Callback> { default void onKeyguardFadingAwayChanged() {} /** + * We've called {@link IActivityTaskManager#keyguardGoingAway}, which initiates the unlock + * sequence. + */ + default void onKeyguardGoingAwayChanged() {} + + /** * Triggered when the keyguard dismiss amount has changed, via either a swipe gesture or an * animation. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index 2f565765158c..be5da377e496 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -323,6 +323,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardGoingAway", keyguardGoingAway ? 1 : 0); mKeyguardGoingAway = keyguardGoingAway; + new ArrayList<>(mCallbacks).forEach(Callback::onKeyguardGoingAwayChanged); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index a3f01c21d137..1b685d0aad7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -88,6 +88,7 @@ import com.android.systemui.util.settings.SecureSettings; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; @@ -161,6 +162,8 @@ public class UserSwitcherController implements Dumpable { private View mView; private String mCreateSupervisedUserPackage; private GlobalSettings mGlobalSettings; + private List<UserSwitchCallback> mUserSwitchCallbacks = + Collections.synchronizedList(new ArrayList<>()); @Inject public UserSwitcherController(Context context, @@ -225,7 +228,8 @@ public class UserSwitcherController implements Dumpable { filter.addAction(Intent.ACTION_USER_STOPPED); filter.addAction(Intent.ACTION_USER_UNLOCKED); mBroadcastDispatcher.registerReceiver( - mReceiver, filter, null /* handler */, UserHandle.SYSTEM); + mReceiver, filter, null /* executor */, + UserHandle.SYSTEM, Context.RECEIVER_EXPORTED, null /* permission */); mSimpleUserSwitcher = shouldUseSimpleUserSwitcher(); @@ -652,6 +656,7 @@ public class UserSwitcherController implements Dumpable { i--; } } + notifyUserSwitchCallbacks(); notifyAdapters(); // Disconnect from the old secondary user's service @@ -1053,6 +1058,33 @@ public class UserSwitcherController implements Dumpable { mActivityStarter.startActivity(intent, true); } + /** + * Add a subscriber to when user switches. + */ + public void addUserSwitchCallback(UserSwitchCallback callback) { + mUserSwitchCallbacks.add(callback); + } + + /** + * Remove a subscriber to when user switches. + */ + public void removeUserSwitchCallback(UserSwitchCallback callback) { + mUserSwitchCallbacks.remove(callback); + } + + /** + * Notify user switch callbacks that user has switched. + */ + private void notifyUserSwitchCallbacks() { + List<UserSwitchCallback> temp; + synchronized (mUserSwitchCallbacks) { + temp = new ArrayList<>(mUserSwitchCallbacks); + } + for (UserSwitchCallback callback : temp) { + callback.onUserSwitched(); + } + } + public static final class UserRecord { public final UserInfo info; public final Bitmap picture; @@ -1233,4 +1265,14 @@ public class UserSwitcherController implements Dumpable { } } } + + /** + * Callback to for when this controller receives the intent to switch users. + */ + public interface UserSwitchCallback { + /** + * Called when user has switched. + */ + void onUserSwitched(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/util/ColorUtil.kt b/packages/SystemUI/src/com/android/systemui/util/ColorUtil.kt new file mode 100644 index 000000000000..27a53bf2ceda --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/util/ColorUtil.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 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.util + +import android.content.res.TypedArray +import android.graphics.Color +import android.view.ContextThemeWrapper + +/** Returns an ARGB color version of [color] at the given [alpha]. */ +fun getColorWithAlpha(color: Int, alpha: Float): Int = + Color.argb( + (alpha * 255).toInt(), + Color.red(color), + Color.green(color), + Color.blue(color) + ) + + +/** + * Returns the color provided at the specified {@param attrIndex} in {@param a} if it exists, + * otherwise, returns the color from the private attribute {@param privAttrId}. + */ +fun getPrivateAttrColorIfUnset( + ctw: ContextThemeWrapper, attrArray: TypedArray, + attrIndex: Int, defColor: Int, privAttrId: Int +): Int { + // If the index is specified, use that value + var a = attrArray + if (a.hasValue(attrIndex)) { + return a.getColor(attrIndex, defColor) + } + + // Otherwise fallback to the value of the private attribute + val customAttrs = intArrayOf(privAttrId) + a = ctw.obtainStyledAttributes(customAttrs) + val color = a.getColor(0, defColor) + a.recycle() + return color +} diff --git a/packages/SystemUI/src/com/android/systemui/util/Utils.java b/packages/SystemUI/src/com/android/systemui/util/Utils.java index 8e5e1d2e1b87..5b5dca30620a 100644 --- a/packages/SystemUI/src/com/android/systemui/util/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/util/Utils.java @@ -105,25 +105,6 @@ public class Utils { } /** - * Returns the color provided at the specified {@param attrIndex} in {@param a} if it exists, - * otherwise, returns the color from the private attribute {@param privAttrId}. - */ - public static int getPrivateAttrColorIfUnset(ContextThemeWrapper ctw, TypedArray a, - int attrIndex, int defColor, int privAttrId) { - // If the index is specified, use that value - if (a.hasValue(attrIndex)) { - return a.getColor(attrIndex, defColor); - } - - // Otherwise fallback to the value of the private attribute - int[] customAttrs = { privAttrId }; - a = ctw.obtainStyledAttributes(customAttrs); - int color = a.getColor(0, defColor); - a.recycle(); - return color; - } - - /** * Gets the {@link R.dimen#status_bar_header_height_keyguard}. */ public static int getStatusBarHeaderHeightKeyguard(Context context) { diff --git a/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java b/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java index 323db5cfd249..bc9e5963c22d 100644 --- a/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java +++ b/packages/SystemUI/src/com/android/systemui/util/concurrency/GlobalConcurrencyModule.java @@ -21,9 +21,11 @@ import android.os.Handler; import android.os.Looper; import com.android.systemui.dagger.qualifiers.Main; +import com.android.systemui.dagger.qualifiers.UiBackground; import java.util.Optional; import java.util.concurrent.Executor; +import java.util.concurrent.Executors; import javax.inject.Named; import javax.inject.Singleton; @@ -73,6 +75,18 @@ public abstract class GlobalConcurrencyModule { } /** + * Provide an Executor specifically for running UI operations on a separate thread. + * + * Keep submitted runnables short and to the point, just as with any other UI code. + */ + @Provides + @Singleton + @UiBackground + public static Executor provideUiBackgroundExecutor() { + return Executors.newSingleThreadExecutor(); + } + + /** * Provide a Main-Thread Executor. */ @Provides @@ -92,7 +106,6 @@ public abstract class GlobalConcurrencyModule { return new ExecutorImpl(looper); } - /** */ @Binds @Singleton diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java index 03b18ae66d4e..eefc412e3ffa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -603,15 +603,25 @@ public class AuthControllerTest extends SysuiTestCase { } @Test + public void testClientNotified_whenTaskStackChangesDuringShow() throws Exception { + switchTask("other_package"); + showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */); + + mTestableLooper.processAllMessages(); + + assertNull(mAuthController.mCurrentDialog); + assertNull(mAuthController.mReceiver); + verify(mDialog1).dismissWithoutCallback(true /* animate */); + verify(mReceiver).onDialogDismissed( + eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL), + eq(null) /* credentialAttestation */); + } + + @Test public void testClientNotified_whenTaskStackChangesDuringAuthentication() throws Exception { showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */); - List<ActivityManager.RunningTaskInfo> tasks = new ArrayList<>(); - ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class); - taskInfo.topActivity = mock(ComponentName.class); - when(taskInfo.topActivity.getPackageName()).thenReturn("other_package"); - tasks.add(taskInfo); - when(mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks); + switchTask("other_package"); mAuthController.mTaskStackListener.onTaskStackChanged(); mTestableLooper.processAllMessages(); @@ -729,6 +739,16 @@ public class AuthControllerTest extends SysuiTestCase { BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE); } + private void switchTask(String packageName) { + final List<ActivityManager.RunningTaskInfo> tasks = new ArrayList<>(); + final ActivityManager.RunningTaskInfo taskInfo = + mock(ActivityManager.RunningTaskInfo.class); + taskInfo.topActivity = mock(ComponentName.class); + when(taskInfo.topActivity.getPackageName()).thenReturn(packageName); + tasks.add(taskInfo); + when(mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks); + } + private PromptInfo createTestPromptInfo() { PromptInfo promptInfo = new PromptInfo(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java index cd05ad496cc8..b87a7e78f73a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java @@ -45,6 +45,7 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.SystemUIDialogManager; import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionListener; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -483,8 +484,11 @@ public class UdfpsKeyguardViewControllerTest extends SysuiTestCase { } private void updateStatusBarExpansion(float fraction, boolean expanded) { + PanelExpansionChangeEvent event = + new PanelExpansionChangeEvent( + fraction, expanded, /* tracking= */ false, /* dragDownPxAmount= */ 0f); for (PanelExpansionListener listener : mExpansionListeners) { - listener.onPanelExpansionChanged(fraction, expanded, /* tracking= */ false); + listener.onPanelExpansionChanged(event); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java index d0b3d6d2d2c7..89c82fbff901 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java @@ -19,7 +19,6 @@ package com.android.systemui.dreams.touch; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; @@ -47,6 +46,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.KeyguardBouncer; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.wm.shell.animation.FlingAnimationUtils; import org.junit.Before; @@ -193,8 +193,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) .isTrue(); - verify(mStatusBarKeyguardViewManager, never()) - .onPanelExpansionChanged(anyFloat(), anyBoolean(), anyBoolean()); + verify(mStatusBarKeyguardViewManager, never()).onPanelExpansionChanged(any()); } /** @@ -221,8 +220,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { assertThat(gestureListener.onScroll(event1, event2, 0, distanceY)) .isTrue(); - verify(mStatusBarKeyguardViewManager, never()) - .onPanelExpansionChanged(anyFloat(), anyBoolean(), anyBoolean()); + verify(mStatusBarKeyguardViewManager, never()).onPanelExpansionChanged(any()); } /** @@ -281,14 +279,16 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { .isTrue(); // Ensure only called once - verify(mStatusBarKeyguardViewManager) - .onPanelExpansionChanged(anyFloat(), anyBoolean(), anyBoolean()); + verify(mStatusBarKeyguardViewManager).onPanelExpansionChanged(any()); final float expansion = isBouncerInitiallyShowing ? percent : 1 - percent; + final float dragDownAmount = event2.getY() - event1.getY(); // Ensure correct expansion passed in. - verify(mStatusBarKeyguardViewManager).onPanelExpansionChanged(eq(expansion), eq(false), - eq(true)); + PanelExpansionChangeEvent event = + new PanelExpansionChangeEvent( + expansion, /* expanded= */ false, /* tracking= */ true, dragDownAmount); + verify(mStatusBarKeyguardViewManager).onPanelExpansionChanged(event); } /** diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt index 8f967ab5294f..65d501442d87 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.media import org.mockito.Mockito.`when` as whenever import android.animation.ValueAnimator import android.graphics.Color -import android.test.suitebuilder.annotation.SmallTest import android.testing.AndroidTestingRunner import android.testing.TestableLooper +import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.monet.ColorScheme import junit.framework.Assert.assertEquals @@ -46,28 +46,35 @@ class ColorSchemeTransitionTest : SysuiTestCase() { private interface ExtractCB : (ColorScheme) -> Int private interface ApplyCB : (Int) -> Unit - private lateinit var colorTransition: ColorTransition + private lateinit var colorTransition: AnimatingColorTransition private lateinit var colorSchemeTransition: ColorSchemeTransition - @Mock private lateinit var mockTransition: ColorTransition + @Mock private lateinit var mockAnimatingTransition: AnimatingColorTransition + @Mock private lateinit var mockGenericTransition: GenericColorTransition @Mock private lateinit var valueAnimator: ValueAnimator @Mock private lateinit var colorScheme: ColorScheme @Mock private lateinit var extractColor: ExtractCB @Mock private lateinit var applyColor: ApplyCB - private lateinit var transitionFactory: ColorTransitionFactory + private lateinit var animatingColorTransitionFactory: AnimatingColorTransitionFactory + private lateinit var genericColorTransitionFactory: GenericColorTransitionFactory @Mock private lateinit var mediaViewHolder: MediaViewHolder @JvmField @Rule val mockitoRule = MockitoJUnit.rule() @Before fun setUp() { - transitionFactory = { default, extractColor, applyColor -> mockTransition } + animatingColorTransitionFactory = { _, _, _ -> mockAnimatingTransition } + genericColorTransitionFactory = { _ -> mockGenericTransition } whenever(extractColor.invoke(colorScheme)).thenReturn(TARGET_COLOR) - colorSchemeTransition = ColorSchemeTransition(context, mediaViewHolder, transitionFactory) + colorSchemeTransition = ColorSchemeTransition( + context, mediaViewHolder, animatingColorTransitionFactory, genericColorTransitionFactory + ) - colorTransition = object : ColorTransition(DEFAULT_COLOR, extractColor, applyColor) { + colorTransition = object : AnimatingColorTransition( + DEFAULT_COLOR, extractColor, applyColor + ) { override fun buildAnimator(): ValueAnimator { return valueAnimator } @@ -142,6 +149,7 @@ class ColorSchemeTransitionTest : SysuiTestCase() { @Test fun testColorSchemeTransition_update() { colorSchemeTransition.updateColorScheme(colorScheme) - verify(mockTransition, times(6)).updateColorScheme(colorScheme) + verify(mockAnimatingTransition, times(6)).updateColorScheme(colorScheme) + verify(mockGenericTransition).updateColorScheme(colorScheme) } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt index 4e130d10f6ec..b8c85bb41726 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt @@ -25,9 +25,12 @@ import org.mockito.Mockito.`when` as whenever import android.content.Intent import android.content.pm.ApplicationInfo import android.content.pm.PackageManager +import android.graphics.Bitmap +import android.graphics.Canvas import android.graphics.Color import android.graphics.drawable.Animatable2 import android.graphics.drawable.AnimatedVectorDrawable +import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable import android.graphics.drawable.Icon import android.graphics.drawable.RippleDrawable @@ -35,7 +38,6 @@ import android.media.MediaMetadata import android.media.session.MediaSession import android.media.session.PlaybackState import android.os.Bundle -import android.os.Handler import android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS import android.testing.AndroidTestingRunner import android.testing.TestableLooper @@ -111,6 +113,7 @@ public class MediaControlPanelTest : SysuiTestCase() { @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var broadcastSender: BroadcastSender + @Mock private lateinit var gutsViewHolder: GutsViewHolder @Mock private lateinit var viewHolder: MediaViewHolder @Mock private lateinit var view: TransitionLayout @Mock private lateinit var seekBarViewModel: SeekBarViewModel @@ -125,7 +128,7 @@ public class MediaControlPanelTest : SysuiTestCase() { @Mock private lateinit var falsingManager: FalsingManager @Mock private lateinit var transitionParent: ViewGroup private lateinit var appIcon: ImageView - private lateinit var albumView: ImageView + @Mock private lateinit var albumView: ImageView private lateinit var titleText: TextView private lateinit var artistText: TextView private lateinit var seamless: ViewGroup @@ -145,8 +148,7 @@ public class MediaControlPanelTest : SysuiTestCase() { private lateinit var scrubbingElapsedTimeView: TextView private lateinit var scrubbingTotalTimeView: TextView private lateinit var actionsTopBarrier: Barrier - @Mock private lateinit var longPressText: TextView - @Mock private lateinit var handler: Handler + @Mock private lateinit var gutsText: TextView @Mock private lateinit var mockAnimator: AnimatorSet private lateinit var settings: ImageButton private lateinit var cancel: View @@ -228,6 +230,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } } + initGutsViewHolderMocks() initMediaViewHolderMocks() // Create media session @@ -272,6 +275,20 @@ public class MediaControlPanelTest : SysuiTestCase() { ) } + private fun initGutsViewHolderMocks() { + settings = ImageButton(context) + cancel = View(context) + cancelText = TextView(context) + dismiss = FrameLayout(context) + dismissText = TextView(context) + whenever(gutsViewHolder.gutsText).thenReturn(gutsText) + whenever(gutsViewHolder.settings).thenReturn(settings) + whenever(gutsViewHolder.cancel).thenReturn(cancel) + whenever(gutsViewHolder.cancelText).thenReturn(cancelText) + whenever(gutsViewHolder.dismiss).thenReturn(dismiss) + whenever(gutsViewHolder.dismissText).thenReturn(dismissText) + } + /** * Initialize elements in media view holder */ @@ -283,7 +300,6 @@ public class MediaControlPanelTest : SysuiTestCase() { // Set up mock views for the players appIcon = ImageView(context) - albumView = ImageView(context) titleText = TextView(context) artistText = TextView(context) seamless = FrameLayout(context) @@ -292,11 +308,6 @@ public class MediaControlPanelTest : SysuiTestCase() { seamlessIcon = ImageView(context) seamlessText = TextView(context) seekBar = SeekBar(context).also { it.id = R.id.media_progress_bar } - settings = ImageButton(context) - cancel = View(context) - cancelText = TextView(context) - dismiss = FrameLayout(context) - dismissText = TextView(context) action0 = ImageButton(context).also { it.setId(R.id.action0) } action1 = ImageButton(context).also { it.setId(R.id.action1) } @@ -341,6 +352,8 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(viewHolder.scrubbingElapsedTimeView).thenReturn(scrubbingElapsedTimeView) whenever(viewHolder.scrubbingTotalTimeView).thenReturn(scrubbingTotalTimeView) + whenever(viewHolder.gutsViewHolder).thenReturn(gutsViewHolder) + // Transition View whenever(view.parent).thenReturn(transitionParent) whenever(view.rootView).thenReturn(transitionParent) @@ -363,15 +376,6 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(viewHolder.action4).thenReturn(action4) whenever(viewHolder.getAction(R.id.action4)).thenReturn(action4) - // Long press menu - whenever(viewHolder.longPressText).thenReturn(longPressText) - whenever(longPressText.handler).thenReturn(handler) - whenever(viewHolder.settings).thenReturn(settings) - whenever(viewHolder.cancel).thenReturn(cancel) - whenever(viewHolder.cancelText).thenReturn(cancelText) - whenever(viewHolder.dismiss).thenReturn(dismiss) - whenever(viewHolder.dismissText).thenReturn(dismissText) - whenever(viewHolder.actionsTopBarrier).thenReturn(actionsTopBarrier) } @@ -404,10 +408,7 @@ public class MediaControlPanelTest : SysuiTestCase() { listOf(recSubtitle1, recSubtitle2, recSubtitle3) ) - // Long press menu - whenever(recommendationViewHolder.settings).thenReturn(settings) - whenever(recommendationViewHolder.cancel).thenReturn(cancel) - whenever(recommendationViewHolder.dismiss).thenReturn(dismiss) + whenever(recommendationViewHolder.gutsViewHolder).thenReturn(gutsViewHolder) val actionIcon = Icon.createWithResource(context, R.drawable.ic_android) whenever(smartspaceAction.icon).thenReturn(actionIcon) @@ -418,7 +419,6 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(coverContainer1.context).thenReturn(mockContext) whenever(coverContainer2.context).thenReturn(mockContext) whenever(coverContainer3.context).thenReturn(mockContext) - } @After @@ -539,6 +539,60 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test + fun bindAlbumView_setAfterExecutors() { + val bmp = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bmp) + canvas.drawColor(Color.RED) + val albumArt = Icon.createWithBitmap(bmp) + val state = mediaData.copy(artwork = albumArt) + + player.attachPlayer(viewHolder) + player.bindPlayer(state, PACKAGE) + bgExecutor.runAllReady() + mainExecutor.runAllReady() + + verify(albumView).setImageDrawable(any(Drawable::class.java)) + } + + @Test + fun bindAlbumView_bitmapInLaterStates_setAfterExecutors() { + val bmp = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bmp) + canvas.drawColor(Color.RED) + val albumArt = Icon.createWithBitmap(bmp) + + val state0 = mediaData.copy(artwork = null) + val state1 = mediaData.copy(artwork = albumArt) + val state2 = mediaData.copy(artwork = albumArt) + player.attachPlayer(viewHolder) + + // First binding sets (empty) drawable + player.bindPlayer(state0, PACKAGE) + bgExecutor.runAllReady() + mainExecutor.runAllReady() + verify(albumView).setImageDrawable(any(Drawable::class.java)) + + // Run Metadata update so that later states don't update + val captor = argumentCaptor<Animator.AnimatorListener>() + verify(mockAnimator, times(2)).addListener(captor.capture()) + captor.value.onAnimationEnd(mockAnimator) + assertThat(titleText.getText()).isEqualTo(TITLE) + assertThat(artistText.getText()).isEqualTo(ARTIST) + + // Second binding sets transition drawable + player.bindPlayer(state1, PACKAGE) + bgExecutor.runAllReady() + mainExecutor.runAllReady() + verify(albumView, times(2)).setImageDrawable(any(Drawable::class.java)) + + // Third binding does run transition or update background + player.bindPlayer(state2, PACKAGE) + bgExecutor.runAllReady() + mainExecutor.runAllReady() + verify(albumView, times(2)).setImageDrawable(any(Drawable::class.java)) + } + + @Test fun bind_seekBarDisabled_hasActions_seekBarVisibilityIsSetToInvisible() { useRealConstraintSets() @@ -968,8 +1022,10 @@ public class MediaControlPanelTest : SysuiTestCase() { assertThat(seamless.isEnabled()).isFalse() } + /* ***** Guts tests for the player ***** */ + @Test - fun longClick_gutsClosed() { + fun player_longClickWhenGutsClosed_gutsOpens() { player.attachPlayer(viewHolder) player.bindPlayer(mediaData, KEY) whenever(mediaViewController.isGutsVisible).thenReturn(false) @@ -983,7 +1039,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun longClick_gutsOpen() { + fun player_longClickWhenGutsOpen_gutsCloses() { player.attachPlayer(viewHolder) whenever(mediaViewController.isGutsVisible).thenReturn(true) @@ -996,8 +1052,9 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun cancelButtonClick_animation() { + fun player_cancelButtonClick_animation() { player.attachPlayer(viewHolder) + player.bindPlayer(mediaData, KEY) cancel.callOnClick() @@ -1005,7 +1062,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun settingsButtonClick() { + fun player_settingsButtonClick() { player.attachPlayer(viewHolder) player.bindPlayer(mediaData, KEY) @@ -1019,7 +1076,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun dismissButtonClick() { + fun player_dismissButtonClick() { val mediaKey = "key for dismissal" player.attachPlayer(viewHolder) val state = mediaData.copy(notificationKey = KEY) @@ -1032,7 +1089,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun dismissButtonDisabled() { + fun player_dismissButtonDisabled() { val mediaKey = "key for dismissal" player.attachPlayer(viewHolder) val state = mediaData.copy(isClearable = false, notificationKey = KEY) @@ -1042,7 +1099,7 @@ public class MediaControlPanelTest : SysuiTestCase() { } @Test - fun dismissButtonClick_notInManager() { + fun player_dismissButtonClick_notInManager() { val mediaKey = "key for dismissal" whenever(mediaDataManager.dismissMediaData(eq(mediaKey), anyLong())).thenReturn(false) @@ -1057,6 +1114,76 @@ public class MediaControlPanelTest : SysuiTestCase() { verify(mediaCarouselController).removePlayer(eq(mediaKey), eq(false), eq(false)) } + /* ***** END guts tests for the player ***** */ + + /* ***** Guts tests for the recommendations ***** */ + + @Test + fun recommendations_longClickWhenGutsClosed_gutsOpens() { + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(smartspaceData) + whenever(mediaViewController.isGutsVisible).thenReturn(false) + + val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java) + verify(viewHolder.player).onLongClickListener = captor.capture() + + captor.value.onLongClick(viewHolder.player) + verify(mediaViewController).openGuts() + verify(logger).logLongPressOpen(anyInt(), eq(PACKAGE), eq(instanceId)) + } + + @Test + fun recommendations_longClickWhenGutsOpen_gutsCloses() { + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(smartspaceData) + whenever(mediaViewController.isGutsVisible).thenReturn(true) + + val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java) + verify(viewHolder.player).onLongClickListener = captor.capture() + + captor.value.onLongClick(viewHolder.player) + verify(mediaViewController, never()).openGuts() + verify(mediaViewController).closeGuts(false) + } + + @Test + fun recommendations_cancelButtonClick_animation() { + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(smartspaceData) + + cancel.callOnClick() + + verify(mediaViewController).closeGuts(false) + } + + @Test + fun recommendations_settingsButtonClick() { + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(smartspaceData) + + settings.callOnClick() + verify(logger).logLongPressSettings(anyInt(), eq(PACKAGE), eq(instanceId)) + + val captor = ArgumentCaptor.forClass(Intent::class.java) + verify(activityStarter).startActivity(captor.capture(), eq(true)) + + assertThat(captor.value.action).isEqualTo(ACTION_MEDIA_CONTROLS_SETTINGS) + } + + @Test + fun recommendations_dismissButtonClick() { + val mediaKey = "key for dismissal" + player.attachRecommendation(recommendationViewHolder) + player.bindRecommendation(smartspaceData.copy(targetId = mediaKey)) + + assertThat(dismiss.isEnabled).isEqualTo(true) + dismiss.callOnClick() + verify(logger).logLongPressDismiss(anyInt(), eq(PACKAGE), eq(instanceId)) + verify(mediaDataManager).dismissSmartspaceRecommendation(eq(mediaKey), anyLong()) + } + + /* ***** END guts tests for the recommendations ***** */ + @Test fun actionPlayPauseClick_isLogged() { val semanticActions = MediaButton( @@ -1330,22 +1457,23 @@ public class MediaControlPanelTest : SysuiTestCase() { val subtitle1 = "Subtitle1" val subtitle2 = "Subtitle2" val subtitle3 = "Subtitle3" + val icon = Icon.createWithResource(context, R.drawable.ic_1x_mobiledata) val data = smartspaceData.copy( recommendations = listOf( SmartspaceAction.Builder("id1", title1) .setSubtitle(subtitle1) - .setIcon(Icon.createWithResource(context, R.drawable.ic_1x_mobiledata)) + .setIcon(icon) .setExtras(Bundle.EMPTY) .build(), SmartspaceAction.Builder("id2", title2) .setSubtitle(subtitle2) - .setIcon(Icon.createWithResource(context, R.drawable.ic_alarm)) + .setIcon(icon) .setExtras(Bundle.EMPTY) .build(), SmartspaceAction.Builder("id3", title3) .setSubtitle(subtitle3) - .setIcon(Icon.createWithResource(context, R.drawable.ic_3g_mobiledata)) + .setIcon(icon) .setExtras(Bundle.EMPTY) .build() ) @@ -1378,6 +1506,135 @@ public class MediaControlPanelTest : SysuiTestCase() { assertThat(recSubtitle1.text).isEqualTo("") } + @Test + fun bindRecommendation_someHaveTitles_allTitleViewsShown() { + useRealConstraintSets() + player.attachRecommendation(recommendationViewHolder) + + val icon = Icon.createWithResource(context, R.drawable.ic_1x_mobiledata) + val data = smartspaceData.copy( + recommendations = listOf( + SmartspaceAction.Builder("id1", "") + .setSubtitle("fake subtitle") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id2", "title2") + .setSubtitle("fake subtitle") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "") + .setSubtitle("fake subtitle") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + player.bindRecommendation(data) + + assertThat(expandedSet.getVisibility(recTitle1.id)).isEqualTo(ConstraintSet.VISIBLE) + assertThat(expandedSet.getVisibility(recTitle2.id)).isEqualTo(ConstraintSet.VISIBLE) + assertThat(expandedSet.getVisibility(recTitle3.id)).isEqualTo(ConstraintSet.VISIBLE) + } + + @Test + fun bindRecommendation_someHaveSubtitles_allSubtitleViewsShown() { + useRealConstraintSets() + player.attachRecommendation(recommendationViewHolder) + + val icon = Icon.createWithResource(context, R.drawable.ic_1x_mobiledata) + val data = smartspaceData.copy( + recommendations = listOf( + SmartspaceAction.Builder("id1", "") + .setSubtitle("") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id2", "title2") + .setSubtitle("") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "title3") + .setSubtitle("subtitle3") + .setIcon(icon) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + player.bindRecommendation(data) + + assertThat(expandedSet.getVisibility(recSubtitle1.id)).isEqualTo(ConstraintSet.VISIBLE) + assertThat(expandedSet.getVisibility(recSubtitle2.id)).isEqualTo(ConstraintSet.VISIBLE) + assertThat(expandedSet.getVisibility(recSubtitle3.id)).isEqualTo(ConstraintSet.VISIBLE) + } + + @Test + fun bindRecommendation_noneHaveSubtitles_subtitleViewsGone() { + useRealConstraintSets() + player.attachRecommendation(recommendationViewHolder) + val data = smartspaceData.copy( + recommendations = listOf( + SmartspaceAction.Builder("id1", "title1") + .setSubtitle("") + .setIcon(Icon.createWithResource(context, R.drawable.ic_1x_mobiledata)) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id2", "title2") + .setSubtitle("") + .setIcon(Icon.createWithResource(context, R.drawable.ic_alarm)) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "title3") + .setSubtitle("") + .setIcon(Icon.createWithResource(context, R.drawable.ic_3g_mobiledata)) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + + player.bindRecommendation(data) + + assertThat(expandedSet.getVisibility(recSubtitle1.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recSubtitle2.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recSubtitle3.id)).isEqualTo(ConstraintSet.GONE) + } + + @Test + fun bindRecommendation_noneHaveTitles_titleAndSubtitleViewsGone() { + useRealConstraintSets() + player.attachRecommendation(recommendationViewHolder) + val data = smartspaceData.copy( + recommendations = listOf( + SmartspaceAction.Builder("id1", "") + .setSubtitle("subtitle1") + .setIcon(Icon.createWithResource(context, R.drawable.ic_1x_mobiledata)) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id2", "") + .setSubtitle("subtitle2") + .setIcon(Icon.createWithResource(context, R.drawable.ic_alarm)) + .setExtras(Bundle.EMPTY) + .build(), + SmartspaceAction.Builder("id3", "") + .setSubtitle("subtitle3") + .setIcon(Icon.createWithResource(context, R.drawable.ic_3g_mobiledata)) + .setExtras(Bundle.EMPTY) + .build() + ) + ) + + player.bindRecommendation(data) + + assertThat(expandedSet.getVisibility(recTitle1.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recTitle2.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recTitle3.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recSubtitle1.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recSubtitle2.id)).isEqualTo(ConstraintSet.GONE) + assertThat(expandedSet.getVisibility(recSubtitle3.id)).isEqualTo(ConstraintSet.GONE) + } + private fun getScrubbingChangeListener(): SeekBarViewModel.ScrubbingChangeListener = withArgCaptor { verify(seekBarViewModel).setScrubbingChangeListener(capture()) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaTimeoutListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaTimeoutListenerTest.kt index 91169834752e..60cbb1754db6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaTimeoutListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaTimeoutListenerTest.kt @@ -24,6 +24,7 @@ import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock @@ -33,7 +34,6 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor -import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyString import org.mockito.Captor @@ -62,6 +62,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { @Mock private lateinit var mediaControllerFactory: MediaControllerFactory @Mock private lateinit var mediaController: MediaController + @Mock private lateinit var logger: MediaTimeoutLogger private lateinit var executor: FakeExecutor @Mock private lateinit var timeoutCallback: (String, Boolean) -> Unit @Captor private lateinit var mediaCallbackCaptor: ArgumentCaptor<MediaController.Callback> @@ -77,7 +78,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { fun setup() { `when`(mediaControllerFactory.create(any())).thenReturn(mediaController) executor = FakeExecutor(FakeSystemClock()) - mediaTimeoutListener = MediaTimeoutListener(mediaControllerFactory, executor) + mediaTimeoutListener = MediaTimeoutListener(mediaControllerFactory, executor, logger) mediaTimeoutListener.timeoutCallback = timeoutCallback // Create a media session and notification for testing. @@ -112,8 +113,9 @@ class MediaTimeoutListenerTest : SysuiTestCase() { `when`(mediaController.playbackState).thenReturn(playingState) mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) verify(mediaController).registerCallback(capture(mediaCallbackCaptor)) + verify(logger).logPlaybackState(eq(KEY), eq(playingState)) - // Ignores is same key + // Ignores if same key clearInvocations(mediaController) mediaTimeoutListener.onMediaDataLoaded(KEY, KEY, mediaData) verify(mediaController, never()).registerCallback(anyObject()) @@ -125,6 +127,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { verify(mediaController).registerCallback(capture(mediaCallbackCaptor)) assertThat(executor.numPending()).isEqualTo(1) verify(timeoutCallback, never()).invoke(anyString(), anyBoolean()) + verify(logger).logScheduleTimeout(eq(KEY), eq(false), eq(false)) assertThat(executor.advanceClockToNext()).isEqualTo(PAUSED_MEDIA_TIMEOUT) } @@ -153,6 +156,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { @Test fun testOnMediaDataLoaded_migratesKeys() { + val newKey = "NEWKEY" // From not playing mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) clearInvocations(mediaController) @@ -161,9 +165,10 @@ class MediaTimeoutListenerTest : SysuiTestCase() { val playingState = mock(android.media.session.PlaybackState::class.java) `when`(playingState.state).thenReturn(PlaybackState.STATE_PLAYING) `when`(mediaController.playbackState).thenReturn(playingState) - mediaTimeoutListener.onMediaDataLoaded("NEWKEY", KEY, mediaData) + mediaTimeoutListener.onMediaDataLoaded(newKey, KEY, mediaData) verify(mediaController).unregisterCallback(anyObject()) verify(mediaController).registerCallback(anyObject()) + verify(logger).logMigrateListener(eq(KEY), eq(newKey), eq(true)) // Enqueues callback assertThat(executor.numPending()).isEqualTo(1) @@ -171,6 +176,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { @Test fun testOnMediaDataLoaded_migratesKeys_noTimeoutExtension() { + val newKey = "NEWKEY" // From not playing mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData) clearInvocations(mediaController) @@ -179,11 +185,12 @@ class MediaTimeoutListenerTest : SysuiTestCase() { val playingState = mock(android.media.session.PlaybackState::class.java) `when`(playingState.state).thenReturn(PlaybackState.STATE_PAUSED) `when`(mediaController.playbackState).thenReturn(playingState) - mediaTimeoutListener.onMediaDataLoaded("NEWKEY", KEY, mediaData) + mediaTimeoutListener.onMediaDataLoaded(newKey, KEY, mediaData) // The number of queued timeout tasks remains the same. The timeout task isn't cancelled nor // is another scheduled assertThat(executor.numPending()).isEqualTo(1) + verify(logger).logUpdateListener(eq(newKey), eq(false)) } @Test @@ -205,6 +212,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { mediaCallbackCaptor.value.onPlaybackStateChanged(PlaybackState.Builder() .setState(PlaybackState.STATE_PLAYING, 0L, 0f).build()) assertThat(executor.numPending()).isEqualTo(0) + verify(logger).logTimeoutCancelled(eq(KEY), any()) } @Test @@ -249,6 +257,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { // THEN the controller is unregistered and timeout run verify(mediaController).unregisterCallback(anyObject()) assertThat(executor.numPending()).isEqualTo(0) + verify(logger).logSessionDestroyed(eq(KEY)) } @Test @@ -270,6 +279,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { runAllReady() } verify(timeoutCallback).invoke(eq(KEY), eq(false)) + verify(logger).logReuseListener(eq(KEY)) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/SeekBarViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/SeekBarViewModelTest.kt index afc9c81ff479..82aa6123917e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/SeekBarViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/SeekBarViewModelTest.kt @@ -375,16 +375,20 @@ public class SeekBarViewModelTest : SysuiTestCase() { } @Test - fun onProgressChangedFromUserWithoutStartTrackingTouch() { - // WHEN user starts dragging the seek bar + fun onProgressChangedFromUserWithoutStartTrackingTouch_transportUpdated() { + whenever(mockController.transportControls).thenReturn(mockTransport) + viewModel.updateController(mockController) val pos = 42 val bar = SeekBar(context) + + // WHEN we get an onProgressChanged event without an onStartTrackingTouch event with(viewModel.seekBarListener) { onProgressChanged(bar, pos, true) } fakeExecutor.runAllReady() - // THEN then elapsed time should not be updated - assertThat(viewModel.progress.value!!.elapsedTime).isNull() + + // THEN we immediately update the transport + verify(mockTransport).seekTo(pos.toLong()) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java index f5b006d732fd..4a740f6c5571 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java @@ -205,10 +205,9 @@ public class NavigationBarTest extends SysuiTestCase { when(mNavigationBarView.getAccessibilityButton()).thenReturn(mAccessibilityButton); when(mNavigationBarView.getImeSwitchButton()).thenReturn(mImeSwitchButton); when(mNavigationBarView.getBackButton()).thenReturn(mBackButton); - when(mNavigationBarView.getBarTransitions()).thenReturn(mNavigationBarTransitions); when(mNavigationBarView.getRotationButtonController()) .thenReturn(mRotationButtonController); - when(mNavigationBarView.getLightTransitionsController()) + when(mNavigationBarTransitions.getLightTransitionsController()) .thenReturn(mLightBarTransitionsController); when(mStatusBarKeyguardViewManager.isNavBarVisible()).thenReturn(true); setupSysuiDependency(); @@ -459,6 +458,7 @@ public class NavigationBarTest extends SysuiTestCase { mInputMethodManager, mDeadZone, mDeviceConfigProxyFake, + mNavigationBarTransitions, Optional.of(mock(BackAnimation.class)))); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java index 6a2a78b40d2d..cafd2cf7cea0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -37,8 +36,8 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.OverviewProxyService; -import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.BarTransitions; +import com.android.systemui.statusbar.phone.LightBarTransitionsController; import com.android.systemui.statusbar.policy.KeyguardStateController; import org.junit.Before; @@ -53,9 +52,16 @@ import org.mockito.MockitoAnnotations; public class NavigationBarTransitionsTest extends SysuiTestCase { @Mock + LightBarTransitionsController.Factory mLightBarTransitionsFactory; + @Mock + LightBarTransitionsController mLightBarTransitions; + @Mock EdgeBackGestureHandler.Factory mEdgeBackGestureHandlerFactory; @Mock EdgeBackGestureHandler mEdgeBackGestureHandler; + @Mock + IWindowManager mIWindowManager; + private NavigationBarTransitions mTransitions; @Before @@ -64,7 +70,6 @@ public class NavigationBarTransitionsTest extends SysuiTestCase { when(mEdgeBackGestureHandlerFactory.create(any(Context.class))) .thenReturn(mEdgeBackGestureHandler); - mDependency.injectMockDependency(IWindowManager.class); mDependency.injectMockDependency(AssistManager.class); mDependency.injectMockDependency(OverviewProxyService.class); mDependency.injectMockDependency(StatusBarStateController.class); @@ -76,10 +81,12 @@ public class NavigationBarTransitionsTest extends SysuiTestCase { .when(mDependency.injectMockDependency(NavigationModeController.class)) .getCurrentUserContext(); + when(mLightBarTransitionsFactory.create(any())).thenReturn(mLightBarTransitions); NavigationBarView navBar = spy(new NavigationBarView(mContext, null)); when(navBar.getCurrentView()).thenReturn(navBar); when(navBar.findViewById(anyInt())).thenReturn(navBar); - mTransitions = new NavigationBarTransitions(navBar, mock(CommandQueue.class)); + mTransitions = new NavigationBarTransitions( + navBar, mIWindowManager, mLightBarTransitionsFactory); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index 633a9c3a03d8..4a8cb0b76dc4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -138,6 +138,8 @@ public class InternetDialogControllerTest extends SysuiTestCase { private DialogLaunchAnimator mDialogLaunchAnimator; @Mock private View mDialogLaunchView; + @Mock + private WifiStateWorker mWifiStateWorker; private TestableResources mTestableResources; private InternetDialogController mInternetDialogController; @@ -166,6 +168,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { when(mSystemUIToast.getView()).thenReturn(mToastView); when(mSystemUIToast.getGravity()).thenReturn(GRAVITY_FLAGS); when(mSystemUIToast.getInAnimation()).thenReturn(mAnimator); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mInternetDialogController = new InternetDialogController(mContext, mock(UiEventLogger.class), mock(ActivityStarter.class), mAccessPointController, @@ -173,7 +176,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { mock(ConnectivityManager.class), mHandler, mExecutor, mBroadcastDispatcher, mock(KeyguardUpdateMonitor.class), mGlobalSettings, mKeyguardStateController, mWindowManager, mToastFactory, mWorkerHandler, mCarrierConfigTracker, - mLocationController, mDialogLaunchAnimator); + mLocationController, mDialogLaunchAnimator, mWifiStateWorker); mSubscriptionManager.addOnSubscriptionsChangedListener(mExecutor, mInternetDialogController.mOnSubscriptionsChangedListener); mInternetDialogController.onStart(mInternetDialogCallback, true); @@ -239,7 +242,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withApmOnAndWifiOff_returnWifiIsOff() { fakeAirplaneModeEnabled(true); - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(false); assertThat(mInternetDialogController.getSubtitleText(false)) .isEqualTo(getResourcesString("wifi_is_off")); @@ -254,7 +257,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withWifiOff_returnWifiIsOff() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(false); assertThat(mInternetDialogController.getSubtitleText(false)) .isEqualTo(getResourcesString("wifi_is_off")); @@ -269,7 +272,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withNoWifiEntry_returnSearchWifi() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); assertThat(mInternetDialogController.getSubtitleText(true)) @@ -286,7 +289,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { public void getSubtitleText_withWifiEntry_returnTapToConnect() { // The preconditions WiFi Entries is already in setUp() fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); assertThat(mInternetDialogController.getSubtitleText(false)) .isEqualTo(getResourcesString("tap_a_network_to_connect")); @@ -301,7 +304,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_deviceLockedWithWifiOn_returnUnlockToViewNetworks() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); when(mKeyguardStateController.isUnlocked()).thenReturn(false); assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(false), @@ -311,7 +314,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withNoService_returnNoNetworksAvailable() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); doReturn(ServiceState.STATE_OUT_OF_SERVICE).when(mServiceState).getState(); @@ -325,7 +328,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withMobileDataDisabled_returnNoOtherAvailable() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); doReturn(ServiceState.STATE_IN_SERVICE).when(mServiceState).getState(); @@ -346,7 +349,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withCarrierNetworkActiveOnly_returnNoOtherAvailable() { fakeAirplaneModeEnabled(false); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); when(mMergedCarrierEntry.isDefaultNetwork()).thenReturn(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java index 616f89455c74..d09a5a11040f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java @@ -14,7 +14,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.net.wifi.WifiManager; import android.os.Handler; import android.telephony.TelephonyManager; import android.testing.AndroidTestingRunner; @@ -64,8 +63,6 @@ public class InternetDialogTest extends SysuiTestCase { @Mock private TelephonyManager mTelephonyManager; @Mock - private WifiManager mWifiManager; - @Mock private WifiEntry mInternetWifiEntry; @Mock private List<WifiEntry> mWifiEntries; @@ -97,7 +94,6 @@ public class InternetDialogTest extends SysuiTestCase { public void setUp() { MockitoAnnotations.initMocks(this); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt()); - when(mWifiManager.isWifiEnabled()).thenReturn(true); when(mInternetWifiEntry.getTitle()).thenReturn(WIFI_TITLE); when(mInternetWifiEntry.getSummary(false)).thenReturn(WIFI_SUMMARY); when(mInternetWifiEntry.isDefaultNetwork()).thenReturn(true); @@ -107,7 +103,7 @@ public class InternetDialogTest extends SysuiTestCase { when(mInternetDialogController.getMobileNetworkTitle()).thenReturn(MOBILE_NETWORK_TITLE); when(mInternetDialogController.getMobileNetworkSummary()) .thenReturn(MOBILE_NETWORK_SUMMARY); - when(mInternetDialogController.getWifiManager()).thenReturn(mWifiManager); + when(mInternetDialogController.isWifiEnabled()).thenReturn(true); mMockitoSession = ExtendedMockito.mockitoSession() .spyStatic(WifiEnterpriseRestrictionUtils.class) @@ -232,7 +228,7 @@ public class InternetDialogTest extends SysuiTestCase { // Carrier network should be gone if airplane mode ON and Wi-Fi is off. when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true); when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); mInternetDialog.updateDialog(true); @@ -241,7 +237,7 @@ public class InternetDialogTest extends SysuiTestCase { // Carrier network should be visible if airplane mode ON and Wi-Fi is ON. when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true); when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mInternetDialogController.isWifiEnabled()).thenReturn(true); mInternetDialog.updateDialog(true); @@ -468,7 +464,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void updateDialog_wifiOffAndWifiScanOff_hideWifiScanNotify() { - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); when(mInternetDialogController.isWifiScanEnabled()).thenReturn(false); mInternetDialog.updateDialog(false); @@ -478,7 +474,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void updateDialog_wifiOffAndWifiScanOnAndDeviceLocked_hideWifiScanNotify() { - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); when(mInternetDialogController.isWifiScanEnabled()).thenReturn(true); when(mInternetDialogController.isDeviceLocked()).thenReturn(true); @@ -489,7 +485,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void updateDialog_wifiOffAndWifiScanOnAndDeviceUnlocked_showWifiScanNotify() { - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); when(mInternetDialogController.isWifiScanEnabled()).thenReturn(true); when(mInternetDialogController.isDeviceLocked()).thenReturn(false); @@ -502,6 +498,26 @@ public class InternetDialogTest extends SysuiTestCase { } @Test + public void updateDialog_wifiIsDisabled_uncheckWifiSwitch() { + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); + mWifiToggleSwitch.setChecked(true); + + mInternetDialog.updateDialog(false); + + assertThat(mWifiToggleSwitch.isChecked()).isFalse(); + } + + @Test + public void updateDialog_wifiIsEnabled_checkWifiSwitch() { + when(mInternetDialogController.isWifiEnabled()).thenReturn(true); + mWifiToggleSwitch.setChecked(false); + + mInternetDialog.updateDialog(false); + + assertThat(mWifiToggleSwitch.isChecked()).isTrue(); + } + + @Test public void onClickSeeMoreButton_clickSeeAll_verifyLaunchNetworkSetting() { mSeeAll.performClick(); @@ -512,7 +528,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void showProgressBar_wifiDisabled_hideProgressBar() { Mockito.reset(mHandler); - when(mWifiManager.isWifiEnabled()).thenReturn(false); + when(mInternetDialogController.isWifiEnabled()).thenReturn(false); mInternetDialog.showProgressBar(); @@ -534,7 +550,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void showProgressBar_wifiEnabledWithWifiEntry_showProgressBarThenHide() { Mockito.reset(mHandler); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mInternetDialogController.isWifiEnabled()).thenReturn(true); mInternetDialog.showProgressBar(); @@ -553,7 +569,7 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void showProgressBar_wifiEnabledWithoutWifiEntries_showProgressBarThenHideSearch() { Mockito.reset(mHandler); - when(mWifiManager.isWifiEnabled()).thenReturn(true); + when(mInternetDialogController.isWifiEnabled()).thenReturn(true); mInternetDialog.mConnectedWifiEntry = null; mInternetDialog.mWifiEntriesCount = 0; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/WifiStateWorkerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/WifiStateWorkerTest.java new file mode 100644 index 000000000000..5d7ba7bc673d --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/WifiStateWorkerTest.java @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2022 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.qs.tiles.dialog; + +import static android.net.wifi.WifiManager.EXTRA_WIFI_STATE; +import static android.net.wifi.WifiManager.WIFI_STATE_CHANGED_ACTION; +import static android.net.wifi.WifiManager.WIFI_STATE_DISABLED; +import static android.net.wifi.WifiManager.WIFI_STATE_DISABLING; +import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED; +import static android.net.wifi.WifiManager.WIFI_STATE_ENABLING; +import static android.net.wifi.WifiManager.WIFI_STATE_UNKNOWN; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Intent; +import android.net.wifi.WifiManager; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.broadcast.BroadcastDispatcher; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class WifiStateWorkerTest extends SysuiTestCase { + + @Rule + public MockitoRule mRule = MockitoJUnit.rule(); + @Mock + private BroadcastDispatcher mBroadcastDispatcher; + @Mock + private WifiManager mWifiManager; + @Mock + private Intent mIntent; + + private WifiStateWorker mWifiStateWorker; + private FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock()); + + @Before + public void setup() { + when(mWifiManager.setWifiEnabled(anyBoolean())).thenReturn(true); + when(mWifiManager.getWifiState()).thenReturn(WIFI_STATE_ENABLED); + when(mIntent.getAction()).thenReturn(WIFI_STATE_CHANGED_ACTION); + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLED); + + mWifiStateWorker = new WifiStateWorker(mBroadcastDispatcher, mBackgroundExecutor, + mWifiManager); + mBackgroundExecutor.runAllReady(); + } + + @Test + public void constructor_shouldGetWifiState() { + verify(mWifiManager).getWifiState(); + } + + @Test + public void setWifiEnabled_wifiManagerIsNull_shouldNotSetWifiEnabled() { + mWifiStateWorker = new WifiStateWorker(mBroadcastDispatcher, mBackgroundExecutor, + null /* wifiManager */); + + mWifiStateWorker.setWifiEnabled(true); + mBackgroundExecutor.runAllReady(); + + verify(mWifiManager, never()).setWifiEnabled(anyBoolean()); + } + + @Test + public void setWifiEnabled_enabledIsTrue_shouldSetWifiEnabled() { + mWifiStateWorker.setWifiEnabled(true); + mBackgroundExecutor.runAllReady(); + + verify(mWifiManager).setWifiEnabled(true); + } + + @Test + public void setWifiEnabled_enabledIsFalse_shouldSetWifiDisabled() { + mWifiStateWorker.setWifiEnabled(false); + mBackgroundExecutor.runAllReady(); + + verify(mWifiManager).setWifiEnabled(false); + } + + @Test + public void getWifiState_receiveWifiStateDisabling_getWifiStateDisabling() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_DISABLING); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_DISABLING); + } + + @Test + public void getWifiState_receiveWifiStateDisabled_getWifiStateDisabled() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_DISABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_DISABLED); + } + + @Test + public void getWifiState_receiveWifiStateEnabling_getWifiStateEnabling() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLING); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_ENABLING); + } + + @Test + public void getWifiState_receiveWifiStateEnabled_getWifiStateEnabled() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_ENABLED); + } + + @Test + public void getWifiState_receiveWifiStateUnknown_ignoreTheIntent() { + // Update the Wi-Fi state to WIFI_STATE_DISABLED + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_DISABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_DISABLED); + + // Receiver WIFI_STATE_UNKNOWN + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_UNKNOWN); + mWifiStateWorker.onReceive(mContext, mIntent); + + // Ignore the intent and keep the Wi-Fi state to WIFI_STATE_DISABLED + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_DISABLED); + + // Update the Wi-Fi state to WIFI_STATE_ENABLED + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_ENABLED); + + // Receiver WIFI_STATE_UNKNOWN change + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_UNKNOWN); + mWifiStateWorker.onReceive(mContext, mIntent); + + // Ignore the intent and keep the Wi-Fi state to WIFI_STATE_ENABLED + assertThat(mWifiStateWorker.getWifiState()).isEqualTo(WIFI_STATE_ENABLED); + } + + @Test + public void isWifiEnabled_receiveWifiStateDisabling_returnFalse() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_DISABLING); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.isWifiEnabled()).isFalse(); + } + + @Test + public void isWifiEnabled_receiveWifiStateDisabled_returnFalse() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_DISABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.isWifiEnabled()).isFalse(); + } + + @Test + public void isWifiEnabled_receiveWifiStateEnabling_returnTrue() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLING); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.isWifiEnabled()).isTrue(); + } + + @Test + public void isWifiEnabled_receiveWifiStateEnabled_returnTrue() { + when(mIntent.getIntExtra(eq(EXTRA_WIFI_STATE), anyInt())).thenReturn(WIFI_STATE_ENABLED); + mWifiStateWorker.onReceive(mContext, mIntent); + + assertThat(mWifiStateWorker.isWifiEnabled()).isTrue(); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt index 57803e874f93..834090057334 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt @@ -136,6 +136,8 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) {} + override fun setIsDreaming(isDreaming: Boolean) {} + override fun setDozeAmount(amount: Float) {} override fun setIntentStarter(intentStarter: BcSmartspaceDataPlugin.IntentStarter?) {} @@ -173,6 +175,7 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { stateChangeListener.onViewAttachedToWindow(mockView) verify(smartspaceManager).createSmartspaceSession(any()) + verify(mockView).setDozeAmount(0f) stateChangeListener.onViewDetachedFromWindow(mockView) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt index 1bcc038e93b6..b166b7367b53 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.phone.BiometricUnlockController import com.android.systemui.statusbar.phone.DozeParameters import com.android.systemui.statusbar.phone.ScrimController +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent import com.android.systemui.statusbar.policy.FakeConfigurationController import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.WallpaperController @@ -123,7 +124,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { verify(statusBarStateController).addCallback(captor.capture()) statusBarStateListener = captor.value verify(notificationShadeWindowController) - .setScrimsVisibilityListener(scrimVisibilityCaptor.capture()) + .setScrimsVisibilityListener(scrimVisibilityCaptor.capture()) disableSplitShade() } @@ -136,16 +137,16 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Test fun onPanelExpansionChanged_apliesBlur_ifShade() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) verify(shadeAnimation).animateTo(eq(maxBlur), any()) } @Test fun onPanelExpansionChanged_animatesBlurIn_ifShade() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.01f, expanded = false, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 0.01f, expanded = false, tracking = false, dragDownPxAmount = 0f)) verify(shadeAnimation).animateTo(eq(maxBlur), any()) } @@ -154,28 +155,27 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { onPanelExpansionChanged_animatesBlurIn_ifShade() clearInvocations(shadeAnimation) notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0f, expanded = false, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 0f, expanded = false, tracking = false, dragDownPxAmount = 0f)) verify(shadeAnimation).animateTo(eq(0), any()) } @Test fun onPanelExpansionChanged_animatesBlurOut_ifFlick() { + val event = + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f) onPanelExpansionChanged_apliesBlur_ifShade() clearInvocations(shadeAnimation) - notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = true - ) + notificationShadeDepthController.onPanelExpansionChanged(event) verify(shadeAnimation, never()).animateTo(anyInt(), any()) notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.9f, expanded = true, tracking = true - ) + event.copy(fraction = 0.9f, tracking = true)) verify(shadeAnimation, never()).animateTo(anyInt(), any()) notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.8f, expanded = true, tracking = false - ) + event.copy(fraction = 0.8f, tracking = false)) verify(shadeAnimation).animateTo(eq(0), any()) } @@ -184,27 +184,24 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { onPanelExpansionChanged_animatesBlurOut_ifFlick() clearInvocations(shadeAnimation) notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.6f, expanded = true, tracking = true - ) + PanelExpansionChangeEvent( + fraction = 0.6f, expanded = true, tracking = true, dragDownPxAmount = 0f)) verify(shadeAnimation).animateTo(eq(maxBlur), any()) } @Test fun onPanelExpansionChanged_respectsMinPanelPullDownFraction() { + val event = + PanelExpansionChangeEvent( + fraction = 0.5f, expanded = true, tracking = true, dragDownPxAmount = 0f) notificationShadeDepthController.panelPullDownMinFraction = 0.5f - notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.5f, expanded = true, tracking = true - ) + notificationShadeDepthController.onPanelExpansionChanged(event) assertThat(notificationShadeDepthController.shadeExpansion).isEqualTo(0f) - notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 0.75f, expanded = true, tracking = true - ) + notificationShadeDepthController.onPanelExpansionChanged(event.copy(fraction = 0.75f)) assertThat(notificationShadeDepthController.shadeExpansion).isEqualTo(0.5f) - notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = true - ) + notificationShadeDepthController.onPanelExpansionChanged(event.copy(fraction = 1f)) assertThat(notificationShadeDepthController.shadeExpansion).isEqualTo(1f) } @@ -223,8 +220,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { statusBarState = StatusBarState.KEYGUARD notificationShadeDepthController.qsPanelExpansion = 1f notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) } @@ -234,11 +231,11 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { statusBarState = StatusBarState.KEYGUARD notificationShadeDepthController.qsPanelExpansion = 0.25f notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) notificationShadeDepthController.updateBlurCallback.doFrame(0) - verify(wallpaperController).setNotificationShadeZoom( - eq(ShadeInterpolation.getNotificationScrimAlpha(0.25f))) + verify(wallpaperController) + .setNotificationShadeZoom(eq(ShadeInterpolation.getNotificationScrimAlpha(0.25f))) } @Test @@ -246,7 +243,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { enableSplitShade() notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(wallpaperController).setNotificationShadeZoom(0f) @@ -257,7 +255,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { disableSplitShade() notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(wallpaperController).setNotificationShadeZoom(floatThat { it > 0 }) @@ -269,14 +268,16 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { val rawFraction = 1f val expanded = true val tracking = false + val dragDownPxAmount = 0f + val event = PanelExpansionChangeEvent(rawFraction, expanded, tracking, dragDownPxAmount) val inOrder = Mockito.inOrder(wallpaperController) - notificationShadeDepthController.onPanelExpansionChanged(rawFraction, expanded, tracking) + notificationShadeDepthController.onPanelExpansionChanged(event) notificationShadeDepthController.updateBlurCallback.doFrame(0) inOrder.verify(wallpaperController).setNotificationShadeZoom(floatThat { it > 0 }) enableSplitShade() - notificationShadeDepthController.onPanelExpansionChanged(rawFraction, expanded, tracking) + notificationShadeDepthController.onPanelExpansionChanged(event) notificationShadeDepthController.updateBlurCallback.doFrame(0) inOrder.verify(wallpaperController).setNotificationShadeZoom(0f) } @@ -332,8 +333,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Test fun updateBlurCallback_setsBlur_whenExpanded() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.updateBlurCallback.doFrame(0) verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false)) @@ -342,8 +343,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Test fun updateBlurCallback_ignoreShadeBlurUntilHidden_overridesZoom() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = true notificationShadeDepthController.updateBlurCallback.doFrame(0) @@ -353,15 +354,15 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Test fun ignoreShadeBlurUntilHidden_schedulesFrame() { notificationShadeDepthController.blursDisabledForAppLaunch = true - verify(choreographer).postFrameCallback( - eq(notificationShadeDepthController.updateBlurCallback)) + verify(choreographer) + .postFrameCallback(eq(notificationShadeDepthController.updateBlurCallback)) } @Test fun ignoreBlurForUnlock_ignores() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = false @@ -377,8 +378,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { @Test fun ignoreBlurForUnlock_doesNotIgnore() { notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.blursDisabledForAppLaunch = false @@ -409,8 +410,8 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { `when`(brightnessSpring.ratio).thenReturn(1f) // And shade is blurred notificationShadeDepthController.onPanelExpansionChanged( - rawFraction = 1f, expanded = true, tracking = false - ) + PanelExpansionChangeEvent( + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f)) `when`(shadeAnimation.radius).thenReturn(maxBlur.toFloat()) notificationShadeDepthController.updateBlurCallback.doFrame(0) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt index 188baaf682b0..ce58a6c82142 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt @@ -544,6 +544,9 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) { } + override fun setIsDreaming(isDreaming: Boolean) { + } + override fun setDozeAmount(amount: Float) { } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java index c9de60806b66..6409967aca9b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java @@ -228,19 +228,15 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { public void testUpdateEmptyShadeView_notificationsVisible_zenHiding() { when(mZenModeController.areNotificationsHiddenInShade()).thenReturn(true); mController.attach(mNotificationStackScrollLayout); - verify(mSysuiStatusBarStateController).addCallback( - mStateListenerArgumentCaptor.capture(), anyInt()); - StatusBarStateController.StateListener stateListener = - mStateListenerArgumentCaptor.getValue(); - setupShowEmptyShadeViewState(stateListener, true); + setupShowEmptyShadeViewState(true); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( /* visible= */ true, /* notifVisibleInShade= */ true); - setupShowEmptyShadeViewState(stateListener, false); + setupShowEmptyShadeViewState(false); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( @@ -252,19 +248,15 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { public void testUpdateEmptyShadeView_notificationsHidden_zenNotHiding() { when(mZenModeController.areNotificationsHiddenInShade()).thenReturn(false); mController.attach(mNotificationStackScrollLayout); - verify(mSysuiStatusBarStateController).addCallback( - mStateListenerArgumentCaptor.capture(), anyInt()); - StatusBarStateController.StateListener stateListener = - mStateListenerArgumentCaptor.getValue(); - setupShowEmptyShadeViewState(stateListener, true); + setupShowEmptyShadeViewState(true); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( /* visible= */ true, /* notifVisibleInShade= */ false); - setupShowEmptyShadeViewState(stateListener, false); + setupShowEmptyShadeViewState(false); reset(mNotificationStackScrollLayout); mController.updateShowEmptyShadeView(); verify(mNotificationStackScrollLayout).updateEmptyShadeView( @@ -407,15 +399,13 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { return argThat(new LogMatcher(category, type)); } - private void setupShowEmptyShadeViewState( - StatusBarStateController.StateListener statusBarStateListener, - boolean toShow) { + private void setupShowEmptyShadeViewState(boolean toShow) { if (toShow) { - statusBarStateListener.onStateChanged(SHADE); + when(mSysuiStatusBarStateController.getCurrentOrUpcomingState()).thenReturn(SHADE); mController.setQsFullScreen(false); mController.getView().removeAllViews(); } else { - statusBarStateListener.onStateChanged(KEYGUARD); + when(mSysuiStatusBarStateController.getCurrentOrUpcomingState()).thenReturn(KEYGUARD); mController.setQsFullScreen(true); mController.getView().addContainerView(mock(ExpandableNotificationRow.class)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java index 077f6bfc5f31..e8608fa76c06 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java @@ -34,15 +34,20 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.graphics.Rect; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.util.MathUtils; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; import androidx.test.annotation.UiThreadTest; import androidx.test.filters.SmallTest; @@ -572,9 +577,70 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { assertEquals(0, mStackScroller.getSpeedBumpIndex()); } + @Test + public void testInsideQSHeader_noOffset() { + ViewGroup qsHeader = mock(ViewGroup.class); + Rect boundsOnScreen = new Rect(0, 0, 1000, 1000); + mockBoundsOnScreen(qsHeader, boundsOnScreen); + + mStackScroller.setQsHeader(qsHeader); + mStackScroller.setLeftTopRightBottom(0, 0, 2000, 2000); + + MotionEvent event1 = transformEventForView(createMotionEvent(100f, 100f), mStackScroller); + assertTrue(mStackScroller.isInsideQsHeader(event1)); + + MotionEvent event2 = transformEventForView(createMotionEvent(1100f, 100f), mStackScroller); + assertFalse(mStackScroller.isInsideQsHeader(event2)); + } + + @Test + public void testInsideQSHeader_Offset() { + ViewGroup qsHeader = mock(ViewGroup.class); + Rect boundsOnScreen = new Rect(100, 100, 1000, 1000); + mockBoundsOnScreen(qsHeader, boundsOnScreen); + + mStackScroller.setQsHeader(qsHeader); + mStackScroller.setLeftTopRightBottom(200, 200, 2000, 2000); + + MotionEvent event1 = transformEventForView(createMotionEvent(50f, 50f), mStackScroller); + assertFalse(mStackScroller.isInsideQsHeader(event1)); + + MotionEvent event2 = transformEventForView(createMotionEvent(150f, 150f), mStackScroller); + assertTrue(mStackScroller.isInsideQsHeader(event2)); + + MotionEvent event3 = transformEventForView(createMotionEvent(250f, 250f), mStackScroller); + assertTrue(mStackScroller.isInsideQsHeader(event2)); + } + private void setBarStateForTest(int state) { // Can't inject this through the listener or we end up on the actual implementation // rather than the mock because the spy just coppied the anonymous inner /shruggie. mStackScroller.setStatusBarState(state); } + + private static void mockBoundsOnScreen(View view, Rect bounds) { + doAnswer(invocation -> { + Rect out = invocation.getArgument(0); + out.set(bounds); + return null; + }).when(view).getBoundsOnScreen(any()); + } + + private static MotionEvent transformEventForView(MotionEvent event, View view) { + // From `ViewGroup#dispatchTransformedTouchEvent` + MotionEvent transformed = event.copy(); + transformed.offsetLocation(-view.getTop(), -view.getLeft()); + return transformed; + } + + private static MotionEvent createMotionEvent(float x, float y) { + return MotionEvent.obtain( + /* downTime= */0, + /* eventTime= */0, + MotionEvent.ACTION_DOWN, + x, + y, + /* metaState= */0 + ); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt index 1f90d0cf9494..87ca1aa5eeb7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithmTest.kt @@ -47,7 +47,7 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test - fun testUpTranslationSetToDefaultValue() { + fun resetViewStates_defaultHun_yTranslationIsInset() { whenever(notificationRow.isPinned).thenReturn(true) whenever(notificationRow.isHeadsUp).thenReturn(true) @@ -57,7 +57,7 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test - fun testHeadsUpTranslationChangesBasedOnStackMargin() { + fun resetViewStates_stackMargin_changesHunYTranslation() { whenever(notificationRow.isPinned).thenReturn(true) whenever(notificationRow.isHeadsUp).thenReturn(true) val minHeadsUpTranslation = context.resources @@ -72,7 +72,7 @@ class StackScrollAlgorithmTest : SysuiTestCase() { } @Test - fun resetViewStates_childIsEmptyShadeView_viewIsCenteredVertically() { + fun resetViewStates_emptyShadeView_isCenteredVertically() { stackScrollAlgorithm.initView(context) val emptyShadeView = EmptyShadeView(context, /* attrs= */ null).apply { layout(/* l= */ 0, /* t= */ 0, /* r= */ 100, /* b= */ 100) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java index 05fb1f5959ea..cad603c85bbc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java @@ -56,6 +56,7 @@ import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; +import android.view.ViewParent; import android.view.ViewPropertyAnimator; import android.view.ViewStub; import android.view.accessibility.AccessibilityManager; @@ -99,6 +100,7 @@ import com.android.systemui.media.MediaHierarchyManager; import com.android.systemui.model.SysUiState; import com.android.systemui.navigationbar.NavigationModeController; import com.android.systemui.plugins.FalsingManager; +import com.android.systemui.plugins.qs.QS; import com.android.systemui.qrcodescanner.controller.QRCodeScannerController; import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.statusbar.CommandQueue; @@ -334,6 +336,12 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { private NotificationStackSizeCalculator mNotificationStackSizeCalculator; @Mock private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController; + @Mock + private QS mQs; + @Mock + private View mQsHeader; + @Mock + private ViewParent mViewParent; private NotificationPanelViewController.PanelEventsEmitter mPanelEventsEmitter; private Optional<SysUIUnfoldComponent> mSysUIUnfoldComponent = Optional.empty(); private SysuiStatusBarStateController mStatusBarStateController; @@ -455,6 +463,9 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { return null; }).when(mNotificationShadeWindowController).batchApplyWindowLayoutParams(any()); + when(mView.getParent()).thenReturn(mViewParent); + when(mQs.getHeader()).thenReturn(mQsHeader); + mMainHandler = new Handler(Looper.getMainLooper()); mPanelEventsEmitter = new NotificationPanelViewController.PanelEventsEmitter(); @@ -547,6 +558,37 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { } @Test + public void computeMaxKeyguardNotifications_lockscreenToShade_returnsExistingMax() { + when(mAmbientState.getFractionToShade()).thenReturn(0.5f); + mNotificationPanelViewController.setMaxDisplayedNotifications(-1); + + // computeMaxKeyguardNotifications sets maxAllowed to 0 at minimum if it updates the value + assertThat(mNotificationPanelViewController.computeMaxKeyguardNotifications()) + .isEqualTo(-1); + } + + @Test + public void computeMaxKeyguardNotifications_dozeAmountNotZero_returnsExistingMax() { + when(mAmbientState.getDozeAmount()).thenReturn(0.5f); + mNotificationPanelViewController.setMaxDisplayedNotifications(-1); + + // computeMaxKeyguardNotifications sets maxAllowed to 0 at minimum if it updates the value + assertThat(mNotificationPanelViewController.computeMaxKeyguardNotifications()) + .isEqualTo(-1); + } + + @Test + public void computeMaxKeyguardNotifications_noTransition_updatesMax() { + when(mAmbientState.getFractionToShade()).thenReturn(0f); + when(mAmbientState.getDozeAmount()).thenReturn(0f); + mNotificationPanelViewController.setMaxDisplayedNotifications(-1); + + // computeMaxKeyguardNotifications sets maxAllowed to 0 at minimum if it updates the value + assertThat(mNotificationPanelViewController.computeMaxKeyguardNotifications()) + .isNotEqualTo(-1); + } + + @Test public void testSetPanelScrimMinFraction() { mNotificationPanelViewController.setPanelScrimMinFraction(0.5f); verify(mNotificationShadeDepthController).setPanelPullDownMinFraction(eq(0.5f)); @@ -984,6 +1026,50 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { assertThat(mNotificationPanelViewController.mQsExpandImmediate).isTrue(); } + @Test + public void interceptTouchEvent_withinQs_shadeExpanded_startsQsTracking() { + mNotificationPanelViewController.mQs = mQs; + when(mQsFrame.getX()).thenReturn(0f); + when(mQsFrame.getWidth()).thenReturn(1000); + when(mQsHeader.getTop()).thenReturn(0); + when(mQsHeader.getBottom()).thenReturn(1000); + PanelViewController.TouchHandler touchHandler = + mNotificationPanelViewController.createTouchHandler(); + + mNotificationPanelViewController.setExpandedFraction(1f); + touchHandler.onInterceptTouchEvent( + createMotionEvent(/* x= */ 0, /* y= */ 0, MotionEvent.ACTION_DOWN)); + touchHandler.onInterceptTouchEvent( + createMotionEvent(/* x= */ 0, /* y= */ 500, MotionEvent.ACTION_MOVE)); + + assertThat(mNotificationPanelViewController.isQsTracking()).isTrue(); + } + + @Test + public void interceptTouchEvent_withinQs_shadeExpanded_inSplitShade_doesNotStartQsTracking() { + enableSplitShade(true); + mNotificationPanelViewController.mQs = mQs; + when(mQsFrame.getX()).thenReturn(0f); + when(mQsFrame.getWidth()).thenReturn(1000); + when(mQsHeader.getTop()).thenReturn(0); + when(mQsHeader.getBottom()).thenReturn(1000); + PanelViewController.TouchHandler touchHandler = + mNotificationPanelViewController.createTouchHandler(); + + mNotificationPanelViewController.setExpandedFraction(1f); + touchHandler.onInterceptTouchEvent( + createMotionEvent(/* x= */ 0, /* y= */ 0, MotionEvent.ACTION_DOWN)); + touchHandler.onInterceptTouchEvent( + createMotionEvent(/* x= */ 0, /* y= */ 500, MotionEvent.ACTION_MOVE)); + + assertThat(mNotificationPanelViewController.isQsTracking()).isFalse(); + } + + private static MotionEvent createMotionEvent(int x, int y, int action) { + return MotionEvent.obtain( + /* downTime= */ 0, /* eventTime= */ 0, action, x, y, /* metaState= */ 0); + } + private void triggerPositionClockAndNotifications() { mNotificationPanelViewController.closeQs(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 2b018727eb98..38e018b42985 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -50,6 +50,7 @@ import com.android.systemui.plugins.ActivityStarter.OnDismissAction; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.phone.panelstate.PanelExpansionChangeEvent; import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -70,48 +71,30 @@ import java.util.Optional; @TestableLooper.RunWithLooper public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { - @Mock - private ViewMediatorCallback mViewMediatorCallback; - @Mock - private LockPatternUtils mLockPatternUtils; - @Mock - private KeyguardStateController mKeyguardStateController; - @Mock - private CentralSurfaces mCentralSurfaces; - @Mock - private ViewGroup mContainer; - @Mock - private NotificationPanelViewController mNotificationPanelView; - @Mock - private BiometricUnlockController mBiometricUnlockController; - @Mock - private SysuiStatusBarStateController mStatusBarStateController; - @Mock - private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - @Mock - private View mNotificationContainer; - @Mock - private KeyguardBypassController mBypassController; - @Mock - private KeyguardBouncer.Factory mKeyguardBouncerFactory; - @Mock - private KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory; - @Mock - private KeyguardMessageAreaController mKeyguardMessageAreaController; - @Mock - private KeyguardBouncer mBouncer; - @Mock - private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor; - @Mock - private KeyguardMessageArea mKeyguardMessageArea; - @Mock - private ShadeController mShadeController; - @Mock - private SysUIUnfoldComponent mSysUiUnfoldComponent; - @Mock - private DreamOverlayStateController mDreamOverlayStateController; - @Mock - private LatencyTracker mLatencyTracker; + private static final PanelExpansionChangeEvent EXPANSION_EVENT = + expansionEvent(/* fraction= */ 0.5f, /* expanded= */ false, /* tracking= */ true); + + @Mock private ViewMediatorCallback mViewMediatorCallback; + @Mock private LockPatternUtils mLockPatternUtils; + @Mock private KeyguardStateController mKeyguardStateController; + @Mock private CentralSurfaces mCentralSurfaces; + @Mock private ViewGroup mContainer; + @Mock private NotificationPanelViewController mNotificationPanelView; + @Mock private BiometricUnlockController mBiometricUnlockController; + @Mock private SysuiStatusBarStateController mStatusBarStateController; + @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; + @Mock private View mNotificationContainer; + @Mock private KeyguardBypassController mBypassController; + @Mock private KeyguardBouncer.Factory mKeyguardBouncerFactory; + @Mock private KeyguardMessageAreaController.Factory mKeyguardMessageAreaFactory; + @Mock private KeyguardMessageAreaController mKeyguardMessageAreaController; + @Mock private KeyguardBouncer mBouncer; + @Mock private StatusBarKeyguardViewManager.AlternateAuthInterceptor mAlternateAuthInterceptor; + @Mock private KeyguardMessageArea mKeyguardMessageArea; + @Mock private ShadeController mShadeController; + @Mock private SysUIUnfoldComponent mSysUiUnfoldComponent; + @Mock private DreamOverlayStateController mDreamOverlayStateController; + @Mock private LatencyTracker mLatencyTracker; private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; @@ -119,31 +102,31 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void setUp() { MockitoAnnotations.initMocks(this); when(mKeyguardBouncerFactory.create( - any(ViewGroup.class), - any(KeyguardBouncer.BouncerExpansionCallback.class))) + any(ViewGroup.class), any(KeyguardBouncer.BouncerExpansionCallback.class))) .thenReturn(mBouncer); when(mCentralSurfaces.getBouncerContainer()).thenReturn(mContainer); when(mContainer.findViewById(anyInt())).thenReturn(mKeyguardMessageArea); when(mKeyguardMessageAreaFactory.create(any(KeyguardMessageArea.class))) .thenReturn(mKeyguardMessageAreaController); - mStatusBarKeyguardViewManager = new StatusBarKeyguardViewManager( - getContext(), - mViewMediatorCallback, - mLockPatternUtils, - mStatusBarStateController, - mock(ConfigurationController.class), - mKeyguardUpdateMonitor, - mDreamOverlayStateController, - mock(NavigationModeController.class), - mock(DockManager.class), - mock(NotificationShadeWindowController.class), - mKeyguardStateController, - mock(NotificationMediaManager.class), - mKeyguardBouncerFactory, - mKeyguardMessageAreaFactory, - Optional.of(mSysUiUnfoldComponent), - () -> mShadeController, - mLatencyTracker); + mStatusBarKeyguardViewManager = + new StatusBarKeyguardViewManager( + getContext(), + mViewMediatorCallback, + mLockPatternUtils, + mStatusBarStateController, + mock(ConfigurationController.class), + mKeyguardUpdateMonitor, + mDreamOverlayStateController, + mock(NavigationModeController.class), + mock(DockManager.class), + mock(NotificationShadeWindowController.class), + mKeyguardStateController, + mock(NotificationMediaManager.class), + mKeyguardBouncerFactory, + mKeyguardMessageAreaFactory, + Optional.of(mSysUiUnfoldComponent), + () -> mShadeController, + mLatencyTracker); mStatusBarKeyguardViewManager.registerCentralSurfaces( mCentralSurfaces, mNotificationPanelView, @@ -159,8 +142,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void dismissWithAction_AfterKeyguardGoneSetToFalse() { OnDismissAction action = () -> false; Runnable cancelAction = () -> {}; - mStatusBarKeyguardViewManager.dismissWithAction(action, cancelAction, - false /* afterKeyguardGone */); + mStatusBarKeyguardViewManager.dismissWithAction( + action, cancelAction, false /* afterKeyguardGone */); verify(mBouncer).showWithDismissAction(eq(action), eq(cancelAction)); } @@ -191,67 +174,55 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void onPanelExpansionChanged_neverHidesScrimmedBouncer() { when(mBouncer.isShowing()).thenReturn(true); when(mBouncer.isScrimmed()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer).setExpansion(eq(KeyguardBouncer.EXPANSION_VISIBLE)); } @Test public void onPanelExpansionChanged_neverShowsDuringHintAnimation() { when(mNotificationPanelView.isUnlockHintRunning()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer).setExpansion(eq(KeyguardBouncer.EXPANSION_HIDDEN)); } @Test public void onPanelExpansionChanged_propagatesToBouncer() { - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer).setExpansion(eq(0.5f)); } @Test + public void onPanelExpansionChanged_propagatesToBouncer_evenAfterHidden() { + mStatusBarKeyguardViewManager.hide(0, 0); + when(mBouncer.inTransit()).thenReturn(true); + + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); + verify(mBouncer).setExpansion(eq(EXPANSION_EVENT.getFraction())); + } + + @Test public void onPanelExpansionChanged_showsBouncerWhenSwiping() { when(mKeyguardStateController.canDismissLockScreen()).thenReturn(false); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer).show(eq(false), eq(false)); // But not when it's already visible reset(mBouncer); when(mBouncer.isShowing()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer, never()).show(eq(false), eq(false)); // Or animating away reset(mBouncer); when(mBouncer.isAnimatingAway()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer, never()).show(eq(false), eq(false)); } @Test public void onPanelExpansionChanged_neverTranslatesBouncerWhenOccluded() { mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animate */); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); + mStatusBarKeyguardViewManager.onPanelExpansionChanged(EXPANSION_EVENT); verify(mBouncer, never()).setExpansion(eq(0.5f)); } @@ -260,9 +231,10 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { when(mBiometricUnlockController.getMode()) .thenReturn(BiometricUnlockController.MODE_WAKE_AND_UNLOCK); mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false); + expansionEvent( + /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, + /* expanded= */ true, + /* tracking= */ false)); verify(mBouncer, never()).setExpansion(anyFloat()); } @@ -270,9 +242,10 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() { when(mCentralSurfaces.isInLaunchTransition()).thenReturn(true); mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, - /* expanded= */ true, - /* tracking= */ false); + expansionEvent( + /* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE, + /* expanded= */ true, + /* tracking= */ false)); verify(mBouncer, never()).setExpansion(anyFloat()); } @@ -336,8 +309,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void testHiding_cancelsGoneRunnable() { OnDismissAction action = mock(OnDismissAction.class); Runnable cancelAction = mock(Runnable.class); - mStatusBarKeyguardViewManager.dismissWithAction(action, cancelAction, - true /* afterKeyguardGone */); + mStatusBarKeyguardViewManager.dismissWithAction( + action, cancelAction, true /* afterKeyguardGone */); mStatusBarKeyguardViewManager.hideBouncer(true); mStatusBarKeyguardViewManager.hide(0, 30); @@ -349,8 +322,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { public void testHiding_doesntCancelWhenShowing() { OnDismissAction action = mock(OnDismissAction.class); Runnable cancelAction = mock(Runnable.class); - mStatusBarKeyguardViewManager.dismissWithAction(action, cancelAction, - true /* afterKeyguardGone */); + mStatusBarKeyguardViewManager.dismissWithAction( + action, cancelAction, true /* afterKeyguardGone */); mStatusBarKeyguardViewManager.hide(0, 30); verify(action).onDismiss(); @@ -362,7 +335,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor); when(mBouncer.isShowing()).thenReturn(false); when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true); - assertTrue("Is showing not accurate when alternative auth showing", + assertTrue( + "Is showing not accurate when alternative auth showing", mStatusBarKeyguardViewManager.isShowing()); } @@ -371,7 +345,8 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor); when(mBouncer.isShowing()).thenReturn(false); when(mAlternateAuthInterceptor.isShowingAlternateAuthBouncer()).thenReturn(true); - assertTrue("Is or will be showing not accurate when alternative auth showing", + assertTrue( + "Is or will be showing not accurate when alternative auth showing", mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()); } @@ -412,8 +387,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { // GIVEN alt auth exists, unlocking with biometric is allowed mStatusBarKeyguardViewManager.setAlternateAuthInterceptor(mAlternateAuthInterceptor); when(mBouncer.isShowing()).thenReturn(false); - when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())) - .thenReturn(true); + when(mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(anyBoolean())).thenReturn(true); // WHEN showGenericBouncer is called mStatusBarKeyguardViewManager.showGenericBouncer(true); @@ -446,4 +420,10 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { mBouncer = null; Truth.assertThat(mStatusBarKeyguardViewManager.isBouncerInTransit()).isFalse(); } + + private static PanelExpansionChangeEvent expansionEvent( + float fraction, boolean expanded, boolean tracking) { + return new PanelExpansionChangeEvent( + fraction, expanded, tracking, /* dragDownPxAmount= */ 0f); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt index 1ce7ff424df1..1779de729e5b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarMoveFromCenterAnimationControllerTest.kt @@ -61,6 +61,15 @@ class StatusBarMoveFromCenterAnimationControllerTest : SysuiTestCase() { } @Test + fun onStatusBarWidthChangedWithNoTransitionBefore_noTranslation() { + controller.onViewsReady(arrayOf(view)) + + controller.onStatusBarWidthChanged() + + assertThat(view.translationX).isZero() + } + + @Test fun onTransitionProgress_updatesTranslations() { controller.onViewsReady(arrayOf(view)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt index 32bad5c084f5..c4f80492b084 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt @@ -39,12 +39,15 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { val fraction = 0.6f val expanded = true val tracking = true + val dragDownAmount = 1234f - panelExpansionStateManager.onPanelExpansionChanged(fraction, expanded, tracking) + panelExpansionStateManager.onPanelExpansionChanged( + fraction, expanded, tracking, dragDownAmount) assertThat(listener.fraction).isEqualTo(fraction) assertThat(listener.expanded).isEqualTo(expanded) assertThat(listener.tracking).isEqualTo(tracking) + assertThat(listener.dragDownAmountPx).isEqualTo(dragDownAmount) } @Test @@ -52,7 +55,9 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { val fraction = 0.6f val expanded = true val tracking = true - panelExpansionStateManager.onPanelExpansionChanged(fraction, expanded, tracking) + val dragDownAmount = 1234f + panelExpansionStateManager.onPanelExpansionChanged( + fraction, expanded, tracking, dragDownAmount) val listener = TestPanelExpansionListener() panelExpansionStateManager.addExpansionListener(listener) @@ -60,6 +65,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { assertThat(listener.fraction).isEqualTo(fraction) assertThat(listener.expanded).isEqualTo(expanded) assertThat(listener.tracking).isEqualTo(tracking) + assertThat(listener.dragDownAmountPx).isEqualTo(dragDownAmount) } @Test @@ -82,8 +88,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.addStateListener(listener) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 0.5f, expanded = true, tracking = false - ) + fraction = 0.5f, expanded = true, tracking = false, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_OPENING) } @@ -94,8 +99,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.addStateListener(listener) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 0.5f, expanded = true, tracking = true - ) + fraction = 0.5f, expanded = true, tracking = true, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_OPENING) } @@ -108,8 +112,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.updateState(STATE_OPEN) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 0.5f, expanded = false, tracking = false - ) + fraction = 0.5f, expanded = false, tracking = false, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_CLOSED) } @@ -122,8 +125,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.updateState(STATE_OPEN) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 0.5f, expanded = false, tracking = true - ) + fraction = 0.5f, expanded = false, tracking = true, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_OPEN) } @@ -136,8 +138,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.addStateListener(listener) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 1f, expanded = true, tracking = false - ) + fraction = 1f, expanded = true, tracking = false, dragDownPxAmount = 0f) assertThat(listener.previousState).isEqualTo(STATE_OPENING) assertThat(listener.state).isEqualTo(STATE_OPEN) @@ -149,8 +150,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.addStateListener(listener) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 1f, expanded = true, tracking = true - ) + fraction = 1f, expanded = true, tracking = true, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_OPENING) } @@ -163,8 +163,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.updateState(STATE_OPEN) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 1f, expanded = false, tracking = false - ) + fraction = 1f, expanded = false, tracking = false, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_CLOSED) } @@ -177,8 +176,7 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { panelExpansionStateManager.updateState(STATE_OPEN) panelExpansionStateManager.onPanelExpansionChanged( - fraction = 1f, expanded = false, tracking = true - ) + fraction = 1f, expanded = false, tracking = true, dragDownPxAmount = 0f) assertThat(listener.state).isEqualTo(STATE_OPEN) } @@ -189,15 +187,13 @@ class PanelExpansionStateManagerTest : SysuiTestCase() { var fraction: Float = 0f var expanded: Boolean = false var tracking: Boolean = false + var dragDownAmountPx: Float = 0f - override fun onPanelExpansionChanged( - fraction: Float, - expanded: Boolean, - tracking: Boolean - ) { - this.fraction = fraction - this.expanded = expanded - this.tracking = tracking + override fun onPanelExpansionChanged(event: PanelExpansionChangeEvent) { + this.fraction = event.fraction + this.expanded = event.expanded + this.tracking = event.tracking + this.dragDownAmountPx = event.dragDownPxAmount } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt index e3d2a2951c97..6bd8b98f70e1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.policy import android.app.IActivityManager import android.app.admin.DevicePolicyManager +import android.content.BroadcastReceiver import android.content.Context import android.content.DialogInterface import android.content.Intent @@ -52,6 +53,10 @@ import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.phone.NotificationShadeWindowView import com.android.systemui.telephony.TelephonyListenerManager import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.mockito.any +import com.android.systemui.util.mockito.argumentCaptor +import com.android.systemui.util.mockito.capture +import com.android.systemui.util.mockito.nullable import com.android.systemui.util.settings.GlobalSettings import com.android.systemui.util.settings.SecureSettings import com.android.systemui.util.time.FakeSystemClock @@ -63,10 +68,8 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyInt -import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito.`when` -import org.mockito.Mockito.any import org.mockito.Mockito.doNothing import org.mockito.Mockito.doReturn import org.mockito.Mockito.eq @@ -529,4 +532,20 @@ class UserSwitcherControllerTest : SysuiTestCase() { setupController() assertFalse(userSwitcherController.canCreateSupervisedUser()) } + + @Test + fun addUserSwitchCallback() { + val broadcastReceiverCaptor = argumentCaptor<BroadcastReceiver>() + verify(broadcastDispatcher).registerReceiver( + capture(broadcastReceiverCaptor), + any(), + nullable(), nullable(), anyInt(), nullable()) + + val cb = mock(UserSwitcherController.UserSwitchCallback::class.java) + userSwitcherController.addUserSwitchCallback(cb) + + val intent = Intent(Intent.ACTION_USER_SWITCHED).putExtra(Intent.EXTRA_USER_HANDLE, guestId) + broadcastReceiverCaptor.value.onReceive(context, intent) + verify(cb).onUserSwitched() + } } diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 8c4db70c301d..aa5c501cd94e 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -805,12 +805,13 @@ final class AutofillManagerServiceImpl * Updates the last fill response when a dataset was selected. */ void logDatasetSelected(@Nullable String selectedDataset, int sessionId, - @Nullable Bundle clientState) { + @Nullable Bundle clientState, int presentationType) { synchronized (mLock) { if (isValidEventLocked("logDatasetSelected()", sessionId)) { mEventHistory.addEvent( new Event(Event.TYPE_DATASET_SELECTED, selectedDataset, clientState, null, - null, null, null, null, null, null, null)); + null, null, null, null, null, null, null, NO_SAVE_UI_REASON_NONE, + presentationType)); } } } diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 7e277ba3c0d0..f18d13d30da6 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -21,6 +21,7 @@ import static android.service.autofill.AutofillService.EXTRA_FILL_RESPONSE; import static android.service.autofill.FillEventHistory.Event.UI_TYPE_DIALOG; import static android.service.autofill.FillEventHistory.Event.UI_TYPE_INLINE; import static android.service.autofill.FillEventHistory.Event.UI_TYPE_MENU; +import static android.service.autofill.FillEventHistory.Event.UI_TYPE_UNKNOWN; import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST; import static android.service.autofill.FillRequest.FLAG_PASSWORD_INPUT_TYPE; import static android.service.autofill.FillRequest.FLAG_SUPPORTS_FILL_DIALOG; @@ -1406,7 +1407,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState // AutoFillUiCallback @Override - public void fill(int requestId, int datasetIndex, Dataset dataset) { + public void fill(int requestId, int datasetIndex, Dataset dataset, int uiType) { synchronized (mLock) { if (mDestroyed) { Slog.w(TAG, "Call to Session#fill() rejected - session: " @@ -1416,7 +1417,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } mHandler.sendMessage(obtainMessage( Session::autoFill, - this, requestId, datasetIndex, dataset, true)); + this, requestId, datasetIndex, dataset, true, uiType)); } // AutoFillUiCallback @@ -1657,7 +1658,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState if (!isAuthResultDatasetEphemeral(oldDataset, data)) { authenticatedResponse.getDatasets().set(datasetIdx, dataset); } - autoFill(requestId, datasetIdx, dataset, false); + autoFill(requestId, datasetIdx, dataset, false, UI_TYPE_UNKNOWN); } else { Slog.w(TAG, "invalid index (" + datasetIdx + ") for authentication id " + authenticationId); @@ -3376,7 +3377,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState new InlineFillUi.InlineSuggestionUiCallback() { @Override public void autofill(@NonNull Dataset dataset, int datasetIndex) { - fill(response.getRequestId(), datasetIndex, dataset); + fill(response.getRequestId(), datasetIndex, dataset, UI_TYPE_INLINE); } @Override @@ -3895,7 +3896,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState return viewState; } - void autoFill(int requestId, int datasetIndex, Dataset dataset, boolean generateEvent) { + void autoFill(int requestId, int datasetIndex, Dataset dataset, boolean generateEvent, + int uiType) { if (sDebug) { Slog.d(TAG, "autoFill(): requestId=" + requestId + "; datasetIdx=" + datasetIndex + "; dataset=" + dataset); @@ -3909,7 +3911,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState // Autofill it directly... if (dataset.getAuthentication() == null) { if (generateEvent) { - mService.logDatasetSelected(dataset.getId(), id, mClientState); + mService.logDatasetSelected(dataset.getId(), id, mClientState, uiType); } if (mCurrentViewId != null) { mInlineSessionController.hideInlineSuggestionsUiLocked(mCurrentViewId); diff --git a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java index 056ab92fffb2..57768ef32391 100644 --- a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java +++ b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java @@ -15,6 +15,9 @@ */ package com.android.server.autofill.ui; +import static android.service.autofill.FillEventHistory.Event.UI_TYPE_DIALOG; +import static android.service.autofill.FillEventHistory.Event.UI_TYPE_MENU; + import static com.android.server.autofill.Helper.sDebug; import static com.android.server.autofill.Helper.sVerbose; @@ -31,6 +34,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; import android.service.autofill.Dataset; +import android.service.autofill.FillEventHistory; import android.service.autofill.FillResponse; import android.service.autofill.SaveInfo; import android.service.autofill.ValueFinder; @@ -81,7 +85,8 @@ public final class AutoFillUI { public interface AutoFillUiCallback { void authenticate(int requestId, int datasetIndex, @NonNull IntentSender intent, @Nullable Bundle extras, boolean authenticateInline); - void fill(int requestId, int datasetIndex, @NonNull Dataset dataset); + void fill(int requestId, int datasetIndex, @NonNull Dataset dataset, + @FillEventHistory.Event.UiType int uiType); void save(); void cancelSave(); void requestShowFillUi(AutofillId id, int width, int height, @@ -236,7 +241,8 @@ public final class AutoFillUI { hideFillUiUiThread(callback, true); if (mCallback != null) { final int datasetIndex = response.getDatasets().indexOf(dataset); - mCallback.fill(response.getRequestId(), datasetIndex, dataset); + mCallback.fill(response.getRequestId(), datasetIndex, + dataset, UI_TYPE_MENU); } } @@ -414,7 +420,8 @@ public final class AutoFillUI { hideFillDialogUiThread(callback); if (mCallback != null) { final int datasetIndex = response.getDatasets().indexOf(dataset); - mCallback.fill(response.getRequestId(), datasetIndex, dataset); + mCallback.fill(response.getRequestId(), datasetIndex, dataset, + UI_TYPE_DIALOG); } } diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 8b48d0f39aaa..fbf648278543 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -143,10 +143,12 @@ public class Watchdog { "android.hardware.media.omx@1.0::IOmx", "android.hardware.media.omx@1.0::IOmxStore", "android.hardware.neuralnetworks@1.0::IDevice", + "android.hardware.power@1.0::IPower", "android.hardware.power.stats@1.0::IPowerStats", "android.hardware.sensors@1.0::ISensors", "android.hardware.sensors@2.0::ISensors", "android.hardware.sensors@2.1::ISensors", + "android.hardware.vibrator@1.0::IVibrator", "android.hardware.vr@1.0::IVr", "android.system.suspend@1.0::ISystemSuspend" ); @@ -155,7 +157,10 @@ public class Watchdog { "android.hardware.biometrics.face.IFace/", "android.hardware.biometrics.fingerprint.IFingerprint/", "android.hardware.light.ILights/", + "android.hardware.power.IPower/", "android.hardware.power.stats.IPowerStats/", + "android.hardware.vibrator.IVibrator/", + "android.hardware.vibrator.IVibratorManager/" }; private static Watchdog sWatchdog; diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b9a55f990ce5..c5a4ca4dc0e5 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8713,7 +8713,9 @@ public class ActivityManagerService extends IActivityManager.Stub if (dbox == null || !dbox.isTagEnabled(dropboxTag)) return; // Check if we should rate limit and abort early if needed. - if (mDropboxRateLimiter.shouldRateLimit(eventType, processName)) return; + final DropboxRateLimiter.RateLimitResult rateLimitResult = + mDropboxRateLimiter.shouldRateLimit(eventType, processName); + if (rateLimitResult.shouldRateLimit()) return; final StringBuilder sb = new StringBuilder(1024); appendDropBoxProcessHeaders(process, processName, sb); @@ -8762,6 +8764,8 @@ public class ActivityManagerService extends IActivityManager.Stub millisSinceOldestPendingRead).append("\n"); } } + sb.append("Dropped-Count: ").append( + rateLimitResult.droppedCountSinceRateLimitActivated()).append("\n"); sb.append("\n"); // Do the rest in a worker thread to avoid blocking the caller on I/O diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java index 6fa13eb0058b..6e28d8fbad59 100644 --- a/services/core/java/com/android/server/am/AppBatteryTracker.java +++ b/services/core/java/com/android/server/am/AppBatteryTracker.java @@ -276,7 +276,9 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> AppBackgroundRestrictionsInfo.REASON_UNKNOWN, // ExemptionReason AppBackgroundRestrictionsInfo.UNKNOWN, // OptimizationLevel AppBackgroundRestrictionsInfo.SDK_UNKNOWN, // TargetSdk - isLowRamDeviceStatic()); + isLowRamDeviceStatic(), + AppBackgroundRestrictionsInfo.LEVEL_UNKNOWN // previous RestrictionLevel + ); } } } @@ -287,7 +289,10 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> */ @Override byte[] getTrackerInfoForStatsd(int uid) { - final ImmutableBatteryUsage temp = mUidBatteryUsageInWindow.get(uid); + final ImmutableBatteryUsage temp; + synchronized (mLock) { + temp = mUidBatteryUsageInWindow.get(uid); + } if (temp == null) { return null; } @@ -301,11 +306,17 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> bgUsage.mPercentage[BatteryUsage.BATTERY_USAGE_INDEX_BACKGROUND]; final double usageFgs = bgUsage.mPercentage[BatteryUsage.BATTERY_USAGE_INDEX_FOREGROUND_SERVICE]; + final double usageForeground = + bgUsage.mPercentage[BatteryUsage.BATTERY_USAGE_INDEX_FOREGROUND]; + final double usageCached = + bgUsage.mPercentage[BatteryUsage.BATTERY_USAGE_INDEX_CACHED]; if (DEBUG_BACKGROUND_BATTERY_TRACKER_VERBOSE) { Slog.d(TAG, "getBatteryTrackerInfoProtoLocked uid:" + uid + " allUsage:" + String.format("%4.2f%%", allUsage) + " usageBackground:" + String.format("%4.2f%%", usageBackground) - + " usageFgs:" + String.format("%4.2f%%", usageFgs)); + + " usageFgs:" + String.format("%4.2f%%", usageFgs) + + " usageForeground:" + String.format("%4.2f%%", usageForeground) + + " usageCached:" + String.format("%4.2f%%", usageCached)); } final ProtoOutputStream proto = new ProtoOutputStream(); proto.write(AppBackgroundRestrictionsInfo.BatteryTrackerInfo.BATTERY_24H, @@ -314,6 +325,10 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> usageBackground * 10000); proto.write(AppBackgroundRestrictionsInfo.BatteryTrackerInfo.BATTERY_USAGE_FGS, usageFgs * 10000); + proto.write(AppBackgroundRestrictionsInfo.BatteryTrackerInfo.BATTERY_USAGE_FOREGROUND, + usageForeground * 10000); + proto.write(AppBackgroundRestrictionsInfo.BatteryTrackerInfo.BATTERY_USAGE_CACHED, + usageCached * 10000); proto.flush(); return proto.getBytes(); } @@ -1673,6 +1688,7 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> if (pair != null) { final long[] ts = pair.first; final int restrictedLevel = ts[TIME_STAMP_INDEX_RESTRICTED_BUCKET] > 0 + && mTracker.mAppRestrictionController.isAutoRestrictAbusiveAppEnabled() ? RESTRICTION_LEVEL_RESTRICTED_BUCKET : RESTRICTION_LEVEL_ADAPTIVE_BUCKET; if (maxLevel > RESTRICTION_LEVEL_BACKGROUND_RESTRICTED) { diff --git a/services/core/java/com/android/server/am/AppBindServiceEventsTracker.java b/services/core/java/com/android/server/am/AppBindServiceEventsTracker.java index 9bed077785f5..f9443226b692 100644 --- a/services/core/java/com/android/server/am/AppBindServiceEventsTracker.java +++ b/services/core/java/com/android/server/am/AppBindServiceEventsTracker.java @@ -24,6 +24,9 @@ import static com.android.server.am.BaseAppStateTracker.ONE_DAY; import android.annotation.NonNull; import android.app.ActivityManagerInternal.BindServiceEventListener; import android.content.Context; +import android.os.AppBackgroundRestrictionsInfo; +import android.os.SystemClock; +import android.util.proto.ProtoOutputStream; import com.android.server.am.AppBindServiceEventsTracker.AppBindServiceEventsPolicy; import com.android.server.am.AppRestrictionController.TrackerType; @@ -82,6 +85,22 @@ final class AppBindServiceEventsTracker extends BaseAppStateTimeSlotEventsTracke } @Override + byte[] getTrackerInfoForStatsd(int uid) { + final long now = SystemClock.elapsedRealtime(); + final int numOfBindRequests = getTotalEventsLocked(uid, now); + if (numOfBindRequests == 0) { + // Not interested. + return null; + } + final ProtoOutputStream proto = new ProtoOutputStream(); + proto.write( + AppBackgroundRestrictionsInfo.BindServiceEventsTrackerInfo.BIND_SERVICE_REQUESTS, + numOfBindRequests); + proto.flush(); + return proto.getBytes(); + } + + @Override void dump(PrintWriter pw, String prefix) { pw.print(prefix); pw.println("APP BIND SERVICE EVENT TRACKER:"); diff --git a/services/core/java/com/android/server/am/AppBroadcastEventsTracker.java b/services/core/java/com/android/server/am/AppBroadcastEventsTracker.java index a9155a115389..b509008f31df 100644 --- a/services/core/java/com/android/server/am/AppBroadcastEventsTracker.java +++ b/services/core/java/com/android/server/am/AppBroadcastEventsTracker.java @@ -24,6 +24,9 @@ import static com.android.server.am.BaseAppStateTracker.ONE_DAY; import android.annotation.NonNull; import android.app.ActivityManagerInternal.BroadcastEventListener; import android.content.Context; +import android.os.AppBackgroundRestrictionsInfo; +import android.os.SystemClock; +import android.util.proto.ProtoOutputStream; import com.android.server.am.AppBroadcastEventsTracker.AppBroadcastEventsPolicy; import com.android.server.am.AppRestrictionController.TrackerType; @@ -81,6 +84,21 @@ final class AppBroadcastEventsTracker extends BaseAppStateTimeSlotEventsTracker } @Override + byte[] getTrackerInfoForStatsd(int uid) { + final long now = SystemClock.elapsedRealtime(); + final int numOfBroadcasts = getTotalEventsLocked(uid, now); + if (numOfBroadcasts == 0) { + // Not interested. + return null; + } + final ProtoOutputStream proto = new ProtoOutputStream(); + proto.write(AppBackgroundRestrictionsInfo.BroadcastEventsTrackerInfo.BROADCASTS_SENT, + numOfBroadcasts); + proto.flush(); + return proto.getBytes(); + } + + @Override void dump(PrintWriter pw, String prefix) { pw.print(prefix); pw.println("APP BROADCAST EVENT TRACKER:"); diff --git a/services/core/java/com/android/server/am/AppFGSTracker.java b/services/core/java/com/android/server/am/AppFGSTracker.java index ddd27647c970..50515cd923d1 100644 --- a/services/core/java/com/android/server/am/AppFGSTracker.java +++ b/services/core/java/com/android/server/am/AppFGSTracker.java @@ -35,6 +35,7 @@ import android.app.IProcessObserver; import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo.ForegroundServiceType; +import android.os.AppBackgroundRestrictionsInfo; import android.os.Handler; import android.os.Message; import android.os.PowerExemptionManager.ReasonCode; @@ -49,6 +50,7 @@ import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.TimeUtils; +import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; @@ -516,6 +518,12 @@ final class AppFGSTracker extends BaseAppStateDurationsTracker<AppFGSPolicy, Pac foregroundServiceTypeToIndex(FOREGROUND_SERVICE_TYPE_NONE)); } + @Override + long getTotalDurations(int uid, long now) { + return getTotalDurations(uid, now, + foregroundServiceTypeToIndex(FOREGROUND_SERVICE_TYPE_NONE)); + } + boolean hasForegroundServices(String packageName, int uid) { synchronized (mLock) { final PackageDurations pkg = mPkgEvents.get(uid, packageName); @@ -562,6 +570,21 @@ final class AppFGSTracker extends BaseAppStateDurationsTracker<AppFGSPolicy, Pac } @Override + byte[] getTrackerInfoForStatsd(int uid) { + final long fgsDurations = getTotalDurations(uid, SystemClock.elapsedRealtime()); + if (fgsDurations == 0L) { + // Not interested + return null; + } + final ProtoOutputStream proto = new ProtoOutputStream(); + proto.write(AppBackgroundRestrictionsInfo.FgsTrackerInfo.FGS_NOTIFICATION_VISIBLE, + hasForegroundServiceNotifications(uid)); + proto.write(AppBackgroundRestrictionsInfo.FgsTrackerInfo.FGS_DURATION, fgsDurations); + proto.flush(); + return proto.getBytes(); + } + + @Override void dump(PrintWriter pw, String prefix) { pw.print(prefix); pw.println("APP FOREGROUND SERVICE TRACKER:"); diff --git a/services/core/java/com/android/server/am/AppRestrictionController.java b/services/core/java/com/android/server/am/AppRestrictionController.java index da083aff62ff..f7abb117e3de 100644 --- a/services/core/java/com/android/server/am/AppRestrictionController.java +++ b/services/core/java/com/android/server/am/AppRestrictionController.java @@ -1063,6 +1063,13 @@ public final class AppRestrictionController { DEVICE_CONFIG_SUBNAMESPACE_PREFIX + "auto_restricted_bucket_on_bg_restricted"; /** + * Whether or not to move the app to restricted standby level automatically + * when system detects it's abusive. + */ + static final String KEY_BG_AUTO_RESTRICT_ABUSIVE_APPS = + DEVICE_CONFIG_SUBNAMESPACE_PREFIX + "auto_restrict_abusive_apps"; + + /** * The minimal interval in ms before posting a notification again on abusive behaviors * of a certain package. */ @@ -1107,6 +1114,11 @@ public final class AppRestrictionController { DEVICE_CONFIG_SUBNAMESPACE_PREFIX + "prompt_abusive_apps_to_bg_restricted"; /** + * Default value to {@link #mBgAutoRestrictAbusiveApps}. + */ + static final boolean DEFAULT_BG_AUTO_RESTRICT_ABUSIVE_APPS = true; + + /** * Default value to {@link #mBgAutoRestrictedBucket}. */ static final boolean DEFAULT_BG_AUTO_RESTRICTED_BUCKET_ON_BG_RESTRICTION = false; @@ -1138,6 +1150,8 @@ public final class AppRestrictionController { volatile boolean mBgAutoRestrictedBucket; + volatile boolean mBgAutoRestrictAbusiveApps; + volatile boolean mRestrictedBucketEnabled; volatile long mBgAbusiveNotificationMinIntervalMs; @@ -1184,6 +1198,9 @@ public final class AppRestrictionController { case KEY_BG_AUTO_RESTRICTED_BUCKET_ON_BG_RESTRICTION: updateBgAutoRestrictedBucketChanged(); break; + case KEY_BG_AUTO_RESTRICT_ABUSIVE_APPS: + updateBgAutoRestrictAbusiveApps(); + break; case KEY_BG_ABUSIVE_NOTIFICATION_MINIMAL_INTERVAL: updateBgAbusiveNotificationMinimalInterval(); break; @@ -1232,6 +1249,7 @@ public final class AppRestrictionController { void updateDeviceConfig() { updateBgAutoRestrictedBucketChanged(); + updateBgAutoRestrictAbusiveApps(); updateBgAbusiveNotificationMinimalInterval(); updateBgLongFgsNotificationMinimalInterval(); updateBgPromptFgsWithNotiToBgRestricted(); @@ -1251,6 +1269,13 @@ public final class AppRestrictionController { } } + private void updateBgAutoRestrictAbusiveApps() { + mBgAutoRestrictAbusiveApps = DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + KEY_BG_AUTO_RESTRICT_ABUSIVE_APPS, + DEFAULT_BG_AUTO_RESTRICT_ABUSIVE_APPS); + } + private void updateBgAbusiveNotificationMinimalInterval() { mBgAbusiveNotificationMinIntervalMs = DeviceConfig.getLong( DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -1313,6 +1338,10 @@ public final class AppRestrictionController { pw.print('='); pw.println(mBgAutoRestrictedBucket); pw.print(prefix); + pw.print(KEY_BG_AUTO_RESTRICT_ABUSIVE_APPS); + pw.print('='); + pw.println(mBgAutoRestrictAbusiveApps); + pw.print(prefix); pw.print(KEY_BG_ABUSIVE_NOTIFICATION_MINIMAL_INTERVAL); pw.print('='); pw.println(mBgAbusiveNotificationMinIntervalMs); @@ -1772,6 +1801,14 @@ public final class AppRestrictionController { } /** + * @return Whether or not to move the app to restricted level automatically + * when system detects it's abusive. + */ + boolean isAutoRestrictAbusiveAppEnabled() { + return mConstantsObserver.mBgAutoRestrictAbusiveApps; + } + + /** * @return The total foreground service durations for the given package/uid with given * foreground service type, or the total durations regardless the type if the given type is 0. */ @@ -2049,6 +2086,9 @@ public final class AppRestrictionController { int curLevel; int prevReason; final AppStandbyInternal appStandbyInternal = mInjector.getAppStandbyInternal(); + if (trackerInfo == null) { + trackerInfo = mEmptyTrackerInfo; + } synchronized (mSettingsLock) { curLevel = getRestrictionLevel(uid, pkgName); if (curLevel == level) { @@ -2101,14 +2141,21 @@ public final class AppRestrictionController { // It's currently active, enqueue it. final int localReason = reason; final int localSubReason = subReason; - mActiveUids.add(uid, pkgName, () -> appStandbyInternal.restrictApp( - pkgName, UserHandle.getUserId(uid), localReason, localSubReason)); + final TrackerInfo localTrackerInfo = trackerInfo; + mActiveUids.add(uid, pkgName, () -> { + appStandbyInternal.restrictApp(pkgName, UserHandle.getUserId(uid), + localReason, localSubReason); + logAppBackgroundRestrictionInfo(pkgName, uid, curLevel, level, + localTrackerInfo, localReason); + }); doIt = false; } } if (doIt) { appStandbyInternal.restrictApp(pkgName, UserHandle.getUserId(uid), reason, subReason); + logAppBackgroundRestrictionInfo(pkgName, uid, curLevel, level, trackerInfo, + reason); } } } else if (curLevel >= RESTRICTION_LEVEL_RESTRICTED_BUCKET @@ -2123,11 +2170,14 @@ public final class AppRestrictionController { appStandbyInternal.maybeUnrestrictApp(pkgName, UserHandle.getUserId(uid), prevReason & REASON_MAIN_MASK, prevReason & REASON_SUB_MASK, reason, subReason); + logAppBackgroundRestrictionInfo(pkgName, uid, curLevel, level, trackerInfo, + reason); } + } - if (trackerInfo == null) { - trackerInfo = mEmptyTrackerInfo; - } + private void logAppBackgroundRestrictionInfo(String pkgName, int uid, + @RestrictionLevel int prevLevel, @RestrictionLevel int level, + @NonNull TrackerInfo trackerInfo, int reason) { FrameworkStatsLog.write(FrameworkStatsLog.APP_BACKGROUND_RESTRICTIONS_INFO, uid, getRestrictionLevelStatsd(level), getThresholdStatsd(reason), @@ -2139,7 +2189,8 @@ public final class AppRestrictionController { getExemptionReasonStatsd(uid, level), getOptimizationLevelStatsd(level), getTargetSdkStatsd(pkgName), - ActivityManager.isLowRamDeviceStatic()); + ActivityManager.isLowRamDeviceStatic(), + getRestrictionLevelStatsd(prevLevel)); } private void handleBackgroundRestrictionChanged(int uid, String pkgName, boolean restricted) { @@ -2398,6 +2449,22 @@ public final class AppRestrictionController { } void postLongRunningFgsIfNecessary(String packageName, int uid) { + // Log the event in statsd. + FrameworkStatsLog.write(FrameworkStatsLog.APP_BACKGROUND_RESTRICTIONS_INFO, + uid, + mBgController.getRestrictionLevel(uid), + AppBackgroundRestrictionsInfo.THRESHOLD_UNKNOWN, + AppBackgroundRestrictionsInfo.FGS_TRACKER, + mInjector.getAppFGSTracker().getTrackerInfoForStatsd(uid), + null, // BatteryTrackerInfo + null, // BroadcastEventsTrackerInfo + null, // BindServiceEventsTrackerInfo + getExemptionReasonForStatsd( + mBgController.getBackgroundRestrictionExemptionReason(uid)), + AppBackgroundRestrictionsInfo.UNKNOWN, // OptimizationLevel + AppBackgroundRestrictionsInfo.SDK_UNKNOWN, // TargetSdk + ActivityManager.isLowRamDeviceStatic(), + mBgController.getRestrictionLevel(uid)); PendingIntent pendingIntent; if (!mBgController.mConstantsObserver.mBgPromptFgsWithNotiOnLongRunning && mBgController.hasForegroundServiceNotifications(packageName, uid)) { diff --git a/services/core/java/com/android/server/am/BaseAppStateTimeSlotEventsTracker.java b/services/core/java/com/android/server/am/BaseAppStateTimeSlotEventsTracker.java index b8aee13ccdd7..ff78355121d5 100644 --- a/services/core/java/com/android/server/am/BaseAppStateTimeSlotEventsTracker.java +++ b/services/core/java/com/android/server/am/BaseAppStateTimeSlotEventsTracker.java @@ -133,6 +133,15 @@ abstract class BaseAppStateTimeSlotEventsTracker mTmpPkgs.clear(); } + @GuardedBy("mLock") + int getTotalEventsLocked(int uid, long now) { + final U events = getUidEventsLocked(uid); + if (events == null) { + return 0; + } + return events.getTotalEvents(now, SimpleAppStateTimeslotEvents.DEFAULT_INDEX); + } + private void trimEvents() { final long now = SystemClock.elapsedRealtime(); trim(Math.max(0, now - mInjector.getPolicy().getMaxTrackingDuration())); @@ -301,6 +310,7 @@ abstract class BaseAppStateTimeSlotEventsTracker @RestrictionLevel int maxLevel) { synchronized (mLock) { final int level = mExcessiveEventPkgs.get(packageName, uid) == null + || !mTracker.mAppRestrictionController.isAutoRestrictAbusiveAppEnabled() ? RESTRICTION_LEVEL_ADAPTIVE_BUCKET : RESTRICTION_LEVEL_RESTRICTED_BUCKET; if (maxLevel > RESTRICTION_LEVEL_RESTRICTED_BUCKET) { diff --git a/services/core/java/com/android/server/am/ComponentAliasResolver.java b/services/core/java/com/android/server/am/ComponentAliasResolver.java index cf910d45b632..2db3b15e719d 100644 --- a/services/core/java/com/android/server/am/ComponentAliasResolver.java +++ b/services/core/java/com/android/server/am/ComponentAliasResolver.java @@ -104,7 +104,10 @@ public class ComponentAliasResolver { private static final String OPT_IN_PROPERTY = "com.android.EXPERIMENTAL_COMPONENT_ALIAS_OPT_IN"; - private static final String ALIAS_FILTER_ACTION = "android.intent.action.EXPERIMENTAL_IS_ALIAS"; + private static final String ALIAS_FILTER_ACTION = + "com.android.intent.action.EXPERIMENTAL_IS_ALIAS"; + private static final String ALIAS_FILTER_ACTION_ALT = + "android.intent.action.EXPERIMENTAL_IS_ALIAS"; private static final String META_DATA_ALIAS_TARGET = "alias_target"; private static final int PACKAGE_QUERY_FLAGS = @@ -223,8 +226,16 @@ public class ComponentAliasResolver { @GuardedBy("mLock") private void loadFromMetadataLocked() { if (DEBUG) Slog.d(TAG, "Scanning service aliases..."); - Intent i = new Intent(ALIAS_FILTER_ACTION); + // PM.queryInetntXxx() doesn't support "OR" queries, so we search for + // both the com.android... action and android... action on by one. + // It's okay if a single component handles both actions because the resulting aliases + // will be stored in a map and duplicates will naturally be removed. + loadFromMetadataLockedInner(new Intent(ALIAS_FILTER_ACTION_ALT)); + loadFromMetadataLockedInner(new Intent(ALIAS_FILTER_ACTION)); + } + + private void loadFromMetadataLockedInner(Intent i) { final List<ResolveInfo> services = mContext.getPackageManager().queryIntentServicesAsUser( i, PACKAGE_QUERY_FLAGS, UserHandle.USER_SYSTEM); diff --git a/services/core/java/com/android/server/am/DropboxRateLimiter.java b/services/core/java/com/android/server/am/DropboxRateLimiter.java index c51702359a6b..672736df88f3 100644 --- a/services/core/java/com/android/server/am/DropboxRateLimiter.java +++ b/services/core/java/com/android/server/am/DropboxRateLimiter.java @@ -49,7 +49,7 @@ public class DropboxRateLimiter { } /** Determines whether dropbox entries of a specific tag and process should be rate limited. */ - public boolean shouldRateLimit(String eventType, String processName) { + public RateLimitResult shouldRateLimit(String eventType, String processName) { // Rate-limit how often we're willing to do the heavy lifting to collect and record logs. final long now = mClock.uptimeMillis(); synchronized (mErrorClusterRecords) { @@ -60,17 +60,33 @@ public class DropboxRateLimiter { if (errRecord == null) { errRecord = new ErrorRecord(now, 1); mErrorClusterRecords.put(errorKey(eventType, processName), errRecord); - } else if (now - errRecord.getStartTime() > RATE_LIMIT_BUFFER_DURATION) { + return new RateLimitResult(false, 0); + } + + if (now - errRecord.getStartTime() > RATE_LIMIT_BUFFER_DURATION) { errRecord.setStartTime(now); errRecord.setCount(1); - } else { - errRecord.incrementCount(); - if (errRecord.getCount() > RATE_LIMIT_ALLOWED_ENTRIES) return true; + return new RateLimitResult(false, recentlyDroppedCount(errRecord)); + } + + errRecord.incrementCount(); + if (errRecord.getCount() > RATE_LIMIT_ALLOWED_ENTRIES) { + return new RateLimitResult(true, recentlyDroppedCount(errRecord)); } } - return false; + return new RateLimitResult(false, 0); } + /** + * Returns the number of entries of a certain type and process that have recenlty been + * dropped. Resets every RATE_LIMIT_BUFFER_DURATION if events are still actively created or + * RATE_LIMIT_BUFFER_EXPIRY if not. */ + private int recentlyDroppedCount(ErrorRecord errRecord) { + if (errRecord == null || errRecord.getCount() < RATE_LIMIT_ALLOWED_ENTRIES) return 0; + return errRecord.getCount() - RATE_LIMIT_ALLOWED_ENTRIES; + } + + private void maybeRemoveExpiredRecords(long now) { if (now - mLastMapCleanUp <= RATE_LIMIT_BUFFER_EXPIRY) return; @@ -87,6 +103,27 @@ public class DropboxRateLimiter { return eventType + processName; } + /** Holds information on whether we should rate limit and how many events have been dropped. */ + public class RateLimitResult { + boolean mShouldRateLimit; + int mDroppedCountSinceRateLimitActivated; + + public RateLimitResult(boolean shouldRateLimit, int droppedCountSinceRateLimitActivated) { + mShouldRateLimit = shouldRateLimit; + mDroppedCountSinceRateLimitActivated = droppedCountSinceRateLimitActivated; + } + + /** Whether to rate limit. */ + public boolean shouldRateLimit() { + return mShouldRateLimit; + } + + /** The number of dropped events since rate limit was activated. */ + public int droppedCountSinceRateLimitActivated() { + return mDroppedCountSinceRateLimitActivated; + } + } + private class ErrorRecord { long mStartTime; int mCount; diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index c48ff9f9f2cc..2dadcecc9f1f 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -97,6 +97,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT, DeviceConfig.NAMESPACE_SWCODEC_NATIVE, DeviceConfig.NAMESPACE_TETHERING, + DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE, DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE, DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, }; diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java index 766283b92d91..028288f73564 100644 --- a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java +++ b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java @@ -43,7 +43,6 @@ import android.os.RemoteException; import android.service.ambientcontext.AmbientContextDetectionResult; import android.service.ambientcontext.AmbientContextDetectionServiceStatus; import android.text.TextUtils; -import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.Slog; @@ -54,7 +53,6 @@ import com.android.server.infra.AbstractPerUserSystemService; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; -import java.util.Set; /** * Per-user manager service for {@link AmbientContextEvent}s. @@ -69,19 +67,13 @@ final class AmbientContextManagerPerUserService extends RemoteAmbientContextDetectionService mRemoteService; private ComponentName mComponentName; - private Set<PendingIntent> mExistingPendingIntents; AmbientContextManagerPerUserService( @NonNull AmbientContextManagerService master, Object lock, @UserIdInt int userId) { super(master, lock, userId); - mExistingPendingIntents = new ArraySet<>(); } void destroyLocked() { - if (isVerbose()) { - Slog.v(TAG, "destroyLocked()"); - } - Slog.d(TAG, "Trying to cancel the remote request. Reason: Service destroyed."); if (mRemoteService != null) { synchronized (mLock) { @@ -118,7 +110,19 @@ final class AmbientContextManagerPerUserService extends if (mComponentName == null) { mComponentName = updateServiceInfoLocked(); } - return mComponentName != null; + if (mComponentName == null) { + return false; + } + + ServiceInfo serviceInfo; + try { + serviceInfo = AppGlobals.getPackageManager().getServiceInfo( + mComponentName, 0, mUserId); + } catch (RemoteException e) { + Slog.w(TAG, "RemoteException while setting up service"); + return false; + } + return serviceInfo != null; } @Override @@ -171,18 +175,10 @@ final class AmbientContextManagerPerUserService extends return; } - // Remove any existing PendingIntent for this package. - String callingPackage = pendingIntent.getCreatorPackage(); - PendingIntent duplicatePendingIntent = findExistingRequestByPackage(callingPackage); - if (duplicatePendingIntent != null) { - Slog.d(TAG, "Replace duplicate request from " + callingPackage); - mExistingPendingIntents.remove(duplicatePendingIntent); - } - - // Register package and add pendingIntent to mExistingPendingIntents - startDetection(request, callingPackage, createDetectionResultRemoteCallback(), - getServerStatusCallback(clientStatusCallback)); - mExistingPendingIntents.add(pendingIntent); + // Register package and add to existing ClientRequests cache + startDetection(request, pendingIntent.getCreatorPackage(), + createDetectionResultRemoteCallback(), clientStatusCallback); + mMaster.newClientAdded(mUserId, request, pendingIntent, clientStatusCallback); } } @@ -214,15 +210,17 @@ final class AmbientContextManagerPerUserService extends @VisibleForTesting void startDetection(AmbientContextEventRequest request, String callingPackage, - RemoteCallback detectionResultCallback, RemoteCallback statusCallback) { + RemoteCallback detectionResultCallback, RemoteCallback clientStatusCallback) { Slog.d(TAG, "Requested detection of " + request.getEventTypes()); synchronized (mLock) { if (setUpServiceIfNeeded()) { ensureRemoteServiceInitiated(); mRemoteService.startDetection(request, callingPackage, detectionResultCallback, - statusCallback); + getServerStatusCallback(clientStatusCallback)); } else { Slog.w(TAG, "No valid component found for AmbientContextDetectionService"); + sendStatusToCallback(clientStatusCallback, + AmbientContextManager.STATUS_NOT_SUPPORTED); } } } @@ -245,15 +243,8 @@ final class AmbientContextManagerPerUserService extends */ public void onUnregisterObserver(String callingPackage) { synchronized (mLock) { - PendingIntent pendingIntent = findExistingRequestByPackage(callingPackage); - if (pendingIntent == null) { - Slog.d(TAG, "No registration found for " + callingPackage); - return; - } - - // Remove from existing requests - mExistingPendingIntents.remove(pendingIntent); - stopDetection(pendingIntent.getCreatorPackage()); + stopDetection(callingPackage); + mMaster.clientRemoved(mUserId, callingPackage); } } @@ -265,7 +256,7 @@ final class AmbientContextManagerPerUserService extends if (!setUpServiceIfNeeded()) { Slog.w(TAG, "Detection service is not available at this moment."); sendStatusToCallback(statusCallback, - AmbientContextManager.STATUS_SERVICE_UNAVAILABLE); + AmbientContextManager.STATUS_NOT_SUPPORTED); return; } ensureRemoteServiceInitiated(); @@ -382,16 +373,6 @@ final class AmbientContextManagerPerUserService extends } } - @Nullable - private PendingIntent findExistingRequestByPackage(String callingPackage) { - for (PendingIntent pendingIntent : mExistingPendingIntents) { - if (pendingIntent.getCreatorPackage().equals(callingPackage)) { - return pendingIntent; - } - } - return null; - } - /** * Sends out the Intent to the client after the event is detected. * @@ -418,22 +399,22 @@ final class AmbientContextManagerPerUserService extends } @NonNull - private RemoteCallback createDetectionResultRemoteCallback() { + RemoteCallback createDetectionResultRemoteCallback() { return new RemoteCallback(result -> { AmbientContextDetectionResult detectionResult = (AmbientContextDetectionResult) result.get( AmbientContextDetectionResult.RESULT_RESPONSE_BUNDLE_KEY); + String packageName = detectionResult.getPackageName(); + PendingIntent pendingIntent = mMaster.getPendingIntent(mUserId, packageName); + if (pendingIntent == null) { + return; + } + final long token = Binder.clearCallingIdentity(); try { - for (PendingIntent pendingIntent : mExistingPendingIntents) { - // Send PendingIntent to requesting packages - String creatorPackage = pendingIntent.getCreatorPackage(); - if (detectionResult.getPackageName().equals(creatorPackage)) { - sendDetectionResultIntent(pendingIntent, detectionResult); - Slog.i(TAG, "Got detection result of " + detectionResult.getEvents() - + " for " + creatorPackage); - } - } + sendDetectionResultIntent(pendingIntent, detectionResult); + Slog.i(TAG, "Got detection result of " + detectionResult.getEvents() + + " for " + packageName); } finally { Binder.restoreCallingIdentity(token); } diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java index cfca7ec6f568..4206262398c7 100644 --- a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java +++ b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java @@ -20,6 +20,7 @@ import static android.provider.DeviceConfig.NAMESPACE_AMBIENT_CONTEXT_MANAGER_SE import android.Manifest; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.PendingIntent; import android.app.ambientcontext.AmbientContextEvent; @@ -34,6 +35,7 @@ import android.os.ResultReceiver; import android.os.ShellCallback; import android.os.UserHandle; import android.provider.DeviceConfig; +import android.util.ArraySet; import android.util.Slog; import com.android.internal.R; @@ -60,9 +62,50 @@ public class AmbientContextManagerService extends /** Default value in absence of {@link DeviceConfig} override. */ private static final boolean DEFAULT_SERVICE_ENABLED = true; + public static final int MAX_TEMPORARY_SERVICE_DURATION_MS = 30000; + + static class ClientRequest { + private final int mUserId; + private final AmbientContextEventRequest mRequest; + private final PendingIntent mPendingIntent; + private final RemoteCallback mClientStatusCallback; + + ClientRequest(int userId, AmbientContextEventRequest request, + PendingIntent pendingIntent, RemoteCallback clientStatusCallback) { + this.mUserId = userId; + this.mRequest = request; + this.mPendingIntent = pendingIntent; + this.mClientStatusCallback = clientStatusCallback; + } + + String getPackageName() { + return mPendingIntent.getCreatorPackage(); + } + + AmbientContextEventRequest getRequest() { + return mRequest; + } + + PendingIntent getPendingIntent() { + return mPendingIntent; + } + + RemoteCallback getClientStatusCallback() { + return mClientStatusCallback; + } + + boolean hasUserId(int userId) { + return mUserId == userId; + } + + boolean hasUserIdAndPackageName(int userId, String packageName) { + return (userId == mUserId) && packageName.equals(getPackageName()); + } + } private final Context mContext; boolean mIsServiceEnabled; + private Set<ClientRequest> mExistingClientRequests; public AmbientContextManagerService(Context context) { super(context, @@ -73,6 +116,7 @@ public class AmbientContextManagerService extends PACKAGE_UPDATE_POLICY_REFRESH_EAGER | /*To avoid high latency*/ PACKAGE_RESTART_POLICY_REFRESH_EAGER); mContext = context; + mExistingClientRequests = new ArraySet<>(); } @Override @@ -94,6 +138,44 @@ public class AmbientContextManagerService extends } } + void newClientAdded(int userId, AmbientContextEventRequest request, + PendingIntent pendingIntent, RemoteCallback clientStatusCallback) { + Slog.d(TAG, "New client added: " + pendingIntent.getCreatorPackage()); + + // Remove any existing ClientRequest for this user and package. + mExistingClientRequests.removeAll( + findExistingRequests(userId, pendingIntent.getCreatorPackage())); + + // Add to existing ClientRequests + mExistingClientRequests.add( + new ClientRequest(userId, request, pendingIntent, clientStatusCallback)); + } + + void clientRemoved(int userId, String packageName) { + Slog.d(TAG, "Remove client: " + packageName); + mExistingClientRequests.removeAll(findExistingRequests(userId, packageName)); + } + + private Set<ClientRequest> findExistingRequests(int userId, String packageName) { + Set<ClientRequest> existingRequests = new ArraySet<>(); + for (ClientRequest clientRequest : mExistingClientRequests) { + if (clientRequest.hasUserIdAndPackageName(userId, packageName)) { + existingRequests.add(clientRequest); + } + } + return existingRequests; + } + + @Nullable + PendingIntent getPendingIntent(int userId, String packageName) { + for (ClientRequest clientRequest : mExistingClientRequests) { + if (clientRequest.hasUserIdAndPackageName(userId, packageName)) { + return clientRequest.getPendingIntent(); + } + } + return null; + } + private void onDeviceConfigChange(@NonNull Set<String> keys) { if (keys.contains(KEY_SERVICE_ENABLED)) { mIsServiceEnabled = DeviceConfig.getBoolean( @@ -111,9 +193,33 @@ public class AmbientContextManagerService extends @Override protected void onServiceRemoved( AmbientContextManagerPerUserService service, @UserIdInt int userId) { + Slog.d(TAG, "onServiceRemoved"); service.destroyLocked(); } + @Override + protected void onServicePackageRestartedLocked(@UserIdInt int userId) { + Slog.d(TAG, "Restoring remote request. Reason: Service package restarted."); + restorePreviouslyEnabledClients(userId); + } + + @Override + protected void onServicePackageUpdatedLocked(@UserIdInt int userId) { + Slog.d(TAG, "Restoring remote request. Reason: Service package updated."); + restorePreviouslyEnabledClients(userId); + } + + @Override + protected void enforceCallingPermissionForManagement() { + getContext().enforceCallingPermission( + Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG); + } + + @Override + protected int getMaximumTemporaryServiceDurationMs() { + return MAX_TEMPORARY_SERVICE_DURATION_MS; + } + /** Returns {@code true} if the detection service is configured on this device. */ public static boolean isDetectionServiceConfigured() { final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class); @@ -182,6 +288,22 @@ public class AmbientContextManagerService extends } } + private void restorePreviouslyEnabledClients(int userId) { + synchronized (mLock) { + final AmbientContextManagerPerUserService service = getServiceForUserLocked(userId); + for (ClientRequest clientRequest : mExistingClientRequests) { + // Start detection for previously enabled clients + if (clientRequest.hasUserId(userId)) { + Slog.d(TAG, "Restoring detection for " + clientRequest.getPackageName()); + service.startDetection(clientRequest.getRequest(), + clientRequest.getPackageName(), + service.createDetectionResultRemoteCallback(), + clientRequest.getClientStatusCallback()); + } + } + } + } + /** * Returns the AmbientContextManagerPerUserService component for this user. */ diff --git a/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java b/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java index a76eb8f1e55d..90b1b634f2ee 100644 --- a/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java +++ b/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java @@ -20,9 +20,11 @@ import android.annotation.NonNull; import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.ActivityTaskManager; +import android.app.IActivityTaskManager; import android.content.Context; import android.content.Intent; import android.os.ServiceManager; +import android.os.UserHandle; import android.service.games.GameService; import android.service.games.GameSessionService; import android.service.games.IGameService; @@ -47,14 +49,17 @@ final class GameServiceProviderInstanceFactoryImpl implements GameServiceProvide @Override public GameServiceProviderInstance create( @NonNull GameServiceComponentConfiguration configuration) { + final UserHandle userHandle = configuration.getUserHandle(); + final IActivityTaskManager activityTaskManager = ActivityTaskManager.getService(); return new GameServiceProviderInstanceImpl( - configuration.getUserHandle(), + userHandle, BackgroundThread.getExecutor(), mContext, - new GameClassifierImpl(mContext.getPackageManager()), + new GameTaskInfoProvider(userHandle, activityTaskManager, + new GameClassifierImpl(mContext.getPackageManager())), ActivityManager.getService(), LocalServices.getService(ActivityManagerInternal.class), - ActivityTaskManager.getService(), + activityTaskManager, (WindowManagerService) ServiceManager.getService(Context.WINDOW_SERVICE), LocalServices.getService(WindowManagerInternal.class), new GameServiceConnector(mContext, configuration), diff --git a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java index b38195aed250..a200067b8f3f 100644 --- a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java +++ b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java @@ -64,7 +64,6 @@ import com.android.server.wm.WindowManagerInternal; import com.android.server.wm.WindowManagerInternal.TaskSystemBarsListener; import com.android.server.wm.WindowManagerService; -import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -218,7 +217,7 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan private final UserHandle mUserHandle; private final Executor mBackgroundExecutor; private final Context mContext; - private final GameClassifier mGameClassifier; + private final GameTaskInfoProvider mGameTaskInfoProvider; private final IActivityManager mActivityManager; private final ActivityManagerInternal mActivityManagerInternal; private final IActivityTaskManager mActivityTaskManager; @@ -244,7 +243,7 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan @NonNull UserHandle userHandle, @NonNull Executor backgroundExecutor, @NonNull Context context, - @NonNull GameClassifier gameClassifier, + @NonNull GameTaskInfoProvider gameTaskInfoProvider, @NonNull IActivityManager activityManager, @NonNull ActivityManagerInternal activityManagerInternal, @NonNull IActivityTaskManager activityTaskManager, @@ -256,7 +255,7 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan mUserHandle = userHandle; mBackgroundExecutor = backgroundExecutor; mContext = context; - mGameClassifier = gameClassifier; + mGameTaskInfoProvider = gameTaskInfoProvider; mActivityManager = activityManager; mActivityManagerInternal = activityManagerInternal; mActivityTaskManager = activityTaskManager; @@ -344,13 +343,14 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } private void onTaskCreated(int taskId, @NonNull ComponentName componentName) { - String packageName = componentName.getPackageName(); - if (!mGameClassifier.isGame(packageName, mUserHandle)) { + final GameTaskInfo taskInfo = mGameTaskInfoProvider.get(taskId, componentName); + + if (!taskInfo.mIsGameTask) { return; } synchronized (mLock) { - gameTaskStartedLocked(taskId, componentName); + gameTaskStartedLocked(taskInfo); } } @@ -367,7 +367,17 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } final GameSessionRecord gameSessionRecord = mGameSessions.get(taskId); - if (gameSessionRecord == null || gameSessionRecord.getGameSession() == null) { + if (gameSessionRecord == null) { + if (focused) { + // The game session for a game task may have been destroyed when the game task + // was put into the background by pressing the back button. If the task is restored + // via the Recents UI there will be no TaskStackListener#onCreated call for the + // restoration, so this focus event is the first opportunity to re-create the game + // session. + maybeCreateGameSessionForFocusedTaskLocked(taskId); + } + return; + } else if (gameSessionRecord.getGameSession() == null) { return; } @@ -379,30 +389,50 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } @GuardedBy("mLock") - private void gameTaskStartedLocked(int taskId, @NonNull ComponentName componentName) { + private void maybeCreateGameSessionForFocusedTaskLocked(int taskId) { + if (DEBUG) { + Slog.d(TAG, "maybeRecreateGameSessionForFocusedTaskLocked() id: " + taskId); + } + + final GameTaskInfo taskInfo = mGameTaskInfoProvider.get(taskId); + if (taskInfo == null) { + Slog.w(TAG, "No task info for focused task: " + taskId); + return; + } + + if (!taskInfo.mIsGameTask) { + return; + } + + gameTaskStartedLocked(taskInfo); + } + + @GuardedBy("mLock") + private void gameTaskStartedLocked(@NonNull GameTaskInfo gameTaskInfo) { if (DEBUG) { - Slog.i(TAG, "gameStartedLocked() id: " + taskId + " component: " + componentName); + Slog.i(TAG, "gameStartedLocked(): " + gameTaskInfo); } if (!mIsRunning) { return; } - GameSessionRecord existingGameSessionRecord = mGameSessions.get(taskId); + GameSessionRecord existingGameSessionRecord = mGameSessions.get(gameTaskInfo.mTaskId); if (existingGameSessionRecord != null) { - Slog.w(TAG, "Existing game session found for task (id: " + taskId + Slog.w(TAG, "Existing game session found for task (id: " + gameTaskInfo.mTaskId + ") creation. Ignoring."); return; } GameSessionRecord gameSessionRecord = GameSessionRecord.awaitingGameSessionRequest( - taskId, componentName); - mGameSessions.put(taskId, gameSessionRecord); + gameTaskInfo.mTaskId, gameTaskInfo.mComponentName); + mGameSessions.put(gameTaskInfo.mTaskId, gameSessionRecord); AndroidFuture<Void> unusedPostGameStartedFuture = mGameServiceConnector.post( gameService -> { gameService.gameStarted( - new GameStartedEvent(taskId, componentName.getPackageName())); + new GameStartedEvent(gameTaskInfo.mTaskId, + gameTaskInfo.mComponentName.getPackageName())); }); } @@ -769,7 +799,7 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan @Nullable private GameSessionViewHostConfiguration createViewHostConfigurationForTask(int taskId) { - RunningTaskInfo runningTaskInfo = getRunningTaskInfoForTask(taskId); + RunningTaskInfo runningTaskInfo = mGameTaskInfoProvider.getRunningTaskInfo(taskId); if (runningTaskInfo == null) { return null; } @@ -781,28 +811,6 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan bounds.height()); } - @Nullable - private RunningTaskInfo getRunningTaskInfoForTask(int taskId) { - List<RunningTaskInfo> runningTaskInfos; - try { - runningTaskInfos = mActivityTaskManager.getTasks( - /* maxNum= */ Integer.MAX_VALUE, - /* filterOnlyVisibleRecents= */ true, - /* keepIntentExtra= */ false); - } catch (RemoteException ex) { - Slog.w(TAG, "Failed to fetch running tasks"); - return null; - } - - for (RunningTaskInfo taskInfo : runningTaskInfos) { - if (taskInfo.taskId == taskId) { - return taskInfo; - } - } - - return null; - } - @VisibleForTesting void takeScreenshot(int taskId, @NonNull AndroidFuture callback) { GameSessionRecord gameSessionRecord; @@ -834,7 +842,8 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan } else { final Bundle bundle = ScreenshotHelper.HardwareBitmapBundler.hardwareBitmapToBundle( bitmap); - final RunningTaskInfo runningTaskInfo = getRunningTaskInfoForTask(taskId); + final RunningTaskInfo runningTaskInfo = + mGameTaskInfoProvider.getRunningTaskInfo(taskId); if (runningTaskInfo == null) { Slog.w(TAG, "Could not get running task info for id: " + taskId); callback.complete(GameScreenshotResult.createInternalErrorResult()); diff --git a/services/core/java/com/android/server/app/GameTaskInfo.java b/services/core/java/com/android/server/app/GameTaskInfo.java new file mode 100644 index 000000000000..7548dbd06c5c --- /dev/null +++ b/services/core/java/com/android/server/app/GameTaskInfo.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 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.app; + +import android.content.ComponentName; + +import java.util.Objects; + +final class GameTaskInfo { + final int mTaskId; + final boolean mIsGameTask; + final ComponentName mComponentName; + + GameTaskInfo(int taskId, boolean isGameTask, ComponentName componentName) { + mTaskId = taskId; + mIsGameTask = isGameTask; + mComponentName = componentName; + } + + @Override + public String toString() { + return "GameTaskInfo{" + + "mTaskId=" + + mTaskId + + ", mIsGameTask=" + + mIsGameTask + + ", mComponentName=" + + mComponentName + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof GameTaskInfo)) { + return false; + } + + GameTaskInfo that = (GameTaskInfo) o; + return mTaskId == that.mTaskId + && mIsGameTask == that.mIsGameTask + && mComponentName.equals(that.mComponentName); + } + + @Override + public int hashCode() { + return Objects.hash(mTaskId, mIsGameTask, mComponentName); + } +} diff --git a/services/core/java/com/android/server/app/GameTaskInfoProvider.java b/services/core/java/com/android/server/app/GameTaskInfoProvider.java new file mode 100644 index 000000000000..f078d98e5950 --- /dev/null +++ b/services/core/java/com/android/server/app/GameTaskInfoProvider.java @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2022 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.app; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.app.ActivityManager.RunningTaskInfo; +import android.app.IActivityTaskManager; +import android.content.ComponentName; +import android.os.RemoteException; +import android.os.UserHandle; +import android.util.LruCache; +import android.util.Slog; + +import com.android.internal.annotations.GuardedBy; + +import java.util.List; + +final class GameTaskInfoProvider { + private static final String TAG = "GameTaskInfoProvider"; + private static final int TASK_INFO_CACHE_MAX_SIZE = 50; + + private final Object mLock = new Object(); + + @GuardedBy("mLock") + private final LruCache<Integer, GameTaskInfo> mGameTaskInfoCache = new LruCache<>( + TASK_INFO_CACHE_MAX_SIZE); + + private final UserHandle mUserHandle; + private final IActivityTaskManager mActivityTaskManager; + private final GameClassifier mGameClassifier; + + GameTaskInfoProvider(@NonNull UserHandle userHandle, + @NonNull IActivityTaskManager activityTaskManager, + @NonNull GameClassifier gameClassifier) { + mUserHandle = userHandle; + mActivityTaskManager = activityTaskManager; + mGameClassifier = gameClassifier; + } + + @Nullable + GameTaskInfo get(int taskId) { + synchronized (mLock) { + final GameTaskInfo cachedTaskInfo = mGameTaskInfoCache.get(taskId); + if (cachedTaskInfo != null) { + return cachedTaskInfo; + } + } + + final RunningTaskInfo runningTaskInfo = getRunningTaskInfo(taskId); + if (runningTaskInfo == null || runningTaskInfo.baseActivity == null) { + return null; + } + + return generateGameInfo(taskId, runningTaskInfo.baseActivity); + } + + GameTaskInfo get(int taskId, @NonNull ComponentName componentName) { + synchronized (mLock) { + final GameTaskInfo cachedTaskInfo = mGameTaskInfoCache.get(taskId); + if (cachedTaskInfo != null) { + if (cachedTaskInfo.mComponentName.equals(componentName)) { + Slog.w(TAG, "Found cached task info for taskId " + taskId + + " but cached component name " + cachedTaskInfo.mComponentName + + " does not match " + componentName); + } else { + return cachedTaskInfo; + } + } + } + + return generateGameInfo(taskId, componentName); + } + + @Nullable + RunningTaskInfo getRunningTaskInfo(int taskId) { + List<RunningTaskInfo> runningTaskInfos; + try { + runningTaskInfos = mActivityTaskManager.getTasks( + /* maxNum= */ Integer.MAX_VALUE, + /* filterOnlyVisibleRecents= */ false, + /* keepIntentExtra= */ false); + } catch (RemoteException ex) { + Slog.w(TAG, "Failed to fetch running tasks"); + return null; + } + + for (RunningTaskInfo taskInfo : runningTaskInfos) { + if (taskInfo.taskId == taskId) { + return taskInfo; + } + } + + return null; + } + + private GameTaskInfo generateGameInfo(int taskId, @NonNull ComponentName componentName) { + final GameTaskInfo gameTaskInfo = new GameTaskInfo(taskId, + mGameClassifier.isGame(componentName.getPackageName(), mUserHandle), componentName); + + synchronized (mLock) { + mGameTaskInfoCache.put(taskId, gameTaskInfo); + } + + return gameTaskInfo; + } +} diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 361629b0a629..3e97b913a158 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -69,6 +69,7 @@ import static android.app.AppOpsManager.extractUidStateFromKey; import static android.app.AppOpsManager.makeKey; import static android.app.AppOpsManager.modeToName; import static android.app.AppOpsManager.opAllowSystemBypassRestriction; +import static android.app.AppOpsManager.opRestrictsRead; import static android.app.AppOpsManager.opToName; import static android.app.AppOpsManager.opToPublicName; import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState; @@ -2875,6 +2876,10 @@ public class AppOpsService extends IAppOpsService.Stub { // features may require permissions our remote caller does not have. final long identity = Binder.clearCallingIdentity(); try { + if (shouldIgnoreCallback(switchedCode, callback.mCallingPid, + callback.mCallingUid)) { + continue; + } callback.mCallback.opChanged(switchedCode, uid, packageName); } catch (RemoteException e) { /* ignore */ @@ -4205,6 +4210,9 @@ public class AppOpsService extends IAppOpsService.Stub { for (int i = 0; i < callbackCount; i++) { final ActiveCallback callback = callbacks.valueAt(i); try { + if (shouldIgnoreCallback(code, callback.mCallingPid, callback.mCallingUid)) { + continue; + } callback.mCallback.opActiveChanged(code, uid, packageName, attributionTag, active, attributionFlags, attributionChainId); } catch (RemoteException e) { @@ -4258,6 +4266,9 @@ public class AppOpsService extends IAppOpsService.Stub { for (int i = 0; i < callbackCount; i++) { final StartedCallback callback = callbacks.valueAt(i); try { + if (shouldIgnoreCallback(code, callback.mCallingPid, callback.mCallingUid)) { + continue; + } callback.mCallback.opStarted(code, uid, packageName, attributionTag, flags, result, startedType, attributionFlags, attributionChainId); } catch (RemoteException e) { @@ -4306,6 +4317,9 @@ public class AppOpsService extends IAppOpsService.Stub { for (int i = 0; i < callbackCount; i++) { final NotedCallback callback = callbacks.valueAt(i); try { + if (shouldIgnoreCallback(code, callback.mCallingPid, callback.mCallingUid)) { + continue; + } callback.mCallback.opNoted(code, uid, packageName, attributionTag, flags, result); } catch (RemoteException e) { @@ -4370,8 +4384,20 @@ public class AppOpsService extends IAppOpsService.Stub { Binder.getCallingPid(), Binder.getCallingUid(), null); } + private boolean shouldIgnoreCallback(int op, int watcherPid, int watcherUid) { + // If it's a restricted read op, ignore it if watcher doesn't have manage ops permission, + // as watcher should not use this to signal if the value is changed. + return opRestrictsRead(op) && mContext.checkPermission(Manifest.permission.MANAGE_APPOPS, + watcherPid, watcherUid) != PackageManager.PERMISSION_GRANTED; + } + private void verifyIncomingOp(int op) { if (op >= 0 && op < AppOpsManager._NUM_OP) { + // Enforce manage appops permission if it's a restricted read op. + if (opRestrictsRead(op)) { + mContext.enforcePermission(Manifest.permission.MANAGE_APPOPS, + Binder.getCallingPid(), Binder.getCallingUid(), "verifyIncomingOp"); + } return; } throw new IllegalArgumentException("Bad operation #" + op); diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index e14527098a72..dbe4fb8c8795 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -862,8 +862,8 @@ public class AudioDeviceInventory { } /*package*/ void disconnectLeAudio(int device) { - if (device != AudioSystem.DEVICE_OUT_BLE_HEADSET || - device != AudioSystem.DEVICE_OUT_BLE_BROADCAST) { + if (device != AudioSystem.DEVICE_OUT_BLE_HEADSET + && device != AudioSystem.DEVICE_OUT_BLE_BROADCAST) { Log.e(TAG, "disconnectLeAudio: Can't disconnect not LE Audio device " + device); return; } @@ -879,6 +879,8 @@ public class AudioDeviceInventory { new MediaMetrics.Item(mMetricsId + "disconnectLeAudio") .record(); if (toRemove.size() > 0) { + final int delay = checkSendBecomingNoisyIntentInt(device, 0, + AudioSystem.DEVICE_NONE); toRemove.stream().forEach(deviceAddress -> makeLeAudioDeviceUnavailable(deviceAddress, device) ); diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index d10ed55281ef..0aa9a2bc4990 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -462,6 +462,7 @@ public class BtHelper { mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.HEADSET); mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.HEARING_AID); mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.LE_AUDIO); + mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.LE_AUDIO_BROADCAST); } // @GuardedBy("AudioDeviceBroker.mSetModeLock") @@ -687,6 +688,7 @@ public class BtHelper { case BluetoothProfile.HEADSET: case BluetoothProfile.HEARING_AID: case BluetoothProfile.LE_AUDIO: + case BluetoothProfile.LE_AUDIO_BROADCAST: mDeviceBroker.postBtProfileDisconnected(profile); break; 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 6d687726dbe8..1002229518e4 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -105,7 +105,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> mIsStrongBiometric = isStrongBiometric; mOperationId = operationId; mRequireConfirmation = requireConfirmation; - mActivityTaskManager = ActivityTaskManager.getInstance(); + mActivityTaskManager = getActivityTaskManager(); mBiometricManager = context.getSystemService(BiometricManager.class); mTaskStackListener = taskStackListener; mLockoutTracker = lockoutTracker; @@ -133,6 +133,10 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> return mStartTimeMs; } + protected ActivityTaskManager getActivityTaskManager() { + return ActivityTaskManager.getInstance(); + } + @Override public void binderDied() { final boolean clearListener = !isBiometricPrompt(); @@ -310,45 +314,50 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> sendCancelOnly(listener); } }); - } else { - // Allow system-defined limit of number of attempts before giving up - final @LockoutTracker.LockoutMode int lockoutMode = - handleFailedAttempt(getTargetUserId()); - if (lockoutMode != LockoutTracker.LOCKOUT_NONE) { - markAlreadyDone(); - } - - final CoexCoordinator coordinator = CoexCoordinator.getInstance(); - coordinator.onAuthenticationRejected(SystemClock.uptimeMillis(), this, lockoutMode, - new CoexCoordinator.Callback() { - @Override - public void sendAuthenticationResult(boolean addAuthTokenIfStrong) { - if (listener != null) { - try { - listener.onAuthenticationFailed(getSensorId()); - } catch (RemoteException e) { - Slog.e(TAG, "Unable to notify listener", e); - } - } + } else { // not authenticated + if (isBackgroundAuth) { + Slog.e(TAG, "cancelling due to background auth"); + cancel(); + } else { + // Allow system-defined limit of number of attempts before giving up + final @LockoutTracker.LockoutMode int lockoutMode = + handleFailedAttempt(getTargetUserId()); + if (lockoutMode != LockoutTracker.LOCKOUT_NONE) { + markAlreadyDone(); } - @Override - public void sendHapticFeedback() { - if (listener != null && mShouldVibrate) { - vibrateError(); - } - } + final CoexCoordinator coordinator = CoexCoordinator.getInstance(); + coordinator.onAuthenticationRejected(SystemClock.uptimeMillis(), this, lockoutMode, + new CoexCoordinator.Callback() { + @Override + public void sendAuthenticationResult(boolean addAuthTokenIfStrong) { + if (listener != null) { + try { + listener.onAuthenticationFailed(getSensorId()); + } catch (RemoteException e) { + Slog.e(TAG, "Unable to notify listener", e); + } + } + } - @Override - public void handleLifecycleAfterAuth() { - AuthenticationClient.this.handleLifecycleAfterAuth(false /* authenticated */); - } + @Override + public void sendHapticFeedback() { + if (listener != null && mShouldVibrate) { + vibrateError(); + } + } - @Override - public void sendAuthenticationCanceled() { - sendCancelOnly(listener); - } - }); + @Override + public void handleLifecycleAfterAuth() { + AuthenticationClient.this.handleLifecycleAfterAuth(false /* authenticated */); + } + + @Override + public void sendAuthenticationCanceled() { + sendCancelOnly(listener); + } + }); + } } } 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 97efc7813230..a26535fbdce3 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 @@ -344,12 +344,12 @@ public class FingerprintService extends SystemService { provider.second.getSensorProperties(sensorId); if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName) && sensorProps != null && sensorProps.isAnyUdfpsType()) { - final long identity2 = Binder.clearCallingIdentity(); try { return authenticateWithPrompt(operationId, sensorProps, userId, receiver, - ignoreEnrollmentState); - } finally { - Binder.restoreCallingIdentity(identity2); + opPackageName, ignoreEnrollmentState); + } catch (PackageManager.NameNotFoundException e) { + Slog.e(TAG, "Invalid package", e); + return -1; } } return provider.second.scheduleAuthenticate(provider.first, token, operationId, userId, @@ -362,12 +362,15 @@ public class FingerprintService extends SystemService { @NonNull final FingerprintSensorPropertiesInternal props, final int userId, final IFingerprintServiceReceiver receiver, - boolean ignoreEnrollmentState) { + final String opPackageName, + boolean ignoreEnrollmentState) throws PackageManager.NameNotFoundException { final Context context = getUiContext(); + final Context promptContext = context.createPackageContextAsUser( + opPackageName, 0 /* flags */, UserHandle.getUserHandleForUid(userId)); final Executor executor = context.getMainExecutor(); - final BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(context) + final BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(promptContext) .setTitle(context.getString(R.string.biometric_dialog_default_title)) .setSubtitle(context.getString(R.string.fingerprint_dialog_default_subtitle)) .setNegativeButton( @@ -381,8 +384,7 @@ public class FingerprintService extends SystemService { Slog.e(TAG, "Remote exception in negative button onClick()", e); } }) - .setAllowedSensorIds(new ArrayList<>( - Collections.singletonList(props.sensorId))) + .setIsForLegacyFingerprintManager(props.sensorId) .setIgnoreEnrollmentState(ignoreEnrollmentState) .build(); @@ -436,8 +438,8 @@ public class FingerprintService extends SystemService { } }; - return biometricPrompt.authenticateUserForOperation( - new CancellationSignal(), executor, promptCallback, userId, operationId); + return biometricPrompt.authenticateForOperation( + new CancellationSignal(), executor, promptCallback, operationId); } @Override diff --git a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java index d0e39ccb3214..03e18a04c2d5 100644 --- a/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java +++ b/services/core/java/com/android/server/devicestate/DeviceStateManagerService.java @@ -43,6 +43,7 @@ import android.os.ShellCallback; import android.util.Slog; import android.util.SparseArray; +import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; @@ -59,7 +60,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.Optional; +import java.util.Set; import java.util.WeakHashMap; /** @@ -139,6 +142,8 @@ public final class DeviceStateManagerService extends SystemService { @GuardedBy("mLock") private final SparseArray<ProcessRecord> mProcessRecords = new SparseArray<>(); + private Set<Integer> mDeviceStatesAvailableForAppRequests; + public DeviceStateManagerService(@NonNull Context context) { this(context, DeviceStatePolicy.Provider .fromResources(context.getResources()) @@ -164,6 +169,10 @@ public final class DeviceStateManagerService extends SystemService { public void onStart() { publishBinderService(Context.DEVICE_STATE_SERVICE, mBinderService); publishLocalService(DeviceStateManagerInternal.class, new LocalService()); + + synchronized (mLock) { + readStatesAvailableForRequestFromApps(); + } } @VisibleForTesting @@ -626,19 +635,76 @@ public final class DeviceStateManagerService extends SystemService { /** * Allow top processes to request or cancel a device state change. If the calling process ID is + * not the top app, then check if this process holds the + * {@link android.Manifest.permission.CONTROL_DEVICE_STATE} permission. If the calling process + * is the top app, check to verify they are requesting a state we've deemed to be able to be + * available for an app process to request. States that can be requested are based around + * features that we've created that require specific device state overrides. + * @param callingPid Process ID that is requesting this state change + * @param state state that is being requested. + */ + private void assertCanRequestDeviceState(int callingPid, int state) { + final WindowProcessController topApp = mActivityTaskManagerInternal.getTopApp(); + if (topApp == null || topApp.getPid() != callingPid + || !isStateAvailableForAppRequests(state)) { + getContext().enforceCallingOrSelfPermission(CONTROL_DEVICE_STATE, + "Permission required to request device state, " + + "or the call must come from the top app " + + "and be a device state that is available for apps to request."); + } + } + + /** + * Checks if the process can control the device state. If the calling process ID is * not the top app, then check if this process holds the CONTROL_DEVICE_STATE permission. - * @param callingPid + * + * @param callingPid Process ID that is requesting this state change */ - private void checkCanControlDeviceState(int callingPid) { - // Allow top processes to request a device state change - // If the calling process ID is not the top app, then we check if this process - // holds a permission to CONTROL_DEVICE_STATE + private void assertCanControlDeviceState(int callingPid) { final WindowProcessController topApp = mActivityTaskManagerInternal.getTopApp(); if (topApp == null || topApp.getPid() != callingPid) { getContext().enforceCallingOrSelfPermission(CONTROL_DEVICE_STATE, "Permission required to request device state, " - + "or the call must come from the top focused app."); + + "or the call must come from the top app."); + } + } + + private boolean isStateAvailableForAppRequests(int state) { + synchronized (mLock) { + return mDeviceStatesAvailableForAppRequests.contains(state); + } + } + + /** + * Adds device state values that are available to be requested by the top level app. + */ + @GuardedBy("mLock") + private void readStatesAvailableForRequestFromApps() { + mDeviceStatesAvailableForAppRequests = new HashSet<>(); + String[] availableAppStatesConfigIdentifiers = getContext().getResources() + .getStringArray(R.array.config_deviceStatesAvailableForAppRequests); + for (int i = 0; i < availableAppStatesConfigIdentifiers.length; i++) { + String identifierToFetch = availableAppStatesConfigIdentifiers[i]; + int configValueIdentifier = getContext().getResources() + .getIdentifier(identifierToFetch, "integer", "android"); + int state = getContext().getResources().getInteger(configValueIdentifier); + if (isValidState(state)) { + mDeviceStatesAvailableForAppRequests.add(state); + } else { + Slog.e(TAG, "Invalid device state was found in the configuration file. State id: " + + state); + } + } + } + + @GuardedBy("mLock") + private boolean isValidState(int state) { + for (int i = 0; i < mDeviceStates.size(); i++) { + if (state == mDeviceStates.valueAt(i).getIdentifier()) { + return true; + } } + return false; } private final class DeviceStateProviderListener implements DeviceStateProvider.Listener { @@ -777,7 +843,7 @@ public final class DeviceStateManagerService extends SystemService { // Allow top processes to request a device state change // If the calling process ID is not the top app, then we check if this process // holds a permission to CONTROL_DEVICE_STATE - checkCanControlDeviceState(callingPid); + assertCanRequestDeviceState(callingPid, state); if (token == null) { throw new IllegalArgumentException("Request token must not be null."); @@ -797,7 +863,7 @@ public final class DeviceStateManagerService extends SystemService { // Allow top processes to cancel a device state change // If the calling process ID is not the top app, then we check if this process // holds a permission to CONTROL_DEVICE_STATE - checkCanControlDeviceState(callingPid); + assertCanControlDeviceState(callingPid); final long callingIdentity = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 698f41f23e98..80ff8349a153 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -1389,12 +1389,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Brightness throttling is needed, so do so quickly. // Later, when throttling is removed, we let other mechanisms decide on speed. slowChange = false; - updateScreenBrightnessSetting = true; } mAppliedThrottling = true; } else if (mAppliedThrottling) { mAppliedThrottling = false; - updateScreenBrightnessSetting = true; } if (updateScreenBrightnessSetting) { diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java index 34e3ce1ab641..b813995f1c08 100644 --- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java +++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java @@ -948,7 +948,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem pw.println(": "); final List<S> services = mServicesCacheList.valueAt(i); for (int j = 0; j < services.size(); j++) { - S service = services.get(i); + S service = services.get(j); synchronized (service.mLock) { service.dumpLocked(prefix2, pw); } diff --git a/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java b/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java index 7bb0d4899de5..e4e9d0153f7c 100644 --- a/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssMeasurementsProvider.java @@ -158,6 +158,7 @@ public final class GnssMeasurementsProvider extends Collection<GnssListenerRegistration> registrations) { boolean fullTracking = false; boolean enableCorrVecOutputs = false; + int intervalMillis = Integer.MAX_VALUE; if (mSettingsHelper.isGnssMeasurementsFullTrackingEnabled()) { fullTracking = true; @@ -171,11 +172,13 @@ public final class GnssMeasurementsProvider extends if (request.isCorrelationVectorOutputsEnabled()) { enableCorrVecOutputs = true; } + intervalMillis = Math.min(intervalMillis, request.getIntervalMillis()); } return new GnssMeasurementRequest.Builder() .setFullTracking(fullTracking) .setCorrelationVectorOutputsEnabled(enableCorrVecOutputs) + .setIntervalMillis(intervalMillis) .build(); } diff --git a/services/core/java/com/android/server/location/gnss/NtpTimeHelper.java b/services/core/java/com/android/server/location/gnss/NtpTimeHelper.java index 4a66516632a5..8732065ea009 100644 --- a/services/core/java/com/android/server/location/gnss/NtpTimeHelper.java +++ b/services/core/java/com/android/server/location/gnss/NtpTimeHelper.java @@ -73,7 +73,6 @@ class NtpTimeHelper { private final WakeLock mWakeLock; private final Handler mHandler; - @GuardedBy("this") private final InjectNtpTimeCallback mCallback; // flags to trigger NTP when network becomes available @@ -129,6 +128,8 @@ class NtpTimeHelper { return; } if (!isNetworkConnected()) { + // try to inject the cached NTP time + injectCachedNtpTime(); // try again when network is up mInjectNtpTimeState = STATE_PENDING_NETWORK; return; @@ -157,23 +158,7 @@ class NtpTimeHelper { // only update when NTP time is fresh // If refreshSuccess is false, cacheAge does not drop down. - ntpResult = mNtpTime.getCachedTimeResult(); - if (ntpResult != null && ntpResult.getAgeMillis() < NTP_INTERVAL) { - long time = ntpResult.getTimeMillis(); - long timeReference = ntpResult.getElapsedRealtimeMillis(); - long certainty = ntpResult.getCertaintyMillis(); - - if (DEBUG) { - long now = System.currentTimeMillis(); - Log.d(TAG, "NTP server returned: " - + time + " (" + new Date(time) + ")" - + " ntpResult: " + ntpResult - + " system time offset: " + (time - now)); - } - - // Ok to cast to int, as can't rollover in practice - mHandler.post(() -> mCallback.injectTime(time, timeReference, (int) certainty)); - + if (injectCachedNtpTime()) { delay = NTP_INTERVAL; mNtpBackOff.reset(); } else { @@ -201,4 +186,26 @@ class NtpTimeHelper { // release wake lock held by task mWakeLock.release(); } + + /** Returns true if successfully inject cached NTP time. */ + private synchronized boolean injectCachedNtpTime() { + NtpTrustedTime.TimeResult ntpResult = mNtpTime.getCachedTimeResult(); + if (ntpResult == null || ntpResult.getAgeMillis() >= NTP_INTERVAL) { + return false; + } + + long time = ntpResult.getTimeMillis(); + long timeReference = ntpResult.getElapsedRealtimeMillis(); + long certainty = ntpResult.getCertaintyMillis(); + + if (DEBUG) { + long now = System.currentTimeMillis(); + Log.d(TAG, "NTP server returned: " + time + " (" + new Date(time) + ")" + + " ntpResult: " + ntpResult + " system time offset: " + (time - now)); + } + + // Ok to cast to int, as can't rollover in practice + mHandler.post(() -> mCallback.injectTime(time, timeReference, (int) certainty)); + return true; + } } diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 549b566eeac2..1ea949ede03d 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -174,6 +174,7 @@ import android.net.ConnectivityManager.NetworkCallback; import android.net.INetworkManagementEventObserver; import android.net.INetworkPolicyListener; import android.net.INetworkPolicyManager; +import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkIdentity; @@ -236,6 +237,7 @@ import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.SparseIntArray; import android.util.SparseLongArray; +import android.util.SparseSetArray; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; import android.util.Xml; @@ -624,6 +626,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { /** Map from network ID to last observed roaming state */ @GuardedBy("mNetworkPoliciesSecondLock") private final SparseBooleanArray mNetworkRoaming = new SparseBooleanArray(); + /** Map from network ID to the last ifaces on it */ + @GuardedBy("mNetworkPoliciesSecondLock") + private SparseSetArray<String> mNetworkToIfaces = new SparseSetArray<>(); /** Map from netId to subId as of last update */ @GuardedBy("mNetworkPoliciesSecondLock") @@ -1328,11 +1333,28 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return changed; } + @GuardedBy("mNetworkPoliciesSecondLock") + private boolean updateNetworkToIfacesNL(int netId, @NonNull ArraySet<String> newIfaces) { + // TODO: Add a facility SparseSetArray.contains(key) to return whether the key exists. + final ArraySet<String> lastIfaces = mNetworkToIfaces.get(netId); + final boolean changed = lastIfaces == null ? true : !lastIfaces.equals(newIfaces); + + if (changed) { + // Changed on the same network should remove last ifaces and add new ifaces. + // TODO: Add a facility SparseSetArray.put(key, value) for replacing the + // value for a given key. + mNetworkToIfaces.remove(netId); + for (String iface : newIfaces) { + mNetworkToIfaces.add(netId, iface); + } + } + return changed; + } + private final NetworkCallback mNetworkCallback = new NetworkCallback() { @Override - public void onCapabilitiesChanged(Network network, - NetworkCapabilities networkCapabilities) { - if (network == null || networkCapabilities == null) return; + public void onCapabilitiesChanged(@NonNull Network network, + @NonNull NetworkCapabilities networkCapabilities) { synchronized (mNetworkPoliciesSecondLock) { final boolean newMetered = !networkCapabilities @@ -1351,6 +1373,25 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } } } + + @Override + public void onLinkPropertiesChanged(@NonNull Network network, @NonNull LinkProperties lp) { + synchronized (mNetworkPoliciesSecondLock) { + final ArraySet<String> newIfaces = new ArraySet<>(lp.getAllInterfaceNames()); + final boolean ifacesChanged = updateNetworkToIfacesNL(network.getNetId(), + newIfaces); + if (ifacesChanged) { + updateNetworkRulesNL(); + } + } + } + + @Override + public void onLost(@NonNull Network network) { + synchronized (mNetworkPoliciesSecondLock) { + mNetworkToIfaces.remove(network.getNetId()); + } + } }; /** diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 21ee4c21ceeb..6078bfc95488 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -252,6 +252,7 @@ import android.util.Log; import android.util.Pair; import android.util.Slog; import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.util.StatsEvent; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; @@ -284,6 +285,7 @@ import com.android.internal.util.DumpUtils; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; import com.android.internal.util.function.TriPredicate; +import com.android.internal.widget.LockPatternUtils; import com.android.server.DeviceIdleInternal; import com.android.server.EventLogTags; import com.android.server.IoThread; @@ -1923,6 +1925,54 @@ public class NotificationManagerService extends SystemService { private SettingsObserver mSettingsObserver; protected ZenModeHelper mZenModeHelper; + protected class StrongAuthTracker extends LockPatternUtils.StrongAuthTracker { + + SparseBooleanArray mUserInLockDownMode = new SparseBooleanArray(); + boolean mIsInLockDownMode = false; + + StrongAuthTracker(Context context) { + super(context); + } + + private boolean containsFlag(int haystack, int needle) { + return (haystack & needle) != 0; + } + + public boolean isInLockDownMode() { + return mIsInLockDownMode; + } + + @Override + public synchronized void onStrongAuthRequiredChanged(int userId) { + boolean userInLockDownModeNext = containsFlag(getStrongAuthForUser(userId), + STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + mUserInLockDownMode.put(userId, userInLockDownModeNext); + boolean isInLockDownModeNext = mUserInLockDownMode.indexOfValue(true) != -1; + + if (mIsInLockDownMode == isInLockDownModeNext) { + return; + } + + if (isInLockDownModeNext) { + cancelNotificationsWhenEnterLockDownMode(); + } + + // When the mIsInLockDownMode is true, both notifyPostedLocked and + // notifyRemovedLocked will be dismissed. So we shall call + // cancelNotificationsWhenEnterLockDownMode before we set mIsInLockDownMode + // as true and call postNotificationsWhenExitLockDownMode after we set + // mIsInLockDownMode as false. + mIsInLockDownMode = isInLockDownModeNext; + + if (!isInLockDownModeNext) { + postNotificationsWhenExitLockDownMode(); + } + } + } + + private LockPatternUtils mLockPatternUtils; + private StrongAuthTracker mStrongAuthTracker; + public NotificationManagerService(Context context) { this(context, new NotificationRecordLoggerImpl(), @@ -1952,6 +2002,11 @@ public class NotificationManagerService extends SystemService { } @VisibleForTesting + void setStrongAuthTracker(StrongAuthTracker strongAuthTracker) { + mStrongAuthTracker = strongAuthTracker; + } + + @VisibleForTesting void setKeyguardManager(KeyguardManager keyguardManager) { mKeyguardManager = keyguardManager; } @@ -2145,6 +2200,8 @@ public class NotificationManagerService extends SystemService { mPlatformCompat = IPlatformCompat.Stub.asInterface( ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); + mLockPatternUtils = new LockPatternUtils(getContext()); + mStrongAuthTracker = new StrongAuthTracker(getContext()); mUiHandler = new Handler(UiThread.get().getLooper()); String[] extractorNames; try { @@ -2641,6 +2698,7 @@ public class NotificationManagerService extends SystemService { bubbsExtractor.setShortcutHelper(mShortcutHelper); } registerNotificationPreferencesPullers(); + mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker); } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) { // This observer will force an update when observe is called, causing us to // bind to listener services. @@ -9537,6 +9595,29 @@ public class NotificationManagerService extends SystemService { } } + private void cancelNotificationsWhenEnterLockDownMode() { + synchronized (mNotificationLock) { + int numNotifications = mNotificationList.size(); + for (int i = 0; i < numNotifications; i++) { + NotificationRecord rec = mNotificationList.get(i); + mListeners.notifyRemovedLocked(rec, REASON_CANCEL_ALL, + rec.getStats()); + } + + } + } + + private void postNotificationsWhenExitLockDownMode() { + synchronized (mNotificationLock) { + int numNotifications = mNotificationList.size(); + for (int i = 0; i < numNotifications; i++) { + NotificationRecord rec = mNotificationList.get(i); + mListeners.notifyPostedLocked(rec, rec); + } + + } + } + private void updateNotificationPulse() { synchronized (mNotificationLock) { updateLightsLocked(); @@ -9753,6 +9834,10 @@ public class NotificationManagerService extends SystemService { rankings.toArray(new NotificationListenerService.Ranking[0])); } + boolean isInLockDownMode() { + return mStrongAuthTracker.isInLockDownMode(); + } + boolean hasCompanionDevice(ManagedServiceInfo info) { if (mCompanionManager == null) { mCompanionManager = getCompanionManager(); @@ -10804,8 +10889,12 @@ public class NotificationManagerService extends SystemService { * targetting <= O_MR1 */ @GuardedBy("mNotificationLock") - private void notifyPostedLocked(NotificationRecord r, NotificationRecord old, + void notifyPostedLocked(NotificationRecord r, NotificationRecord old, boolean notifyAllListeners) { + if (isInLockDownMode()) { + return; + } + try { // Lazily initialized snapshots of the notification. StatusBarNotification sbn = r.getSbn(); @@ -10903,6 +10992,10 @@ public class NotificationManagerService extends SystemService { @GuardedBy("mNotificationLock") public void notifyRemovedLocked(NotificationRecord r, int reason, NotificationStats notificationStats) { + if (isInLockDownMode()) { + return; + } + final StatusBarNotification sbn = r.getSbn(); // make a copy in case changes are made to the underlying Notification object @@ -10948,6 +11041,10 @@ public class NotificationManagerService extends SystemService { */ @GuardedBy("mNotificationLock") public void notifyRankingUpdateLocked(List<NotificationRecord> changedHiddenNotifications) { + if (isInLockDownMode()) { + return; + } + boolean isHiddenRankingUpdate = changedHiddenNotifications != null && changedHiddenNotifications.size() > 0; // TODO (b/73052211): if the ranking update changed the notification type, diff --git a/services/core/java/com/android/server/pm/AppsFilterImpl.java b/services/core/java/com/android/server/pm/AppsFilterImpl.java index dff7100e90e3..f757405645b9 100644 --- a/services/core/java/com/android/server/pm/AppsFilterImpl.java +++ b/services/core/java/com/android/server/pm/AppsFilterImpl.java @@ -61,6 +61,7 @@ import com.android.server.pm.pkg.component.ParsedInstrumentation; import com.android.server.pm.pkg.component.ParsedIntentInfo; import com.android.server.pm.pkg.component.ParsedMainComponent; import com.android.server.pm.pkg.component.ParsedProvider; +import com.android.server.pm.snapshot.PackageDataSnapshot; import com.android.server.utils.Snappable; import com.android.server.utils.SnapshotCache; import com.android.server.utils.Watchable; @@ -179,7 +180,6 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable private final boolean mSystemAppsQueryable; private final FeatureConfig mFeatureConfig; private final OverlayReferenceMapper mOverlayReferenceMapper; - private final StateProvider mStateProvider; private SigningDetails mSystemSigningDetails; @GuardedBy("mLock") @@ -189,10 +189,13 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable private final Object mCacheLock = new Object(); + private final boolean mIsSnapshot; + /** * This structure maps uid -> uid and indicates whether access from the first should be * filtered to the second. It's essentially a cache of the - * {@link #shouldFilterApplicationInternal(int, Object, PackageStateInternal, int)} call. + * {@link #shouldFilterApplicationInternal(PackageDataSnapshot, int, Object, + * PackageStateInternal, int)} call. * NOTE: It can only be relied upon after the system is ready to avoid unnecessary update on * initial scam and is empty until {@link #mSystemReady} is true. */ @@ -282,8 +285,7 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable } @VisibleForTesting(visibility = PRIVATE) - AppsFilterImpl(StateProvider stateProvider, - FeatureConfig featureConfig, + AppsFilterImpl(FeatureConfig featureConfig, String[] forceQueryableList, boolean systemAppsQueryable, @Nullable OverlayReferenceMapper.Provider overlayProvider, @@ -293,7 +295,6 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable mSystemAppsQueryable = systemAppsQueryable; mOverlayReferenceMapper = new OverlayReferenceMapper(true /*deferRebuild*/, overlayProvider); - mStateProvider = stateProvider; mBackgroundExecutor = backgroundExecutor; mShouldFilterCache = new WatchedSparseBooleanMatrix(); mShouldFilterCacheSnapshot = new SnapshotCache.Auto<>( @@ -323,6 +324,7 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable mProtectedBroadcasts, mProtectedBroadcasts, "AppsFilter.mProtectedBroadcasts"); mSnapshot = makeCache(); + mIsSnapshot = false; } /** @@ -352,7 +354,6 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable mSystemAppsQueryable = orig.mSystemAppsQueryable; mFeatureConfig = orig.mFeatureConfig; mOverlayReferenceMapper = orig.mOverlayReferenceMapper; - mStateProvider = orig.mStateProvider; mSystemSigningDetails = orig.mSystemSigningDetails; synchronized (orig.mCacheLock) { mShouldFilterCache = orig.mShouldFilterCacheSnapshot.snapshot(); @@ -361,7 +362,8 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable mBackgroundExecutor = null; mSnapshot = new SnapshotCache.Sealed<>(); - mSystemReady = true; + mSystemReady = orig.mSystemReady; + mIsSnapshot = true; } /** @@ -373,23 +375,6 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable return mSnapshot.snapshot(); } - /** - * Provides system state to AppsFilter via {@link CurrentStateCallback} after properly guarding - * the data with the package lock. - * - * Don't call {@link #runWithState} with {@link #mCacheLock} held. - */ - @VisibleForTesting(visibility = PRIVATE) - public interface StateProvider { - void runWithState(CurrentStateCallback callback); - - interface CurrentStateCallback { - void currentState(ArrayMap<String, ? extends PackageStateInternal> settings, - Collection<SharedUserSetting> sharedUserSettings, - UserInfo[] users); - } - } - @VisibleForTesting(visibility = PRIVATE) public interface FeatureConfig { @@ -517,12 +502,13 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable @Override public void onCompatChange(String packageName) { - AndroidPackage pkg = mPmInternal.getPackage(packageName); + PackageDataSnapshot snapshot = mPmInternal.snapshot(); + AndroidPackage pkg = snapshot.getPackage(packageName); if (pkg == null) { return; } updateEnabledState(pkg); - mAppsFilter.updateShouldFilterCacheForPackage(packageName); + mAppsFilter.updateShouldFilterCacheForPackage(snapshot, packageName); } private void updateEnabledState(@NonNull AndroidPackage pkg) { @@ -574,14 +560,7 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable forcedQueryablePackageNames[i] = forcedQueryablePackageNames[i].intern(); } } - final StateProvider stateProvider = command -> { - synchronized (injector.getLock()) { - command.currentState(injector.getSettings().getPackagesLocked().untrackedStorage(), - injector.getSettings().getAllSharedUsersLPw(), - injector.getUserManagerInternal().getUserInfos()); - } - }; - AppsFilterImpl appsFilter = new AppsFilterImpl(stateProvider, featureConfig, + AppsFilterImpl appsFilter = new AppsFilterImpl(featureConfig, forcedQueryablePackageNames, forceSystemAppsQueryable, null, injector.getBackgroundExecutor()); featureConfig.setAppsFilter(appsFilter); @@ -754,12 +733,11 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable return changed; } - public void onSystemReady() { + public void onSystemReady(PackageManagerInternal pmInternal) { mOverlayReferenceMapper.rebuildIfDeferred(); mFeatureConfig.onSystemReady(); - updateEntireShouldFilterCacheAsync(); - onChanged(); + updateEntireShouldFilterCacheAsync(pmInternal); mSystemReady = true; } @@ -769,39 +747,41 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable * @param newPkgSetting the new setting being added * @param isReplace if the package is being replaced and may need extra cleanup. */ - public void addPackage(PackageStateInternal newPkgSetting, boolean isReplace) { + public void addPackage(PackageDataSnapshot snapshot, PackageStateInternal newPkgSetting, + boolean isReplace) { if (DEBUG_TRACING) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage"); } try { if (isReplace) { // let's first remove any prior rules for this package - removePackage(newPkgSetting, true /*isReplace*/); + removePackage(snapshot, newPkgSetting, true /*isReplace*/); } - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - ArraySet<String> additionalChangedPackages = - addPackageInternal(newPkgSetting, settings); - if (mSystemReady) { - updateShouldFilterCacheForPackage(null, newPkgSetting, + final ArrayMap<String, ? extends PackageStateInternal> settings = + snapshot.getPackageStates(); + final UserInfo[] users = snapshot.getUserInfos(); + final ArraySet<String> additionalChangedPackages = + addPackageInternal(newPkgSetting, settings); + if (mSystemReady) { + synchronized (mCacheLock) { + updateShouldFilterCacheForPackage(snapshot, null, newPkgSetting, settings, users, USER_ALL, settings.size()); if (additionalChangedPackages != null) { for (int index = 0; index < additionalChangedPackages.size(); index++) { String changedPackage = additionalChangedPackages.valueAt(index); - PackageStateInternal changedPkgSetting = - settings.get(changedPackage); + PackageStateInternal changedPkgSetting = settings.get(changedPackage); if (changedPkgSetting == null) { // It's possible for the overlay mapper to know that an actor // package changed via an explicit reference, even if the actor // isn't installed, so skip if that's the case. continue; } - - updateShouldFilterCacheForPackage(null, changedPkgSetting, + updateShouldFilterCacheForPackage(snapshot, null, changedPkgSetting, settings, users, USER_ALL, settings.size()); } } - } // else, rebuild entire cache when system is ready - }); + } + } // else, rebuild entire cache when system is ready } finally { onChanged(); if (DEBUG_TRACING) { @@ -941,30 +921,32 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable } } - private void updateEntireShouldFilterCache() { - updateEntireShouldFilterCache(USER_ALL); + private void updateEntireShouldFilterCache(PackageDataSnapshot snapshot) { + updateEntireShouldFilterCache(snapshot, USER_ALL); } - private void updateEntireShouldFilterCache(int subjectUserId) { - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - int userId = USER_NULL; - for (int u = 0; u < users.length; u++) { - if (subjectUserId == users[u].id) { - userId = subjectUserId; - break; - } - } - if (userId == USER_NULL) { - Slog.e(TAG, "We encountered a new user that isn't a member of known users, " - + "updating the whole cache"); - userId = USER_ALL; + private void updateEntireShouldFilterCache(PackageDataSnapshot snapshot, int subjectUserId) { + final ArrayMap<String, ? extends PackageStateInternal> settings = + snapshot.getPackageStates(); + final UserInfo[] users = snapshot.getUserInfos(); + int userId = USER_NULL; + for (int u = 0; u < users.length; u++) { + if (subjectUserId == users[u].id) { + userId = subjectUserId; + break; } - updateEntireShouldFilterCacheInner(settings, users, userId); - }); + } + if (userId == USER_NULL) { + Slog.e(TAG, "We encountered a new user that isn't a member of known users, " + + "updating the whole cache"); + userId = USER_ALL; + } + updateEntireShouldFilterCacheInner(snapshot, settings, users, userId); + onChanged(); } - private void updateEntireShouldFilterCacheInner( + private void updateEntireShouldFilterCacheInner(PackageDataSnapshot snapshot, ArrayMap<String, ? extends PackageStateInternal> settings, UserInfo[] users, int subjectUserId) { @@ -973,67 +955,42 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable mShouldFilterCache.clear(); } mShouldFilterCache.setCapacity(users.length * settings.size()); - } - for (int i = settings.size() - 1; i >= 0; i--) { - updateShouldFilterCacheForPackage( - null /*skipPackage*/, settings.valueAt(i), settings, users, - subjectUserId, i); + for (int i = settings.size() - 1; i >= 0; i--) { + updateShouldFilterCacheForPackage(snapshot, + null /*skipPackage*/, settings.valueAt(i), settings, users, + subjectUserId, i); + } } } - private void updateEntireShouldFilterCacheAsync() { + private void updateEntireShouldFilterCacheAsync(PackageManagerInternal pmInternal) { mBackgroundExecutor.execute(() -> { - final ArrayMap<String, PackageStateInternal> settingsCopy = new ArrayMap<>(); - final Collection<SharedUserSetting> sharedUserSettingsCopy = new ArraySet<>(); final ArrayMap<String, AndroidPackage> packagesCache = new ArrayMap<>(); final UserInfo[][] usersRef = new UserInfo[1][]; - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - packagesCache.ensureCapacity(settings.size()); - settingsCopy.putAll(settings); - usersRef[0] = users; - // store away the references to the immutable packages, since settings are retained - // during updates. - for (int i = 0, max = settings.size(); i < max; i++) { - final AndroidPackage pkg = settings.valueAt(i).getPkg(); - packagesCache.put(settings.keyAt(i), pkg); - } - sharedUserSettingsCopy.addAll(sharedUserSettings); - }); - - boolean[] changed = new boolean[1]; - // We have a cache, let's make sure the world hasn't changed out from under us. - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - if (settings.size() != settingsCopy.size()) { - changed[0] = true; - return; - } - for (int i = 0, max = settings.size(); i < max; i++) { - final AndroidPackage pkg = settings.valueAt(i).getPkg(); - if (!Objects.equals(pkg, packagesCache.get(settings.keyAt(i)))) { - changed[0] = true; - return; - } - } - }); - if (changed[0]) { - // Something has changed, just update the cache inline with the lock held - updateEntireShouldFilterCache(); - if (DEBUG_LOGGING) { - Slog.i(TAG, "Rebuilding cache with lock due to package change."); - } - } else { - updateEntireShouldFilterCacheInner(settingsCopy, - usersRef[0], USER_ALL); - onChanged(); + final PackageDataSnapshot snapshot = pmInternal.snapshot(); + final ArrayMap<String, ? extends PackageStateInternal> settings = + snapshot.getPackageStates(); + final UserInfo[] users = snapshot.getUserInfos(); + + packagesCache.ensureCapacity(settings.size()); + usersRef[0] = users; + // store away the references to the immutable packages, since settings are retained + // during updates. + for (int i = 0, max = settings.size(); i < max; i++) { + final AndroidPackage pkg = settings.valueAt(i).getPkg(); + packagesCache.put(settings.keyAt(i), pkg); } + + updateEntireShouldFilterCacheInner(snapshot, settings, usersRef[0], USER_ALL); + onChanged(); }); } - public void onUserCreated(int newUserId) { + public void onUserCreated(PackageDataSnapshot snapshot, int newUserId) { if (!mSystemReady) { return; } - updateEntireShouldFilterCache(newUserId); + updateEntireShouldFilterCache(snapshot, newUserId); } public void onUserDeleted(@UserIdInt int userId) { @@ -1044,19 +1001,24 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable onChanged(); } - private void updateShouldFilterCacheForPackage(String packageName) { - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - if (!mSystemReady) { - return; - } - updateShouldFilterCacheForPackage(null /* skipPackage */, + private void updateShouldFilterCacheForPackage(PackageDataSnapshot snapshot, + String packageName) { + if (!mSystemReady) { + return; + } + final ArrayMap<String, ? extends PackageStateInternal> settings = + snapshot.getPackageStates(); + final UserInfo[] users = snapshot.getUserInfos(); + synchronized (mCacheLock) { + updateShouldFilterCacheForPackage(snapshot, null /* skipPackage */, settings.get(packageName), settings, users, USER_ALL, settings.size() /*maxIndex*/); - }); + } onChanged(); } - private void updateShouldFilterCacheForPackage( + @GuardedBy("mCacheLock") + private void updateShouldFilterCacheForPackage(PackageDataSnapshot snapshot, @Nullable String skipPackageName, PackageStateInternal subjectSetting, ArrayMap<String, ? extends PackageStateInternal> allSettings, UserInfo[] allUsers, int subjectUserId, int maxIndex) { @@ -1072,31 +1034,30 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable } if (subjectUserId == USER_ALL) { for (int su = 0; su < allUsers.length; su++) { - updateShouldFilterCacheForUser(subjectSetting, allUsers, otherSetting, + updateShouldFilterCacheForUser(snapshot, subjectSetting, allUsers, otherSetting, allUsers[su].id); } } else { - updateShouldFilterCacheForUser(subjectSetting, allUsers, otherSetting, + updateShouldFilterCacheForUser(snapshot, subjectSetting, allUsers, otherSetting, subjectUserId); } } } - private void updateShouldFilterCacheForUser( + @GuardedBy("mCacheLock") + private void updateShouldFilterCacheForUser(PackageDataSnapshot snapshot, PackageStateInternal subjectSetting, UserInfo[] allUsers, PackageStateInternal otherSetting, int subjectUserId) { for (int ou = 0; ou < allUsers.length; ou++) { int otherUser = allUsers[ou].id; int subjectUid = UserHandle.getUid(subjectUserId, subjectSetting.getAppId()); int otherUid = UserHandle.getUid(otherUser, otherSetting.getAppId()); - final boolean shouldFilterSubjectToOther = shouldFilterApplicationInternal( + final boolean shouldFilterSubjectToOther = shouldFilterApplicationInternal(snapshot, subjectUid, subjectSetting, otherSetting, otherUser); - final boolean shouldFilterOtherToSubject = shouldFilterApplicationInternal( + final boolean shouldFilterOtherToSubject = shouldFilterApplicationInternal(snapshot, otherUid, otherSetting, subjectSetting, subjectUserId); - synchronized (mCacheLock) { - mShouldFilterCache.put(subjectUid, otherUid, shouldFilterSubjectToOther); - mShouldFilterCache.put(otherUid, subjectUid, shouldFilterOtherToSubject); - } + mShouldFilterCache.put(subjectUid, otherUid, shouldFilterSubjectToOther); + mShouldFilterCache.put(otherUid, subjectUid, shouldFilterOtherToSubject); } } @@ -1179,14 +1140,17 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable } } mQueriesViaComponentRequireRecompute = false; + onChanged(); } /** - * See {@link AppsFilterSnapshot#getVisibilityAllowList(PackageStateInternal, int[], ArrayMap)} + * See {@link AppsFilterSnapshot#getVisibilityAllowList(PackageDataSnapshot, + * PackageStateInternal, int[], ArrayMap)} */ @Override @Nullable - public SparseArray<int[]> getVisibilityAllowList(PackageStateInternal setting, int[] users, + public SparseArray<int[]> getVisibilityAllowList(PackageDataSnapshot snapshot, + PackageStateInternal setting, int[] users, ArrayMap<String, ? extends PackageStateInternal> existingSettings) { synchronized (mLock) { if (mForceQueryable.contains(setting.getAppId())) { @@ -1211,7 +1175,8 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable continue; } final int existingUid = UserHandle.getUid(userId, existingAppId); - if (!shouldFilterApplication(existingUid, existingSetting, setting, userId)) { + if (!shouldFilterApplication(snapshot, existingUid, existingSetting, setting, + userId)) { if (buffer == null) { buffer = new int[appIds.length]; } @@ -1232,19 +1197,21 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable */ @VisibleForTesting(visibility = PRIVATE) @Nullable - SparseArray<int[]> getVisibilityAllowList(PackageStateInternal setting, int[] users, + SparseArray<int[]> getVisibilityAllowList(PackageDataSnapshot snapshot, + PackageStateInternal setting, int[] users, WatchedArrayMap<String, ? extends PackageStateInternal> existingSettings) { - return getVisibilityAllowList(setting, users, existingSettings.untrackedStorage()); + return getVisibilityAllowList(snapshot, setting, users, + existingSettings.untrackedStorage()); } /** - * Equivalent to calling {@link #addPackage(PackageStateInternal, boolean)} with - * {@code isReplace} equal to {@code false}. + * Equivalent to calling {@link #addPackage(PackageDataSnapshot, PackageStateInternal, boolean)} + * with {@code isReplace} equal to {@code false}. * - * @see AppsFilterImpl#addPackage(PackageStateInternal, boolean) + * @see AppsFilterImpl#addPackage(PackageDataSnapshot, PackageStateInternal, boolean) */ - public void addPackage(PackageStateInternal newPkgSetting) { - addPackage(newPkgSetting, false /* isReplace */); + public void addPackage(PackageDataSnapshot snapshot, PackageStateInternal newPkgSetting) { + addPackage(snapshot, newPkgSetting, false /* isReplace */); } /** @@ -1253,119 +1220,122 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable * @param setting the setting of the package being removed. * @param isReplace if the package is being replaced. */ - public void removePackage(PackageStateInternal setting, boolean isReplace) { - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - final ArraySet<String> additionalChangedPackages; - final int userCount = users.length; - synchronized (mLock) { - for (int u = 0; u < userCount; u++) { - final int userId = users[u].id; - final int removingUid = UserHandle.getUid(userId, setting.getAppId()); - mImplicitlyQueryable.remove(removingUid); - for (int i = mImplicitlyQueryable.size() - 1; i >= 0; i--) { - mImplicitlyQueryable.remove(mImplicitlyQueryable.keyAt(i), - removingUid); - } - - if (isReplace) { - continue; - } - - mRetainedImplicitlyQueryable.remove(removingUid); - for (int i = mRetainedImplicitlyQueryable.size() - 1; i >= 0; i--) { - mRetainedImplicitlyQueryable.remove( - mRetainedImplicitlyQueryable.keyAt(i), removingUid); - } + public void removePackage(PackageDataSnapshot snapshot, PackageStateInternal setting, + boolean isReplace) { + final ArraySet<String> additionalChangedPackages; + final ArrayMap<String, ? extends PackageStateInternal> settings = + snapshot.getPackageStates(); + final UserInfo[] users = snapshot.getUserInfos(); + final Collection<SharedUserSetting> sharedUserSettings = snapshot.getAllSharedUsers(); + final int userCount = users.length; + synchronized (mLock) { + for (int u = 0; u < userCount; u++) { + final int userId = users[u].id; + final int removingUid = UserHandle.getUid(userId, setting.getAppId()); + mImplicitlyQueryable.remove(removingUid); + for (int i = mImplicitlyQueryable.size() - 1; i >= 0; i--) { + mImplicitlyQueryable.remove(mImplicitlyQueryable.keyAt(i), + removingUid); } - if (!mQueriesViaComponentRequireRecompute) { - mQueriesViaComponent.remove(setting.getAppId()); - for (int i = mQueriesViaComponent.size() - 1; i >= 0; i--) { - mQueriesViaComponent.remove(mQueriesViaComponent.keyAt(i), - setting.getAppId()); - } + if (isReplace) { + continue; } - mQueriesViaPackage.remove(setting.getAppId()); - for (int i = mQueriesViaPackage.size() - 1; i >= 0; i--) { - mQueriesViaPackage.remove(mQueriesViaPackage.keyAt(i), - setting.getAppId()); + + mRetainedImplicitlyQueryable.remove(removingUid); + for (int i = mRetainedImplicitlyQueryable.size() - 1; i >= 0; i--) { + mRetainedImplicitlyQueryable.remove( + mRetainedImplicitlyQueryable.keyAt(i), removingUid); } - mQueryableViaUsesLibrary.remove(setting.getAppId()); - for (int i = mQueryableViaUsesLibrary.size() - 1; i >= 0; i--) { - mQueryableViaUsesLibrary.remove(mQueryableViaUsesLibrary.keyAt(i), + } + + if (!mQueriesViaComponentRequireRecompute) { + mQueriesViaComponent.remove(setting.getAppId()); + for (int i = mQueriesViaComponent.size() - 1; i >= 0; i--) { + mQueriesViaComponent.remove(mQueriesViaComponent.keyAt(i), setting.getAppId()); } + } + mQueriesViaPackage.remove(setting.getAppId()); + for (int i = mQueriesViaPackage.size() - 1; i >= 0; i--) { + mQueriesViaPackage.remove(mQueriesViaPackage.keyAt(i), + setting.getAppId()); + } + mQueryableViaUsesLibrary.remove(setting.getAppId()); + for (int i = mQueryableViaUsesLibrary.size() - 1; i >= 0; i--) { + mQueryableViaUsesLibrary.remove(mQueryableViaUsesLibrary.keyAt(i), + setting.getAppId()); + } - mForceQueryable.remove(setting.getAppId()); + mForceQueryable.remove(setting.getAppId()); - if (setting.getPkg() != null - && !setting.getPkg().getProtectedBroadcasts().isEmpty()) { - final String removingPackageName = setting.getPkg().getPackageName(); - final ArrayList<String> protectedBroadcasts = new ArrayList<>(); - protectedBroadcasts.addAll(mProtectedBroadcasts.untrackedStorage()); - collectProtectedBroadcasts(settings, removingPackageName); - if (!mProtectedBroadcasts.containsAll(protectedBroadcasts)) { - mQueriesViaComponentRequireRecompute = true; - } + if (setting.getPkg() != null + && !setting.getPkg().getProtectedBroadcasts().isEmpty()) { + final String removingPackageName = setting.getPkg().getPackageName(); + final ArrayList<String> protectedBroadcasts = new ArrayList<>(); + protectedBroadcasts.addAll(mProtectedBroadcasts.untrackedStorage()); + collectProtectedBroadcasts(settings, removingPackageName); + if (!mProtectedBroadcasts.containsAll(protectedBroadcasts)) { + mQueriesViaComponentRequireRecompute = true; } } + } - additionalChangedPackages = mOverlayReferenceMapper.removePkg(setting.getPackageName()); - mFeatureConfig.updatePackageState(setting, true /*removed*/); + additionalChangedPackages = mOverlayReferenceMapper.removePkg(setting.getPackageName()); + mFeatureConfig.updatePackageState(setting, true /*removed*/); - // After removing all traces of the package, if it's part of a shared user, - // re-add other - // shared user members to re-establish visibility between them and other - // packages. - // NOTE: this must come after all removals from data structures but before we - // update the - // cache - if (setting.hasSharedUser()) { - final ArraySet<? extends PackageStateInternal> sharedUserPackages = - getSharedUserPackages(setting.getSharedUserAppId(), sharedUserSettings); - for (int i = sharedUserPackages.size() - 1; i >= 0; i--) { - if (sharedUserPackages.valueAt(i) == setting) { - continue; - } - addPackageInternal( - sharedUserPackages.valueAt(i), settings); + // After removing all traces of the package, if it's part of a shared user, re-add other + // shared user members to re-establish visibility between them and other packages. + // NOTE: this must come after all removals from data structures but before we update the + // cache + if (setting.hasSharedUser()) { + final ArraySet<? extends PackageStateInternal> sharedUserPackages = + getSharedUserPackages(setting.getSharedUserAppId(), sharedUserSettings); + for (int i = sharedUserPackages.size() - 1; i >= 0; i--) { + if (sharedUserPackages.valueAt(i) == setting) { + continue; } + addPackageInternal( + sharedUserPackages.valueAt(i), settings); } + } - removeAppIdFromVisibilityCache(setting.getAppId()); - if (mSystemReady && setting.hasSharedUser()) { - final ArraySet<? extends PackageStateInternal> sharedUserPackages = - getSharedUserPackages(setting.getSharedUserAppId(), sharedUserSettings); - for (int i = sharedUserPackages.size() - 1; i >= 0; i--) { - PackageStateInternal siblingSetting = - sharedUserPackages.valueAt(i); - if (siblingSetting == setting) { - continue; - } - updateShouldFilterCacheForPackage( + removeAppIdFromVisibilityCache(setting.getAppId()); + if (mSystemReady && setting.hasSharedUser()) { + final ArraySet<? extends PackageStateInternal> sharedUserPackages = + getSharedUserPackages(setting.getSharedUserAppId(), sharedUserSettings); + for (int i = sharedUserPackages.size() - 1; i >= 0; i--) { + PackageStateInternal siblingSetting = + sharedUserPackages.valueAt(i); + if (siblingSetting == setting) { + continue; + } + synchronized (mCacheLock) { + updateShouldFilterCacheForPackage(snapshot, setting.getPackageName(), siblingSetting, settings, users, USER_ALL, settings.size()); } } + } - if (mSystemReady) { - if (additionalChangedPackages != null) { - for (int index = 0; index < additionalChangedPackages.size(); index++) { - String changedPackage = additionalChangedPackages.valueAt(index); - PackageStateInternal changedPkgSetting = settings.get(changedPackage); - if (changedPkgSetting == null) { - // It's possible for the overlay mapper to know that an actor - // package changed via an explicit reference, even if the actor - // isn't installed, so skip if that's the case. - continue; - } - - updateShouldFilterCacheForPackage(null, changedPkgSetting, + if (mSystemReady) { + if (additionalChangedPackages != null) { + for (int index = 0; index < additionalChangedPackages.size(); index++) { + String changedPackage = additionalChangedPackages.valueAt(index); + PackageStateInternal changedPkgSetting = settings.get(changedPackage); + if (changedPkgSetting == null) { + // It's possible for the overlay mapper to know that an actor + // package changed via an explicit reference, even if the actor + // isn't installed, so skip if that's the case. + continue; + } + synchronized (mCacheLock) { + updateShouldFilterCacheForPackage(snapshot, null, changedPkgSetting, settings, users, USER_ALL, settings.size()); } } } - }); + } onChanged(); } @@ -1382,12 +1352,12 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable /** * See - * {@link AppsFilterSnapshot#shouldFilterApplication(int, Object, PackageStateInternal, - * int)} + * {@link AppsFilterSnapshot#shouldFilterApplication(PackageDataSnapshot, int, Object, + * PackageStateInternal, int)} */ @Override - public boolean shouldFilterApplication(int callingUid, @Nullable Object callingSetting, - PackageStateInternal targetPkgSetting, int userId) { + public boolean shouldFilterApplication(PackageDataSnapshot snapshot, int callingUid, + @Nullable Object callingSetting, PackageStateInternal targetPkgSetting, int userId) { if (DEBUG_TRACING) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "shouldFilterApplication"); } @@ -1405,7 +1375,7 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable return false; } } else { - if (!shouldFilterApplicationInternal( + if (!shouldFilterApplicationInternal(snapshot, callingUid, callingSetting, targetPkgSetting, userId)) { return false; } @@ -1440,8 +1410,9 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable } } - private boolean shouldFilterApplicationInternal(int callingUid, Object callingSetting, - PackageStateInternal targetPkgSetting, int targetUserId) { + @SuppressWarnings("GuardedBy") + private boolean shouldFilterApplicationInternal(PackageDataSnapshot snapshot, int callingUid, + Object callingSetting, PackageStateInternal targetPkgSetting, int targetUserId) { if (DEBUG_TRACING) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "shouldFilterApplicationInternal"); } @@ -1467,9 +1438,8 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable final PackageStateInternal packageState = (PackageStateInternal) callingSetting; if (packageState.hasSharedUser()) { callingPkgSetting = null; - mStateProvider.runWithState((settings, sharedUserSettings, users) -> - callingSharedPkgSettings.addAll(getSharedUserPackages( - packageState.getSharedUserAppId(), sharedUserSettings))); + callingSharedPkgSettings.addAll(getSharedUserPackages( + packageState.getSharedUserAppId(), snapshot.getAllSharedUsers())); } else { callingPkgSetting = packageState; @@ -1599,20 +1569,53 @@ public class AppsFilterImpl implements AppsFilterSnapshot, Watchable, Snappable if (DEBUG_TRACING) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "mQueriesViaComponent"); } - if (mQueriesViaComponentRequireRecompute) { - final ArrayMap<String, PackageStateInternal> settingsCopy = new ArrayMap<>(); - mStateProvider.runWithState((settings, sharedUserSettings, users) -> { - settingsCopy.putAll(settings); - }); - recomputeComponentVisibility(settingsCopy); - onChanged(); - } - synchronized (mLock) { - if (mQueriesViaComponent.contains(callingAppId, targetAppId)) { - if (DEBUG_LOGGING) { - log(callingSetting, targetPkgSetting, "queries component"); + if (!mQueriesViaComponentRequireRecompute) { + synchronized (mLock) { + if (mQueriesViaComponent.contains(callingAppId, targetAppId)) { + if (DEBUG_LOGGING) { + log(callingSetting, targetPkgSetting, "queries component"); + } + return false; + } + } + } else { // mQueriesViaComponent is stale + if (!mIsSnapshot) { + // Only recompute mQueriesViaComponent if not in snapshot + recomputeComponentVisibility(snapshot.getPackageStates()); + synchronized (mLock) { + if (mQueriesViaComponent.contains(callingAppId, targetAppId)) { + if (DEBUG_LOGGING) { + log(callingSetting, targetPkgSetting, "queries component"); + } + return false; + } + } + } else { + // Do no recompute or use mQueriesViaComponent if it's stale in snapshot + // Since we know we are in the snapshot, no need to acquire mLock because + // mProtectedBroadcasts will not change + if (callingPkgSetting != null) { + if (callingPkgSetting.getPkg() != null + && canQueryViaComponents(callingPkgSetting.getPkg(), targetPkg, + mProtectedBroadcasts)) { + if (DEBUG_LOGGING) { + log(callingSetting, targetPkgSetting, "queries component"); + } + return false; + } + } else { + for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) { + final AndroidPackage pkg = + callingSharedPkgSettings.valueAt(i).getPkg(); + if (pkg != null && canQueryViaComponents(pkg, targetPkg, + mProtectedBroadcasts)) { + if (DEBUG_LOGGING) { + log(callingSetting, targetPkgSetting, "queries component"); + } + return false; + } + } } - return false; } } } finally { diff --git a/services/core/java/com/android/server/pm/AppsFilterSnapshot.java b/services/core/java/com/android/server/pm/AppsFilterSnapshot.java index cb8c649ded00..de037f3ba889 100644 --- a/services/core/java/com/android/server/pm/AppsFilterSnapshot.java +++ b/services/core/java/com/android/server/pm/AppsFilterSnapshot.java @@ -25,6 +25,7 @@ import android.util.SparseArray; import com.android.internal.util.function.QuadFunction; import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.pkg.PackageStateInternal; +import com.android.server.pm.snapshot.PackageDataSnapshot; import java.io.PrintWriter; @@ -40,27 +41,30 @@ public interface AppsFilterSnapshot { * If the setting is visible to all UIDs, null is returned. If an app is not visible to any * applications, the int array will be empty. * + * @param snapshot the snapshot of the computer that contains all package information * @param users the set of users that should be evaluated for this calculation * @param existingSettings the set of all package settings that currently exist on device * @return a SparseArray mapping userIds to a sorted int array of appIds that may view the * provided setting or null if the app is visible to all and no allow list should be * applied. */ - SparseArray<int[]> getVisibilityAllowList(PackageStateInternal setting, int[] users, + SparseArray<int[]> getVisibilityAllowList(PackageDataSnapshot snapshot, + PackageStateInternal setting, int[] users, ArrayMap<String, ? extends PackageStateInternal> existingSettings); /** * Returns true if the calling package should not be able to see the target package, false if no * filtering should be done. * + * @param snapshot the snapshot of the computer that contains all package information * @param callingUid the uid of the caller attempting to access a package * @param callingSetting the setting attempting to access a package or null if it could not be * found * @param targetPkgSetting the package being accessed * @param userId the user in which this access is being attempted */ - boolean shouldFilterApplication(int callingUid, @Nullable Object callingSetting, - PackageStateInternal targetPkgSetting, int userId); + boolean shouldFilterApplication(PackageDataSnapshot snapshot, int callingUid, + @Nullable Object callingSetting, PackageStateInternal targetPkgSetting, int userId); /** * Returns whether the querying package is allowed to see the target package. diff --git a/services/core/java/com/android/server/pm/Computer.java b/services/core/java/com/android/server/pm/Computer.java index c259797942a7..db48a1f63099 100644 --- a/services/core/java/com/android/server/pm/Computer.java +++ b/services/core/java/com/android/server/pm/Computer.java @@ -59,6 +59,7 @@ import com.android.server.utils.WatchedLongSparseArray; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -128,6 +129,7 @@ public interface Computer extends PackageDataSnapshot { */ ActivityInfo getActivityInfoInternal(ComponentName component, long flags, int filterCallingUid, int userId); + @Override AndroidPackage getPackage(String packageName); AndroidPackage getPackage(int uid); ApplicationInfo generateApplicationInfoFromSettings(String packageName, long flags, @@ -289,6 +291,7 @@ public interface Computer extends PackageDataSnapshot { PreferredIntentResolver getPreferredActivities(@UserIdInt int userId); @NonNull + @Override ArrayMap<String, ? extends PackageStateInternal> getPackageStates(); @Nullable @@ -602,4 +605,12 @@ public interface Computer extends PackageDataSnapshot { @NonNull List<? extends PackageStateInternal> getVolumePackages(@NonNull String volumeUuid); + + @Override + @NonNull + UserInfo[] getUserInfos(); + + @Override + @NonNull + Collection<SharedUserSetting> getAllSharedUsers(); } diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java index 80d61b593fd2..bf9f4fa8a211 100644 --- a/services/core/java/com/android/server/pm/ComputerEngine.java +++ b/services/core/java/com/android/server/pm/ComputerEngine.java @@ -1348,7 +1348,7 @@ public class ComputerEngine implements Computer { PackageStateInternal resolvedSetting = getPackageStateInternal(info.activityInfo.packageName, 0); if (resolveForStart - || !mAppsFilter.shouldFilterApplication( + || !mAppsFilter.shouldFilterApplication(this, filterCallingUid, callingSetting, resolvedSetting, userId)) { continue; } @@ -1382,7 +1382,7 @@ public class ComputerEngine implements Computer { mSettings.getSettingBase(UserHandle.getAppId(filterCallingUid)); PackageStateInternal resolvedSetting = getPackageStateInternal(info.serviceInfo.packageName, 0); - if (!mAppsFilter.shouldFilterApplication( + if (!mAppsFilter.shouldFilterApplication(this, filterCallingUid, callingSetting, resolvedSetting, userId)) { continue; } @@ -2730,7 +2730,7 @@ public class ComputerEngine implements Computer { } int appId = UserHandle.getAppId(callingUid); final SettingBase callingPs = mSettings.getSettingBase(appId); - return mAppsFilter.shouldFilterApplication(callingUid, callingPs, ps, userId); + return mAppsFilter.shouldFilterApplication(this, callingUid, callingPs, ps, userId); } /** @@ -5036,7 +5036,7 @@ public class ComputerEngine implements Computer { if (setting == null) { return null; } - return mAppsFilter.getVisibilityAllowList(setting, userIds, getPackageStates()); + return mAppsFilter.getVisibilityAllowList(this, setting, userIds, getPackageStates()); } @Nullable @@ -5323,7 +5323,7 @@ public class ComputerEngine implements Computer { if (ps == null) { return null; } - final SparseArray<int[]> visibilityAllowList = mAppsFilter.getVisibilityAllowList(ps, + final SparseArray<int[]> visibilityAllowList = mAppsFilter.getVisibilityAllowList(this, ps, new int[]{userId}, getPackageStates()); return visibilityAllowList != null ? visibilityAllowList.get(userId) : null; } @@ -5823,4 +5823,16 @@ public class ComputerEngine implements Computer { public List<? extends PackageStateInternal> getVolumePackages(@NonNull String volumeUuid) { return mSettings.getVolumePackages(volumeUuid); } + + @Override + @NonNull + public Collection<SharedUserSetting> getAllSharedUsers() { + return mSettings.getAllSharedUsers(); + } + + @Override + @NonNull + public UserInfo[] getUserInfos() { + return mInjector.getUserManagerInternal().getUserInfos(); + } } diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java index d3d291ea52ac..cb38d522f3bd 100644 --- a/services/core/java/com/android/server/pm/DeletePackageHelper.java +++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java @@ -543,8 +543,9 @@ final class DeletePackageHelper { synchronized (mPm.mLock) { if (outInfo != null) { outInfo.mUid = ps.getAppId(); - outInfo.mBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList(ps, - allUserHandles, mPm.mSettings.getPackagesLocked()); + outInfo.mBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList( + mPm.snapshotComputer(), ps, allUserHandles, + mPm.mSettings.getPackagesLocked()); } } diff --git a/services/core/java/com/android/server/pm/DexOptHelper.java b/services/core/java/com/android/server/pm/DexOptHelper.java index 249099d122a1..8c33dd935822 100644 --- a/services/core/java/com/android/server/pm/DexOptHelper.java +++ b/services/core/java/com/android/server/pm/DexOptHelper.java @@ -432,8 +432,8 @@ final class DexOptHelper { // Whoever is calling forceDexOpt wants a compiled package. // Don't use profiles since that may cause compilation to be skipped. final int res = performDexOptInternalWithDependenciesLI(pkg, packageState, - new DexoptOptions(packageName, - getDefaultCompilerFilter(), + new DexoptOptions(packageName, REASON_CMDLINE, + getDefaultCompilerFilter(), null /* splitName */, DexoptOptions.DEXOPT_FORCE | DexoptOptions.DEXOPT_BOOT_COMPLETE)); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); @@ -442,10 +442,13 @@ final class DexOptHelper { } } - public boolean performDexOptMode(String packageName, + public boolean performDexOptMode(@NonNull Computer snapshot, String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force, boolean bootComplete, String splitName) { - PackageManagerServiceUtils.enforceSystemOrRootOrShell("performDexOptMode"); + if (!PackageManagerServiceUtils.isSystemOrRootOrShell() + && !isCallerInstallerForPackage(snapshot, packageName)) { + throw new SecurityException("performDexOptMode"); + } int flags = (checkProfiles ? DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES : 0) | (force ? DexoptOptions.DEXOPT_FORCE : 0) @@ -454,6 +457,22 @@ final class DexOptHelper { targetCompilerFilter, splitName, flags)); } + private boolean isCallerInstallerForPackage(@NonNull Computer snapshot, String packageName) { + final PackageStateInternal packageState = snapshot.getPackageStateInternal(packageName); + if (packageState == null) { + return false; + } + final InstallSource installSource = packageState.getInstallSource(); + + final PackageStateInternal installerPackageState = + snapshot.getPackageStateInternal(installSource.installerPackageName); + if (installerPackageState == null) { + return false; + } + final AndroidPackage installerPkg = installerPackageState.getPkg(); + return installerPkg.getUid() == Binder.getCallingUid(); + } + public boolean performDexOptSecondary(String packageName, String compilerFilter, boolean force) { int flags = DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX diff --git a/services/core/java/com/android/server/pm/IPackageManagerBase.java b/services/core/java/com/android/server/pm/IPackageManagerBase.java index ba7309f0283d..043661302f8f 100644 --- a/services/core/java/com/android/server/pm/IPackageManagerBase.java +++ b/services/core/java/com/android/server/pm/IPackageManagerBase.java @@ -972,8 +972,9 @@ public abstract class IPackageManagerBase extends IPackageManager.Stub { public final boolean performDexOptMode(String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force, boolean bootComplete, String splitName) { - return mDexOptHelper.performDexOptMode(packageName, checkProfiles, targetCompilerFilter, - force, bootComplete, splitName); + final Computer snapshot = snapshot(); + return mDexOptHelper.performDexOptMode(snapshot, packageName, checkProfiles, + targetCompilerFilter, force, bootComplete, splitName); } /** diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index bbdb7ebfe887..2d8d4f588192 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -464,9 +464,9 @@ final class InstallPackageHelper { KeySetManagerService ksms = mPm.mSettings.getKeySetManagerService(); ksms.addScannedPackageLPw(pkg); - mPm.mComponentResolver.addAllComponents(pkg, chatty, mPm.mSetupWizardPackage, - mPm.snapshotComputer()); - mPm.mAppsFilter.addPackage(pkgSetting, isReplace); + final Computer snapshot = mPm.snapshotComputer(); + mPm.mComponentResolver.addAllComponents(pkg, chatty, mPm.mSetupWizardPackage, snapshot); + mPm.mAppsFilter.addPackage(snapshot, pkgSetting, isReplace); mPm.addAllPackageProperties(pkg); if (oldPkgSetting == null || oldPkgSetting.getPkg() == null) { @@ -1916,7 +1916,7 @@ final class InstallPackageHelper { .setLastUpdateTime(System.currentTimeMillis()); res.mRemovedInfo.mBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList( - reconciledPkg.mPkgSetting, request.mAllUsers, + mPm.snapshotComputer(), reconciledPkg.mPkgSetting, request.mAllUsers, mPm.mSettings.getPackagesLocked()); if (reconciledPkg.mPrepareResult.mSystem) { // Remove existing system package @@ -2545,7 +2545,6 @@ final class InstallPackageHelper { ArrayList<String>[] components; int size = 0; int[] uids; - Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); synchronized (mPm.mLock) { final SparseArray<ArrayMap<String, ArrayList<String>>> userIdToPackagesToComponents = @@ -2584,7 +2583,6 @@ final class InstallPackageHelper { mPm.sendPackageChangedBroadcast(snapshot, packages[i], true /* dontKillApp */, components[i], uids[i], null /* reason */); } - Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); } void handlePackagePostInstall(PackageInstalledInfo res, InstallArgs installArgs, @@ -2712,9 +2710,9 @@ final class InstallPackageHelper { // Send to all running apps. final SparseArray<int[]> newBroadcastAllowList; synchronized (mPm.mLock) { - newBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList( - mPm.snapshotComputer() - .getPackageStateInternal(packageName, Process.SYSTEM_UID), + final Computer snapshot = mPm.snapshotComputer(); + newBroadcastAllowList = mPm.mAppsFilter.getVisibilityAllowList(snapshot, + snapshot.getPackageStateInternal(packageName, Process.SYSTEM_UID), updateUserIds, mPm.mSettings.getPackagesLocked()); } mPm.sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName, diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 2a66e026438a..320b06f6dc3e 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -629,12 +629,17 @@ public class Installer extends SystemService { } } - public boolean dumpProfiles(int uid, String packageName, String profileName, String codePath) + /** + * Dumps profiles associated with a package in a human readable format. + */ + public boolean dumpProfiles(int uid, String packageName, String profileName, String codePath, + boolean dumpClassesAndMethods) throws InstallerException { if (!checkBeforeRemote()) return false; BlockGuard.getVmPolicy().onPathAccess(codePath); try { - return mInstalld.dumpProfiles(uid, packageName, profileName, codePath); + return mInstalld.dumpProfiles(uid, packageName, profileName, codePath, + dumpClassesAndMethods); } catch (Exception e) { throw InstallerException.from(e); } diff --git a/services/core/java/com/android/server/pm/PackageHandler.java b/services/core/java/com/android/server/pm/PackageHandler.java index e8faca9765f8..0dfa31c5f1fc 100644 --- a/services/core/java/com/android/server/pm/PackageHandler.java +++ b/services/core/java/com/android/server/pm/PackageHandler.java @@ -75,7 +75,7 @@ final class PackageHandler extends Handler { try { doHandleMessage(msg); } finally { - Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); + Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); } } @@ -136,19 +136,13 @@ final class PackageHandler extends Handler { } } break; case WRITE_SETTINGS: { - Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); mPm.writeSettings(); - Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); } break; case WRITE_PACKAGE_RESTRICTIONS: { - Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); mPm.writePendingRestrictions(); - Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); } break; case WRITE_PACKAGE_LIST: { - Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT); mPm.writePackageList(msg.arg1); - Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); } break; case CHECK_PENDING_VERIFICATION: { final int verificationId = msg.arg1; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ffd924edc7d8..2cef35fcf0f6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -1413,7 +1413,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService t.traceBegin("create package manager"); final PackageManagerTracedLock lock = new PackageManagerTracedLock(); final Object installLock = new Object(); - HandlerThread backgroundThread = new HandlerThread("PackageManagerBg"); + + HandlerThread backgroundThread = new ServiceThread("PackageManagerBg", + Process.THREAD_PRIORITY_BACKGROUND, true /*allowIo*/); backgroundThread.start(); Handler backgroundHandler = new Handler(backgroundThread.getLooper()); @@ -1430,7 +1432,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService (i, pm) -> new Settings(Environment.getDataDirectory(), RuntimePermissionsPersistence.createInstance(), i.getPermissionManagerServiceInternal(), - domainVerificationService, lock), + domainVerificationService, backgroundHandler, lock), (i, pm) -> AppsFilterImpl.create(i, i.getLocalService(PackageManagerInternal.class)), (i, pm) -> (PlatformCompat) ServiceManager.getService("platform_compat"), @@ -1467,7 +1469,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService (i, pm) -> domainVerificationService, (i, pm) -> { HandlerThread thread = new ServiceThread(TAG, - Process.THREAD_PRIORITY_BACKGROUND, true /*allowIo*/); + Process.THREAD_PRIORITY_DEFAULT, true /*allowIo*/); thread.start(); return new PackageHandler(thread.getLooper(), pm); }, @@ -2992,7 +2994,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService if (ArrayUtils.isEmpty(userIds) && ArrayUtils.isEmpty(instantUserIds)) { return; } - SparseArray<int[]> broadcastAllowList = mAppsFilter.getVisibilityAllowList( + SparseArray<int[]> broadcastAllowList = mAppsFilter.getVisibilityAllowList(snapshot, snapshot.getPackageStateInternal(packageName, Process.SYSTEM_UID), userIds, snapshot.getPackageStates()); mHandler.post(() -> mBroadcastHelper.sendPackageAddedForNewUsers( @@ -4013,7 +4015,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService .getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_ALL); co.onChange(true); - mAppsFilter.onSystemReady(); + mAppsFilter.onSystemReady(LocalServices.getService(PackageManagerInternal.class)); // Disable any carrier apps. We do this very early in boot to prevent the apps from being // disabled after already being started. @@ -4226,7 +4228,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService synchronized (mLock) { scheduleWritePackageRestrictions(userId); scheduleWritePackageListLocked(userId); - mAppsFilter.onUserCreated(userId); + mAppsFilter.onUserCreated(snapshotComputer(), userId); } } @@ -4665,7 +4667,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService } @Override - public void dumpProfiles(String packageName) { + public void dumpProfiles(String packageName, boolean dumpClassesAndMethods) { /* Only the shell, root, or the app user should be able to dump profiles. */ final int callingUid = Binder.getCallingUid(); final Computer snapshot = snapshotComputer(); @@ -4683,7 +4685,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService synchronized (mInstallLock) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dump profiles"); - mArtManagerService.dumpProfiles(pkg); + mArtManagerService.dumpProfiles(pkg, dumpClassesAndMethods); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } } @@ -5751,7 +5753,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService targetPackageState = snapshotComputer().getPackageStateInternal(targetPackage); mSettings.addInstallerPackageNames(targetPackageState.getInstallSource()); } - mAppsFilter.addPackage(targetPackageState); + mAppsFilter.addPackage(snapshotComputer(), targetPackageState); scheduleWriteSettings(); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index 2a1a99068d45..4d11b13510e9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -1245,13 +1245,20 @@ public class PackageManagerServiceUtils { * @throws SecurityException if the caller is not system or shell */ public static void enforceSystemOrRootOrShell(String message) { - final int uid = Binder.getCallingUid(); - if (uid != Process.SYSTEM_UID && uid != Process.ROOT_UID && uid != Process.SHELL_UID) { + if (!isSystemOrRootOrShell()) { throw new SecurityException(message); } } /** + * Check if the Binder caller is system UID, root's UID, or shell's UID. + */ + public static boolean isSystemOrRootOrShell() { + final int uid = Binder.getCallingUid(); + return uid == Process.SYSTEM_UID || uid == Process.ROOT_UID || uid == Process.SHELL_UID; + } + + /** * Check if the Binder caller is system UID or root's UID. */ public static boolean isSystemOrRoot() { diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 7b0659332412..6b10d4c17527 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -159,13 +159,14 @@ class PackageManagerShellCommand extends ShellCommand { private static final Map<String, Integer> SUPPORTED_PERMISSION_FLAGS = new ArrayMap<>(); private static final List<String> SUPPORTED_PERMISSION_FLAGS_LIST; static { + SUPPORTED_PERMISSION_FLAGS_LIST = List.of("review-required", "revoked-compat", + "revoke-when-requested", "user-fixed", "user-set"); SUPPORTED_PERMISSION_FLAGS.put("user-set", FLAG_PERMISSION_USER_SET); SUPPORTED_PERMISSION_FLAGS.put("user-fixed", FLAG_PERMISSION_USER_FIXED); SUPPORTED_PERMISSION_FLAGS.put("revoked-compat", FLAG_PERMISSION_REVOKED_COMPAT); SUPPORTED_PERMISSION_FLAGS.put("review-required", FLAG_PERMISSION_REVIEW_REQUIRED); SUPPORTED_PERMISSION_FLAGS.put("revoke-when-requested", FLAG_PERMISSION_REVOKE_WHEN_REQUESTED); - SUPPORTED_PERMISSION_FLAGS_LIST = new ArrayList<>(SUPPORTED_PERMISSION_FLAGS.keySet()); } final IPackageManager mInterface; @@ -1994,8 +1995,23 @@ class PackageManagerShellCommand extends ShellCommand { } private int runDumpProfiles() throws RemoteException { + final PrintWriter pw = getOutPrintWriter(); + boolean dumpClassesAndMethods = false; + + String opt; + while ((opt = getNextOption()) != null) { + switch (opt) { + case "--dump-classes-and-methods": + dumpClassesAndMethods = true; + break; + default: + pw.println("Error: Unknown option: " + opt); + return 1; + } + } + String packageName = getNextArg(); - mInterface.dumpProfiles(packageName); + mInterface.dumpProfiles(packageName, dumpClassesAndMethods); return 0; } @@ -4164,9 +4180,12 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" reconcile-secondary-dex-files TARGET-PACKAGE"); pw.println(" Reconciles the package secondary dex files with the generated oat files."); pw.println(""); - pw.println(" dump-profiles TARGET-PACKAGE"); + pw.println(" dump-profiles [--dump-classes-and-methods] TARGET-PACKAGE"); pw.println(" Dumps method/class profile files to"); - pw.println(" " + ART_PROFILE_SNAPSHOT_DEBUG_LOCATION + "TARGET-PACKAGE.txt"); + pw.println(" " + ART_PROFILE_SNAPSHOT_DEBUG_LOCATION + + "TARGET-PACKAGE-primary.prof.txt."); + pw.println(" --dump-classes-and-methods: passed along to the profman binary to"); + pw.println(" switch to the format used by 'profman --create-profile-from'."); pw.println(""); pw.println(" snapshot-profile TARGET-PACKAGE [--code-path path]"); pw.println(" Take a snapshot of the package profiles to"); diff --git a/services/core/java/com/android/server/pm/ReconcilePackageUtils.java b/services/core/java/com/android/server/pm/ReconcilePackageUtils.java index 0b69cd376bd1..5fc916f888f3 100644 --- a/services/core/java/com/android/server/pm/ReconcilePackageUtils.java +++ b/services/core/java/com/android/server/pm/ReconcilePackageUtils.java @@ -18,6 +18,7 @@ package com.android.server.pm; import static android.content.pm.PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES; +import static android.content.pm.SigningDetails.CapabilityMergeRule.MERGE_RESTRICTED_CAPABILITY; import static com.android.server.pm.PackageManagerService.SCAN_BOOTING; import static com.android.server.pm.PackageManagerService.SCAN_DONT_KILL_APP; @@ -176,6 +177,19 @@ final class ReconcilePackageUtils { SigningDetails mergedDetails = sharedSigningDetails.mergeLineageWith( signingDetails); if (mergedDetails != sharedSigningDetails) { + // Use the restricted merge rule with the signing lineages from the + // other packages in the sharedUserId to ensure if any revoke a + // capability from a previous signer then this is reflected in the + // shared lineage. + for (AndroidPackage androidPackage : sharedUserSetting.getPackages()) { + if (androidPackage.getPackageName() != null + && !androidPackage.getPackageName().equals( + parsedPackage.getPackageName())) { + mergedDetails = mergedDetails.mergeLineageWith( + androidPackage.getSigningDetails(), + MERGE_RESTRICTED_CAPABILITY); + } + } sharedUserSetting.signatures.mSigningDetails = mergedDetails; } diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java index baa3a9d85b0a..65d3430fe474 100644 --- a/services/core/java/com/android/server/pm/RemovePackageHelper.java +++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java @@ -274,8 +274,9 @@ final class RemovePackageHelper { synchronized (mPm.mLock) { mPm.mDomainVerificationManager.clearPackage(deletedPs.getPackageName()); mPm.mSettings.getKeySetManagerService().removeAppKeySetDataLPw(packageName); - mPm.mAppsFilter.removePackage(mPm.snapshotComputer() - .getPackageStateInternal(packageName), false /* isReplace */); + final Computer snapshot = mPm.snapshotComputer(); + mPm.mAppsFilter.removePackage(snapshot, + snapshot.getPackageStateInternal(packageName), false /* isReplace */); removedAppId = mPm.mSettings.removePackageLPw(packageName); if (outInfo != null) { outInfo.mRemovedAppId = removedAppId; diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index e6d59d43ffbe..ba4d09f28d05 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -164,6 +164,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; +import java.util.Random; import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -360,6 +361,8 @@ public final class Settings implements Watchable, Snappable { private static final String ATTR_VALUE = "value"; private static final String ATTR_FIRST_INSTALL_TIME = "first-install-time"; + private final Handler mHandler; + private final PackageManagerTracedLock mLock; @Watched(manual = true) @@ -583,6 +586,8 @@ public final class Settings implements Watchable, Snappable { "Settings.mInstallerPackages"); mKeySetManagerService = new KeySetManagerService(mPackages); + // Test-only handler working on background thread. + mHandler = new Handler(BackgroundThread.getHandler().getLooper()); mLock = new PackageManagerTracedLock(); mPackages.putAll(pkgSettings); mAppIds = new AppIdSettingMap(); @@ -607,6 +612,7 @@ public final class Settings implements Watchable, Snappable { Settings(File dataDir, RuntimePermissionsPersistence runtimePermissionsPersistence, LegacyPermissionDataProvider permissionDataProvider, @NonNull DomainVerificationManagerInternal domainVerificationManager, + @NonNull Handler handler, @NonNull PackageManagerTracedLock lock) { mPackages = new WatchedArrayMap<>(); mPackagesSnapshot = @@ -620,6 +626,7 @@ public final class Settings implements Watchable, Snappable { "Settings.mInstallerPackages"); mKeySetManagerService = new KeySetManagerService(mPackages); + mHandler = handler; mLock = lock; mAppIds = new AppIdSettingMap(); mPermissions = new LegacyPermissionSettings(lock); @@ -627,10 +634,8 @@ public final class Settings implements Watchable, Snappable { runtimePermissionsPersistence, new Consumer<Integer>() { @Override public void accept(Integer userId) { - synchronized (mLock) { - mRuntimePermissionsPersistence.writeStateForUserSync(userId, - mPermissionDataProvider, mPackages, mSharedUsers); - } + mRuntimePermissionsPersistence.writeStateForUser(userId, mPermissionDataProvider, + mPackages, mSharedUsers, mHandler, mLock, /*sync=*/false); } }); mPermissionDataProvider = permissionDataProvider; @@ -679,6 +684,7 @@ public final class Settings implements Watchable, Snappable { // needed by the read-only methods. Note especially that the lock // is not required because this clone is meant to support lock-free // read-only methods. + mHandler = null; mLock = null; mRuntimePermissionsPersistence = r.mRuntimePermissionsPersistence; mSettingsFilename = null; @@ -5286,8 +5292,8 @@ public final class Settings implements Watchable, Snappable { public void writePermissionStateForUserLPr(int userId, boolean sync) { if (sync) { - mRuntimePermissionsPersistence.writeStateForUserSync(userId, mPermissionDataProvider, - mPackages, mSharedUsers); + mRuntimePermissionsPersistence.writeStateForUser(userId, mPermissionDataProvider, + mPackages, mSharedUsers, /*handler=*/null, mLock, /*sync=*/true); } else { mRuntimePermissionsPersistence.writeStateForUserAsync(userId); } @@ -5365,17 +5371,27 @@ public final class Settings implements Watchable, Snappable { } private static final class RuntimePermissionPersistence { - private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 200; + // 200-400ms delay to avoid monopolizing PMS lock when written for multiple users. + private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 300; + private static final double WRITE_PERMISSIONS_DELAY_JITTER = 0.3; + private static final long MAX_WRITE_PERMISSIONS_DELAY_MILLIS = 2000; private static final int UPGRADE_VERSION = -1; private static final int INITIAL_VERSION = 0; + private static final Random sRandom = new Random(); + private String mExtendedFingerprint; + @GuardedBy("mPersistenceLock") private final RuntimePermissionsPersistence mPersistence; + private final Object mPersistenceLock = new Object(); - private final Handler mHandler = new MyHandler(); + // Low-priority handlers running on SystemBg thread. + private final Handler mAsyncHandler = new MyHandler(); + private final Handler mPersistenceHandler = new Handler( + BackgroundThread.getHandler().getLooper()); private final Object mLock = new Object(); @@ -5387,6 +5403,11 @@ public final class Settings implements Watchable, Snappable { private final SparseLongArray mLastNotWrittenMutationTimesMillis = new SparseLongArray(); @GuardedBy("mLock") + // Tracking the mutations that haven't yet been written to legacy state. + // This avoids unnecessary work when writing settings for multiple users. + private boolean mIsLegacyPermissionStateStale = false; + + @GuardedBy("mLock") // The mapping keys are user ids. private final SparseIntArray mVersions = new SparseIntArray(); @@ -5398,6 +5419,11 @@ public final class Settings implements Watchable, Snappable { // The mapping keys are user ids. private final SparseBooleanArray mPermissionUpgradeNeeded = new SparseBooleanArray(); + @GuardedBy("mLock") + // Staging area for states prepared to be written. + private final SparseArray<RuntimePermissionsState> mPendingStatesToWrite = + new SparseArray<>(); + // This is a hack to allow this class to invoke a write using Settings's data structures, // to facilitate moving to a finer scoped lock without a significant refactor. private final Consumer<Integer> mInvokeWriteUserStateAsyncCallback; @@ -5457,12 +5483,25 @@ public final class Settings implements Watchable, Snappable { return PackagePartitions.FINGERPRINT + "?pc_version=" + version; } + private static long uniformRandom(double low, double high) { + double mag = high - low; + return (long) (sRandom.nextDouble() * mag + low); + } + + private static long nextWritePermissionDelayMillis() { + final long delay = WRITE_PERMISSIONS_DELAY_MILLIS; + final double jitter = WRITE_PERMISSIONS_DELAY_JITTER; + return delay + uniformRandom(-jitter * delay, jitter * delay); + } + public void writeStateForUserAsync(int userId) { synchronized (mLock) { + mIsLegacyPermissionStateStale = true; final long currentTimeMillis = SystemClock.uptimeMillis(); + final long writePermissionDelayMillis = nextWritePermissionDelayMillis(); if (mWriteScheduled.get(userId)) { - mHandler.removeMessages(userId); + mAsyncHandler.removeMessages(userId); // If enough time passed, write without holding off anymore. final long lastNotWrittenMutationTimeMillis = mLastNotWrittenMutationTimesMillis @@ -5471,77 +5510,126 @@ public final class Settings implements Watchable, Snappable { - lastNotWrittenMutationTimeMillis; if (timeSinceLastNotWrittenMutationMillis >= MAX_WRITE_PERMISSIONS_DELAY_MILLIS) { - mHandler.obtainMessage(userId).sendToTarget(); + mAsyncHandler.obtainMessage(userId).sendToTarget(); return; } // Hold off a bit more as settings are frequently changing. final long maxDelayMillis = Math.max(lastNotWrittenMutationTimeMillis + MAX_WRITE_PERMISSIONS_DELAY_MILLIS - currentTimeMillis, 0); - final long writeDelayMillis = Math.min(WRITE_PERMISSIONS_DELAY_MILLIS, + final long writeDelayMillis = Math.min(writePermissionDelayMillis, maxDelayMillis); - Message message = mHandler.obtainMessage(userId); - mHandler.sendMessageDelayed(message, writeDelayMillis); + Message message = mAsyncHandler.obtainMessage(userId); + mAsyncHandler.sendMessageDelayed(message, writeDelayMillis); } else { mLastNotWrittenMutationTimesMillis.put(userId, currentTimeMillis); - Message message = mHandler.obtainMessage(userId); - mHandler.sendMessageDelayed(message, WRITE_PERMISSIONS_DELAY_MILLIS); + Message message = mAsyncHandler.obtainMessage(userId); + mAsyncHandler.sendMessageDelayed(message, writePermissionDelayMillis); mWriteScheduled.put(userId, true); } } } - public void writeStateForUserSync(int userId, @NonNull LegacyPermissionDataProvider + public void writeStateForUser(int userId, @NonNull LegacyPermissionDataProvider legacyPermissionDataProvider, @NonNull WatchedArrayMap<String, ? extends PackageStateInternal> packageStates, - @NonNull WatchedArrayMap<String, SharedUserSetting> sharedUsers) { + @NonNull WatchedArrayMap<String, SharedUserSetting> sharedUsers, + @Nullable Handler pmHandler, @NonNull Object pmLock, + boolean sync) { + final int version; + final String fingerprint; + final boolean isLegacyPermissionStateStale; synchronized (mLock) { - mHandler.removeMessages(userId); + mAsyncHandler.removeMessages(userId); mWriteScheduled.delete(userId); - legacyPermissionDataProvider.writeLegacyPermissionStateTEMP(); + version = mVersions.get(userId, INITIAL_VERSION); + fingerprint = mFingerprints.get(userId); + isLegacyPermissionStateStale = mIsLegacyPermissionStateStale; + mIsLegacyPermissionStateStale = false; + } - int version = mVersions.get(userId, INITIAL_VERSION); + Runnable writer = () -> { + final RuntimePermissionsState runtimePermissions; + synchronized (pmLock) { + if (sync || isLegacyPermissionStateStale) { + legacyPermissionDataProvider.writeLegacyPermissionStateTEMP(); + } - String fingerprint = mFingerprints.get(userId); + Map<String, List<RuntimePermissionsState.PermissionState>> packagePermissions = + new ArrayMap<>(); + int packagesSize = packageStates.size(); + for (int i = 0; i < packagesSize; i++) { + String packageName = packageStates.keyAt(i); + PackageStateInternal packageState = packageStates.valueAt(i); + if (!packageState.hasSharedUser()) { + List<RuntimePermissionsState.PermissionState> permissions = + getPermissionsFromPermissionsState( + packageState.getLegacyPermissionState(), userId); + if (permissions.isEmpty() + && !packageState.isInstallPermissionsFixed()) { + // Storing an empty state means the package is known to the + // system and its install permissions have been granted and fixed. + // If this is not the case, we should not store anything. + continue; + } + packagePermissions.put(packageName, permissions); + } + } - Map<String, List<RuntimePermissionsState.PermissionState>> packagePermissions = - new ArrayMap<>(); - int packagesSize = packageStates.size(); - for (int i = 0; i < packagesSize; i++) { - String packageName = packageStates.keyAt(i); - PackageStateInternal packageState = packageStates.valueAt(i); - if (!packageState.hasSharedUser()) { + Map<String, List<RuntimePermissionsState.PermissionState>> + sharedUserPermissions = + new ArrayMap<>(); + final int sharedUsersSize = sharedUsers.size(); + for (int i = 0; i < sharedUsersSize; i++) { + String sharedUserName = sharedUsers.keyAt(i); + SharedUserSetting sharedUserSetting = sharedUsers.valueAt(i); List<RuntimePermissionsState.PermissionState> permissions = getPermissionsFromPermissionsState( - packageState.getLegacyPermissionState(), userId); - if (permissions.isEmpty() && !packageState.isInstallPermissionsFixed()) { - // Storing an empty state means the package is known to the system and - // its install permissions have been granted and fixed. If this is not - // the case, we should not store anything. - continue; - } - packagePermissions.put(packageName, permissions); + sharedUserSetting.getLegacyPermissionState(), userId); + sharedUserPermissions.put(sharedUserName, permissions); } - } - Map<String, List<RuntimePermissionsState.PermissionState>> sharedUserPermissions = - new ArrayMap<>(); - final int sharedUsersSize = sharedUsers.size(); - for (int i = 0; i < sharedUsersSize; i++) { - String sharedUserName = sharedUsers.keyAt(i); - SharedUserSetting sharedUserSetting = sharedUsers.valueAt(i); - List<RuntimePermissionsState.PermissionState> permissions = - getPermissionsFromPermissionsState( - sharedUserSetting.getLegacyPermissionState(), userId); - sharedUserPermissions.put(sharedUserName, permissions); + runtimePermissions = new RuntimePermissionsState(version, + fingerprint, packagePermissions, sharedUserPermissions); + } + synchronized (mLock) { + mPendingStatesToWrite.put(userId, runtimePermissions); } + if (pmHandler != null) { + // Async version. + mPersistenceHandler.post(() -> writePendingStates()); + } else { + // Sync version. + writePendingStates(); + } + }; - RuntimePermissionsState runtimePermissions = new RuntimePermissionsState(version, - fingerprint, packagePermissions, sharedUserPermissions); + if (pmHandler != null) { + // Async version, use pmHandler. + pmHandler.post(writer); + } else { + // Sync version, use caller's thread. + writer.run(); + } + } - mPersistence.writeForUser(runtimePermissions, UserHandle.of(userId)); + private void writePendingStates() { + while (true) { + final RuntimePermissionsState runtimePermissions; + final int userId; + synchronized (mLock) { + if (mPendingStatesToWrite.size() == 0) { + break; + } + userId = mPendingStatesToWrite.keyAt(0); + runtimePermissions = mPendingStatesToWrite.valueAt(0); + mPendingStatesToWrite.removeAt(0); + } + synchronized (mPersistenceLock) { + mPersistence.writeForUser(runtimePermissions, UserHandle.of(userId)); + } } } @@ -5563,7 +5651,7 @@ public final class Settings implements Watchable, Snappable { private void onUserRemoved(int userId) { synchronized (mLock) { // Make sure we do not - mHandler.removeMessages(userId); + mAsyncHandler.removeMessages(userId); mPermissionUpgradeNeeded.delete(userId); mVersions.delete(userId); @@ -5572,7 +5660,7 @@ public final class Settings implements Watchable, Snappable { } public void deleteUserRuntimePermissionsFile(int userId) { - synchronized (mLock) { + synchronized (mPersistenceLock) { mPersistence.deleteForUser(UserHandle.of(userId)); } } @@ -5581,16 +5669,17 @@ public final class Settings implements Watchable, Snappable { @NonNull WatchedArrayMap<String, PackageSetting> packageSettings, @NonNull WatchedArrayMap<String, SharedUserSetting> sharedUsers, @NonNull File userRuntimePermissionsFile) { + final RuntimePermissionsState runtimePermissions; + synchronized (mPersistenceLock) { + runtimePermissions = mPersistence.readForUser(UserHandle.of(userId)); + } + if (runtimePermissions == null) { + readLegacyStateForUserSync(userId, userRuntimePermissionsFile, packageSettings, + sharedUsers); + writeStateForUserAsync(userId); + return; + } synchronized (mLock) { - RuntimePermissionsState runtimePermissions = mPersistence.readForUser(UserHandle.of( - userId)); - if (runtimePermissions == null) { - readLegacyStateForUserSync(userId, userRuntimePermissionsFile, packageSettings, - sharedUsers); - writeStateForUserAsync(userId); - return; - } - // If the runtime permissions file exists but the version is not set this is // an upgrade from P->Q. Hence mark it with the special UPGRADE_VERSION. int version = runtimePermissions.getVersion(); diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index b3723fb61f5a..f57eaaef25a4 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -894,8 +894,12 @@ class ShortcutPackage extends ShortcutPackageItem { // Get the list of all dynamic shortcuts in this package. final ArrayList<ShortcutInfo> shortcuts = new ArrayList<>(); + // Pass callingLauncher to ensure pinned flag marked by system ui, e.g. ShareSheet, are + // included in the result findAll(shortcuts, ShortcutInfo::isNonManifestVisible, - ShortcutInfo.CLONE_REMOVE_FOR_APP_PREDICTION); + ShortcutInfo.CLONE_REMOVE_FOR_APP_PREDICTION, + mShortcutUser.mService.mContext.getPackageName(), + 0, /*getPinnedByAnyLauncher=*/ false); final List<ShortcutManager.ShareShortcutInfo> result = new ArrayList<>(); for (int i = 0; i < shortcuts.size(); i++) { diff --git a/services/core/java/com/android/server/pm/SuspendPackageHelper.java b/services/core/java/com/android/server/pm/SuspendPackageHelper.java index 860c54c31bb2..29c926c5f790 100644 --- a/services/core/java/com/android/server/pm/SuspendPackageHelper.java +++ b/services/core/java/com/android/server/pm/SuspendPackageHelper.java @@ -598,7 +598,7 @@ public final class SuspendPackageHelper { final String pkgName = pkgList[i]; final int uid = uidList[i]; SparseArray<int[]> allowList = mInjector.getAppsFilter().getVisibilityAllowList( - snapshot.getPackageStateInternal(pkgName, SYSTEM_UID), + snapshot, snapshot.getPackageStateInternal(pkgName, SYSTEM_UID), userIds, snapshot.getPackageStates()); if (allowList == null) { allowList = new SparseArray<>(0); diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 4fae6b8e1271..0e46b0f42a91 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -465,14 +465,15 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { /** * Dumps the profiles for the given package. */ - public void dumpProfiles(AndroidPackage pkg) { + public void dumpProfiles(AndroidPackage pkg, boolean dumpClassesAndMethods) { final int sharedGid = UserHandle.getSharedAppGid(pkg.getUid()); try { ArrayMap<String, String> packageProfileNames = getPackageProfileNames(pkg); for (int i = packageProfileNames.size() - 1; i >= 0; i--) { String codePath = packageProfileNames.keyAt(i); String profileName = packageProfileNames.valueAt(i); - mInstaller.dumpProfiles(sharedGid, pkg.getPackageName(), profileName, codePath); + mInstaller.dumpProfiles(sharedGid, pkg.getPackageName(), profileName, codePath, + dumpClassesAndMethods); } } catch (InstallerException e) { Slog.w(TAG, "Failed to dump profiles", e); diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 7b412a04dcc1..284c29ecfbe9 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -21,6 +21,7 @@ import static android.os.Process.FIRST_APPLICATION_UID; import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.DownloadManager; import android.app.SearchManager; @@ -903,15 +904,6 @@ final class DefaultPermissionGrantPolicy { COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS); } - // Content capture - String contentCapturePackageName = - mContext.getPackageManager().getContentCaptureServicePackageName(); - if (!TextUtils.isEmpty(contentCapturePackageName)) { - grantPermissionsToSystemPackage(pm, contentCapturePackageName, userId, - PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, - CONTACTS_PERMISSIONS, STORAGE_PERMISSIONS); - } - // Attention Service String attentionServicePackageName = mContext.getPackageManager().getAttentionServicePackageName(); @@ -1102,6 +1094,14 @@ final class DefaultPermissionGrantPolicy { } } + public void grantDefaultPermissionsToCarrierServiceApp(@NonNull String packageName, + @UserIdInt int userId) { + Log.i(TAG, "Grant permissions to Carrier Service app " + packageName + " for user:" + + userId); + grantPermissionsToPackage(NO_PM_CACHE, packageName, userId, /* ignoreSystemPackage */ false, + /* whitelistRestricted */ true, NOTIFICATION_PERMISSIONS); + } + private String getDefaultSystemHandlerActivityPackage(PackageManagerWrapper pm, String intentAction, int userId) { return getDefaultSystemHandlerActivityPackage(pm, new Intent(intentAction), userId); diff --git a/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java b/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java index ea554d3d7996..360a04f7e9bc 100644 --- a/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java @@ -18,6 +18,7 @@ package com.android.server.pm.permission; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; import android.content.Context; @@ -248,6 +249,15 @@ public class LegacyPermissionManagerService extends ILegacyPermissionManager.Stu } @Override + public void grantDefaultPermissionsToCarrierServiceApp(@NonNull String packageName, + @UserIdInt int userId) { + PackageManagerServiceUtils.enforceSystemOrRoot( + "grantDefaultPermissionsForCarrierServiceApp"); + Binder.withCleanCallingIdentity(() -> mDefaultPermissionGrantPolicy + .grantDefaultPermissionsToCarrierServiceApp(packageName, userId)); + } + + @Override public void grantDefaultPermissionsToActiveLuiApp(String packageName, int userId) { final int callingUid = Binder.getCallingUid(); PackageManagerServiceUtils.enforceSystemOrPhoneCaller( diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 092f3bec4012..d9e74f8a6afd 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -767,8 +767,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt flagValues &= ~FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT; flagValues &= ~FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT; flagValues &= ~PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION; - // REVIEW_REQUIRED can only be set by non-system apps for POST_NOTIFICATIONS, or by the - // shell or root UID. + // REVIEW_REQUIRED can be set on any permission by the shell or the root uid, or by + // any app for the POST_NOTIFICATIONS permission specifically. if (!POST_NOTIFICATIONS.equals(permName) && callingUid != Process.SHELL_UID && callingUid != Process.ROOT_UID) { flagValues &= ~PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED; diff --git a/services/core/java/com/android/server/pm/snapshot/PackageDataSnapshot.java b/services/core/java/com/android/server/pm/snapshot/PackageDataSnapshot.java index b09144568eb4..e1e22222ae3e 100644 --- a/services/core/java/com/android/server/pm/snapshot/PackageDataSnapshot.java +++ b/services/core/java/com/android/server/pm/snapshot/PackageDataSnapshot.java @@ -16,5 +16,22 @@ package com.android.server.pm.snapshot; +import android.annotation.NonNull; +import android.content.pm.UserInfo; +import android.util.ArrayMap; + +import com.android.server.pm.SharedUserSetting; +import com.android.server.pm.parsing.pkg.AndroidPackage; +import com.android.server.pm.pkg.PackageStateInternal; + +import java.util.Collection; + public interface PackageDataSnapshot { + @NonNull + ArrayMap<String, ? extends PackageStateInternal> getPackageStates(); + @NonNull + UserInfo[] getUserInfos(); + @NonNull + Collection<SharedUserSetting> getAllSharedUsers(); + AndroidPackage getPackage(String packageName); } diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index 32e7a6a81096..14abc9aabc29 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -57,6 +57,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal.PackageListObserver; import android.content.pm.PermissionInfo; +import android.content.res.Resources; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -65,11 +66,13 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import android.permission.LegacyPermissionManager; import android.permission.PermissionControllerManager; import android.permission.PermissionManager; import android.provider.Settings; import android.provider.Telephony; import android.telecom.TelecomManager; +import android.telephony.TelephonyManager; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -78,10 +81,12 @@ import android.util.Pair; import android.util.Slog; import android.util.SparseBooleanArray; +import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IAppOpsCallback; import com.android.internal.app.IAppOpsService; import com.android.internal.infra.AndroidFuture; +import com.android.internal.policy.AttributeCache; import com.android.internal.util.IntPair; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.FgThread; @@ -103,6 +108,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.ExecutionException; /** @@ -160,6 +166,7 @@ public final class PermissionPolicyService extends SystemService { private PackageManagerInternal mPackageManagerInternal; private PermissionManagerServiceInternal mPermissionManagerInternal; private NotificationManagerInternal mNotificationManager; + private TelephonyManager mTelephonyManager; private final KeyguardManager mKeyguardManager; private final PackageManager mPackageManager; private final Handler mHandler; @@ -381,6 +388,13 @@ public final class PermissionPolicyService extends SystemService { public void onBootPhase(int phase) { if (DEBUG) Slog.i(LOG_TAG, "onBootPhase(" + phase + ")"); + if (phase == PHASE_DEVICE_SPECIFIC_SERVICES_READY) { + registerCarrierPrivilegesCallbacks(); + IntentFilter filter = + new IntentFilter(TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED); + mContext.registerReceiver(mSimConfigBroadcastReceiver, filter); + } + if (phase == PHASE_ACTIVITY_MANAGER_READY) { final UserManagerInternal um = LocalServices.getService(UserManagerInternal.class); @@ -405,6 +419,94 @@ public final class PermissionPolicyService extends SystemService { } + private void initTelephonyManagerIfNeeded() { + if (mTelephonyManager == null) { + mTelephonyManager = TelephonyManager.from(mContext); + } + } + + private void registerCarrierPrivilegesCallbacks() { + initTelephonyManagerIfNeeded(); + if (mTelephonyManager == null) { + return; + } + + int numPhones = mTelephonyManager.getActiveModemCount(); + for (int i = 0; i < numPhones; i++) { + PhoneCarrierPrivilegesCallback callback = new PhoneCarrierPrivilegesCallback(i); + mPhoneCarrierPrivilegesCallbacks.add(callback); + mTelephonyManager.registerCarrierPrivilegesCallback(i, mContext.getMainExecutor(), + callback); + } + } + + private void unregisterCarrierPrivilegesCallback() { + initTelephonyManagerIfNeeded(); + if (mTelephonyManager == null) { + return; + } + + for (int i = 0; i < mPhoneCarrierPrivilegesCallbacks.size(); i++) { + PhoneCarrierPrivilegesCallback callback = mPhoneCarrierPrivilegesCallbacks.get(i); + if (callback != null) { + mTelephonyManager.unregisterCarrierPrivilegesCallback(callback); + } + } + mPhoneCarrierPrivilegesCallbacks.clear(); + } + + private final class PhoneCarrierPrivilegesCallback + implements TelephonyManager.CarrierPrivilegesCallback { + private int mPhoneId; + + PhoneCarrierPrivilegesCallback(int phoneId) { + mPhoneId = phoneId; + } + @Override + public void onCarrierPrivilegesChanged( + @NonNull Set<String> privilegedPackageNames, + @NonNull Set<Integer> privilegedUids) { + initTelephonyManagerIfNeeded(); + if (mTelephonyManager == null) { + Log.e(LOG_TAG, "Cannot grant default permissions to Carrier Service app. " + + "TelephonyManager is null"); + return; + } + + String servicePkg = mTelephonyManager.getCarrierServicePackageNameForLogicalSlot( + mPhoneId); + if (servicePkg == null) { + return; + } + int[] users = LocalServices.getService(UserManagerInternal.class).getUserIds(); + LegacyPermissionManager legacyPermManager = + mContext.getSystemService(LegacyPermissionManager.class); + for (int i = 0; i < users.length; i++) { + try { + mPackageManager.getPackageInfoAsUser(servicePkg, 0, users[i]); + legacyPermManager.grantDefaultPermissionsToCarrierServiceApp( + servicePkg, users[i]); + } catch (PackageManager.NameNotFoundException e) { + // Do nothing if the package does not exist for the specified user + } + } + } + } + + private final ArrayList<PhoneCarrierPrivilegesCallback> mPhoneCarrierPrivilegesCallbacks = + new ArrayList<>(); + + private final BroadcastReceiver mSimConfigBroadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (!TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED.equals(intent.getAction())) { + return; + } + unregisterCarrierPrivilegesCallback(); + registerCarrierPrivilegesCallbacks(); + } + }; + /** * @return Whether the user is started but not yet stopped */ @@ -1064,7 +1166,8 @@ public final class PermissionPolicyService extends SystemService { ActivityInterceptorInfo info) { super.onActivityLaunched(taskInfo, activityInfo, info); if (!shouldShowNotificationDialogOrClearFlags(taskInfo, - activityInfo.packageName, info.intent, info.checkedOptions, true)) { + activityInfo.packageName, info.intent, info.checkedOptions, true) + || isNoDisplayActivity(activityInfo)) { return; } UserHandle user = UserHandle.of(taskInfo.userId); @@ -1139,6 +1242,22 @@ public final class PermissionPolicyService extends SystemService { taskInfo, currPkg, intent, null, false); } + private boolean isNoDisplayActivity(@NonNull ActivityInfo aInfo) { + final int themeResource = aInfo.getThemeResource(); + if (themeResource == Resources.ID_NULL) { + return false; + } + + boolean noDisplay = false; + final AttributeCache.Entry ent = AttributeCache.instance() + .get(aInfo.packageName, themeResource, R.styleable.Window, 0); + if (ent != null) { + noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false); + } + + return noDisplay; + } + /** * Determine if a particular task is in the proper state to show a system-triggered * permission prompt. A prompt can be shown if the task is just starting, or the task is diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index e0da0e8bdf35..4075cddc302c 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -293,6 +293,7 @@ public final class PowerManagerService extends SystemService private final Clock mClock; private final Injector mInjector; + private AppOpsManager mAppOpsManager; private LightsManager mLightsManager; private BatteryManagerInternal mBatteryManagerInternal; private DisplayManagerInternal mDisplayManagerInternal; @@ -990,6 +991,10 @@ public final class PowerManagerService extends SystemService LowPowerStandbyController createLowPowerStandbyController(Context context, Looper looper) { return new LowPowerStandbyController(context, looper, SystemClock::elapsedRealtime); } + + AppOpsManager createAppOpsManager(Context context) { + return context.getSystemService(AppOpsManager.class); + } } final Constants mConstants; @@ -1044,6 +1049,8 @@ public final class PowerManagerService extends SystemService mInattentiveSleepWarningOverlayController = mInjector.createInattentiveSleepWarningController(); + mAppOpsManager = injector.createAppOpsManager(mContext); + mPowerGroupWakefulnessChangeListener = new PowerGroupWakefulnessChangeListener(); // Save brightness values: @@ -1562,8 +1569,7 @@ public final class PowerManagerService extends SystemService } return true; } - if (mContext.getSystemService(AppOpsManager.class).checkOpNoThrow( - AppOpsManager.OP_TURN_SCREEN_ON, opUid, opPackageName) + if (mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_TURN_SCREEN_ON, opUid, opPackageName) == AppOpsManager.MODE_ALLOWED) { if (DEBUG_SPEW) { Slog.d(TAG, "Allowing device wake-up for app with special access " + opPackageName); diff --git a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java index 89470ec00a6c..5c305c6902af 100644 --- a/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java +++ b/services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java @@ -29,6 +29,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.net.vcn.VcnManager; import android.os.Handler; import android.os.HandlerExecutor; import android.os.ParcelUuid; @@ -47,6 +48,8 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; import com.android.internal.util.IndentingPrintWriter; +import com.android.server.vcn.util.PersistableBundleUtils; +import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import java.util.ArrayList; import java.util.Collections; @@ -95,6 +98,10 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { // TODO (Android T+): Add ability to handle multiple subIds per slot. @NonNull private final Map<Integer, Integer> mReadySubIdsBySlotId = new HashMap<>(); + + @NonNull + private final Map<Integer, PersistableBundleWrapper> mSubIdToCarrierConfigMap = new HashMap<>(); + @NonNull private final OnSubscriptionsChangedListener mSubscriptionChangedListener; @NonNull @@ -250,7 +257,10 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { final TelephonySubscriptionSnapshot newSnapshot = new TelephonySubscriptionSnapshot( - mDeps.getActiveDataSubscriptionId(), newSubIdToInfoMap, privilegedPackages); + mDeps.getActiveDataSubscriptionId(), + newSubIdToInfoMap, + mSubIdToCarrierConfigMap, + privilegedPackages); // If snapshot was meaningfully updated, fire the callback if (!newSnapshot.equals(mCurrentSnapshot)) { @@ -311,47 +321,77 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { } if (SubscriptionManager.isValidSubscriptionId(subId)) { - final PersistableBundle carrierConfigs = mCarrierConfigManager.getConfigForSubId(subId); - if (mDeps.isConfigForIdentifiedCarrier(carrierConfigs)) { + final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId); + if (mDeps.isConfigForIdentifiedCarrier(carrierConfig)) { mReadySubIdsBySlotId.put(slotId, subId); + + final PersistableBundle minimized = + PersistableBundleUtils.minimizeBundle( + carrierConfig, VcnManager.VCN_RELATED_CARRIER_CONFIG_KEYS); + if (minimized != null) { + mSubIdToCarrierConfigMap.put(subId, new PersistableBundleWrapper(minimized)); + } handleSubscriptionsChanged(); } } else { - mReadySubIdsBySlotId.remove(slotId); + final Integer oldSubid = mReadySubIdsBySlotId.remove(slotId); + if (oldSubid != null) { + mSubIdToCarrierConfigMap.remove(oldSubid); + } handleSubscriptionsChanged(); } } @VisibleForTesting(visibility = Visibility.PRIVATE) void setReadySubIdsBySlotId(Map<Integer, Integer> readySubIdsBySlotId) { + mReadySubIdsBySlotId.clear(); mReadySubIdsBySlotId.putAll(readySubIdsBySlotId); } @VisibleForTesting(visibility = Visibility.PRIVATE) + void setSubIdToCarrierConfigMap( + Map<Integer, PersistableBundleWrapper> subIdToCarrierConfigMap) { + mSubIdToCarrierConfigMap.clear(); + mSubIdToCarrierConfigMap.putAll(subIdToCarrierConfigMap); + } + + @VisibleForTesting(visibility = Visibility.PRIVATE) Map<Integer, Integer> getReadySubIdsBySlotId() { return Collections.unmodifiableMap(mReadySubIdsBySlotId); } + @VisibleForTesting(visibility = Visibility.PRIVATE) + Map<Integer, PersistableBundleWrapper> getSubIdToCarrierConfigMap() { + return Collections.unmodifiableMap(mSubIdToCarrierConfigMap); + } + /** TelephonySubscriptionSnapshot is a class containing info about active subscriptions */ public static class TelephonySubscriptionSnapshot { private final int mActiveDataSubId; private final Map<Integer, SubscriptionInfo> mSubIdToInfoMap; + private final Map<Integer, PersistableBundleWrapper> mSubIdToCarrierConfigMap; private final Map<ParcelUuid, Set<String>> mPrivilegedPackages; public static final TelephonySubscriptionSnapshot EMPTY_SNAPSHOT = new TelephonySubscriptionSnapshot( - INVALID_SUBSCRIPTION_ID, Collections.emptyMap(), Collections.emptyMap()); + INVALID_SUBSCRIPTION_ID, + Collections.emptyMap(), + Collections.emptyMap(), + Collections.emptyMap()); @VisibleForTesting(visibility = Visibility.PRIVATE) TelephonySubscriptionSnapshot( int activeDataSubId, @NonNull Map<Integer, SubscriptionInfo> subIdToInfoMap, + @NonNull Map<Integer, PersistableBundleWrapper> subIdToCarrierConfigMap, @NonNull Map<ParcelUuid, Set<String>> privilegedPackages) { mActiveDataSubId = activeDataSubId; Objects.requireNonNull(subIdToInfoMap, "subIdToInfoMap was null"); Objects.requireNonNull(privilegedPackages, "privilegedPackages was null"); + Objects.requireNonNull(subIdToCarrierConfigMap, "subIdToCarrierConfigMap was null"); mSubIdToInfoMap = Collections.unmodifiableMap(subIdToInfoMap); + mSubIdToCarrierConfigMap = Collections.unmodifiableMap(subIdToCarrierConfigMap); final Map<ParcelUuid, Set<String>> unmodifiableInnerSets = new ArrayMap<>(); for (Entry<ParcelUuid, Set<String>> entry : privilegedPackages.entrySet()) { @@ -423,9 +463,40 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { : false; } + /** + * Retrieves a carrier config for a subscription in the provided group. + * + * <p>This method will prioritize non-opportunistic subscriptions, but will use the a + * carrier config for an opportunistic subscription if no other subscriptions are found. + */ + @Nullable + public PersistableBundleWrapper getCarrierConfigForSubGrp(@NonNull ParcelUuid subGrp) { + PersistableBundleWrapper result = null; + + for (int subId : getAllSubIdsInGroup(subGrp)) { + final PersistableBundleWrapper config = mSubIdToCarrierConfigMap.get(subId); + if (config != null) { + result = config; + + // Attempt to use (any) non-opportunistic subscription. If this subscription is + // opportunistic, continue and try to find a non-opportunistic subscription, + // using the opportunistic ones as a last resort. + if (!isOpportunistic(subId)) { + return config; + } + } + } + + return result; + } + @Override public int hashCode() { - return Objects.hash(mActiveDataSubId, mSubIdToInfoMap, mPrivilegedPackages); + return Objects.hash( + mActiveDataSubId, + mSubIdToInfoMap, + mSubIdToCarrierConfigMap, + mPrivilegedPackages); } @Override @@ -438,6 +509,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { return mActiveDataSubId == other.mActiveDataSubId && mSubIdToInfoMap.equals(other.mSubIdToInfoMap) + && mSubIdToCarrierConfigMap.equals(other.mSubIdToCarrierConfigMap) && mPrivilegedPackages.equals(other.mPrivilegedPackages); } @@ -448,6 +520,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { pw.println("mActiveDataSubId: " + mActiveDataSubId); pw.println("mSubIdToInfoMap: " + mSubIdToInfoMap); + pw.println("mSubIdToCarrierConfigMap: " + mSubIdToCarrierConfigMap); pw.println("mPrivilegedPackages: " + mPrivilegedPackages); pw.decreaseIndent(); @@ -458,6 +531,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { return "TelephonySubscriptionSnapshot{ " + "mActiveDataSubId=" + mActiveDataSubId + ", mSubIdToInfoMap=" + mSubIdToInfoMap + + ", mSubIdToCarrierConfigMap=" + mSubIdToCarrierConfigMap + ", mPrivilegedPackages=" + mPrivilegedPackages + " }"; } diff --git a/services/core/java/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java b/services/core/java/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java index c96c1ee01a6d..2f84fddc7278 100644 --- a/services/core/java/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java +++ b/services/core/java/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java @@ -24,6 +24,7 @@ import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_FORBIDDEN; import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_REQUIRED; import static com.android.server.VcnManagementService.LOCAL_LOG; +import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; @@ -34,7 +35,6 @@ import android.net.vcn.VcnManager; import android.net.vcn.VcnUnderlyingNetworkTemplate; import android.net.vcn.VcnWifiUnderlyingNetworkTemplate; import android.os.ParcelUuid; -import android.os.PersistableBundle; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Slog; @@ -81,7 +81,7 @@ class NetworkPriorityClassifier { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { // mRouteSelectionNetworkRequest requires a network be both VALIDATED and NOT_SUSPENDED if (networkRecord.isBlocked) { @@ -119,7 +119,7 @@ class NetworkPriorityClassifier { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { final NetworkCapabilities caps = networkRecord.networkCapabilities; final boolean isSelectedUnderlyingNetwork = currentlySelected != null @@ -181,7 +181,7 @@ class NetworkPriorityClassifier { VcnWifiUnderlyingNetworkTemplate networkPriority, UnderlyingNetworkRecord networkRecord, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { final NetworkCapabilities caps = networkRecord.networkCapabilities; if (!caps.hasTransport(TRANSPORT_WIFI)) { @@ -204,7 +204,7 @@ class NetworkPriorityClassifier { private static boolean isWifiRssiAcceptable( UnderlyingNetworkRecord networkRecord, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { final NetworkCapabilities caps = networkRecord.networkCapabilities; final boolean isSelectedNetwork = currentlySelected != null @@ -314,7 +314,7 @@ class NetworkPriorityClassifier { return false; } - static int getWifiEntryRssiThreshold(@Nullable PersistableBundle carrierConfig) { + static int getWifiEntryRssiThreshold(@Nullable PersistableBundleWrapper carrierConfig) { if (carrierConfig != null) { return carrierConfig.getInt( VcnManager.VCN_NETWORK_SELECTION_WIFI_ENTRY_RSSI_THRESHOLD_KEY, @@ -323,7 +323,7 @@ class NetworkPriorityClassifier { return WIFI_ENTRY_RSSI_THRESHOLD_DEFAULT; } - static int getWifiExitRssiThreshold(@Nullable PersistableBundle carrierConfig) { + static int getWifiExitRssiThreshold(@Nullable PersistableBundleWrapper carrierConfig) { if (carrierConfig != null) { return carrierConfig.getInt( VcnManager.VCN_NETWORK_SELECTION_WIFI_EXIT_RSSI_THRESHOLD_KEY, diff --git a/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java b/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java index a3babf7c9fff..d474c5d33a93 100644 --- a/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java +++ b/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java @@ -21,7 +21,7 @@ import static android.telephony.TelephonyCallback.ActiveDataSubscriptionIdListen import static com.android.server.VcnManagementService.LOCAL_LOG; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.getWifiEntryRssiThreshold; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.getWifiExitRssiThreshold; -import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.isOpportunistic; +import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import android.annotation.NonNull; import android.annotation.Nullable; @@ -37,8 +37,6 @@ import android.net.vcn.VcnUnderlyingNetworkTemplate; import android.os.Handler; import android.os.HandlerExecutor; import android.os.ParcelUuid; -import android.os.PersistableBundle; -import android.telephony.CarrierConfigManager; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; import android.util.ArrayMap; @@ -51,7 +49,6 @@ import com.android.server.vcn.VcnContext; import com.android.server.vcn.util.LogUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -87,7 +84,7 @@ public class UnderlyingNetworkController { @Nullable private UnderlyingNetworkListener mRouteSelectionCallback; @NonNull private TelephonySubscriptionSnapshot mLastSnapshot; - @Nullable private PersistableBundle mCarrierConfig; + @Nullable private PersistableBundleWrapper mCarrierConfig; private boolean mIsQuitting = false; @Nullable private UnderlyingNetworkRecord mCurrentRecord; @@ -124,25 +121,7 @@ public class UnderlyingNetworkController { .getSystemService(TelephonyManager.class) .registerTelephonyCallback(new HandlerExecutor(mHandler), mActiveDataSubIdListener); - // TODO: Listen for changes in carrier config that affect this. - for (int subId : mLastSnapshot.getAllSubIdsInGroup(mSubscriptionGroup)) { - PersistableBundle config = - mVcnContext - .getContext() - .getSystemService(CarrierConfigManager.class) - .getConfigForSubId(subId); - - if (config != null) { - mCarrierConfig = config; - - // Attempt to use (any) non-opportunistic subscription. If this subscription is - // opportunistic, continue and try to find a non-opportunistic subscription, using - // the opportunistic ones as a last resort. - if (!isOpportunistic(mLastSnapshot, Collections.singleton(subId))) { - break; - } - } - } + mCarrierConfig = mLastSnapshot.getCarrierConfigForSubGrp(mSubscriptionGroup); registerOrUpdateNetworkRequests(); } @@ -334,6 +313,9 @@ public class UnderlyingNetworkController { final TelephonySubscriptionSnapshot oldSnapshot = mLastSnapshot; mLastSnapshot = newSnapshot; + // Update carrier config + mCarrierConfig = mLastSnapshot.getCarrierConfigForSubGrp(mSubscriptionGroup); + // Only trigger re-registration if subIds in this group have changed if (oldSnapshot .getAllSubIdsInGroup(mSubscriptionGroup) diff --git a/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkRecord.java b/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkRecord.java index 06f92805ad2b..319680e0b01c 100644 --- a/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkRecord.java +++ b/services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkRecord.java @@ -16,6 +16,8 @@ package com.android.server.vcn.routeselection; +import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; + import android.annotation.NonNull; import android.annotation.Nullable; import android.net.LinkProperties; @@ -23,7 +25,6 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.vcn.VcnUnderlyingNetworkTemplate; import android.os.ParcelUuid; -import android.os.PersistableBundle; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting.Visibility; @@ -68,7 +69,7 @@ public class UnderlyingNetworkRecord { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { // Never changes after the underlying network record is created. if (mPriorityClass == PRIORITY_CLASS_INVALID) { mPriorityClass = @@ -113,7 +114,7 @@ public class UnderlyingNetworkRecord { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { return (left, right) -> { final int leftIndex = left.getOrCalculatePriorityClass( @@ -167,7 +168,7 @@ public class UnderlyingNetworkRecord { ParcelUuid subscriptionGroup, TelephonySubscriptionSnapshot snapshot, UnderlyingNetworkRecord currentlySelected, - PersistableBundle carrierConfig) { + PersistableBundleWrapper carrierConfig) { pw.println("UnderlyingNetworkRecord:"); pw.increaseIndent(); diff --git a/services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java b/services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java index 1c675c228554..08e8eebb8740 100644 --- a/services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java +++ b/services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java @@ -28,11 +28,13 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; +import java.util.TreeSet; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -354,4 +356,182 @@ public class PersistableBundleUtils { } } } + + /** + * Returns a copy of the persistable bundle with only the specified keys + * + * <p>This allows for holding minimized copies for memory-saving purposes. + */ + @NonNull + public static PersistableBundle minimizeBundle( + @NonNull PersistableBundle bundle, String... keys) { + final PersistableBundle minimized = new PersistableBundle(); + + if (bundle == null) { + return minimized; + } + + for (String key : keys) { + if (bundle.containsKey(key)) { + final Object value = bundle.get(key); + if (value == null) { + continue; + } + + if (value instanceof Boolean) { + minimized.putBoolean(key, (Boolean) value); + } else if (value instanceof boolean[]) { + minimized.putBooleanArray(key, (boolean[]) value); + } else if (value instanceof Double) { + minimized.putDouble(key, (Double) value); + } else if (value instanceof double[]) { + minimized.putDoubleArray(key, (double[]) value); + } else if (value instanceof Integer) { + minimized.putInt(key, (Integer) value); + } else if (value instanceof int[]) { + minimized.putIntArray(key, (int[]) value); + } else if (value instanceof Long) { + minimized.putLong(key, (Long) value); + } else if (value instanceof long[]) { + minimized.putLongArray(key, (long[]) value); + } else if (value instanceof String) { + minimized.putString(key, (String) value); + } else if (value instanceof String[]) { + minimized.putStringArray(key, (String[]) value); + } else if (value instanceof PersistableBundle) { + minimized.putPersistableBundle(key, (PersistableBundle) value); + } else { + continue; + } + } + } + + return minimized; + } + + /** Builds a stable hashcode */ + public static int getHashCode(@Nullable PersistableBundle bundle) { + if (bundle == null) { + return -1; + } + + int iterativeHashcode = 0; + TreeSet<String> treeSet = new TreeSet<>(bundle.keySet()); + for (String key : treeSet) { + Object val = bundle.get(key); + if (val instanceof PersistableBundle) { + iterativeHashcode = + Objects.hash(iterativeHashcode, key, getHashCode((PersistableBundle) val)); + } else { + iterativeHashcode = Objects.hash(iterativeHashcode, key, val); + } + } + + return iterativeHashcode; + } + + /** Checks for persistable bundle equality */ + public static boolean isEqual( + @Nullable PersistableBundle left, @Nullable PersistableBundle right) { + // Check for pointer equality & null equality + if (Objects.equals(left, right)) { + return true; + } + + // If only one of the two is null, but not the other, not equal by definition. + if (Objects.isNull(left) != Objects.isNull(right)) { + return false; + } + + if (!left.keySet().equals(right.keySet())) { + return false; + } + + for (String key : left.keySet()) { + Object leftVal = left.get(key); + Object rightVal = right.get(key); + + // Check for equality + if (Objects.equals(leftVal, rightVal)) { + continue; + } else if (Objects.isNull(leftVal) != Objects.isNull(rightVal)) { + // If only one of the two is null, but not the other, not equal by definition. + return false; + } else if (!Objects.equals(leftVal.getClass(), rightVal.getClass())) { + // If classes are different, not equal by definition. + return false; + } + if (leftVal instanceof PersistableBundle) { + if (!isEqual((PersistableBundle) leftVal, (PersistableBundle) rightVal)) { + return false; + } + } else if (leftVal.getClass().isArray()) { + if (leftVal instanceof boolean[]) { + if (!Arrays.equals((boolean[]) leftVal, (boolean[]) rightVal)) { + return false; + } + } else if (leftVal instanceof double[]) { + if (!Arrays.equals((double[]) leftVal, (double[]) rightVal)) { + return false; + } + } else if (leftVal instanceof int[]) { + if (!Arrays.equals((int[]) leftVal, (int[]) rightVal)) { + return false; + } + } else if (leftVal instanceof long[]) { + if (!Arrays.equals((long[]) leftVal, (long[]) rightVal)) { + return false; + } + } else if (!Arrays.equals((Object[]) leftVal, (Object[]) rightVal)) { + return false; + } + } else { + if (!Objects.equals(leftVal, rightVal)) { + return false; + } + } + } + + return true; + } + + /** + * Wrapper class around PersistableBundles to allow equality comparisons + * + * <p>This class exposes the minimal getters to retrieve values. + */ + public static class PersistableBundleWrapper { + @NonNull private final PersistableBundle mBundle; + + public PersistableBundleWrapper(@NonNull PersistableBundle bundle) { + mBundle = Objects.requireNonNull(bundle, "Bundle was null"); + } + + /** + * Retrieves the integer associated with the provided key. + * + * @param key the string key to query + * @param defaultValue the value to return if key does not exist + * @return the int value, or the default + */ + public int getInt(String key, int defaultValue) { + return mBundle.getInt(key, defaultValue); + } + + @Override + public int hashCode() { + return getHashCode(mBundle); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof PersistableBundleWrapper)) { + return false; + } + + final PersistableBundleWrapper other = (PersistableBundleWrapper) obj; + + return isEqual(mBundle, other.mBundle); + } + } } diff --git a/services/core/java/com/android/server/wm/ActivityClientController.java b/services/core/java/com/android/server/wm/ActivityClientController.java index 5fdcd690b5e2..4822ddbc0ebb 100644 --- a/services/core/java/com/android/server/wm/ActivityClientController.java +++ b/services/core/java/com/android/server/wm/ActivityClientController.java @@ -1190,10 +1190,29 @@ class ActivityClientController extends IActivityClientController.Stub { } } + /** + * Removes the outdated home task snapshot. + * + * @param token The token of the home task, or null if you have the + * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS} + * permission and want us to find the home task token for you. + */ @Override public void invalidateHomeTaskSnapshot(IBinder token) { + if (token == null) { + ActivityTaskManagerService.enforceTaskPermission("invalidateHomeTaskSnapshot"); + } + synchronized (mGlobalLock) { - final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token); + final ActivityRecord r; + if (token == null) { + final Task rootTask = + mService.mRootWindowContainer.getDefaultTaskDisplayArea().getRootHomeTask(); + r = rootTask != null ? rootTask.topRunningActivity() : null; + } else { + r = ActivityRecord.isInRootTaskLocked(token); + } + if (r != null && r.isActivityTypeHome()) { mService.mWindowManager.mTaskSnapshotController.removeSnapshotCache( r.getTask().mTaskId); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 1956cee11f90..b2f9b52cad8d 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -322,6 +322,7 @@ import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.WindowManager.TransitionOldType; import android.view.animation.Animation; +import android.window.ITaskFragmentOrganizer; import android.window.RemoteTransition; import android.window.SizeConfigurationBuckets; import android.window.SplashScreen; @@ -635,6 +636,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // host Activity the launch-into-pip Activity is originated from. private ActivityRecord mLaunchIntoPipHostActivity; + /** + * Sets to the previous {@link ITaskFragmentOrganizer} of the {@link TaskFragment} that the + * activity is embedded in before it is reparented to a new Task due to picture-in-picture. + */ + @Nullable + ITaskFragmentOrganizer mLastTaskFragmentOrganizerBeforePip; + boolean firstWindowDrawn; /** Whether the visible window(s) of this activity is drawn. */ private boolean mReportedDrawn; @@ -653,10 +661,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A /** * The activity is opaque and fills the entire space of this task. - * @see WindowContainer#fillsParent() + * @see #occludesParent() */ private boolean mOccludesParent; + /** + * Unlike {@link #mOccludesParent} which can be changed at runtime. This is a static attribute + * from the style of activity. Because we don't want {@link WindowContainer#getOrientation()} + * to be affected by the temporal state of {@link ActivityClientController#convertToTranslucent} + * when running ANIM_SCENE_TRANSITION. + * @see WindowContainer#fillsParent() + */ + private final boolean mFillsParent; + // The input dispatching timeout for this application token in milliseconds. long mInputDispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS; @@ -1531,7 +1548,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A updateAnimatingActivityRegistry(); - if (task == mLastParentBeforePip) { + if (task == mLastParentBeforePip && task != null) { + // Notify the TaskFragmentOrganizer that the activity is reparented back from pip. + mAtmService.mWindowOrganizerController.mTaskFragmentOrganizerController + .onActivityReparentToTask(this); // Activity's reparented back from pip, clear the links once established clearLastParentBeforePip(); } @@ -1654,6 +1674,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A : launchIntoPipHostActivity.getTask(); mLastParentBeforePip.mChildPipActivity = this; mLaunchIntoPipHostActivity = launchIntoPipHostActivity; + final TaskFragment organizedTf = launchIntoPipHostActivity == null + ? getOrganizedTaskFragment() + : launchIntoPipHostActivity.getOrganizedTaskFragment(); + mLastTaskFragmentOrganizerBeforePip = organizedTf != null + ? organizedTf.getTaskFragmentOrganizer() + : null; } private void clearLastParentBeforePip() { @@ -1662,6 +1688,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mLastParentBeforePip = null; } mLaunchIntoPipHostActivity = null; + mLastTaskFragmentOrganizerBeforePip = null; } @Nullable Task getLastParentBeforePip() { @@ -1938,8 +1965,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // This style is propagated to the main window attributes with // FLAG_SHOW_WALLPAPER from PhoneWindow#generateLayout. || ent.array.getBoolean(R.styleable.Window_windowShowWallpaper, false); + mFillsParent = mOccludesParent; noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false); } else { + mFillsParent = mOccludesParent = true; noDisplay = false; } @@ -2452,20 +2481,29 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Obsoleted snapshot. return false; } - final Rect taskBounds = task.getBounds(); - final Point taskSize = snapshot.getTaskSize(); - // Task size has changed? e.g. foldable device. - if (Math.abs(((float) taskSize.x / Math.max(taskSize.y, 1)) - - ((float) taskBounds.width() / Math.max(taskBounds.height(), 1))) > 0.01f) { - return false; - } final int rotation = mDisplayContent.rotationForActivityInDifferentOrientation(this); + final int currentRotation = task.getWindowConfiguration().getRotation(); final int targetRotation = rotation != ROTATION_UNDEFINED // The display may rotate according to the orientation of this activity. ? rotation // The activity won't change display orientation. - : task.getWindowConfiguration().getRotation(); - return snapshot.getRotation() == targetRotation; + : currentRotation; + if (snapshot.getRotation() != targetRotation) { + return false; + } + final Rect taskBounds = task.getBounds(); + int w = taskBounds.width(); + int h = taskBounds.height(); + final Point taskSize = snapshot.getTaskSize(); + if ((Math.abs(currentRotation - targetRotation) % 2) == 1) { + // Flip the size if the activity will show in 90 degree difference. + final int t = w; + w = h; + h = t; + } + // Task size might be changed with the same rotation such as on a foldable device. + return Math.abs(((float) taskSize.x / Math.max(taskSize.y, 1)) + - ((float) w / Math.max(h, 1))) <= 0.01f; } /** @@ -2825,7 +2863,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A @Override boolean fillsParent() { - return occludesParent(true /* includingFinishing */); + return mFillsParent; } /** Returns true if this activity is not finishing, is opaque and fills the entire space of @@ -5515,8 +5553,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } /** @return {@code true} if this activity should be made visible. */ - private boolean shouldBeVisible(boolean behindFullscreenActivity, boolean ignoringKeyguard) { - updateVisibilityIgnoringKeyguard(behindFullscreenActivity); + private boolean shouldBeVisible(boolean behindOccludedContainer, boolean ignoringKeyguard) { + updateVisibilityIgnoringKeyguard(behindOccludedContainer); if (ignoringKeyguard) { return visibleIgnoringKeyguard; @@ -5574,20 +5612,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return differentUidOverlayActivity != null; } - void updateVisibilityIgnoringKeyguard(boolean behindFullscreenActivity) { - visibleIgnoringKeyguard = (!behindFullscreenActivity || mLaunchTaskBehind) + void updateVisibilityIgnoringKeyguard(boolean behindOccludedContainer) { + visibleIgnoringKeyguard = (!behindOccludedContainer || mLaunchTaskBehind) && showToCurrentUser(); } boolean shouldBeVisible() { - final Task rootTask = getRootTask(); - if (rootTask == null) { + final Task task = getTask(); + if (task == null) { return false; } - final boolean behindFullscreenActivity = !rootTask.shouldBeVisible(null /* starting */) - || rootTask.getOccludingActivityAbove(this) != null; - return shouldBeVisible(behindFullscreenActivity, false /* ignoringKeyguard */); + final boolean behindOccludedContainer = !task.shouldBeVisible(null /* starting */) + || task.getOccludingActivityAbove(this) != null; + return shouldBeVisible(behindOccludedContainer, false /* ignoringKeyguard */); } void makeVisibleIfNeeded(ActivityRecord starting, boolean reportToClient) { diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 75d462131aae..34c083aa8ac1 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2809,11 +2809,6 @@ class ActivityStarter { } } - if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED - && intentTask.getWindowingMode() != mPreferredWindowingMode) { - intentTask.setWindowingMode(mPreferredWindowingMode); - } - // Update the target's launch cookie to those specified in the options if set if (mStartActivity.mLaunchCookie != null) { intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie; diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index d99770717a5d..d254aaff1a1c 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3331,7 +3331,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } userId = activity.mUserId; } - return DevicePolicyCache.getInstance().isScreenCaptureAllowed(userId, false); + return DevicePolicyCache.getInstance().isScreenCaptureAllowed(userId); } private void onLocalVoiceInteractionStartedLocked(IBinder activity, diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index cefc8717ed01..3bda2e60334a 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -562,9 +562,6 @@ public class AppTransitionController { leafTask = null; break; } - // The activity may be a child of embedded Task, but we want to find the owner Task. - // As a result, find the organized TaskFragment first. - final TaskFragment organizedTaskFragment = r.getOrganizedTaskFragment(); // There are also cases where the Task contains non-embedded activity, such as launching // split TaskFragments from a non-embedded activity. // The hierarchy may looks like this: @@ -575,10 +572,9 @@ public class AppTransitionController { // - TaskFragment // - Activity // We also want to have the organizer handle the transition for such case. - final Task task = organizedTaskFragment != null - ? organizedTaskFragment.getTask() - : r.getTask(); - if (task == null) { + final Task task = r.getTask(); + // We don't support embedding in PiP, leave the animation to the PipTaskOrganizer. + if (task == null || task.inPinnedWindowingMode()) { leafTask = null; break; } diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 3f300bce54c4..ee7d9a9b3f2d 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java @@ -19,7 +19,7 @@ package com.android.server.wm; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_SYNC_ENGINE; -import static com.android.server.wm.WindowManagerService.H.WINDOW_STATE_BLAST_SYNC_TIMEOUT; +import static com.android.server.wm.WindowState.BLAST_TIMEOUT_DURATION; import android.annotation.NonNull; import android.os.Trace; @@ -173,7 +173,7 @@ class BLASTSyncEngine { } }; merged.addTransactionCommittedListener((r) -> { r.run(); }, callback::run); - mWm.mH.postDelayed(callback, WINDOW_STATE_BLAST_SYNC_TIMEOUT); + mWm.mH.postDelayed(callback, BLAST_TIMEOUT_DURATION); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "onTransactionReady"); mListener.onTransactionReady(mSyncId, merged); @@ -255,7 +255,7 @@ class BLASTSyncEngine { } int startSyncSet(TransactionReadyListener listener) { - return startSyncSet(listener, WindowState.BLAST_TIMEOUT_DURATION, ""); + return startSyncSet(listener, BLAST_TIMEOUT_DURATION, ""); } int startSyncSet(TransactionReadyListener listener, long timeoutMs, String name) { @@ -265,7 +265,7 @@ class BLASTSyncEngine { } void startSyncSet(SyncGroup s) { - startSyncSet(s, WindowState.BLAST_TIMEOUT_DURATION); + startSyncSet(s, BLAST_TIMEOUT_DURATION); } void startSyncSet(SyncGroup s, long timeoutMs) { diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index dfa3b743292e..863782a4316e 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -78,8 +78,11 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { * Whether this {@link DisplayArea} should ignore fixed-orientation request. If {@code true}, it * can never specify orientation, but shows the fixed-orientation apps below it in the * letterbox; otherwise, it rotates based on the fixed-orientation request. + * + * <p>Note: use {@link #getIgnoreOrientationRequest} to access outside of {@link + * #setIgnoreOrientationRequest} since the value can be overridden at runtime on a device level. */ - protected boolean mIgnoreOrientationRequest; + protected boolean mSetIgnoreOrientationRequest; DisplayArea(WindowManagerService wms, Type type, String name) { this(wms, type, name, FEATURE_UNDEFINED); @@ -140,7 +143,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override int getOrientation(int candidate) { mLastOrientationSource = null; - if (mIgnoreOrientationRequest) { + if (getIgnoreOrientationRequest()) { return SCREEN_ORIENTATION_UNSET; } @@ -149,14 +152,15 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override boolean handlesOrientationChangeFromDescendant() { - return !mIgnoreOrientationRequest && super.handlesOrientationChangeFromDescendant(); + return !getIgnoreOrientationRequest() + && super.handlesOrientationChangeFromDescendant(); } @Override boolean onDescendantOrientationChanged(WindowContainer requestingContainer) { // If this is set to ignore the orientation request, we don't propagate descendant // orientation request. - return !mIgnoreOrientationRequest + return !getIgnoreOrientationRequest() && super.onDescendantOrientationChanged(requestingContainer); } @@ -167,10 +171,10 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { * @return Whether the display orientation changed after calling this method. */ boolean setIgnoreOrientationRequest(boolean ignoreOrientationRequest) { - if (mIgnoreOrientationRequest == ignoreOrientationRequest) { + if (mSetIgnoreOrientationRequest == ignoreOrientationRequest) { return false; } - mIgnoreOrientationRequest = ignoreOrientationRequest; + mSetIgnoreOrientationRequest = ignoreOrientationRequest; // Check whether we should notify Display to update orientation. if (mDisplayContent == null) { @@ -204,7 +208,11 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { } boolean getIgnoreOrientationRequest() { - return mIgnoreOrientationRequest; + // Adding an exception for when ignoreOrientationRequest is overridden at runtime for all + // DisplayArea-s. For example, this is needed for the Kids Mode since many Kids apps aren't + // optimised to support both orientations and it will be hard for kids to understand the + // app compat mode. + return mSetIgnoreOrientationRequest && !mWmService.isIgnoreOrientationRequestDisabled(); } /** @@ -289,8 +297,8 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override void dump(PrintWriter pw, String prefix, boolean dumpAll) { super.dump(pw, prefix, dumpAll); - if (mIgnoreOrientationRequest) { - pw.println(prefix + "mIgnoreOrientationRequest=true"); + if (mSetIgnoreOrientationRequest) { + pw.println(prefix + "mSetIgnoreOrientationRequest=true"); } if (hasRequestedOverrideConfiguration()) { pw.println(prefix + "overrideConfig=" + getRequestedOverrideConfiguration()); @@ -600,7 +608,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { @Override int getOrientation(int candidate) { mLastOrientationSource = null; - if (mIgnoreOrientationRequest) { + if (getIgnoreOrientationRequest()) { return SCREEN_ORIENTATION_UNSET; } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 01d1614610a2..dc441860f7c8 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -1489,7 +1489,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @Override boolean handlesOrientationChangeFromDescendant() { - return !mIgnoreOrientationRequest && !getDisplayRotation().isFixedToUserRotation(); + return !getIgnoreOrientationRequest() + && !getDisplayRotation().isFixedToUserRotation(); } /** @@ -4892,7 +4893,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @Override int getOrientation(int candidate) { - if (mIgnoreOrientationRequest) { + if (getIgnoreOrientationRequest()) { return SCREEN_ORIENTATION_UNSET; } @@ -6131,14 +6132,29 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp @Override boolean setIgnoreOrientationRequest(boolean ignoreOrientationRequest) { - if (mIgnoreOrientationRequest == ignoreOrientationRequest) return false; + if (mSetIgnoreOrientationRequest == ignoreOrientationRequest) return false; final boolean rotationChanged = super.setIgnoreOrientationRequest(ignoreOrientationRequest); mWmService.mDisplayWindowSettings.setIgnoreOrientationRequest( - this, mIgnoreOrientationRequest); + this, mSetIgnoreOrientationRequest); return rotationChanged; } /** + * Updates orientation if necessary after ignore orientation request override logic in {@link + * WindowManagerService#isIgnoreOrientationRequestDisabled} changes at runtime. + */ + void onIsIgnoreOrientationRequestDisabledChanged() { + if (mFocusedApp != null) { + // We record the last focused TDA that respects orientation request, check if this + // change may affect it. + onLastFocusedTaskDisplayAreaChanged(mFocusedApp.getDisplayArea()); + } + if (mSetIgnoreOrientationRequest) { + updateOrientation(); + } + } + + /** * Locates the appropriate target window for scroll capture. The search progresses top to * bottom. * If {@code searchBehind} is non-null, the search will only consider windows behind this one. diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index 2d7d7055a03b..014bb9f5e6ad 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -138,8 +138,8 @@ import android.window.ClientWindowFrames; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.policy.ForceShowNavBarSettingsObserver; import com.android.internal.policy.GestureNavigationSettingsObserver; -import com.android.internal.policy.KidsModeSettingsObserver; import com.android.internal.policy.ScreenDecorationsUtils; import com.android.internal.policy.SystemBarUtils; import com.android.internal.protolog.common.ProtoLog; @@ -378,7 +378,7 @@ public class DisplayPolicy { private final WindowManagerInternal.AppTransitionListener mAppTransitionListener; - private final KidsModeSettingsObserver mKidsModeSettingsObserver; + private final ForceShowNavBarSettingsObserver mForceShowNavBarSettingsObserver; private boolean mForceShowNavigationBarEnabled; private class PolicyHandler extends Handler { @@ -653,17 +653,17 @@ public class DisplayPolicy { }); mHandler.post(mGestureNavigationSettingsObserver::register); - mKidsModeSettingsObserver = new KidsModeSettingsObserver( + mForceShowNavBarSettingsObserver = new ForceShowNavBarSettingsObserver( mHandler, mContext); - mKidsModeSettingsObserver.setOnChangeRunnable(() -> { + mForceShowNavBarSettingsObserver.setOnChangeRunnable(() -> { synchronized (mLock) { mForceShowNavigationBarEnabled = - mKidsModeSettingsObserver.isEnabled(); + mForceShowNavBarSettingsObserver.isEnabled(); updateSystemBarAttributes(); } }); - mForceShowNavigationBarEnabled = mKidsModeSettingsObserver.isEnabled(); - mHandler.post(mKidsModeSettingsObserver::register); + mForceShowNavigationBarEnabled = mForceShowNavBarSettingsObserver.isEnabled(); + mHandler.post(mForceShowNavBarSettingsObserver::register); } /** @@ -2861,7 +2861,7 @@ public class DisplayPolicy { void release() { mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener); mHandler.post(mGestureNavigationSettingsObserver::unregister); - mHandler.post(mKidsModeSettingsObserver::unregister); + mHandler.post(mForceShowNavBarSettingsObserver::unregister); mImmersiveModeConfirmation.release(); } diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java index 43ff58083657..1d09116cad73 100644 --- a/services/core/java/com/android/server/wm/DisplayRotation.java +++ b/services/core/java/com/android/server/wm/DisplayRotation.java @@ -702,17 +702,17 @@ public class DisplayRotation { } boolean canRotateSeamlessly(int oldRotation, int newRotation) { + // If the navigation bar can't change sides, then it will jump when we change orientations + // and we don't rotate seamlessly - unless that is allowed, eg. with gesture navigation + // where the navbar is low-profile enough that this isn't very noticeable. + if (mAllowSeamlessRotationDespiteNavBarMoving || mDisplayPolicy.navigationBarCanMove()) { + return true; + } // For the upside down rotation we don't rotate seamlessly as the navigation bar moves // position. Note most apps (using orientation:sensor or user as opposed to fullSensor) // will not enter the reverse portrait orientation, so actually the orientation won't change // at all. - if (oldRotation == mUpsideDownRotation || newRotation == mUpsideDownRotation) { - return false; - } - // If the navigation bar can't change sides, then it will jump when we change orientations - // and we don't rotate seamlessly - unless that is allowed, eg. with gesture navigation - // where the navbar is low-profile enough that this isn't very noticeable. - return mAllowSeamlessRotationDespiteNavBarMoving || mDisplayPolicy.navigationBarCanMove(); + return oldRotation != Surface.ROTATION_180 && newRotation != Surface.ROTATION_180; } void markForSeamlessRotation(WindowState w, boolean seamlesslyRotated) { @@ -1683,7 +1683,7 @@ public class DisplayRotation { mSensorRotation = (listener == null || !listener.mEnabled) ? -2 /* disabled */ : dr.mLastSensorRotation; final DisplayContent dc = dr.mDisplayContent; - mIgnoreOrientationRequest = dc.mIgnoreOrientationRequest; + mIgnoreOrientationRequest = dc.getIgnoreOrientationRequest(); final TaskDisplayArea requestingTda = dc.getOrientationRequestingTaskDisplayArea(); mNonDefaultRequestingTaskDisplayArea = requestingTda == null ? "none" : requestingTda != dc.getDefaultTaskDisplayArea() diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index e04644c564f8..8413c5442536 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -123,7 +123,7 @@ abstract class InsetsSourceProvider { mDisplayContent = displayContent; mStateController = stateController; mFakeControl = new InsetsSourceControl( - source.getType(), null /* leash */, new Point(), Insets.NONE); + source.getType(), null /* leash */, new Point(), InsetsSourceControl.INVALID_HINTS); mControllable = InsetsPolicy.isInsetsTypeControllable(source.getType()); } diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java index c162e8ecadfc..bb15d76c3bac 100644 --- a/services/core/java/com/android/server/wm/LetterboxUiController.java +++ b/services/core/java/com/android/server/wm/LetterboxUiController.java @@ -332,25 +332,29 @@ final class LetterboxUiController { if (windowSurface != null && windowSurface.isValid()) { Transaction transaction = mActivityRecord.getSyncTransaction(); + final InsetsState insetsState = mainWindow.getInsetsState(); + final InsetsSource taskbarInsetsSource = + insetsState.peekSource(InsetsState.ITYPE_EXTRA_NAVIGATION_BAR); + if (!isLetterboxedNotForDisplayCutout(mainWindow) - || !mLetterboxConfiguration.isLetterboxActivityCornersRounded()) { + || !mLetterboxConfiguration.isLetterboxActivityCornersRounded() + || taskbarInsetsSource == null) { transaction .setWindowCrop(windowSurface, null) .setCornerRadius(windowSurface, 0); return; } - final InsetsState insetsState = mainWindow.getInsetsState(); - final InsetsSource taskbarInsetsSource = - insetsState.getSource(InsetsState.ITYPE_EXTRA_NAVIGATION_BAR); - Rect cropBounds = null; // Rounded corners should be displayed above the taskbar. When taskbar is hidden, // an insets frame is equal to a navigation bar which shouldn't affect position of // rounded corners since apps are expected to handle navigation bar inset. // This condition checks whether the taskbar is visible. - if (taskbarInsetsSource.getFrame().height() >= mExpandedTaskBarHeight) { + // Do not crop the taskbar inset if the window is in immersive mode - the user can + // swipe to show/hide the taskbar as an overlay. + if (taskbarInsetsSource.getFrame().height() >= mExpandedTaskBarHeight + && taskbarInsetsSource.isVisible()) { cropBounds = new Rect(mActivityRecord.getBounds()); // Activity bounds are in screen coordinates while (0,0) for activity's surface // control is at the top left corner of an app window so offsetting bounds diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 22714c6f5593..ca4c450a4592 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -643,9 +643,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> } } - void setSecureSurfaceState(int userId) { + void refreshSecureSurfaceState() { forAllWindows((w) -> { - if (w.mHasSurface && userId == w.mShowUserId) { + if (w.mHasSurface) { w.mWinAnimator.setSecureLocked(w.isSecureLocked()); } }, true /* traverseTopToBottom */); @@ -2097,11 +2097,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent> r.setWindowingMode(intermediateWindowingMode); r.mWaitForEnteringPinnedMode = true; rootTask.forAllTaskFragments(tf -> { - // When the Task is entering picture-in-picture, we should clear all override from - // the client organizer, so the PIP activity can get the correct config from the - // Task, and prevent conflict with the PipTaskOrganizer. - if (tf.isOrganizedTaskFragment()) { - tf.resetAdjacentTaskFragment(); + if (!tf.isOrganizedTaskFragment()) { + return; + } + tf.resetAdjacentTaskFragment(); + if (tf.getTopNonFinishingActivity() != null) { + // When the Task is entering picture-in-picture, we should clear all override + // from the client organizer, so the PIP activity can get the correct config + // from the Task, and prevent conflict with the PipTaskOrganizer. tf.updateRequestedOverrideConfiguration(EMPTY); } }); @@ -2116,7 +2119,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // to the root pinned task r.supportsEnterPipOnTaskSwitch = false; - if (organizedTf != null && organizedTf.mClearedTaskFragmentForPip) { + if (organizedTf != null && organizedTf.mClearedTaskFragmentForPip + && organizedTf.isTaskVisibleRequested()) { // Dispatch the pending info to TaskFragmentOrganizer before PIP animation. // Otherwise, it will keep waiting for the empty TaskFragment to be non-empty. mService.mTaskFragmentOrganizerController.dispatchPendingInfoChangedEvent( diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index dc15cb781bc8..17e1dd26a602 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1175,7 +1175,7 @@ class Task extends TaskFragment { // Call this again after super onParentChanged in-case the surface wasn't created yet // (happens when the task is first inserted into the hierarchy). It's a no-op if it // already ran fully within super.onParentChanged - updateTaskOrganizerState(false /* forceUpdate */); + updateTaskOrganizerState(); // TODO(b/168037178): The check for null display content and setting it to null doesn't // really make sense here... @@ -1724,8 +1724,8 @@ class Task extends TaskFragment { /** Returns {@code true} if this task is currently in split-screen. */ boolean inSplitScreen() { return getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW - && getRootTask() != null - && getRootTask().getAdjacentTaskFragment() != null; + && getCreatedByOrganizerTask() != null + && getCreatedByOrganizerTask().getAdjacentTaskFragment() != null; } private boolean supportsSplitScreenWindowingModeInner(@Nullable TaskDisplayArea tda) { @@ -1951,7 +1951,7 @@ class Task extends TaskFragment { } saveLaunchingStateIfNeeded(); - final boolean taskOrgChanged = updateTaskOrganizerState(false /* forceUpdate */); + final boolean taskOrgChanged = updateTaskOrganizerState(); if (taskOrgChanged) { updateSurfacePosition(getSyncTransaction()); if (!isOrganized()) { @@ -4269,21 +4269,18 @@ class Task extends TaskFragment { return true; } - boolean updateTaskOrganizerState(boolean forceUpdate) { - return updateTaskOrganizerState(forceUpdate, false /* skipTaskAppeared */); + boolean updateTaskOrganizerState() { + return updateTaskOrganizerState(false /* skipTaskAppeared */); } /** * Called when the task state changes (ie. from windowing mode change) an the task organizer * state should also be updated. * - * @param forceUpdate Updates the task organizer to the one currently specified in the task - * org controller for the task's windowing mode, ignoring the cached - * windowing mode checks. * @param skipTaskAppeared Skips calling taskAppeared for the new organizer if it has changed * @return {@code true} if task organizer changed. */ - boolean updateTaskOrganizerState(boolean forceUpdate, boolean skipTaskAppeared) { + boolean updateTaskOrganizerState(boolean skipTaskAppeared) { if (getSurfaceControl() == null) { // Can't call onTaskAppeared without a surfacecontrol, so defer this until next one // is created. @@ -4295,7 +4292,10 @@ class Task extends TaskFragment { final TaskOrganizerController controller = mWmService.mAtmService.mTaskOrganizerController; final ITaskOrganizer organizer = controller.getTaskOrganizer(); - if (!forceUpdate && mTaskOrganizer == organizer) { + // Do not change to different organizer if the task is created by organizer because only + // the creator knows how to manage it. + if (mCreatedByOrganizer && mTaskOrganizer != null && organizer != null + && mTaskOrganizer != organizer) { return false; } return setTaskOrganizer(organizer, skipTaskAppeared); @@ -5053,21 +5053,9 @@ class Task extends TaskFragment { 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. - ProtoLog.i(WM_DEBUG_ADD_REMOVE, "Adding activity %s to task %s " - + "callers: %s", r, task, - new RuntimeException("here").fillInStackTrace()); - rTask.positionChildAtTop(r); - ActivityOptions.abort(options); - return; - } + if (!newTask && isOrhasTask && !r.shouldBeVisible()) { + ActivityOptions.abort(options); + return; } // Place a new activity at top of root task, so it is next to interact with the user. @@ -5697,9 +5685,7 @@ class Task extends TaskFragment { 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.shouldBeVisible()) return false; if (r.finishing) Slog.e(TAG, "willActivityBeVisible: Returning false," + " would have returned true for r=" + r); diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 7a7bf1f877b9..1176182ede50 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -640,7 +640,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { @Override int getOrientation(int candidate) { mLastOrientationSource = null; - if (mIgnoreOrientationRequest) { + if (getIgnoreOrientationRequest()) { return SCREEN_ORIENTATION_UNSET; } if (!canSpecifyOrientation()) { @@ -963,7 +963,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { } else if (candidateTask != null) { final int position = onTop ? POSITION_TOP : POSITION_BOTTOM; final Task launchRootTask = getLaunchRootTask(resolvedWindowingMode, activityType, - options, sourceTask, launchFlags); + options, sourceTask, launchFlags, candidateTask); if (launchRootTask != null) { if (candidateTask.getParent() == null) { launchRootTask.addChild(candidateTask, position); @@ -977,6 +977,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { candidateTask.reparent(this, onTop); } } + // Update windowing mode if necessary, e.g. launch into a different windowing mode. + if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask() + && candidateTask.getWindowingMode() != windowingMode) { + candidateTask.setWindowingMode(windowingMode); + } return candidateTask.getRootTask(); } return new Task.Builder(mAtmService) @@ -1112,6 +1117,13 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { @Nullable Task getLaunchRootTask(int windowingMode, int activityType, @Nullable ActivityOptions options, @Nullable Task sourceTask, int launchFlags) { + return getLaunchRootTask(windowingMode, activityType, options, sourceTask, launchFlags, + null /* candidateTask */); + } + + @Nullable + Task getLaunchRootTask(int windowingMode, int activityType, @Nullable ActivityOptions options, + @Nullable Task sourceTask, int launchFlags, @Nullable Task candidateTask) { // Try to use the launch root task in options if available. if (options != null) { final Task launchRootTask = Task.fromWindowContainerToken(options.getLaunchRootTask()); @@ -1152,9 +1164,19 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { } // For a better split UX, If a task is launching from a created-by-organizer task, it should - // be launched into the same created-by-organizer task as well. - if (sourceTask != null) { - return sourceTask.getCreatedByOrganizerTask(); + // be launched into the same created-by-organizer task as well. Unless, the candidate task + // is already positioned in the split. + Task preferredRootInSplit = sourceTask != null && sourceTask.inSplitScreen() + ? sourceTask.getCreatedByOrganizerTask() : null; + if (preferredRootInSplit != null) { + if (candidateTask != null) { + final Task candidateRoot = candidateTask.getCreatedByOrganizerTask(); + if (candidateRoot != null && candidateRoot != preferredRootInSplit + && preferredRootInSplit == candidateRoot.getAdjacentTaskFragment()) { + preferredRootInSplit = candidateRoot; + } + } + return preferredRootInSplit; } return null; @@ -1912,7 +1934,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { // Only allow to specify orientation if this TDA is not set to ignore orientation request, // and it is the last focused one on this logical display that can request orientation // request. - return !mIgnoreOrientationRequest + return !getIgnoreOrientationRequest() && mDisplayContent.getOrientationRequestingTaskDisplayArea() == this; } diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index e0346544d528..56e96fa1fe58 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -519,15 +519,20 @@ class TaskFragment extends WindowContainer<WindowContainer> { return false; } + boolean isAllowedToEmbedActivity(@NonNull ActivityRecord a) { + return isAllowedToEmbedActivity(a, mTaskFragmentOrganizerUid); + } + /** * Checks if the organized task fragment is allowed to have the specified activity, which is * allowed if an activity allows embedding in untrusted mode, or if the trusted mode can be * enabled. * @see #isAllowedToEmbedActivityInTrustedMode(ActivityRecord) + * @param uid uid of the TaskFragment organizer. */ - boolean isAllowedToEmbedActivity(@NonNull ActivityRecord a) { + boolean isAllowedToEmbedActivity(@NonNull ActivityRecord a, int uid) { return isAllowedToEmbedActivityInUntrustedMode(a) - || isAllowedToEmbedActivityInTrustedMode(a); + || isAllowedToEmbedActivityInTrustedMode(a, uid); } /** @@ -544,20 +549,25 @@ class TaskFragment extends WindowContainer<WindowContainer> { == FLAG_ALLOW_UNTRUSTED_ACTIVITY_EMBEDDING; } + boolean isAllowedToEmbedActivityInTrustedMode(@NonNull ActivityRecord a) { + return isAllowedToEmbedActivityInTrustedMode(a, mTaskFragmentOrganizerUid); + } + /** * Checks if the organized task fragment is allowed to embed activity in fully trusted mode, * which means that all transactions are allowed. This is supported in the following cases: * <li>the activity belongs to the same app as the organizer host;</li> * <li>the activity has declared the organizer host as trusted explicitly via known * certificate.</li> + * @param uid uid of the TaskFragment organizer. */ - boolean isAllowedToEmbedActivityInTrustedMode(@NonNull ActivityRecord a) { - if (UserHandle.getAppId(mTaskFragmentOrganizerUid) == SYSTEM_UID) { + boolean isAllowedToEmbedActivityInTrustedMode(@NonNull ActivityRecord a, int uid) { + if (UserHandle.getAppId(uid) == SYSTEM_UID) { // The system is trusted to embed other apps securely and for all users. return true; } - if (mTaskFragmentOrganizerUid == a.getUid()) { + if (uid == a.getUid()) { // Activities from the same UID can be embedded freely by the host. return true; } @@ -570,7 +580,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { } AndroidPackage hostPackage = mAtmService.getPackageManagerInternalLocked() - .getPackage(mTaskFragmentOrganizerUid); + .getPackage(uid); return hostPackage != null && hostPackage.getSigningDetails().hasAncestorOrSelfWithDigest( knownActivityEmbeddingCerts); @@ -581,7 +591,9 @@ class TaskFragment extends WindowContainer<WindowContainer> { * @see #isAllowedToEmbedActivityInTrustedMode(ActivityRecord) */ boolean isAllowedToBeEmbeddedInTrustedMode() { - return forAllActivities(this::isAllowedToEmbedActivityInTrustedMode); + // Traverse all activities to see if any of them are not in the trusted mode. + final Predicate<ActivityRecord> callback = r -> !isAllowedToEmbedActivityInTrustedMode(r); + return !forAllActivities(callback); } /** @@ -2144,7 +2156,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) { return applicationType; } - return getTopChild().getActivityType(); + final ActivityRecord activity = getTopNonFinishingActivity(); + return activity != null ? activity.getActivityType() : getTopChild().getActivityType(); } @Override @@ -2302,11 +2315,32 @@ class TaskFragment extends WindowContainer<WindowContainer> { return mTaskFragmentOrganizer != null; } + /** Whether the Task should be visible. */ + boolean isTaskVisibleRequested() { + final Task task = getTask(); + return task != null && task.isVisibleRequested(); + } + boolean isReadyToTransit() { + // We only wait when this is organized to give the organizer a chance to update. + if (!isOrganizedTaskFragment()) { + return true; + } // We don't want to start the transition if the organized TaskFragment is empty, unless // it is requested to be removed. - return !isOrganizedTaskFragment() || getTopNonFinishingActivity() != null - || mIsRemovalRequested; + if (getTopNonFinishingActivity() != null || mIsRemovalRequested) { + return true; + } + // Organizer shouldn't change embedded TaskFragment in PiP. + if (isEmbeddedTaskFragmentInPip()) { + return true; + } + // The TaskFragment becomes empty because the last running activity enters PiP when the Task + // is minimized. + if (mClearedTaskFragmentForPip && !isTaskVisibleRequested()) { + return true; + } + return false; } /** Clear {@link #mLastPausedActivity} for all {@link TaskFragment} children */ @@ -2424,8 +2458,19 @@ class TaskFragment extends WindowContainer<WindowContainer> { mIsRemovalRequested = false; resetAdjacentTaskFragment(); cleanUp(); + final boolean shouldExecuteAppTransition = + mClearedTaskFragmentForPip && isTaskVisibleRequested(); super.removeImmediately(); sendTaskFragmentVanished(); + if (shouldExecuteAppTransition && mDisplayContent != null) { + // When the Task is still visible, and the TaskFragment is removed because the last + // running activity is reparenting to PiP, it is possible that no activity is getting + // paused or resumed (having an embedded activity in split), thus we need to relayout + // and execute it explicitly. + mAtmService.addWindowLayoutReasons( + ActivityTaskManagerService.LAYOUT_REASON_VISIBILITY_CHANGED); + mDisplayContent.executeAppTransition(); + } } /** Called on remove to cleanup. */ diff --git a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java index bd351acf5119..eaf25260405a 100644 --- a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java @@ -51,6 +51,7 @@ import java.util.WeakHashMap; */ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerController.Stub { private static final String TAG = "TaskFragmentOrganizerController"; + private static final long TEMPORARY_ACTIVITY_TOKEN_TIMEOUT_MS = 5000; private final ActivityTaskManagerService mAtmService; private final WindowManagerGlobalLock mGlobalLock; @@ -78,10 +79,14 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr private class TaskFragmentOrganizerState implements IBinder.DeathRecipient { private final ArrayList<TaskFragment> mOrganizedTaskFragments = new ArrayList<>(); private final ITaskFragmentOrganizer mOrganizer; + private final int mOrganizerPid; + private final int mOrganizerUid; private final Map<TaskFragment, TaskFragmentInfo> mLastSentTaskFragmentInfos = new WeakHashMap<>(); private final Map<TaskFragment, Configuration> mLastSentTaskFragmentParentConfigs = new WeakHashMap<>(); + private final Map<IBinder, ActivityRecord> mTemporaryActivityTokens = + new WeakHashMap<>(); /** * Map from Task Id to {@link RemoteAnimationDefinition}. @@ -91,8 +96,10 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr private final SparseArray<RemoteAnimationDefinition> mRemoteAnimationDefinitions = new SparseArray<>(); - TaskFragmentOrganizerState(ITaskFragmentOrganizer organizer) { + TaskFragmentOrganizerState(ITaskFragmentOrganizer organizer, int pid, int uid) { mOrganizer = organizer; + mOrganizerPid = pid; + mOrganizerUid = uid; try { mOrganizer.asBinder().linkToDeath(this, 0 /*flags*/); } catch (RemoteException e) { @@ -134,23 +141,23 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr mOrganizer.asBinder().unlinkToDeath(this, 0 /*flags*/); } - void onTaskFragmentAppeared(ITaskFragmentOrganizer organizer, TaskFragment tf) { + void onTaskFragmentAppeared(TaskFragment tf) { ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "TaskFragment appeared name=%s", tf.getName()); final TaskFragmentInfo info = tf.getTaskFragmentInfo(); try { - organizer.onTaskFragmentAppeared(info); + mOrganizer.onTaskFragmentAppeared(info); mLastSentTaskFragmentInfos.put(tf, info); tf.mTaskFragmentAppearedSent = true; } catch (RemoteException e) { Slog.d(TAG, "Exception sending onTaskFragmentAppeared callback", e); } - onTaskFragmentParentInfoChanged(organizer, tf); + onTaskFragmentParentInfoChanged(tf); } - void onTaskFragmentVanished(ITaskFragmentOrganizer organizer, TaskFragment tf) { + void onTaskFragmentVanished(TaskFragment tf) { ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "TaskFragment vanished name=%s", tf.getName()); try { - organizer.onTaskFragmentVanished(tf.getTaskFragmentInfo()); + mOrganizer.onTaskFragmentVanished(tf.getTaskFragmentInfo()); } catch (RemoteException e) { Slog.d(TAG, "Exception sending onTaskFragmentVanished callback", e); } @@ -159,10 +166,10 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr mLastSentTaskFragmentParentConfigs.remove(tf); } - void onTaskFragmentInfoChanged(ITaskFragmentOrganizer organizer, TaskFragment tf) { + void onTaskFragmentInfoChanged(TaskFragment tf) { // Parent config may have changed. The controller will check if there is any important // config change for the organizer. - onTaskFragmentParentInfoChanged(organizer, tf); + onTaskFragmentParentInfoChanged(tf); // Check if the info is different from the last reported info. final TaskFragmentInfo info = tf.getTaskFragmentInfo(); @@ -174,14 +181,14 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "TaskFragment info changed name=%s", tf.getName()); try { - organizer.onTaskFragmentInfoChanged(tf.getTaskFragmentInfo()); + mOrganizer.onTaskFragmentInfoChanged(tf.getTaskFragmentInfo()); mLastSentTaskFragmentInfos.put(tf, info); } catch (RemoteException e) { Slog.d(TAG, "Exception sending onTaskFragmentInfoChanged callback", e); } } - void onTaskFragmentParentInfoChanged(ITaskFragmentOrganizer organizer, TaskFragment tf) { + void onTaskFragmentParentInfoChanged(TaskFragment tf) { // Check if the parent info is different from the last reported parent info. if (tf.getParent() == null || tf.getParent().asTask() == null) { mLastSentTaskFragmentParentConfigs.remove(tf); @@ -197,30 +204,86 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr "TaskFragment parent info changed name=%s parentTaskId=%d", tf.getName(), parent.mTaskId); try { - organizer.onTaskFragmentParentInfoChanged(tf.getFragmentToken(), parentConfig); + mOrganizer.onTaskFragmentParentInfoChanged(tf.getFragmentToken(), parentConfig); mLastSentTaskFragmentParentConfigs.put(tf, new Configuration(parentConfig)); } catch (RemoteException e) { Slog.d(TAG, "Exception sending onTaskFragmentParentInfoChanged callback", e); } } - void onTaskFragmentError(ITaskFragmentOrganizer organizer, IBinder errorCallbackToken, - Throwable exception) { + void onTaskFragmentError(IBinder errorCallbackToken, Throwable exception) { ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "Sending TaskFragment error exception=%s", exception.toString()); final Bundle exceptionBundle = putExceptionInBundle(exception); try { - organizer.onTaskFragmentError(errorCallbackToken, exceptionBundle); + mOrganizer.onTaskFragmentError(errorCallbackToken, exceptionBundle); } catch (RemoteException e) { Slog.d(TAG, "Exception sending onTaskFragmentError callback", e); } } + + void onActivityReparentToTask(ActivityRecord activity) { + if (activity.finishing) { + Slog.d(TAG, "Reparent activity=" + activity.token + " is finishing"); + return; + } + final Task task = activity.getTask(); + if (task == null || task.effectiveUid != mOrganizerUid) { + Slog.d(TAG, "Reparent activity=" + activity.token + + " is not in a task belong to the organizer app."); + return; + } + if (!task.isAllowedToEmbedActivity(activity, mOrganizerUid)) { + Slog.d(TAG, "Reparent activity=" + activity.token + + " is not allowed to be embedded."); + return; + } + + final IBinder activityToken; + if (activity.getPid() == mOrganizerPid) { + // We only pass the actual token if the activity belongs to the organizer process. + activityToken = activity.token; + } else { + // For security, we can't pass the actual token if the activity belongs to a + // different process. In this case, we will pass a temporary token that organizer + // can use to reparent through WindowContainerTransaction. + activityToken = new Binder("TemporaryActivityToken"); + mTemporaryActivityTokens.put(activityToken, activity); + final Runnable timeout = () -> { + synchronized (mGlobalLock) { + mTemporaryActivityTokens.remove(activityToken); + } + }; + mAtmService.mWindowManager.mH.postDelayed(timeout, + TEMPORARY_ACTIVITY_TOKEN_TIMEOUT_MS); + } + ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "Activity=%s reparent to taskId=%d", + activity.token, task.mTaskId); + try { + mOrganizer.onActivityReparentToTask(task.mTaskId, activity.intent, activityToken); + } catch (RemoteException e) { + Slog.d(TAG, "Exception sending onActivityReparentToTask callback", e); + } + } + } + + @Nullable + ActivityRecord getReparentActivityFromTemporaryToken( + @Nullable ITaskFragmentOrganizer organizer, @Nullable IBinder activityToken) { + if (organizer == null || activityToken == null) { + return null; + } + final TaskFragmentOrganizerState state = mTaskFragmentOrganizerState.get( + organizer.asBinder()); + return state != null + ? state.mTemporaryActivityTokens.remove(activityToken) + : null; } @Override public void registerOrganizer(ITaskFragmentOrganizer organizer) { final int pid = Binder.getCallingPid(); - final long uid = Binder.getCallingUid(); + final int uid = Binder.getCallingUid(); synchronized (mGlobalLock) { ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "Register task fragment organizer=%s uid=%d pid=%d", @@ -230,7 +293,7 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr "Replacing existing organizer currently unsupported"); } mTaskFragmentOrganizerState.put(organizer.asBinder(), - new TaskFragmentOrganizerState(organizer)); + new TaskFragmentOrganizerState(organizer, pid, uid)); } } @@ -321,8 +384,10 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr PendingTaskFragmentEvent pendingEvent = getPendingTaskFragmentEvent(taskFragment, PendingTaskFragmentEvent.EVENT_APPEARED); if (pendingEvent == null) { - pendingEvent = new PendingTaskFragmentEvent(taskFragment, organizer, - PendingTaskFragmentEvent.EVENT_APPEARED); + pendingEvent = new PendingTaskFragmentEvent.Builder( + PendingTaskFragmentEvent.EVENT_APPEARED, organizer) + .setTaskFragment(taskFragment) + .build(); mPendingTaskFragmentEvents.add(pendingEvent); } } @@ -347,7 +412,9 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr } PendingTaskFragmentEvent pendingEvent = getLastPendingLifecycleEvent(taskFragment); if (pendingEvent == null) { - pendingEvent = new PendingTaskFragmentEvent(taskFragment, organizer, eventType); + pendingEvent = new PendingTaskFragmentEvent.Builder(eventType, organizer) + .setTaskFragment(taskFragment) + .build(); } else { if (pendingEvent.mEventType == PendingTaskFragmentEvent.EVENT_VANISHED) { // Skipped the info changed event if vanished event is pending. @@ -374,8 +441,10 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr if (!taskFragment.mTaskFragmentAppearedSent) { return; } - PendingTaskFragmentEvent pendingEvent = new PendingTaskFragmentEvent(taskFragment, - organizer, PendingTaskFragmentEvent.EVENT_VANISHED); + final PendingTaskFragmentEvent pendingEvent = new PendingTaskFragmentEvent.Builder( + PendingTaskFragmentEvent.EVENT_VANISHED, organizer) + .setTaskFragment(taskFragment) + .build(); mPendingTaskFragmentEvents.add(pendingEvent); state.removeTaskFragment(taskFragment); } @@ -384,8 +453,43 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr Throwable exception) { validateAndGetState(organizer); Slog.w(TAG, "onTaskFragmentError ", exception); - PendingTaskFragmentEvent pendingEvent = new PendingTaskFragmentEvent(organizer, - errorCallbackToken, exception, PendingTaskFragmentEvent.EVENT_ERROR); + final PendingTaskFragmentEvent pendingEvent = new PendingTaskFragmentEvent.Builder( + PendingTaskFragmentEvent.EVENT_ERROR, organizer) + .setErrorCallbackToken(errorCallbackToken) + .setException(exception) + .build(); + mPendingTaskFragmentEvents.add(pendingEvent); + } + + void onActivityReparentToTask(ActivityRecord activity) { + final ITaskFragmentOrganizer organizer; + if (activity.mLastTaskFragmentOrganizerBeforePip != null) { + // If the activity is previously embedded in an organized TaskFragment. + organizer = activity.mLastTaskFragmentOrganizerBeforePip; + } else { + // Find the topmost TaskFragmentOrganizer. + final Task task = activity.getTask(); + final TaskFragment[] organizedTf = new TaskFragment[1]; + task.forAllLeafTaskFragments(tf -> { + if (tf.isOrganizedTaskFragment()) { + organizedTf[0] = tf; + return true; + } + return false; + }); + if (organizedTf[0] == null) { + return; + } + organizer = organizedTf[0].getTaskFragmentOrganizer(); + } + if (!mTaskFragmentOrganizerState.containsKey(organizer.asBinder())) { + Slog.w(TAG, "The last TaskFragmentOrganizer no longer exists"); + return; + } + final PendingTaskFragmentEvent pendingEvent = new PendingTaskFragmentEvent.Builder( + PendingTaskFragmentEvent.EVENT_ACTIVITY_REPARENT_TO_TASK, organizer) + .setActivity(activity) + .build(); mPendingTaskFragmentEvents.add(pendingEvent); } @@ -422,13 +526,15 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr static final int EVENT_INFO_CHANGED = 2; static final int EVENT_PARENT_INFO_CHANGED = 3; static final int EVENT_ERROR = 4; + static final int EVENT_ACTIVITY_REPARENT_TO_TASK = 5; @IntDef(prefix = "EVENT_", value = { EVENT_APPEARED, EVENT_VANISHED, EVENT_INFO_CHANGED, EVENT_PARENT_INFO_CHANGED, - EVENT_ERROR + EVENT_ERROR, + EVENT_ACTIVITY_REPARENT_TO_TASK }) @Retention(RetentionPolicy.SOURCE) public @interface EventType {} @@ -436,34 +542,30 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr @EventType private final int mEventType; private final ITaskFragmentOrganizer mTaskFragmentOrg; + @Nullable private final TaskFragment mTaskFragment; - private final IBinder mErrorCallback; + @Nullable + private final IBinder mErrorCallbackToken; + @Nullable private final Throwable mException; + @Nullable + private final ActivityRecord mActivity; // Set when the event is deferred due to the host task is invisible. The defer time will // be the last active time of the host task. private long mDeferTime; - private PendingTaskFragmentEvent(TaskFragment taskFragment, - ITaskFragmentOrganizer taskFragmentOrg, @EventType int eventType) { - this(taskFragment, taskFragmentOrg, null /* errorCallback */, - null /* exception */, eventType); - - } - - private PendingTaskFragmentEvent(ITaskFragmentOrganizer taskFragmentOrg, - IBinder errorCallback, Throwable exception, @EventType int eventType) { - this(null /* taskFragment */, taskFragmentOrg, errorCallback, exception, - eventType); - } - - private PendingTaskFragmentEvent(TaskFragment taskFragment, - ITaskFragmentOrganizer taskFragmentOrg, IBinder errorCallback, Throwable exception, - @EventType int eventType) { - mTaskFragment = taskFragment; + private PendingTaskFragmentEvent(@EventType int eventType, + ITaskFragmentOrganizer taskFragmentOrg, + @Nullable TaskFragment taskFragment, + @Nullable IBinder errorCallbackToken, + @Nullable Throwable exception, + @Nullable ActivityRecord activity) { + mEventType = eventType; mTaskFragmentOrg = taskFragmentOrg; - mErrorCallback = errorCallback; + mTaskFragment = taskFragment; + mErrorCallbackToken = errorCallbackToken; mException = exception; - mEventType = eventType; + mActivity = activity; } /** @@ -481,6 +583,50 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr return false; } } + + private static class Builder { + @EventType + private final int mEventType; + private final ITaskFragmentOrganizer mTaskFragmentOrg; + @Nullable + private TaskFragment mTaskFragment; + @Nullable + private IBinder mErrorCallbackToken; + @Nullable + private Throwable mException; + @Nullable + private ActivityRecord mActivity; + + Builder(@EventType int eventType, ITaskFragmentOrganizer taskFragmentOrg) { + mEventType = eventType; + mTaskFragmentOrg = taskFragmentOrg; + } + + Builder setTaskFragment(@Nullable TaskFragment taskFragment) { + mTaskFragment = taskFragment; + return this; + } + + Builder setErrorCallbackToken(@Nullable IBinder errorCallbackToken) { + mErrorCallbackToken = errorCallbackToken; + return this; + } + + Builder setException(@Nullable Throwable exception) { + mException = exception; + return this; + } + + Builder setActivity(@Nullable ActivityRecord activity) { + mActivity = activity; + return this; + } + + PendingTaskFragmentEvent build() { + return new PendingTaskFragmentEvent(mEventType, mTaskFragmentOrg, mTaskFragment, + mErrorCallbackToken, mException, mActivity); + } + } } @Nullable @@ -518,8 +664,13 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr // longer has activities. As a result, the organizer will never get this info changed event // and will not delete the TaskFragment because the organizer thinks the TaskFragment still // has running activities. + // Another case is when an organized TaskFragment became empty because the last running + // activity is reparented to a new Task due to enter PiP. We also want to notify the + // organizer, so it can remove the empty TaskFragment and update the paired TaskFragment + // without causing the extra delay. return event.mEventType == PendingTaskFragmentEvent.EVENT_INFO_CHANGED - && task.topRunningActivity() == null && lastInfo != null + && (task.topRunningActivity() == null || info.isTaskFragmentClearedForPip()) + && lastInfo != null && lastInfo.getRunningActivityCount() > 0 && info.getRunningActivityCount() == 0; } @@ -591,20 +742,22 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr } switch (event.mEventType) { case PendingTaskFragmentEvent.EVENT_APPEARED: - state.onTaskFragmentAppeared(taskFragmentOrg, taskFragment); + state.onTaskFragmentAppeared(taskFragment); break; case PendingTaskFragmentEvent.EVENT_VANISHED: - state.onTaskFragmentVanished(taskFragmentOrg, taskFragment); + state.onTaskFragmentVanished(taskFragment); break; case PendingTaskFragmentEvent.EVENT_INFO_CHANGED: - state.onTaskFragmentInfoChanged(taskFragmentOrg, taskFragment); + state.onTaskFragmentInfoChanged(taskFragment); break; case PendingTaskFragmentEvent.EVENT_PARENT_INFO_CHANGED: - state.onTaskFragmentParentInfoChanged(taskFragmentOrg, taskFragment); + state.onTaskFragmentParentInfoChanged(taskFragment); break; case PendingTaskFragmentEvent.EVENT_ERROR: - state.onTaskFragmentError(taskFragmentOrg, event.mErrorCallback, - event.mException); + state.onTaskFragmentError(event.mErrorCallbackToken, event.mException); + break; + case PendingTaskFragmentEvent.EVENT_ACTIVITY_REPARENT_TO_TASK: + state.onActivityReparentToTask(event.mActivity); } } diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 9bf988f16090..6e84681f0ab5 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -257,7 +257,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { // organizer is disposed off to avoid inconsistent behavior. t.removeImmediately(); } else { - t.updateTaskOrganizerState(true /* forceUpdate */); + t.updateTaskOrganizerState(); } if (mOrganizedTasks.contains(t)) { // updateTaskOrganizerState should remove the task from the list, but still @@ -381,8 +381,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { final TaskOrganizerState state = mTaskOrganizerStates.get(organizer.asBinder()); mService.mRootWindowContainer.forAllTasks((task) -> { boolean returnTask = !task.mCreatedByOrganizer; - task.updateTaskOrganizerState(true /* forceUpdate */, - returnTask /* skipTaskAppeared */); + task.updateTaskOrganizerState(returnTask /* skipTaskAppeared */); if (returnTask) { SurfaceControl outSurfaceControl = state.addTaskWithoutCallback(task, "TaskOrganizerController.registerTaskOrganizer"); @@ -1001,6 +1000,19 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { } } + @Override + public void setIsIgnoreOrientationRequestDisabled(boolean isDisabled) { + enforceTaskPermission("setIsIgnoreOrientationRequestDisabled()"); + final long origId = Binder.clearCallingIdentity(); + try { + synchronized (mGlobalLock) { + mService.mWindowManager.setIsIgnoreOrientationRequestDisabled(isDisabled); + } + } finally { + Binder.restoreCallingIdentity(origId); + } + } + public boolean handleInterceptBackPressedOnTaskRoot(Task task) { if (task == null || !task.isOrganized() || !mInterceptBackPressedOnRootTasks.contains(task.mTaskId)) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c37c9cb72ec5..a9b0f0dc28ad 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -423,7 +423,7 @@ public class WindowManagerService extends IWindowManager.Stub "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 2); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY @@ -989,6 +989,8 @@ public class WindowManagerService extends IWindowManager.Stub final LetterboxConfiguration mLetterboxConfiguration; + private boolean mIsIgnoreOrientationRequestDisabled; + final InputManagerService mInputManager; final DisplayManagerInternal mDisplayManagerInternal; final DisplayManager mDisplayManager; @@ -2009,15 +2011,15 @@ public class WindowManagerService extends IWindowManager.Stub * the device policy cache. */ @Override - public void refreshScreenCaptureDisabled(int userId) { + public void refreshScreenCaptureDisabled() { int callingUid = Binder.getCallingUid(); if (callingUid != SYSTEM_UID) { throw new SecurityException("Only system can call refreshScreenCaptureDisabled."); } synchronized (mGlobalLock) { - // Update secure surface for all windows belonging to this user. - mRoot.setSecureSurfaceState(userId); + // Refresh secure surface for all windows. + mRoot.refreshSecureSurfaceState(); } } @@ -4087,6 +4089,36 @@ public class WindowManagerService extends IWindowManager.Stub } } + /** + * Controls whether ignore orientation request logic in {@link DisplayArea} is disabled + * at runtime. + * + * <p>Note: this assumes that {@link #mGlobalLock} is held by the caller. + * + * @param isDisabled when {@code true}, the system always ignores the value of {@link + * DisplayArea#getIgnoreOrientationRequest} and app requested orientation is + * respected. + */ + void setIsIgnoreOrientationRequestDisabled(boolean isDisabled) { + if (isDisabled == mIsIgnoreOrientationRequestDisabled) { + return; + } + mIsIgnoreOrientationRequestDisabled = isDisabled; + for (int i = mRoot.getChildCount() - 1; i >= 0; i--) { + mRoot.getChildAt(i).onIsIgnoreOrientationRequestDisabledChanged(); + } + } + + /** + * Whether the system ignores the value of {@link DisplayArea#getIgnoreOrientationRequest} and + * app requested orientation is respected. + * + * <p>Note: this assumes that {@link #mGlobalLock} is held by the caller. + */ + boolean isIgnoreOrientationRequestDisabled() { + return mIsIgnoreOrientationRequestDisabled; + } + @Override public void freezeRotation(int rotation) { freezeDisplayRotation(Display.DEFAULT_DISPLAY, rotation); diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 67f7ff701981..137a3ac81b9b 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -30,6 +30,7 @@ import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REPARENT_CHILDREN; +import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_RESTORE_TRANSIENT_ORDER; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_ADJACENT_ROOTS; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_SET_ADJACENT_TASK_FRAGMENTS; @@ -705,7 +706,14 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } case HIERARCHY_OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT: { final IBinder fragmentToken = hop.getNewParent(); - final ActivityRecord activity = ActivityRecord.forTokenLocked(hop.getContainer()); + final IBinder activityToken = hop.getContainer(); + ActivityRecord activity = ActivityRecord.forTokenLocked(activityToken); + if (activity == null) { + // The token may be a temporary token if the activity doesn't belong to + // the organizer process. + activity = mTaskFragmentOrganizerController + .getReparentActivityFromTemporaryToken(organizer, activityToken); + } final TaskFragment parent = mLaunchTaskFragments.get(fragmentToken); if (parent == null || activity == null) { final Throwable exception = new IllegalArgumentException( @@ -768,6 +776,29 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } break; } + case HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT: { + final TaskFragment tf = mLaunchTaskFragments.get(hop.getContainer()); + if (tf == null || !tf.isAttached()) { + Slog.e(TAG, "Attempt to operate on detached container: " + tf); + break; + } + final ActivityRecord curFocus = tf.getDisplayContent().mFocusedApp; + if (curFocus != null && curFocus.getTaskFragment() == tf) { + Slog.d(TAG, "The requested TaskFragment already has the focus."); + break; + } + if (curFocus != null && curFocus.getTask() != tf.getTask()) { + Slog.d(TAG, "The Task of the requested TaskFragment doesn't have focus."); + break; + } + final ActivityRecord targetFocus = tf.getTopResumedActivity(); + if (targetFocus == null) { + Slog.d(TAG, "There is no resumed activity in the requested TaskFragment."); + break; + } + tf.getDisplayContent().setFocusedApp(targetFocus); + break; + } default: { // The other operations may change task order so they are skipped while in lock // task mode. The above operations are still allowed because they don't move @@ -1311,6 +1342,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub case HIERARCHY_OP_TYPE_START_ACTIVITY_IN_TASK_FRAGMENT: case HIERARCHY_OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT: case HIERARCHY_OP_TYPE_SET_ADJACENT_TASK_FRAGMENTS: + case HIERARCHY_OP_TYPE_REQUEST_FOCUS_ON_TASK_FRAGMENT: // We are allowing organizer to start/reparent activity to a TaskFragment it // created, or set two TaskFragments adjacent to each other. Nothing to check // here because the TaskFragment may not be created yet, but will be created in @@ -1406,7 +1438,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } final WindowConfiguration requestedWindowConfig = requestedConfig.windowConfiguration; final WindowConfiguration parentWindowConfig = parentConfig.windowConfiguration; - if (!parentWindowConfig.getBounds().contains(requestedWindowConfig.getBounds())) { + if (!requestedWindowConfig.getBounds().isEmpty() + && !parentWindowConfig.getBounds().contains(requestedWindowConfig.getBounds())) { String msg = "Permission Denial: " + func + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + " trying to apply bounds outside of parent for non-trusted host," @@ -1415,6 +1448,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub throw new SecurityException(msg); } if (requestedWindowConfig.getAppBounds() != null + && !requestedWindowConfig.getAppBounds().isEmpty() && parentWindowConfig.getAppBounds() != null && !parentWindowConfig.getAppBounds().contains( requestedWindowConfig.getAppBounds())) { diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 238f96ffd1e1..c6288a7da26a 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2040,8 +2040,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if ((mAttrs.flags & WindowManager.LayoutParams.FLAG_SECURE) != 0) { return true; } - return !DevicePolicyCache.getInstance().isScreenCaptureAllowed(mShowUserId, - mOwnerCanAddInternalSystemWindow); + return !DevicePolicyCache.getInstance().isScreenCaptureAllowed(mShowUserId); } /** diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java index aca138935491..3912991a41ed 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java @@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; import static android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST; import static android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST; +import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1; import static com.android.server.devicepolicy.DevicePolicyManagerService.LOG_TAG; @@ -159,6 +160,10 @@ class ActiveAdmin { private static final String ATTR_VALUE = "value"; private static final String ATTR_LAST_NETWORK_LOGGING_NOTIFICATION = "last-notification"; private static final String ATTR_NUM_NETWORK_LOGGING_NOTIFICATIONS = "num-notifications"; + private static final String TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIGS = + "preferential_network_service_configs"; + private static final String TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG = + "preferential_network_service_config"; DeviceAdminInfo info; @@ -587,8 +592,6 @@ class ActiveAdmin { } writeAttributeValueToXml(out, TAG_ADMIN_CAN_GRANT_SENSORS_PERMISSIONS, mAdminCanGrantSensorsPermissions); - writeAttributeValueToXml(out, TAG_PREFERENTIAL_NETWORK_SERVICE_ENABLED, - mPreferentialNetworkServiceEnabled); if (mUsbDataSignalingEnabled != USB_DATA_SIGNALING_ENABLED_DEFAULT) { writeAttributeValueToXml(out, TAG_USB_DATA_SIGNALING, mUsbDataSignalingEnabled); } @@ -603,6 +606,13 @@ class ActiveAdmin { writeAttributeValuesToXml(out, TAG_SSID_DENYLIST, TAG_SSID, ssids); } } + if (!mPreferentialNetworkServiceConfigs.isEmpty()) { + out.startTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIGS); + for (PreferentialNetworkServiceConfig config : mPreferentialNetworkServiceConfigs) { + config.writeToXml(out); + } + out.endTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIGS); + } } private List<String> ssidsToStrings(Set<WifiSsid> ssids) { @@ -833,6 +843,14 @@ class ActiveAdmin { } else if (TAG_PREFERENTIAL_NETWORK_SERVICE_ENABLED.equals(tag)) { mPreferentialNetworkServiceEnabled = parser.getAttributeBoolean(null, ATTR_VALUE, DevicePolicyManager.PREFERENTIAL_NETWORK_SERVICE_ENABLED_DEFAULT); + if (mPreferentialNetworkServiceEnabled) { + PreferentialNetworkServiceConfig.Builder configBuilder = + new PreferentialNetworkServiceConfig.Builder(); + configBuilder.setEnabled(mPreferentialNetworkServiceEnabled); + configBuilder.setNetworkId(NET_ENTERPRISE_ID_1); + mPreferentialNetworkServiceConfigs = List.of(configBuilder.build()); + mPreferentialNetworkServiceEnabled = false; + } } else if (TAG_COMMON_CRITERIA_MODE.equals(tag)) { mCommonCriteriaMode = parser.getAttributeBoolean(null, ATTR_VALUE, false); } else if (TAG_PASSWORD_COMPLEXITY.equals(tag)) { @@ -871,6 +889,12 @@ class ActiveAdmin { List<WifiSsid> ssids = readWifiSsids(parser, TAG_SSID); mWifiSsidPolicy = new WifiSsidPolicy( WIFI_SSID_POLICY_TYPE_DENYLIST, new ArraySet<>(ssids)); + } else if (TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIGS.equals(tag)) { + List<PreferentialNetworkServiceConfig> configs = + getPreferentialNetworkServiceConfigs(parser, tag); + if (!configs.isEmpty()) { + mPreferentialNetworkServiceConfigs = configs; + } } else { Slogf.w(LOG_TAG, "Unknown admin tag: %s", tag); XmlUtils.skipCurrentTag(parser); @@ -956,19 +980,43 @@ class ActiveAdmin { return result; } - private TrustAgentInfo getTrustAgentInfo(TypedXmlPullParser parser, String tag) + private TrustAgentInfo getTrustAgentInfo(TypedXmlPullParser parser, String outerTag) throws XmlPullParserException, IOException { - int outerDepthDAM = parser.getDepth(); - int typeDAM; + int outerDepth = parser.getDepth(); + int type; TrustAgentInfo result = new TrustAgentInfo(null); + while ((type = parser.next()) != END_DOCUMENT + && (type != END_TAG || parser.getDepth() > outerDepth)) { + if (type == END_TAG || type == TEXT) { + continue; + } + String tag = parser.getName(); + if (TAG_TRUST_AGENT_COMPONENT_OPTIONS.equals(tag)) { + result.options = PersistableBundle.restoreFromXml(parser); + } else { + Slogf.w(LOG_TAG, "Unknown tag under %s: %s", outerTag, tag); + } + } + return result; + } + + @NonNull + private List<PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs( + TypedXmlPullParser parser, String tag) throws XmlPullParserException, IOException { + int outerDepth = parser.getDepth(); + int typeDAM; + final List<PreferentialNetworkServiceConfig> result = new ArrayList<>(); while ((typeDAM = parser.next()) != END_DOCUMENT - && (typeDAM != END_TAG || parser.getDepth() > outerDepthDAM)) { + && (typeDAM != END_TAG || parser.getDepth() > outerDepth)) { if (typeDAM == END_TAG || typeDAM == TEXT) { continue; } String tagDAM = parser.getName(); - if (TAG_TRUST_AGENT_COMPONENT_OPTIONS.equals(tagDAM)) { - result.options = PersistableBundle.restoreFromXml(parser); + if (TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG.equals(tagDAM)) { + final PreferentialNetworkServiceConfig preferentialNetworkServiceConfig = + PreferentialNetworkServiceConfig.getPreferentialNetworkServiceConfig( + parser, tag); + result.add(preferentialNetworkServiceConfig); } else { Slogf.w(LOG_TAG, "Unknown tag under %s: %s", tag, tagDAM); } @@ -1258,5 +1306,14 @@ class ActiveAdmin { mFactoryResetProtectionPolicy.dump(pw); pw.decreaseIndent(); } + + if (mPreferentialNetworkServiceConfigs != null) { + pw.println("mPreferentialNetworkServiceConfigs:"); + pw.increaseIndent(); + for (PreferentialNetworkServiceConfig config : mPreferentialNetworkServiceConfigs) { + config.dump(pw); + } + pw.decreaseIndent(); + } } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java index a3017990543f..304d148252b1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyCacheImpl.java @@ -18,6 +18,7 @@ package com.android.server.devicepolicy; import android.annotation.UserIdInt; import android.app.admin.DevicePolicyCache; import android.app.admin.DevicePolicyManager; +import android.os.UserHandle; import android.util.IndentingPrintWriter; import android.util.SparseBooleanArray; import android.util.SparseIntArray; @@ -37,8 +38,12 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { */ private final Object mLock = new Object(); + /** + * Indicates which user is screen capture disallowed on. Can be {@link UserHandle#USER_NULL}, + * {@link UserHandle#USER_ALL} or a concrete user ID. + */ @GuardedBy("mLock") - private final SparseBooleanArray mScreenCaptureDisabled = new SparseBooleanArray(); + private int mScreenCaptureDisallowedUser = UserHandle.USER_NULL; @GuardedBy("mLock") private final SparseIntArray mPasswordQuality = new SparseIntArray(); @@ -57,7 +62,6 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { public void onUserRemoved(int userHandle) { synchronized (mLock) { - mScreenCaptureDisabled.delete(userHandle); mPasswordQuality.delete(userHandle); mPermissionPolicy.delete(userHandle); mCanGrantSensorsPermissions.delete(userHandle); @@ -65,15 +69,22 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { } @Override - public boolean isScreenCaptureAllowed(int userHandle, boolean ownerCanAddInternalSystemWindow) { + public boolean isScreenCaptureAllowed(int userHandle) { + synchronized (mLock) { + return mScreenCaptureDisallowedUser != UserHandle.USER_ALL + && mScreenCaptureDisallowedUser != userHandle; + } + } + + public int getScreenCaptureDisallowedUser() { synchronized (mLock) { - return !mScreenCaptureDisabled.get(userHandle) || ownerCanAddInternalSystemWindow; + return mScreenCaptureDisallowedUser; } } - public void setScreenCaptureAllowed(int userHandle, boolean allowed) { + public void setScreenCaptureDisallowedUser(int userHandle) { synchronized (mLock) { - mScreenCaptureDisabled.put(userHandle, !allowed); + mScreenCaptureDisallowedUser = userHandle; } } @@ -125,7 +136,7 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { public void dump(IndentingPrintWriter pw) { pw.println("Device policy cache:"); pw.increaseIndent(); - pw.println("Screen capture disabled: " + mScreenCaptureDisabled.toString()); + pw.println("Screen capture disallowed user: " + mScreenCaptureDisallowedUser); pw.println("Password quality: " + mPasswordQuality.toString()); pw.println("Permission policy: " + mPermissionPolicy.toString()); pw.println("Admin can grant sensors permission: " diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java index 9a0b5c7ef5ae..48a436f15803 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java @@ -69,6 +69,7 @@ class DevicePolicyData { private static final String TAG_PASSWORD_VALIDITY = "password-validity"; private static final String TAG_PASSWORD_TOKEN_HANDLE = "password-token"; private static final String TAG_PROTECTED_PACKAGES = "protected-packages"; + private static final String TAG_BYPASS_ROLE_QUALIFICATIONS = "bypass-role-qualifications"; private static final String ATTR_VALUE = "value"; private static final String ATTR_ALIAS = "alias"; private static final String ATTR_ID = "id"; @@ -107,6 +108,8 @@ class DevicePolicyData { int mPasswordOwner = -1; long mLastMaximumTimeToLock = -1; boolean mUserSetupComplete = false; + boolean mBypassDevicePolicyManagementRoleQualifications = false; + String mCurrentRoleHolder; boolean mPaired = false; int mUserProvisioningState; int mPermissionPolicy; @@ -374,6 +377,12 @@ class DevicePolicyData { out.endTag(null, TAG_APPS_SUSPENDED); } + if (policyData.mBypassDevicePolicyManagementRoleQualifications) { + out.startTag(null, TAG_BYPASS_ROLE_QUALIFICATIONS); + out.attribute(null, ATTR_VALUE, policyData.mCurrentRoleHolder); + out.endTag(null, TAG_BYPASS_ROLE_QUALIFICATIONS); + } + out.endTag(null, "policies"); out.endDocument(); @@ -558,6 +567,9 @@ class DevicePolicyData { } else if (TAG_APPS_SUSPENDED.equals(tag)) { policy.mAppsSuspended = parser.getAttributeBoolean(null, ATTR_VALUE, false); + } else if (TAG_BYPASS_ROLE_QUALIFICATIONS.equals(tag)) { + policy.mBypassDevicePolicyManagementRoleQualifications = true; + policy.mCurrentRoleHolder = parser.getAttributeValue(null, ATTR_VALUE); } else { Slogf.w(TAG, "Unknown tag: %s", tag); XmlUtils.skipCurrentTag(parser); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 18bffebb427c..d1fac871fa2e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -138,7 +138,6 @@ import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_DEFAULT import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_ENTERPRISE; import static android.net.ConnectivityManager.PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK; import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK; -import static android.provider.Settings.Global.BYPASS_DEVICE_POLICY_MANAGEMENT_ROLE_QUALIFICATIONS; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; import static android.provider.Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED; import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; @@ -222,6 +221,7 @@ import android.app.admin.UnsafeStateException; import android.app.admin.WifiSsidPolicy; import android.app.backup.IBackupManager; import android.app.compat.CompatChanges; +import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; import android.app.trust.TrustManager; import android.app.usage.UsageStatsManagerInternal; @@ -255,6 +255,7 @@ import android.content.pm.ParceledListSlice; import android.content.pm.PermissionInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; +import android.content.pm.Signature; import android.content.pm.StringParceledListSlice; import android.content.pm.UserInfo; import android.content.res.Resources; @@ -409,6 +410,7 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Predicate; @@ -756,6 +758,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { private @UserIdInt int mNetworkLoggingNotificationUserId = UserHandle.USER_NULL; private final DeviceManagementResourcesProvider mDeviceManagementResourcesProvider; + private final DevicePolicyManagementRoleObserver mDevicePolicyManagementRoleObserver; private static final boolean ENABLE_LOCK_GUARD = true; @@ -1823,6 +1826,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mBugreportCollectionManager = new RemoteBugreportManager(this, mInjector); mDeviceManagementResourcesProvider = mInjector.getDeviceManagementResourcesProvider(); + mDevicePolicyManagementRoleObserver = new DevicePolicyManagementRoleObserver(mContext); + mDevicePolicyManagementRoleObserver.register(); // "Lite" interface is available even when the device doesn't have the feature LocalServices.addService(DevicePolicyManagerLiteInternal.class, mLocalService); @@ -1963,6 +1968,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mOwners.removeProfileOwner(userHandle); mOwners.writeProfileOwner(userHandle); + pushScreenCapturePolicy(userHandle); DevicePolicyData policy = mUserData.get(userHandle); if (policy != null) { @@ -3183,8 +3189,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override void handleStartUser(int userId) { - updateScreenCaptureDisabled(userId, - getScreenCaptureDisabled(null, userId, false)); + synchronized (getLockObject()) { + pushScreenCapturePolicy(userId); + } pushUserRestrictions(userId); // When system user is started (device boot), load cache for all users. // This is to mitigate the potential race between loading the cache and keyguard @@ -6919,7 +6926,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { notifyResetProtectionPolicyChanged(frpAgentUid); } mLockSettingsInternal.refreshStrongAuthTimeout(parentId); - updateScreenCaptureDisabled(parentId, getScreenCaptureDisabled(null, parentId, false)); Slogf.i(LOG_TAG, "Cleaning up device-wide policies done."); } @@ -7686,10 +7692,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (ap.disableScreenCapture != disabled) { ap.disableScreenCapture = disabled; saveSettingsLocked(caller.getUserId()); - final int affectedUserId = parent - ? getProfileParentId(caller.getUserId()) - : caller.getUserId(); - updateScreenCaptureDisabled(affectedUserId, disabled); + pushScreenCapturePolicy(caller.getUserId()); } } DevicePolicyEventLogger @@ -7699,6 +7702,38 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { .write(); } + // Push the screen capture policy for a given userId. If screen capture is disabled by the + // DO or COPE PO on the parent profile, then this takes precedence as screen capture will + // be disabled device-wide. + private void pushScreenCapturePolicy(int adminUserId) { + // Update screen capture device-wide if disabled by the DO or COPE PO on the parent profile. + ActiveAdmin admin = + getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceParentLocked( + UserHandle.USER_SYSTEM); + if (admin != null && admin.disableScreenCapture) { + setScreenCaptureDisabled(UserHandle.USER_ALL); + } else { + // Otherwise, update screen capture only for the calling user. + admin = getProfileOwnerAdminLocked(adminUserId); + if (admin != null && admin.disableScreenCapture) { + setScreenCaptureDisabled(adminUserId); + } else { + setScreenCaptureDisabled(UserHandle.USER_NULL); + } + } + } + + // Set the latest screen capture policy, overriding any existing ones. + // userHandle can be one of USER_ALL, USER_NULL or a concrete userId. + private void setScreenCaptureDisabled(int userHandle) { + int current = mPolicyCache.getScreenCaptureDisallowedUser(); + if (userHandle == current) { + return; + } + mPolicyCache.setScreenCaptureDisallowedUser(userHandle); + updateScreenCaptureDisabled(); + } + /** * Returns whether or not screen capture is disabled for a given admin, or disabled for any * active admin (if given admin is null). @@ -7708,7 +7743,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (!mHasFeature) { return false; } - final CallerIdentity caller = getCallerIdentity(who); Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle)); @@ -7716,29 +7750,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization( isProfileOwnerOfOrganizationOwnedDevice(getCallerIdentity().getUserId())); } - - synchronized (getLockObject()) { - if (who != null) { - ActiveAdmin admin = getActiveAdminUncheckedLocked(who, userHandle, parent); - return (admin != null) && admin.disableScreenCapture; - } - - final int affectedUserId = parent ? getProfileParentId(userHandle) : userHandle; - List<ActiveAdmin> admins = getActiveAdminsForAffectedUserLocked(affectedUserId); - for (ActiveAdmin admin: admins) { - if (admin.disableScreenCapture) { - return true; - } - } - return false; - } + return !mPolicyCache.isScreenCaptureAllowed(userHandle); } - private void updateScreenCaptureDisabled(int userHandle, boolean disabled) { - mPolicyCache.setScreenCaptureAllowed(userHandle, !disabled); + private void updateScreenCaptureDisabled() { mHandler.post(() -> { try { - mInjector.getIWindowManager().refreshScreenCaptureDisabled(userHandle); + mInjector.getIWindowManager().refreshScreenCaptureDisabled(); } catch (RemoteException e) { Slogf.w(LOG_TAG, "Unable to notify WindowManager.", e); } @@ -8690,6 +8708,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } ActiveAdmin getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(int userId) { + ensureLocked(); ActiveAdmin admin = getDeviceOwnerAdminLocked(); if (admin == null) { admin = getProfileOwnerOfOrganizationOwnedDeviceLocked(userId); @@ -8697,6 +8716,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return admin; } + ActiveAdmin getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceParentLocked(int userId) { + ensureLocked(); + ActiveAdmin admin = getDeviceOwnerAdminLocked(); + if (admin != null) { + return admin; + } + admin = getProfileOwnerOfOrganizationOwnedDeviceLocked(userId); + return admin != null ? admin.getParentActiveAdmin() : null; + } + @Override public void clearDeviceOwner(String packageName) { Objects.requireNonNull(packageName, "packageName is null"); @@ -14625,6 +14654,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { throw new SecurityException( "Only the system can mark a profile owner of organization-owned device."); } + // Only a test admin can be unmarked as a profile owner on an organization-owned device. + synchronized (getLockObject()) { + if (!isProfileOwnerOnOrganizationOwnedDevice && !isAdminTestOnlyLocked(who, userId)) { + throw new SecurityException("Only a test admin can be unmarked as a " + + "profile owner of organization-owned device."); + } + } if (isAdb(caller)) { if (hasIncompatibleAccountsOrNonAdbNoLock(caller, userId, who)) { @@ -15151,6 +15187,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { saveSettingsLocked(userHandle); updateMaximumTimeToLockLocked(userHandle); policy.mRemovingAdmins.remove(adminReceiver); + pushScreenCapturePolicy(userHandle); Slogf.i(LOG_TAG, "Device admin " + adminReceiver + " removed from user " + userHandle); } @@ -18251,16 +18288,20 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { preferenceBuilder.setPreference( PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); } + preferenceBuilder.setIncludedUids( + preferentialNetworkServiceConfig.getIncludedUids()); + preferenceBuilder.setExcludedUids( + preferentialNetworkServiceConfig.getExcludedUids()); + preferenceBuilder.setPreferenceEnterpriseId( + preferentialNetworkServiceConfig.getNetworkId()); } else { preferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_DEFAULT); } - preferenceBuilder.setIncludedUids(preferentialNetworkServiceConfig.getIncludedUids()); - preferenceBuilder.setExcludedUids(preferentialNetworkServiceConfig.getExcludedUids()); - preferenceBuilder.setPreferenceEnterpriseId( - preferentialNetworkServiceConfig.getNetworkId()); + preferences.add(preferenceBuilder.build()); } + Slogf.d(LOG_TAG, "updateNetworkPreferenceForUser to " + preferences); mInjector.binderWithCleanCallingIdentity(() -> mInjector.getConnectivityManager().setProfileNetworkPreferences( UserHandle.of(userId), preferences, @@ -18627,16 +18668,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization(hasCallingOrSelfPermission( android.Manifest.permission.MANAGE_ROLE_HOLDERS)); return mInjector.binderWithCleanCallingIdentity(() -> { - if (mInjector.settingsGlobalGetInt( - BYPASS_DEVICE_POLICY_MANAGEMENT_ROLE_QUALIFICATIONS, /* def= */ 0) == 1) { - return true; - } - if (shouldAllowBypassingDevicePolicyManagementRoleQualificationInternal()) { - mInjector.settingsGlobalPutInt( - BYPASS_DEVICE_POLICY_MANAGEMENT_ROLE_QUALIFICATIONS, /* value= */ 1); + if (getUserData( + UserHandle.USER_SYSTEM).mBypassDevicePolicyManagementRoleQualifications) { return true; } - return false; + return shouldAllowBypassingDevicePolicyManagementRoleQualificationInternal(); }); } @@ -18649,6 +18685,142 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return accounts.length == 0; } + private void setBypassDevicePolicyManagementRoleQualificationStateInternal( + String currentRoleHolder, boolean allowBypass) { + boolean stateChanged = false; + DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM); + if (policy.mBypassDevicePolicyManagementRoleQualifications != allowBypass) { + policy.mBypassDevicePolicyManagementRoleQualifications = allowBypass; + stateChanged = true; + } + if (!Objects.equals(currentRoleHolder, policy.mCurrentRoleHolder)) { + policy.mCurrentRoleHolder = currentRoleHolder; + stateChanged = true; + } + if (stateChanged) { + synchronized (getLockObject()) { + saveSettingsLocked(UserHandle.USER_SYSTEM); + } + } + } + + private final class DevicePolicyManagementRoleObserver implements OnRoleHoldersChangedListener { + private RoleManager mRm; + private final Executor mExecutor; + private final Context mContext; + + DevicePolicyManagementRoleObserver(@NonNull Context context) { + mContext = context; + mExecutor = mContext.getMainExecutor(); + mRm = mContext.getSystemService(RoleManager.class); + } + + public void register() { + mRm.addOnRoleHoldersChangedListenerAsUser(mExecutor, this, UserHandle.SYSTEM); + } + + @Override + public void onRoleHoldersChanged(@NonNull String roleName, @NonNull UserHandle user) { + if (!RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT.equals(roleName)) { + return; + } + String newRoleHolder = getRoleHolder(); + if (isDefaultRoleHolder(newRoleHolder)) { + Slogf.i(LOG_TAG, + "onRoleHoldersChanged: Default role holder is set, returning early"); + return; + } + if (newRoleHolder == null) { + Slogf.i(LOG_TAG, + "onRoleHoldersChanged: New role holder is null, returning early"); + return; + } + if (shouldAllowBypassingDevicePolicyManagementRoleQualificationInternal()) { + Slogf.w(LOG_TAG, + "onRoleHoldersChanged: Updating current role holder to " + newRoleHolder); + setBypassDevicePolicyManagementRoleQualificationStateInternal( + newRoleHolder, /* allowBypass= */ true); + return; + } + DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM); + if (!newRoleHolder.equals(policy.mCurrentRoleHolder)) { + Slogf.w(LOG_TAG, + "onRoleHoldersChanged: You can't set a different role holder, role " + + "is getting revoked from " + newRoleHolder); + setBypassDevicePolicyManagementRoleQualificationStateInternal( + /* currentRoleHolder= */ null, /* allowBypass= */ false); + mRm.removeRoleHolderAsUser( + RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT, + newRoleHolder, + /* flags= */ 0, + user, + mExecutor, + successful -> {}); + } + } + + private String getRoleHolder() { + return DevicePolicyManagerService.this.getDevicePolicyManagementRoleHolderPackageName( + mContext); + } + + private boolean isDefaultRoleHolder(String packageName) { + String defaultRoleHolder = getDefaultRoleHolderPackageName(); + if (packageName == null || defaultRoleHolder == null) { + return false; + } + if (!defaultRoleHolder.equals(packageName)) { + return false; + } + return hasSigningCertificate( + packageName, getDefaultRoleHolderPackageSignature()); + } + + private boolean hasSigningCertificate(String packageName, String certificateString) { + if (packageName == null || certificateString == null) { + return false; + } + byte[] certificate; + try { + certificate = new Signature(certificateString).toByteArray(); + } catch (IllegalArgumentException e) { + Slogf.w(LOG_TAG, "Cannot parse signing certificate: " + certificateString, e); + return false; + } + PackageManager pm = mInjector.getPackageManager(); + return pm.hasSigningCertificate( + packageName, certificate, PackageManager.CERT_INPUT_SHA256); + } + + private String getDefaultRoleHolderPackageName() { + String[] info = getDefaultRoleHolderPackageNameAndSignature(); + if (info == null) { + return null; + } + return info[0]; + } + + private String getDefaultRoleHolderPackageSignature() { + String[] info = getDefaultRoleHolderPackageNameAndSignature(); + if (info == null || info.length < 2) { + return null; + } + return info[1]; + } + + private String[] getDefaultRoleHolderPackageNameAndSignature() { + String packageNameAndSignature = mContext.getString( + com.android.internal.R.string.config_devicePolicyManagement); + if (TextUtils.isEmpty(packageNameAndSignature)) { + return null; + } + if (packageNameAndSignature.contains(":")) { + return packageNameAndSignature.split(":"); + } + return new String[]{packageNameAndSignature}; + } + } + @Override public List<UserHandle> getPolicyManagedProfiles(@NonNull UserHandle user) { Preconditions.checkCallAuthorization(hasCallingOrSelfPermission( diff --git a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt index 7b152247eb9c..9c0f71364354 100644 --- a/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt +++ b/services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt @@ -30,6 +30,7 @@ import com.android.server.pm.parsing.pkg.AndroidPackage import com.android.server.pm.parsing.pkg.PackageImpl import com.android.server.pm.parsing.pkg.ParsedPackage import com.android.server.pm.resolution.ComponentResolver +import com.android.server.pm.snapshot.PackageDataSnapshot import com.android.server.pm.test.override.PackageManagerComponentLabelIconOverrideTest.Companion.Params.AppType import com.android.server.testutils.TestHandler import com.android.server.testutils.mock @@ -361,8 +362,8 @@ class PackageManagerComponentLabelIconOverrideTest { whenever(this.isCallerRecents(anyInt())) { false } } val mockAppsFilter: AppsFilterImpl = mockThrowOnUnmocked { - whenever(this.shouldFilterApplication(anyInt(), any<PackageSetting>(), - any<PackageSetting>(), anyInt())) { false } + whenever(this.shouldFilterApplication(any<PackageDataSnapshot>(), anyInt(), + any<PackageSetting>(), any<PackageSetting>(), anyInt())) { false } whenever(this.snapshot()) { this@mockThrowOnUnmocked } whenever(registerObserver(any())).thenCallRealMethod() } diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 670c1596e15e..08c68b9a469e 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -42,6 +42,8 @@ android_test { static_libs: [ "androidx.test.core", "androidx.test.runner", + "androidx.test.espresso.core", + "androidx.test.espresso.contrib", "androidx.test.ext.truth", "frameworks-base-testutils", "hamcrest-library", diff --git a/services/tests/mockingservicestests/AndroidManifest.xml b/services/tests/mockingservicestests/AndroidManifest.xml index 7714cf0ca094..07b763dcd85b 100644 --- a/services/tests/mockingservicestests/AndroidManifest.xml +++ b/services/tests/mockingservicestests/AndroidManifest.xml @@ -32,6 +32,8 @@ <uses-permission android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/> <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" /> + <uses-permission android:name="android.permission.MANAGE_GAME_ACTIVITY" /> + <uses-permission android:name="android.permission.SET_ALWAYS_FINISH" /> <!-- needed by MasterClearReceiverTest to display a system dialog --> <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"/> @@ -39,6 +41,8 @@ <application android:testOnly="true" android:debuggable="true"> <uses-library android:name="android.test.runner" /> + <activity + android:name="android.service.games.GameSessionTrampolineActivityTest$TestActivity" /> </application> <instrumentation diff --git a/services/tests/mockingservicestests/src/android/service/games/GameSessionTrampolineActivityTest.java b/services/tests/mockingservicestests/src/android/service/games/GameSessionTrampolineActivityTest.java new file mode 100644 index 000000000000..d68b517ca8cd --- /dev/null +++ b/services/tests/mockingservicestests/src/android/service/games/GameSessionTrampolineActivityTest.java @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2022 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.service.games; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isClickable; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.ext.truth.content.IntentSubject.assertThat; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + +import static com.google.common.truth.Truth.assertThat; + +import static org.hamcrest.Matchers.allOf; + +import android.app.Activity; +import android.app.ActivityManager; +import android.content.Intent; +import android.os.Bundle; +import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; +import android.testing.AndroidTestingRunner; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.test.espresso.NoActivityResumedException; +import androidx.test.filters.SmallTest; + +import com.android.internal.infra.AndroidFuture; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.concurrent.TimeUnit; + +/** + * Unit tests for the {@link GameSessionTrampolineActivity}. + */ +@RunWith(AndroidTestingRunner.class) +@SmallTest +@Presubmit +public class GameSessionTrampolineActivityTest { + + @Before + public void setUp() { + setAlwaysFinishActivities(false); + } + + @After + public void tearDown() { + setAlwaysFinishActivities(false); + } + + @Test + public void launch_launchesTargetActivity() { + AndroidFuture<GameSessionActivityResult> unusedResultFuture = + startTestActivityViaGameSessionTrampolineActivity(); + + TestActivityPage.assertPageIsLaunched(); + } + + @Test + public void launch_targetActivityFinishesSuccessfully_futureCompletedWithSameResults() { + AndroidFuture<GameSessionActivityResult> resultFuture = + startTestActivityViaGameSessionTrampolineActivity(); + + TestActivityPage.assertPageIsLaunched(); + TestActivityPage.clickFinish(); + + GameSessionActivityResult expectedResult = + new GameSessionActivityResult(Activity.RESULT_OK, TestActivity.RESULT_INTENT); + + assertEquals(resultFuture, expectedResult); + + TestActivityPage.assertPageIsNotLaunched(); + } + + @Test + public void launch_trampolineActivityProcessDeath_futureCompletedWithSameResults() { + setAlwaysFinishActivities(true); + + AndroidFuture<GameSessionActivityResult> resultFuture = + startTestActivityViaGameSessionTrampolineActivity(); + + TestActivityPage.assertPageIsLaunched(); + TestActivityPage.clickFinish(); + + GameSessionActivityResult expectedResult = + new GameSessionActivityResult(Activity.RESULT_OK, TestActivity.RESULT_INTENT); + + assertEquals(resultFuture, expectedResult); + + TestActivityPage.assertPageIsNotLaunched(); + } + + private static void assertEquals( + AndroidFuture<GameSessionActivityResult> actualFuture, + GameSessionActivityResult expected) { + try { + assertEquals(actualFuture.get(20, TimeUnit.SECONDS), expected); + } catch (Exception ex) { + throw new IllegalStateException(ex); + } + } + + private static void assertEquals( + GameSessionActivityResult actual, + GameSessionActivityResult expected) { + assertThat(actual.getResultCode()).isEqualTo(expected.getResultCode()); + assertThat(actual.getData()).filtersEquallyTo(actual.getData()); + } + + private static void setAlwaysFinishActivities(boolean isEnabled) { + try { + ActivityManager.getService().setAlwaysFinish(isEnabled); + } catch (RemoteException ex) { + throw new IllegalStateException(ex); + } + } + + private static AndroidFuture<GameSessionActivityResult> + startTestActivityViaGameSessionTrampolineActivity() { + Intent testActivityIntent = new Intent(); + testActivityIntent.setClass(getInstrumentation().getTargetContext(), TestActivity.class); + + return startGameSessionTrampolineActivity(testActivityIntent); + } + + private static AndroidFuture<GameSessionActivityResult> startGameSessionTrampolineActivity( + Intent targetIntent) { + AndroidFuture<GameSessionActivityResult> resultFuture = new AndroidFuture<>(); + Intent trampolineActivityIntent = GameSessionTrampolineActivity.createIntent(targetIntent, + null, resultFuture); + trampolineActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + getInstrumentation().getTargetContext().startActivity(trampolineActivityIntent); + getInstrumentation().waitForIdleSync(); + + return resultFuture; + } + + + private static class TestActivityPage { + private TestActivityPage() {} + + public static void assertPageIsLaunched() { + onView(withText(TestActivity.PAGE_TITLE_TEXT)).check(matches(isDisplayed())); + } + + public static void assertPageIsNotLaunched() { + try { + onView(withText(TestActivity.PAGE_TITLE_TEXT)).check(doesNotExist()); + } catch (NoActivityResumedException ex) { + // Do nothing + } + } + + public static void clickFinish() { + onView(allOf(withText(TestActivity.FINISH_BUTTON_TEXT), isClickable())).perform( + click()); + getInstrumentation().waitForIdleSync(); + } + } + + public static class TestActivity extends Activity { + private static final String PAGE_TITLE_TEXT = "GameSessionTestActivity"; + private static final String FINISH_BUTTON_TEXT = "Finish Test Activity"; + private static final Intent RESULT_INTENT = new Intent("com.test.action.VIEW"); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + LinearLayout contentLayout = new LinearLayout(this); + contentLayout.setOrientation(LinearLayout.VERTICAL); + + TextView titleTextView = new TextView(this); + titleTextView.setText(PAGE_TITLE_TEXT); + contentLayout.addView(titleTextView); + + Button finishActivityButton = new Button(this); + finishActivityButton.setText(FINISH_BUTTON_TEXT); + finishActivityButton.setOnClickListener((unused) -> { + setResult(Activity.RESULT_OK, RESULT_INTENT); + finish(); + }); + + + contentLayout.addView(finishActivityButton); + setContentView(contentLayout); + } + } +} diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java index 319a769bb1de..5b551b1c183c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java @@ -216,11 +216,12 @@ public final class GameServiceProviderInstanceImplTest { mRunningTaskInfos); + final UserHandle userHandle = new UserHandle(USER_ID); mGameServiceProviderInstance = new GameServiceProviderInstanceImpl( - new UserHandle(USER_ID), + userHandle, ConcurrentUtils.DIRECT_EXECUTOR, mMockContext, - mFakeGameClassifier, + new GameTaskInfoProvider(userHandle, mMockActivityTaskManager, mFakeGameClassifier), mMockActivityManager, mMockActivityManagerInternal, mMockActivityTaskManager, @@ -788,6 +789,36 @@ public final class GameServiceProviderInstanceImplTest { } @Test + public void gameTaskFocusedWithCreateAfterRemoved_gameSessionRecreated() throws Exception { + mGameServiceProviderInstance.start(); + + startTask(10, GAME_A_MAIN_ACTIVITY); + mockPermissionGranted(Manifest.permission.MANAGE_GAME_ACTIVITY); + mFakeGameService.requestCreateGameSession(10); + + FakeGameSession gameSession10 = new FakeGameSession(); + SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class); + mFakeGameSessionService.removePendingFutureForTaskId(10) + .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10)); + + stopTask(10); + + assertThat(gameSession10.mIsDestroyed).isTrue(); + + // If the game task is restored via the Recents UI, the task will be running again but + // we would not expect any call to TaskStackListener#onTaskCreated. + addRunningTaskInfo(10, GAME_A_MAIN_ACTIVITY); + + // We now receive a task focused event for the task. This will occur if the game task is + // restored via the Recents UI. + dispatchTaskFocused(10, /*focused=*/ true); + mFakeGameService.requestCreateGameSession(10); + + // Verify that a new pending game session is created for the game's taskId. + assertNotNull(mFakeGameSessionService.removePendingFutureForTaskId(10)); + } + + @Test public void gameTaskRemoved_removesTaskOverlay() throws Exception { mGameServiceProviderInstance.start(); @@ -1144,13 +1175,18 @@ public final class GameServiceProviderInstanceImplTest { } private void startTask(int taskId, ComponentName componentName) { + addRunningTaskInfo(taskId, componentName); + + dispatchTaskCreated(taskId, componentName); + } + + private void addRunningTaskInfo(int taskId, ComponentName componentName) { RunningTaskInfo runningTaskInfo = new RunningTaskInfo(); runningTaskInfo.taskId = taskId; + runningTaskInfo.baseActivity = componentName; runningTaskInfo.displayId = 1; runningTaskInfo.configuration.windowConfiguration.setBounds(new Rect(0, 0, 500, 800)); mRunningTaskInfos.add(runningTaskInfo); - - dispatchTaskCreated(taskId, componentName); } private void stopTask(int taskId) { diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt index 353c8e22cceb..55745cd254a4 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt @@ -69,6 +69,7 @@ import com.android.server.pm.permission.PermissionManagerServiceInternal import com.android.server.pm.pkg.parsing.ParsingPackage import com.android.server.pm.pkg.parsing.ParsingPackageUtils import com.android.server.pm.resolution.ComponentResolver +import com.android.server.pm.snapshot.PackageDataSnapshot import com.android.server.pm.verify.domain.DomainVerificationManagerInternal import com.android.server.sdksandbox.SdkSandboxManagerLocal import com.android.server.testutils.TestHandler @@ -329,7 +330,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { } whenever(mocks.injector.sharedLibrariesImpl) { mSharedLibraries } // everything visible by default - whenever(mocks.appsFilter.shouldFilterApplication( + whenever(mocks.appsFilter.shouldFilterApplication(any(PackageDataSnapshot::class.java), anyInt(), nullable(), nullable(), anyInt())) { false } val displayManager: DisplayManager = mock() diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt index 3ba9ca591fb3..b9d6b2ccd306 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt +++ b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt @@ -23,6 +23,7 @@ import android.os.PersistableBundle import android.util.ArrayMap import android.util.SparseArray import com.android.server.pm.pkg.PackageStateInternal +import com.android.server.pm.snapshot.PackageDataSnapshot import com.android.server.testutils.any import com.android.server.testutils.eq import com.android.server.testutils.nullable @@ -389,6 +390,7 @@ class SuspendPackageHelperTest : PackageHelperTestBase() { private fun mockAllowList(pkgSetting: PackageStateInternal, list: SparseArray<IntArray>?) { whenever(rule.mocks().appsFilter.getVisibilityAllowList( + any(PackageDataSnapshot::class.java), argThat { it?.packageName == pkgSetting.packageName }, any(IntArray::class.java), any() as ArrayMap<String, out PackageStateInternal> )) diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 449177ef9b7d..0afb1829f9d4 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -102,6 +102,7 @@ <uses-permission android:name="android.permission.READ_NEARBY_STREAMING_POLICY" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" /> <uses-permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT" /> + <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" /> <queries> <package android:name="com.android.servicestests.apps.suspendtestapp" /> diff --git a/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java b/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java index 0e84e044e44b..42c4129513d0 100644 --- a/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java @@ -16,6 +16,10 @@ package com.android.server; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + +import android.app.job.JobScheduler; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -43,13 +47,15 @@ public class BinaryTransparencyServiceTest { @Before public void setUp() { - mContext = ApplicationProvider.getApplicationContext(); + mContext = spy(ApplicationProvider.getApplicationContext()); mBinaryTransparencyService = new BinaryTransparencyService(mContext); mTestInterface = mBinaryTransparencyService.new BinaryTransparencyServiceImpl(); } private void prepSignedInfo() { // simulate what happens on boot completed phase + // but we avoid calling JobScheduler.schedule by returning a null. + doReturn(null).when(mContext).getSystemService(JobScheduler.class); mBinaryTransparencyService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED); } diff --git a/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java b/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java index 00f4c3908f26..5c91b8b4717f 100644 --- a/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java +++ b/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java @@ -16,6 +16,7 @@ package com.android.server.am; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -43,34 +44,52 @@ public class DropboxRateLimiterTest { @Test public void testMultipleProcesses() { // The first 5 entries should not be rate limited. - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); // Different processes and tags should not get rate limited either. - assertFalse(mRateLimiter.shouldRateLimit("tag", "process2")); - assertFalse(mRateLimiter.shouldRateLimit("tag2", "process")); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process2").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag2", "process").shouldRateLimit()); // The 6th entry of the same process should be rate limited. - assertTrue(mRateLimiter.shouldRateLimit("tag", "process")); + assertTrue(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); } @Test public void testBufferClearing() throws Exception { // The first 5 entries should not be rate limited. - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); // The 6th entry of the same process should be rate limited. - assertTrue(mRateLimiter.shouldRateLimit("tag", "process")); + assertTrue(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); // After 11 seconds there should be nothing left in the buffer and the same type of entry // should not get rate limited anymore. mClock.setOffsetMillis(11000); - assertFalse(mRateLimiter.shouldRateLimit("tag", "process")); + assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); + } + + @Test + public void testRecentlyDroppedCount() throws Exception { + assertEquals(0, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(0, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(0, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(0, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(0, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(1, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); + assertEquals(2, + mRateLimiter.shouldRateLimit("tag", "p").droppedCountSinceRateLimitActivated()); } private static class TestClock implements DropboxRateLimiter.Clock { diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java index aba93b058669..f08d0ef67df3 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java @@ -18,6 +18,7 @@ package com.android.server.biometrics.sensors.face.aidl; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; @@ -26,8 +27,13 @@ import static org.mockito.Mockito.same; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.ActivityManager; +import android.app.ActivityTaskManager; +import android.content.ComponentName; +import android.hardware.biometrics.common.ICancellationSignal; import android.hardware.biometrics.common.OperationContext; import android.hardware.biometrics.face.ISession; +import android.hardware.face.Face; import android.os.IBinder; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; @@ -53,6 +59,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import java.util.ArrayList; +import java.util.List; + @Presubmit @SmallTest public class FaceAuthenticationClientTest { @@ -82,6 +91,10 @@ public class FaceAuthenticationClientTest { private ClientMonitorCallback mCallback; @Mock private Sensor.HalSessionCallback mHalSessionCallback; + @Mock + private ActivityTaskManager mActivityTaskManager; + @Mock + private ICancellationSignal mCancellationSignal; @Captor private ArgumentCaptor<OperationContext> mOperationContextCaptor; @@ -116,6 +129,25 @@ public class FaceAuthenticationClientTest { verify(mHal, never()).authenticate(anyLong()); } + @Test + public void cancelsAuthWhenNotInForeground() throws Exception { + final ActivityManager.RunningTaskInfo topTask = new ActivityManager.RunningTaskInfo(); + topTask.topActivity = new ComponentName("other", "thing"); + when(mActivityTaskManager.getTasks(anyInt())).thenReturn(List.of(topTask)); + when(mHal.authenticateWithContext(anyLong(), any())).thenReturn(mCancellationSignal); + + final FaceAuthenticationClient client = createClient(); + client.start(mCallback); + client.onAuthenticated(new Face("friendly", 1 /* faceId */, 2 /* deviceId */), + true /* authenticated */, new ArrayList<>()); + + verify(mCancellationSignal).cancel(); + } + + private FaceAuthenticationClient createClient() throws RemoteException { + return createClient(2 /* version */); + } + private FaceAuthenticationClient createClient(int version) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); @@ -126,6 +158,11 @@ public class FaceAuthenticationClientTest { false /* requireConfirmation */, 9 /* sensorId */, mBiometricLogger, mBiometricContext, true /* isStrongBiometric */, mUsageStats, mLockoutCache, false /* allowBackgroundAuthentication */, - false /* isKeyguardBypassEnabled */, null /* sensorPrivacyManager */); + false /* isKeyguardBypassEnabled */, null /* sensorPrivacyManager */) { + @Override + protected ActivityTaskManager getActivityTaskManager() { + return mActivityTaskManager; + } + }; } } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java index 746302224d21..1a49f8aa2e6a 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java @@ -31,7 +31,11 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.ActivityManager; +import android.app.ActivityTaskManager; +import android.content.ComponentName; import android.hardware.biometrics.BiometricManager; +import android.hardware.biometrics.common.ICancellationSignal; import android.hardware.biometrics.common.OperationContext; import android.hardware.biometrics.fingerprint.ISession; import android.hardware.biometrics.fingerprint.PointerContext; @@ -66,6 +70,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import java.util.ArrayList; +import java.util.List; import java.util.function.Consumer; @Presubmit @@ -111,6 +116,10 @@ public class FingerprintAuthenticationClientTest { @Mock private Sensor.HalSessionCallback mHalSessionCallback; @Mock + private ActivityTaskManager mActivityTaskManager; + @Mock + private ICancellationSignal mCancellationSignal; + @Mock private Probe mLuxProbe; @Captor private ArgumentCaptor<OperationContext> mOperationContextCaptor; @@ -288,11 +297,36 @@ public class FingerprintAuthenticationClientTest { verify(mSideFpsController).hide(anyInt()); } + @Test + public void cancelsAuthWhenNotInForeground() throws Exception { + final ActivityManager.RunningTaskInfo topTask = new ActivityManager.RunningTaskInfo(); + topTask.topActivity = new ComponentName("other", "thing"); + when(mActivityTaskManager.getTasks(anyInt())).thenReturn(List.of(topTask)); + when(mHal.authenticateWithContext(anyLong(), any())).thenReturn(mCancellationSignal); + + final FingerprintAuthenticationClient client = createClientWithoutBackgroundAuth(); + client.start(mCallback); + client.onAuthenticated(new Fingerprint("friendly", 1 /* fingerId */, 2 /* deviceId */), + true /* authenticated */, new ArrayList<>()); + + verify(mCancellationSignal).cancel(); + } + private FingerprintAuthenticationClient createClient() throws RemoteException { - return createClient(100); + return createClient(100 /* version */, true /* allowBackgroundAuthentication */); + } + + private FingerprintAuthenticationClient createClientWithoutBackgroundAuth() + throws RemoteException { + return createClient(100 /* version */, false /* allowBackgroundAuthentication */); } private FingerprintAuthenticationClient createClient(int version) throws RemoteException { + return createClient(version, true /* allowBackgroundAuthentication */); + } + + private FingerprintAuthenticationClient createClient(int version, + boolean allowBackgroundAuthentication) throws RemoteException { when(mHal.getInterfaceVersion()).thenReturn(version); final AidlSession aidl = new AidlSession(version, mHal, USER_ID, mHalSessionCallback); @@ -302,7 +336,11 @@ public class FingerprintAuthenticationClientTest { 9 /* sensorId */, mBiometricLogger, mBiometricContext, true /* isStrongBiometric */, null /* taskStackListener */, mLockoutCache, - mUdfpsOverlayController, mSideFpsController, - true /* allowBackgroundAuthentication */, mSensorProps); + mUdfpsOverlayController, mSideFpsController, allowBackgroundAuthentication, mSensorProps) { + @Override + protected ActivityTaskManager getActivityTaskManager() { + return mActivityTaskManager; + } + }; } } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 45d101a4a426..545361c934d2 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -4992,8 +4992,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { .thenReturn(12345 /* some UID in user 0 */); // Make personal apps look suspended dpms.getUserData(UserHandle.USER_SYSTEM).mAppsSuspended = true; - - clearInvocations(getServices().iwindowManager); + // Screen capture + dpm.setScreenCaptureDisabled(admin1, true); dpm.wipeData(0); verify(getServices().userManagerInternal).removeUserEvenWhenDisallowed(CALLER_USER_HANDLE); @@ -5004,6 +5004,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { verify(getServices().userManager).setUserRestriction( UserManager.DISALLOW_ADD_USER, false, UserHandle.SYSTEM); + clearInvocations(getServices().iwindowManager); + // Some device-wide policies are getting cleaned-up after the user is removed. mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; sendBroadcastWithUser(dpms, Intent.ACTION_USER_REMOVED, CALLER_USER_HANDLE); @@ -5020,9 +5022,10 @@ public class DevicePolicyManagerTest extends DpmTestBase { MockUtils.checkIntentAction( DevicePolicyManager.ACTION_RESET_PROTECTION_POLICY_CHANGED), MockUtils.checkUserHandle(UserHandle.USER_SYSTEM)); - // Refresh strong auth timeout and screen capture + // Refresh strong auth timeout verify(getServices().lockSettingsInternal).refreshStrongAuthTimeout(UserHandle.USER_SYSTEM); - verify(getServices().iwindowManager).refreshScreenCaptureDisabled(UserHandle.USER_SYSTEM); + // Refresh screen capture + verify(getServices().iwindowManager).refreshScreenCaptureDisabled(); // Unsuspend personal apps verify(getServices().packageManagerInternal) .unsuspendForSuspendingPackage(PLATFORM_PACKAGE_NAME, UserHandle.USER_SYSTEM); diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java index 2cf67f83578b..e991ec6879ae 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java @@ -237,6 +237,8 @@ public class DpmMockContext extends MockContext { return mMockSystemServices.devicePolicyManager; case Context.LOCATION_SERVICE: return mMockSystemServices.locationManager; + case Context.ROLE_SERVICE: + return mMockSystemServices.roleManager; } throw new UnsupportedOperationException(); } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java index 34c9f7c2ef87..884ffce155d7 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java @@ -33,6 +33,7 @@ import android.app.IActivityTaskManager; import android.app.NotificationManager; import android.app.admin.DevicePolicyManager; import android.app.backup.IBackupManager; +import android.app.role.RoleManager; import android.app.usage.UsageStatsManagerInternal; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -131,6 +132,7 @@ public class MockSystemServices { public final VpnManager vpnManager; public final DevicePolicyManager devicePolicyManager; public final LocationManager locationManager; + public final RoleManager roleManager; /** Note this is a partial mock, not a real mock. */ public final PackageManager packageManager; public final BuildMock buildMock = new BuildMock(); @@ -181,6 +183,7 @@ public class MockSystemServices { vpnManager = mock(VpnManager.class); devicePolicyManager = mock(DevicePolicyManager.class); locationManager = mock(LocationManager.class); + roleManager = realContext.getSystemService(RoleManager.class); // Package manager is huge, so we use a partial mock instead. packageManager = spy(realContext.getPackageManager()); diff --git a/services/tests/servicestests/src/com/android/server/display/TEST_MAPPING b/services/tests/servicestests/src/com/android/server/display/TEST_MAPPING new file mode 100644 index 000000000000..9f1a209d2ee1 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/display/TEST_MAPPING @@ -0,0 +1,21 @@ +{ + "presubmit": [ + { + "name": "FrameworksServicesTests", + "options": [ + { + "include-filter": "com.android.server.display." + }, + { + "include-annotation": "android.platform.test.annotations.Presubmit" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + }, + { + "exclude-annotation": "org.junit.Ignore" + } + ] + } + ] +} diff --git a/services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java b/services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java index 3be2aacc75cb..c43e6ab6658a 100644 --- a/services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/AppsFilterImplTest.java @@ -30,6 +30,7 @@ import android.annotation.Nullable; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManagerInternal; import android.content.pm.Signature; import android.content.pm.SigningDetails; import android.content.pm.UserInfo; @@ -53,6 +54,7 @@ import com.android.server.pm.pkg.component.ParsedInstrumentationImpl; import com.android.server.pm.pkg.component.ParsedIntentInfoImpl; import com.android.server.pm.pkg.component.ParsedProviderImpl; import com.android.server.pm.pkg.parsing.ParsingPackage; +import com.android.server.pm.snapshot.PackageDataSnapshot; import com.android.server.utils.WatchableTester; import org.junit.Before; @@ -99,9 +101,11 @@ public class AppsFilterImplTest { @Mock AppsFilterImpl.FeatureConfig mFeatureConfigMock; @Mock - AppsFilterImpl.StateProvider mStateProvider; + PackageDataSnapshot mSnapshot; @Mock Executor mMockExecutor; + @Mock + PackageManagerInternal mPmInternal; private ArrayMap<String, PackageSetting> mExisting = new ArrayMap<>(); private Collection<SharedUserSetting> mSharedUserSettings = new ArraySet<>(); @@ -201,12 +205,10 @@ public class AppsFilterImplTest { mExisting = new ArrayMap<>(); MockitoAnnotations.initMocks(this); - doAnswer(invocation -> { - ((AppsFilterImpl.StateProvider.CurrentStateCallback) invocation.getArgument(0)) - .currentState(mExisting, mSharedUserSettings, USER_INFO_LIST); - return new Object(); - }).when(mStateProvider) - .runWithState(any(AppsFilterImpl.StateProvider.CurrentStateCallback.class)); + when(mSnapshot.getPackageStates()).thenAnswer(x -> mExisting); + when(mSnapshot.getAllSharedUsers()).thenReturn(mSharedUserSettings); + when(mSnapshot.getUserInfos()).thenReturn(USER_INFO_LIST); + when(mPmInternal.snapshot()).thenReturn(mSnapshot); doAnswer(invocation -> { ((Runnable) invocation.getArgument(0)).run(); @@ -223,11 +225,11 @@ public class AppsFilterImplTest { @Test public void testSystemReadyPropogates() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); verify(mFeatureConfigMock).onSystemReady(); } @@ -235,13 +237,13 @@ public class AppsFilterImplTest { @Test public void testQueriesAction_FilterMatches() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasicAndroid"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, @@ -251,14 +253,16 @@ public class AppsFilterImplTest { pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_APPID); watcher.verifyChangeReported("add package"); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterAplication"); } + @Test public void testQueriesProtectedAction_FilterDoesNotMatch() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); @@ -271,7 +275,7 @@ public class AppsFilterImplTest { simulateAddPackage(appsFilter, android, 1000, b -> b.setSigningDetails(frameworkSigningDetails)); watcher.verifyChangeReported("addPackage"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); final int activityUid = DUMMY_TARGET_APPID; @@ -292,14 +296,14 @@ public class AppsFilterImplTest { pkg("com.calling.wildcard", new Intent("*")), wildcardUid); watcher.verifyChangeReported("addPackage"); - assertFalse(appsFilter.shouldFilterApplication(callingUid, calling, targetActivity, - SYSTEM_USER)); - assertTrue(appsFilter.shouldFilterApplication(callingUid, calling, targetReceiver, - SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, callingUid, calling, + targetActivity, SYSTEM_USER)); + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, callingUid, calling, + targetReceiver, SYSTEM_USER)); - assertFalse(appsFilter.shouldFilterApplication( + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, wildcardUid, callingWildCard, targetActivity, SYSTEM_USER)); - assertTrue(appsFilter.shouldFilterApplication( + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, wildcardUid, callingWildCard, targetReceiver, SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterApplication"); } @@ -307,13 +311,13 @@ public class AppsFilterImplTest { @Test public void testQueriesProvider_FilterMatches() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addPackage"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, @@ -324,19 +328,19 @@ public class AppsFilterImplTest { DUMMY_CALLING_APPID); watcher.verifyChangeReported("addPackage"); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, + target, SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterApplication"); } @Test public void testOnUserUpdated_FilterMatches() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkgWithProvider("com.some.package", "com.some.authority"), DUMMY_TARGET_APPID); @@ -346,41 +350,31 @@ public class AppsFilterImplTest { for (int subjectUserId : USER_ARRAY) { for (int otherUserId : USER_ARRAY) { - assertFalse(appsFilter.shouldFilterApplication( + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, UserHandle.getUid(DUMMY_CALLING_APPID, subjectUserId), calling, target, otherUserId)); } } // adds new user - doAnswer(invocation -> { - ((AppsFilterImpl.StateProvider.CurrentStateCallback) invocation.getArgument(0)) - .currentState(mExisting, mSharedUserSettings, USER_INFO_LIST_WITH_ADDED); - return new Object(); - }).when(mStateProvider) - .runWithState(any(AppsFilterImpl.StateProvider.CurrentStateCallback.class)); - appsFilter.onUserCreated(ADDED_USER); + when(mSnapshot.getUserInfos()).thenReturn(USER_INFO_LIST_WITH_ADDED); + appsFilter.onUserCreated(mSnapshot, ADDED_USER); for (int subjectUserId : USER_ARRAY_WITH_ADDED) { for (int otherUserId : USER_ARRAY_WITH_ADDED) { - assertFalse(appsFilter.shouldFilterApplication( + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, UserHandle.getUid(DUMMY_CALLING_APPID, subjectUserId), calling, target, otherUserId)); } } // delete user - doAnswer(invocation -> { - ((AppsFilterImpl.StateProvider.CurrentStateCallback) invocation.getArgument(0)) - .currentState(mExisting, mSharedUserSettings, USER_INFO_LIST); - return new Object(); - }).when(mStateProvider) - .runWithState(any(AppsFilterImpl.StateProvider.CurrentStateCallback.class)); + when(mSnapshot.getUserInfos()).thenReturn(USER_INFO_LIST); appsFilter.onUserDeleted(ADDED_USER); for (int subjectUserId : USER_ARRAY) { for (int otherUserId : USER_ARRAY) { - assertFalse(appsFilter.shouldFilterApplication( + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, UserHandle.getUid(DUMMY_CALLING_APPID, subjectUserId), calling, target, otherUserId)); } @@ -390,13 +384,13 @@ public class AppsFilterImplTest { @Test public void testQueriesDifferentProvider_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addPackage"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, @@ -407,18 +401,18 @@ public class AppsFilterImplTest { DUMMY_CALLING_APPID); watcher.verifyChangeReported("addPackage"); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, + target, SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterApplication"); } @Test public void testQueriesProviderWithSemiColon_FilterMatches() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkgWithProvider("com.some.package", "com.some.authority;com.some.other.authority"), @@ -427,34 +421,34 @@ public class AppsFilterImplTest { pkgQueriesProvider("com.some.other.package", "com.some.authority"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, + target, SYSTEM_USER)); } @Test public void testQueriesAction_NoMatchingAction_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, + target, SYSTEM_USER)); } @Test public void testQueriesAction_NoMatchingActionFilterLowSdk_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); @@ -465,35 +459,37 @@ public class AppsFilterImplTest { DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testNoQueries_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testNoUsesLibrary_Filters() throws Exception { - final AppsFilterImpl appsFilter = new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + final AppsFilterImpl appsFilter = new AppsFilterImpl(mFeatureConfigMock, new String[]{}, /* systemAppsQueryable */ false, /* overlayProvider */ null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final Signature mockSignature = Mockito.mock(Signature.class); final SigningDetails mockSigningDetails = new SigningDetails( @@ -508,18 +504,19 @@ public class AppsFilterImplTest { final PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testUsesLibrary_DoesntFilter() throws Exception { - final AppsFilterImpl appsFilter = new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + final AppsFilterImpl appsFilter = new AppsFilterImpl(mFeatureConfigMock, new String[]{}, /* systemAppsQueryable */ false, /* overlayProvider */ null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final Signature mockSignature = Mockito.mock(Signature.class); final SigningDetails mockSigningDetails = new SigningDetails( @@ -535,18 +532,19 @@ public class AppsFilterImplTest { pkg("com.some.other.package").addUsesLibrary("com.some.shared_library"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testUsesOptionalLibrary_DoesntFilter() throws Exception { - final AppsFilterImpl appsFilter = new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + final AppsFilterImpl appsFilter = new AppsFilterImpl(mFeatureConfigMock, new String[]{}, /* systemAppsQueryable */ false, /* overlayProvider */ null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final Signature mockSignature = Mockito.mock(Signature.class); final SigningDetails mockSigningDetails = new SigningDetails( @@ -562,18 +560,19 @@ public class AppsFilterImplTest { pkg("com.some.other.package").addUsesOptionalLibrary("com.some.shared_library"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testUsesLibrary_ShareUid_DoesntFilter() throws Exception { - final AppsFilterImpl appsFilter = new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + final AppsFilterImpl appsFilter = new AppsFilterImpl(mFeatureConfigMock, new String[]{}, /* systemAppsQueryable */ false, /* overlayProvider */ null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final Signature mockSignature = Mockito.mock(Signature.class); final SigningDetails mockSigningDetails = new SigningDetails( @@ -589,22 +588,23 @@ public class AppsFilterImplTest { pkg("com.some.other.package_a").setSharedUserId("com.some.uid"), DUMMY_CALLING_APPID); simulateAddPackage(appsFilter, pkg("com.some.other.package_b") - .setSharedUserId("com.some.uid").addUsesLibrary("com.some.shared_library"), + .setSharedUserId("com.some.uid").addUsesLibrary("com.some.shared_library"), DUMMY_CALLING_APPID); // Although package_a doesn't use library, it should be granted visibility. It's because // package_a shares userId with package_b, and package_b uses that shared library. - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testForceQueryable_SystemDoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package").setForceQueryable(true), DUMMY_TARGET_APPID, @@ -612,36 +612,38 @@ public class AppsFilterImplTest { PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testForceQueryable_NonSystemFilters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package").setForceQueryable(true), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testForceQueryableByDevice_SystemCaller_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + new AppsFilterImpl(mFeatureConfigMock, new String[]{"com.some.package"}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID, @@ -649,17 +651,18 @@ public class AppsFilterImplTest { PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testSystemSignedTarget_DoesntFilter() throws CertificateException { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final Signature frameworkSignature = Mockito.mock(Signature.class); final SigningDetails frameworkSigningDetails = @@ -679,36 +682,38 @@ public class AppsFilterImplTest { pkg("com.some.other.package"), DUMMY_CALLING_APPID, b -> b.setSigningDetails(otherSigningDetails)); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testForceQueryableByDevice_NonSystemCaller_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, + new AppsFilterImpl(mFeatureConfigMock, new String[]{"com.some.package"}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testSystemQueryable_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, true /* system force queryable */, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID, @@ -716,25 +721,27 @@ public class AppsFilterImplTest { PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testQueriesPackage_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package", "com.some.package"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test @@ -742,49 +749,52 @@ public class AppsFilterImplTest { when(mFeatureConfigMock.packageIsEnabled(any(AndroidPackage.class))) .thenReturn(false); final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage( appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); PackageSetting calling = simulateAddPackage( appsFilter, pkg("com.some.other.package"), DUMMY_CALLING_APPID); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testSystemUid_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); - assertFalse(appsFilter.shouldFilterApplication(SYSTEM_USER, null, target, SYSTEM_USER)); - assertFalse(appsFilter.shouldFilterApplication(Process.FIRST_APPLICATION_UID - 1, - null, target, SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, SYSTEM_USER, null, target, + SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, + Process.FIRST_APPLICATION_UID - 1, null, target, SYSTEM_USER)); } @Test public void testSystemUidSecondaryUser_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); - assertFalse(appsFilter.shouldFilterApplication(0, null, target, SECONDARY_USER)); - assertFalse(appsFilter.shouldFilterApplication( + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, 0, null, target, + SECONDARY_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, UserHandle.getUid(SECONDARY_USER, Process.FIRST_APPLICATION_UID - 1), null, target, SECONDARY_USER)); } @@ -792,25 +802,25 @@ public class AppsFilterImplTest { @Test public void testNonSystemUid_NoCallingSetting_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, null, target, + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, null, target, SYSTEM_USER)); } @Test public void testNoTargetPackage_filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = new PackageSettingBuilder() .setAppId(DUMMY_TARGET_APPID) @@ -821,8 +831,9 @@ public class AppsFilterImplTest { PackageSetting calling = simulateAddPackage(appsFilter, pkg("com.some.other.package", new Intent("TEST_ACTION")), DUMMY_CALLING_APPID); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test @@ -838,7 +849,6 @@ public class AppsFilterImplTest { ParsingPackage actor = pkg("com.some.package.actor"); final AppsFilterImpl appsFilter = new AppsFilterImpl( - mStateProvider, mFeatureConfigMock, new String[]{}, false, @@ -868,7 +878,7 @@ public class AppsFilterImplTest { }, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); // Packages must be added in actor -> overlay -> target order so that the implicit // visibility of the actor into the overlay can be tested @@ -878,33 +888,33 @@ public class AppsFilterImplTest { simulateAddPackage(appsFilter, overlay, DUMMY_OVERLAY_APPID); // Actor can not see overlay (yet) - assertTrue(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSetting, + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, actorSetting, overlaySetting, SYSTEM_USER)); PackageSetting targetSetting = simulateAddPackage(appsFilter, target, DUMMY_TARGET_APPID); // Actor can see both target and overlay - assertFalse(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSetting, + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, actorSetting, targetSetting, SYSTEM_USER)); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSetting, + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, actorSetting, overlaySetting, SYSTEM_USER)); // But target/overlay can't see each other - assertTrue(appsFilter.shouldFilterApplication(DUMMY_TARGET_APPID, targetSetting, + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_TARGET_APPID, targetSetting, overlaySetting, SYSTEM_USER)); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_OVERLAY_APPID, overlaySetting, - targetSetting, SYSTEM_USER)); + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_OVERLAY_APPID, + overlaySetting, targetSetting, SYSTEM_USER)); // And can't see the actor - assertTrue(appsFilter.shouldFilterApplication(DUMMY_TARGET_APPID, targetSetting, - actorSetting, SYSTEM_USER)); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_OVERLAY_APPID, overlaySetting, + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_TARGET_APPID, targetSetting, actorSetting, SYSTEM_USER)); + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_OVERLAY_APPID, + overlaySetting, actorSetting, SYSTEM_USER)); - appsFilter.removePackage(targetSetting, false /* isReplace */); + appsFilter.removePackage(mSnapshot, targetSetting, false /* isReplace */); // Actor loses visibility to the overlay via removal of the target - assertTrue(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSetting, + assertTrue(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, actorSetting, overlaySetting, SYSTEM_USER)); } @@ -928,7 +938,6 @@ public class AppsFilterImplTest { null /*settingBuilder*/); final AppsFilterImpl appsFilter = new AppsFilterImpl( - mStateProvider, mFeatureConfigMock, new String[]{}, false, @@ -959,7 +968,7 @@ public class AppsFilterImplTest { }, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting targetSetting = simulateAddPackage(appsFilter, target, DUMMY_TARGET_APPID); SharedUserSetting actorSharedSetting = new SharedUserSetting("actorSharedUser", @@ -971,19 +980,19 @@ public class AppsFilterImplTest { simulateAddPackage(ps2, appsFilter, actorSharedSetting); // actorTwo can see both target and overlay - assertFalse(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSharedSetting, - targetSetting, SYSTEM_USER)); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_ACTOR_APPID, actorSharedSetting, - overlaySetting, SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, + actorSharedSetting, targetSetting, SYSTEM_USER)); + assertFalse(appsFilter.shouldFilterApplication(mSnapshot, DUMMY_ACTOR_APPID, + actorSharedSetting, overlaySetting, SYSTEM_USER)); } @Test public void testInitiatingApp_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); @@ -991,17 +1000,18 @@ public class AppsFilterImplTest { DUMMY_CALLING_APPID, withInstallSource(target.getPackageName(), null, null, null, false)); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testUninstalledInitiatingApp_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); @@ -1009,20 +1019,21 @@ public class AppsFilterImplTest { DUMMY_CALLING_APPID, withInstallSource(target.getPackageName(), null, null, null, true)); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); } @Test public void testOriginatingApp_Filters() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasicAndroid"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), @@ -1033,21 +1044,22 @@ public class AppsFilterImplTest { false)); watcher.verifyChangeReported("add package"); - assertTrue(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertTrue( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterAplication"); } @Test public void testInstallingApp_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasicAndroid"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), @@ -1058,21 +1070,22 @@ public class AppsFilterImplTest { false)); watcher.verifyChangeReported("add package"); - assertFalse(appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, calling, target, - SYSTEM_USER)); + assertFalse( + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, calling, target, + SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterAplication"); } @Test public void testInstrumentation_DoesntFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasicAndroid"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), @@ -1084,24 +1097,24 @@ public class AppsFilterImplTest { watcher.verifyChangeReported("add package"); assertFalse( - appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, instrumentation, target, - SYSTEM_USER)); + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, instrumentation, + target, SYSTEM_USER)); assertFalse( - appsFilter.shouldFilterApplication(DUMMY_TARGET_APPID, target, instrumentation, - SYSTEM_USER)); + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_TARGET_APPID, target, + instrumentation, SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterAplication"); } @Test public void testWhoCanSee() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasicAndroid"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); final int systemAppId = Process.FIRST_APPLICATION_UID - 1; @@ -1123,14 +1136,14 @@ public class AppsFilterImplTest { watcher.verifyChangeReported("add package"); final SparseArray<int[]> systemFilter = - appsFilter.getVisibilityAllowList(system, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, system, USER_ARRAY, mExisting); watcher.verifyNoChangeReported("getVisibility"); assertThat(toList(systemFilter.get(SYSTEM_USER)), contains(seesNothingAppId, hasProviderAppId, queriesProviderAppId)); watcher.verifyNoChangeReported("getVisibility"); final SparseArray<int[]> seesNothingFilter = - appsFilter.getVisibilityAllowList(seesNothing, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, seesNothing, USER_ARRAY, mExisting); watcher.verifyNoChangeReported("getVisibility"); assertThat(toList(seesNothingFilter.get(SYSTEM_USER)), contains(seesNothingAppId)); @@ -1140,12 +1153,13 @@ public class AppsFilterImplTest { watcher.verifyNoChangeReported("getVisibility"); final SparseArray<int[]> hasProviderFilter = - appsFilter.getVisibilityAllowList(hasProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, hasProvider, USER_ARRAY, mExisting); assertThat(toList(hasProviderFilter.get(SYSTEM_USER)), contains(hasProviderAppId, queriesProviderAppId)); SparseArray<int[]> queriesProviderFilter = - appsFilter.getVisibilityAllowList(queriesProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, queriesProvider, USER_ARRAY, + mExisting); watcher.verifyNoChangeReported("getVisibility"); assertThat(toList(queriesProviderFilter.get(SYSTEM_USER)), contains(queriesProviderAppId)); @@ -1158,7 +1172,8 @@ public class AppsFilterImplTest { // ensure implicit access is included in the filter queriesProviderFilter = - appsFilter.getVisibilityAllowList(queriesProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, queriesProvider, USER_ARRAY, + mExisting); watcher.verifyNoChangeReported("getVisibility"); assertThat(toList(queriesProviderFilter.get(SYSTEM_USER)), contains(hasProviderAppId, queriesProviderAppId)); @@ -1168,13 +1183,13 @@ public class AppsFilterImplTest { @Test public void testOnChangeReport() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange"); watcher.register(); simulateAddBasicAndroid(appsFilter); watcher.verifyChangeReported("addBasic"); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); watcher.verifyChangeReported("systemReady"); final int systemAppId = Process.FIRST_APPLICATION_UID - 1; @@ -1196,13 +1211,13 @@ public class AppsFilterImplTest { watcher.verifyChangeReported("addPackage"); final SparseArray<int[]> systemFilter = - appsFilter.getVisibilityAllowList(system, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, system, USER_ARRAY, mExisting); assertThat(toList(systemFilter.get(SYSTEM_USER)), contains(seesNothingAppId, hasProviderAppId, queriesProviderAppId)); watcher.verifyNoChangeReported("get"); final SparseArray<int[]> seesNothingFilter = - appsFilter.getVisibilityAllowList(seesNothing, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, seesNothing, USER_ARRAY, mExisting); assertThat(toList(seesNothingFilter.get(SYSTEM_USER)), contains(seesNothingAppId)); assertThat(toList(seesNothingFilter.get(SECONDARY_USER)), @@ -1210,13 +1225,14 @@ public class AppsFilterImplTest { watcher.verifyNoChangeReported("get"); final SparseArray<int[]> hasProviderFilter = - appsFilter.getVisibilityAllowList(hasProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, hasProvider, USER_ARRAY, mExisting); assertThat(toList(hasProviderFilter.get(SYSTEM_USER)), contains(hasProviderAppId, queriesProviderAppId)); watcher.verifyNoChangeReported("get"); SparseArray<int[]> queriesProviderFilter = - appsFilter.getVisibilityAllowList(queriesProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, queriesProvider, USER_ARRAY, + mExisting); assertThat(toList(queriesProviderFilter.get(SYSTEM_USER)), contains(queriesProviderAppId)); watcher.verifyNoChangeReported("get"); @@ -1228,23 +1244,24 @@ public class AppsFilterImplTest { // ensure implicit access is included in the filter queriesProviderFilter = - appsFilter.getVisibilityAllowList(queriesProvider, USER_ARRAY, mExisting); + appsFilter.getVisibilityAllowList(mSnapshot, queriesProvider, USER_ARRAY, + mExisting); assertThat(toList(queriesProviderFilter.get(SYSTEM_USER)), contains(hasProviderAppId, queriesProviderAppId)); watcher.verifyNoChangeReported("get"); // remove a package - appsFilter.removePackage(seesNothing, false /* isReplace */); + appsFilter.removePackage(mSnapshot, seesNothing, false /* isReplace */); watcher.verifyChangeReported("removePackage"); } @Test public void testOnChangeReportedFilter() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); final WatchableTester watcher = new WatchableTester(appsFilter, "onChange filter"); watcher.register(); @@ -1256,21 +1273,21 @@ public class AppsFilterImplTest { watcher.verifyChangeReported("addPackage"); assertFalse( - appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, instrumentation, target, - SYSTEM_USER)); + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, instrumentation, + target, SYSTEM_USER)); assertFalse( - appsFilter.shouldFilterApplication(DUMMY_TARGET_APPID, target, instrumentation, - SYSTEM_USER)); + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_TARGET_APPID, target, + instrumentation, SYSTEM_USER)); watcher.verifyNoChangeReported("shouldFilterApplication"); } @Test public void testAppsFilterRead() throws Exception { final AppsFilterImpl appsFilter = - new AppsFilterImpl(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, + new AppsFilterImpl(mFeatureConfigMock, new String[]{}, false, null, mMockExecutor); simulateAddBasicAndroid(appsFilter); - appsFilter.onSystemReady(); + appsFilter.onSystemReady(mPmInternal); PackageSetting target = simulateAddPackage(appsFilter, pkg("com.some.package"), DUMMY_TARGET_APPID); @@ -1288,25 +1305,29 @@ public class AppsFilterImplTest { AppsFilterSnapshot snapshot = appsFilter.snapshot(); assertFalse( - snapshot.shouldFilterApplication(DUMMY_CALLING_APPID, instrumentation, target, + snapshot.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, instrumentation, + target, SYSTEM_USER)); assertFalse( - snapshot.shouldFilterApplication(DUMMY_TARGET_APPID, target, instrumentation, + snapshot.shouldFilterApplication(mSnapshot, DUMMY_TARGET_APPID, target, + instrumentation, SYSTEM_USER)); SparseArray<int[]> queriesProviderFilter = - snapshot.getVisibilityAllowList(queriesProvider, USER_ARRAY, mExisting); + snapshot.getVisibilityAllowList(mSnapshot, queriesProvider, USER_ARRAY, mExisting); assertThat(toList(queriesProviderFilter.get(SYSTEM_USER)), contains(queriesProviderAppId)); assertTrue(snapshot.canQueryPackage(instrumentation.getPkg(), target.getPackageName())); // New changes don't affect the snapshot - appsFilter.removePackage(target, false); + appsFilter.removePackage(mSnapshot, target, false); assertTrue( - appsFilter.shouldFilterApplication(DUMMY_CALLING_APPID, instrumentation, target, + appsFilter.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, instrumentation, + target, SYSTEM_USER)); assertFalse( - snapshot.shouldFilterApplication(DUMMY_CALLING_APPID, instrumentation, target, + snapshot.shouldFilterApplication(mSnapshot, DUMMY_CALLING_APPID, instrumentation, + target, SYSTEM_USER)); } @@ -1343,7 +1364,7 @@ public class AppsFilterImplTest { } private PackageSetting simulateAddPackage(AppsFilterImpl filter, - ParsingPackage newPkgBuilder, int appId, @Nullable WithSettingBuilder action, + ParsingPackage newPkgBuilder, int appId, @Nullable WithSettingBuilder action, @Nullable SharedUserSetting sharedUserSetting) { final PackageSetting setting = getPackageSettingFromParsingPackage(newPkgBuilder, appId, action); @@ -1373,7 +1394,7 @@ public class AppsFilterImplTest { setting.setSharedUserAppId(sharedUserSetting.mAppId); mSharedUserSettings.add(sharedUserSetting); } - filter.addPackage(setting); + filter.addPackage(mSnapshot, setting); } private WithSettingBuilder withInstallSource(String initiatingPackageName, diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index e4ee4d064724..fdf9354747a0 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -266,6 +266,11 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { public void sendIntentSender(IntentSender intent) { // Placeholder for spying. } + + @Override + public String getPackageName() { + return SYSTEM_PACKAGE_NAME; + } } /** ShortcutService with injection override methods. */ @@ -704,6 +709,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { protected UriPermissionOwner mUriPermissionOwner; + protected static final String SYSTEM_PACKAGE_NAME = "android"; protected static final String CALLING_PACKAGE_1 = "com.android.test.1"; protected static final int CALLING_UID_1 = 10001; diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java index f4ab3db3c917..39220a429b8c 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java @@ -1516,7 +1516,7 @@ public class PackageManagerSettingsTests { private Settings makeSettings() { return new Settings(InstrumentationRegistry.getContext().getFilesDir(), mRuntimePermissionsPersistence, mPermissionDataProvider, - mDomainVerificationManager, new PackageManagerTracedLock()); + mDomainVerificationManager, null, new PackageManagerTracedLock()); } private void verifyKeySetMetaData(Settings settings) diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index fbcad62988be..f2495e1545b5 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -18,6 +18,8 @@ package com.android.server.power; import static android.app.ActivityManager.PROCESS_STATE_BOUND_TOP; import static android.app.ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE; +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_ERRORED; import static android.os.PowerManagerInternal.WAKEFULNESS_ASLEEP; import static android.os.PowerManagerInternal.WAKEFULNESS_AWAKE; import static android.os.PowerManagerInternal.WAKEFULNESS_DOZING; @@ -46,6 +48,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManagerInternal; +import android.app.AppOpsManager; import android.attention.AttentionManagerInternal; import android.content.Context; import android.content.ContextWrapper; @@ -140,6 +143,7 @@ public class PowerManagerServiceTest { @Mock private WirelessChargerDetector mWirelessChargerDetectorMock; @Mock private AmbientDisplayConfiguration mAmbientDisplayConfigurationMock; @Mock private SystemPropertiesWrapper mSystemPropertiesMock; + @Mock private AppOpsManager mAppOpsManagerMock; @Mock private InattentiveSleepWarningController mInattentiveSleepWarningControllerMock; @@ -297,6 +301,11 @@ public class PowerManagerServiceTest { return new LowPowerStandbyController(context, mTestLooper.getLooper(), SystemClock::elapsedRealtime); } + + @Override + AppOpsManager createAppOpsManager(Context context) { + return mAppOpsManagerMock; + } }); return mService; } @@ -461,7 +470,7 @@ public class PowerManagerServiceTest { } @Test - public void testWakefulnessAwake_AcquireCausesWakeup() { + public void testWakefulnessAwake_AcquireCausesWakeup_turnScreenOnAllowed() { createService(); startSystem(); forceSleep(); @@ -469,6 +478,8 @@ public class PowerManagerServiceTest { IBinder token = new Binder(); String tag = "acq_causes_wakeup"; String packageName = "pkg.name"; + when(mAppOpsManagerMock.checkOpNoThrow(AppOpsManager.OP_TURN_SCREEN_ON, + Binder.getCallingUid(), packageName)).thenReturn(MODE_ALLOWED); // First, ensure that a normal full wake lock does not cause a wakeup int flags = PowerManager.FULL_WAKE_LOCK; @@ -493,6 +504,27 @@ public class PowerManagerServiceTest { } @Test + public void testWakefulnessAwake_AcquireCausesWakeup_turnScreenOnDenied() { + createService(); + startSystem(); + forceSleep(); + + IBinder token = new Binder(); + String tag = "acq_causes_wakeup"; + String packageName = "pkg.name"; + when(mAppOpsManagerMock.checkOpNoThrow(AppOpsManager.OP_TURN_SCREEN_ON, + Binder.getCallingUid(), packageName)).thenReturn(MODE_ERRORED); + + + // Verify that flag has no effect when OP_TURN_SCREEN_ON is not allowed + int flags = PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP; + mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName, + null /* workSource */, null /* historyTag */, Display.INVALID_DISPLAY, null); + assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + mService.getBinderServiceInstance().releaseWakeLock(token, 0 /* flags */); + } + + @Test public void testWakefulnessAwake_IPowerManagerWakeUp() { createService(); startSystem(); diff --git a/services/tests/uiservicestests/AndroidManifest.xml b/services/tests/uiservicestests/AndroidManifest.xml index 767857bf2de8..e8e3a8f84f21 100644 --- a/services/tests/uiservicestests/AndroidManifest.xml +++ b/services/tests/uiservicestests/AndroidManifest.xml @@ -33,6 +33,7 @@ <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" /> <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT"/> <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" /> + <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> <application android:debuggable="true"> <uses-library android:name="android.test.runner" /> diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java index f4b9e258f7e0..76d4059eb436 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java @@ -30,8 +30,11 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -46,6 +49,8 @@ import android.os.Bundle; import android.os.UserHandle; import android.service.notification.NotificationListenerFilter; import android.service.notification.NotificationListenerService; +import android.service.notification.NotificationStats; +import android.service.notification.StatusBarNotification; import android.testing.TestableContext; import android.util.ArraySet; import android.util.Pair; @@ -59,11 +64,13 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.internal.util.reflection.FieldSetter; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.util.List; public class NotificationListenersTest extends UiServiceTestCase { @@ -388,4 +395,66 @@ public class NotificationListenersTest extends UiServiceTestCase { verify(mContext).sendBroadcastAsUser( any(), eq(UserHandle.of(userId)), nullable(String.class)); } + + @Test + public void testNotifyPostedLockedInLockdownMode() { + NotificationRecord r = mock(NotificationRecord.class); + NotificationRecord old = mock(NotificationRecord.class); + + // before the lockdown mode + when(mNm.isInLockDownMode()).thenReturn(false); + mListeners.notifyPostedLocked(r, old, true); + mListeners.notifyPostedLocked(r, old, false); + verify(r, atLeast(2)).getSbn(); + + // in the lockdown mode + reset(r); + reset(old); + when(mNm.isInLockDownMode()).thenReturn(true); + mListeners.notifyPostedLocked(r, old, true); + mListeners.notifyPostedLocked(r, old, false); + verify(r, never()).getSbn(); + } + + @Test + public void testnotifyRankingUpdateLockedInLockdownMode() { + List chn = mock(List.class); + + // before the lockdown mode + when(mNm.isInLockDownMode()).thenReturn(false); + mListeners.notifyRankingUpdateLocked(chn); + verify(chn, atLeast(1)).size(); + + // in the lockdown mode + reset(chn); + when(mNm.isInLockDownMode()).thenReturn(true); + mListeners.notifyRankingUpdateLocked(chn); + verify(chn, never()).size(); + } + + @Test + public void testNotifyRemovedLockedInLockdownMode() throws NoSuchFieldException { + NotificationRecord r = mock(NotificationRecord.class); + NotificationStats rs = mock(NotificationStats.class); + StatusBarNotification sbn = mock(StatusBarNotification.class); + FieldSetter.setField(mNm, + NotificationManagerService.class.getDeclaredField("mHandler"), + mock(NotificationManagerService.WorkerHandler.class)); + + // before the lockdown mode + when(mNm.isInLockDownMode()).thenReturn(false); + when(r.getSbn()).thenReturn(sbn); + mListeners.notifyRemovedLocked(r, 0, rs); + mListeners.notifyRemovedLocked(r, 0, rs); + verify(r, atLeast(2)).getSbn(); + + // in the lockdown mode + reset(r); + reset(rs); + when(mNm.isInLockDownMode()).thenReturn(true); + when(r.getSbn()).thenReturn(sbn); + mListeners.notifyRemovedLocked(r, 0, rs); + mListeners.notifyRemovedLocked(r, 0, rs); + verify(r, never()).getSbn(); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index b987c692bddb..348e015500fe 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -63,10 +63,13 @@ import static android.service.notification.Adjustment.KEY_USER_SENTIMENT; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS; import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING; +import static android.service.notification.NotificationListenerService.REASON_CANCEL_ALL; import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE; import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; +import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; + import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; @@ -352,6 +355,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { MultiRateLimiter mToastRateLimiter; BroadcastReceiver mPackageIntentReceiver; NotificationRecordLoggerFake mNotificationRecordLogger = new NotificationRecordLoggerFake(); + TestableNotificationManagerService.StrongAuthTrackerFake mStrongAuthTracker; private InstanceIdSequence mNotificationInstanceIdSequence = new InstanceIdSequenceFake( 1 << 30); @Mock @@ -508,6 +512,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mService.setAudioManager(mAudioManager); + mStrongAuthTracker = mService.new StrongAuthTrackerFake(mContext); + mService.setStrongAuthTracker(mStrongAuthTracker); + mShortcutHelper = mService.getShortcutHelper(); mShortcutHelper.setLauncherApps(mLauncherApps); mShortcutHelper.setShortcutServiceInternal(mShortcutServiceInternal); @@ -9247,4 +9254,44 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // make sure the summary was removed and not re-posted assertThat(mService.getNotificationRecordCount()).isEqualTo(0); } + + @Test + public void testStrongAuthTracker_isInLockDownMode() { + mStrongAuthTracker.setGetStrongAuthForUserReturnValue( + STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + mStrongAuthTracker.onStrongAuthRequiredChanged(mContext.getUserId()); + assertTrue(mStrongAuthTracker.isInLockDownMode()); + mStrongAuthTracker.setGetStrongAuthForUserReturnValue(0); + mStrongAuthTracker.onStrongAuthRequiredChanged(mContext.getUserId()); + assertFalse(mStrongAuthTracker.isInLockDownMode()); + } + + @Test + public void testCancelAndPostNotificationsWhenEnterAndExitLockDownMode() { + // post 2 notifications from 2 packages + NotificationRecord pkgA = new NotificationRecord(mContext, + generateSbn("a", 1000, 9, 0), mTestNotificationChannel); + mService.addNotification(pkgA); + NotificationRecord pkgB = new NotificationRecord(mContext, + generateSbn("b", 1001, 9, 0), mTestNotificationChannel); + mService.addNotification(pkgB); + + // when entering the lockdown mode, cancel the 2 notifications. + mStrongAuthTracker.setGetStrongAuthForUserReturnValue( + STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); + mStrongAuthTracker.onStrongAuthRequiredChanged(mContext.getUserId()); + assertTrue(mStrongAuthTracker.isInLockDownMode()); + + // the notifyRemovedLocked function is called twice due to REASON_CANCEL_ALL. + ArgumentCaptor<Integer> captor = ArgumentCaptor.forClass(Integer.class); + verify(mListeners, times(2)).notifyRemovedLocked(any(), captor.capture(), any()); + assertEquals(REASON_CANCEL_ALL, captor.getValue().intValue()); + + // exit lockdown mode. + mStrongAuthTracker.setGetStrongAuthForUserReturnValue(0); + mStrongAuthTracker.onStrongAuthRequiredChanged(mContext.getUserId()); + + // the notifyPostedLocked function is called twice. + verify(mListeners, times(2)).notifyPostedLocked(any(), any()); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java index bde048569e53..4ed7d35a097f 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/TestableNotificationManagerService.java @@ -113,4 +113,20 @@ public class TestableNotificationManagerService extends NotificationManagerServi protected void doChannelWarningToast(int uid, CharSequence toastText) { mChannelToastsSent.add(uid); } + + public class StrongAuthTrackerFake extends NotificationManagerService.StrongAuthTracker { + private int mGetStrongAuthForUserReturnValue = 0; + StrongAuthTrackerFake(Context context) { + super(context); + } + + public void setGetStrongAuthForUserReturnValue(int val) { + mGetStrongAuthForUserReturnValue = val; + } + + @Override + public int getStrongAuthForUser(int userId) { + return mGetStrongAuthForUserReturnValue; + } + } } 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 55147f3e59f6..18b7a00cb43b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -757,6 +757,8 @@ public class ActivityRecordTests extends WindowTestsBase { final ActivityRecord activity = createActivityWithTask(); ActivityRecord topActivity = new ActivityBuilder(mAtm).setTask(activity.getTask()).build(); topActivity.setOccludesParent(false); + // The requested occluding state doesn't affect whether it fills parent. + assertTrue(topActivity.fillsParent()); activity.setState(STOPPED, "Testing"); activity.setVisibility(true); activity.makeActiveIfNeeded(null /* activeActivity */); @@ -1218,7 +1220,7 @@ public class ActivityRecordTests extends WindowTestsBase { task.setPausingActivity(currentTop); currentTop.finishing = true; currentTop.setState(PAUSED, "test"); - currentTop.completeFinishing("completePauseLocked"); + currentTop.completeFinishing(false /* updateVisibility */, "completePause"); // Current top becomes stopping because it is visible and the next is invisible. assertEquals(STOPPING, currentTop.getState()); @@ -1896,10 +1898,13 @@ public class ActivityRecordTests extends WindowTestsBase { final ActivityRecord activity = createActivityWithTask(); final Task task = activity.getTask(); final Rect taskBounds = task.getBounds(); + final int currentRotation = mDisplayContent.getRotation(); + final int w = taskBounds.width(); + final int h = taskBounds.height(); final TaskSnapshot snapshot = new TaskSnapshotPersisterTestBase.TaskSnapshotBuilder() .setTopActivityComponent(activity.mActivityComponent) - .setRotation(activity.getWindowConfiguration().getRotation()) - .setTaskSize(taskBounds.width(), taskBounds.height()) + .setRotation(currentRotation) + .setTaskSize(w, h) .build(); assertTrue(activity.isSnapshotCompatible(snapshot)); @@ -1909,6 +1914,18 @@ public class ActivityRecordTests extends WindowTestsBase { activity.getWindowConfiguration().setBounds(taskBounds); assertFalse(activity.isSnapshotCompatible(snapshot)); + + // Flipped size should be accepted if the activity will show with 90 degree rotation. + final int targetRotation = currentRotation + 1; + doReturn(targetRotation).when(mDisplayContent) + .rotationForActivityInDifferentOrientation(any()); + final TaskSnapshot rotatedSnapshot = new TaskSnapshotPersisterTestBase.TaskSnapshotBuilder() + .setTopActivityComponent(activity.mActivityComponent) + .setRotation(targetRotation) + .setTaskSize(h, w) + .build(); + task.getWindowConfiguration().getBounds().set(0, 0, w, h); + assertTrue(activity.isSnapshotCompatible(rotatedSnapshot)); } @Test 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 33b70249dabe..67f02c7fab55 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -46,7 +46,6 @@ import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -89,14 +88,6 @@ public class AppTransitionControllerTest extends WindowTestsBase { mAppTransitionController = new AppTransitionController(mWm, mDisplayContent); } - @Override - ActivityRecord createActivityRecord(DisplayContent dc, int windowingMode, int activityType) { - final ActivityRecord r = super.createActivityRecord(dc, windowingMode, activityType); - // Ensure that ActivityRecord#setOccludesParent takes effect. - doCallRealMethod().when(r).fillsParent(); - return r; - } - @Test public void testSkipOccludedActivityCloseTransition() { final ActivityRecord behind = createActivityRecord(mDisplayContent, @@ -135,7 +126,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final ActivityRecord translucentOpening = createActivityRecord(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); - translucentOpening.setOccludesParent(false); + doReturn(false).when(translucentOpening).fillsParent(); translucentOpening.setVisible(false); mDisplayContent.prepareAppTransition(TRANSIT_OPEN); mDisplayContent.mOpeningApps.add(behind); @@ -153,7 +144,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final ActivityRecord translucentClosing = createActivityRecord(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); - translucentClosing.setOccludesParent(false); + doReturn(false).when(translucentClosing).fillsParent(); mDisplayContent.prepareAppTransition(TRANSIT_CLOSE); mDisplayContent.mClosingApps.add(translucentClosing); assertEquals(WindowManager.TRANSIT_OLD_TRANSLUCENT_ACTIVITY_CLOSE, 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 56244cb92a97..32d201fafcfb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -2174,7 +2174,7 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(windowingMode, windowConfig.getWindowingMode()); // test misc display overrides - assertEquals(ignoreOrientationRequests, testDisplayContent.mIgnoreOrientationRequest); + assertEquals(ignoreOrientationRequests, testDisplayContent.mSetIgnoreOrientationRequest); assertEquals(fixedOrientationLetterboxRatio, mWm.mLetterboxConfiguration.getFixedOrientationLetterboxAspectRatio(), 0 /* delta */); @@ -2215,7 +2215,7 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(windowingMode, windowConfig.getWindowingMode()); // test misc display overrides - assertEquals(ignoreOrientationRequests, testDisplayContent.mIgnoreOrientationRequest); + assertEquals(ignoreOrientationRequests, testDisplayContent.mSetIgnoreOrientationRequest); assertEquals(fixedOrientationLetterboxRatio, mWm.mLetterboxConfiguration.getFixedOrientationLetterboxAspectRatio(), 0 /* delta */); diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java index 25cff61c3b78..e8d0acba5e52 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java @@ -721,14 +721,20 @@ public class DisplayRotationTests { doReturn(true).when(mMockDisplayPolicy).navigationBarCanMove(); doReturn(win).when(mMockDisplayPolicy).getTopFullscreenOpaqueWindow(); mMockDisplayContent.mCurrentFocus = win; - mTarget.mUpsideDownRotation = Surface.ROTATION_180; + // This should not affect the condition of shouldRotateSeamlessly. + mTarget.mUpsideDownRotation = Surface.ROTATION_90; doReturn(true).when(win.mActivityRecord).matchParentBounds(); // The focused fullscreen opaque window without override bounds should be able to be // rotated seamlessly. assertTrue(mTarget.shouldRotateSeamlessly( Surface.ROTATION_0, Surface.ROTATION_90, false /* forceUpdate */)); + // Reject any 180 degree because non-movable navbar will be placed in a different position. + doReturn(false).when(mMockDisplayPolicy).navigationBarCanMove(); + assertFalse(mTarget.shouldRotateSeamlessly( + Surface.ROTATION_90, Surface.ROTATION_180, false /* forceUpdate */)); + doReturn(true).when(mMockDisplayPolicy).navigationBarCanMove(); doReturn(false).when(win.mActivityRecord).matchParentBounds(); // No seamless rotation if the window may be positioned with offset after rotation. assertFalse(mTarget.shouldRotateSeamlessly( 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 80f6bceb884c..e5e0145095c1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java @@ -741,4 +741,35 @@ public class TaskDisplayAreaTests extends WindowTestsBase { assertEquals(isAssistantOnTop ? topPosition : topPosition - 4, getTaskIndexOf(taskDisplayArea, assistRootTask)); } + + /** + * This test verifies proper launch root based on source and candidate task for split screen. + * If a task is launching from a created-by-organizer task, it should be launched into the + * same created-by-organizer task as well. Unless, the candidate task is already positioned in + * the split. + */ + @Test + public void getLaunchRootTaskInSplit() { + final Task rootTask = createTask( + mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD); + rootTask.mCreatedByOrganizer = true; + final Task adjacentRootTask = createTask( + mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD); + adjacentRootTask.mCreatedByOrganizer = true; + final Task candidateTask = createTaskInRootTask(rootTask, 0 /* userId*/); + final TaskDisplayArea taskDisplayArea = rootTask.getDisplayArea(); + adjacentRootTask.setAdjacentTaskFragment(rootTask, false /* moveTogether */); + + // Verify the launch root with candidate task + Task actualRootTask = taskDisplayArea.getLaunchRootTask(WINDOWING_MODE_UNDEFINED, + ACTIVITY_TYPE_STANDARD, null /* options */, adjacentRootTask /* sourceTask */, + 0 /* launchFlags */, candidateTask); + assertSame(rootTask, actualRootTask.getRootTask()); + + // Verify the launch root task without candidate task + actualRootTask = taskDisplayArea.getLaunchRootTask(WINDOWING_MODE_UNDEFINED, + ACTIVITY_TYPE_STANDARD, null /* options */, adjacentRootTask /* sourceTask */, + 0 /* launchFlags */); + assertSame(adjacentRootTask, actualRootTask.getRootTask()); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java index a297608af480..7a704742fba2 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java @@ -26,6 +26,7 @@ import static com.android.server.wm.testing.Assert.assertThrows; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -38,6 +39,7 @@ import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Intent; @@ -63,6 +65,7 @@ import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; /** * Build/Install/Run: @@ -223,6 +226,85 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { } @Test + public void testOnActivityReparentToTask_activityInOrganizerProcess_useActivityToken() { + // Make sure the activity pid/uid is the same as the organizer caller. + final int pid = Binder.getCallingPid(); + final int uid = Binder.getCallingUid(); + mController.registerOrganizer(mIOrganizer); + final ActivityRecord activity = createActivityRecord(mDisplayContent); + final Task task = activity.getTask(); + activity.info.applicationInfo.uid = uid; + doReturn(pid).when(activity).getPid(); + task.effectiveUid = uid; + + // No need to notify organizer if it is not embedded. + mController.onActivityReparentToTask(activity); + mController.dispatchPendingEvents(); + + verify(mOrganizer, never()).onActivityReparentToTask(anyInt(), any(), any()); + + // Notify organizer if it was embedded before entered Pip. + activity.mLastTaskFragmentOrganizerBeforePip = mIOrganizer; + mController.onActivityReparentToTask(activity); + mController.dispatchPendingEvents(); + + verify(mOrganizer).onActivityReparentToTask(task.mTaskId, activity.intent, activity.token); + + // Notify organizer if there is any embedded in the Task. + final TaskFragment taskFragment = new TaskFragmentBuilder(mAtm) + .setParentTask(task) + .setOrganizer(mOrganizer) + .build(); + taskFragment.setTaskFragmentOrganizer(mOrganizer.getOrganizerToken(), uid, + DEFAULT_TASK_FRAGMENT_ORGANIZER_PROCESS_NAME); + activity.reparent(taskFragment, POSITION_TOP); + activity.mLastTaskFragmentOrganizerBeforePip = null; + mController.onActivityReparentToTask(activity); + mController.dispatchPendingEvents(); + + verify(mOrganizer, times(2)) + .onActivityReparentToTask(task.mTaskId, activity.intent, activity.token); + } + + @Test + public void testOnActivityReparentToTask_activityNotInOrganizerProcess_useTemporaryToken() { + final int pid = Binder.getCallingPid(); + final int uid = Binder.getCallingUid(); + mTaskFragment.setTaskFragmentOrganizer(mOrganizer.getOrganizerToken(), uid, + DEFAULT_TASK_FRAGMENT_ORGANIZER_PROCESS_NAME); + mAtm.mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment); + mController.registerOrganizer(mIOrganizer); + mOrganizer.applyTransaction(mTransaction); + final Task task = createTask(mDisplayContent); + task.addChild(mTaskFragment, POSITION_TOP); + final ActivityRecord activity = createActivityRecord(task); + + // Make sure the activity belongs to the same app, but it is in a different pid. + activity.info.applicationInfo.uid = uid; + doReturn(pid + 1).when(activity).getPid(); + task.effectiveUid = uid; + final ArgumentCaptor<IBinder> token = ArgumentCaptor.forClass(IBinder.class); + + // Notify organizer if it was embedded before entered Pip. + // Create a temporary token since the activity doesn't belong to the same process. + activity.mLastTaskFragmentOrganizerBeforePip = mIOrganizer; + mController.onActivityReparentToTask(activity); + mController.dispatchPendingEvents(); + + // Allow organizer to reparent activity in other process using the temporary token. + verify(mOrganizer).onActivityReparentToTask(eq(task.mTaskId), eq(activity.intent), + token.capture()); + final IBinder temporaryToken = token.getValue(); + assertNotEquals(activity.token, temporaryToken); + mTransaction.reparentActivityToTaskFragment(mFragmentToken, temporaryToken); + mAtm.mWindowOrganizerController.applyTransaction(mTransaction); + + assertEquals(mTaskFragment, activity.getTaskFragment()); + // The temporary token can only be used once. + assertNull(mController.getReparentActivityFromTemporaryToken(mIOrganizer, temporaryToken)); + } + + @Test public void testRegisterRemoteAnimations() { mController.registerOrganizer(mIOrganizer); mController.registerRemoteAnimations(mIOrganizer, TASK_ID, mDefinition); @@ -440,6 +522,55 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { } @Test + public void testApplyTransaction_requestFocusOnTaskFragment() { + mOrganizer.applyTransaction(mTransaction); + mController.registerOrganizer(mIOrganizer); + final Task task = createTask(mDisplayContent); + final IBinder token0 = new Binder(); + final TaskFragment tf0 = new TaskFragmentBuilder(mAtm) + .setParentTask(task) + .setFragmentToken(token0) + .setOrganizer(mOrganizer) + .createActivityCount(1) + .build(); + final IBinder token1 = new Binder(); + final TaskFragment tf1 = new TaskFragmentBuilder(mAtm) + .setParentTask(task) + .setFragmentToken(token1) + .setOrganizer(mOrganizer) + .createActivityCount(1) + .build(); + mAtm.mWindowOrganizerController.mLaunchTaskFragments.put(token0, tf0); + mAtm.mWindowOrganizerController.mLaunchTaskFragments.put(token1, tf1); + final ActivityRecord activity0 = tf0.getTopMostActivity(); + final ActivityRecord activity1 = tf1.getTopMostActivity(); + + // No effect if the current focus is in a different Task. + final ActivityRecord activityInOtherTask = createActivityRecord(mDefaultDisplay); + mDisplayContent.setFocusedApp(activityInOtherTask); + mTransaction.requestFocusOnTaskFragment(token0); + mAtm.mWindowOrganizerController.applyTransaction(mTransaction); + + assertEquals(activityInOtherTask, mDisplayContent.mFocusedApp); + + // No effect if there is no resumed activity in the request TaskFragment. + activity0.setState(ActivityRecord.State.PAUSED, "test"); + activity1.setState(ActivityRecord.State.RESUMED, "test"); + mDisplayContent.setFocusedApp(activity1); + mAtm.mWindowOrganizerController.applyTransaction(mTransaction); + + assertEquals(activity1, mDisplayContent.mFocusedApp); + + // Set focus to the request TaskFragment when the current focus is in the same Task, and it + // has a resumed activity. + activity0.setState(ActivityRecord.State.RESUMED, "test"); + mDisplayContent.setFocusedApp(activity1); + mAtm.mWindowOrganizerController.applyTransaction(mTransaction); + + assertEquals(activity0, mDisplayContent.mFocusedApp); + } + + @Test public void testTaskFragmentInPip_startActivityInTaskFragment() { setupTaskFragmentInPip(); final ActivityRecord activity = mTaskFragment.getTopMostActivity(); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java index 54fa4e4bf7ec..b2043c38d00a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java @@ -19,17 +19,22 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static com.android.dx.mockito.inline.extended.ExtendedMockito.any; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; 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.ActivityRecord.State.RESUMED; +import static com.android.server.wm.WindowContainer.POSITION_TOP; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.clearInvocations; import android.content.res.Configuration; @@ -61,6 +66,7 @@ import org.mockito.MockitoAnnotations; public class TaskFragmentTest extends WindowTestsBase { private TaskFragmentOrganizer mOrganizer; + private ITaskFragmentOrganizer mIOrganizer; private TaskFragment mTaskFragment; private SurfaceControl mLeash; @Mock @@ -70,10 +76,10 @@ public class TaskFragmentTest extends WindowTestsBase { public void setup() { MockitoAnnotations.initMocks(this); mOrganizer = new TaskFragmentOrganizer(Runnable::run); - final ITaskFragmentOrganizer iOrganizer = - ITaskFragmentOrganizer.Stub.asInterface(mOrganizer.getOrganizerToken().asBinder()); + mIOrganizer = ITaskFragmentOrganizer.Stub.asInterface(mOrganizer.getOrganizerToken() + .asBinder()); mAtm.mWindowOrganizerController.mTaskFragmentOrganizerController - .registerOrganizer(iOrganizer); + .registerOrganizer(mIOrganizer); mTaskFragment = new TaskFragmentBuilder(mAtm) .setCreateParentTask() .setOrganizer(mOrganizer) @@ -239,6 +245,8 @@ public class TaskFragmentTest extends WindowTestsBase { assertEquals(taskBounds, taskFragment.getBounds()); assertEquals(taskBounds, activity.getBounds()); assertEquals(Configuration.EMPTY, taskFragment.getRequestedOverrideConfiguration()); + // Because the whole Task is entering PiP, no need to record for future reparent. + assertNull(activity.mLastTaskFragmentOrganizerBeforePip); } @Test @@ -257,6 +265,9 @@ public class TaskFragmentTest extends WindowTestsBase { .createActivityCount(1) .build(); final ActivityRecord activity0 = taskFragment0.getTopMostActivity(); + final ActivityRecord activity1 = taskFragment1.getTopMostActivity(); + activity0.setVisibility(true /* visible */, false /* deferHidingClient */); + activity1.setVisibility(true /* visible */, false /* deferHidingClient */); spyOn(mAtm.mTaskFragmentOrganizerController); // Move activity to pinned. @@ -269,8 +280,76 @@ public class TaskFragmentTest extends WindowTestsBase { final TaskFragmentInfo info = taskFragment0.getTaskFragmentInfo(); assertTrue(info.isTaskFragmentClearedForPip()); assertTrue(info.isEmpty()); + + // Notify organizer because the Task is still visible. + assertTrue(task.isVisibleRequested()); verify(mAtm.mTaskFragmentOrganizerController) .dispatchPendingInfoChangedEvent(taskFragment0); + // Make sure the organizer is recorded so that it can be reused when the activity is + // reparented back on exiting PiP. + assertEquals(mIOrganizer, activity0.mLastTaskFragmentOrganizerBeforePip); + } + + @Test + public void testEmbeddedActivityExitPip_notifyOrganizer() { + final Task task = createTask(mDisplayContent); + final TaskFragment taskFragment = new TaskFragmentBuilder(mAtm) + .setParentTask(task) + .setOrganizer(mOrganizer) + .setFragmentToken(new Binder()) + .createActivityCount(1) + .build(); + new TaskFragmentBuilder(mAtm) + .setParentTask(task) + .setOrganizer(mOrganizer) + .setFragmentToken(new Binder()) + .createActivityCount(1) + .build(); + final ActivityRecord activity = taskFragment.getTopMostActivity(); + mRootWindowContainer.moveActivityToPinnedRootTask(activity, + null /* launchIntoPipHostActivity */, "test"); + spyOn(mAtm.mTaskFragmentOrganizerController); + assertEquals(mIOrganizer, activity.mLastTaskFragmentOrganizerBeforePip); + + // Move the activity back to its original Task. + activity.reparent(task, POSITION_TOP); + + // Notify the organizer about the reparent. + verify(mAtm.mTaskFragmentOrganizerController).onActivityReparentToTask(activity); + assertNull(activity.mLastTaskFragmentOrganizerBeforePip); + } + + @Test + public void testIsReadyToTransit() { + final TaskFragment taskFragment = new TaskFragmentBuilder(mAtm) + .setCreateParentTask() + .setOrganizer(mOrganizer) + .setFragmentToken(new Binder()) + .build(); + final Task task = taskFragment.getTask(); + + // Not ready when it is empty. + assertFalse(taskFragment.isReadyToTransit()); + + // Ready when it is not empty. + final ActivityRecord activity = createActivityRecord(mDisplayContent); + doNothing().when(activity).setDropInputMode(anyInt()); + activity.reparent(taskFragment, WindowContainer.POSITION_TOP); + assertTrue(taskFragment.isReadyToTransit()); + + // Ready when the Task is in PiP. + taskFragment.removeChild(activity); + task.setWindowingMode(WINDOWING_MODE_PINNED); + assertTrue(taskFragment.isReadyToTransit()); + + // Ready when the TaskFragment is empty because of PiP, and the Task is invisible. + task.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + taskFragment.mClearedTaskFragmentForPip = true; + assertTrue(taskFragment.isReadyToTransit()); + + // Not ready if the task is still visible when the TaskFragment becomes empty. + doReturn(true).when(task).isVisibleRequested(); + assertFalse(taskFragment.isReadyToTransit()); } @Test @@ -324,4 +403,29 @@ public class TaskFragmentTest extends WindowTestsBase { assertFalse(activity0.hasOverlayOverUntrustedModeEmbedded()); assertFalse(activity1.hasOverlayOverUntrustedModeEmbedded()); } + + @Test + public void testIsAllowedToBeEmbeddedInTrustedMode() { + final TaskFragment taskFragment = new TaskFragmentBuilder(mAtm) + .setCreateParentTask() + .createActivityCount(2) + .build(); + final ActivityRecord activity0 = taskFragment.getBottomMostActivity(); + final ActivityRecord activity1 = taskFragment.getTopMostActivity(); + + // Allowed if all children activities are allowed. + doReturn(true).when(taskFragment).isAllowedToEmbedActivityInTrustedMode(activity0); + doReturn(true).when(taskFragment).isAllowedToEmbedActivityInTrustedMode(activity1); + + assertTrue(taskFragment.isAllowedToBeEmbeddedInTrustedMode()); + + // Disallowed if any child activity is not allowed. + doReturn(false).when(taskFragment).isAllowedToEmbedActivityInTrustedMode(activity0); + + assertFalse(taskFragment.isAllowedToBeEmbeddedInTrustedMode()); + + doReturn(false).when(taskFragment).isAllowedToEmbedActivityInTrustedMode(activity1); + + assertFalse(taskFragment.isAllowedToBeEmbeddedInTrustedMode()); + } } 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 832bd2d8b951..40ca2506fab1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java @@ -370,13 +370,16 @@ public class WindowOrganizerTests extends WindowTestsBase { // Ensure events dispatch to organizer. mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents(); assertContainsTasks(existingTasks2, rootTask); - verify(organizer2, times(1)).onTaskAppeared(any(RunningTaskInfo.class), + verify(organizer2, never()).onTaskAppeared(any(RunningTaskInfo.class), any(SurfaceControl.class)); verify(organizer2, times(0)).onTaskVanished(any()); - // Removed tasks from the original organizer - assertTaskVanished(organizer, true /* expectVanished */, rootTask, rootTask2); - assertTrue(rootTask2.isOrganized()); + // The non-CreatedByOrganizer task is removed from the original organizer. + assertTaskVanished(organizer, true /* expectVanished */, rootTask); + assertEquals(organizer2, rootTask.mTaskOrganizer); + // The CreatedByOrganizer task should be still organized by the original organizer. + assertEquals(organizer, rootTask2.mTaskOrganizer); + clearInvocations(organizer); // Now we unregister the second one, the first one should automatically be reregistered // so we verify that it's now seeing changes. mWm.mAtmService.mTaskOrganizerController.unregisterTaskOrganizer(organizer2); @@ -385,9 +388,13 @@ public class WindowOrganizerTests extends WindowTestsBase { verify(organizer, times(2)) .onTaskAppeared(any(RunningTaskInfo.class), any(SurfaceControl.class)); - assertFalse(rootTask2.isOrganized()); - assertTaskVanished(organizer2, true /* expectVanished */, rootTask, - rootTask2); + + // Unregister the first one. The CreatedByOrganizer task created by it must be removed. + mWm.mAtmService.mTaskOrganizerController.unregisterTaskOrganizer(organizer); + assertFalse(rootTask2.isAttached()); + assertFalse(task2.isAttached()); + // Normal task should keep. + assertTrue(task.isAttached()); } @Test 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 c672b9173570..7507df6eba74 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -1156,10 +1156,6 @@ class WindowTestsBase extends SystemServiceTestsBase { spyOn(activity); if (mTask != null) { - // fullscreen value is normally read from resources in ctor, so for testing we need - // to set it somewhere else since we can't mock resources. - doReturn(true).when(activity).occludesParent(); - doReturn(true).when(activity).fillsParent(); mTask.addChild(activity); if (mOnTop) { // Move the task to front after activity is added. diff --git a/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java b/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java index 97d5215213a9..eafcef2f1d38 100644 --- a/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java +++ b/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java @@ -41,10 +41,10 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.ResultReceiver; import android.service.translation.TranslationServiceInfo; +import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.util.Slog; -import android.util.SparseArray; import android.view.autofill.AutofillId; import android.view.inputmethod.InputMethodInfo; import android.view.translation.ITranslationServiceCallback; @@ -71,7 +71,8 @@ import java.lang.ref.WeakReference; import java.util.List; final class TranslationManagerServiceImpl extends - AbstractPerUserSystemService<TranslationManagerServiceImpl, TranslationManagerService> { + AbstractPerUserSystemService<TranslationManagerServiceImpl, TranslationManagerService> + implements IBinder.DeathRecipient { private static final String TAG = "TranslationManagerServiceImpl"; @SuppressLint("IsLoggableTagLength") @@ -100,10 +101,10 @@ final class TranslationManagerServiceImpl extends private final ArraySet<IBinder> mWaitingFinishedCallbackActivities = new ArraySet<>(); /** - * Key is translated activity uid, value is the specification and state for the translation. + * Key is translated activity token, value is the specification and state for the translation. */ @GuardedBy("mLock") - private final SparseArray<ActiveTranslation> mActiveTranslations = new SparseArray<>(); + private final ArrayMap<IBinder, ActiveTranslation> mActiveTranslations = new ArrayMap<>(); protected TranslationManagerServiceImpl( @NonNull TranslationManagerService master, @@ -190,25 +191,24 @@ final class TranslationManagerServiceImpl extends } } - private int getActivityUidByComponentName(Context context, ComponentName componentName, - int userId) { - int translationActivityUid = -1; + private int getAppUidByComponentName(Context context, ComponentName componentName, int userId) { + int translatedAppUid = -1; try { if (componentName != null) { - translationActivityUid = context.getPackageManager().getApplicationInfoAsUser( + translatedAppUid = context.getPackageManager().getApplicationInfoAsUser( componentName.getPackageName(), 0, userId).uid; } } catch (PackageManager.NameNotFoundException e) { Slog.d(TAG, "Cannot find packageManager for" + componentName); } - return translationActivityUid; + return translatedAppUid; } @GuardedBy("mLock") public void onTranslationFinishedLocked(boolean activityDestroyed, IBinder token, ComponentName componentName) { - final int translationActivityUid = - getActivityUidByComponentName(getContext(), componentName, getUserId()); + final int translatedAppUid = + getAppUidByComponentName(getContext(), componentName, getUserId()); final String packageName = componentName.getPackageName(); if (activityDestroyed) { // In the Activity destroy case, we only calls onTranslationFinished() in @@ -216,13 +216,13 @@ final class TranslationManagerServiceImpl extends // should remove the waiting callback to avoid callback twice. invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, /* sourceSpec= */ null, /* targetSpec= */ null, - packageName, translationActivityUid); + packageName, translatedAppUid); mWaitingFinishedCallbackActivities.remove(token); } else { if (mWaitingFinishedCallbackActivities.contains(token)) { invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, /* sourceSpec= */ null, /* targetSpec= */ null, - packageName, translationActivityUid); + packageName, translatedAppUid); mWaitingFinishedCallbackActivities.remove(token); } } @@ -259,48 +259,161 @@ final class TranslationManagerServiceImpl extends } ComponentName componentName = mActivityTaskManagerInternal.getActivityName(activityToken); - int translationActivityUid = - getActivityUidByComponentName(getContext(), componentName, getUserId()); + int translatedAppUid = + getAppUidByComponentName(getContext(), componentName, getUserId()); String packageName = componentName.getPackageName(); - if (state != STATE_UI_TRANSLATION_FINISHED) { - invokeCallbacks(state, sourceSpec, targetSpec, packageName, translationActivityUid); - updateActiveTranslations(state, sourceSpec, targetSpec, packageName, - translationActivityUid); - } else { - if (mActiveTranslations.contains(translationActivityUid)) { - mActiveTranslations.delete(translationActivityUid); - } else { - Slog.w(TAG, "Finishing translation for activity with uid=" + translationActivityUid - + " but no active translation was found for it"); - } - } + + invokeCallbacksIfNecessaryLocked(state, sourceSpec, targetSpec, packageName, activityToken, + translatedAppUid); + updateActiveTranslationsLocked(state, sourceSpec, targetSpec, packageName, activityToken, + translatedAppUid); } @GuardedBy("mLock") - private void updateActiveTranslations(int state, TranslationSpec sourceSpec, - TranslationSpec targetSpec, String packageName, int translationActivityUid) { - // Keep track of active translations so that we can trigger callbacks that are - // registered after translation has started. + private void updateActiveTranslationsLocked(int state, TranslationSpec sourceSpec, + TranslationSpec targetSpec, String packageName, IBinder activityToken, + int translatedAppUid) { + // We keep track of active translations and their state so that we can: + // 1. Trigger callbacks that are registered after translation has started. + // See registerUiTranslationStateCallbackLocked(). + // 2. NOT trigger callbacks when the state didn't change. + // See invokeCallbacksIfNecessaryLocked(). + ActiveTranslation activeTranslation = mActiveTranslations.get(activityToken); switch (state) { case STATE_UI_TRANSLATION_STARTED: { - ActiveTranslation activeTranslation = new ActiveTranslation(sourceSpec, - targetSpec, packageName); - mActiveTranslations.put(translationActivityUid, activeTranslation); + if (activeTranslation == null) { + try { + activityToken.linkToDeath(this, /* flags= */ 0); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to call linkToDeath for translated app with uid=" + + translatedAppUid + "; activity is already dead", e); + + // Apps with registered callbacks were just notified that translation + // started. We should let them know translation is finished too. + invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, sourceSpec, targetSpec, + packageName, translatedAppUid); + return; + } + mActiveTranslations.put(activityToken, + new ActiveTranslation(sourceSpec, targetSpec, translatedAppUid, + packageName)); + } break; } - case STATE_UI_TRANSLATION_PAUSED: + + case STATE_UI_TRANSLATION_PAUSED: { + if (activeTranslation != null) { + activeTranslation.isPaused = true; + } + break; + } + case STATE_UI_TRANSLATION_RESUMED: { - ActiveTranslation activeTranslation = mActiveTranslations.get( - translationActivityUid); if (activeTranslation != null) { - activeTranslation.isPaused = (state == STATE_UI_TRANSLATION_PAUSED); - } else { - Slog.w(TAG, "Pausing or resuming translation for activity with uid=" - + translationActivityUid - + " but no active translation was found for it"); + activeTranslation.isPaused = false; } break; } + + case STATE_UI_TRANSLATION_FINISHED: { + if (activeTranslation != null) { + mActiveTranslations.remove(activityToken); + } + break; + } + } + + if (DEBUG) { + Slog.d(TAG, + "Updating to translation state=" + state + " for app with uid=" + + translatedAppUid + " packageName=" + packageName); + } + } + + @GuardedBy("mLock") + private void invokeCallbacksIfNecessaryLocked(int state, TranslationSpec sourceSpec, + TranslationSpec targetSpec, String packageName, IBinder activityToken, + int translatedAppUid) { + boolean shouldInvokeCallbacks = true; + int stateForCallbackInvocation = state; + + ActiveTranslation activeTranslation = mActiveTranslations.get(activityToken); + if (activeTranslation == null) { + if (state != STATE_UI_TRANSLATION_STARTED) { + shouldInvokeCallbacks = false; + Slog.w(TAG, + "Updating to translation state=" + state + " for app with uid=" + + translatedAppUid + " packageName=" + packageName + + " but no active translation was found for it"); + } + } else { + switch (state) { + case STATE_UI_TRANSLATION_STARTED: { + boolean specsAreIdentical = activeTranslation.sourceSpec.getLocale().equals( + sourceSpec.getLocale()) + && activeTranslation.targetSpec.getLocale().equals( + targetSpec.getLocale()); + if (specsAreIdentical) { + if (activeTranslation.isPaused) { + // Ideally UiTranslationManager.resumeTranslation() should be first + // used to resume translation, but for the purposes of invoking the + // callback, we want to call onResumed() instead of onStarted(). This + // way there can only be one call to onStarted() for the lifetime of + // a translated activity and this will simplify the number of states + // apps have to handle. + stateForCallbackInvocation = STATE_UI_TRANSLATION_RESUMED; + } else { + // Don't invoke callbacks if the state or specs didn't change. For a + // given activity, startTranslation() will be called every time there + // are new views to be translated, but we don't need to repeatedly + // notify apps about it. + shouldInvokeCallbacks = false; + } + } + break; + } + + case STATE_UI_TRANSLATION_PAUSED: { + if (activeTranslation.isPaused) { + // Don't invoke callbacks if the state didn't change. + shouldInvokeCallbacks = false; + } + break; + } + + case STATE_UI_TRANSLATION_RESUMED: { + if (!activeTranslation.isPaused) { + // Don't invoke callbacks if the state didn't change. Either + // resumeTranslation() was called consecutive times, or right after + // startTranslation(). The latter case shouldn't happen normally, so we + // don't want apps to have to handle that particular transition. + shouldInvokeCallbacks = false; + } + break; + } + + case STATE_UI_TRANSLATION_FINISHED: { + // Note: Here finishTranslation() was called but we don't want to invoke + // onFinished() on the callbacks. They will be invoked when + // UiTranslationManager.onTranslationFinished() is called (see + // onTranslationFinishedLocked()). + shouldInvokeCallbacks = false; + break; + } + } + } + + if (DEBUG) { + Slog.d(TAG, + (shouldInvokeCallbacks ? "" : "NOT ") + + "Invoking callbacks for translation state=" + + stateForCallbackInvocation + " for app with uid=" + translatedAppUid + + " packageName=" + packageName); + } + + if (shouldInvokeCallbacks) { + invokeCallbacks(stateForCallbackInvocation, sourceSpec, targetSpec, packageName, + translatedAppUid); } } @@ -343,15 +456,14 @@ final class TranslationManagerServiceImpl extends private void invokeCallbacks( int state, TranslationSpec sourceSpec, TranslationSpec targetSpec, String packageName, - int translationActivityUid) { + int translatedAppUid) { Bundle result = createResultForCallback(state, sourceSpec, targetSpec, packageName); if (mCallbacks.getRegisteredCallbackCount() == 0) { return; } List<InputMethodInfo> enabledInputMethods = getEnabledInputMethods(); mCallbacks.broadcast((callback, uid) -> { - invokeCallback((int) uid, translationActivityUid, callback, result, - enabledInputMethods); + invokeCallback((int) uid, translatedAppUid, callback, result, enabledInputMethods); }); } @@ -374,9 +486,9 @@ final class TranslationManagerServiceImpl extends } private void invokeCallback( - int callbackSourceUid, int translationActivityUid, IRemoteCallback callback, + int callbackSourceUid, int translatedAppUid, IRemoteCallback callback, Bundle result, List<InputMethodInfo> enabledInputMethods) { - if (callbackSourceUid == translationActivityUid) { + if (callbackSourceUid == translatedAppUid) { // Invoke callback for the application being translated. try { callback.sendResult(result); @@ -417,29 +529,26 @@ final class TranslationManagerServiceImpl extends // Trigger the callback for already active translations. List<InputMethodInfo> enabledInputMethods = getEnabledInputMethods(); for (int i = 0; i < mActiveTranslations.size(); i++) { - int activeTranslationUid = mActiveTranslations.keyAt(i); ActiveTranslation activeTranslation = mActiveTranslations.valueAt(i); - if (activeTranslation == null) { - continue; - } + int translatedAppUid = activeTranslation.translatedAppUid; String packageName = activeTranslation.packageName; if (DEBUG) { Slog.d(TAG, "Triggering callback for sourceUid=" + sourceUid - + " for translated activity with uid=" + activeTranslationUid + + " for translated app with uid=" + translatedAppUid + "packageName=" + packageName + " isPaused=" + activeTranslation.isPaused); } Bundle startedResult = createResultForCallback(STATE_UI_TRANSLATION_STARTED, activeTranslation.sourceSpec, activeTranslation.targetSpec, packageName); - invokeCallback(sourceUid, activeTranslationUid, callback, startedResult, + invokeCallback(sourceUid, translatedAppUid, callback, startedResult, enabledInputMethods); if (activeTranslation.isPaused) { // Also send event so callback owners know that translation was started then paused. Bundle pausedResult = createResultForCallback(STATE_UI_TRANSLATION_PAUSED, activeTranslation.sourceSpec, activeTranslation.targetSpec, packageName); - invokeCallback(sourceUid, activeTranslationUid, callback, pausedResult, + invokeCallback(sourceUid, translatedAppUid, callback, pausedResult, enabledInputMethods); } } @@ -492,13 +601,34 @@ final class TranslationManagerServiceImpl extends public final TranslationSpec sourceSpec; public final TranslationSpec targetSpec; public final String packageName; + public final int translatedAppUid; public boolean isPaused = false; private ActiveTranslation(TranslationSpec sourceSpec, TranslationSpec targetSpec, - String packageName) { + int translatedAppUid, String packageName) { this.sourceSpec = sourceSpec; this.targetSpec = targetSpec; + this.translatedAppUid = translatedAppUid; this.packageName = packageName; } } + + @Override + public void binderDied() { + // Don't need to implement this with binderDied(IBinder) implemented. + } + + @Override + public void binderDied(IBinder who) { + synchronized (mLock) { + mWaitingFinishedCallbackActivities.remove(who); + ActiveTranslation activeTranslation = mActiveTranslations.remove(who); + if (activeTranslation != null) { + // Let apps with registered callbacks know about the activity's death. + invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, activeTranslation.sourceSpec, + activeTranslation.targetSpec, activeTranslation.packageName, + activeTranslation.translatedAppUid); + } + } + } } diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 1b07e9a69446..6ea416b54811 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -556,6 +556,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser protected boolean mCurrentUsbFunctionsReceived; protected int mUsbSpeed; protected int mCurrentGadgetHalVersion; + protected boolean mPendingBootAccessoryHandshakeBroadcast; /** * The persistent property which stores whether adb is enabled or not. @@ -1113,7 +1114,13 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser if (DEBUG) { Slog.v(TAG, "Accessory handshake timeout"); } - broadcastUsbAccessoryHandshake(); + if (mBootCompleted) { + broadcastUsbAccessoryHandshake(); + } else { + if (DEBUG) Slog.v(TAG, "Pending broadcasting intent as " + + "not boot completed yet."); + mPendingBootAccessoryHandshakeBroadcast = true; + } break; } case MSG_INCREASE_SENDSTRING_COUNT: { @@ -1137,8 +1144,11 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser if (mCurrentAccessory != null) { mUsbDeviceManager.getCurrentSettings().accessoryAttached(mCurrentAccessory); broadcastUsbAccessoryHandshake(); + } else if (mPendingBootAccessoryHandshakeBroadcast) { + broadcastUsbAccessoryHandshake(); } + mPendingBootAccessoryHandshakeBroadcast = false; updateUsbNotification(false); updateAdbNotification(false); updateUsbFunctions(); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 8cbbe947d32d..f31cdcba5830 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -1824,6 +1824,32 @@ public class VoiceInteractionManagerService extends SystemService { } } + public void setSessionWindowVisible(IBinder token, boolean visible) { + synchronized (this) { + if (mImpl == null) { + Slog.w(TAG, "setSessionWindowVisible called without running voice interaction " + + "service"); + return; + } + if (mImpl.mActiveSession == null || token != mImpl.mActiveSession.mToken) { + Slog.w(TAG, "setSessionWindowVisible does not match active session"); + return; + } + final long caller = Binder.clearCallingIdentity(); + try { + mVoiceInteractionSessionListeners.broadcast(listener -> { + try { + listener.onVoiceSessionWindowVisibilityChanged(visible); + } catch (RemoteException e) { + Slog.e(TAG, "Error delivering window visibility event to listener.", e); + } + }); + } finally { + Binder.restoreCallingIdentity(caller); + } + } + } + @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 09d3a0d6392b..e21301eb32af 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -908,6 +908,9 @@ public class CarrierConfigManager { * Combines VoLTE, VT, VoWiFI calling provisioning into one parameter. * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for * finer-grained control. + * changing carrier_volte_provisioning_required_bool requires changes to + * mmtel_requires_provisioning_bundle and vice versa + * {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} */ @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL @@ -5437,6 +5440,10 @@ public class CarrierConfigManager { * </ul> * <p> The values are defined in * {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech} + * + * changing mmtel_requires_provisioning_bundle requires changes to + * carrier_volte_provisioning_required_bool and vice versa + * {@link Ims#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL} */ public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE = KEY_PREFIX + "mmtel_requires_provisioning_bundle"; diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index c56cc62abe44..235ed842b749 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -1293,8 +1293,8 @@ public class ApnSetting implements Parcelable { && Objects.equals(this.mOperatorNumeric, other.mOperatorNumeric) && Objects.equals(this.mProtocol, other.mProtocol) && Objects.equals(this.mRoamingProtocol, other.mRoamingProtocol) - && xorEqualsInt(this.mMtuV4, other.mMtuV4) - && xorEqualsInt(this.mMtuV6, other.mMtuV6) + && mtuUnsetOrEquals(this.mMtuV4, other.mMtuV4) + && mtuUnsetOrEquals(this.mMtuV6, other.mMtuV6) && Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled) && Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask) && Objects.equals(this.mLingeringNetworkTypeBitmask, @@ -1322,7 +1322,12 @@ public class ApnSetting implements Parcelable { // Equal or one is not specified. private boolean xorEqualsInt(int first, int second) { return first == UNSPECIFIED_INT || second == UNSPECIFIED_INT - || Objects.equals(first, second); + || first == second; + } + + // Equal or one is not specified. Specific to MTU where <= 0 indicates unset. + private boolean mtuUnsetOrEquals(int first, int second) { + return first <= 0 || second <= 0 || first == second; } private String nullToEmpty(String stringValue) { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt index 774b85bb8e57..a8cbc5dc922c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt @@ -74,6 +74,17 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) @Test override fun entireScreenCovered() = super.entireScreenCovered() + /** {@inheritDoc} */ + @FlakyTest(bugId = 203538234) + @Test + override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = + super.visibleWindowsShownMoreThanOneConsecutiveEntry() + + /** {@inheritDoc} */ + @FlakyTest(bugId = 203538234) + @Test + override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow() + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt index 53ee57b2fb7c..cd8dea012db5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt @@ -105,6 +105,12 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) @Test override fun entireScreenCovered() = super.entireScreenCovered() + /** {@inheritDoc} */ + @FlakyTest(bugId = 203538234) + @Test + override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = + super.visibleWindowsShownMoreThanOneConsecutiveEntry() + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt index af9eaa56dd52..812f6859c7b0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt @@ -20,6 +20,7 @@ import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice import android.view.WindowInsets import android.view.WindowManager +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import androidx.test.uiautomator.Until import com.android.launcher3.tapl.LauncherInstrumentation @@ -29,8 +30,10 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.NotificationAppHelper +import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen +import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -162,6 +165,21 @@ open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter) } } + /** {@inheritDoc} */ + @Postsubmit + @Test + override fun appWindowBecomesTopWindow() { + Assume.assumeFalse(isShellTransitionsEnabled) + super.appWindowBecomesTopWindow() + } + + @FlakyTest(bugId = 229738092) + @Test + fun appWindowBecomesTopWindow_ShellTransit() { + Assume.assumeTrue(isShellTransitionsEnabled) + super.appWindowBecomesTopWindow() + } + companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 18f077f241de..2226fd1d2155 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -154,6 +154,21 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) super.appWindowReplacesLauncherAsTopWindow() } + /** {@inheritDoc} */ + @Presubmit + @Test + override fun appWindowBecomesTopWindow() { + Assume.assumeFalse(isShellTransitionsEnabled) + super.appWindowBecomesTopWindow() + } + + @FlakyTest(bugId = 229738092) + @Test + fun appWindowBecomesTopWindow_ShellTransit() { + Assume.assumeTrue(isShellTransitionsEnabled) + super.appWindowBecomesTopWindow() + } + companion object { /** * Creates the test configurations. diff --git a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java index 1c957d4d78cf..8419276f4406 100644 --- a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java +++ b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java @@ -30,6 +30,7 @@ import android.os.Bundle; import android.os.SystemClock; import android.platform.test.annotations.RootPermissionTest; import android.platform.test.rule.UnlockScreenRule; +import android.util.Log; import android.view.WindowInsets; import android.view.WindowInsetsAnimation; import android.view.inputmethod.InputMethodManager; @@ -40,16 +41,19 @@ import androidx.annotation.Nullable; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.ArrayList; import java.util.List; @RootPermissionTest @RunWith(AndroidJUnit4.class) public final class ImeOpenCloseStressTest { + private static final String TAG = "ImeOpenCloseStressTest"; private static final int NUM_TEST_ITERATIONS = 10; @Rule @@ -58,32 +62,103 @@ public final class ImeOpenCloseStressTest { @Rule public ScreenCaptureRule mScreenCaptureRule = new ScreenCaptureRule("/sdcard/InputMethodStressTest"); + private Instrumentation mInstrumentation; + + @Before + public void setUp() { + mInstrumentation = InstrumentationRegistry.getInstrumentation(); + } + + @Test + public void testShowHide_waitingVisibilityChange() { + TestActivity activity = TestActivity.start(); + EditText editText = activity.getEditText(); + waitOnMainUntil("activity should gain focus", editText::hasWindowFocus); + for (int i = 0; i < NUM_TEST_ITERATIONS; i++) { + String msgPrefix = "Iteration #" + i + " "; + Log.i(TAG, msgPrefix + "start"); + mInstrumentation.runOnMainSync(activity::showIme); + waitOnMainUntil(msgPrefix + "IME should be visible", () -> isImeShown(editText)); + mInstrumentation.runOnMainSync(activity::hideIme); + waitOnMainUntil(msgPrefix + "IME should be hidden", () -> !isImeShown(editText)); + } + } @Test - public void test() { - Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); - Intent intent = new Intent() - .setAction(Intent.ACTION_MAIN) - .setClass(instrumentation.getContext(), TestActivity.class) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - TestActivity activity = (TestActivity) instrumentation.startActivitySync(intent); + public void testShowHide_waitingAnimationEnd() { + TestActivity activity = TestActivity.start(); + activity.enableAnimationMonitoring(); EditText editText = activity.getEditText(); waitOnMainUntil("activity should gain focus", editText::hasWindowFocus); for (int i = 0; i < NUM_TEST_ITERATIONS; i++) { String msgPrefix = "Iteration #" + i + " "; - instrumentation.runOnMainSync(activity::showIme); + Log.i(TAG, msgPrefix + "start"); + mInstrumentation.runOnMainSync(activity::showIme); waitOnMainUntil(msgPrefix + "IME should be visible", () -> !activity.isAnimating() && isImeShown(editText)); - instrumentation.runOnMainSync(activity::hideIme); + mInstrumentation.runOnMainSync(activity::hideIme); waitOnMainUntil(msgPrefix + "IME should be hidden", () -> !activity.isAnimating() && !isImeShown(editText)); - // b/b/221483132, wait until IMS and IMMS handles IMM#notifyImeHidden. - // There is no good signal, so we just wait a second. - SystemClock.sleep(1000); } } + @Test + public void testShowHide_intervalAfterHide() { + // Regression test for b/221483132 + TestActivity activity = TestActivity.start(); + EditText editText = activity.getEditText(); + // Intervals = 10, 20, 30, ..., 100, 150, 200, ... + List<Integer> intervals = new ArrayList<>(); + for (int i = 10; i < 100; i += 10) intervals.add(i); + for (int i = 100; i < 1000; i += 50) intervals.add(i); + waitOnMainUntil("activity should gain focus", editText::hasWindowFocus); + for (int intervalMillis : intervals) { + String msgPrefix = "Interval = " + intervalMillis + " "; + Log.i(TAG, msgPrefix + " start"); + mInstrumentation.runOnMainSync(activity::hideIme); + SystemClock.sleep(intervalMillis); + mInstrumentation.runOnMainSync(activity::showIme); + waitOnMainUntil(msgPrefix + "IME should be visible", + () -> isImeShown(editText)); + } + } + + @Test + public void testShowHideInSameFrame() { + TestActivity activity = TestActivity.start(); + activity.enableAnimationMonitoring(); + EditText editText = activity.getEditText(); + waitOnMainUntil("activity should gain focus", editText::hasWindowFocus); + + // hidden -> show -> hide + mInstrumentation.runOnMainSync(() -> { + Log.i(TAG, "Calling showIme() and hideIme()"); + activity.showIme(); + activity.hideIme(); + }); + // Wait until IMMS / IMS handles messages. + SystemClock.sleep(1000); + mInstrumentation.waitForIdleSync(); + waitOnMainUntil("IME should be invisible after show/hide", () -> !isImeShown(editText)); + + mInstrumentation.runOnMainSync(activity::showIme); + waitOnMainUntil("IME should be visible", + () -> !activity.isAnimating() && isImeShown(editText)); + mInstrumentation.waitForIdleSync(); + + // shown -> hide -> show + mInstrumentation.runOnMainSync(() -> { + Log.i(TAG, "Calling hideIme() and showIme()"); + activity.hideIme(); + activity.showIme(); + }); + // Wait until IMMS / IMS handles messages. + SystemClock.sleep(1000); + mInstrumentation.waitForIdleSync(); + waitOnMainUntil("IME should be visible after hide/show", + () -> !activity.isAnimating() && isImeShown(editText)); + } + public static class TestActivity extends Activity { private EditText mEditText; @@ -111,6 +186,15 @@ public final class ImeOpenCloseStressTest { } }; + public static TestActivity start() { + Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); + Intent intent = new Intent() + .setAction(Intent.ACTION_MAIN) + .setClass(instrumentation.getContext(), TestActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + return (TestActivity) instrumentation.startActivitySync(intent); + } @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -120,9 +204,6 @@ public final class ImeOpenCloseStressTest { mEditText = new EditText(this); rootView.addView(mEditText, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); setContentView(rootView); - // Enable WindowInsetsAnimation. - getWindow().setDecorFitsSystemWindows(false); - mEditText.setWindowInsetsAnimationCallback(mWindowInsetsAnimationCallback); } public EditText getEditText() { @@ -130,16 +211,27 @@ public final class ImeOpenCloseStressTest { } public void showIme() { + Log.i(TAG, "TestActivity.showIme"); mEditText.requestFocus(); InputMethodManager imm = getSystemService(InputMethodManager.class); imm.showSoftInput(mEditText, 0); } public void hideIme() { + Log.i(TAG, "TestActivity.hideIme"); InputMethodManager imm = getSystemService(InputMethodManager.class); imm.hideSoftInputFromWindow(mEditText.getWindowToken(), 0); } + public void enableAnimationMonitoring() { + // Enable WindowInsetsAnimation. + // Note that this has a side effect of disabling InsetsAnimationThreadControlRunner. + InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { + getWindow().setDecorFitsSystemWindows(false); + mEditText.setWindowInsetsAnimationCallback(mWindowInsetsAnimationCallback); + }); + } + public boolean isAnimating() { return mIsAnimating; } diff --git a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java index 29c52cf8cb6a..47f87d6d75ff 100644 --- a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java +++ b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java @@ -20,6 +20,8 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assume.assumeFalse; + import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -28,6 +30,7 @@ import android.app.RemoteInput; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.platform.test.annotations.RootPermissionTest; import android.platform.test.rule.UnlockScreenRule; @@ -89,6 +92,11 @@ public final class NotificationTest { mContext = InstrumentationRegistry.getInstrumentation().getContext(); mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()); mNotificationManager = mContext.getSystemService(NotificationManager.class); + PackageManager pm = mContext.getPackageManager(); + // Do not run on Automotive. + assumeFalse(pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)); + // Do not run on TV. Direct Reply isn't supported on TV. + assumeFalse(pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY)); } @After diff --git a/tests/componentalias/AndroidManifest_service_aliases.xml b/tests/componentalias/AndroidManifest_service_aliases.xml index e73bb6102fbf..c96f1736c684 100644 --- a/tests/componentalias/AndroidManifest_service_aliases.xml +++ b/tests/componentalias/AndroidManifest_service_aliases.xml @@ -23,57 +23,57 @@ --> <service android:name=".s.Alias00" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests/android.content.componentalias.tests.s.Target00" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_ALIAS_00" /></intent-filter> </service> <service android:name=".s.Alias01" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub1/android.content.componentalias.tests.s.Target01" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_ALIAS_01" /></intent-filter> </service> <service android:name=".s.Alias02" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub2/android.content.componentalias.tests.s.Target02" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_ALIAS_02" /></intent-filter> </service> <service android:name=".s.Alias03" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub1/android.content.componentalias.tests.s.Target03" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_ALIAS_03" /></intent-filter> </service> <service android:name=".s.Alias04" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub2/android.content.componentalias.tests.s.Target04" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_ALIAS_04" /></intent-filter> </service> <receiver android:name=".b.Alias00" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests/android.content.componentalias.tests.b.Target00" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_RECEIVER_00" /></intent-filter> <intent-filter><action android:name="ACTION_BROADCAST" /></intent-filter> </receiver> <receiver android:name=".b.Alias01" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub1/android.content.componentalias.tests.b.Target01" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_RECEIVER_01" /></intent-filter> <intent-filter><action android:name="ACTION_BROADCAST" /></intent-filter> </receiver> <receiver android:name=".b.Alias02" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub2/android.content.componentalias.tests.b.Target02" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_RECEIVER_02" /></intent-filter> <intent-filter><action android:name="ACTION_BROADCAST" /></intent-filter> </receiver> <receiver android:name=".b.Alias03" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub1/android.content.componentalias.tests.b.Target03" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_RECEIVER_03" /></intent-filter> <intent-filter><action android:name="ACTION_BROADCAST" /></intent-filter> </receiver> <receiver android:name=".b.Alias04" android:exported="true" android:enabled="true" > <meta-data android:name="alias_target" android:value="android.content.componentalias.tests.sub2/android.content.componentalias.tests.b.Target04" /> - <intent-filter><action android:name="android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> + <intent-filter><action android:name="com.android.intent.action.EXPERIMENTAL_IS_ALIAS" /></intent-filter> <intent-filter><action android:name="android.content.componentalias.tests.IS_RECEIVER_04" /></intent-filter> <intent-filter><action android:name="ACTION_BROADCAST" /></intent-filter> </receiver> diff --git a/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java b/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java index 5f606e1dab0c..09080be9ee41 100644 --- a/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java +++ b/tests/vcn/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java @@ -26,6 +26,7 @@ import static android.telephony.TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot; import static com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionTrackerCallback; +import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -50,9 +51,11 @@ import android.annotation.NonNull; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.net.vcn.VcnManager; import android.os.Handler; import android.os.HandlerExecutor; import android.os.ParcelUuid; +import android.os.PersistableBundle; import android.os.test.TestLooper; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; @@ -104,6 +107,26 @@ public class TelephonySubscriptionTrackerTest { TEST_SUBID_TO_INFO_MAP = Collections.unmodifiableMap(subIdToGroupMap); } + private static final String TEST_CARRIER_CONFIG_KEY_1 = "TEST_CARRIER_CONFIG_KEY_1"; + private static final String TEST_CARRIER_CONFIG_KEY_2 = "TEST_CARRIER_CONFIG_KEY_2"; + private static final PersistableBundle TEST_CARRIER_CONFIG = new PersistableBundle(); + private static final PersistableBundleWrapper TEST_CARRIER_CONFIG_WRAPPER; + private static final Map<Integer, PersistableBundleWrapper> TEST_SUBID_TO_CARRIER_CONFIG_MAP; + + static { + TEST_CARRIER_CONFIG.putString( + VcnManager.VCN_NETWORK_SELECTION_WIFI_ENTRY_RSSI_THRESHOLD_KEY, + VcnManager.VCN_NETWORK_SELECTION_WIFI_ENTRY_RSSI_THRESHOLD_KEY); + TEST_CARRIER_CONFIG.putString( + VcnManager.VCN_NETWORK_SELECTION_WIFI_EXIT_RSSI_THRESHOLD_KEY, + VcnManager.VCN_NETWORK_SELECTION_WIFI_EXIT_RSSI_THRESHOLD_KEY); + TEST_CARRIER_CONFIG_WRAPPER = new PersistableBundleWrapper(TEST_CARRIER_CONFIG); + + final Map<Integer, PersistableBundleWrapper> subIdToCarrierConfigMap = new HashMap<>(); + subIdToCarrierConfigMap.put(TEST_SUBSCRIPTION_ID_1, TEST_CARRIER_CONFIG_WRAPPER); + TEST_SUBID_TO_CARRIER_CONFIG_MAP = Collections.unmodifiableMap(subIdToCarrierConfigMap); + } + @NonNull private final Context mContext; @NonNull private final TestLooper mTestLooper; @NonNull private final Handler mHandler; @@ -144,6 +167,9 @@ public class TelephonySubscriptionTrackerTest { doReturn(mCarrierConfigManager) .when(mContext) .getSystemService(Context.CARRIER_CONFIG_SERVICE); + doReturn(TEST_CARRIER_CONFIG) + .when(mCarrierConfigManager) + .getConfigForSubId(eq(TEST_SUBSCRIPTION_ID_1)); // subId 1, 2 are in same subGrp, only subId 1 is active doReturn(TEST_PARCEL_UUID).when(TEST_SUBINFO_1).getGroupUuid(); @@ -227,14 +253,24 @@ public class TelephonySubscriptionTrackerTest { private TelephonySubscriptionSnapshot buildExpectedSnapshot( Map<Integer, SubscriptionInfo> subIdToInfoMap, Map<ParcelUuid, Set<String>> privilegedPackages) { - return new TelephonySubscriptionSnapshot(0, subIdToInfoMap, privilegedPackages); + return buildExpectedSnapshot(0, subIdToInfoMap, privilegedPackages); } private TelephonySubscriptionSnapshot buildExpectedSnapshot( int activeSubId, Map<Integer, SubscriptionInfo> subIdToInfoMap, Map<ParcelUuid, Set<String>> privilegedPackages) { - return new TelephonySubscriptionSnapshot(activeSubId, subIdToInfoMap, privilegedPackages); + return buildExpectedSnapshot( + activeSubId, subIdToInfoMap, TEST_SUBID_TO_CARRIER_CONFIG_MAP, privilegedPackages); + } + + private TelephonySubscriptionSnapshot buildExpectedSnapshot( + int activeSubId, + Map<Integer, SubscriptionInfo> subIdToInfoMap, + Map<Integer, PersistableBundleWrapper> subIdToCarrierConfigMap, + Map<ParcelUuid, Set<String>> privilegedPackages) { + return new TelephonySubscriptionSnapshot( + activeSubId, subIdToInfoMap, subIdToCarrierConfigMap, privilegedPackages); } private void verifyNoActiveSubscriptions() { @@ -245,6 +281,8 @@ public class TelephonySubscriptionTrackerTest { private void setupReadySubIds() { mTelephonySubscriptionTracker.setReadySubIdsBySlotId( Collections.singletonMap(TEST_SIM_SLOT_INDEX, TEST_SUBSCRIPTION_ID_1)); + mTelephonySubscriptionTracker.setSubIdToCarrierConfigMap( + Collections.singletonMap(TEST_SUBSCRIPTION_ID_1, TEST_CARRIER_CONFIG_WRAPPER)); } private void setPrivilegedPackagesForMock(@NonNull List<String> privilegedPackages) { @@ -300,6 +338,7 @@ public class TelephonySubscriptionTrackerTest { readySubIdsBySlotId.put(TEST_SIM_SLOT_INDEX + 1, TEST_SUBSCRIPTION_ID_1); mTelephonySubscriptionTracker.setReadySubIdsBySlotId(readySubIdsBySlotId); + mTelephonySubscriptionTracker.setSubIdToCarrierConfigMap(TEST_SUBID_TO_CARRIER_CONFIG_MAP); doReturn(1).when(mTelephonyManager).getActiveModemCount(); List<CarrierPrivilegesCallback> carrierPrivilegesCallbacks = @@ -464,8 +503,16 @@ public class TelephonySubscriptionTrackerTest { mTelephonySubscriptionTracker.onReceive(mContext, buildTestBroadcastIntent(false)); mTestLooper.dispatchAll(); - verify(mCallback).onNewSnapshot(eq(buildExpectedSnapshot(emptyMap()))); + verify(mCallback) + .onNewSnapshot( + eq( + buildExpectedSnapshot( + 0, TEST_SUBID_TO_INFO_MAP, emptyMap(), emptyMap()))); assertNull(mTelephonySubscriptionTracker.getReadySubIdsBySlotId().get(TEST_SIM_SLOT_INDEX)); + assertNull( + mTelephonySubscriptionTracker + .getSubIdToCarrierConfigMap() + .get(TEST_SUBSCRIPTION_ID_1)); } @Test @@ -493,7 +540,7 @@ public class TelephonySubscriptionTrackerTest { public void testTelephonySubscriptionSnapshotGetGroupForSubId() throws Exception { final TelephonySubscriptionSnapshot snapshot = new TelephonySubscriptionSnapshot( - TEST_SUBSCRIPTION_ID_1, TEST_SUBID_TO_INFO_MAP, emptyMap()); + TEST_SUBSCRIPTION_ID_1, TEST_SUBID_TO_INFO_MAP, emptyMap(), emptyMap()); assertEquals(TEST_PARCEL_UUID, snapshot.getGroupForSubId(TEST_SUBSCRIPTION_ID_1)); assertEquals(TEST_PARCEL_UUID, snapshot.getGroupForSubId(TEST_SUBSCRIPTION_ID_2)); @@ -503,7 +550,7 @@ public class TelephonySubscriptionTrackerTest { public void testTelephonySubscriptionSnapshotGetAllSubIdsInGroup() throws Exception { final TelephonySubscriptionSnapshot snapshot = new TelephonySubscriptionSnapshot( - TEST_SUBSCRIPTION_ID_1, TEST_SUBID_TO_INFO_MAP, emptyMap()); + TEST_SUBSCRIPTION_ID_1, TEST_SUBID_TO_INFO_MAP, emptyMap(), emptyMap()); assertEquals( new ArraySet<>(Arrays.asList(TEST_SUBSCRIPTION_ID_1, TEST_SUBSCRIPTION_ID_2)), diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java index 3d95a9b32d4a..785bff167ad2 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java @@ -138,6 +138,7 @@ public class VcnGatewayConnectionTestBase { new TelephonySubscriptionSnapshot( TEST_SUB_ID, Collections.singletonMap(TEST_SUB_ID, TEST_SUB_INFO), + Collections.EMPTY_MAP, Collections.EMPTY_MAP); @NonNull protected final Context mContext; diff --git a/tests/vcn/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java b/tests/vcn/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java index 6c849b5af888..b0d68952c39d 100644 --- a/tests/vcn/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java +++ b/tests/vcn/java/com/android/server/vcn/routeselection/NetworkPriorityClassifierTest.java @@ -30,6 +30,7 @@ import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.ch import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.checkMatchesPriorityRule; import static com.android.server.vcn.routeselection.NetworkPriorityClassifier.checkMatchesWifiPriorityRule; import static com.android.server.vcn.routeselection.UnderlyingNetworkControllerTest.getLinkPropertiesWithName; +import static com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -309,7 +310,9 @@ public class NetworkPriorityClassifierTest { wifiNetworkPriority, mWifiNetworkRecord, selectedNetworkRecord, - carrierConfig)); + carrierConfig == null + ? null + : new PersistableBundleWrapper(carrierConfig))); } @Test diff --git a/tests/vcn/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java b/tests/vcn/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java index a44a734a2dce..294f5c1f4842 100644 --- a/tests/vcn/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java +++ b/tests/vcn/java/com/android/server/vcn/util/PersistableBundleUtilsTest.java @@ -18,6 +18,8 @@ package com.android.server.vcn.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import android.os.PersistableBundle; @@ -211,4 +213,84 @@ public class PersistableBundleUtilsTest { assertEquals(testInt, result); } + + private PersistableBundle getTestBundle() { + final PersistableBundle bundle = new PersistableBundle(); + + bundle.putBoolean(TEST_KEY + "Boolean", true); + bundle.putBooleanArray(TEST_KEY + "BooleanArray", new boolean[] {true, false}); + bundle.putDouble(TEST_KEY + "Double", 0.1); + bundle.putDoubleArray(TEST_KEY + "DoubleArray", new double[] {0.1, 0.2, 0.3}); + bundle.putInt(TEST_KEY + "Int", 1); + bundle.putIntArray(TEST_KEY + "IntArray", new int[] {1, 2}); + bundle.putLong(TEST_KEY + "Long", 5L); + bundle.putLongArray(TEST_KEY + "LongArray", new long[] {0L, -1L, -2L}); + bundle.putString(TEST_KEY + "String", "TEST"); + bundle.putStringArray(TEST_KEY + "StringArray", new String[] {"foo", "bar", "bas"}); + bundle.putPersistableBundle( + TEST_KEY + "PersistableBundle", + new TestClass(1, TEST_INT_ARRAY, TEST_STRING_PREFIX, new PersistableBundle()) + .toPersistableBundle()); + + return bundle; + } + + @Test + public void testMinimizeBundle() throws Exception { + final String[] minimizedKeys = + new String[] { + TEST_KEY + "Boolean", + TEST_KEY + "BooleanArray", + TEST_KEY + "Double", + TEST_KEY + "DoubleArray", + TEST_KEY + "Int", + TEST_KEY + "IntArray", + TEST_KEY + "Long", + TEST_KEY + "LongArray", + TEST_KEY + "String", + TEST_KEY + "StringArray", + TEST_KEY + "PersistableBundle" + }; + + final PersistableBundle testBundle = getTestBundle(); + testBundle.putBoolean(TEST_KEY + "Boolean2", true); + + final PersistableBundle minimized = + PersistableBundleUtils.minimizeBundle(testBundle, minimizedKeys); + + // Verify that the minimized bundle is NOT the same in size OR values due to the extra + // Boolean2 key + assertFalse(PersistableBundleUtils.isEqual(testBundle, minimized)); + + // Verify that removing the extra key from the source bundle results in equality. + testBundle.remove(TEST_KEY + "Boolean2"); + assertTrue(PersistableBundleUtils.isEqual(testBundle, minimized)); + } + + @Test + public void testEquality_identical() throws Exception { + final PersistableBundle left = getTestBundle(); + final PersistableBundle right = getTestBundle(); + + assertTrue(PersistableBundleUtils.isEqual(left, right)); + } + + @Test + public void testEquality_different() throws Exception { + final PersistableBundle left = getTestBundle(); + final PersistableBundle right = getTestBundle(); + + left.putBoolean(TEST_KEY + "Boolean2", true); + assertFalse(PersistableBundleUtils.isEqual(left, right)); + + left.remove(TEST_KEY + "Boolean2"); + assertTrue(PersistableBundleUtils.isEqual(left, right)); + } + + @Test + public void testEquality_null() throws Exception { + assertFalse(PersistableBundleUtils.isEqual(getTestBundle(), null)); + assertFalse(PersistableBundleUtils.isEqual(null, getTestBundle())); + assertTrue(PersistableBundleUtils.isEqual(null, null)); + } } |