diff options
746 files changed, 29635 insertions, 8896 deletions
diff --git a/Android.bp b/Android.bp index 71023bf647c8..08efa8ee72ed 100644 --- a/Android.bp +++ b/Android.bp @@ -103,8 +103,9 @@ filegroup { ":android.hardware.security.secureclock-V1-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", + ":android.security.legacykeystore-java-source", ":android.security.maintenance-java-source", - ":android.security.vpnprofilestore-java-source", + ":android.security.metrics-java-source", ":android.system.keystore2-V1-java-source", ":credstore_aidl", ":dumpstate_aidl", diff --git a/apct-tests/perftests/inputmethod/src/android/inputmethod/ImePerfTest.java b/apct-tests/perftests/inputmethod/src/android/inputmethod/ImePerfTest.java index 689fb3645daf..21c4491fc371 100644 --- a/apct-tests/perftests/inputmethod/src/android/inputmethod/ImePerfTest.java +++ b/apct-tests/perftests/inputmethod/src/android/inputmethod/ImePerfTest.java @@ -18,6 +18,7 @@ package android.inputmethod; import static android.perftests.utils.ManualBenchmarkState.StatsReport; import static android.perftests.utils.PerfTestActivity.ID_EDITOR; +import static android.perftests.utils.TestUtils.getOnMainSync; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP; @@ -25,6 +26,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat import static org.junit.Assert.assertTrue; +import android.annotation.UiThread; import android.app.Activity; import android.content.ComponentName; import android.content.Context; @@ -64,6 +66,7 @@ import java.io.InputStreamReader; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; @@ -72,6 +75,7 @@ import java.util.concurrent.atomic.AtomicReference; public class ImePerfTest extends ImePerfTestBase implements ManualBenchmarkState.CustomizedIterationListener { private static final String TAG = ImePerfTest.class.getSimpleName(); + private static final long ANIMATION_NOT_STARTED = -1; @Rule public final PerfManualStatusReporter mPerfStatusReporter = new PerfManualStatusReporter(); @@ -304,12 +308,18 @@ public class ImePerfTest extends ImePerfTestBase latchEnd.set(new CountDownLatch(2)); // For measuring hide, lets show IME first. if (!show) { - activity.runOnUiThread(() -> { - controller.show(WindowInsets.Type.ime()); + AtomicBoolean showCalled = new AtomicBoolean(); + getInstrumentation().runOnMainSync(() -> { + if (!isImeVisible(activity)) { + controller.show(WindowInsets.Type.ime()); + showCalled.set(true); + } }); - PollingCheck.check("IME show animation should finish ", TIMEOUT_1_S_IN_MS, - () -> latchStart.get().getCount() == 1 - && latchEnd.get().getCount() == 1); + if (showCalled.get()) { + PollingCheck.check("IME show animation should finish ", TIMEOUT_1_S_IN_MS, + () -> latchStart.get().getCount() == 1 + && latchEnd.get().getCount() == 1); + } } if (!mIsTraceStarted && !state.isWarmingUp()) { startAsyncAtrace(); @@ -317,23 +327,35 @@ public class ImePerfTest extends ImePerfTestBase } AtomicLong startTime = new AtomicLong(); - activity.runOnUiThread(() -> { + AtomicBoolean unexpectedVisibility = new AtomicBoolean(); + getInstrumentation().runOnMainSync(() -> { + boolean isVisible = isImeVisible(activity); startTime.set(SystemClock.elapsedRealtimeNanos()); - if (show) { + + if (show && !isVisible) { controller.show(WindowInsets.Type.ime()); - } else { + } else if (!show && isVisible) { controller.hide(WindowInsets.Type.ime()); + } else { + // ignore this iteration as unexpected IME visibility was encountered. + unexpectedVisibility.set(true); } }); - measuredTimeNs = waitForAnimationStart(latchStart, startTime); + if (!unexpectedVisibility.get()) { + long timeElapsed = waitForAnimationStart(latchStart, startTime); + if (timeElapsed != ANIMATION_NOT_STARTED) { + measuredTimeNs = timeElapsed; + } + } // hide IME before next iteration. if (show) { activity.runOnUiThread(() -> controller.hide(WindowInsets.Type.ime())); try { latchEnd.get().await(TIMEOUT_1_S_IN_MS * 5, TimeUnit.MILLISECONDS); - if (latchEnd.get().getCount() != 0) { + if (latchEnd.get().getCount() != 0 + && getOnMainSync(() -> isImeVisible(activity))) { Assert.fail("IME hide animation should finish."); } } catch (InterruptedException e) { @@ -350,12 +372,18 @@ public class ImePerfTest extends ImePerfTestBase addResultToState(state); } + @UiThread + private boolean isImeVisible(@NonNull final Activity activity) { + return activity.getWindow().getDecorView().getRootWindowInsets().isVisible( + WindowInsets.Type.ime()); + } + private long waitForAnimationStart( AtomicReference<CountDownLatch> latchStart, AtomicLong startTime) { try { latchStart.get().await(TIMEOUT_1_S_IN_MS * 5, TimeUnit.MILLISECONDS); if (latchStart.get().getCount() != 0) { - Assert.fail("IME animation should start " + latchStart.get().getCount()); + return ANIMATION_NOT_STARTED; } } catch (InterruptedException e) { } diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/TestUtils.java b/apct-tests/perftests/utils/src/android/perftests/utils/TestUtils.java new file mode 100644 index 000000000000..d8d3ee329638 --- /dev/null +++ b/apct-tests/perftests/utils/src/android/perftests/utils/TestUtils.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.perftests.utils; + +import android.app.Instrumentation; + +import androidx.annotation.NonNull; +import androidx.test.InstrumentationRegistry; + +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; + +public final class TestUtils { + + /** + * Retrieves a value that needs to be obtained on the main thread. + * + * <p>A simple utility method that helps to return an object from the UI thread.</p> + * + * @param supplier callback to be called on the UI thread to return a value + * @param <T> Type of the value to be returned + * @return Value returned from {@code supplier} + */ + public static <T> T getOnMainSync(@NonNull Supplier<T> supplier) { + final AtomicReference<T> result = new AtomicReference<>(); + final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); + instrumentation.runOnMainSync(() -> result.set(supplier.get())); + return result.get(); + } +} diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp index 827842633942..977e610d734f 100644 --- a/apex/appsearch/Android.bp +++ b/apex/appsearch/Android.bp @@ -29,6 +29,7 @@ apex { key: "com.android.appsearch.key", certificate: ":com.android.appsearch.certificate", updatable: false, + jni_libs: ["libicing"], generate_hashtree: false, } @@ -50,6 +51,20 @@ bootclasspath_fragment { name: "com.android.appsearch-bootclasspath-fragment", contents: ["framework-appsearch"], apex_available: ["com.android.appsearch"], + + // The bootclasspath_fragments that provide APIs on which this depends. + fragments: [ + { + apex: "com.android.art", + module: "art-bootclasspath-fragment", + }, + ], + + // Additional stubs libraries that this fragment's contents use which are + // not provided by another bootclasspath_fragment. + additional_stubs: [ + "android-non-updatable", + ], } // Encapsulate the contributions made by the com.android.appsearch to the systemserverclasspath. diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp index e5675f688fd7..5ab7ff9f13c0 100644 --- a/apex/appsearch/service/Android.bp +++ b/apex/appsearch/service/Android.bp @@ -53,9 +53,6 @@ java_library { "framework-appsearch.impl", "unsupportedappusage", // TODO(b/181887768) should be removed ], - required: [ - "libicing", - ], defaults: ["framework-system-server-module-defaults"], permitted_packages: [ "com.android.server.appsearch", diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java index d5271a6cb92e..689aa1fcd371 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java @@ -60,6 +60,11 @@ public final class AppSearchConfig implements AutoCloseable { @VisibleForTesting static final int DEFAULT_SAMPLING_INTERVAL = 10; + @VisibleForTesting + static final int DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES = 512 * 1024; // 512KiB + @VisibleForTesting + static final int DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT = 20_000; + /* * Keys for ALL the flags stored in DeviceConfig. */ @@ -70,13 +75,19 @@ public final class AppSearchConfig implements AutoCloseable { "sampling_interval_for_batch_call_stats"; public static final String KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS = "sampling_interval_for_put_document_stats"; + public static final String KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES = + "limit_config_max_document_size_bytes"; + public static final String KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT = + "limit_config_max_document_docunt"; // Array contains all the corresponding keys for the cached values. private static final String[] KEYS_TO_ALL_CACHED_VALUES = { KEY_MIN_TIME_INTERVAL_BETWEEN_SAMPLES_MILLIS, KEY_SAMPLING_INTERVAL_DEFAULT, KEY_SAMPLING_INTERVAL_FOR_BATCH_CALL_STATS, - KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS + KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS, + KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES, + KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT, }; // Lock needed for all the operations in this class. @@ -222,6 +233,24 @@ public final class AppSearchConfig implements AutoCloseable { } } + /** Returns the maximum serialized size an indexed document can be, in bytes. */ + public int getCachedLimitConfigMaxDocumentSizeBytes() { + synchronized (mLock) { + throwIfClosedLocked(); + return mBundleLocked.getInt(KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES, + DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES); + } + } + + /** Returns the maximum number of active docs allowed per package. */ + public int getCachedLimitConfigMaxDocumentCount() { + synchronized (mLock) { + throwIfClosedLocked(); + return mBundleLocked.getInt(KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT, + DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT); + } + } + @GuardedBy("mLock") private void throwIfClosedLocked() { if (mIsClosedLocked) { @@ -264,6 +293,20 @@ public final class AppSearchConfig implements AutoCloseable { mBundleLocked.putInt(key, properties.getInt(key, DEFAULT_SAMPLING_INTERVAL)); } break; + case KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES: + synchronized (mLock) { + mBundleLocked.putInt( + key, + properties.getInt(key, DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES)); + } + break; + case KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT: + synchronized (mLock) { + mBundleLocked.putInt( + key, + properties.getInt(key, DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT)); + } + break; default: break; } diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java index e067d4bcdf72..d0d2e8964cf0 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java @@ -173,8 +173,11 @@ public final class AppSearchUserInstanceManager { File appSearchDir = getAppSearchDir(userHandle); File icingDir = new File(appSearchDir, "icing"); Log.i(TAG, "Creating new AppSearch instance at: " + icingDir); - AppSearchImpl appSearchImpl = - AppSearchImpl.create(icingDir, initStatsBuilder, new FrameworkOptimizeStrategy()); + AppSearchImpl appSearchImpl = AppSearchImpl.create( + icingDir, + new FrameworkLimitConfig(config), + initStatsBuilder, + new FrameworkOptimizeStrategy()); long prepareVisibilityStoreLatencyStartMillis = SystemClock.elapsedRealtime(); VisibilityStoreImpl visibilityStore = diff --git a/apex/appsearch/service/java/com/android/server/appsearch/FrameworkLimitConfig.java b/apex/appsearch/service/java/com/android/server/appsearch/FrameworkLimitConfig.java new file mode 100644 index 000000000000..d16168a915d5 --- /dev/null +++ b/apex/appsearch/service/java/com/android/server/appsearch/FrameworkLimitConfig.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appsearch; + +import android.annotation.NonNull; + +import com.android.server.appsearch.external.localstorage.LimitConfig; + +import java.util.Objects; + +class FrameworkLimitConfig implements LimitConfig { + private final AppSearchConfig mAppSearchConfig; + + FrameworkLimitConfig(@NonNull AppSearchConfig appSearchConfig) { + mAppSearchConfig = Objects.requireNonNull(appSearchConfig); + } + + @Override + public int getMaxDocumentSizeBytes() { + return mAppSearchConfig.getCachedLimitConfigMaxDocumentSizeBytes(); + } + + @Override + public int getMaxDocumentCount() { + return mAppSearchConfig.getCachedLimitConfigMaxDocumentCount(); + } +} diff --git a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java index 9dee179bd6f2..a1b93ce12975 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java @@ -88,6 +88,7 @@ import com.google.android.icing.proto.SearchResultProto; import com.google.android.icing.proto.SearchSpecProto; import com.google.android.icing.proto.SetSchemaResultProto; import com.google.android.icing.proto.StatusProto; +import com.google.android.icing.proto.StorageInfoProto; import com.google.android.icing.proto.StorageInfoResultProto; import com.google.android.icing.proto.TypePropertyMask; import com.google.android.icing.proto.UsageReport; @@ -147,10 +148,9 @@ public final class AppSearchImpl implements Closeable { @VisibleForTesting static final int CHECK_OPTIMIZE_INTERVAL = 100; private final ReadWriteLock mReadWriteLock = new ReentrantReadWriteLock(); - private final LogUtil mLogUtil = new LogUtil(TAG); - private final OptimizeStrategy mOptimizeStrategy; + private final LimitConfig mLimitConfig; @GuardedBy("mReadWriteLock") @VisibleForTesting @@ -169,6 +169,10 @@ public final class AppSearchImpl implements Closeable { @GuardedBy("mReadWriteLock") private final Map<String, Set<String>> mNamespaceMapLocked = new HashMap<>(); + /** Maps package name to active document count. */ + @GuardedBy("mReadWriteLock") + private final Map<String, Integer> mDocumentCountMapLocked = new ArrayMap<>(); + /** * The counter to check when to call {@link #checkForOptimize}. The interval is {@link * #CHECK_OPTIMIZE_INTERVAL}. @@ -196,19 +200,22 @@ public final class AppSearchImpl implements Closeable { @NonNull public static AppSearchImpl create( @NonNull File icingDir, + @NonNull LimitConfig limitConfig, @Nullable InitializeStats.Builder initStatsBuilder, @NonNull OptimizeStrategy optimizeStrategy) throws AppSearchException { - return new AppSearchImpl(icingDir, initStatsBuilder, optimizeStrategy); + return new AppSearchImpl(icingDir, limitConfig, initStatsBuilder, optimizeStrategy); } /** @param initStatsBuilder collects stats for initialization if provided. */ private AppSearchImpl( @NonNull File icingDir, + @NonNull LimitConfig limitConfig, @Nullable InitializeStats.Builder initStatsBuilder, @NonNull OptimizeStrategy optimizeStrategy) throws AppSearchException { Objects.requireNonNull(icingDir); + mLimitConfig = Objects.requireNonNull(limitConfig); mOptimizeStrategy = Objects.requireNonNull(optimizeStrategy); mReadWriteLock.writeLock().lock(); @@ -244,9 +251,9 @@ public final class AppSearchImpl implements Closeable { AppSearchLoggerHelper.copyNativeStats( initializeResultProto.getInitializeStats(), initStatsBuilder); } - checkSuccess(initializeResultProto.getStatus()); + // Read all protos we need to construct AppSearchImpl's cache maps long prepareSchemaAndNamespacesLatencyStartMillis = SystemClock.elapsedRealtime(); SchemaProto schemaProto = getSchemaProtoLocked(); @@ -258,6 +265,9 @@ public final class AppSearchImpl implements Closeable { getAllNamespacesResultProto.getNamespacesCount(), getAllNamespacesResultProto); + StorageInfoProto storageInfoProto = getRawStorageInfoProto(); + + // Log the time it took to read the data that goes into the cache maps if (initStatsBuilder != null) { initStatsBuilder .setStatusCode( @@ -268,20 +278,27 @@ public final class AppSearchImpl implements Closeable { (SystemClock.elapsedRealtime() - prepareSchemaAndNamespacesLatencyStartMillis)); } - checkSuccess(getAllNamespacesResultProto.getStatus()); // Populate schema map - for (SchemaTypeConfigProto schema : schemaProto.getTypesList()) { + List<SchemaTypeConfigProto> schemaProtoTypesList = schemaProto.getTypesList(); + for (int i = 0; i < schemaProtoTypesList.size(); i++) { + SchemaTypeConfigProto schema = schemaProtoTypesList.get(i); String prefixedSchemaType = schema.getSchemaType(); addToMap(mSchemaMapLocked, getPrefix(prefixedSchemaType), schema); } // Populate namespace map - for (String prefixedNamespace : getAllNamespacesResultProto.getNamespacesList()) { + List<String> prefixedNamespaceList = + getAllNamespacesResultProto.getNamespacesList(); + for (int i = 0; i < prefixedNamespaceList.size(); i++) { + String prefixedNamespace = prefixedNamespaceList.get(i); addToMap(mNamespaceMapLocked, getPrefix(prefixedNamespace), prefixedNamespace); } + // Populate document count map + rebuildDocumentCountMapLocked(storageInfoProto); + // logging prepare_schema_and_namespaces latency if (initStatsBuilder != null) { initStatsBuilder.setPrepareSchemaAndNamespacesLatencyMillis( @@ -596,10 +613,19 @@ public final class AppSearchImpl implements Closeable { long rewriteDocumentTypeEndTimeMillis = SystemClock.elapsedRealtime(); DocumentProto finalDocument = documentBuilder.build(); + // Check limits + int newDocumentCount = + enforceLimitConfigLocked( + packageName, finalDocument.getUri(), finalDocument.getSerializedSize()); + + // Insert document mLogUtil.piiTrace("putDocument, request", finalDocument.getUri(), finalDocument); - PutResultProto putResultProto = mIcingSearchEngineLocked.put(documentBuilder.build()); + PutResultProto putResultProto = mIcingSearchEngineLocked.put(finalDocument); mLogUtil.piiTrace("putDocument, response", putResultProto.getStatus(), putResultProto); - addToMap(mNamespaceMapLocked, prefix, documentBuilder.getNamespace()); + + // Update caches + addToMap(mNamespaceMapLocked, prefix, finalDocument.getNamespace()); + mDocumentCountMapLocked.put(packageName, newDocumentCount); // Logging stats if (pStatsBuilder != null) { @@ -631,6 +657,71 @@ public final class AppSearchImpl implements Closeable { } /** + * Checks that a new document can be added to the given packageName with the given serialized + * size without violating our {@link LimitConfig}. + * + * @return the new count of documents for the given package, including the new document. + * @throws AppSearchException with a code of {@link AppSearchResult#RESULT_OUT_OF_SPACE} if the + * limits are violated by the new document. + */ + @GuardedBy("mReadWriteLock") + private int enforceLimitConfigLocked(String packageName, String newDocUri, int newDocSize) + throws AppSearchException { + // Limits check: size of document + if (newDocSize > mLimitConfig.getMaxDocumentSizeBytes()) { + throw new AppSearchException( + AppSearchResult.RESULT_OUT_OF_SPACE, + "Document \"" + + newDocUri + + "\" for package \"" + + packageName + + "\" serialized to " + + newDocSize + + " bytes, which exceeds " + + "limit of " + + mLimitConfig.getMaxDocumentSizeBytes() + + " bytes"); + } + + // Limits check: number of documents + Integer oldDocumentCount = mDocumentCountMapLocked.get(packageName); + int newDocumentCount; + if (oldDocumentCount == null) { + newDocumentCount = 1; + } else { + newDocumentCount = oldDocumentCount + 1; + } + if (newDocumentCount > mLimitConfig.getMaxDocumentCount()) { + // Our management of mDocumentCountMapLocked doesn't account for document + // replacements, so our counter might have overcounted if the app has replaced docs. + // Rebuild the counter from StorageInfo in case this is so. + // TODO(b/170371356): If Icing lib exposes something in the result which says + // whether the document was a replacement, we could subtract 1 again after the put + // to keep the count accurate. That would allow us to remove this code. + rebuildDocumentCountMapLocked(getRawStorageInfoProto()); + oldDocumentCount = mDocumentCountMapLocked.get(packageName); + if (oldDocumentCount == null) { + newDocumentCount = 1; + } else { + newDocumentCount = oldDocumentCount + 1; + } + } + if (newDocumentCount > mLimitConfig.getMaxDocumentCount()) { + // Now we really can't fit it in, even accounting for replacements. + throw new AppSearchException( + AppSearchResult.RESULT_OUT_OF_SPACE, + "Package \"" + + packageName + + "\" exceeded limit of " + + mLimitConfig.getMaxDocumentCount() + + " documents. Some documents " + + "must be removed to index additional ones."); + } + + return newDocumentCount; + } + + /** * Retrieves a document from the AppSearch index by namespace and document ID. * * <p>This method belongs to query group. @@ -1121,6 +1212,9 @@ public final class AppSearchImpl implements Closeable { deleteResultProto.getDeleteStats(), removeStatsBuilder); } checkSuccess(deleteResultProto.getStatus()); + + // Update derived maps + updateDocumentCountAfterRemovalLocked(packageName, /*numDocumentsDeleted=*/ 1); } finally { mReadWriteLock.writeLock().unlock(); if (removeStatsBuilder != null) { @@ -1196,6 +1290,11 @@ public final class AppSearchImpl implements Closeable { // not in the DB because it was not there or was successfully deleted. checkCodeOneOf( deleteResultProto.getStatus(), StatusProto.Code.OK, StatusProto.Code.NOT_FOUND); + + // Update derived maps + int numDocumentsDeleted = + deleteResultProto.getDeleteStats().getNumDocumentsDeleted(); + updateDocumentCountAfterRemovalLocked(packageName, numDocumentsDeleted); } finally { mReadWriteLock.writeLock().unlock(); if (removeStatsBuilder != null) { @@ -1205,6 +1304,22 @@ public final class AppSearchImpl implements Closeable { } } + @GuardedBy("mReadWriteLock") + private void updateDocumentCountAfterRemovalLocked( + @NonNull String packageName, int numDocumentsDeleted) { + if (numDocumentsDeleted > 0) { + Integer oldDocumentCount = mDocumentCountMapLocked.get(packageName); + // This should always be true: how can we delete documents for a package without + // having seen that package during init? This is just a safeguard. + if (oldDocumentCount != null) { + // This should always be >0; how can we remove more documents than we've indexed? + // This is just a safeguard. + int newDocumentCount = Math.max(oldDocumentCount - numDocumentsDeleted, 0); + mDocumentCountMapLocked.put(packageName, newDocumentCount); + } + } + } + /** Estimates the storage usage info for a specific package. */ @NonNull public StorageInfo getStorageInfoForPackage(@NonNull String packageName) @@ -1233,7 +1348,7 @@ public final class AppSearchImpl implements Closeable { return new StorageInfo.Builder().build(); } - return getStorageInfoForNamespacesLocked(wantedPrefixedNamespaces); + return getStorageInfoForNamespaces(getRawStorageInfoProto(), wantedPrefixedNamespaces); } finally { mReadWriteLock.readLock().unlock(); } @@ -1264,29 +1379,45 @@ public final class AppSearchImpl implements Closeable { return new StorageInfo.Builder().build(); } - return getStorageInfoForNamespacesLocked(wantedPrefixedNamespaces); + return getStorageInfoForNamespaces(getRawStorageInfoProto(), wantedPrefixedNamespaces); } finally { mReadWriteLock.readLock().unlock(); } } - @GuardedBy("mReadWriteLock") + /** + * Returns the native storage info capsuled in {@link StorageInfoResultProto} directly from + * IcingSearchEngine. + */ @NonNull - private StorageInfo getStorageInfoForNamespacesLocked(@NonNull Set<String> prefixedNamespaces) - throws AppSearchException { - mLogUtil.piiTrace("getStorageInfo, request"); - StorageInfoResultProto storageInfoResult = mIcingSearchEngineLocked.getStorageInfo(); - mLogUtil.piiTrace( - "getStorageInfo, response", storageInfoResult.getStatus(), storageInfoResult); - checkSuccess(storageInfoResult.getStatus()); - if (!storageInfoResult.hasStorageInfo() - || !storageInfoResult.getStorageInfo().hasDocumentStorageInfo()) { + public StorageInfoProto getRawStorageInfoProto() throws AppSearchException { + mReadWriteLock.readLock().lock(); + try { + throwIfClosedLocked(); + mLogUtil.piiTrace("getStorageInfo, request"); + StorageInfoResultProto storageInfoResult = mIcingSearchEngineLocked.getStorageInfo(); + mLogUtil.piiTrace( + "getStorageInfo, response", storageInfoResult.getStatus(), storageInfoResult); + checkSuccess(storageInfoResult.getStatus()); + return storageInfoResult.getStorageInfo(); + } finally { + mReadWriteLock.readLock().unlock(); + } + } + + /** + * Extracts and returns {@link StorageInfo} from {@link StorageInfoProto} based on prefixed + * namespaces. + */ + @NonNull + private static StorageInfo getStorageInfoForNamespaces( + @NonNull StorageInfoProto storageInfoProto, @NonNull Set<String> prefixedNamespaces) { + if (!storageInfoProto.hasDocumentStorageInfo()) { return new StorageInfo.Builder().build(); } - long totalStorageSize = storageInfoResult.getStorageInfo().getTotalStorageSize(); - DocumentStorageInfoProto documentStorageInfo = - storageInfoResult.getStorageInfo().getDocumentStorageInfo(); + long totalStorageSize = storageInfoProto.getTotalStorageSize(); + DocumentStorageInfoProto documentStorageInfo = storageInfoProto.getDocumentStorageInfo(); int totalDocuments = documentStorageInfo.getNumAliveDocuments() + documentStorageInfo.getNumExpiredDocuments(); @@ -1436,6 +1567,7 @@ public final class AppSearchImpl implements Closeable { String packageName = entry.getKey(); Set<String> databaseNames = entry.getValue(); if (!installedPackages.contains(packageName) && databaseNames != null) { + mDocumentCountMapLocked.remove(packageName); for (String databaseName : databaseNames) { String removedPrefix = createPrefix(packageName, databaseName); mSchemaMapLocked.remove(removedPrefix); @@ -1468,6 +1600,7 @@ public final class AppSearchImpl implements Closeable { mOptimizeIntervalCountLocked = 0; mSchemaMapLocked.clear(); mNamespaceMapLocked.clear(); + mDocumentCountMapLocked.clear(); if (initStatsBuilder != null) { initStatsBuilder .setHasReset(true) @@ -1477,6 +1610,26 @@ public final class AppSearchImpl implements Closeable { checkSuccess(resetResultProto.getStatus()); } + @GuardedBy("mReadWriteLock") + private void rebuildDocumentCountMapLocked(@NonNull StorageInfoProto storageInfoProto) { + mDocumentCountMapLocked.clear(); + List<NamespaceStorageInfoProto> namespaceStorageInfoProtoList = + storageInfoProto.getDocumentStorageInfo().getNamespaceStorageInfoList(); + for (int i = 0; i < namespaceStorageInfoProtoList.size(); i++) { + NamespaceStorageInfoProto namespaceStorageInfoProto = + namespaceStorageInfoProtoList.get(i); + String packageName = getPackageName(namespaceStorageInfoProto.getNamespace()); + Integer oldCount = mDocumentCountMapLocked.get(packageName); + int newCount; + if (oldCount == null) { + newCount = namespaceStorageInfoProto.getNumAliveDocuments(); + } else { + newCount = oldCount + namespaceStorageInfoProto.getNumAliveDocuments(); + } + mDocumentCountMapLocked.put(packageName, newCount); + } + } + /** Wrapper around schema changes */ @VisibleForTesting static class RewrittenSchemaResults { diff --git a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/LimitConfig.java b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/LimitConfig.java new file mode 100644 index 000000000000..3f5723ee53e0 --- /dev/null +++ b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/LimitConfig.java @@ -0,0 +1,57 @@ +/* + * Copyright 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appsearch.external.localstorage; + + +/** + * Defines limits placed on users of AppSearch and enforced by {@link AppSearchImpl}. + * + * @hide + */ +public interface LimitConfig { + /** + * The maximum number of bytes a single document is allowed to be. + * + * <p>Enforced at the time of serializing the document into a proto. + * + * <p>This limit has two purposes: + * + * <ol> + * <li>Prevent the system service from using too much memory during indexing or querying by + * capping the size of the data structures it needs to buffer + * <li>Prevent apps from using a very large amount of data by storing exceptionally large + * documents. + * </ol> + */ + int getMaxDocumentSizeBytes(); + + /** + * The maximum number of documents a single app is allowed to index. + * + * <p>Enforced at indexing time. + * + * <p>This limit has two purposes: + * + * <ol> + * <li>Protect icing lib's docid space from being overwhelmed by a single app. The overall + * docid limit is currently 2^20 (~1 million) + * <li>Prevent apps from using a very large amount of data on the system by storing too many + * documents. + * </ol> + */ + int getMaxDocumentCount(); +} diff --git a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/UnlimitedLimitConfig.java b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/UnlimitedLimitConfig.java new file mode 100644 index 000000000000..0fabab04048b --- /dev/null +++ b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/UnlimitedLimitConfig.java @@ -0,0 +1,37 @@ +/* + * Copyright 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appsearch.external.localstorage; + + +/** + * In Jetpack, AppSearch doesn't enforce artificial limits on number of documents or size of + * documents, since the app is the only user of the Icing instance. Icing still enforces a docid + * limit of 1M docs. + * + * @hide + */ +public class UnlimitedLimitConfig implements LimitConfig { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return Integer.MAX_VALUE; + } +} diff --git a/apex/jobscheduler/framework/java/android/app/AlarmManager.java b/apex/jobscheduler/framework/java/android/app/AlarmManager.java index 4843415fdbdd..9c0c3657bff3 100644 --- a/apex/jobscheduler/framework/java/android/app/AlarmManager.java +++ b/apex/jobscheduler/framework/java/android/app/AlarmManager.java @@ -494,6 +494,9 @@ public class AlarmManager { * exact alarms, rescheduling each time as described above. Legacy applications * whose {@code targetSdkVersion} is earlier than API 19 will continue to have all * of their alarms, including repeating alarms, treated as exact. + * <p>Apps targeting {@link Build.VERSION_CODES#S} will need to set the flag + * {@link PendingIntent#FLAG_MUTABLE} on the {@link PendingIntent} being used to set this alarm, + * if they want the alarm count to be supplied with the key {@link Intent#EXTRA_ALARM_COUNT}. * * @param type type of alarm. * @param triggerAtMillis time in milliseconds that the alarm should first @@ -516,6 +519,7 @@ public class AlarmManager { * @see #ELAPSED_REALTIME_WAKEUP * @see #RTC * @see #RTC_WAKEUP + * @see Intent#EXTRA_ALARM_COUNT */ public void setRepeating(@AlarmType int type, long triggerAtMillis, long intervalMillis, PendingIntent operation) { @@ -1004,6 +1008,9 @@ public class AlarmManager { * been available since API 3, your application can safely call it and be * assured that it will get similar behavior on both current and older versions * of Android. + * <p>Apps targeting {@link Build.VERSION_CODES#S} will need to set the flag + * {@link PendingIntent#FLAG_MUTABLE} on the {@link PendingIntent} being used to set this alarm, + * if they want the alarm count to be supplied with the key {@link Intent#EXTRA_ALARM_COUNT}. * * @param type type of alarm. * @param triggerAtMillis time in milliseconds that the alarm should first @@ -1038,6 +1045,7 @@ public class AlarmManager { * @see #INTERVAL_HOUR * @see #INTERVAL_HALF_DAY * @see #INTERVAL_DAY + * @see Intent#EXTRA_ALARM_COUNT */ public void setInexactRepeating(@AlarmType int type, long triggerAtMillis, long intervalMillis, PendingIntent operation) { @@ -1286,22 +1294,31 @@ public class AlarmManager { /** * Called to check if the caller can schedule exact alarms. + * Your app schedules exact alarms when it calls any of the {@code setExact...} or + * {@link #setAlarmClock(AlarmClockInfo, PendingIntent) setAlarmClock} API methods. * <p> - * Apps targeting {@link Build.VERSION_CODES#S} or higher can schedule exact alarms if they - * have the {@link Manifest.permission#SCHEDULE_EXACT_ALARM} permission. These apps can also + * Apps targeting {@link Build.VERSION_CODES#S} or higher can schedule exact alarms only if they + * have the {@link Manifest.permission#SCHEDULE_EXACT_ALARM} permission or they are on the + * device's power-save exemption list. + * These apps can also * start {@link android.provider.Settings#ACTION_REQUEST_SCHEDULE_EXACT_ALARM} to - * request this from the user. + * request this permission from the user. * <p> * Apps targeting lower sdk versions, can always schedule exact alarms. * - * @return {@code true} if the caller can schedule exact alarms. + * @return {@code true} if the caller can schedule exact alarms, {@code false} otherwise. * @see android.provider.Settings#ACTION_REQUEST_SCHEDULE_EXACT_ALARM * @see #setExact(int, long, PendingIntent) * @see #setExactAndAllowWhileIdle(int, long, PendingIntent) * @see #setAlarmClock(AlarmClockInfo, PendingIntent) + * @see android.os.PowerManager#isIgnoringBatteryOptimizations(String) */ public boolean canScheduleExactAlarms() { - return hasScheduleExactAlarm(mContext.getOpPackageName(), mContext.getUserId()); + try { + return mService.canScheduleExactAlarms(mContext.getOpPackageName()); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } } /** diff --git a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl index cd7c1e8ab4fd..9d11ca470397 100644 --- a/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl +++ b/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl @@ -41,6 +41,7 @@ interface IAlarmManager { @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) AlarmManager.AlarmClockInfo getNextAlarmClock(int userId); long currentNetworkTimeMillis(); + boolean canScheduleExactAlarms(String packageName); boolean hasScheduleExactAlarm(String packageName, int userId); int getConfigVersion(); } diff --git a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java index 42e953b72a69..a1a46afcffe6 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java @@ -190,6 +190,8 @@ public class PowerExemptionManager { * @hide */ public static final int REASON_TEMP_ALLOWED_WHILE_IN_USE = 70; + /** @hide */ + public static final int REASON_CURRENT_INPUT_METHOD = 71; /* BG-FGS-launch is allowed by temp-allow-list or system-allow-list. Reason code for temp and system allow list starts here. @@ -381,6 +383,7 @@ public class PowerExemptionManager { REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD, REASON_OP_ACTIVATE_VPN, REASON_OP_ACTIVATE_PLATFORM_VPN, + REASON_CURRENT_INPUT_METHOD, REASON_TEMP_ALLOWED_WHILE_IN_USE, // temp and system allow list reasons. REASON_GEOFENCING, @@ -649,6 +652,8 @@ public class PowerExemptionManager { return "OP_ACTIVATE_VPN"; case REASON_OP_ACTIVATE_PLATFORM_VPN: return "OP_ACTIVATE_PLATFORM_VPN"; + case REASON_CURRENT_INPUT_METHOD: + return "CURRENT_INPUT_METHOD"; case REASON_TEMP_ALLOWED_WHILE_IN_USE: return "TEMP_ALLOWED_WHILE_IN_USE"; case REASON_GEOFENCING: diff --git a/apex/jobscheduler/framework/java/com/android/server/AppStateTracker.java b/apex/jobscheduler/framework/java/com/android/server/AppStateTracker.java index 3c89016ec605..b0b9abccd229 100644 --- a/apex/jobscheduler/framework/java/com/android/server/AppStateTracker.java +++ b/apex/jobscheduler/framework/java/com/android/server/AppStateTracker.java @@ -25,29 +25,19 @@ public interface AppStateTracker { String TAG = "AppStateTracker"; /** - * Register a {@link ForcedAppStandbyListener} to listen for forced-app-standby changes that - * should affect services etc. + * Register a {@link ServiceStateListener} to listen for forced-app-standby changes that should + * affect services. */ - void addForcedAppStandbyListener(@NonNull ForcedAppStandbyListener listener); + void addServiceStateListener(@NonNull ServiceStateListener listener); /** - * @return {code true} if the given UID/package has been in forced app standby mode. + * A listener to listen to forced-app-standby changes that should affect services. */ - boolean isAppInForcedAppStandby(int uid, @NonNull String packageName); - - /** - * A listener to listen to forced-app-standby changes that should affect services etc. - */ - interface ForcedAppStandbyListener { - /** - * Called when an app goes in/out of forced app standby. - */ - void updateForceAppStandbyForUidPackage(int uid, String packageName, boolean standby); - + interface ServiceStateListener { /** - * Called when all apps' forced-app-standby states need to be re-evaluated, due to - * enable/disable certain feature flags. + * Called when an app goes into forced app standby and its foreground + * services need to be removed from that state. */ - void updateForcedAppStandbyForAllApps(); + void stopForegroundServicesForUidPackage(int uid, String packageName); } } diff --git a/apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java b/apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java index 1deb3656dabe..c332a598c30b 100644 --- a/apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java +++ b/apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java @@ -60,10 +60,8 @@ import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.io.PrintWriter; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.Set; /** * Class to keep track of the information related to "force app standby", which includes: @@ -162,46 +160,16 @@ public class AppStateTrackerImpl implements AppStateTracker { @GuardedBy("mLock") boolean mForcedAppStandbyEnabled; - /** - * A lock-free set of (uid, packageName) pairs in forced app standby mode. - * - * <p> - * It's bascially shadowing the {@link #mRunAnyRestrictedPackages} together with - * the {@link #mForcedAppStandbyEnabled} and the {@link #mForceAllAppsStandby} - mutations on - * them would result in copy-on-write. - * - * Note: when {@link #mForcedAppStandbyEnabled} is {@code false}, it'll be set to an empty set. - * when {@link #mForceAllAppsStandby} is {@code true}, it'll be set to null; - * </p> - */ - volatile Set<Pair<Integer, String>> mForcedAppStandbyUidPackages = Collections.emptySet(); - @Override - public void addForcedAppStandbyListener(@NonNull ForcedAppStandbyListener listener) { + public void addServiceStateListener(@NonNull ServiceStateListener listener) { addListener(new Listener() { @Override - public void updateForceAppStandbyForUidPackage(int uid, String packageName, - boolean standby) { - listener.updateForceAppStandbyForUidPackage(uid, packageName, standby); - } - - @Override - public void updateForcedAppStandbyForAllApps() { - listener.updateForcedAppStandbyForAllApps(); + public void stopForegroundServicesForUidPackage(int uid, String packageName) { + listener.stopForegroundServicesForUidPackage(uid, packageName); } }); } - @Override - public boolean isAppInForcedAppStandby(int uid, @NonNull String packageName) { - final Set<Pair<Integer, String>> fasUidPkgs = mForcedAppStandbyUidPackages; - if (fasUidPkgs == null) { - // Meaning the mForceAllAppsStandby is true. - return true; - } - return fasUidPkgs.contains(Pair.create(uid, packageName)); - } - interface Stats { int UID_FG_STATE_CHANGED = 0; int UID_ACTIVE_STATE_CHANGED = 1; @@ -265,7 +233,6 @@ public class AppStateTrackerImpl implements AppStateTracker { return; } mForcedAppStandbyEnabled = enabled; - updateForcedAppStandbyUidPackagesLocked(); if (DEBUG) { Slog.d(TAG, "Forced app standby feature flag changed: " + mForcedAppStandbyEnabled); @@ -310,11 +277,7 @@ public class AppStateTrackerImpl implements AppStateTracker { if (!sender.isRunAnyInBackgroundAppOpsAllowed(uid, packageName)) { Slog.v(TAG, "Package " + packageName + "/" + uid + " toggled into fg service restriction"); - updateForceAppStandbyForUidPackage(uid, packageName, true); - } else { - Slog.v(TAG, "Package " + packageName + "/" + uid - + " toggled out of fg service restriction"); - updateForceAppStandbyForUidPackage(uid, packageName, false); + stopForegroundServicesForUidPackage(uid, packageName); } } @@ -379,7 +342,6 @@ public class AppStateTrackerImpl implements AppStateTracker { private void onForceAllAppsStandbyChanged(AppStateTrackerImpl sender) { updateAllJobs(); updateAllAlarms(); - updateForcedAppStandbyForAllApps(); } /** @@ -404,17 +366,10 @@ public class AppStateTrackerImpl implements AppStateTracker { } /** - * Called when an app goes in/out of forced app standby. + * Called when an app goes into forced app standby and its foreground + * services need to be removed from that state. */ - public void updateForceAppStandbyForUidPackage(int uid, String packageName, - boolean standby) { - } - - /** - * Called when all apps' forced-app-standby states need to be re-evaluated due to changes of - * feature flags such as {@link #mForcedAppStandbyEnabled} or {@link #mForceAllAppsStandby}. - */ - public void updateForcedAppStandbyForAllApps() { + public void stopForegroundServicesForUidPackage(int uid, String packageName) { } /** @@ -483,12 +438,9 @@ public class AppStateTrackerImpl implements AppStateTracker { final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); // No need to notify for state change as all the alarms and jobs should be // removed too. - synchronized (mLock) { - mExemptedBucketPackages.remove(userId, pkgName); - mRunAnyRestrictedPackages.remove(Pair.create(uid, pkgName)); - updateForcedAppStandbyUidPackagesLocked(); - mActiveUids.delete(uid); - } + mExemptedBucketPackages.remove(userId, pkgName); + mRunAnyRestrictedPackages.remove(Pair.create(uid, pkgName)); + mActiveUids.delete(uid); } break; } @@ -628,29 +580,6 @@ public class AppStateTrackerImpl implements AppStateTracker { } } } - updateForcedAppStandbyUidPackagesLocked(); - } - - /** - * Update the {@link #mForcedAppStandbyUidPackages} upon mutations on - * {@link #mRunAnyRestrictedPackages}, {@link #mForcedAppStandbyEnabled} or - * {@link #mForceAllAppsStandby}. - */ - @GuardedBy("mLock") - private void updateForcedAppStandbyUidPackagesLocked() { - if (!mForcedAppStandbyEnabled) { - mForcedAppStandbyUidPackages = Collections.emptySet(); - return; - } - if (mForceAllAppsStandby) { - mForcedAppStandbyUidPackages = null; - return; - } - Set<Pair<Integer, String>> fasUidPkgs = new ArraySet<>(); - for (int i = 0, size = mRunAnyRestrictedPackages.size(); i < size; i++) { - fasUidPkgs.add(mRunAnyRestrictedPackages.valueAt(i)); - } - mForcedAppStandbyUidPackages = Collections.unmodifiableSet(fasUidPkgs); } private void updateForceAllAppStandbyState() { @@ -672,7 +601,6 @@ public class AppStateTrackerImpl implements AppStateTracker { return; } mForceAllAppsStandby = enable; - updateForcedAppStandbyUidPackagesLocked(); mHandler.notifyForceAllAppsStandbyChanged(); } @@ -717,7 +645,6 @@ public class AppStateTrackerImpl implements AppStateTracker { } else { mRunAnyRestrictedPackages.removeAt(index); } - updateForcedAppStandbyUidPackagesLocked(); return true; } @@ -969,7 +896,6 @@ public class AppStateTrackerImpl implements AppStateTracker { if (unblockAlarms) { l.unblockAllUnrestrictedAlarms(); } - l.updateForcedAppStandbyForAllApps(); } mStatLogger.logDurationStat( Stats.FORCE_APP_STANDBY_FEATURE_FLAG_CHANGED, start); @@ -1040,7 +966,6 @@ public class AppStateTrackerImpl implements AppStateTracker { mRunAnyRestrictedPackages.removeAt(i); } } - updateForcedAppStandbyUidPackagesLocked(); cleanUpArrayForUser(mActiveUids, removedUserId); mExemptedBucketPackages.remove(removedUserId); } diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index 70e548d4c547..ed80ddbd2cd7 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -1740,7 +1740,7 @@ public class AlarmManagerService extends SystemService { if (!isExactAlarmChangeEnabled(a.packageName, UserHandle.getUserId(a.uid))) { return false; } - return a.alarmClock != null || !isExemptFromExactAlarmPermission(a.uid); + return !isExemptFromExactAlarmPermission(a.uid); }; removeAlarmsInternalLocked(whichAlarms, REMOVE_REASON_EXACT_PERMISSION_REVOKED); } @@ -2414,6 +2414,7 @@ public class AlarmManagerService extends SystemService { /** * Returns true if the given uid does not require SCHEDULE_EXACT_ALARM to set exact, * allow-while-idle alarms. + * Note: It is ok to call this method without the lock {@link #mLock} held. */ boolean isExemptFromExactAlarmPermission(int uid) { return (UserHandle.isSameApp(mSystemUiUid, uid) @@ -2515,7 +2516,7 @@ public class AlarmManagerService extends SystemService { idleOptions = allowWhileIdle ? mOptsWithFgs.toBundle() : null; } if (needsPermission && !hasScheduleExactAlarmInternal(callingPackage, callingUid)) { - if (alarmClock != null || !isExemptFromExactAlarmPermission(callingUid)) { + if (!isExemptFromExactAlarmPermission(callingUid)) { final String errorMessage = "Caller " + callingPackage + " needs to hold " + Manifest.permission.SCHEDULE_EXACT_ALARM + " to set " + "exact alarms."; @@ -2527,10 +2528,16 @@ public class AlarmManagerService extends SystemService { } else { allowListed = true; } - // If the app is on the full system power allow-list (not except-idle), or we're - // in a soft failure mode, we still allow the alarms. - // We give temporary allowlist to allow-while-idle alarms but without FGS - // capability. Note that apps that are in the power allow-list do not need it. + // If the app is on the full system power allow-list (not except-idle), or the + // user-elected allow-list, or we're in a soft failure mode, we still allow the + // alarms. + // In both cases, ALLOW_WHILE_IDLE alarms get a lower quota equivalent to what + // pre-S apps got. Note that user-allow-listed apps don't use the flag + // ALLOW_WHILE_IDLE. + // We grant temporary allow-list to allow-while-idle alarms but without FGS + // capability. AlarmClock alarms do not get the temporary allow-list. This is + // consistent with pre-S behavior. Note that apps that are in either of the + // power-save allow-lists do not need it. idleOptions = allowWhileIdle ? mOptsWithoutFgs.toBundle() : null; lowerQuota = allowWhileIdle; } @@ -2561,6 +2568,22 @@ public class AlarmManagerService extends SystemService { } @Override + public boolean canScheduleExactAlarms(String packageName) { + final int callingUid = mInjector.getCallingUid(); + final int userId = UserHandle.getUserId(callingUid); + final int packageUid = mPackageManagerInternal.getPackageUid(packageName, 0, userId); + if (callingUid != packageUid) { + throw new SecurityException("Uid " + callingUid + + " cannot query canScheduleExactAlarms for package " + packageName); + } + if (!isExactAlarmChangeEnabled(packageName, userId)) { + return true; + } + return isExemptFromExactAlarmPermission(packageUid) + || hasScheduleExactAlarmInternal(packageName, packageUid); + } + + @Override public boolean hasScheduleExactAlarm(String packageName, int userId) { final int callingUid = mInjector.getCallingUid(); if (UserHandle.getUserId(callingUid) != userId) { @@ -2572,9 +2595,6 @@ public class AlarmManagerService extends SystemService { throw new SecurityException("Uid " + callingUid + " cannot query hasScheduleExactAlarm for uid " + uid); } - if (!isExactAlarmChangeEnabled(packageName, userId)) { - return true; - } return (uid > 0) ? hasScheduleExactAlarmInternal(packageName, uid) : false; } @@ -3577,17 +3597,14 @@ public class AlarmManagerService extends SystemService { * This is not expected to get called frequently. */ void removeExactAlarmsOnPermissionRevokedLocked(int uid, String packageName) { - Slog.w(TAG, "Package " + packageName + ", uid " + uid + " lost SCHEDULE_EXACT_ALARM!"); - if (!isExactAlarmChangeEnabled(packageName, UserHandle.getUserId(uid))) { + if (isExemptFromExactAlarmPermission(uid) + || !isExactAlarmChangeEnabled(packageName, UserHandle.getUserId(uid))) { return; } + Slog.w(TAG, "Package " + packageName + ", uid " + uid + " lost SCHEDULE_EXACT_ALARM!"); - final Predicate<Alarm> whichAlarms = a -> { - if (a.uid == uid && a.packageName.equals(packageName) && a.windowLength == 0) { - return a.alarmClock != null || !isExemptFromExactAlarmPermission(uid); - } - return false; - }; + final Predicate<Alarm> whichAlarms = a -> (a.uid == uid && a.packageName.equals(packageName) + && a.windowLength == 0); removeAlarmsInternalLocked(whichAlarms, REMOVE_REASON_EXACT_PERMISSION_REVOKED); if (mConstants.KILL_ON_SCHEDULE_EXACT_ALARM_REVOKED) { diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/idle/CarIdlenessTracker.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/idle/CarIdlenessTracker.java index 1e5b84d55a02..9ada8dc3ef32 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/idle/CarIdlenessTracker.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/idle/CarIdlenessTracker.java @@ -30,6 +30,12 @@ import com.android.server.job.StateControllerProto; import java.io.PrintWriter; +/** + * CarIdlenessTracker determines that a car is in idle state when 1) garage mode is started, or + * 2) screen is off and idle maintenance is triggered. + * If idleness is forced or garage mode is running, the car is considered idle regardless of screen + * on/off. + */ public final class CarIdlenessTracker extends BroadcastReceiver implements IdlenessTracker { private static final String TAG = "JobScheduler.CarIdlenessTracker"; private static final boolean DEBUG = JobSchedulerService.DEBUG @@ -48,6 +54,7 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen private boolean mIdle; private boolean mGarageModeOn; private boolean mForced; + private boolean mScreenOn; private IdlenessListener mIdleListener; public CarIdlenessTracker() { @@ -56,6 +63,7 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen mIdle = false; mGarageModeOn = false; mForced = false; + mScreenOn = true; } @Override @@ -71,6 +79,7 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen // Screen state filter.addAction(Intent.ACTION_SCREEN_ON); + filter.addAction(Intent.ACTION_SCREEN_OFF); // State of GarageMode filter.addAction(ACTION_GARAGE_MODE_ON); @@ -88,6 +97,8 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen public void dump(PrintWriter pw) { pw.print(" mIdle: "); pw.println(mIdle); pw.print(" mGarageModeOn: "); pw.println(mGarageModeOn); + pw.print(" mForced: "); pw.println(mForced); + pw.print(" mScreenOn: "); pw.println(mScreenOn); } @Override @@ -121,6 +132,9 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen } else if (action.equals(Intent.ACTION_SCREEN_ON)) { logIfDebug("Screen is on..."); handleScreenOn(); + } else if (action.equals(intent.ACTION_SCREEN_OFF)) { + logIfDebug("Screen is off..."); + mScreenOn = false; } else if (action.equals(ACTION_GARAGE_MODE_ON)) { logIfDebug("GarageMode is on..."); mGarageModeOn = true; @@ -132,10 +146,10 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen } else if (action.equals(ActivityManagerService.ACTION_TRIGGER_IDLE)) { if (!mGarageModeOn) { logIfDebug("Idle trigger fired..."); - triggerIdlenessOnce(); + triggerIdleness(); } else { - logIfDebug("TRIGGER_IDLE received but not changing state; idle=" - + mIdle + " screen=" + mGarageModeOn); + logIfDebug("TRIGGER_IDLE received but not changing state; mIdle=" + + mIdle + " mGarageModeOn=" + mGarageModeOn); } } } @@ -158,20 +172,24 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen } } - private void triggerIdlenessOnce() { + private void triggerIdleness() { // This is simply triggering idleness once until some constraint will switch it back off if (mIdle) { // Already in idle state. Nothing to do logIfDebug("Device is already idle"); - } else { + } else if (!mScreenOn) { // Going idle once - logIfDebug("Device is going idle once"); + logIfDebug("Device is going idle"); mIdle = true; mIdleListener.reportNewIdleState(mIdle); + } else { + logIfDebug("TRIGGER_IDLE received but not changing state: mIdle = " + mIdle + + ", mScreenOn = " + mScreenOn); } } private void handleScreenOn() { + mScreenOn = true; if (mForced || mGarageModeOn) { // Even though screen is on, the device remains idle logIfDebug("Screen is on, but device cannot exit idle"); @@ -179,6 +197,7 @@ public final class CarIdlenessTracker extends BroadcastReceiver implements Idlen // Exiting idle logIfDebug("Device is exiting idle"); mIdle = false; + mIdleListener.reportNewIdleState(mIdle); } else { // Already in non-idle state. Nothing to do logIfDebug("Device is already non-idle"); diff --git a/boot/hiddenapi/hiddenapi-max-target-o.txt b/boot/hiddenapi/hiddenapi-max-target-o.txt index 3cc28d908a38..0ec918b11723 100644 --- a/boot/hiddenapi/hiddenapi-max-target-o.txt +++ b/boot/hiddenapi/hiddenapi-max-target-o.txt @@ -8961,12 +8961,6 @@ Landroid/app/slice/SliceQuery;->TAG:Ljava/lang/String; Landroid/app/slice/SliceSpec;-><init>(Landroid/os/Parcel;)V Landroid/app/slice/SliceSpec;->mRevision:I Landroid/app/slice/SliceSpec;->mType:Ljava/lang/String; -Landroid/app/StatsManager;-><init>(Landroid/content/Context;)V -Landroid/app/StatsManager;->DEBUG:Z -Landroid/app/StatsManager;->getIStatsManagerLocked()Landroid/os/IStatsManager; -Landroid/app/StatsManager;->mContext:Landroid/content/Context; -Landroid/app/StatsManager;->mService:Landroid/os/IStatsManager; -Landroid/app/StatsManager;->TAG:Ljava/lang/String; Landroid/app/StatusBarManager;->CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER:I Landroid/app/StatusBarManager;->CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP:I Landroid/app/StatusBarManager;->CAMERA_LAUNCH_SOURCE_WIGGLE:I @@ -31618,12 +31612,6 @@ Landroid/media/MediaSession2$CommandButton;->getIconResId()I Landroid/media/MediaSession2$CommandButton;->getProvider()Landroid/media/update/MediaSession2Provider$CommandButtonProvider; Landroid/media/MediaSession2$CommandButton;->isEnabled()Z Landroid/media/MediaSession2$CommandButton;->mProvider:Landroid/media/update/MediaSession2Provider$CommandButtonProvider; -Landroid/media/MediaSession2$ControllerInfo;-><init>(Landroid/content/Context;IILjava/lang/String;Landroid/os/IInterface;)V -Landroid/media/MediaSession2$ControllerInfo;->getPackageName()Ljava/lang/String; -Landroid/media/MediaSession2$ControllerInfo;->getProvider()Landroid/media/update/MediaSession2Provider$ControllerInfoProvider; -Landroid/media/MediaSession2$ControllerInfo;->getUid()I -Landroid/media/MediaSession2$ControllerInfo;->isTrusted()Z -Landroid/media/MediaSession2$ControllerInfo;->mProvider:Landroid/media/update/MediaSession2Provider$ControllerInfoProvider; Landroid/media/MediaSession2$OnDataSourceMissingHelper;->onDataSourceMissing(Landroid/media/MediaSession2;Landroid/media/MediaItem2;)Landroid/media/DataSourceDesc; Landroid/media/MediaSession2$SessionCallback;-><init>()V Landroid/media/MediaSession2$SessionCallback;->onBufferingStateChanged(Landroid/media/MediaSession2;Landroid/media/MediaPlayerBase;Landroid/media/MediaItem2;I)V @@ -35339,159 +35327,6 @@ Landroid/mtp/MtpStorageManager;->removeObjectFromCache(Landroid/mtp/MtpStorageMa Landroid/mtp/MtpStorageManager;->sDebug:Z Landroid/mtp/MtpStorageManager;->setSubdirectories(Ljava/util/Set;)V Landroid/mtp/MtpStorageManager;->TAG:Ljava/lang/String; -Landroid/net/CaptivePortal;-><init>(Landroid/os/IBinder;)V -Landroid/net/CaptivePortal;->APP_RETURN_DISMISSED:I -Landroid/net/CaptivePortal;->APP_RETURN_UNWANTED:I -Landroid/net/CaptivePortal;->APP_RETURN_WANTED_AS_IS:I -Landroid/net/CaptivePortal;->mBinder:Landroid/os/IBinder; -Landroid/net/CaptivePortal;->useNetwork()V -Landroid/net/ConnectivityManager$CallbackHandler;->DBG:Z -Landroid/net/ConnectivityManager$CallbackHandler;->getObject(Landroid/os/Message;Ljava/lang/Class;)Ljava/lang/Object; -Landroid/net/ConnectivityManager$CallbackHandler;->TAG:Ljava/lang/String; -Landroid/net/ConnectivityManager$Errors;->TOO_MANY_REQUESTS:I -Landroid/net/ConnectivityManager$LegacyRequest;-><init>()V -Landroid/net/ConnectivityManager$LegacyRequest;->clearDnsBinding()V -Landroid/net/ConnectivityManager$LegacyRequest;->currentNetwork:Landroid/net/Network; -Landroid/net/ConnectivityManager$LegacyRequest;->delay:I -Landroid/net/ConnectivityManager$LegacyRequest;->expireSequenceNumber:I -Landroid/net/ConnectivityManager$LegacyRequest;->networkCallback:Landroid/net/ConnectivityManager$NetworkCallback; -Landroid/net/ConnectivityManager$LegacyRequest;->networkCapabilities:Landroid/net/NetworkCapabilities; -Landroid/net/ConnectivityManager$LegacyRequest;->networkRequest:Landroid/net/NetworkRequest; -Landroid/net/ConnectivityManager$NetworkCallback;->networkRequest:Landroid/net/NetworkRequest; -Landroid/net/ConnectivityManager$NetworkCallback;->onAvailable(Landroid/net/Network;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;)V -Landroid/net/ConnectivityManager$NetworkCallback;->onNetworkResumed(Landroid/net/Network;)V -Landroid/net/ConnectivityManager$NetworkCallback;->onNetworkSuspended(Landroid/net/Network;)V -Landroid/net/ConnectivityManager$NetworkCallback;->onPreCheck(Landroid/net/Network;)V -Landroid/net/ConnectivityManager$PacketKeepalive;->BINDER_DIED:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_HARDWARE_ERROR:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_HARDWARE_UNSUPPORTED:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_INVALID_INTERVAL:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_INVALID_IP_ADDRESS:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_INVALID_LENGTH:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_INVALID_NETWORK:I -Landroid/net/ConnectivityManager$PacketKeepalive;->ERROR_INVALID_PORT:I -Landroid/net/ConnectivityManager$PacketKeepalive;->mCallback:Landroid/net/ConnectivityManager$PacketKeepaliveCallback; -Landroid/net/ConnectivityManager$PacketKeepalive;->MIN_INTERVAL:I -Landroid/net/ConnectivityManager$PacketKeepalive;->mLooper:Landroid/os/Looper; -Landroid/net/ConnectivityManager$PacketKeepalive;->mMessenger:Landroid/os/Messenger; -Landroid/net/ConnectivityManager$PacketKeepalive;->mNetwork:Landroid/net/Network; -Landroid/net/ConnectivityManager$PacketKeepalive;->mSlot:Ljava/lang/Integer; -Landroid/net/ConnectivityManager$PacketKeepalive;->NATT_PORT:I -Landroid/net/ConnectivityManager$PacketKeepalive;->NO_KEEPALIVE:I -Landroid/net/ConnectivityManager$PacketKeepalive;->stopLooper()V -Landroid/net/ConnectivityManager$PacketKeepalive;->SUCCESS:I -Landroid/net/ConnectivityManager$PacketKeepalive;->TAG:Ljava/lang/String; -Landroid/net/ConnectivityManager$TooManyRequestsException;-><init>()V -Landroid/net/ConnectivityManager;-><init>(Landroid/content/Context;Landroid/net/IConnectivityManager;)V -Landroid/net/ConnectivityManager;->ACTION_CAPTIVE_PORTAL_TEST_COMPLETED:Ljava/lang/String; -Landroid/net/ConnectivityManager;->ACTION_DATA_ACTIVITY_CHANGE:Ljava/lang/String; -Landroid/net/ConnectivityManager;->ACTION_PROMPT_LOST_VALIDATION:Ljava/lang/String; -Landroid/net/ConnectivityManager;->ACTION_PROMPT_UNVALIDATED:Ljava/lang/String; -Landroid/net/ConnectivityManager;->ALREADY_UNREGISTERED:Landroid/net/NetworkRequest; -Landroid/net/ConnectivityManager;->BASE:I -Landroid/net/ConnectivityManager;->CALLBACK_AVAILABLE:I -Landroid/net/ConnectivityManager;->CALLBACK_CAP_CHANGED:I -Landroid/net/ConnectivityManager;->CALLBACK_IP_CHANGED:I -Landroid/net/ConnectivityManager;->CALLBACK_LOSING:I -Landroid/net/ConnectivityManager;->CALLBACK_LOST:I -Landroid/net/ConnectivityManager;->CALLBACK_PRECHECK:I -Landroid/net/ConnectivityManager;->CALLBACK_RESUMED:I -Landroid/net/ConnectivityManager;->CALLBACK_SUSPENDED:I -Landroid/net/ConnectivityManager;->CALLBACK_UNAVAIL:I -Landroid/net/ConnectivityManager;->checkCallbackNotNull(Landroid/net/ConnectivityManager$NetworkCallback;)V -Landroid/net/ConnectivityManager;->checkLegacyRoutingApiAccess()V -Landroid/net/ConnectivityManager;->checkMobileProvisioning(I)I -Landroid/net/ConnectivityManager;->checkPendingIntentNotNull(Landroid/app/PendingIntent;)V -Landroid/net/ConnectivityManager;->checkTimeout(I)V -Landroid/net/ConnectivityManager;->CONNECTIVITY_ACTION_SUPL:Ljava/lang/String; -Landroid/net/ConnectivityManager;->convertServiceException(Landroid/os/ServiceSpecificException;)Ljava/lang/RuntimeException; -Landroid/net/ConnectivityManager;->enforceChangePermission(Landroid/content/Context;)V -Landroid/net/ConnectivityManager;->enforceTetherChangePermission(Landroid/content/Context;Ljava/lang/String;)V -Landroid/net/ConnectivityManager;->expireRequest(Landroid/net/NetworkCapabilities;I)V -Landroid/net/ConnectivityManager;->EXPIRE_LEGACY_REQUEST:I -Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_LOCAL_ONLY:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_ADD_TETHER_TYPE:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_CAPTIVE_PORTAL_PROBE_SPEC:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_CAPTIVE_PORTAL_USER_AGENT:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_DEVICE_TYPE:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_INET_CONDITION:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_IS_ACTIVE:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_IS_CAPTIVE_PORTAL:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_PROVISION_CALLBACK:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_REALTIME_NS:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_REM_TETHER_TYPE:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_RUN_PROVISION:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_SET_ALARM:Ljava/lang/String; -Landroid/net/ConnectivityManager;->factoryReset()V -Landroid/net/ConnectivityManager;->findRequestForFeature(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest; -Landroid/net/ConnectivityManager;->getActiveNetworkForUid(I)Landroid/net/Network; -Landroid/net/ConnectivityManager;->getActiveNetworkForUid(IZ)Landroid/net/Network; -Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(IZ)Landroid/net/NetworkInfo; -Landroid/net/ConnectivityManager;->getAlwaysOnVpnPackageForUser(I)Ljava/lang/String; -Landroid/net/ConnectivityManager;->getCallbackName(I)Ljava/lang/String; -Landroid/net/ConnectivityManager;->getDefaultHandler()Landroid/net/ConnectivityManager$CallbackHandler; -Landroid/net/ConnectivityManager;->getGlobalProxy()Landroid/net/ProxyInfo; -Landroid/net/ConnectivityManager;->getInstanceOrNull()Landroid/net/ConnectivityManager; -Landroid/net/ConnectivityManager;->getMobileProvisioningUrl()Ljava/lang/String; -Landroid/net/ConnectivityManager;->getNetworkInfoForUid(Landroid/net/Network;IZ)Landroid/net/NetworkInfo; -Landroid/net/ConnectivityManager;->getNetworkManagementService()Landroid/os/INetworkManagementService; -Landroid/net/ConnectivityManager;->getNetworkPolicyManager()Landroid/net/INetworkPolicyManager; -Landroid/net/ConnectivityManager;->getProxyForNetwork(Landroid/net/Network;)Landroid/net/ProxyInfo; -Landroid/net/ConnectivityManager;->getTetheredDhcpRanges()[Ljava/lang/String; -Landroid/net/ConnectivityManager;->inferLegacyTypeForNetworkCapabilities(Landroid/net/NetworkCapabilities;)I -Landroid/net/ConnectivityManager;->isAlwaysOnVpnPackageSupportedForUser(ILjava/lang/String;)Z -Landroid/net/ConnectivityManager;->isNetworkTypeWifi(I)Z -Landroid/net/ConnectivityManager;->legacyTypeForNetworkCapabilities(Landroid/net/NetworkCapabilities;)I -Landroid/net/ConnectivityManager;->LISTEN:I -Landroid/net/ConnectivityManager;->MAX_NETWORK_TYPE:I -Landroid/net/ConnectivityManager;->MAX_RADIO_TYPE:I -Landroid/net/ConnectivityManager;->mContext:Landroid/content/Context; -Landroid/net/ConnectivityManager;->MIN_NETWORK_TYPE:I -Landroid/net/ConnectivityManager;->mNetworkActivityListeners:Landroid/util/ArrayMap; -Landroid/net/ConnectivityManager;->mNMService:Landroid/os/INetworkManagementService; -Landroid/net/ConnectivityManager;->mNPManager:Landroid/net/INetworkPolicyManager; -Landroid/net/ConnectivityManager;->MULTIPATH_PREFERENCE_UNMETERED:I -Landroid/net/ConnectivityManager;->NETID_UNSET:I -Landroid/net/ConnectivityManager;->networkCapabilitiesForType(I)Landroid/net/NetworkCapabilities; -Landroid/net/ConnectivityManager;->PRIVATE_DNS_DEFAULT_MODE_FALLBACK:Ljava/lang/String; -Landroid/net/ConnectivityManager;->PRIVATE_DNS_MODE_OFF:Ljava/lang/String; -Landroid/net/ConnectivityManager;->PRIVATE_DNS_MODE_OPPORTUNISTIC:Ljava/lang/String; -Landroid/net/ConnectivityManager;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:Ljava/lang/String; -Landroid/net/ConnectivityManager;->registerNetworkAgent(Landroid/os/Messenger;Landroid/net/NetworkInfo;Landroid/net/LinkProperties;Landroid/net/NetworkCapabilities;ILandroid/net/NetworkMisc;)I -Landroid/net/ConnectivityManager;->renewRequestLocked(Landroid/net/ConnectivityManager$LegacyRequest;)V -Landroid/net/ConnectivityManager;->reportInetCondition(II)V -Landroid/net/ConnectivityManager;->REQUEST:I -Landroid/net/ConnectivityManager;->requestNetwork(Landroid/net/NetworkRequest;Landroid/net/ConnectivityManager$NetworkCallback;IILandroid/os/Handler;)V -Landroid/net/ConnectivityManager;->REQUEST_ID_UNSET:I -Landroid/net/ConnectivityManager;->sCallbackHandler:Landroid/net/ConnectivityManager$CallbackHandler; -Landroid/net/ConnectivityManager;->sCallbacks:Ljava/util/HashMap; -Landroid/net/ConnectivityManager;->sendExpireMsgForFeature(Landroid/net/NetworkCapabilities;II)V -Landroid/net/ConnectivityManager;->sendRequestForNetwork(Landroid/net/NetworkCapabilities;Landroid/net/ConnectivityManager$NetworkCallback;IIILandroid/net/ConnectivityManager$CallbackHandler;)Landroid/net/NetworkRequest; -Landroid/net/ConnectivityManager;->setAcceptUnvalidated(Landroid/net/Network;ZZ)V -Landroid/net/ConnectivityManager;->setAlwaysOnVpnPackageForUser(ILjava/lang/String;Z)Z -Landroid/net/ConnectivityManager;->setAvoidUnvalidated(Landroid/net/Network;)V -Landroid/net/ConnectivityManager;->setGlobalProxy(Landroid/net/ProxyInfo;)V -Landroid/net/ConnectivityManager;->setProvisioningNotificationVisible(ZILjava/lang/String;)V -Landroid/net/ConnectivityManager;->sInstance:Landroid/net/ConnectivityManager; -Landroid/net/ConnectivityManager;->sLegacyTypeToCapability:Landroid/util/SparseIntArray; -Landroid/net/ConnectivityManager;->sLegacyTypeToTransport:Landroid/util/SparseIntArray; -Landroid/net/ConnectivityManager;->startCaptivePortalApp(Landroid/net/Network;)V -Landroid/net/ConnectivityManager;->TAG:Ljava/lang/String; -Landroid/net/ConnectivityManager;->TETHERING_INVALID:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_DISABLE_NAT_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_ENABLE_NAT_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_IFACE_CFG_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_MASTER_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_NO_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_PROVISION_FAILED:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_SERVICE_UNAVAIL:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_TETHER_IFACE_ERROR:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_UNAVAIL_IFACE:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_UNKNOWN_IFACE:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_UNSUPPORTED:I -Landroid/net/ConnectivityManager;->TETHER_ERROR_UNTETHER_IFACE_ERROR:I -Landroid/net/ConnectivityManager;->unsupportedStartingFrom(I)V -Landroid/net/ConnectivityManager;->updateLockdownVpn()Z Landroid/net/ConnectivityMetricsEvent;-><init>()V Landroid/net/ConnectivityMetricsEvent;-><init>(Landroid/os/Parcel;)V Landroid/net/ConnectivityMetricsEvent;->CREATOR:Landroid/os/Parcelable$Creator; @@ -35500,12 +35335,6 @@ Landroid/net/ConnectivityMetricsEvent;->ifname:Ljava/lang/String; Landroid/net/ConnectivityMetricsEvent;->netId:I Landroid/net/ConnectivityMetricsEvent;->timestamp:J Landroid/net/ConnectivityMetricsEvent;->transports:J -Landroid/net/ConnectivityThread$Singleton;-><init>()V -Landroid/net/ConnectivityThread$Singleton;->INSTANCE:Landroid/net/ConnectivityThread; -Landroid/net/ConnectivityThread;-><init>()V -Landroid/net/ConnectivityThread;->createInstance()Landroid/net/ConnectivityThread; -Landroid/net/ConnectivityThread;->get()Landroid/net/ConnectivityThread; -Landroid/net/ConnectivityThread;->getInstanceLooper()Landroid/os/Looper; Landroid/net/Credentials;->gid:I Landroid/net/Credentials;->pid:I Landroid/net/Credentials;->uid:I @@ -35516,9 +35345,6 @@ Landroid/net/DataUsageRequest;->requestId:I Landroid/net/DataUsageRequest;->REQUEST_ID_UNSET:I Landroid/net/DataUsageRequest;->template:Landroid/net/NetworkTemplate; Landroid/net/DataUsageRequest;->thresholdInBytes:J -Landroid/net/DhcpInfo;-><init>(Landroid/net/DhcpInfo;)V -Landroid/net/DhcpInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/DhcpInfo;->putAddress(Ljava/lang/StringBuffer;I)V Landroid/net/DhcpResults;->addDns(Ljava/lang/String;)Z Landroid/net/DhcpResults;->clear()V Landroid/net/DhcpResults;->CREATOR:Landroid/os/Parcelable$Creator; @@ -35572,224 +35398,6 @@ Landroid/net/http/X509TrustManagerExtensions;->mCheckServerTrusted:Ljava/lang/re Landroid/net/http/X509TrustManagerExtensions;->mDelegate:Lcom/android/org/conscrypt/TrustManagerImpl; Landroid/net/http/X509TrustManagerExtensions;->mIsSameTrustConfiguration:Ljava/lang/reflect/Method; Landroid/net/http/X509TrustManagerExtensions;->mTrustManager:Ljavax/net/ssl/X509TrustManager; -Landroid/net/ICaptivePortal$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/ICaptivePortal$Stub$Proxy;->appResponse(I)V -Landroid/net/ICaptivePortal$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/ICaptivePortal$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/ICaptivePortal$Stub;-><init>()V -Landroid/net/ICaptivePortal$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/ICaptivePortal; -Landroid/net/ICaptivePortal$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/ICaptivePortal$Stub;->TRANSACTION_appResponse:I -Landroid/net/ICaptivePortal;->appResponse(I)V -Landroid/net/IConnectivityManager$Stub$Proxy;->addVpnAddress(Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->checkMobileProvisioning(I)I -Landroid/net/IConnectivityManager$Stub$Proxy;->establishVpn(Lcom/android/internal/net/VpnConfig;)Landroid/os/ParcelFileDescriptor; -Landroid/net/IConnectivityManager$Stub$Proxy;->factoryReset()V -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetwork()Landroid/net/Network; -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkForUid(IZ)Landroid/net/Network; -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkInfoForUid(IZ)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkQuotaInfo()Landroid/net/NetworkQuotaInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworkState()[Landroid/net/NetworkState; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllVpnInfo()[Lcom/android/internal/net/VpnInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAlwaysOnVpnPackage(I)Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getCaptivePortalServerUrl()Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities; -Landroid/net/IConnectivityManager$Stub$Proxy;->getGlobalProxy()Landroid/net/ProxyInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getLastTetherError(Ljava/lang/String;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->getLegacyVpnInfo(I)Lcom/android/internal/net/LegacyVpnInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getLinkProperties(Landroid/net/Network;)Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager$Stub$Proxy;->getLinkPropertiesForType(I)Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager$Stub$Proxy;->getMobileProvisioningUrl()Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getMultipathPreference(Landroid/net/Network;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->getNetworkCapabilities(Landroid/net/Network;)Landroid/net/NetworkCapabilities; -Landroid/net/IConnectivityManager$Stub$Proxy;->getNetworkForType(I)Landroid/net/Network; -Landroid/net/IConnectivityManager$Stub$Proxy;->getNetworkInfo(I)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getNetworkInfoForUid(Landroid/net/Network;IZ)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getNetworkWatchlistConfigHash()[B -Landroid/net/IConnectivityManager$Stub$Proxy;->getProxyForNetwork(Landroid/net/Network;)Landroid/net/ProxyInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getRestoreDefaultNetworkDelay(I)I -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableBluetoothRegexs()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableWifiRegexs()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredDhcpRanges()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheringErroredIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getVpnConfig(I)Lcom/android/internal/net/VpnConfig; -Landroid/net/IConnectivityManager$Stub$Proxy;->isActiveNetworkMetered()Z -Landroid/net/IConnectivityManager$Stub$Proxy;->isAlwaysOnVpnPackageSupported(ILjava/lang/String;)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->isNetworkSupported(I)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->isTetheringSupported(Ljava/lang/String;)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->listenForNetwork(Landroid/net/NetworkCapabilities;Landroid/os/Messenger;Landroid/os/IBinder;)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager$Stub$Proxy;->pendingListenForNetwork(Landroid/net/NetworkCapabilities;Landroid/app/PendingIntent;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->pendingRequestForNetwork(Landroid/net/NetworkCapabilities;Landroid/app/PendingIntent;)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager$Stub$Proxy;->prepareVpn(Ljava/lang/String;Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->registerNetworkAgent(Landroid/os/Messenger;Landroid/net/NetworkInfo;Landroid/net/LinkProperties;Landroid/net/NetworkCapabilities;ILandroid/net/NetworkMisc;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->registerNetworkFactory(Landroid/os/Messenger;Ljava/lang/String;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->releaseNetworkRequest(Landroid/net/NetworkRequest;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->releasePendingNetworkRequest(Landroid/app/PendingIntent;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->removeVpnAddress(Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->reportInetCondition(II)V -Landroid/net/IConnectivityManager$Stub$Proxy;->reportNetworkConnectivity(Landroid/net/Network;Z)V -Landroid/net/IConnectivityManager$Stub$Proxy;->requestBandwidthUpdate(Landroid/net/Network;)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->requestNetwork(Landroid/net/NetworkCapabilities;Landroid/os/Messenger;ILandroid/os/IBinder;I)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager$Stub$Proxy;->requestRouteToHostAddress(I[B)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->setAcceptUnvalidated(Landroid/net/Network;ZZ)V -Landroid/net/IConnectivityManager$Stub$Proxy;->setAirplaneMode(Z)V -Landroid/net/IConnectivityManager$Stub$Proxy;->setAlwaysOnVpnPackage(ILjava/lang/String;Z)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->setAvoidUnvalidated(Landroid/net/Network;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->setGlobalProxy(Landroid/net/ProxyInfo;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->setProvisioningNotificationVisible(ZILjava/lang/String;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->setUnderlyingNetworksForVpn([Landroid/net/Network;)Z -Landroid/net/IConnectivityManager$Stub$Proxy;->setUsbTethering(ZLjava/lang/String;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->setVpnPackageAuthorization(Ljava/lang/String;IZ)V -Landroid/net/IConnectivityManager$Stub$Proxy;->startCaptivePortalApp(Landroid/net/Network;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->startLegacyVpn(Lcom/android/internal/net/VpnProfile;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->startNattKeepalive(Landroid/net/Network;ILandroid/os/Messenger;Landroid/os/IBinder;Ljava/lang/String;ILjava/lang/String;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->startTethering(ILandroid/os/ResultReceiver;ZLjava/lang/String;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->stopKeepalive(Landroid/net/Network;I)V -Landroid/net/IConnectivityManager$Stub$Proxy;->stopTethering(ILjava/lang/String;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->tether(Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->unregisterNetworkFactory(Landroid/os/Messenger;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->untether(Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/IConnectivityManager$Stub$Proxy;->updateLockdownVpn()Z -Landroid/net/IConnectivityManager$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_addVpnAddress:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_checkMobileProvisioning:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_establishVpn:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_factoryReset:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveLinkProperties:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveNetworkForUid:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveNetworkInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveNetworkInfoForUid:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getActiveNetworkQuotaInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getAllNetworkInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getAllNetworks:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getAllNetworkState:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getAllVpnInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getAlwaysOnVpnPackage:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getCaptivePortalServerUrl:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getDefaultNetworkCapabilitiesForUser:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getGlobalProxy:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getLastTetherError:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getLegacyVpnInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getLinkProperties:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getLinkPropertiesForType:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getMobileProvisioningUrl:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getMultipathPreference:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getNetworkCapabilities:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getNetworkForType:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getNetworkInfo:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getNetworkInfoForUid:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getNetworkWatchlistConfigHash:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getProxyForNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getRestoreDefaultNetworkDelay:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetherableBluetoothRegexs:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetherableIfaces:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetherableUsbRegexs:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetherableWifiRegexs:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetheredDhcpRanges:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetheredIfaces:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getTetheringErroredIfaces:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_getVpnConfig:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_isActiveNetworkMetered:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_isAlwaysOnVpnPackageSupported:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_isNetworkSupported:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_isTetheringSupported:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_listenForNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_pendingListenForNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_pendingRequestForNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_prepareVpn:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_registerNetworkAgent:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_registerNetworkFactory:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_releaseNetworkRequest:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_releasePendingNetworkRequest:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_removeVpnAddress:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_reportInetCondition:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_reportNetworkConnectivity:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_requestBandwidthUpdate:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_requestNetwork:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_requestRouteToHostAddress:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setAcceptUnvalidated:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setAirplaneMode:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setAlwaysOnVpnPackage:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setAvoidUnvalidated:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setGlobalProxy:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setProvisioningNotificationVisible:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setUnderlyingNetworksForVpn:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setUsbTethering:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_setVpnPackageAuthorization:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_startCaptivePortalApp:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_startLegacyVpn:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_startNattKeepalive:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_startTethering:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_stopKeepalive:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_stopTethering:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_tether:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_unregisterNetworkFactory:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_untether:I -Landroid/net/IConnectivityManager$Stub;->TRANSACTION_updateLockdownVpn:I -Landroid/net/IConnectivityManager;->addVpnAddress(Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager;->checkMobileProvisioning(I)I -Landroid/net/IConnectivityManager;->establishVpn(Lcom/android/internal/net/VpnConfig;)Landroid/os/ParcelFileDescriptor; -Landroid/net/IConnectivityManager;->factoryReset()V -Landroid/net/IConnectivityManager;->getActiveNetwork()Landroid/net/Network; -Landroid/net/IConnectivityManager;->getActiveNetworkForUid(IZ)Landroid/net/Network; -Landroid/net/IConnectivityManager;->getActiveNetworkInfoForUid(IZ)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager;->getActiveNetworkQuotaInfo()Landroid/net/NetworkQuotaInfo; -Landroid/net/IConnectivityManager;->getAllNetworks()[Landroid/net/Network; -Landroid/net/IConnectivityManager;->getAllVpnInfo()[Lcom/android/internal/net/VpnInfo; -Landroid/net/IConnectivityManager;->getAlwaysOnVpnPackage(I)Ljava/lang/String; -Landroid/net/IConnectivityManager;->getCaptivePortalServerUrl()Ljava/lang/String; -Landroid/net/IConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities; -Landroid/net/IConnectivityManager;->getGlobalProxy()Landroid/net/ProxyInfo; -Landroid/net/IConnectivityManager;->getLegacyVpnInfo(I)Lcom/android/internal/net/LegacyVpnInfo; -Landroid/net/IConnectivityManager;->getLinkProperties(Landroid/net/Network;)Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager;->getLinkPropertiesForType(I)Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager;->getMobileProvisioningUrl()Ljava/lang/String; -Landroid/net/IConnectivityManager;->getMultipathPreference(Landroid/net/Network;)I -Landroid/net/IConnectivityManager;->getNetworkCapabilities(Landroid/net/Network;)Landroid/net/NetworkCapabilities; -Landroid/net/IConnectivityManager;->getNetworkForType(I)Landroid/net/Network; -Landroid/net/IConnectivityManager;->getNetworkInfoForUid(Landroid/net/Network;IZ)Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager;->getNetworkWatchlistConfigHash()[B -Landroid/net/IConnectivityManager;->getProxyForNetwork(Landroid/net/Network;)Landroid/net/ProxyInfo; -Landroid/net/IConnectivityManager;->getRestoreDefaultNetworkDelay(I)I -Landroid/net/IConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String; -Landroid/net/IConnectivityManager;->getTetheredDhcpRanges()[Ljava/lang/String; -Landroid/net/IConnectivityManager;->getVpnConfig(I)Lcom/android/internal/net/VpnConfig; -Landroid/net/IConnectivityManager;->isActiveNetworkMetered()Z -Landroid/net/IConnectivityManager;->isAlwaysOnVpnPackageSupported(ILjava/lang/String;)Z -Landroid/net/IConnectivityManager;->isNetworkSupported(I)Z -Landroid/net/IConnectivityManager;->isTetheringSupported(Ljava/lang/String;)Z -Landroid/net/IConnectivityManager;->listenForNetwork(Landroid/net/NetworkCapabilities;Landroid/os/Messenger;Landroid/os/IBinder;)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager;->pendingListenForNetwork(Landroid/net/NetworkCapabilities;Landroid/app/PendingIntent;)V -Landroid/net/IConnectivityManager;->pendingRequestForNetwork(Landroid/net/NetworkCapabilities;Landroid/app/PendingIntent;)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager;->prepareVpn(Ljava/lang/String;Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager;->registerNetworkAgent(Landroid/os/Messenger;Landroid/net/NetworkInfo;Landroid/net/LinkProperties;Landroid/net/NetworkCapabilities;ILandroid/net/NetworkMisc;)I -Landroid/net/IConnectivityManager;->registerNetworkFactory(Landroid/os/Messenger;Ljava/lang/String;)V -Landroid/net/IConnectivityManager;->releaseNetworkRequest(Landroid/net/NetworkRequest;)V -Landroid/net/IConnectivityManager;->releasePendingNetworkRequest(Landroid/app/PendingIntent;)V -Landroid/net/IConnectivityManager;->removeVpnAddress(Ljava/lang/String;I)Z -Landroid/net/IConnectivityManager;->reportNetworkConnectivity(Landroid/net/Network;Z)V -Landroid/net/IConnectivityManager;->requestBandwidthUpdate(Landroid/net/Network;)Z -Landroid/net/IConnectivityManager;->requestNetwork(Landroid/net/NetworkCapabilities;Landroid/os/Messenger;ILandroid/os/IBinder;I)Landroid/net/NetworkRequest; -Landroid/net/IConnectivityManager;->requestRouteToHostAddress(I[B)Z -Landroid/net/IConnectivityManager;->setAcceptUnvalidated(Landroid/net/Network;ZZ)V -Landroid/net/IConnectivityManager;->setAlwaysOnVpnPackage(ILjava/lang/String;Z)Z -Landroid/net/IConnectivityManager;->setAvoidUnvalidated(Landroid/net/Network;)V -Landroid/net/IConnectivityManager;->setGlobalProxy(Landroid/net/ProxyInfo;)V -Landroid/net/IConnectivityManager;->setProvisioningNotificationVisible(ZILjava/lang/String;)V -Landroid/net/IConnectivityManager;->setUnderlyingNetworksForVpn([Landroid/net/Network;)Z -Landroid/net/IConnectivityManager;->setUsbTethering(ZLjava/lang/String;)I -Landroid/net/IConnectivityManager;->setVpnPackageAuthorization(Ljava/lang/String;IZ)V -Landroid/net/IConnectivityManager;->startCaptivePortalApp(Landroid/net/Network;)V -Landroid/net/IConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/os/Messenger;Landroid/os/IBinder;Ljava/lang/String;ILjava/lang/String;)V -Landroid/net/IConnectivityManager;->startTethering(ILandroid/os/ResultReceiver;ZLjava/lang/String;)V -Landroid/net/IConnectivityManager;->stopKeepalive(Landroid/net/Network;I)V -Landroid/net/IConnectivityManager;->stopTethering(ILjava/lang/String;)V -Landroid/net/IConnectivityManager;->tether(Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/IConnectivityManager;->unregisterNetworkFactory(Landroid/os/Messenger;)V -Landroid/net/IConnectivityManager;->untether(Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/IConnectivityManager;->updateLockdownVpn()Z Landroid/net/IEthernetManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/IEthernetManager$Stub$Proxy;->addListener(Landroid/net/IEthernetServiceListener;)V Landroid/net/IEthernetManager$Stub$Proxy;->getAvailableInterfaces()[Ljava/lang/String; @@ -36306,41 +35914,6 @@ Landroid/net/InterfaceConfiguration;->mFlags:Ljava/util/HashSet; Landroid/net/InterfaceConfiguration;->mHwAddr:Ljava/lang/String; Landroid/net/InterfaceConfiguration;->setHardwareAddress(Ljava/lang/String;)V Landroid/net/InterfaceConfiguration;->validateFlag(Ljava/lang/String;)V -Landroid/net/IpConfiguration$IpAssignment;->DHCP:Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration$IpAssignment;->UNASSIGNED:Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration$IpAssignment;->valueOf(Ljava/lang/String;)Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration$IpAssignment;->values()[Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration$ProxySettings;->PAC:Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration$ProxySettings;->STATIC:Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration$ProxySettings;->UNASSIGNED:Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration$ProxySettings;->valueOf(Ljava/lang/String;)Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration$ProxySettings;->values()[Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration;-><init>()V -Landroid/net/IpConfiguration;-><init>(Landroid/net/IpConfiguration;)V -Landroid/net/IpConfiguration;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/IpConfiguration;->getHttpProxy()Landroid/net/ProxyInfo; -Landroid/net/IpConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration; -Landroid/net/IpConfiguration;->init(Landroid/net/IpConfiguration$IpAssignment;Landroid/net/IpConfiguration$ProxySettings;Landroid/net/StaticIpConfiguration;Landroid/net/ProxyInfo;)V -Landroid/net/IpConfiguration;->ipAssignment:Landroid/net/IpConfiguration$IpAssignment; -Landroid/net/IpConfiguration;->proxySettings:Landroid/net/IpConfiguration$ProxySettings; -Landroid/net/IpConfiguration;->setHttpProxy(Landroid/net/ProxyInfo;)V -Landroid/net/IpConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V -Landroid/net/IpConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V -Landroid/net/IpConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V -Landroid/net/IpConfiguration;->staticIpConfiguration:Landroid/net/StaticIpConfiguration; -Landroid/net/IpConfiguration;->TAG:Ljava/lang/String; -Landroid/net/IpPrefix;-><init>(Ljava/lang/String;)V -Landroid/net/IpPrefix;-><init>(Ljava/net/InetAddress;I)V -Landroid/net/IpPrefix;-><init>([BI)V -Landroid/net/IpPrefix;->address:[B -Landroid/net/IpPrefix;->checkAndMaskAddressAndPrefixLength()V -Landroid/net/IpPrefix;->containsPrefix(Landroid/net/IpPrefix;)Z -Landroid/net/IpPrefix;->isIPv4()Z -Landroid/net/IpPrefix;->isIPv6()Z -Landroid/net/IpPrefix;->lengthComparator()Ljava/util/Comparator; -Landroid/net/IpPrefix;->prefixLength:I Landroid/net/IpSecAlgorithm;->checkValidOrThrow(Ljava/lang/String;II)V Landroid/net/IpSecAlgorithm;->CRYPT_NULL:Ljava/lang/String; Landroid/net/IpSecAlgorithm;->equals(Landroid/net/IpSecAlgorithm;Landroid/net/IpSecAlgorithm;)Z @@ -36522,73 +36095,6 @@ Landroid/net/ITetheringStatsProvider$Stub;->TRANSACTION_setInterfaceQuota:I Landroid/net/ITetheringStatsProvider;->getTetherStats(I)Landroid/net/NetworkStats; Landroid/net/ITetheringStatsProvider;->QUOTA_UNLIMITED:I Landroid/net/ITetheringStatsProvider;->setInterfaceQuota(Ljava/lang/String;J)V -Landroid/net/KeepalivePacketData$InvalidPacketException;-><init>(I)V -Landroid/net/KeepalivePacketData$InvalidPacketException;->error:I -Landroid/net/KeepalivePacketData;-><init>(Landroid/os/Parcel;)V -Landroid/net/KeepalivePacketData;-><init>(Ljava/net/InetAddress;ILjava/net/InetAddress;I[B)V -Landroid/net/KeepalivePacketData;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/KeepalivePacketData;->dstAddress:Ljava/net/InetAddress; -Landroid/net/KeepalivePacketData;->dstPort:I -Landroid/net/KeepalivePacketData;->getPacket()[B -Landroid/net/KeepalivePacketData;->IPV4_HEADER_LENGTH:I -Landroid/net/KeepalivePacketData;->mPacket:[B -Landroid/net/KeepalivePacketData;->nattKeepalivePacket(Ljava/net/InetAddress;ILjava/net/InetAddress;I)Landroid/net/KeepalivePacketData; -Landroid/net/KeepalivePacketData;->srcAddress:Ljava/net/InetAddress; -Landroid/net/KeepalivePacketData;->srcPort:I -Landroid/net/KeepalivePacketData;->TAG:Ljava/lang/String; -Landroid/net/KeepalivePacketData;->UDP_HEADER_LENGTH:I -Landroid/net/LinkAddress;-><init>(Ljava/lang/String;II)V -Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;III)V -Landroid/net/LinkAddress;-><init>(Ljava/net/InterfaceAddress;)V -Landroid/net/LinkAddress;->flags:I -Landroid/net/LinkAddress;->init(Ljava/net/InetAddress;III)V -Landroid/net/LinkAddress;->isGlobalPreferred()Z -Landroid/net/LinkAddress;->isIPv4()Z -Landroid/net/LinkAddress;->isIPv6ULA()Z -Landroid/net/LinkAddress;->scope:I -Landroid/net/LinkAddress;->scopeForUnicastAddress(Ljava/net/InetAddress;)I -Landroid/net/LinkProperties$CompareResult;-><init>()V -Landroid/net/LinkProperties$CompareResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V -Landroid/net/LinkProperties$CompareResult;->added:Ljava/util/List; -Landroid/net/LinkProperties$CompareResult;->removed:Ljava/util/List; -Landroid/net/LinkProperties$ProvisioningChange;->valueOf(Ljava/lang/String;)Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties;->addValidatedPrivateDnsServer(Ljava/net/InetAddress;)Z -Landroid/net/LinkProperties;->compareAddresses(Landroid/net/LinkProperties;)Landroid/net/LinkProperties$CompareResult; -Landroid/net/LinkProperties;->compareAllInterfaceNames(Landroid/net/LinkProperties;)Landroid/net/LinkProperties$CompareResult; -Landroid/net/LinkProperties;->compareAllRoutes(Landroid/net/LinkProperties;)Landroid/net/LinkProperties$CompareResult; -Landroid/net/LinkProperties;->compareDnses(Landroid/net/LinkProperties;)Landroid/net/LinkProperties$CompareResult; -Landroid/net/LinkProperties;->compareValidatedPrivateDnses(Landroid/net/LinkProperties;)Landroid/net/LinkProperties$CompareResult; -Landroid/net/LinkProperties;->ensureDirectlyConnectedRoutes()V -Landroid/net/LinkProperties;->findLinkAddressIndex(Landroid/net/LinkAddress;)I -Landroid/net/LinkProperties;->getValidatedPrivateDnsServers()Ljava/util/List; -Landroid/net/LinkProperties;->hasIPv4AddressOnInterface(Ljava/lang/String;)Z -Landroid/net/LinkProperties;->isIdenticalMtu(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalPrivateDns(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalTcpBufferSizes(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalValidatedPrivateDnses(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIPv4Provisioned()Z -Landroid/net/LinkProperties;->isValidMtu(IZ)Z -Landroid/net/LinkProperties;->MAX_MTU:I -Landroid/net/LinkProperties;->mDnses:Ljava/util/ArrayList; -Landroid/net/LinkProperties;->mDomains:Ljava/lang/String; -Landroid/net/LinkProperties;->mHttpProxy:Landroid/net/ProxyInfo; -Landroid/net/LinkProperties;->MIN_MTU:I -Landroid/net/LinkProperties;->MIN_MTU_V6:I -Landroid/net/LinkProperties;->mLinkAddresses:Ljava/util/ArrayList; -Landroid/net/LinkProperties;->mMtu:I -Landroid/net/LinkProperties;->mPrivateDnsServerName:Ljava/lang/String; -Landroid/net/LinkProperties;->mRoutes:Ljava/util/ArrayList; -Landroid/net/LinkProperties;->mStackedLinks:Ljava/util/Hashtable; -Landroid/net/LinkProperties;->mTcpBufferSizes:Ljava/lang/String; -Landroid/net/LinkProperties;->mUsePrivateDns:Z -Landroid/net/LinkProperties;->mValidatedPrivateDnses:Ljava/util/ArrayList; -Landroid/net/LinkProperties;->removeLinkAddress(Landroid/net/LinkAddress;)Z -Landroid/net/LinkProperties;->removeStackedLink(Ljava/lang/String;)Z -Landroid/net/LinkProperties;->removeValidatedPrivateDnsServer(Ljava/net/InetAddress;)Z -Landroid/net/LinkProperties;->routeWithInterface(Landroid/net/RouteInfo;)Landroid/net/RouteInfo; -Landroid/net/LinkProperties;->setPrivateDnsServerName(Ljava/lang/String;)V -Landroid/net/LinkProperties;->setUsePrivateDns(Z)V -Landroid/net/LinkProperties;->setValidatedPrivateDnsServers(Ljava/util/Collection;)V Landroid/net/LinkQualityInfo;-><init>()V Landroid/net/LinkQualityInfo;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/net/LinkQualityInfo;->getDataSampleDuration()I @@ -36677,29 +36183,6 @@ Landroid/net/LocalSocketImpl;->supportsUrgentData()Z Landroid/net/LocalSocketImpl;->writeba_native([BIILjava/io/FileDescriptor;)V Landroid/net/LocalSocketImpl;->writeMonitor:Ljava/lang/Object; Landroid/net/LocalSocketImpl;->write_native(ILjava/io/FileDescriptor;)V -Landroid/net/MacAddress;-><init>(J)V -Landroid/net/MacAddress;->BASE_GOOGLE_MAC:Landroid/net/MacAddress; -Landroid/net/MacAddress;->byteAddrFromLongAddr(J)[B -Landroid/net/MacAddress;->byteAddrFromStringAddr(Ljava/lang/String;)[B -Landroid/net/MacAddress;->createRandomUnicastAddress()Landroid/net/MacAddress; -Landroid/net/MacAddress;->createRandomUnicastAddress(Landroid/net/MacAddress;Ljava/util/Random;)Landroid/net/MacAddress; -Landroid/net/MacAddress;->createRandomUnicastAddressWithGoogleBase()Landroid/net/MacAddress; -Landroid/net/MacAddress;->ETHER_ADDR_BROADCAST:[B -Landroid/net/MacAddress;->ETHER_ADDR_LEN:I -Landroid/net/MacAddress;->isMacAddress([B)Z -Landroid/net/MacAddress;->isMulticastAddress()Z -Landroid/net/MacAddress;->LOCALLY_ASSIGNED_MASK:J -Landroid/net/MacAddress;->longAddrFromByteAddr([B)J -Landroid/net/MacAddress;->longAddrFromStringAddr(Ljava/lang/String;)J -Landroid/net/MacAddress;->macAddressType([B)I -Landroid/net/MacAddress;->mAddr:J -Landroid/net/MacAddress;->MULTICAST_MASK:J -Landroid/net/MacAddress;->NIC_MASK:J -Landroid/net/MacAddress;->OUI_MASK:J -Landroid/net/MacAddress;->stringAddrFromByteAddr([B)Ljava/lang/String; -Landroid/net/MacAddress;->stringAddrFromLongAddr(J)Ljava/lang/String; -Landroid/net/MacAddress;->TYPE_UNKNOWN:I -Landroid/net/MacAddress;->VALID_LONG_MASK:J Landroid/net/MailTo;-><init>()V Landroid/net/MailTo;->BODY:Ljava/lang/String; Landroid/net/MailTo;->CC:Ljava/lang/String; @@ -36958,666 +36441,6 @@ Landroid/net/MobileLinkQualityInfo;->mLteRssnr:I Landroid/net/MobileLinkQualityInfo;->mLteSignalStrength:I Landroid/net/MobileLinkQualityInfo;->mMobileNetworkType:I Landroid/net/MobileLinkQualityInfo;->mRssi:I -Landroid/net/Network$NetworkBoundSocketFactory;->connectToHost(Ljava/lang/String;ILjava/net/SocketAddress;)Ljava/net/Socket; -Landroid/net/Network$NetworkBoundSocketFactory;->mNetId:I -Landroid/net/Network;-><init>(Landroid/net/Network;)V -Landroid/net/Network;->getNetIdForResolv()I -Landroid/net/Network;->HANDLE_MAGIC:J -Landroid/net/Network;->HANDLE_MAGIC_SIZE:I -Landroid/net/Network;->httpKeepAlive:Z -Landroid/net/Network;->httpKeepAliveDurationMs:J -Landroid/net/Network;->httpMaxConnections:I -Landroid/net/Network;->maybeInitUrlConnectionFactory()V -Landroid/net/Network;->mLock:Ljava/lang/Object; -Landroid/net/Network;->mNetworkBoundSocketFactory:Landroid/net/Network$NetworkBoundSocketFactory; -Landroid/net/Network;->mPrivateDnsBypass:Z -Landroid/net/Network;->mUrlConnectionFactory:Lcom/android/okhttp/internalandroidapi/HttpURLConnectionFactory; -Landroid/net/Network;->setPrivateDnsBypass(Z)V -Landroid/net/Network;->writeToProto(Landroid/util/proto/ProtoOutputStream;J)V -Landroid/net/NetworkAgent;-><init>(Landroid/os/Looper;Landroid/content/Context;Ljava/lang/String;Landroid/net/NetworkInfo;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;I)V -Landroid/net/NetworkAgent;-><init>(Landroid/os/Looper;Landroid/content/Context;Ljava/lang/String;Landroid/net/NetworkInfo;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkMisc;)V -Landroid/net/NetworkAgent;->BASE:I -Landroid/net/NetworkAgent;->BW_REFRESH_MIN_WIN_MS:J -Landroid/net/NetworkAgent;->CMD_PREVENT_AUTOMATIC_RECONNECT:I -Landroid/net/NetworkAgent;->CMD_REPORT_NETWORK_STATUS:I -Landroid/net/NetworkAgent;->CMD_REQUEST_BANDWIDTH_UPDATE:I -Landroid/net/NetworkAgent;->CMD_SAVE_ACCEPT_UNVALIDATED:I -Landroid/net/NetworkAgent;->CMD_SET_SIGNAL_STRENGTH_THRESHOLDS:I -Landroid/net/NetworkAgent;->CMD_START_PACKET_KEEPALIVE:I -Landroid/net/NetworkAgent;->CMD_STOP_PACKET_KEEPALIVE:I -Landroid/net/NetworkAgent;->CMD_SUSPECT_BAD:I -Landroid/net/NetworkAgent;->DBG:Z -Landroid/net/NetworkAgent;->EVENT_NETWORK_CAPABILITIES_CHANGED:I -Landroid/net/NetworkAgent;->EVENT_NETWORK_INFO_CHANGED:I -Landroid/net/NetworkAgent;->EVENT_NETWORK_PROPERTIES_CHANGED:I -Landroid/net/NetworkAgent;->EVENT_NETWORK_SCORE_CHANGED:I -Landroid/net/NetworkAgent;->EVENT_PACKET_KEEPALIVE:I -Landroid/net/NetworkAgent;->EVENT_SET_EXPLICITLY_SELECTED:I -Landroid/net/NetworkAgent;->explicitlySelected(Z)V -Landroid/net/NetworkAgent;->INVALID_NETWORK:I -Landroid/net/NetworkAgent;->log(Ljava/lang/String;)V -Landroid/net/NetworkAgent;->LOG_TAG:Ljava/lang/String; -Landroid/net/NetworkAgent;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel; -Landroid/net/NetworkAgent;->mContext:Landroid/content/Context; -Landroid/net/NetworkAgent;->mLastBwRefreshTime:J -Landroid/net/NetworkAgent;->mPollLcePending:Ljava/util/concurrent/atomic/AtomicBoolean; -Landroid/net/NetworkAgent;->mPollLceScheduled:Z -Landroid/net/NetworkAgent;->mPreConnectedQueue:Ljava/util/ArrayList; -Landroid/net/NetworkAgent;->netId:I -Landroid/net/NetworkAgent;->networkStatus(ILjava/lang/String;)V -Landroid/net/NetworkAgent;->onPacketKeepaliveEvent(II)V -Landroid/net/NetworkAgent;->pollLceData()V -Landroid/net/NetworkAgent;->preventAutomaticReconnect()V -Landroid/net/NetworkAgent;->queueOrSendMessage(III)V -Landroid/net/NetworkAgent;->queueOrSendMessage(IIILjava/lang/Object;)V -Landroid/net/NetworkAgent;->queueOrSendMessage(ILjava/lang/Object;)V -Landroid/net/NetworkAgent;->queueOrSendMessage(Landroid/os/Message;)V -Landroid/net/NetworkAgent;->REDIRECT_URL_KEY:Ljava/lang/String; -Landroid/net/NetworkAgent;->saveAcceptUnvalidated(Z)V -Landroid/net/NetworkAgent;->sendLinkProperties(Landroid/net/LinkProperties;)V -Landroid/net/NetworkAgent;->sendNetworkCapabilities(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkAgent;->sendNetworkScore(I)V -Landroid/net/NetworkAgent;->setSignalStrengthThresholds([I)V -Landroid/net/NetworkAgent;->startPacketKeepalive(Landroid/os/Message;)V -Landroid/net/NetworkAgent;->stopPacketKeepalive(Landroid/os/Message;)V -Landroid/net/NetworkAgent;->unwanted()V -Landroid/net/NetworkAgent;->VALID_NETWORK:I -Landroid/net/NetworkAgent;->VDBG:Z -Landroid/net/NetworkAgent;->WIFI_BASE_SCORE:I -Landroid/net/NetworkBadging;-><init>()V -Landroid/net/NetworkBadging;->getBadgedWifiSignalResource(I)I -Landroid/net/NetworkBadging;->getWifiSignalResource(I)I -Landroid/net/NetworkCapabilities$NameOf;->nameOf(I)Ljava/lang/String; -Landroid/net/NetworkCapabilities;->addUnwantedCapability(I)V -Landroid/net/NetworkCapabilities;->appendStringRepresentationOfBitMaskToStringBuilder(Ljava/lang/StringBuilder;JLandroid/net/NetworkCapabilities$NameOf;Ljava/lang/String;)V -Landroid/net/NetworkCapabilities;->appliesToUid(I)Z -Landroid/net/NetworkCapabilities;->appliesToUidRange(Landroid/net/UidRange;)Z -Landroid/net/NetworkCapabilities;->capabilityNameOf(I)Ljava/lang/String; -Landroid/net/NetworkCapabilities;->capabilityNamesOf([I)Ljava/lang/String; -Landroid/net/NetworkCapabilities;->checkValidCapability(I)V -Landroid/net/NetworkCapabilities;->checkValidTransportType(I)V -Landroid/net/NetworkCapabilities;->clearAll()V -Landroid/net/NetworkCapabilities;->combineCapabilities(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineLinkBandwidths(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineNetCapabilities(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineSignalStrength(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineSpecifiers(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineSSIDs(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineTransportTypes(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->combineUids(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->DEFAULT_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->describeFirstNonRequestableCapability()Ljava/lang/String; -Landroid/net/NetworkCapabilities;->describeImmutableDifferences(Landroid/net/NetworkCapabilities;)Ljava/lang/String; -Landroid/net/NetworkCapabilities;->equalRequestableCapabilities(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsLinkBandwidths(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsNetCapabilities(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsNetCapabilitiesRequestable(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsSignalStrength(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsSpecifier(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsSSID(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsTransportTypes(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->equalsUids(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->FORCE_RESTRICTED_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->getSSID()Ljava/lang/String; -Landroid/net/NetworkCapabilities;->getUids()Ljava/util/Set; -Landroid/net/NetworkCapabilities;->getUnwantedCapabilities()[I -Landroid/net/NetworkCapabilities;->hasUnwantedCapability(I)Z -Landroid/net/NetworkCapabilities;->INVALID_UID:I -Landroid/net/NetworkCapabilities;->isValidCapability(I)Z -Landroid/net/NetworkCapabilities;->isValidTransport(I)Z -Landroid/net/NetworkCapabilities;->LINK_BANDWIDTH_UNSPECIFIED:I -Landroid/net/NetworkCapabilities;->maxBandwidth(II)I -Landroid/net/NetworkCapabilities;->MAX_NET_CAPABILITY:I -Landroid/net/NetworkCapabilities;->MAX_TRANSPORT:I -Landroid/net/NetworkCapabilities;->maybeMarkCapabilitiesRestricted()V -Landroid/net/NetworkCapabilities;->mEstablishingVpnAppUid:I -Landroid/net/NetworkCapabilities;->minBandwidth(II)I -Landroid/net/NetworkCapabilities;->MIN_NET_CAPABILITY:I -Landroid/net/NetworkCapabilities;->MIN_TRANSPORT:I -Landroid/net/NetworkCapabilities;->mLinkDownBandwidthKbps:I -Landroid/net/NetworkCapabilities;->mLinkUpBandwidthKbps:I -Landroid/net/NetworkCapabilities;->mNetworkSpecifier:Landroid/net/NetworkSpecifier; -Landroid/net/NetworkCapabilities;->mSSID:Ljava/lang/String; -Landroid/net/NetworkCapabilities;->mTransportTypes:J -Landroid/net/NetworkCapabilities;->mUids:Landroid/util/ArraySet; -Landroid/net/NetworkCapabilities;->mUnwantedNetworkCapabilities:J -Landroid/net/NetworkCapabilities;->MUTABLE_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->NON_REQUESTABLE_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->removeTransportType(I)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->RESTRICTED_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->satisfiedByImmutableNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedByLinkBandwidths(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedByNetCapabilities(Landroid/net/NetworkCapabilities;Z)Z -Landroid/net/NetworkCapabilities;->satisfiedByNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedByNetworkCapabilities(Landroid/net/NetworkCapabilities;Z)Z -Landroid/net/NetworkCapabilities;->satisfiedBySignalStrength(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedBySpecifier(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedBySSID(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedByTransportTypes(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->satisfiedByUids(Landroid/net/NetworkCapabilities;)Z -Landroid/net/NetworkCapabilities;->set(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkCapabilities;->setCapabilities([I)V -Landroid/net/NetworkCapabilities;->setCapabilities([I[I)V -Landroid/net/NetworkCapabilities;->setCapability(IZ)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setEstablishingVpnAppUid(I)V -Landroid/net/NetworkCapabilities;->setLinkDownstreamBandwidthKbps(I)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setLinkUpstreamBandwidthKbps(I)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setNetworkSpecifier(Landroid/net/NetworkSpecifier;)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setSingleUid(I)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setSSID(Ljava/lang/String;)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setTransportType(IZ)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->setTransportTypes([I)V -Landroid/net/NetworkCapabilities;->setUids(Ljava/util/Set;)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->SIGNAL_STRENGTH_UNSPECIFIED:I -Landroid/net/NetworkCapabilities;->TAG:Ljava/lang/String; -Landroid/net/NetworkCapabilities;->transportNameOf(I)Ljava/lang/String; -Landroid/net/NetworkCapabilities;->TRANSPORT_NAMES:[Ljava/lang/String; -Landroid/net/NetworkCapabilities;->UNRESTRICTED_CAPABILITIES:J -Landroid/net/NetworkCapabilities;->writeToProto(Landroid/util/proto/ProtoOutputStream;J)V -Landroid/net/NetworkCapabilitiesProto;-><init>()V -Landroid/net/NetworkCapabilitiesProto;->CAN_REPORT_SIGNAL_STRENGTH:J -Landroid/net/NetworkCapabilitiesProto;->CAPABILITIES:J -Landroid/net/NetworkCapabilitiesProto;->LINK_DOWN_BANDWIDTH_KBPS:J -Landroid/net/NetworkCapabilitiesProto;->LINK_UP_BANDWIDTH_KBPS:J -Landroid/net/NetworkCapabilitiesProto;->NETWORK_SPECIFIER:J -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_CAPTIVE_PORTAL:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_CBS:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_DUN:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_EIMS:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_FOREGROUND:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_FOTA:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_IA:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_IMS:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_INTERNET:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_MMS:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_NOT_METERED:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_NOT_RESTRICTED:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_NOT_ROAMING:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_NOT_VPN:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_RCS:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_SUPL:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_TRUSTED:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_VALIDATED:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_WIFI_P2P:I -Landroid/net/NetworkCapabilitiesProto;->NET_CAPABILITY_XCAP:I -Landroid/net/NetworkCapabilitiesProto;->SIGNAL_STRENGTH:J -Landroid/net/NetworkCapabilitiesProto;->TRANSPORTS:J -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_BLUETOOTH:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_CELLULAR:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_ETHERNET:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_LOWPAN:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_VPN:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_WIFI:I -Landroid/net/NetworkCapabilitiesProto;->TRANSPORT_WIFI_AWARE:I -Landroid/net/NetworkConfig;-><init>(Ljava/lang/String;)V -Landroid/net/NetworkConfig;->dependencyMet:Z -Landroid/net/NetworkConfig;->isDefault()Z -Landroid/net/NetworkConfig;->name:Ljava/lang/String; -Landroid/net/NetworkConfig;->priority:I -Landroid/net/NetworkConfig;->radio:I -Landroid/net/NetworkConfig;->restoreTime:I -Landroid/net/NetworkConfig;->type:I -Landroid/net/NetworkFactory$NetworkRequestInfo;->request:Landroid/net/NetworkRequest; -Landroid/net/NetworkFactory$NetworkRequestInfo;->requested:Z -Landroid/net/NetworkFactory$NetworkRequestInfo;->score:I -Landroid/net/NetworkFactory;->acceptRequest(Landroid/net/NetworkRequest;I)Z -Landroid/net/NetworkFactory;->addNetworkRequest(Landroid/net/NetworkRequest;I)V -Landroid/net/NetworkFactory;->BASE:I -Landroid/net/NetworkFactory;->CMD_CANCEL_REQUEST:I -Landroid/net/NetworkFactory;->CMD_REQUEST_NETWORK:I -Landroid/net/NetworkFactory;->CMD_SET_FILTER:I -Landroid/net/NetworkFactory;->CMD_SET_SCORE:I -Landroid/net/NetworkFactory;->DBG:Z -Landroid/net/NetworkFactory;->evalRequest(Landroid/net/NetworkFactory$NetworkRequestInfo;)V -Landroid/net/NetworkFactory;->evalRequests()V -Landroid/net/NetworkFactory;->getRequestCount()I -Landroid/net/NetworkFactory;->handleAddRequest(Landroid/net/NetworkRequest;I)V -Landroid/net/NetworkFactory;->handleRemoveRequest(Landroid/net/NetworkRequest;)V -Landroid/net/NetworkFactory;->handleSetFilter(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkFactory;->handleSetScore(I)V -Landroid/net/NetworkFactory;->log(Ljava/lang/String;)V -Landroid/net/NetworkFactory;->LOG_TAG:Ljava/lang/String; -Landroid/net/NetworkFactory;->mCapabilityFilter:Landroid/net/NetworkCapabilities; -Landroid/net/NetworkFactory;->mContext:Landroid/content/Context; -Landroid/net/NetworkFactory;->mMessenger:Landroid/os/Messenger; -Landroid/net/NetworkFactory;->mNetworkRequests:Landroid/util/SparseArray; -Landroid/net/NetworkFactory;->mRefCount:I -Landroid/net/NetworkFactory;->mScore:I -Landroid/net/NetworkFactory;->needNetworkFor(Landroid/net/NetworkRequest;I)V -Landroid/net/NetworkFactory;->reevaluateAllRequests()V -Landroid/net/NetworkFactory;->register()V -Landroid/net/NetworkFactory;->releaseNetworkFor(Landroid/net/NetworkRequest;)V -Landroid/net/NetworkFactory;->removeNetworkRequest(Landroid/net/NetworkRequest;)V -Landroid/net/NetworkFactory;->setCapabilityFilter(Landroid/net/NetworkCapabilities;)V -Landroid/net/NetworkFactory;->startNetwork()V -Landroid/net/NetworkFactory;->stopNetwork()V -Landroid/net/NetworkFactory;->unregister()V -Landroid/net/NetworkFactory;->VDBG:Z -Landroid/net/NetworkIdentity;-><init>(IILjava/lang/String;Ljava/lang/String;ZZZ)V -Landroid/net/NetworkIdentity;->buildNetworkIdentity(Landroid/content/Context;Landroid/net/NetworkState;Z)Landroid/net/NetworkIdentity; -Landroid/net/NetworkIdentity;->COMBINE_SUBTYPE_ENABLED:Z -Landroid/net/NetworkIdentity;->compareTo(Landroid/net/NetworkIdentity;)I -Landroid/net/NetworkIdentity;->getDefaultNetwork()Z -Landroid/net/NetworkIdentity;->getMetered()Z -Landroid/net/NetworkIdentity;->getNetworkId()Ljava/lang/String; -Landroid/net/NetworkIdentity;->getRoaming()Z -Landroid/net/NetworkIdentity;->getSubscriberId()Ljava/lang/String; -Landroid/net/NetworkIdentity;->getSubType()I -Landroid/net/NetworkIdentity;->getType()I -Landroid/net/NetworkIdentity;->mDefaultNetwork:Z -Landroid/net/NetworkIdentity;->mMetered:Z -Landroid/net/NetworkIdentity;->mNetworkId:Ljava/lang/String; -Landroid/net/NetworkIdentity;->mRoaming:Z -Landroid/net/NetworkIdentity;->mSubscriberId:Ljava/lang/String; -Landroid/net/NetworkIdentity;->mSubType:I -Landroid/net/NetworkIdentity;->mType:I -Landroid/net/NetworkIdentity;->scrubSubscriberId(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/NetworkIdentity;->scrubSubscriberId([Ljava/lang/String;)[Ljava/lang/String; -Landroid/net/NetworkIdentity;->SUBTYPE_COMBINED:I -Landroid/net/NetworkIdentity;->TAG:Ljava/lang/String; -Landroid/net/NetworkIdentity;->writeToProto(Landroid/util/proto/ProtoOutputStream;J)V -Landroid/net/NetworkInfo;->mDetailedState:Landroid/net/NetworkInfo$DetailedState; -Landroid/net/NetworkInfo;->mExtraInfo:Ljava/lang/String; -Landroid/net/NetworkInfo;->mIsAvailable:Z -Landroid/net/NetworkInfo;->mIsFailover:Z -Landroid/net/NetworkInfo;->mIsRoaming:Z -Landroid/net/NetworkInfo;->mNetworkType:I -Landroid/net/NetworkInfo;->mReason:Ljava/lang/String; -Landroid/net/NetworkInfo;->mState:Landroid/net/NetworkInfo$State; -Landroid/net/NetworkInfo;->mSubtype:I -Landroid/net/NetworkInfo;->mSubtypeName:Ljava/lang/String; -Landroid/net/NetworkInfo;->mTypeName:Ljava/lang/String; -Landroid/net/NetworkInfo;->setExtraInfo(Ljava/lang/String;)V -Landroid/net/NetworkInfo;->setType(I)V -Landroid/net/NetworkInfo;->stateMap:Ljava/util/EnumMap; -Landroid/net/NetworkKey;-><init>(Landroid/os/Parcel;)V -Landroid/net/NetworkKey;->createFromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/NetworkKey; -Landroid/net/NetworkKey;->createFromWifiInfo(Landroid/net/wifi/WifiInfo;)Landroid/net/NetworkKey; -Landroid/net/NetworkKey;->TAG:Ljava/lang/String; -Landroid/net/NetworkMisc;-><init>()V -Landroid/net/NetworkMisc;-><init>(Landroid/net/NetworkMisc;)V -Landroid/net/NetworkMisc;->acceptUnvalidated:Z -Landroid/net/NetworkMisc;->allowBypass:Z -Landroid/net/NetworkMisc;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/NetworkMisc;->explicitlySelected:Z -Landroid/net/NetworkMisc;->provisioningNotificationDisabled:Z -Landroid/net/NetworkMisc;->subscriberId:Ljava/lang/String; -Landroid/net/NetworkPolicy;-><init>(Landroid/net/NetworkTemplate;ILjava/lang/String;JJZ)V -Landroid/net/NetworkPolicy;-><init>(Landroid/net/NetworkTemplate;Landroid/util/RecurrenceRule;JJJJJZZ)V -Landroid/net/NetworkPolicy;-><init>(Landroid/net/NetworkTemplate;Landroid/util/RecurrenceRule;JJJJZZ)V -Landroid/net/NetworkPolicy;-><init>(Landroid/os/Parcel;)V -Landroid/net/NetworkPolicy;->buildRule(ILjava/time/ZoneId;)Landroid/util/RecurrenceRule; -Landroid/net/NetworkPolicy;->cycleIterator()Ljava/util/Iterator; -Landroid/net/NetworkPolicy;->cycleRule:Landroid/util/RecurrenceRule; -Landroid/net/NetworkPolicy;->CYCLE_NONE:I -Landroid/net/NetworkPolicy;->DEFAULT_MTU:J -Landroid/net/NetworkPolicy;->getBytesForBackup()[B -Landroid/net/NetworkPolicy;->getNetworkPolicyFromBackup(Ljava/io/DataInputStream;)Landroid/net/NetworkPolicy; -Landroid/net/NetworkPolicy;->hasCycle()Z -Landroid/net/NetworkPolicy;->lastLimitSnooze:J -Landroid/net/NetworkPolicy;->lastRapidSnooze:J -Landroid/net/NetworkPolicy;->lastWarningSnooze:J -Landroid/net/NetworkPolicy;->LIMIT_DISABLED:J -Landroid/net/NetworkPolicy;->SNOOZE_NEVER:J -Landroid/net/NetworkPolicy;->VERSION_INIT:I -Landroid/net/NetworkPolicy;->VERSION_RAPID:I -Landroid/net/NetworkPolicy;->VERSION_RULE:I -Landroid/net/NetworkPolicy;->WARNING_DISABLED:J -Landroid/net/NetworkPolicyManager$Listener;-><init>()V -Landroid/net/NetworkPolicyManager$Listener;->onMeteredIfacesChanged([Ljava/lang/String;)V -Landroid/net/NetworkPolicyManager$Listener;->onRestrictBackgroundChanged(Z)V -Landroid/net/NetworkPolicyManager$Listener;->onSubscriptionOverride(III)V -Landroid/net/NetworkPolicyManager$Listener;->onUidPoliciesChanged(II)V -Landroid/net/NetworkPolicyManager$Listener;->onUidRulesChanged(II)V -Landroid/net/NetworkPolicyManager;-><init>(Landroid/content/Context;Landroid/net/INetworkPolicyManager;)V -Landroid/net/NetworkPolicyManager;->addUidPolicy(II)V -Landroid/net/NetworkPolicyManager;->ALLOW_PLATFORM_APP_POLICY:Z -Landroid/net/NetworkPolicyManager;->cycleIterator(Landroid/net/NetworkPolicy;)Ljava/util/Iterator; -Landroid/net/NetworkPolicyManager;->EXTRA_NETWORK_TEMPLATE:Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->factoryReset(Ljava/lang/String;)V -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_DOZABLE:I -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_NAME_DOZABLE:Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_NAME_NONE:Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_NAME_POWERSAVE:Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_NAME_STANDBY:Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_NONE:I -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_POWERSAVE:I -Landroid/net/NetworkPolicyManager;->FIREWALL_CHAIN_STANDBY:I -Landroid/net/NetworkPolicyManager;->FIREWALL_RULE_ALLOW:I -Landroid/net/NetworkPolicyManager;->FIREWALL_RULE_DEFAULT:I -Landroid/net/NetworkPolicyManager;->FIREWALL_RULE_DENY:I -Landroid/net/NetworkPolicyManager;->FIREWALL_TYPE_BLACKLIST:I -Landroid/net/NetworkPolicyManager;->FIREWALL_TYPE_WHITELIST:I -Landroid/net/NetworkPolicyManager;->FOREGROUND_THRESHOLD_STATE:I -Landroid/net/NetworkPolicyManager;->isProcStateAllowedWhileIdleOrPowerSaveMode(I)Z -Landroid/net/NetworkPolicyManager;->isProcStateAllowedWhileOnRestrictBackground(I)Z -Landroid/net/NetworkPolicyManager;->isUidValidForPolicy(Landroid/content/Context;I)Z -Landroid/net/NetworkPolicyManager;->MASK_ALL_NETWORKS:I -Landroid/net/NetworkPolicyManager;->MASK_METERED_NETWORKS:I -Landroid/net/NetworkPolicyManager;->mContext:Landroid/content/Context; -Landroid/net/NetworkPolicyManager;->OVERRIDE_CONGESTED:I -Landroid/net/NetworkPolicyManager;->OVERRIDE_UNMETERED:I -Landroid/net/NetworkPolicyManager;->POLICY_ALLOW_METERED_BACKGROUND:I -Landroid/net/NetworkPolicyManager;->POLICY_NONE:I -Landroid/net/NetworkPolicyManager;->POLICY_REJECT_METERED_BACKGROUND:I -Landroid/net/NetworkPolicyManager;->removeUidPolicy(II)V -Landroid/net/NetworkPolicyManager;->resolveNetworkId(Landroid/net/wifi/WifiConfiguration;)Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->resolveNetworkId(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->RULE_ALLOW_ALL:I -Landroid/net/NetworkPolicyManager;->RULE_ALLOW_METERED:I -Landroid/net/NetworkPolicyManager;->RULE_NONE:I -Landroid/net/NetworkPolicyManager;->RULE_REJECT_ALL:I -Landroid/net/NetworkPolicyManager;->RULE_REJECT_METERED:I -Landroid/net/NetworkPolicyManager;->RULE_TEMPORARY_ALLOW_METERED:I -Landroid/net/NetworkPolicyManager;->setNetworkPolicies([Landroid/net/NetworkPolicy;)V -Landroid/net/NetworkPolicyManager;->uidPoliciesToString(I)Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->uidRulesToString(I)Ljava/lang/String; -Landroid/net/NetworkProto;-><init>()V -Landroid/net/NetworkProto;->NET_ID:J -Landroid/net/NetworkQuotaInfo;-><init>()V -Landroid/net/NetworkQuotaInfo;-><init>(Landroid/os/Parcel;)V -Landroid/net/NetworkQuotaInfo;->NO_LIMIT:J -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->enforceCallingPermission()V -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->execute(Ljava/lang/Runnable;)V -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->mContext:Landroid/content/Context; -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->mExecutor:Ljava/util/concurrent/Executor; -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->mHandler:Landroid/os/Handler; -Landroid/net/NetworkRecommendationProvider$ServiceWrapper;->requestScores([Landroid/net/NetworkKey;)V -Landroid/net/NetworkRecommendationProvider;->mService:Landroid/os/IBinder; -Landroid/net/NetworkRecommendationProvider;->TAG:Ljava/lang/String; -Landroid/net/NetworkRecommendationProvider;->VERBOSE:Z -Landroid/net/NetworkRequest$Builder;->addUnwantedCapability(I)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest$Builder;->mNetworkCapabilities:Landroid/net/NetworkCapabilities; -Landroid/net/NetworkRequest$Builder;->setCapabilities(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest$Builder;->setLinkDownstreamBandwidthKbps(I)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest$Builder;->setLinkUpstreamBandwidthKbps(I)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest$Builder;->setUids(Ljava/util/Set;)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest$Type;->BACKGROUND_REQUEST:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->LISTEN:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->NONE:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->REQUEST:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->TRACK_DEFAULT:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->valueOf(Ljava/lang/String;)Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest$Type;->values()[Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest;-><init>(Landroid/net/NetworkCapabilities;IILandroid/net/NetworkRequest$Type;)V -Landroid/net/NetworkRequest;-><init>(Landroid/net/NetworkRequest;)V -Landroid/net/NetworkRequest;->hasUnwantedCapability(I)Z -Landroid/net/NetworkRequest;->isBackgroundRequest()Z -Landroid/net/NetworkRequest;->isForegroundRequest()Z -Landroid/net/NetworkRequest;->isListen()Z -Landroid/net/NetworkRequest;->isRequest()Z -Landroid/net/NetworkRequest;->type:Landroid/net/NetworkRequest$Type; -Landroid/net/NetworkRequest;->typeToProtoEnum(Landroid/net/NetworkRequest$Type;)I -Landroid/net/NetworkRequest;->writeToProto(Landroid/util/proto/ProtoOutputStream;J)V -Landroid/net/NetworkRequestProto;-><init>()V -Landroid/net/NetworkRequestProto;->LEGACY_TYPE:J -Landroid/net/NetworkRequestProto;->NETWORK_CAPABILITIES:J -Landroid/net/NetworkRequestProto;->REQUEST_ID:J -Landroid/net/NetworkRequestProto;->TYPE:J -Landroid/net/NetworkRequestProto;->TYPE_BACKGROUND_REQUEST:I -Landroid/net/NetworkRequestProto;->TYPE_LISTEN:I -Landroid/net/NetworkRequestProto;->TYPE_NONE:I -Landroid/net/NetworkRequestProto;->TYPE_REQUEST:I -Landroid/net/NetworkRequestProto;->TYPE_TRACK_DEFAULT:I -Landroid/net/NetworkRequestProto;->TYPE_UNKNOWN:I -Landroid/net/NetworkScoreManager;-><init>(Landroid/content/Context;)V -Landroid/net/NetworkScoreManager;->CACHE_FILTER_CURRENT_NETWORK:I -Landroid/net/NetworkScoreManager;->CACHE_FILTER_NONE:I -Landroid/net/NetworkScoreManager;->CACHE_FILTER_SCAN_RESULTS:I -Landroid/net/NetworkScoreManager;->getActiveScorer()Landroid/net/NetworkScorerAppData; -Landroid/net/NetworkScoreManager;->getAllValidScorers()Ljava/util/List; -Landroid/net/NetworkScoreManager;->isCallerActiveScorer(I)Z -Landroid/net/NetworkScoreManager;->mContext:Landroid/content/Context; -Landroid/net/NetworkScoreManager;->mService:Landroid/net/INetworkScoreService; -Landroid/net/NetworkScoreManager;->NETWORK_AVAILABLE_NOTIFICATION_CHANNEL_ID_META_DATA:Ljava/lang/String; -Landroid/net/NetworkScoreManager;->RECOMMENDATIONS_ENABLED_FORCED_OFF:I -Landroid/net/NetworkScoreManager;->RECOMMENDATIONS_ENABLED_OFF:I -Landroid/net/NetworkScoreManager;->RECOMMENDATIONS_ENABLED_ON:I -Landroid/net/NetworkScoreManager;->RECOMMENDATION_SERVICE_LABEL_META_DATA:Ljava/lang/String; -Landroid/net/NetworkScoreManager;->registerNetworkScoreCache(ILandroid/net/INetworkScoreCache;)V -Landroid/net/NetworkScoreManager;->registerNetworkScoreCache(ILandroid/net/INetworkScoreCache;I)V -Landroid/net/NetworkScoreManager;->requestScores([Landroid/net/NetworkKey;)Z -Landroid/net/NetworkScoreManager;->unregisterNetworkScoreCache(ILandroid/net/INetworkScoreCache;)V -Landroid/net/NetworkScoreManager;->USE_OPEN_WIFI_PACKAGE_META_DATA:Ljava/lang/String; -Landroid/net/NetworkScorerAppData;-><init>(ILandroid/content/ComponentName;Ljava/lang/String;Landroid/content/ComponentName;Ljava/lang/String;)V -Landroid/net/NetworkScorerAppData;-><init>(Landroid/os/Parcel;)V -Landroid/net/NetworkScorerAppData;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/NetworkScorerAppData;->getEnableUseOpenWifiActivity()Landroid/content/ComponentName; -Landroid/net/NetworkScorerAppData;->getNetworkAvailableNotificationChannelId()Ljava/lang/String; -Landroid/net/NetworkScorerAppData;->getRecommendationServiceComponent()Landroid/content/ComponentName; -Landroid/net/NetworkScorerAppData;->getRecommendationServiceLabel()Ljava/lang/String; -Landroid/net/NetworkScorerAppData;->getRecommendationServicePackageName()Ljava/lang/String; -Landroid/net/NetworkScorerAppData;->mEnableUseOpenWifiActivity:Landroid/content/ComponentName; -Landroid/net/NetworkScorerAppData;->mNetworkAvailableNotificationChannelId:Ljava/lang/String; -Landroid/net/NetworkScorerAppData;->mRecommendationService:Landroid/content/ComponentName; -Landroid/net/NetworkScorerAppData;->mRecommendationServiceLabel:Ljava/lang/String; -Landroid/net/NetworkScorerAppData;->packageUid:I -Landroid/net/NetworkSpecifier;-><init>()V -Landroid/net/NetworkSpecifier;->assertValidFromUid(I)V -Landroid/net/NetworkSpecifier;->satisfiedBy(Landroid/net/NetworkSpecifier;)Z -Landroid/net/NetworkState;-><init>(Landroid/net/NetworkInfo;Landroid/net/LinkProperties;Landroid/net/NetworkCapabilities;Landroid/net/Network;Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/NetworkState;->EMPTY:Landroid/net/NetworkState; -Landroid/net/NetworkState;->linkProperties:Landroid/net/LinkProperties; -Landroid/net/NetworkState;->networkCapabilities:Landroid/net/NetworkCapabilities; -Landroid/net/NetworkState;->networkId:Ljava/lang/String; -Landroid/net/NetworkState;->networkInfo:Landroid/net/NetworkInfo; -Landroid/net/NetworkState;->SANITY_CHECK_ROAMING:Z -Landroid/net/NetworkState;->subscriberId:Ljava/lang/String; -Landroid/net/NetworkStats$Entry;-><init>(JJJJJ)V -Landroid/net/NetworkStats$Entry;-><init>(Ljava/lang/String;IIIIIIJJJJJ)V -Landroid/net/NetworkStats$Entry;-><init>(Ljava/lang/String;IIIJJJJJ)V -Landroid/net/NetworkStats$Entry;->add(Landroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStats$Entry;->defaultNetwork:I -Landroid/net/NetworkStats$Entry;->isEmpty()Z -Landroid/net/NetworkStats$Entry;->isNegative()Z -Landroid/net/NetworkStats$Entry;->metered:I -Landroid/net/NetworkStats$Entry;->operations:J -Landroid/net/NetworkStats$Entry;->roaming:I -Landroid/net/NetworkStats$NonMonotonicObserver;->foundNonMonotonic(Landroid/net/NetworkStats;ILandroid/net/NetworkStats;ILjava/lang/Object;)V -Landroid/net/NetworkStats$NonMonotonicObserver;->foundNonMonotonic(Landroid/net/NetworkStats;ILjava/lang/Object;)V -Landroid/net/NetworkStats;->addIfaceValues(Ljava/lang/String;JJJJ)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->addTrafficToApplications(ILjava/lang/String;Ljava/lang/String;Landroid/net/NetworkStats$Entry;Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry; -Landroid/net/NetworkStats;->addValues(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->addValues(Ljava/lang/String;IIIIIIJJJJJ)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->addValues(Ljava/lang/String;IIIJJJJJ)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->apply464xlatAdjustments(Landroid/net/NetworkStats;Landroid/net/NetworkStats;Ljava/util/Map;)V -Landroid/net/NetworkStats;->apply464xlatAdjustments(Ljava/util/Map;)V -Landroid/net/NetworkStats;->CLATD_INTERFACE_PREFIX:Ljava/lang/String; -Landroid/net/NetworkStats;->clear()V -Landroid/net/NetworkStats;->combineValues(Ljava/lang/String;IIIJJJJJ)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->combineValues(Ljava/lang/String;IIJJJJJ)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->deductTrafficFromVpnApp(ILjava/lang/String;Landroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStats;->defaultNetworkToString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->DEFAULT_NETWORK_ALL:I -Landroid/net/NetworkStats;->DEFAULT_NETWORK_NO:I -Landroid/net/NetworkStats;->DEFAULT_NETWORK_YES:I -Landroid/net/NetworkStats;->dump(Ljava/lang/String;Ljava/io/PrintWriter;)V -Landroid/net/NetworkStats;->elapsedRealtime:J -Landroid/net/NetworkStats;->filter(I[Ljava/lang/String;I)V -Landroid/net/NetworkStats;->findIndex(Ljava/lang/String;IIIIII)I -Landroid/net/NetworkStats;->findIndexHinted(Ljava/lang/String;IIIIIII)I -Landroid/net/NetworkStats;->getElapsedRealtime()J -Landroid/net/NetworkStats;->getElapsedRealtimeAge()J -Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;Ljava/util/HashSet;)Landroid/net/NetworkStats$Entry; -Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;Ljava/util/HashSet;IZ)Landroid/net/NetworkStats$Entry; -Landroid/net/NetworkStats;->getTotalPackets()J -Landroid/net/NetworkStats;->getUniqueIfaces()[Ljava/lang/String; -Landroid/net/NetworkStats;->groupedByIface()Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->groupedByUid()Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->IFACE_ALL:Ljava/lang/String; -Landroid/net/NetworkStats;->INTERFACES_ALL:[Ljava/lang/String; -Landroid/net/NetworkStats;->internalSize()I -Landroid/net/NetworkStats;->IPV4V6_HEADER_DELTA:I -Landroid/net/NetworkStats;->meteredToString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->METERED_ALL:I -Landroid/net/NetworkStats;->METERED_NO:I -Landroid/net/NetworkStats;->METERED_YES:I -Landroid/net/NetworkStats;->migrateTun(ILjava/lang/String;Ljava/lang/String;)Z -Landroid/net/NetworkStats;->roamingToString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->ROAMING_ALL:I -Landroid/net/NetworkStats;->ROAMING_NO:I -Landroid/net/NetworkStats;->ROAMING_YES:I -Landroid/net/NetworkStats;->setElapsedRealtime(J)V -Landroid/net/NetworkStats;->setMatches(II)Z -Landroid/net/NetworkStats;->setToCheckinString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->setToString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->setValues(ILandroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStats;->SET_ALL:I -Landroid/net/NetworkStats;->SET_DBG_VPN_IN:I -Landroid/net/NetworkStats;->SET_DBG_VPN_OUT:I -Landroid/net/NetworkStats;->SET_DEBUG_START:I -Landroid/net/NetworkStats;->SET_DEFAULT:I -Landroid/net/NetworkStats;->SET_FOREGROUND:I -Landroid/net/NetworkStats;->spliceOperationsFrom(Landroid/net/NetworkStats;)V -Landroid/net/NetworkStats;->STATS_PER_IFACE:I -Landroid/net/NetworkStats;->STATS_PER_UID:I -Landroid/net/NetworkStats;->subtract(Landroid/net/NetworkStats;)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->subtract(Landroid/net/NetworkStats;Landroid/net/NetworkStats;Landroid/net/NetworkStats$NonMonotonicObserver;Ljava/lang/Object;)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->subtract(Landroid/net/NetworkStats;Landroid/net/NetworkStats;Landroid/net/NetworkStats$NonMonotonicObserver;Ljava/lang/Object;Landroid/net/NetworkStats;)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->TAG:Ljava/lang/String; -Landroid/net/NetworkStats;->tagToString(I)Ljava/lang/String; -Landroid/net/NetworkStats;->TAG_ALL:I -Landroid/net/NetworkStats;->TAG_NONE:I -Landroid/net/NetworkStats;->tunAdjustmentInit(ILjava/lang/String;Ljava/lang/String;Landroid/net/NetworkStats$Entry;Landroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStats;->tunGetPool(Landroid/net/NetworkStats$Entry;Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry; -Landroid/net/NetworkStats;->tunSubtract(ILandroid/net/NetworkStats;Landroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStats;->UID_ALL:I -Landroid/net/NetworkStats;->withoutUids([I)Landroid/net/NetworkStats; -Landroid/net/NetworkStatsHistory$DataStreamUtils;-><init>()V -Landroid/net/NetworkStatsHistory$DataStreamUtils;->readFullLongArray(Ljava/io/DataInputStream;)[J -Landroid/net/NetworkStatsHistory$DataStreamUtils;->readVarLong(Ljava/io/DataInputStream;)J -Landroid/net/NetworkStatsHistory$DataStreamUtils;->readVarLongArray(Ljava/io/DataInputStream;)[J -Landroid/net/NetworkStatsHistory$DataStreamUtils;->writeVarLong(Ljava/io/DataOutputStream;J)V -Landroid/net/NetworkStatsHistory$DataStreamUtils;->writeVarLongArray(Ljava/io/DataOutputStream;[JI)V -Landroid/net/NetworkStatsHistory$Entry;-><init>()V -Landroid/net/NetworkStatsHistory$Entry;->activeTime:J -Landroid/net/NetworkStatsHistory$Entry;->operations:J -Landroid/net/NetworkStatsHistory$Entry;->UNKNOWN:J -Landroid/net/NetworkStatsHistory$ParcelUtils;-><init>()V -Landroid/net/NetworkStatsHistory$ParcelUtils;->readLongArray(Landroid/os/Parcel;)[J -Landroid/net/NetworkStatsHistory$ParcelUtils;->writeLongArray(Landroid/os/Parcel;[JI)V -Landroid/net/NetworkStatsHistory;-><init>(JI)V -Landroid/net/NetworkStatsHistory;-><init>(JII)V -Landroid/net/NetworkStatsHistory;-><init>(Landroid/net/NetworkStatsHistory;J)V -Landroid/net/NetworkStatsHistory;-><init>(Ljava/io/DataInputStream;)V -Landroid/net/NetworkStatsHistory;->activeTime:[J -Landroid/net/NetworkStatsHistory;->addLong([JIJ)V -Landroid/net/NetworkStatsHistory;->bucketCount:I -Landroid/net/NetworkStatsHistory;->bucketDuration:J -Landroid/net/NetworkStatsHistory;->bucketStart:[J -Landroid/net/NetworkStatsHistory;->clear()V -Landroid/net/NetworkStatsHistory;->dump(Lcom/android/internal/util/IndentingPrintWriter;Z)V -Landroid/net/NetworkStatsHistory;->dumpCheckin(Ljava/io/PrintWriter;)V -Landroid/net/NetworkStatsHistory;->ensureBuckets(JJ)V -Landroid/net/NetworkStatsHistory;->estimateResizeBuckets(J)I -Landroid/net/NetworkStatsHistory;->FIELD_ACTIVE_TIME:I -Landroid/net/NetworkStatsHistory;->FIELD_ALL:I -Landroid/net/NetworkStatsHistory;->FIELD_OPERATIONS:I -Landroid/net/NetworkStatsHistory;->FIELD_RX_BYTES:I -Landroid/net/NetworkStatsHistory;->FIELD_RX_PACKETS:I -Landroid/net/NetworkStatsHistory;->FIELD_TX_BYTES:I -Landroid/net/NetworkStatsHistory;->FIELD_TX_PACKETS:I -Landroid/net/NetworkStatsHistory;->generateRandom(JJJ)V -Landroid/net/NetworkStatsHistory;->generateRandom(JJJJJJJLjava/util/Random;)V -Landroid/net/NetworkStatsHistory;->getBucketDuration()J -Landroid/net/NetworkStatsHistory;->getIndexAfter(J)I -Landroid/net/NetworkStatsHistory;->getLong([JIJ)J -Landroid/net/NetworkStatsHistory;->getTotalBytes()J -Landroid/net/NetworkStatsHistory;->insertBucket(IJ)V -Landroid/net/NetworkStatsHistory;->intersects(JJ)Z -Landroid/net/NetworkStatsHistory;->operations:[J -Landroid/net/NetworkStatsHistory;->randomLong(Ljava/util/Random;JJ)J -Landroid/net/NetworkStatsHistory;->recordData(JJJJ)V -Landroid/net/NetworkStatsHistory;->recordData(JJLandroid/net/NetworkStats$Entry;)V -Landroid/net/NetworkStatsHistory;->recordHistory(Landroid/net/NetworkStatsHistory;JJ)V -Landroid/net/NetworkStatsHistory;->removeBucketsBefore(J)V -Landroid/net/NetworkStatsHistory;->rxBytes:[J -Landroid/net/NetworkStatsHistory;->rxPackets:[J -Landroid/net/NetworkStatsHistory;->setLong([JIJ)V -Landroid/net/NetworkStatsHistory;->setValues(ILandroid/net/NetworkStatsHistory$Entry;)V -Landroid/net/NetworkStatsHistory;->totalBytes:J -Landroid/net/NetworkStatsHistory;->txBytes:[J -Landroid/net/NetworkStatsHistory;->txPackets:[J -Landroid/net/NetworkStatsHistory;->VERSION_ADD_ACTIVE:I -Landroid/net/NetworkStatsHistory;->VERSION_ADD_PACKETS:I -Landroid/net/NetworkStatsHistory;->VERSION_INIT:I -Landroid/net/NetworkStatsHistory;->writeToProto(Landroid/util/proto/ProtoOutputStream;J)V -Landroid/net/NetworkStatsHistory;->writeToProto(Landroid/util/proto/ProtoOutputStream;J[JI)V -Landroid/net/NetworkStatsHistory;->writeToStream(Ljava/io/DataOutputStream;)V -Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/NetworkTemplate;-><init>(ILjava/lang/String;[Ljava/lang/String;Ljava/lang/String;III)V -Landroid/net/NetworkTemplate;-><init>(Landroid/os/Parcel;)V -Landroid/net/NetworkTemplate;->BACKUP_VERSION:I -Landroid/net/NetworkTemplate;->buildTemplateBluetooth()Landroid/net/NetworkTemplate; -Landroid/net/NetworkTemplate;->buildTemplateProxy()Landroid/net/NetworkTemplate; -Landroid/net/NetworkTemplate;->buildTemplateWifi(Ljava/lang/String;)Landroid/net/NetworkTemplate; -Landroid/net/NetworkTemplate;->forceAllNetworkTypes()V -Landroid/net/NetworkTemplate;->getBytesForBackup()[B -Landroid/net/NetworkTemplate;->getMatchRuleName(I)Ljava/lang/String; -Landroid/net/NetworkTemplate;->getNetworkId()Ljava/lang/String; -Landroid/net/NetworkTemplate;->getNetworkTemplateFromBackup(Ljava/io/DataInputStream;)Landroid/net/NetworkTemplate; -Landroid/net/NetworkTemplate;->isKnownMatchRule(I)Z -Landroid/net/NetworkTemplate;->isMatchRuleMobile()Z -Landroid/net/NetworkTemplate;->isPersistable()Z -Landroid/net/NetworkTemplate;->matches(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesBluetooth(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesDefaultNetwork(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesEthernet(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesMetered(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesMobile(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesMobileWildcard(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesProxy(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesRoaming(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesSubscriberId(Ljava/lang/String;)Z -Landroid/net/NetworkTemplate;->matchesWifi(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->matchesWifiWildcard(Landroid/net/NetworkIdentity;)Z -Landroid/net/NetworkTemplate;->MATCH_BLUETOOTH:I -Landroid/net/NetworkTemplate;->MATCH_ETHERNET:I -Landroid/net/NetworkTemplate;->MATCH_MOBILE:I -Landroid/net/NetworkTemplate;->MATCH_MOBILE_WILDCARD:I -Landroid/net/NetworkTemplate;->MATCH_PROXY:I -Landroid/net/NetworkTemplate;->MATCH_WIFI:I -Landroid/net/NetworkTemplate;->MATCH_WIFI_WILDCARD:I -Landroid/net/NetworkTemplate;->mDefaultNetwork:I -Landroid/net/NetworkTemplate;->mMatchRule:I -Landroid/net/NetworkTemplate;->mMatchSubscriberIds:[Ljava/lang/String; -Landroid/net/NetworkTemplate;->mMetered:I -Landroid/net/NetworkTemplate;->mNetworkId:Ljava/lang/String; -Landroid/net/NetworkTemplate;->mRoaming:I -Landroid/net/NetworkTemplate;->mSubscriberId:Ljava/lang/String; -Landroid/net/NetworkTemplate;->sForceAllNetworkTypes:Z -Landroid/net/NetworkTemplate;->TAG:Ljava/lang/String; -Landroid/net/NetworkUtils;-><init>()V -Landroid/net/NetworkUtils;->addressTypeMatches(Ljava/net/InetAddress;Ljava/net/InetAddress;)Z -Landroid/net/NetworkUtils;->bindProcessToNetwork(I)Z -Landroid/net/NetworkUtils;->bindProcessToNetworkForHostResolution(I)Z -Landroid/net/NetworkUtils;->bindSocketToNetwork(II)I -Landroid/net/NetworkUtils;->deduplicatePrefixSet(Ljava/util/TreeSet;)Ljava/util/TreeSet; -Landroid/net/NetworkUtils;->getBoundNetworkForProcess()I -Landroid/net/NetworkUtils;->getNetworkPart(Ljava/net/InetAddress;I)Ljava/net/InetAddress; -Landroid/net/NetworkUtils;->hexToInet6Address(Ljava/lang/String;)Ljava/net/InetAddress; -Landroid/net/NetworkUtils;->inetAddressToInt(Ljava/net/Inet4Address;)I -Landroid/net/NetworkUtils;->makeStrings(Ljava/util/Collection;)[Ljava/lang/String; -Landroid/net/NetworkUtils;->maskRawAddress([BI)V -Landroid/net/NetworkUtils;->netmaskIntToPrefixLength(I)I -Landroid/net/NetworkUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V -Landroid/net/NetworkUtils;->parseIpAndMask(Ljava/lang/String;)Landroid/util/Pair; -Landroid/net/NetworkUtils;->protectFromVpn(I)Z -Landroid/net/NetworkUtils;->queryUserAccess(II)Z -Landroid/net/NetworkUtils;->routedIPv4AddressCount(Ljava/util/TreeSet;)J -Landroid/net/NetworkUtils;->routedIPv6AddressCount(Ljava/util/TreeSet;)Ljava/math/BigInteger; -Landroid/net/NetworkUtils;->setupRaSocket(Ljava/io/FileDescriptor;I)V -Landroid/net/NetworkUtils;->TAG:Ljava/lang/String; -Landroid/net/NetworkUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress; -Landroid/net/NetworkWatchlistManager;-><init>(Landroid/content/Context;)V -Landroid/net/NetworkWatchlistManager;-><init>(Landroid/content/Context;Lcom/android/internal/net/INetworkWatchlistManager;)V -Landroid/net/NetworkWatchlistManager;->getWatchlistConfigHash()[B -Landroid/net/NetworkWatchlistManager;->mContext:Landroid/content/Context; -Landroid/net/NetworkWatchlistManager;->mNetworkWatchlistManager:Lcom/android/internal/net/INetworkWatchlistManager; -Landroid/net/NetworkWatchlistManager;->reloadWatchlist()V -Landroid/net/NetworkWatchlistManager;->reportWatchlistIfNecessary()V -Landroid/net/NetworkWatchlistManager;->SHARED_MEMORY_TAG:Ljava/lang/String; -Landroid/net/NetworkWatchlistManager;->TAG:Ljava/lang/String; Landroid/net/nsd/DnsSdTxtRecord;-><init>()V Landroid/net/nsd/DnsSdTxtRecord;-><init>(Landroid/net/nsd/DnsSdTxtRecord;)V Landroid/net/nsd/DnsSdTxtRecord;-><init>([B)V @@ -37733,43 +36556,6 @@ Landroid/net/Proxy;->sDefaultProxySelector:Ljava/net/ProxySelector; Landroid/net/Proxy;->setHttpProxySystemProperty(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;)V Landroid/net/Proxy;->TAG:Ljava/lang/String; Landroid/net/Proxy;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/ProxyInfo;-><init>(Landroid/net/ProxyInfo;)V -Landroid/net/ProxyInfo;-><init>(Landroid/net/Uri;)V -Landroid/net/ProxyInfo;-><init>(Landroid/net/Uri;I)V -Landroid/net/ProxyInfo;-><init>(Ljava/lang/String;)V -Landroid/net/ProxyInfo;-><init>(Ljava/lang/String;ILjava/lang/String;[Ljava/lang/String;)V -Landroid/net/ProxyInfo;->getExclusionListAsString()Ljava/lang/String; -Landroid/net/ProxyInfo;->getSocketAddress()Ljava/net/InetSocketAddress; -Landroid/net/ProxyInfo;->isValid()Z -Landroid/net/ProxyInfo;->LOCAL_EXCL_LIST:Ljava/lang/String; -Landroid/net/ProxyInfo;->LOCAL_HOST:Ljava/lang/String; -Landroid/net/ProxyInfo;->LOCAL_PORT:I -Landroid/net/ProxyInfo;->makeProxy()Ljava/net/Proxy; -Landroid/net/ProxyInfo;->mExclusionList:Ljava/lang/String; -Landroid/net/ProxyInfo;->mHost:Ljava/lang/String; -Landroid/net/ProxyInfo;->mPacFileUrl:Landroid/net/Uri; -Landroid/net/ProxyInfo;->mParsedExclusionList:[Ljava/lang/String; -Landroid/net/ProxyInfo;->mPort:I -Landroid/net/ProxyInfo;->setExclusionList(Ljava/lang/String;)V -Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;)V -Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;I)V -Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;)V -Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;Ljava/lang/String;I)V -Landroid/net/RouteInfo;-><init>(Landroid/net/LinkAddress;)V -Landroid/net/RouteInfo;->getDestinationLinkAddress()Landroid/net/LinkAddress; -Landroid/net/RouteInfo;->getType()I -Landroid/net/RouteInfo;->isHostRoute()Z -Landroid/net/RouteInfo;->isIPv4Default()Z -Landroid/net/RouteInfo;->isIPv6Default()Z -Landroid/net/RouteInfo;->makeHostRoute(Ljava/net/InetAddress;Ljava/lang/String;)Landroid/net/RouteInfo; -Landroid/net/RouteInfo;->makeHostRoute(Ljava/net/InetAddress;Ljava/net/InetAddress;Ljava/lang/String;)Landroid/net/RouteInfo; -Landroid/net/RouteInfo;->mDestination:Landroid/net/IpPrefix; -Landroid/net/RouteInfo;->mHasGateway:Z -Landroid/net/RouteInfo;->mInterface:Ljava/lang/String; -Landroid/net/RouteInfo;->mType:I -Landroid/net/RouteInfo;->RTN_THROW:I -Landroid/net/RouteInfo;->RTN_UNICAST:I -Landroid/net/RouteInfo;->RTN_UNREACHABLE:I Landroid/net/RssiCurve;-><init>(Landroid/os/Parcel;)V Landroid/net/RssiCurve;->DEFAULT_ACTIVE_NETWORK_RSSI_BOOST:I Landroid/net/rtp/AudioCodec;-><init>(ILjava/lang/String;Ljava/lang/String;)V @@ -38040,11 +36826,6 @@ Landroid/net/SntpClient;->writeTimeStamp([BIJ)V Landroid/net/SSLSessionCache;-><init>(Ljava/lang/Object;)V Landroid/net/SSLSessionCache;->install(Landroid/net/SSLSessionCache;Ljavax/net/ssl/SSLContext;)V Landroid/net/SSLSessionCache;->TAG:Ljava/lang/String; -Landroid/net/StaticIpConfiguration;-><init>(Landroid/net/StaticIpConfiguration;)V -Landroid/net/StaticIpConfiguration;->clear()V -Landroid/net/StaticIpConfiguration;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/StaticIpConfiguration;->readFromParcel(Landroid/net/StaticIpConfiguration;Landroid/os/Parcel;)V -Landroid/net/StaticIpConfiguration;->toLinkProperties(Ljava/lang/String;)Landroid/net/LinkProperties; Landroid/net/StringNetworkSpecifier;-><init>(Ljava/lang/String;)V Landroid/net/StringNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/net/StringNetworkSpecifier;->satisfiedBy(Landroid/net/NetworkSpecifier;)Z @@ -38083,15 +36864,6 @@ Landroid/net/TrafficStats;->TYPE_TX_BYTES:I Landroid/net/TrafficStats;->TYPE_TX_PACKETS:I Landroid/net/TrafficStats;->UID_REMOVED:I Landroid/net/TrafficStats;->UID_TETHERING:I -Landroid/net/UidRange;-><init>(II)V -Landroid/net/UidRange;->contains(I)Z -Landroid/net/UidRange;->containsRange(Landroid/net/UidRange;)Z -Landroid/net/UidRange;->count()I -Landroid/net/UidRange;->createForUser(I)Landroid/net/UidRange; -Landroid/net/UidRange;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/UidRange;->getStartUser()I -Landroid/net/UidRange;->start:I -Landroid/net/UidRange;->stop:I Landroid/net/Uri$AbstractHierarchicalUri;-><init>()V Landroid/net/Uri$AbstractHierarchicalUri;->getUserInfoPart()Landroid/net/Uri$Part; Landroid/net/Uri$AbstractHierarchicalUri;->host:Ljava/lang/String; @@ -38253,837 +37025,6 @@ Landroid/net/WebAddress;->sAddressPattern:Ljava/util/regex/Pattern; Landroid/net/WebAddress;->setAuthInfo(Ljava/lang/String;)V Landroid/net/WebAddress;->setPort(I)V Landroid/net/WebAddress;->setScheme(Ljava/lang/String;)V -Landroid/net/wifi/AnqpInformationElement;-><init>(II[B)V -Landroid/net/wifi/AnqpInformationElement;->ANQP_3GPP_NETWORK:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_CAPABILITY_LIST:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_CIVIC_LOC:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_DOM_NAME:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_EMERGENCY_ALERT:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_EMERGENCY_NAI:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_EMERGENCY_NUMBER:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_GEO_LOC:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_IP_ADDR_AVAILABILITY:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_LOC_URI:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_NAI_REALM:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_NEIGHBOR_REPORT:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_NWK_AUTH_TYPE:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_QUERY_LIST:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_ROAMING_CONSORTIUM:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_TDLS_CAP:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_VENDOR_SPEC:I -Landroid/net/wifi/AnqpInformationElement;->ANQP_VENUE_NAME:I -Landroid/net/wifi/AnqpInformationElement;->getElementId()I -Landroid/net/wifi/AnqpInformationElement;->getPayload()[B -Landroid/net/wifi/AnqpInformationElement;->getVendorId()I -Landroid/net/wifi/AnqpInformationElement;->HOTSPOT20_VENDOR_ID:I -Landroid/net/wifi/AnqpInformationElement;->HS_CAPABILITY_LIST:I -Landroid/net/wifi/AnqpInformationElement;->HS_CONN_CAPABILITY:I -Landroid/net/wifi/AnqpInformationElement;->HS_FRIENDLY_NAME:I -Landroid/net/wifi/AnqpInformationElement;->HS_ICON_FILE:I -Landroid/net/wifi/AnqpInformationElement;->HS_ICON_REQUEST:I -Landroid/net/wifi/AnqpInformationElement;->HS_NAI_HOME_REALM_QUERY:I -Landroid/net/wifi/AnqpInformationElement;->HS_OPERATING_CLASS:I -Landroid/net/wifi/AnqpInformationElement;->HS_OSU_PROVIDERS:I -Landroid/net/wifi/AnqpInformationElement;->HS_QUERY_LIST:I -Landroid/net/wifi/AnqpInformationElement;->HS_WAN_METRICS:I -Landroid/net/wifi/AnqpInformationElement;->mElementId:I -Landroid/net/wifi/AnqpInformationElement;->mPayload:[B -Landroid/net/wifi/AnqpInformationElement;->mVendorId:I -Landroid/net/wifi/aware/Characteristics;-><init>(Landroid/os/Bundle;)V -Landroid/net/wifi/aware/Characteristics;->KEY_MAX_MATCH_FILTER_LENGTH:Ljava/lang/String; -Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_NAME_LENGTH:Ljava/lang/String; -Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_SPECIFIC_INFO_LENGTH:Ljava/lang/String; -Landroid/net/wifi/aware/Characteristics;->mCharacteristics:Landroid/os/Bundle; -Landroid/net/wifi/aware/ConfigRequest$Builder;-><init>()V -Landroid/net/wifi/aware/ConfigRequest$Builder;->build()Landroid/net/wifi/aware/ConfigRequest; -Landroid/net/wifi/aware/ConfigRequest$Builder;->mClusterHigh:I -Landroid/net/wifi/aware/ConfigRequest$Builder;->mClusterLow:I -Landroid/net/wifi/aware/ConfigRequest$Builder;->mDiscoveryWindowInterval:[I -Landroid/net/wifi/aware/ConfigRequest$Builder;->mMasterPreference:I -Landroid/net/wifi/aware/ConfigRequest$Builder;->mSupport5gBand:Z -Landroid/net/wifi/aware/ConfigRequest$Builder;->setClusterHigh(I)Landroid/net/wifi/aware/ConfigRequest$Builder; -Landroid/net/wifi/aware/ConfigRequest$Builder;->setClusterLow(I)Landroid/net/wifi/aware/ConfigRequest$Builder; -Landroid/net/wifi/aware/ConfigRequest$Builder;->setDiscoveryWindowInterval(II)Landroid/net/wifi/aware/ConfigRequest$Builder; -Landroid/net/wifi/aware/ConfigRequest$Builder;->setMasterPreference(I)Landroid/net/wifi/aware/ConfigRequest$Builder; -Landroid/net/wifi/aware/ConfigRequest$Builder;->setSupport5gBand(Z)Landroid/net/wifi/aware/ConfigRequest$Builder; -Landroid/net/wifi/aware/ConfigRequest;-><init>(ZIII[I)V -Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MAX:I -Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MIN:I -Landroid/net/wifi/aware/ConfigRequest;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/aware/ConfigRequest;->DW_DISABLE:I -Landroid/net/wifi/aware/ConfigRequest;->DW_INTERVAL_NOT_INIT:I -Landroid/net/wifi/aware/ConfigRequest;->mClusterHigh:I -Landroid/net/wifi/aware/ConfigRequest;->mClusterLow:I -Landroid/net/wifi/aware/ConfigRequest;->mDiscoveryWindowInterval:[I -Landroid/net/wifi/aware/ConfigRequest;->mMasterPreference:I -Landroid/net/wifi/aware/ConfigRequest;->mSupport5gBand:Z -Landroid/net/wifi/aware/ConfigRequest;->NAN_BAND_24GHZ:I -Landroid/net/wifi/aware/ConfigRequest;->NAN_BAND_5GHZ:I -Landroid/net/wifi/aware/ConfigRequest;->validate()V -Landroid/net/wifi/aware/DiscoverySession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;II)V -Landroid/net/wifi/aware/DiscoverySession;->DBG:Z -Landroid/net/wifi/aware/DiscoverySession;->getClientId()I -Landroid/net/wifi/aware/DiscoverySession;->getMaxSendRetryCount()I -Landroid/net/wifi/aware/DiscoverySession;->getSessionId()I -Landroid/net/wifi/aware/DiscoverySession;->MAX_SEND_RETRY_COUNT:I -Landroid/net/wifi/aware/DiscoverySession;->mClientId:I -Landroid/net/wifi/aware/DiscoverySession;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/wifi/aware/DiscoverySession;->mMgr:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/aware/DiscoverySession;->mSessionId:I -Landroid/net/wifi/aware/DiscoverySession;->mTerminated:Z -Landroid/net/wifi/aware/DiscoverySession;->sendMessage(Landroid/net/wifi/aware/PeerHandle;I[BI)V -Landroid/net/wifi/aware/DiscoverySession;->setTerminated()V -Landroid/net/wifi/aware/DiscoverySession;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/DiscoverySession;->VDBG:Z -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatch(I[B[B)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchWithDistance(I[B[BI)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageReceived(I[B)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendFail(II)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendSuccess(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionConfigFail(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionConfigSuccess()V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionStarted(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionTerminated(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;-><init>()V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback; -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMatch:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMatchWithDistance:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMessageReceived:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMessageSendFail:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMessageSendSuccess:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionConfigFail:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionConfigSuccess:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionStarted:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionTerminated:I -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatch(I[B[B)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchWithDistance(I[B[BI)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageReceived(I[B)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendFail(II)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendSuccess(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionConfigFail(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionConfigSuccess()V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionStarted(I)V -Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionTerminated(I)V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectFail(I)V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectSuccess(I)V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onIdentityChanged([B)V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;-><init>()V -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareEventCallback; -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectFail:I -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectSuccess:I -Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onIdentityChanged:I -Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectFail(I)V -Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectSuccess(I)V -Landroid/net/wifi/aware/IWifiAwareEventCallback;->onIdentityChanged([B)V -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->macAddress(Ljava/util/Map;)V -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;-><init>()V -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareMacAddressProvider; -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->TRANSACTION_macAddress:I -Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;->macAddress(Ljava/util/Map;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->connect(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->disconnect(ILandroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getCharacteristics()Landroid/net/wifi/aware/Characteristics; -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isUsageEnabled()Z -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->publish(Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->sendMessage(III[BII)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->subscribe(Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->terminateSession(II)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V -Landroid/net/wifi/aware/IWifiAwareManager$Stub;-><init>()V -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareManager; -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_connect:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_disconnect:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_getCharacteristics:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isUsageEnabled:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_publish:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_requestMacAddresses:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_sendMessage:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_subscribe:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_terminateSession:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updatePublish:I -Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updateSubscribe:I -Landroid/net/wifi/aware/IWifiAwareManager;->connect(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V -Landroid/net/wifi/aware/IWifiAwareManager;->disconnect(ILandroid/os/IBinder;)V -Landroid/net/wifi/aware/IWifiAwareManager;->getCharacteristics()Landroid/net/wifi/aware/Characteristics; -Landroid/net/wifi/aware/IWifiAwareManager;->isUsageEnabled()Z -Landroid/net/wifi/aware/IWifiAwareManager;->publish(Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V -Landroid/net/wifi/aware/IWifiAwareManager;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V -Landroid/net/wifi/aware/IWifiAwareManager;->sendMessage(III[BII)V -Landroid/net/wifi/aware/IWifiAwareManager;->subscribe(Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V -Landroid/net/wifi/aware/IWifiAwareManager;->terminateSession(II)V -Landroid/net/wifi/aware/IWifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V -Landroid/net/wifi/aware/IWifiAwareManager;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V -Landroid/net/wifi/aware/PeerHandle;-><init>(I)V -Landroid/net/wifi/aware/PeerHandle;->peerId:I -Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableRanging:Z -Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableTerminateNotification:Z -Landroid/net/wifi/aware/PublishConfig$Builder;->mMatchFilter:[B -Landroid/net/wifi/aware/PublishConfig$Builder;->mPublishType:I -Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceName:[B -Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceSpecificInfo:[B -Landroid/net/wifi/aware/PublishConfig$Builder;->mTtlSec:I -Landroid/net/wifi/aware/PublishConfig;-><init>([B[B[BIIZZ)V -Landroid/net/wifi/aware/PublishConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V -Landroid/net/wifi/aware/PublishConfig;->mEnableRanging:Z -Landroid/net/wifi/aware/PublishConfig;->mEnableTerminateNotification:Z -Landroid/net/wifi/aware/PublishConfig;->mMatchFilter:[B -Landroid/net/wifi/aware/PublishConfig;->mPublishType:I -Landroid/net/wifi/aware/PublishConfig;->mServiceName:[B -Landroid/net/wifi/aware/PublishConfig;->mServiceSpecificInfo:[B -Landroid/net/wifi/aware/PublishConfig;->mTtlSec:I -Landroid/net/wifi/aware/PublishDiscoverySession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;II)V -Landroid/net/wifi/aware/PublishDiscoverySession;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mEnableTerminateNotification:Z -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMatchFilter:[B -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMaxDistanceMm:I -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMaxDistanceMmSet:Z -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMinDistanceMm:I -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMinDistanceMmSet:Z -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mServiceName:[B -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mServiceSpecificInfo:[B -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mSubscribeType:I -Landroid/net/wifi/aware/SubscribeConfig$Builder;->mTtlSec:I -Landroid/net/wifi/aware/SubscribeConfig;-><init>([B[B[BIIZZIZI)V -Landroid/net/wifi/aware/SubscribeConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V -Landroid/net/wifi/aware/SubscribeConfig;->mEnableTerminateNotification:Z -Landroid/net/wifi/aware/SubscribeConfig;->mMatchFilter:[B -Landroid/net/wifi/aware/SubscribeConfig;->mMaxDistanceMm:I -Landroid/net/wifi/aware/SubscribeConfig;->mMaxDistanceMmSet:Z -Landroid/net/wifi/aware/SubscribeConfig;->mMinDistanceMm:I -Landroid/net/wifi/aware/SubscribeConfig;->mMinDistanceMmSet:Z -Landroid/net/wifi/aware/SubscribeConfig;->mServiceName:[B -Landroid/net/wifi/aware/SubscribeConfig;->mServiceSpecificInfo:[B -Landroid/net/wifi/aware/SubscribeConfig;->mSubscribeType:I -Landroid/net/wifi/aware/SubscribeConfig;->mTtlSec:I -Landroid/net/wifi/aware/SubscribeDiscoverySession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;II)V -Landroid/net/wifi/aware/SubscribeDiscoverySession;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;-><init>(II)V -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->addHeader(II)V -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->allocate(I)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->allocateAndPut(Ljava/util/List;)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->checkLength(I)V -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->getActualLength()I -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->getArray()[B -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->mArray:[B -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->mArrayLength:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->mLengthSize:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->mPosition:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->mTypeSize:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putByte(IB)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putByteArray(I[B)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putByteArray(I[BII)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putInt(II)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putShort(IS)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putString(ILjava/lang/String;)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putZeroLengthElement(I)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->wrap([B)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor; -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BI)V -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getByte()B -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getInt()I -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getShort()S -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getString()Ljava/lang/String; -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->length:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->offset:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->refArray:[B -Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->type:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;-><init>(II[B)V -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArray:[B -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArrayLength:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mLengthSize:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mTypeSize:I -Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->toList()Ljava/util/List; -Landroid/net/wifi/aware/TlvBufferUtils;-><init>()V -Landroid/net/wifi/aware/TlvBufferUtils;->isValid([BII)Z -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;-><init>([B)V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->mData:[B -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>()V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>([Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->assertValidFromUid(I)V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->convert(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->initialize()V -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->isEmpty()Z -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->mDigester:Ljava/security/MessageDigest; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->mNetworkSpecifiers:Ljava/util/Set; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->satisfiedBy(Landroid/net/NetworkSpecifier;)Z -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->satisfiesAwareNetworkSpecifier(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Z -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->VDBG:Z -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;ZLandroid/net/wifi/aware/DiscoverySessionCallback;I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH_WITH_DISTANCE:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MESSAGE_RECEIVED:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MESSAGE_SEND_FAIL:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MESSAGE_SEND_SUCCESS:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_CONFIG_FAIL:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_CONFIG_SUCCESS:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_STARTED:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_TERMINATED:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mClientId:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE2:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mIsPublish:Z -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mOriginalCallback:Landroid/net/wifi/aware/DiscoverySessionCallback; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mSession:Landroid/net/wifi/aware/DiscoverySession; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatch(I[B[B)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchCommon(II[B[BI)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchWithDistance(I[B[BI)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageReceived(I[B)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendFail(II)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendSuccess(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onProxySessionStarted(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onProxySessionTerminated(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onSessionConfigFail(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onSessionConfigSuccess()V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onSessionStarted(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onSessionTerminated(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;Landroid/os/Binder;Landroid/net/wifi/aware/AttachCallback;Landroid/net/wifi/aware/IdentityChangedListener;)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_FAIL:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_SUCCESS:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_IDENTITY_CHANGED:I -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mBinder:Landroid/os/Binder; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mLooper:Landroid/os/Looper; -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectFail(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectSuccess(I)V -Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onIdentityChanged([B)V -Landroid/net/wifi/aware/WifiAwareManager;-><init>(Landroid/content/Context;Landroid/net/wifi/aware/IWifiAwareManager;)V -Landroid/net/wifi/aware/WifiAwareManager;->attach(Landroid/os/Handler;Landroid/net/wifi/aware/ConfigRequest;Landroid/net/wifi/aware/AttachCallback;Landroid/net/wifi/aware/IdentityChangedListener;)V -Landroid/net/wifi/aware/WifiAwareManager;->createNetworkSpecifier(IIILandroid/net/wifi/aware/PeerHandle;[BLjava/lang/String;)Landroid/net/NetworkSpecifier; -Landroid/net/wifi/aware/WifiAwareManager;->createNetworkSpecifier(II[B[BLjava/lang/String;)Landroid/net/NetworkSpecifier; -Landroid/net/wifi/aware/WifiAwareManager;->DBG:Z -Landroid/net/wifi/aware/WifiAwareManager;->disconnect(ILandroid/os/Binder;)V -Landroid/net/wifi/aware/WifiAwareManager;->mContext:Landroid/content/Context; -Landroid/net/wifi/aware/WifiAwareManager;->mLock:Ljava/lang/Object; -Landroid/net/wifi/aware/WifiAwareManager;->mService:Landroid/net/wifi/aware/IWifiAwareManager; -Landroid/net/wifi/aware/WifiAwareManager;->publish(ILandroid/os/Looper;Landroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V -Landroid/net/wifi/aware/WifiAwareManager;->sendMessage(IILandroid/net/wifi/aware/PeerHandle;[BII)V -Landroid/net/wifi/aware/WifiAwareManager;->subscribe(ILandroid/os/Looper;Landroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V -Landroid/net/wifi/aware/WifiAwareManager;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareManager;->terminateSession(II)V -Landroid/net/wifi/aware/WifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V -Landroid/net/wifi/aware/WifiAwareManager;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V -Landroid/net/wifi/aware/WifiAwareManager;->VDBG:Z -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><init>(IIIII[B[BLjava/lang/String;I)V -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->assertValidFromUid(I)V -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->clientId:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->isOutOfBand()Z -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_IB:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_IB_ANY_PEER:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_MAX_VALID:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_OOB:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_OOB_ANY_PEER:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->passphrase:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerId:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerMac:[B -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->pmk:[B -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->requestorUid:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->role:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->satisfiedBy(Landroid/net/NetworkSpecifier;)Z -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->sessionId:I -Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->type:I -Landroid/net/wifi/aware/WifiAwareSession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Binder;I)V -Landroid/net/wifi/aware/WifiAwareSession;->DBG:Z -Landroid/net/wifi/aware/WifiAwareSession;->getClientId()I -Landroid/net/wifi/aware/WifiAwareSession;->mBinder:Landroid/os/Binder; -Landroid/net/wifi/aware/WifiAwareSession;->mClientId:I -Landroid/net/wifi/aware/WifiAwareSession;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/wifi/aware/WifiAwareSession;->mMgr:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/aware/WifiAwareSession;->mTerminated:Z -Landroid/net/wifi/aware/WifiAwareSession;->TAG:Ljava/lang/String; -Landroid/net/wifi/aware/WifiAwareSession;->VDBG:Z -Landroid/net/wifi/aware/WifiAwareUtils;-><init>()V -Landroid/net/wifi/aware/WifiAwareUtils;->isLegacyVersion(Landroid/content/Context;I)Z -Landroid/net/wifi/aware/WifiAwareUtils;->validatePassphrase(Ljava/lang/String;)Z -Landroid/net/wifi/aware/WifiAwareUtils;->validatePmk([B)Z -Landroid/net/wifi/aware/WifiAwareUtils;->validateServiceName([B)V -Landroid/net/wifi/BatchedScanResult;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/BatchedScanResult;->TAG:Ljava/lang/String; -Landroid/net/wifi/EAPConstants;-><init>()V -Landroid/net/wifi/EAPConstants;->EAP_3Com:I -Landroid/net/wifi/EAPConstants;->EAP_ActiontecWireless:I -Landroid/net/wifi/EAPConstants;->EAP_AKA:I -Landroid/net/wifi/EAPConstants;->EAP_AKA_PRIME:I -Landroid/net/wifi/EAPConstants;->EAP_EKE:I -Landroid/net/wifi/EAPConstants;->EAP_FAST:I -Landroid/net/wifi/EAPConstants;->EAP_GPSK:I -Landroid/net/wifi/EAPConstants;->EAP_HTTPDigest:I -Landroid/net/wifi/EAPConstants;->EAP_IKEv2:I -Landroid/net/wifi/EAPConstants;->EAP_KEA:I -Landroid/net/wifi/EAPConstants;->EAP_KEA_VALIDATE:I -Landroid/net/wifi/EAPConstants;->EAP_LEAP:I -Landroid/net/wifi/EAPConstants;->EAP_Link:I -Landroid/net/wifi/EAPConstants;->EAP_MD5:I -Landroid/net/wifi/EAPConstants;->EAP_MOBAC:I -Landroid/net/wifi/EAPConstants;->EAP_MSCHAPv2:I -Landroid/net/wifi/EAPConstants;->EAP_OTP:I -Landroid/net/wifi/EAPConstants;->EAP_PAX:I -Landroid/net/wifi/EAPConstants;->EAP_PEAP:I -Landroid/net/wifi/EAPConstants;->EAP_POTP:I -Landroid/net/wifi/EAPConstants;->EAP_PSK:I -Landroid/net/wifi/EAPConstants;->EAP_PWD:I -Landroid/net/wifi/EAPConstants;->EAP_RSA:I -Landroid/net/wifi/EAPConstants;->EAP_SAKE:I -Landroid/net/wifi/EAPConstants;->EAP_SIM:I -Landroid/net/wifi/EAPConstants;->EAP_SPEKE:I -Landroid/net/wifi/EAPConstants;->EAP_TEAP:I -Landroid/net/wifi/EAPConstants;->EAP_TLS:I -Landroid/net/wifi/EAPConstants;->EAP_TTLS:I -Landroid/net/wifi/EAPConstants;->EAP_ZLXEAP:I -Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>()V -Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->boundary:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->contentType:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->encodingType:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>()V -Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->data:[B -Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->isLast:Z -Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->type:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;-><init>()V -Landroid/net/wifi/hotspot2/ConfigParser;->BOUNDARY:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->CONTENT_TRANSFER_ENCODING:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->CONTENT_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->createPasspointConfig(Ljava/util/Map;)Landroid/net/wifi/hotspot2/PasspointConfiguration; -Landroid/net/wifi/hotspot2/ConfigParser;->ENCODING_BASE64:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->parseCACert([B)Ljava/security/cert/X509Certificate; -Landroid/net/wifi/hotspot2/ConfigParser;->parseContentType(Ljava/lang/String;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/ConfigParser;->parseHeaders(Ljava/io/LineNumberReader;)Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader; -Landroid/net/wifi/hotspot2/ConfigParser;->parseMimeMultipartMessage(Ljava/io/LineNumberReader;)Ljava/util/Map; -Landroid/net/wifi/hotspot2/ConfigParser;->parseMimePart(Ljava/io/LineNumberReader;Ljava/lang/String;)Landroid/net/wifi/hotspot2/ConfigParser$MimePart; -Landroid/net/wifi/hotspot2/ConfigParser;->parsePkcs12([B)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/ConfigParser;->readHeaders(Ljava/io/LineNumberReader;)Ljava/util/Map; -Landroid/net/wifi/hotspot2/ConfigParser;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->TYPE_CA_CERT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->TYPE_MULTIPART_MIXED:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->TYPE_PASSPOINT_PROFILE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->TYPE_PKCS12:Ljava/lang/String; -Landroid/net/wifi/hotspot2/ConfigParser;->TYPE_WIFI_CONFIG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningFailure(I)V -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningStatus(I)V -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;-><init>()V -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/hotspot2/IProvisioningCallback; -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningFailure:I -Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningStatus:I -Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningFailure(I)V -Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningStatus(I)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$InternalNode;-><init>(Ljava/lang/String;Ljava/util/List;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$InternalNode;->getChildren()Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$InternalNode;->getValue()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$InternalNode;->isLeaf()Z -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$InternalNode;->mChildren:Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$LeafNode;-><init>(Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$LeafNode;->getChildren()Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$LeafNode;->getValue()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$LeafNode;->isLeaf()Z -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$LeafNode;->mValue:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$ParsingException;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;->getChildren()Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;->getName()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;->getValue()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;->isLeaf()Z -Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;->mName:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;-><init>()V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->buildPpsNode(Landroid/net/wifi/hotspot2/omadm/XMLNode;)Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->convertFromLongList(Ljava/util/List;)[J -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->getPpsNodeValue(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_AAA_SERVER_TRUST_ROOT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_ABLE_TO_SHARE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CERTIFICATE_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CERT_SHA256_FINGERPRINT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CERT_URL:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CHECK_AAA_SERVER_CERT_STATUS:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_COUNTRY:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CREATION_DATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CREDENTIAL:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_CREDENTIAL_PRIORITY:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_DATA_LIMIT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_DIGITAL_CERTIFICATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_DOWNLINK_BANDWIDTH:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_EAP_METHOD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_EAP_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_EXPIRATION_DATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_EXTENSION:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_FQDN:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_FQDN_MATCH:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_FRIENDLY_NAME:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_HESSID:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_HOMESP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_HOME_OI:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_HOME_OI_LIST:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_HOME_OI_REQUIRED:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_ICON_URL:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_INNER_EAP_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_INNER_METHOD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_INNER_VENDOR_ID:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_INNER_VENDOR_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_IP_PROTOCOL:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_MACHINE_MANAGED:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_MAXIMUM_BSS_LOAD_VALUE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_MIN_BACKHAUL_THRESHOLD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_NETWORK_ID:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_NETWORK_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_OTHER:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_OTHER_HOME_PARTNERS:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_PASSWORD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_PER_PROVIDER_SUBSCRIPTION:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_POLICY:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_POLICY_UPDATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_PORT_NUMBER:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_PREFERRED_ROAMING_PARTNER_LIST:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_PRIORITY:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_REALM:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_REQUIRED_PROTO_PORT_TUPLE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_RESTRICTION:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_ROAMING_CONSORTIUM_OI:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SIM:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SIM_IMSI:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SOFT_TOKEN_APP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SP_EXCLUSION_LIST:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SSID:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_START_DATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SUBSCRIPTION_PARAMETER:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_SUBSCRIPTION_UPDATE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_TIME_LIMIT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_TRUST_ROOT:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_TYPE_OF_SUBSCRIPTION:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_UPDATE_IDENTIFIER:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_UPDATE_INTERVAL:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_UPDATE_METHOD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_UPLINK_BANDWIDTH:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_URI:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_USAGE_LIMITS:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_USAGE_TIME_PERIOD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_USERNAME:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_USERNAME_PASSWORD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_VENDOR_ID:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->NODE_VENDOR_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseAAAServerTrustRootList(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/util/Map; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseCertificateCredential(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseCredential(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Credential; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseDate(Ljava/lang/String;)J -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseEAPMethod(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseHexString(Ljava/lang/String;)[B -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseHomeOIInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseHomeOIList(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseHomeSP(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/HomeSp; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseInteger(Ljava/lang/String;)I -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseLong(Ljava/lang/String;I)J -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseMinBackhaulThreshold(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;Landroid/net/wifi/hotspot2/pps/Policy;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseMinBackhaulThresholdInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;Landroid/net/wifi/hotspot2/pps/Policy;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseNetworkIdInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseNetworkIds(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/util/Map; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseOtherHomePartnerInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseOtherHomePartners(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)[Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parsePolicy(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Policy; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parsePpsInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/PasspointConfiguration; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parsePpsNode(Landroid/net/wifi/hotspot2/omadm/XMLNode;)Landroid/net/wifi/hotspot2/PasspointConfiguration; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parsePreferredRoamingPartner(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parsePreferredRoamingPartnerList(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseProtoPortTuple(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseRequiredProtoPortTuple(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/util/Map; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseRoamingConsortiumOI(Ljava/lang/String;)[J -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseSimCredential(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Credential$SimCredential; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseSpExclusionInstance(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseSpExclusionList(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)[Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseSubscriptionParameter(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;Landroid/net/wifi/hotspot2/PasspointConfiguration;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseTrustRoot(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseUpdateParameter(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/UpdateParameter; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseUpdateUserCredential(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/util/Pair; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseUrn(Landroid/net/wifi/hotspot2/omadm/XMLNode;)Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseUsageLimits(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;Landroid/net/wifi/hotspot2/PasspointConfiguration;)V -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->parseUserCredential(Landroid/net/wifi/hotspot2/omadm/PpsMoParser$PPSNode;)Landroid/net/wifi/hotspot2/pps/Credential$UserCredential; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->PPS_MO_URN:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_DDF_NAME:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_MANAGEMENT_TREE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_NODE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_NODE_NAME:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_RT_PROPERTIES:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_TYPE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_VALUE:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/PpsMoParser;->TAG_VER_DTD:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/XMLNode;-><init>(Landroid/net/wifi/hotspot2/omadm/XMLNode;Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/omadm/XMLNode;->addChild(Landroid/net/wifi/hotspot2/omadm/XMLNode;)V -Landroid/net/wifi/hotspot2/omadm/XMLNode;->addText(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/omadm/XMLNode;->close()V -Landroid/net/wifi/hotspot2/omadm/XMLNode;->getChildren()Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->getParent()Landroid/net/wifi/hotspot2/omadm/XMLNode; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->getTag()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->getText()Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->mChildren:Ljava/util/List; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->mParent:Landroid/net/wifi/hotspot2/omadm/XMLNode; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->mTag:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->mText:Ljava/lang/String; -Landroid/net/wifi/hotspot2/omadm/XMLNode;->mTextBuilder:Ljava/lang/StringBuilder; -Landroid/net/wifi/hotspot2/omadm/XMLParser;-><init>()V -Landroid/net/wifi/hotspot2/omadm/XMLParser;->mCurrent:Landroid/net/wifi/hotspot2/omadm/XMLNode; -Landroid/net/wifi/hotspot2/omadm/XMLParser;->mRoot:Landroid/net/wifi/hotspot2/omadm/XMLNode; -Landroid/net/wifi/hotspot2/omadm/XMLParser;->parse(Ljava/lang/String;)Landroid/net/wifi/hotspot2/omadm/XMLNode; -Landroid/net/wifi/hotspot2/OsuProvider;-><init>(Landroid/net/wifi/hotspot2/OsuProvider;)V -Landroid/net/wifi/hotspot2/OsuProvider;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/util/List;Landroid/graphics/drawable/Icon;)V -Landroid/net/wifi/hotspot2/OsuProvider;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/hotspot2/OsuProvider;->getFriendlyName()Ljava/lang/String; -Landroid/net/wifi/hotspot2/OsuProvider;->getIcon()Landroid/graphics/drawable/Icon; -Landroid/net/wifi/hotspot2/OsuProvider;->getMethodList()Ljava/util/List; -Landroid/net/wifi/hotspot2/OsuProvider;->getNetworkAccessIdentifier()Ljava/lang/String; -Landroid/net/wifi/hotspot2/OsuProvider;->getOsuSsid()Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/hotspot2/OsuProvider;->getServerUri()Landroid/net/Uri; -Landroid/net/wifi/hotspot2/OsuProvider;->getServiceDescription()Ljava/lang/String; -Landroid/net/wifi/hotspot2/OsuProvider;->METHOD_OMA_DM:I -Landroid/net/wifi/hotspot2/OsuProvider;->METHOD_SOAP_XML_SPP:I -Landroid/net/wifi/hotspot2/OsuProvider;->mFriendlyName:Ljava/lang/String; -Landroid/net/wifi/hotspot2/OsuProvider;->mIcon:Landroid/graphics/drawable/Icon; -Landroid/net/wifi/hotspot2/OsuProvider;->mMethodList:Ljava/util/List; -Landroid/net/wifi/hotspot2/OsuProvider;->mNetworkAccessIdentifier:Ljava/lang/String; -Landroid/net/wifi/hotspot2/OsuProvider;->mOsuSsid:Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/hotspot2/OsuProvider;->mServerUri:Landroid/net/Uri; -Landroid/net/wifi/hotspot2/OsuProvider;->mServiceDescription:Ljava/lang/String; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->CERTIFICATE_SHA256_BYTES:I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getCredentialPriority()I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getPolicy()Landroid/net/wifi/hotspot2/pps/Policy; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionCreationTimeInMillis()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionExpirationTimeInMillis()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionType()Ljava/lang/String; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionUpdate()Landroid/net/wifi/hotspot2/pps/UpdateParameter; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getTrustRootCertList()Ljava/util/Map; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getUpdateIdentifier()I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getUsageLimitDataLimit()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getUsageLimitStartTimeInMillis()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getUsageLimitTimeLimitInMinutes()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->getUsageLimitUsageTimePeriodInMinutes()J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->isTrustRootCertListEquals(Ljava/util/Map;Ljava/util/Map;)Z -Landroid/net/wifi/hotspot2/PasspointConfiguration;->MAX_URL_BYTES:I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mCredential:Landroid/net/wifi/hotspot2/pps/Credential; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mCredentialPriority:I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mHomeSp:Landroid/net/wifi/hotspot2/pps/HomeSp; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mPolicy:Landroid/net/wifi/hotspot2/pps/Policy; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionCreationTimeInMillis:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionExpirationTimeInMillis:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionType:Ljava/lang/String; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionUpdate:Landroid/net/wifi/hotspot2/pps/UpdateParameter; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mTrustRootCertList:Ljava/util/Map; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mUpdateIdentifier:I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mUsageLimitDataLimit:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mUsageLimitStartTimeInMillis:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mUsageLimitTimeLimitInMinutes:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->mUsageLimitUsageTimePeriodInMinutes:J -Landroid/net/wifi/hotspot2/PasspointConfiguration;->NULL_VALUE:I -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setCredentialPriority(I)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setPolicy(Landroid/net/wifi/hotspot2/pps/Policy;)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionCreationTimeInMillis(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionExpirationTimeInMillis(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionType(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionUpdate(Landroid/net/wifi/hotspot2/pps/UpdateParameter;)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setTrustRootCertList(Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setUpdateIdentifier(I)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setUsageLimitDataLimit(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setUsageLimitStartTimeInMillis(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setUsageLimitTimeLimitInMinutes(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->setUsageLimitUsageTimePeriodInMinutes(J)V -Landroid/net/wifi/hotspot2/PasspointConfiguration;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/PasspointConfiguration;->validate()Z -Landroid/net/wifi/hotspot2/PasspointConfiguration;->writeTrustRootCerts(Landroid/os/Parcel;Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;->CERT_SHA256_FINGER_PRINT_LENGTH:I -Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;->CERT_TYPE_X509V3:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;->mCertSha256Fingerprint:[B -Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;->mCertType:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential;->validate()Z -Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;->MAX_IMSI_LENGTH:I -Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;->mEapType:I -Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;->mImsi:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;->validate()Z -Landroid/net/wifi/hotspot2/pps/Credential$SimCredential;->verifyImsi()Z -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->AUTH_METHOD_MSCHAP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->AUTH_METHOD_MSCHAPV2:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->AUTH_METHOD_PAP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->getAbleToShare()Z -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->getMachineManaged()Z -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->getSoftTokenApp()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mAbleToShare:Z -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->MAX_PASSWORD_BYTES:I -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->MAX_USERNAME_BYTES:I -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mEapType:I -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mMachineManaged:Z -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mNonEapInnerMethod:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mPassword:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mSoftTokenApp:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->mUsername:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->setAbleToShare(Z)V -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->setMachineManaged(Z)V -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->setSoftTokenApp(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->SUPPORTED_AUTH:Ljava/util/Set; -Landroid/net/wifi/hotspot2/pps/Credential$UserCredential;->validate()Z -Landroid/net/wifi/hotspot2/pps/Credential;->getCheckAaaServerCertStatus()Z -Landroid/net/wifi/hotspot2/pps/Credential;->getCreationTimeInMillis()J -Landroid/net/wifi/hotspot2/pps/Credential;->getExpirationTimeInMillis()J -Landroid/net/wifi/hotspot2/pps/Credential;->isPrivateKeyEquals(Ljava/security/PrivateKey;Ljava/security/PrivateKey;)Z -Landroid/net/wifi/hotspot2/pps/Credential;->isX509CertificateEquals(Ljava/security/cert/X509Certificate;Ljava/security/cert/X509Certificate;)Z -Landroid/net/wifi/hotspot2/pps/Credential;->isX509CertificatesEquals([Ljava/security/cert/X509Certificate;[Ljava/security/cert/X509Certificate;)Z -Landroid/net/wifi/hotspot2/pps/Credential;->MAX_REALM_BYTES:I -Landroid/net/wifi/hotspot2/pps/Credential;->mCaCertificate:Ljava/security/cert/X509Certificate; -Landroid/net/wifi/hotspot2/pps/Credential;->mCertCredential:Landroid/net/wifi/hotspot2/pps/Credential$CertificateCredential; -Landroid/net/wifi/hotspot2/pps/Credential;->mCheckAaaServerCertStatus:Z -Landroid/net/wifi/hotspot2/pps/Credential;->mClientCertificateChain:[Ljava/security/cert/X509Certificate; -Landroid/net/wifi/hotspot2/pps/Credential;->mClientPrivateKey:Ljava/security/PrivateKey; -Landroid/net/wifi/hotspot2/pps/Credential;->mCreationTimeInMillis:J -Landroid/net/wifi/hotspot2/pps/Credential;->mExpirationTimeInMillis:J -Landroid/net/wifi/hotspot2/pps/Credential;->mRealm:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential;->mSimCredential:Landroid/net/wifi/hotspot2/pps/Credential$SimCredential; -Landroid/net/wifi/hotspot2/pps/Credential;->mUserCredential:Landroid/net/wifi/hotspot2/pps/Credential$UserCredential; -Landroid/net/wifi/hotspot2/pps/Credential;->setCheckAaaServerCertStatus(Z)V -Landroid/net/wifi/hotspot2/pps/Credential;->setCreationTimeInMillis(J)V -Landroid/net/wifi/hotspot2/pps/Credential;->setExpirationTimeInMillis(J)V -Landroid/net/wifi/hotspot2/pps/Credential;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Credential;->validate()Z -Landroid/net/wifi/hotspot2/pps/Credential;->verifyCertCredential()Z -Landroid/net/wifi/hotspot2/pps/Credential;->verifySha256Fingerprint([Ljava/security/cert/X509Certificate;[B)Z -Landroid/net/wifi/hotspot2/pps/Credential;->verifySimCredential()Z -Landroid/net/wifi/hotspot2/pps/Credential;->verifyUserCredential()Z -Landroid/net/wifi/hotspot2/pps/HomeSp;->getHomeNetworkIds()Ljava/util/Map; -Landroid/net/wifi/hotspot2/pps/HomeSp;->getIconUrl()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->getMatchAllOis()[J -Landroid/net/wifi/hotspot2/pps/HomeSp;->getMatchAnyOis()[J -Landroid/net/wifi/hotspot2/pps/HomeSp;->getOtherHomePartners()[Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->MAX_SSID_BYTES:I -Landroid/net/wifi/hotspot2/pps/HomeSp;->mFqdn:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->mFriendlyName:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->mHomeNetworkIds:Ljava/util/Map; -Landroid/net/wifi/hotspot2/pps/HomeSp;->mIconUrl:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->mMatchAllOis:[J -Landroid/net/wifi/hotspot2/pps/HomeSp;->mMatchAnyOis:[J -Landroid/net/wifi/hotspot2/pps/HomeSp;->mOtherHomePartners:[Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->mRoamingConsortiumOis:[J -Landroid/net/wifi/hotspot2/pps/HomeSp;->NULL_VALUE:I -Landroid/net/wifi/hotspot2/pps/HomeSp;->setHomeNetworkIds(Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/pps/HomeSp;->setIconUrl(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/HomeSp;->setMatchAllOis([J)V -Landroid/net/wifi/hotspot2/pps/HomeSp;->setMatchAnyOis([J)V -Landroid/net/wifi/hotspot2/pps/HomeSp;->setOtherHomePartners([Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/HomeSp;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/HomeSp;->validate()Z -Landroid/net/wifi/hotspot2/pps/HomeSp;->writeHomeNetworkIds(Landroid/os/Parcel;Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;-><init>()V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;-><init>(Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->getCountries()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->getFqdn()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->getFqdnExactMatch()Z -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->getPriority()I -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->mCountries:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->mFqdn:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->mFqdnExactMatch:Z -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->mPriority:I -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->setCountries(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->setFqdn(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->setFqdnExactMatch(Z)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->setPriority(I)V -Landroid/net/wifi/hotspot2/pps/Policy$RoamingPartner;->validate()Z -Landroid/net/wifi/hotspot2/pps/Policy;-><init>()V -Landroid/net/wifi/hotspot2/pps/Policy;-><init>(Landroid/net/wifi/hotspot2/pps/Policy;)V -Landroid/net/wifi/hotspot2/pps/Policy;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/hotspot2/pps/Policy;->getExcludedSsidList()[Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy;->getMaximumBssLoadValue()I -Landroid/net/wifi/hotspot2/pps/Policy;->getMinHomeDownlinkBandwidth()J -Landroid/net/wifi/hotspot2/pps/Policy;->getMinHomeUplinkBandwidth()J -Landroid/net/wifi/hotspot2/pps/Policy;->getMinRoamingDownlinkBandwidth()J -Landroid/net/wifi/hotspot2/pps/Policy;->getMinRoamingUplinkBandwidth()J -Landroid/net/wifi/hotspot2/pps/Policy;->getPolicyUpdate()Landroid/net/wifi/hotspot2/pps/UpdateParameter; -Landroid/net/wifi/hotspot2/pps/Policy;->getPreferredRoamingPartnerList()Ljava/util/List; -Landroid/net/wifi/hotspot2/pps/Policy;->getRequiredProtoPortMap()Ljava/util/Map; -Landroid/net/wifi/hotspot2/pps/Policy;->MAX_EXCLUSION_SSIDS:I -Landroid/net/wifi/hotspot2/pps/Policy;->MAX_PORT_STRING_BYTES:I -Landroid/net/wifi/hotspot2/pps/Policy;->MAX_SSID_BYTES:I -Landroid/net/wifi/hotspot2/pps/Policy;->mExcludedSsidList:[Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy;->mMaximumBssLoadValue:I -Landroid/net/wifi/hotspot2/pps/Policy;->mMinHomeDownlinkBandwidth:J -Landroid/net/wifi/hotspot2/pps/Policy;->mMinHomeUplinkBandwidth:J -Landroid/net/wifi/hotspot2/pps/Policy;->mMinRoamingDownlinkBandwidth:J -Landroid/net/wifi/hotspot2/pps/Policy;->mMinRoamingUplinkBandwidth:J -Landroid/net/wifi/hotspot2/pps/Policy;->mPolicyUpdate:Landroid/net/wifi/hotspot2/pps/UpdateParameter; -Landroid/net/wifi/hotspot2/pps/Policy;->mPreferredRoamingPartnerList:Ljava/util/List; -Landroid/net/wifi/hotspot2/pps/Policy;->mRequiredProtoPortMap:Ljava/util/Map; -Landroid/net/wifi/hotspot2/pps/Policy;->NULL_VALUE:I -Landroid/net/wifi/hotspot2/pps/Policy;->setExcludedSsidList([Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/Policy;->setMaximumBssLoadValue(I)V -Landroid/net/wifi/hotspot2/pps/Policy;->setMinHomeDownlinkBandwidth(J)V -Landroid/net/wifi/hotspot2/pps/Policy;->setMinHomeUplinkBandwidth(J)V -Landroid/net/wifi/hotspot2/pps/Policy;->setMinRoamingDownlinkBandwidth(J)V -Landroid/net/wifi/hotspot2/pps/Policy;->setMinRoamingUplinkBandwidth(J)V -Landroid/net/wifi/hotspot2/pps/Policy;->setPolicyUpdate(Landroid/net/wifi/hotspot2/pps/UpdateParameter;)V -Landroid/net/wifi/hotspot2/pps/Policy;->setPreferredRoamingPartnerList(Ljava/util/List;)V -Landroid/net/wifi/hotspot2/pps/Policy;->setRequiredProtoPortMap(Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/pps/Policy;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/Policy;->validate()Z -Landroid/net/wifi/hotspot2/pps/Policy;->writeProtoPortMap(Landroid/os/Parcel;Ljava/util/Map;)V -Landroid/net/wifi/hotspot2/pps/Policy;->writeRoamingPartnerList(Landroid/os/Parcel;ILjava/util/List;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;-><init>()V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;-><init>(Landroid/net/wifi/hotspot2/pps/UpdateParameter;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->CERTIFICATE_SHA256_BYTES:I -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getBase64EncodedPassword()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getRestriction()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getServerUri()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getTrustRootCertSha256Fingerprint()[B -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getTrustRootCertUrl()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getUpdateIntervalInMinutes()J -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getUpdateMethod()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->getUsername()Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->MAX_PASSWORD_BYTES:I -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->MAX_URI_BYTES:I -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->MAX_URL_BYTES:I -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->MAX_USERNAME_BYTES:I -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mBase64EncodedPassword:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mRestriction:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mServerUri:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mTrustRootCertSha256Fingerprint:[B -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mTrustRootCertUrl:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mUpdateIntervalInMinutes:J -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mUpdateMethod:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->mUsername:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setBase64EncodedPassword(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setRestriction(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setServerUri(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setTrustRootCertSha256Fingerprint([B)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setTrustRootCertUrl(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setUpdateIntervalInMinutes(J)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setUpdateMethod(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->setUsername(Ljava/lang/String;)V -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->TAG:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_CHECK_INTERVAL_NEVER:J -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_OMADM:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SSP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_HOMESP:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_ROAMING_PARTNER:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_UNRESTRICTED:Ljava/lang/String; -Landroid/net/wifi/hotspot2/pps/UpdateParameter;->validate()Z Landroid/net/wifi/hotspot2/ProvisioningCallback;-><init>()V Landroid/net/wifi/hotspot2/ProvisioningCallback;->onProvisioningFailure(I)V Landroid/net/wifi/hotspot2/ProvisioningCallback;->onProvisioningStatus(I)V @@ -39099,539 +37040,6 @@ Landroid/net/wifi/hotspot2/ProvisioningCallback;->OSU_STATUS_AP_CONNECTING:I Landroid/net/wifi/hotspot2/ProvisioningCallback;->OSU_STATUS_PROVIDER_VERIFIED:I Landroid/net/wifi/hotspot2/ProvisioningCallback;->OSU_STATUS_SERVER_CONNECTED:I Landroid/net/wifi/hotspot2/ProvisioningCallback;->OSU_STATUS_SERVER_VALIDATED:I -Landroid/net/wifi/ISoftApCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onNumClientsChanged(I)V -Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onStateChanged(II)V -Landroid/net/wifi/ISoftApCallback$Stub;-><init>()V -Landroid/net/wifi/ISoftApCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISoftApCallback; -Landroid/net/wifi/ISoftApCallback$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onNumClientsChanged:I -Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onStateChanged:I -Landroid/net/wifi/ISoftApCallback;->onNumClientsChanged(I)V -Landroid/net/wifi/ISoftApCallback;->onStateChanged(II)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->deauthenticateNetwork(JZ)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableNetwork(ILjava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->disconnect(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->enableNetwork(IZLjava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->enableTdls(Ljava/lang/String;Z)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->enableTdlsWithMacAddress(Ljava/lang/String;Z)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->enableVerboseLogging(I)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->enableWifiConnectivityManager(Z)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->factoryReset(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getAllMatchingWifiConfigs(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConfiguredNetworks()Landroid/content/pm/ParceledListSlice; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConnectionInfo(Ljava/lang/String;)Landroid/net/wifi/WifiInfo; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCountryCode()Ljava/lang/String; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetwork()Landroid/net/Network; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getDhcpInfo()Landroid/net/DhcpInfo; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingOsuProviders(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingWifiConfig(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/WifiConfiguration; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPasspointConfigurations()Ljava/util/List; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConfiguredNetworks()Landroid/content/pm/ParceledListSlice; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getScanResults(Ljava/lang/String;)Ljava/util/List; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSupportedFeatures()I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getVerboseLoggingLevel()I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getWifiApEnabledState()I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getWifiEnabledState()I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->getWifiServiceMessenger(Ljava/lang/String;)Landroid/os/Messenger; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->initializeMulticastFiltering()V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->isDualBandSupported()Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->isMulticastEnabled()Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->isScanAlwaysAvailable()Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->needs5GHzToAnyApBandConversion()Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->queryPasspointIcon(JLjava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->reassociate(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->reconnect(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerSoftApCallback(Landroid/os/IBinder;Landroid/net/wifi/ISoftApCallback;I)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseMulticastLock()V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseWifiLock(Landroid/os/IBinder;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetwork(ILjava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->reportActivityInfo()Landroid/net/wifi/WifiActivityEnergyInfo; -Landroid/net/wifi/IWifiManager$Stub$Proxy;->requestActivityInfo(Landroid/os/ResultReceiver;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreBackupData([B)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreSupplicantBackupData([B[B)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->retrieveBackupData()[B -Landroid/net/wifi/IWifiManager$Stub$Proxy;->setCountryCode(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiEnabled(Ljava/lang/String;Z)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->startLocalOnlyHotspot(Landroid/os/Messenger;Landroid/os/IBinder;Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager$Stub$Proxy;->startScan(Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->startSoftAp(Landroid/net/wifi/WifiConfiguration;)Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->startSubscriptionProvisioning(Landroid/net/wifi/hotspot2/OsuProvider;Landroid/net/wifi/hotspot2/IProvisioningCallback;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->startWatchLocalOnlyHotspot(Landroid/os/Messenger;Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopLocalOnlyHotspot()V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopSoftAp()Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopWatchLocalOnlyHotspot()V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterSoftApCallback(I)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->updateInterfaceIpState(Ljava/lang/String;I)V -Landroid/net/wifi/IWifiManager$Stub$Proxy;->updateWifiLockWorkSource(Landroid/os/IBinder;Landroid/os/WorkSource;)V -Landroid/net/wifi/IWifiManager$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireMulticastLock:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireWifiLock:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOrUpdateNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOrUpdatePasspointConfiguration:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_deauthenticateNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_disableEphemeralNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_disableNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_disconnect:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_enableNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_enableTdls:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_enableTdlsWithMacAddress:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_enableVerboseLogging:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_enableWifiConnectivityManager:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_factoryReset:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getAllMatchingWifiConfigs:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getConfiguredNetworks:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getConnectionInfo:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getCountryCode:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getCurrentNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getCurrentNetworkWpsNfcConfigurationToken:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getDhcpInfo:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingOsuProviders:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingWifiConfig:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPasspointConfigurations:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPrivilegedConfiguredNetworks:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSupportedFeatures:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getVerboseLoggingLevel:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getWifiApConfiguration:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getWifiApEnabledState:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getWifiEnabledState:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getWifiServiceMessenger:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_initializeMulticastFiltering:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isDualBandSupported:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isMulticastEnabled:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isScanAlwaysAvailable:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_matchProviderWithCurrentNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_needs5GHzToAnyApBandConversion:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_queryPasspointIcon:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reassociate:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reconnect:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerSoftApCallback:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseMulticastLock:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseWifiLock:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNetwork:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removePasspointConfiguration:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reportActivityInfo:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_requestActivityInfo:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreBackupData:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreSupplicantBackupData:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_retrieveBackupData:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setCountryCode:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiApConfiguration:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiEnabled:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startLocalOnlyHotspot:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startScan:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startSoftAp:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startSubscriptionProvisioning:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startWatchLocalOnlyHotspot:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopLocalOnlyHotspot:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopSoftAp:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopWatchLocalOnlyHotspot:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterSoftApCallback:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_updateInterfaceIpState:I -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_updateWifiLockWorkSource:I -Landroid/net/wifi/IWifiManager;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z -Landroid/net/wifi/IWifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->deauthenticateNetwork(JZ)V -Landroid/net/wifi/IWifiManager;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->disableNetwork(ILjava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->disconnect(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->enableNetwork(IZLjava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->enableTdls(Ljava/lang/String;Z)V -Landroid/net/wifi/IWifiManager;->enableTdlsWithMacAddress(Ljava/lang/String;Z)V -Landroid/net/wifi/IWifiManager;->enableVerboseLogging(I)V -Landroid/net/wifi/IWifiManager;->enableWifiConnectivityManager(Z)V -Landroid/net/wifi/IWifiManager;->factoryReset(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->getAllMatchingWifiConfigs(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/IWifiManager;->getConfiguredNetworks()Landroid/content/pm/ParceledListSlice; -Landroid/net/wifi/IWifiManager;->getConnectionInfo(Ljava/lang/String;)Landroid/net/wifi/WifiInfo; -Landroid/net/wifi/IWifiManager;->getCountryCode()Ljava/lang/String; -Landroid/net/wifi/IWifiManager;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String; -Landroid/net/wifi/IWifiManager;->getDhcpInfo()Landroid/net/DhcpInfo; -Landroid/net/wifi/IWifiManager;->getMatchingOsuProviders(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/IWifiManager;->getMatchingWifiConfig(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/WifiConfiguration; -Landroid/net/wifi/IWifiManager;->getPasspointConfigurations()Ljava/util/List; -Landroid/net/wifi/IWifiManager;->getPrivilegedConfiguredNetworks()Landroid/content/pm/ParceledListSlice; -Landroid/net/wifi/IWifiManager;->getScanResults(Ljava/lang/String;)Ljava/util/List; -Landroid/net/wifi/IWifiManager;->getSupportedFeatures()I -Landroid/net/wifi/IWifiManager;->getVerboseLoggingLevel()I -Landroid/net/wifi/IWifiManager;->getWifiEnabledState()I -Landroid/net/wifi/IWifiManager;->getWifiServiceMessenger(Ljava/lang/String;)Landroid/os/Messenger; -Landroid/net/wifi/IWifiManager;->initializeMulticastFiltering()V -Landroid/net/wifi/IWifiManager;->isDualBandSupported()Z -Landroid/net/wifi/IWifiManager;->isMulticastEnabled()Z -Landroid/net/wifi/IWifiManager;->isScanAlwaysAvailable()Z -Landroid/net/wifi/IWifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager;->needs5GHzToAnyApBandConversion()Z -Landroid/net/wifi/IWifiManager;->queryPasspointIcon(JLjava/lang/String;)V -Landroid/net/wifi/IWifiManager;->reassociate(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->reconnect(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->registerSoftApCallback(Landroid/os/IBinder;Landroid/net/wifi/ISoftApCallback;I)V -Landroid/net/wifi/IWifiManager;->releaseMulticastLock()V -Landroid/net/wifi/IWifiManager;->releaseWifiLock(Landroid/os/IBinder;)Z -Landroid/net/wifi/IWifiManager;->removeNetwork(ILjava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->reportActivityInfo()Landroid/net/wifi/WifiActivityEnergyInfo; -Landroid/net/wifi/IWifiManager;->requestActivityInfo(Landroid/os/ResultReceiver;)V -Landroid/net/wifi/IWifiManager;->restoreBackupData([B)V -Landroid/net/wifi/IWifiManager;->restoreSupplicantBackupData([B[B)V -Landroid/net/wifi/IWifiManager;->retrieveBackupData()[B -Landroid/net/wifi/IWifiManager;->setCountryCode(Ljava/lang/String;)V -Landroid/net/wifi/IWifiManager;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->setWifiEnabled(Ljava/lang/String;Z)Z -Landroid/net/wifi/IWifiManager;->startLocalOnlyHotspot(Landroid/os/Messenger;Landroid/os/IBinder;Ljava/lang/String;)I -Landroid/net/wifi/IWifiManager;->startScan(Ljava/lang/String;)Z -Landroid/net/wifi/IWifiManager;->startSoftAp(Landroid/net/wifi/WifiConfiguration;)Z -Landroid/net/wifi/IWifiManager;->startSubscriptionProvisioning(Landroid/net/wifi/hotspot2/OsuProvider;Landroid/net/wifi/hotspot2/IProvisioningCallback;)V -Landroid/net/wifi/IWifiManager;->startWatchLocalOnlyHotspot(Landroid/os/Messenger;Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiManager;->stopLocalOnlyHotspot()V -Landroid/net/wifi/IWifiManager;->stopSoftAp()Z -Landroid/net/wifi/IWifiManager;->stopWatchLocalOnlyHotspot()V -Landroid/net/wifi/IWifiManager;->unregisterSoftApCallback(I)V -Landroid/net/wifi/IWifiManager;->updateInterfaceIpState(Ljava/lang/String;I)V -Landroid/net/wifi/IWifiManager;->updateWifiLockWorkSource(Landroid/os/IBinder;Landroid/os/WorkSource;)V -Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getAvailableChannels(I)Landroid/os/Bundle; -Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getMessenger()Landroid/os/Messenger; -Landroid/net/wifi/IWifiScanner$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getAvailableChannels:I -Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getMessenger:I -Landroid/net/wifi/IWifiScanner;->getAvailableChannels(I)Landroid/os/Bundle; -Landroid/net/wifi/IWifiScanner;->getMessenger()Landroid/os/Messenger; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->checkConfigureWifiDisplayPermission()V -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->close(Landroid/os/IBinder;)V -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getMessenger(Landroid/os/IBinder;)Landroid/os/Messenger; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getP2pStateMachineMessenger()Landroid/os/Messenger; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->setMiracastMode(I)V -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;-><init>()V -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_checkConfigureWifiDisplayPermission:I -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_close:I -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getMessenger:I -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getP2pStateMachineMessenger:I -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_setMiracastMode:I -Landroid/net/wifi/p2p/IWifiP2pManager;->checkConfigureWifiDisplayPermission()V -Landroid/net/wifi/p2p/IWifiP2pManager;->close(Landroid/os/IBinder;)V -Landroid/net/wifi/p2p/IWifiP2pManager;->getMessenger(Landroid/os/IBinder;)Landroid/os/Messenger; -Landroid/net/wifi/p2p/IWifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger; -Landroid/net/wifi/p2p/IWifiP2pManager;->setMiracastMode(I)V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;-><init>(Ljava/util/List;)V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->compressDnsName(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->createPtrServiceQuery(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->createTxtServiceQuery(Ljava/lang/String;Ljava/lang/String;Landroid/net/nsd/DnsSdTxtRecord;)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->DNS_TYPE_PTR:I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->DNS_TYPE_TXT:I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->sVmPacket:Ljava/util/Map; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo;->VERSION_1:I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceRequest;-><init>()V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceRequest;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceRequest;-><init>(Ljava/lang/String;II)V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;-><init>(IILandroid/net/wifi/p2p/WifiP2pDevice;[B)V -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->getDnsQueryName()Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->getDnsType()I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->getInstanceName()Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->getTxtRecord()Ljava/util/Map; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->getVersion()I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->mDnsQueryName:Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->mDnsType:I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->mInstanceName:Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->mTxtRecord:Ljava/util/HashMap; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->mVersion:I -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->newInstance(IILandroid/net/wifi/p2p/WifiP2pDevice;[B)Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->parse()Z -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->readDnsName(Ljava/io/DataInputStream;)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->readTxtData(Ljava/io/DataInputStream;)Z -Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;->sVmpack:Ljava/util/Map; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;->bin2HexStr([B)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;->getSupplicantQueryList()Ljava/util/List; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;->SERVICE_TYPE_WS_DISCOVERY:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;)V -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->getSupplicantQuery()Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->getTransactionId()I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->mLength:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->mProtocolType:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->mQuery:Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->mTransId:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->setTransactionId(I)V -Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->validateQuery(Ljava/lang/String;)V -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;-><init>()V -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;->BAD_REQUEST:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;->REQUESTED_INFORMATION_NOT_AVAILABLE:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;->SERVICE_PROTOCOL_NOT_AVAILABLE:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;->SUCCESS:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse$Status;->toString(I)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;-><init>(IIILandroid/net/wifi/p2p/WifiP2pDevice;[B)V -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->getRawData()[B -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->getServiceType()I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->getSrcDevice()Landroid/net/wifi/p2p/WifiP2pDevice; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->getStatus()I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->getTransactionId()I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->hexStr2Bin(Ljava/lang/String;)[B -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->MAX_BUF_SIZE:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->mData:[B -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->mDevice:Landroid/net/wifi/p2p/WifiP2pDevice; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->mServiceType:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->mStatus:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->mTransId:I -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->newInstance(Ljava/lang/String;[B)Ljava/util/List; -Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;->setSrcDevice(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceInfo;-><init>(Ljava/util/List;)V -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceInfo;->createSupplicantQuery(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceInfo;->VERSION_1_0:I -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceRequest;-><init>()V -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceRequest;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;-><init>(IILandroid/net/wifi/p2p/WifiP2pDevice;[B)V -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->getUniqueServiceNames()Ljava/util/List; -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->getVersion()I -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->mUniqueServiceNames:Ljava/util/List; -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->mVersion:I -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->newInstance(IILandroid/net/wifi/p2p/WifiP2pDevice;[B)Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse; -Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;->parse()Z -Landroid/net/wifi/p2p/WifiP2pConfig;->invalidate()V -Landroid/net/wifi/p2p/WifiP2pConfig;->MAX_GROUP_OWNER_INTENT:I -Landroid/net/wifi/p2p/WifiP2pDevice;->detailedDevicePattern:Ljava/util/regex/Pattern; -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_CLIENT_DISCOVERABILITY:I -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_CONCURRENT_OPER:I -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_DEVICE_LIMIT:I -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_INFRA_MANAGED:I -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_INVITATION_PROCEDURE:I -Landroid/net/wifi/p2p/WifiP2pDevice;->DEVICE_CAPAB_SERVICE_DISCOVERY:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_CROSS_CONN:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_GROUP_FORMATION:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_GROUP_LIMIT:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_GROUP_OWNER:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_INTRA_BSS_DIST:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_PERSISTENT_GROUP:I -Landroid/net/wifi/p2p/WifiP2pDevice;->GROUP_CAPAB_PERSISTENT_RECONN:I -Landroid/net/wifi/p2p/WifiP2pDevice;->isDeviceLimit()Z -Landroid/net/wifi/p2p/WifiP2pDevice;->isGroupLimit()Z -Landroid/net/wifi/p2p/WifiP2pDevice;->isInvitationCapable()Z -Landroid/net/wifi/p2p/WifiP2pDevice;->parseHex(Ljava/lang/String;)I -Landroid/net/wifi/p2p/WifiP2pDevice;->TAG:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pDevice;->threeTokenPattern:Ljava/util/regex/Pattern; -Landroid/net/wifi/p2p/WifiP2pDevice;->twoTokenPattern:Ljava/util/regex/Pattern; -Landroid/net/wifi/p2p/WifiP2pDevice;->updateSupplicantDetails(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/WifiP2pDevice;->WPS_CONFIG_DISPLAY:I -Landroid/net/wifi/p2p/WifiP2pDevice;->WPS_CONFIG_KEYPAD:I -Landroid/net/wifi/p2p/WifiP2pDevice;->WPS_CONFIG_PUSHBUTTON:I -Landroid/net/wifi/p2p/WifiP2pDeviceList;-><init>(Ljava/util/ArrayList;)V -Landroid/net/wifi/p2p/WifiP2pDeviceList;->clear()Z -Landroid/net/wifi/p2p/WifiP2pDeviceList;->isGroupOwner(Ljava/lang/String;)Z -Landroid/net/wifi/p2p/WifiP2pDeviceList;->mDevices:Ljava/util/HashMap; -Landroid/net/wifi/p2p/WifiP2pDeviceList;->remove(Landroid/net/wifi/p2p/WifiP2pDevice;)Z -Landroid/net/wifi/p2p/WifiP2pDeviceList;->remove(Landroid/net/wifi/p2p/WifiP2pDeviceList;)Z -Landroid/net/wifi/p2p/WifiP2pDeviceList;->updateGroupCapability(Ljava/lang/String;I)V -Landroid/net/wifi/p2p/WifiP2pDeviceList;->updateStatus(Ljava/lang/String;I)V -Landroid/net/wifi/p2p/WifiP2pDeviceList;->updateSupplicantDetails(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/WifiP2pDeviceList;->validateDevice(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/WifiP2pDeviceList;->validateDeviceAddress(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pGroup;->addClient(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/WifiP2pGroup;->addClient(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pGroup;->contains(Landroid/net/wifi/p2p/WifiP2pDevice;)Z -Landroid/net/wifi/p2p/WifiP2pGroup;->groupStartedPattern:Ljava/util/regex/Pattern; -Landroid/net/wifi/p2p/WifiP2pGroup;->mClients:Ljava/util/List; -Landroid/net/wifi/p2p/WifiP2pGroup;->mInterface:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pGroup;->mIsGroupOwner:Z -Landroid/net/wifi/p2p/WifiP2pGroup;->mNetId:I -Landroid/net/wifi/p2p/WifiP2pGroup;->mNetworkName:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pGroup;->mOwner:Landroid/net/wifi/p2p/WifiP2pDevice; -Landroid/net/wifi/p2p/WifiP2pGroup;->mPassphrase:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pGroup;->PERSISTENT_NET_ID:I -Landroid/net/wifi/p2p/WifiP2pGroup;->removeClient(Landroid/net/wifi/p2p/WifiP2pDevice;)Z -Landroid/net/wifi/p2p/WifiP2pGroup;->removeClient(Ljava/lang/String;)Z -Landroid/net/wifi/p2p/WifiP2pGroup;->setNetworkName(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pGroup;->setOwner(Landroid/net/wifi/p2p/WifiP2pDevice;)V -Landroid/net/wifi/p2p/WifiP2pGroup;->setPassphrase(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;->onDeleteGroup(I)V -Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>()V -Landroid/net/wifi/p2p/WifiP2pGroupList;->add(Landroid/net/wifi/p2p/WifiP2pGroup;)V -Landroid/net/wifi/p2p/WifiP2pGroupList;->clear()Z -Landroid/net/wifi/p2p/WifiP2pGroupList;->contains(I)Z -Landroid/net/wifi/p2p/WifiP2pGroupList;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/p2p/WifiP2pGroupList;->CREDENTIAL_MAX_NUM:I -Landroid/net/wifi/p2p/WifiP2pGroupList;->getNetworkId(Ljava/lang/String;)I -Landroid/net/wifi/p2p/WifiP2pGroupList;->getNetworkId(Ljava/lang/String;Ljava/lang/String;)I -Landroid/net/wifi/p2p/WifiP2pGroupList;->getOwnerAddr(I)Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pGroupList;->isClearCalled:Z -Landroid/net/wifi/p2p/WifiP2pGroupList;->mListener:Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener; -Landroid/net/wifi/p2p/WifiP2pGroupList;->remove(I)V -Landroid/net/wifi/p2p/WifiP2pGroupList;->remove(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pManager$Channel;-><init>(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Binder;Landroid/net/wifi/p2p/WifiP2pManager;)V -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->getListener(I)Ljava/lang/Object; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleDnsSdServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;)V -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleUpnpServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pUpnpServiceResponse;)V -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->INVALID_LISTENER_KEY:I -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mBinder:Landroid/os/Binder; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mChannelListener:Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mContext:Landroid/content/Context; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mDnsSdServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mDnsSdTxtListener:Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mHandler:Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mListenerKey:I -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mListenerMap:Ljava/util/HashMap; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mListenerMapLock:Ljava/lang/Object; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mP2pManager:Landroid/net/wifi/p2p/WifiP2pManager; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mUpnpServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener; -Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;->onHandoverMessageAvailable(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pManager$PersistentGroupInfoListener;->onPersistentGroupInfoAvailable(Landroid/net/wifi/p2p/WifiP2pGroupList;)V -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE:I -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_SERVICE_REQUEST:I -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_SERVICE_REQUEST_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->ADD_SERVICE_REQUEST_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->BASE:I -Landroid/net/wifi/p2p/WifiP2pManager;->CALLING_PACKAGE:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pManager;->CANCEL_CONNECT:I -Landroid/net/wifi/p2p/WifiP2pManager;->CANCEL_CONNECT_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CANCEL_CONNECT_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->checkChannel(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)V -Landroid/net/wifi/p2p/WifiP2pManager;->checkP2pConfig(Landroid/net/wifi/p2p/WifiP2pConfig;)V -Landroid/net/wifi/p2p/WifiP2pManager;->checkServiceInfo(Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;)V -Landroid/net/wifi/p2p/WifiP2pManager;->checkServiceRequest(Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;)V -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_LOCAL_SERVICES:I -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_LOCAL_SERVICES_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_LOCAL_SERVICES_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS:I -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT:I -Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DELETE_PERSISTENT_GROUP:I -Landroid/net/wifi/p2p/WifiP2pManager;->DELETE_PERSISTENT_GROUP_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DELETE_PERSISTENT_GROUP_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_PEERS:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_PEERS_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_PEERS_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_HANDOVER_MESSAGE:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;)Landroid/os/Messenger; -Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverSelect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger; -Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_REQUEST:I -Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_SELECT:I -Landroid/net/wifi/p2p/WifiP2pManager;->initalizeChannel(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Messenger;Landroid/os/Binder;)Landroid/net/wifi/p2p/WifiP2pManager$Channel; -Landroid/net/wifi/p2p/WifiP2pManager;->initializeInternal(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$Channel; -Landroid/net/wifi/p2p/WifiP2pManager;->initiatorReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->INITIATOR_REPORT_NFC_HANDOVER:I -Landroid/net/wifi/p2p/WifiP2pManager;->listen(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ZLandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->MIRACAST_DISABLED:I -Landroid/net/wifi/p2p/WifiP2pManager;->MIRACAST_SINK:I -Landroid/net/wifi/p2p/WifiP2pManager;->MIRACAST_SOURCE:I -Landroid/net/wifi/p2p/WifiP2pManager;->mService:Landroid/net/wifi/p2p/IWifiP2pManager; -Landroid/net/wifi/p2p/WifiP2pManager;->PING:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_LOCAL_SERVICE:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_LOCAL_SERVICE_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_LOCAL_SERVICE_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_SERVICE_REQUEST:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_SERVICE_REQUEST_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_SERVICE_REQUEST_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REPORT_NFC_HANDOVER_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REPORT_NFC_HANDOVER_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->REQUEST_CONNECTION_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->REQUEST_GROUP_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->REQUEST_PEERS:I -Landroid/net/wifi/p2p/WifiP2pManager;->REQUEST_PERSISTENT_GROUP_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->responderReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONDER_REPORT_NFC_HANDOVER:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_CONNECTION_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_GET_HANDOVER_MESSAGE:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_GROUP_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_PEERS:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_PERSISTENT_GROUP_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->RESPONSE_SERVICE:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_LISTEN:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_LISTEN_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_LISTEN_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_WPS:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_WPS_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->START_WPS_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_DISCOVERY:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_DISCOVERY_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_DISCOVERY_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_LISTEN:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_LISTEN_FAILED:I -Landroid/net/wifi/p2p/WifiP2pManager;->STOP_LISTEN_SUCCEEDED:I -Landroid/net/wifi/p2p/WifiP2pManager;->TAG:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->ENTER_PIN:I -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->PBC_REQ:I -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->PBC_RSP:I -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->SHOW_PIN:I -Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->TAG:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->COUPLED_SINK_SUPPORT_AT_SINK:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->COUPLED_SINK_SUPPORT_AT_SOURCE:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->DEVICE_TYPE:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getControlPort()I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getDeviceInfoHex()Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getMaxThroughput()I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->isCoupledSinkSupportedAtSink()Z -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->isCoupledSinkSupportedAtSource()Z -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->isSessionAvailable()Z -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->mCtrlPort:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->mDeviceInfo:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->mMaxThroughput:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->mWfdEnabled:Z -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->PRIMARY_SINK:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->readFromParcel(Landroid/os/Parcel;)V -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SECONDARY_SINK:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT1:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT2:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->setCoupledSinkSupportAtSink(Z)V -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->setCoupledSinkSupportAtSource(Z)V -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SOURCE_OR_PRIMARY_SINK:I -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->TAG:Ljava/lang/String; -Landroid/net/wifi/p2p/WifiP2pWfdInfo;->WFD_SOURCE:I -Landroid/net/wifi/ParcelUtil;-><init>()V -Landroid/net/wifi/ParcelUtil;->readCertificate(Landroid/os/Parcel;)Ljava/security/cert/X509Certificate; -Landroid/net/wifi/ParcelUtil;->readCertificates(Landroid/os/Parcel;)[Ljava/security/cert/X509Certificate; -Landroid/net/wifi/ParcelUtil;->readPrivateKey(Landroid/os/Parcel;)Ljava/security/PrivateKey; -Landroid/net/wifi/ParcelUtil;->writeCertificate(Landroid/os/Parcel;Ljava/security/cert/X509Certificate;)V -Landroid/net/wifi/ParcelUtil;->writeCertificates(Landroid/os/Parcel;[Ljava/security/cert/X509Certificate;)V -Landroid/net/wifi/ParcelUtil;->writePrivateKey(Landroid/os/Parcel;Ljava/security/PrivateKey;)V Landroid/net/wifi/PasspointManagementObjectDefinition;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V Landroid/net/wifi/PasspointManagementObjectDefinition;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/net/wifi/PasspointManagementObjectDefinition;->getBaseUri()Ljava/lang/String; @@ -39647,121 +37055,6 @@ Landroid/net/wifi/RssiPacketCountInfo;->rssi:I Landroid/net/wifi/RssiPacketCountInfo;->rxgood:I Landroid/net/wifi/RssiPacketCountInfo;->txbad:I Landroid/net/wifi/RssiPacketCountInfo;->txgood:I -Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingFailure(I)V -Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingResults(Ljava/util/List;)V -Landroid/net/wifi/rtt/IRttCallback$Stub;-><init>()V -Landroid/net/wifi/rtt/IRttCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IRttCallback; -Landroid/net/wifi/rtt/IRttCallback$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingFailure:I -Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingResults:I -Landroid/net/wifi/rtt/IRttCallback;->onRangingFailure(I)V -Landroid/net/wifi/rtt/IRttCallback;->onRangingResults(Ljava/util/List;)V -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->cancelRanging(Landroid/os/WorkSource;)V -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->isAvailable()Z -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V -Landroid/net/wifi/rtt/IWifiRttManager$Stub;-><init>()V -Landroid/net/wifi/rtt/IWifiRttManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IWifiRttManager; -Landroid/net/wifi/rtt/IWifiRttManager$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_cancelRanging:I -Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_isAvailable:I -Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_startRanging:I -Landroid/net/wifi/rtt/IWifiRttManager;->cancelRanging(Landroid/os/WorkSource;)V -Landroid/net/wifi/rtt/IWifiRttManager;->isAvailable()Z -Landroid/net/wifi/rtt/IWifiRttManager;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V -Landroid/net/wifi/rtt/RangingRequest$Builder;->mRttPeers:Ljava/util/List; -Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;)V -Landroid/net/wifi/rtt/RangingRequest;->enforceValidity(Z)V -Landroid/net/wifi/rtt/RangingRequest;->MAX_PEERS:I -Landroid/net/wifi/rtt/RangingRequest;->mRttPeers:Ljava/util/List; -Landroid/net/wifi/rtt/RangingResult;-><init>(ILandroid/net/MacAddress;IIIII[B[BJ)V -Landroid/net/wifi/rtt/RangingResult;-><init>(ILandroid/net/wifi/aware/PeerHandle;IIIII[B[BJ)V -Landroid/net/wifi/rtt/RangingResult;->EMPTY_BYTE_ARRAY:[B -Landroid/net/wifi/rtt/RangingResult;->mDistanceMm:I -Landroid/net/wifi/rtt/RangingResult;->mDistanceStdDevMm:I -Landroid/net/wifi/rtt/RangingResult;->mLci:[B -Landroid/net/wifi/rtt/RangingResult;->mLcr:[B -Landroid/net/wifi/rtt/RangingResult;->mMac:Landroid/net/MacAddress; -Landroid/net/wifi/rtt/RangingResult;->mNumAttemptedMeasurements:I -Landroid/net/wifi/rtt/RangingResult;->mNumSuccessfulMeasurements:I -Landroid/net/wifi/rtt/RangingResult;->mPeerHandle:Landroid/net/wifi/aware/PeerHandle; -Landroid/net/wifi/rtt/RangingResult;->mRssi:I -Landroid/net/wifi/rtt/RangingResult;->mStatus:I -Landroid/net/wifi/rtt/RangingResult;->mTimestamp:J -Landroid/net/wifi/rtt/RangingResult;->TAG:Ljava/lang/String; -Landroid/net/wifi/rtt/ResponderConfig;-><init>(Landroid/net/MacAddress;Landroid/net/wifi/aware/PeerHandle;IZIIIII)V -Landroid/net/wifi/rtt/ResponderConfig;->AWARE_BAND_2_DISCOVERY_CHANNEL:I -Landroid/net/wifi/rtt/ResponderConfig;->isValid(Z)Z -Landroid/net/wifi/rtt/ResponderConfig;->TAG:Ljava/lang/String; -Landroid/net/wifi/rtt/ResponderConfig;->translateScanResultChannelWidth(I)I -Landroid/net/wifi/rtt/WifiRttManager;-><init>(Landroid/content/Context;Landroid/net/wifi/rtt/IWifiRttManager;)V -Landroid/net/wifi/rtt/WifiRttManager;->mContext:Landroid/content/Context; -Landroid/net/wifi/rtt/WifiRttManager;->mService:Landroid/net/wifi/rtt/IWifiRttManager; -Landroid/net/wifi/rtt/WifiRttManager;->TAG:Ljava/lang/String; -Landroid/net/wifi/rtt/WifiRttManager;->VDBG:Z -Landroid/net/wifi/RttManager$ParcelableRttParams;-><init>([Landroid/net/wifi/RttManager$RttParams;)V -Landroid/net/wifi/RttManager$ParcelableRttParams;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/RttManager$ParcelableRttResults;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/RttManager$RttCapabilities;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/RttManager;-><init>(Landroid/content/Context;Landroid/net/wifi/rtt/WifiRttManager;)V -Landroid/net/wifi/RttManager;->CMD_OP_REG_BINDER:I -Landroid/net/wifi/RttManager;->DBG:Z -Landroid/net/wifi/RttManager;->mContext:Landroid/content/Context; -Landroid/net/wifi/RttManager;->mNewService:Landroid/net/wifi/rtt/WifiRttManager; -Landroid/net/wifi/RttManager;->mRttCapabilities:Landroid/net/wifi/RttManager$RttCapabilities; -Landroid/net/wifi/RttManager;->TAG:Ljava/lang/String; -Landroid/net/wifi/ScanResult$InformationElement;-><init>()V -Landroid/net/wifi/ScanResult$InformationElement;-><init>(Landroid/net/wifi/ScanResult$InformationElement;)V -Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_CAPABILITIES:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_CAPABILITIES:I -Landroid/net/wifi/ScanResult$RadioChainInfo;-><init>()V -Landroid/net/wifi/ScanResult$RadioChainInfo;->id:I -Landroid/net/wifi/ScanResult$RadioChainInfo;->level:I -Landroid/net/wifi/ScanResult;-><init>()V -Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/ScanResult;)V -Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;JI[BLjava/lang/String;IIJ)V -Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJII)V -Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;JILjava/lang/String;IIJIIIIIZ)V -Landroid/net/wifi/ScanResult;-><init>(Ljava/lang/String;Ljava/lang/String;JILjava/lang/String;IIJIIIIIZ)V -Landroid/net/wifi/ScanResult;->anqpElements:[Landroid/net/wifi/AnqpInformationElement; -Landroid/net/wifi/ScanResult;->carrierApEapType:I -Landroid/net/wifi/ScanResult;->carrierName:Ljava/lang/String; -Landroid/net/wifi/ScanResult;->CIPHER_CCMP:I -Landroid/net/wifi/ScanResult;->CIPHER_NONE:I -Landroid/net/wifi/ScanResult;->CIPHER_NO_GROUP_ADDRESSED:I -Landroid/net/wifi/ScanResult;->CIPHER_TKIP:I -Landroid/net/wifi/ScanResult;->clearFlag(J)V -Landroid/net/wifi/ScanResult;->FLAG_80211mc_RESPONDER:J -Landroid/net/wifi/ScanResult;->FLAG_PASSPOINT_NETWORK:J -Landroid/net/wifi/ScanResult;->is24GHz()Z -Landroid/net/wifi/ScanResult;->is24GHz(I)Z -Landroid/net/wifi/ScanResult;->is5GHz()Z -Landroid/net/wifi/ScanResult;->is5GHz(I)Z -Landroid/net/wifi/ScanResult;->isCarrierAp:Z -Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP_SHA256:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_FT_EAP:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_FT_PSK:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_NONE:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_OSEN:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_PSK:I -Landroid/net/wifi/ScanResult;->KEY_MGMT_PSK_SHA256:I -Landroid/net/wifi/ScanResult;->PROTOCOL_NONE:I -Landroid/net/wifi/ScanResult;->PROTOCOL_OSEN:I -Landroid/net/wifi/ScanResult;->PROTOCOL_WPA2:I -Landroid/net/wifi/ScanResult;->PROTOCOL_WPA:I -Landroid/net/wifi/ScanResult;->radioChainInfos:[Landroid/net/wifi/ScanResult$RadioChainInfo; -Landroid/net/wifi/ScanResult;->setFlag(J)V -Landroid/net/wifi/ScanResult;->UNSPECIFIED:I -Landroid/net/wifi/SupplicantState;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/SupplicantState;->isConnecting(Landroid/net/wifi/SupplicantState;)Z -Landroid/net/wifi/SupplicantState;->isDriverActive(Landroid/net/wifi/SupplicantState;)Z -Landroid/net/wifi/SupplicantState;->isHandshakeState(Landroid/net/wifi/SupplicantState;)Z Landroid/net/wifi/WifiActivityEnergyInfo;-><init>(JIJ[JJJJJ)V Landroid/net/wifi/WifiActivityEnergyInfo;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/net/wifi/WifiActivityEnergyInfo;->getControllerEnergyUsed()J @@ -39785,460 +37078,6 @@ Landroid/net/wifi/WifiActivityEnergyInfo;->STACK_STATE_INVALID:I Landroid/net/wifi/WifiActivityEnergyInfo;->STACK_STATE_STATE_ACTIVE:I Landroid/net/wifi/WifiActivityEnergyInfo;->STACK_STATE_STATE_IDLE:I Landroid/net/wifi/WifiActivityEnergyInfo;->STACK_STATE_STATE_SCANNING:I -Landroid/net/wifi/WifiConfiguration$AuthAlgorithm;-><init>()V -Landroid/net/wifi/WifiConfiguration$GroupCipher;-><init>()V -Landroid/net/wifi/WifiConfiguration$GroupCipher;->GTK_NOT_USED:I -Landroid/net/wifi/WifiConfiguration$KeyMgmt;-><init>()V -Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FT_EAP:I -Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FT_PSK:I -Landroid/net/wifi/WifiConfiguration$KeyMgmt;->OSEN:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;-><init>()V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->clearDisableReasonCounter()V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->clearDisableReasonCounter(I)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->CONNECT_CHOICE_EXISTS:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->CONNECT_CHOICE_NOT_EXISTS:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->copy(Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_ASSOCIATION_REJECTION:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_AUTHENTICATION_FAILURE:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_AUTHENTICATION_NO_CREDENTIALS:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_BAD_LINK:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_BY_WIFI_MANAGER:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_BY_WRONG_PASSWORD:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_DHCP_FAILURE:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_DNS_FAILURE:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_DUE_TO_USER_SWITCH:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_PERMANENT:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_TEMPORARY:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_TLS_VERSION_MISMATCH:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_WPS_START:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getCandidate()Landroid/net/wifi/ScanResult; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getCandidateScore()I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoice()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoiceTimestamp()J -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableReasonCounter(I)I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableTime()J -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getHasEverConnected()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkDisableReasonString()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkDisableReasonString(I)Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionBSSID()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionDisableReason()I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionStatus()I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkStatusString()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getSeenInLastQualifiedNetworkSelection()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->incrementDisableReasonCounter(I)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP:J -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->isDisabledByReason(I)Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->isNetworkEnabled()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->isNetworkPermanentlyDisabled()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->isNetworkTemporaryDisabled()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->isNotRecommended()Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mCandidate:Landroid/net/wifi/ScanResult; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mCandidateScore:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mConnectChoice:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mConnectChoiceTimestamp:J -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mHasEverConnected:Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSeclectionDisableCounter:[I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionBSSID:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionDisableReason:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNotRecommended:Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mSeenInLastQualifiedNetworkSelection:Z -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mStatus:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mTemporarilyDisabledTimestamp:J -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_MAX:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_STARTING_INDEX:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_ENABLE:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_ENABLED:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_PERMANENTLY_DISABLED:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_STATUS_MAX:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_TEMPORARY_DISABLED:I -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->QUALITY_NETWORK_SELECTION_DISABLE_REASON:[Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->QUALITY_NETWORK_SELECTION_STATUS:[Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->readFromParcel(Landroid/os/Parcel;)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidate(Landroid/net/wifi/ScanResult;)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidateScore(I)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoice(Ljava/lang/String;)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoiceTimestamp(J)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableReasonCounter(II)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableTime(J)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setHasEverConnected(Z)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionBSSID(Ljava/lang/String;)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionDisableReason(I)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionStatus(I)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNotRecommended(Z)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setSeenInLastQualifiedNetworkSelection(Z)V -Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->writeToParcel(Landroid/os/Parcel;)V -Landroid/net/wifi/WifiConfiguration$PairwiseCipher;-><init>()V -Landroid/net/wifi/WifiConfiguration$Protocol;-><init>()V -Landroid/net/wifi/WifiConfiguration$Protocol;->OSEN:I -Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>()V -Landroid/net/wifi/WifiConfiguration$RecentFailure;->clear()V -Landroid/net/wifi/WifiConfiguration$RecentFailure;->getAssociationStatus()I -Landroid/net/wifi/WifiConfiguration$RecentFailure;->mAssociationStatus:I -Landroid/net/wifi/WifiConfiguration$RecentFailure;->NONE:I -Landroid/net/wifi/WifiConfiguration$RecentFailure;->setAssociationStatus(I)V -Landroid/net/wifi/WifiConfiguration$RecentFailure;->STATUS_AP_UNABLE_TO_HANDLE_NEW_STA:I -Landroid/net/wifi/WifiConfiguration$Status;-><init>()V -Landroid/net/wifi/WifiConfiguration;->AP_BAND_2GHZ:I -Landroid/net/wifi/WifiConfiguration;->AP_BAND_5GHZ:I -Landroid/net/wifi/WifiConfiguration;->AP_BAND_ANY:I -Landroid/net/wifi/WifiConfiguration;->BACKUP_VERSION:I -Landroid/net/wifi/WifiConfiguration;->bssidVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->configKey()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->configKey(Z)Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->creationTime:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->dhcpServer:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->didSelfAdd:Z -Landroid/net/wifi/WifiConfiguration;->dtimInterval:I -Landroid/net/wifi/WifiConfiguration;->ephemeral:Z -Landroid/net/wifi/WifiConfiguration;->getBytesForBackup()[B -Landroid/net/wifi/WifiConfiguration;->getKeyIdForCredentials(Landroid/net/wifi/WifiConfiguration;)Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->getMoTree()Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->getNetworkSelectionStatus()Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus; -Landroid/net/wifi/WifiConfiguration;->getOrCreateRandomizedMacAddress()Landroid/net/MacAddress; -Landroid/net/wifi/WifiConfiguration;->getRandomizedMacAddress()Landroid/net/MacAddress; -Landroid/net/wifi/WifiConfiguration;->getWifiConfigFromBackup(Ljava/io/DataInputStream;)Landroid/net/wifi/WifiConfiguration; -Landroid/net/wifi/WifiConfiguration;->hiddenSSIDVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->HOME_NETWORK_RSSI_BOOST:I -Landroid/net/wifi/WifiConfiguration;->INVALID_NETWORK_ID:I -Landroid/net/wifi/WifiConfiguration;->isLegacyPasspointConfig:Z -Landroid/net/wifi/WifiConfiguration;->isLinked(Landroid/net/wifi/WifiConfiguration;)Z -Landroid/net/wifi/WifiConfiguration;->isMetered(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/WifiInfo;)Z -Landroid/net/wifi/WifiConfiguration;->isOpenNetwork()Z -Landroid/net/wifi/WifiConfiguration;->isValidMacAddressForRandomization(Landroid/net/MacAddress;)Z -Landroid/net/wifi/WifiConfiguration;->lastConnected:J -Landroid/net/wifi/WifiConfiguration;->lastDisconnected:J -Landroid/net/wifi/WifiConfiguration;->linkedConfigurations:Ljava/util/HashMap; -Landroid/net/wifi/WifiConfiguration;->LOCAL_ONLY_NETWORK_ID:I -Landroid/net/wifi/WifiConfiguration;->MAXIMUM_RANDOM_MAC_GENERATION_RETRY:I -Landroid/net/wifi/WifiConfiguration;->mCachedConfigKey:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->meteredOverride:I -Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_METERED:I -Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NONE:I -Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NOT_METERED:I -Landroid/net/wifi/WifiConfiguration;->mNetworkSelectionStatus:Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus; -Landroid/net/wifi/WifiConfiguration;->mPasspointManagementObjectTree:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->mRandomizedMacAddress:Landroid/net/MacAddress; -Landroid/net/wifi/WifiConfiguration;->peerWifiConfiguration:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->pmfVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->priorityVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->pskVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->readBitSet(Landroid/os/Parcel;)Ljava/util/BitSet; -Landroid/net/wifi/WifiConfiguration;->recentFailure:Landroid/net/wifi/WifiConfiguration$RecentFailure; -Landroid/net/wifi/WifiConfiguration;->requirePMF:Z -Landroid/net/wifi/WifiConfiguration;->setNetworkSelectionStatus(Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;)V -Landroid/net/wifi/WifiConfiguration;->setPasspointManagementObjectTree(Ljava/lang/String;)V -Landroid/net/wifi/WifiConfiguration;->setRandomizedMacAddress(Landroid/net/MacAddress;)V -Landroid/net/wifi/WifiConfiguration;->ssidVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->TAG:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->trimStringForKeyId(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->UNKNOWN_UID:I -Landroid/net/wifi/WifiConfiguration;->updateIdentiferVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->updateIdentifier:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->updateTime:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->userApproved:I -Landroid/net/wifi/WifiConfiguration;->userApprovedAsString(I)Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->USER_APPROVED:I -Landroid/net/wifi/WifiConfiguration;->USER_BANNED:I -Landroid/net/wifi/WifiConfiguration;->USER_PENDING:I -Landroid/net/wifi/WifiConfiguration;->USER_UNSPECIFIED:I -Landroid/net/wifi/WifiConfiguration;->wepTxKeyIdxVarName:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->writeBitSet(Landroid/os/Parcel;Ljava/util/BitSet;)V -Landroid/net/wifi/WifiEnterpriseConfig$Eap;-><init>()V -Landroid/net/wifi/WifiEnterpriseConfig$Eap;->strings:[Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig$Phase2;-><init>()V -Landroid/net/wifi/WifiEnterpriseConfig$Phase2;->AUTHEAP_PREFIX:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig$Phase2;->AUTH_PREFIX:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig$Phase2;->strings:[Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;->loadValue(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig$SupplicantSaver;->saveValue(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/net/wifi/WifiEnterpriseConfig;->ALTSUBJECT_MATCH_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ANON_IDENTITY_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CA_CERT_ALIAS_DELIMITER:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CA_CERT_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CA_CERT_PREFIX:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CA_PATH_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CLIENT_CERT_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->CLIENT_CERT_PREFIX:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->convertToQuotedString(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->copyFrom(Landroid/net/wifi/WifiEnterpriseConfig;ZLjava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->copyFromExternal(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->decodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->DOM_SUFFIX_MATCH_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->EAP_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->EMPTY_VALUE:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->encodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ENGINE_DISABLE:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ENGINE_ENABLE:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ENGINE_ID_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ENGINE_ID_KEYSTORE:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->ENGINE_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAliases()[Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getCaPath()Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getClientPrivateKey()Ljava/security/PrivateKey; -Landroid/net/wifi/WifiEnterpriseConfig;->getFieldValue(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getFieldValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getKeyId(Landroid/net/wifi/WifiEnterpriseConfig;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getStringIndex([Ljava/lang/String;Ljava/lang/String;I)I -Landroid/net/wifi/WifiEnterpriseConfig;->IDENTITY_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->isEapMethodValid()Z -Landroid/net/wifi/WifiEnterpriseConfig;->KEYSTORES_URI:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->KEYSTORE_URI:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->loadFromSupplicant(Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;)V -Landroid/net/wifi/WifiEnterpriseConfig;->mCaCerts:[Ljava/security/cert/X509Certificate; -Landroid/net/wifi/WifiEnterpriseConfig;->mClientCertificateChain:[Ljava/security/cert/X509Certificate; -Landroid/net/wifi/WifiEnterpriseConfig;->mClientPrivateKey:Ljava/security/PrivateKey; -Landroid/net/wifi/WifiEnterpriseConfig;->mEapMethod:I -Landroid/net/wifi/WifiEnterpriseConfig;->mPhase2Method:I -Landroid/net/wifi/WifiEnterpriseConfig;->OPP_KEY_CACHING:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->PASSWORD_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->PHASE2_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->PLMN_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->PRIVATE_KEY_ID_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->REALM_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->resetCaCertificate()V -Landroid/net/wifi/WifiEnterpriseConfig;->resetClientKeyEntry()V -Landroid/net/wifi/WifiEnterpriseConfig;->saveToSupplicant(Landroid/net/wifi/WifiEnterpriseConfig$SupplicantSaver;)Z -Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAliases([Ljava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->setCaPath(Ljava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->setFieldValue(Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->setFieldValue(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Landroid/net/wifi/WifiEnterpriseConfig;->SUBJECT_MATCH_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->SUPPLICANT_CONFIG_KEYS:[Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->TAG:Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->UNQUOTED_KEYS:Ljava/util/List; -Landroid/net/wifi/WifiInfo;-><init>(Landroid/net/wifi/WifiInfo;)V -Landroid/net/wifi/WifiInfo;->hasRealMacAddress()Z -Landroid/net/wifi/WifiInfo;->is24GHz()Z -Landroid/net/wifi/WifiInfo;->MAX_RSSI:I -Landroid/net/wifi/WifiInfo;->mEphemeral:Z -Landroid/net/wifi/WifiInfo;->mFrequency:I -Landroid/net/wifi/WifiInfo;->MIN_RSSI:I -Landroid/net/wifi/WifiInfo;->mLinkSpeed:I -Landroid/net/wifi/WifiInfo;->mMeteredHint:Z -Landroid/net/wifi/WifiInfo;->mNetworkId:I -Landroid/net/wifi/WifiInfo;->mRssi:I -Landroid/net/wifi/WifiInfo;->mSupplicantState:Landroid/net/wifi/SupplicantState; -Landroid/net/wifi/WifiInfo;->reset()V -Landroid/net/wifi/WifiInfo;->rxSuccess:J -Landroid/net/wifi/WifiInfo;->rxSuccessRate:D -Landroid/net/wifi/WifiInfo;->setEphemeral(Z)V -Landroid/net/wifi/WifiInfo;->setFrequency(I)V -Landroid/net/wifi/WifiInfo;->setInetAddress(Ljava/net/InetAddress;)V -Landroid/net/wifi/WifiInfo;->setMeteredHint(Z)V -Landroid/net/wifi/WifiInfo;->setSSID(Landroid/net/wifi/WifiSsid;)V -Landroid/net/wifi/WifiInfo;->stateMap:Ljava/util/EnumMap; -Landroid/net/wifi/WifiInfo;->TAG:Ljava/lang/String; -Landroid/net/wifi/WifiInfo;->txBad:J -Landroid/net/wifi/WifiInfo;->txBadRate:D -Landroid/net/wifi/WifiInfo;->txRetries:J -Landroid/net/wifi/WifiInfo;->txRetriesRate:D -Landroid/net/wifi/WifiInfo;->txSuccess:J -Landroid/net/wifi/WifiInfo;->txSuccessRate:D -Landroid/net/wifi/WifiInfo;->valueOf(Ljava/lang/String;)Landroid/net/wifi/SupplicantState; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->REQUEST_REGISTERED:I -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/os/Looper;Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;)V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->getMessenger()Landroid/os/Messenger; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mLooper:Landroid/os/Looper; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mMessenger:Landroid/os/Messenger; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mWifiManager:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->notifyFailed(I)V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;-><init>()V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onRegistered(Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;)V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStarted(Landroid/net/wifi/WifiConfiguration;)V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStopped()V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/os/Looper;Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;)V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->getMessenger()Landroid/os/Messenger; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mLooper:Landroid/os/Looper; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mMessenger:Landroid/os/Messenger; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mWifiManager:Ljava/lang/ref/WeakReference; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->registered()V -Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;->mConfig:Landroid/net/wifi/WifiConfiguration; -Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;->mCloseGuard:Ldalvik/system/CloseGuard; -Landroid/net/wifi/WifiManager$MulticastLock;->mBinder:Landroid/os/IBinder; -Landroid/net/wifi/WifiManager$MulticastLock;->mHeld:Z -Landroid/net/wifi/WifiManager$MulticastLock;->mRefCount:I -Landroid/net/wifi/WifiManager$MulticastLock;->mRefCounted:Z -Landroid/net/wifi/WifiManager$MulticastLock;->mTag:Ljava/lang/String; -Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;-><init>(Landroid/os/Looper;Landroid/net/wifi/hotspot2/ProvisioningCallback;)V -Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mCallback:Landroid/net/wifi/hotspot2/ProvisioningCallback; -Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->onProvisioningFailure(I)V -Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->onProvisioningStatus(I)V -Landroid/net/wifi/WifiManager$ServiceHandler;->dispatchMessageToListeners(Landroid/os/Message;)V -Landroid/net/wifi/WifiManager$SoftApCallback;->onNumClientsChanged(I)V -Landroid/net/wifi/WifiManager$SoftApCallback;->onStateChanged(II)V -Landroid/net/wifi/WifiManager$SoftApCallbackProxy;-><init>(Landroid/os/Looper;Landroid/net/wifi/WifiManager$SoftApCallback;)V -Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$SoftApCallback; -Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mHandler:Landroid/os/Handler; -Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onNumClientsChanged(I)V -Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onStateChanged(II)V -Landroid/net/wifi/WifiManager$TxPacketCountListener;->onFailure(I)V -Landroid/net/wifi/WifiManager$TxPacketCountListener;->onSuccess(I)V -Landroid/net/wifi/WifiManager$WifiLock;->mBinder:Landroid/os/IBinder; -Landroid/net/wifi/WifiManager$WifiLock;->mHeld:Z -Landroid/net/wifi/WifiManager$WifiLock;->mLockType:I -Landroid/net/wifi/WifiManager$WifiLock;->mRefCount:I -Landroid/net/wifi/WifiManager$WifiLock;->mRefCounted:Z -Landroid/net/wifi/WifiManager$WifiLock;->mTag:Ljava/lang/String; -Landroid/net/wifi/WifiManager$WifiLock;->mWorkSource:Landroid/os/WorkSource; -Landroid/net/wifi/WifiManager;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiManager;Landroid/os/Looper;)V -Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_DEAUTH_IMMINENT:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_ICON:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_OSU_PROVIDERS_LIST:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->ACTION_REQUEST_DISABLE:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->ACTION_REQUEST_ENABLE:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;)I -Landroid/net/wifi/WifiManager;->BASE:I -Landroid/net/wifi/WifiManager;->BATCHED_SCAN_RESULTS_AVAILABLE_ACTION:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->BUSY:I -Landroid/net/wifi/WifiManager;->CANCEL_WPS:I -Landroid/net/wifi/WifiManager;->CANCEL_WPS_FAILED:I -Landroid/net/wifi/WifiManager;->CANCEL_WPS_SUCCEDED:I -Landroid/net/wifi/WifiManager;->CONNECT_NETWORK:I -Landroid/net/wifi/WifiManager;->CONNECT_NETWORK_FAILED:I -Landroid/net/wifi/WifiManager;->CONNECT_NETWORK_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->DATA_ACTIVITY_IN:I -Landroid/net/wifi/WifiManager;->DATA_ACTIVITY_INOUT:I -Landroid/net/wifi/WifiManager;->DATA_ACTIVITY_NONE:I -Landroid/net/wifi/WifiManager;->DATA_ACTIVITY_NOTIFICATION:I -Landroid/net/wifi/WifiManager;->DATA_ACTIVITY_OUT:I -Landroid/net/wifi/WifiManager;->deauthenticateNetwork(JZ)V -Landroid/net/wifi/WifiManager;->DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED:Z -Landroid/net/wifi/WifiManager;->disableEphemeralNetwork(Ljava/lang/String;)V -Landroid/net/wifi/WifiManager;->DISABLE_NETWORK:I -Landroid/net/wifi/WifiManager;->DISABLE_NETWORK_FAILED:I -Landroid/net/wifi/WifiManager;->DISABLE_NETWORK_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->enableWifiConnectivityManager(Z)V -Landroid/net/wifi/WifiManager;->ERROR:I -Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_EAP_FAILURE:I -Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_NONE:I -Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_TIMEOUT:I -Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_WRONG_PSWD:I -Landroid/net/wifi/WifiManager;->EXTRA_ANQP_ELEMENT_DATA:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_BSSID_LONG:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_DELAY:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_ESS:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_FILENAME:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_ICON:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_LINK_PROPERTIES:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_NETWORK_CAPABILITIES:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_SCAN_AVAILABLE:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_SUBSCRIPTION_REMEDIATION_METHOD:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_SUPPLICANT_ERROR_REASON:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_URL:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_WIFI_AP_FAILURE_REASON:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_WIFI_AP_INTERFACE_NAME:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->EXTRA_WIFI_AP_MODE:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->factoryReset()V -Landroid/net/wifi/WifiManager;->FORGET_NETWORK:I -Landroid/net/wifi/WifiManager;->FORGET_NETWORK_FAILED:I -Landroid/net/wifi/WifiManager;->FORGET_NETWORK_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->getAllMatchingWifiConfigs(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/WifiManager;->getChannel()Lcom/android/internal/util/AsyncChannel; -Landroid/net/wifi/WifiManager;->getControllerActivityEnergyInfo(I)Landroid/net/wifi/WifiActivityEnergyInfo; -Landroid/net/wifi/WifiManager;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String; -Landroid/net/wifi/WifiManager;->getEnableAutoJoinWhenAssociated()Z -Landroid/net/wifi/WifiManager;->getMatchingOsuProviders(Landroid/net/wifi/ScanResult;)Ljava/util/List; -Landroid/net/wifi/WifiManager;->getSupportedFeatures()I -Landroid/net/wifi/WifiManager;->getTxPacketCount(Landroid/net/wifi/WifiManager$TxPacketCountListener;)V -Landroid/net/wifi/WifiManager;->HOTSPOT_FAILED:I -Landroid/net/wifi/WifiManager;->HOTSPOT_OBSERVER_REGISTERED:I -Landroid/net/wifi/WifiManager;->HOTSPOT_STARTED:I -Landroid/net/wifi/WifiManager;->HOTSPOT_STOPPED:I -Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_CONFIGURATION_ERROR:I -Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_LOCAL_ONLY:I -Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_TETHERED:I -Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_UNSPECIFIED:I -Landroid/net/wifi/WifiManager;->INVALID_ARGS:I -Landroid/net/wifi/WifiManager;->INVALID_KEY:I -Landroid/net/wifi/WifiManager;->IN_PROGRESS:I -Landroid/net/wifi/WifiManager;->isAdditionalStaSupported()Z -Landroid/net/wifi/WifiManager;->isDualModeSupported()Z -Landroid/net/wifi/WifiManager;->isFeatureSupported(I)Z -Landroid/net/wifi/WifiManager;->isMulticastEnabled()Z -Landroid/net/wifi/WifiManager;->isOffChannelTdlsSupported()Z -Landroid/net/wifi/WifiManager;->isPasspointSupported()Z -Landroid/net/wifi/WifiManager;->isWifiAwareSupported()Z -Landroid/net/wifi/WifiManager;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel; -Landroid/net/wifi/WifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I -Landroid/net/wifi/WifiManager;->MAX_ACTIVE_LOCKS:I -Landroid/net/wifi/WifiManager;->mConnected:Ljava/util/concurrent/CountDownLatch; -Landroid/net/wifi/WifiManager;->mContext:Landroid/content/Context; -Landroid/net/wifi/WifiManager;->mListenerKey:I -Landroid/net/wifi/WifiManager;->mListenerMap:Landroid/util/SparseArray; -Landroid/net/wifi/WifiManager;->mListenerMapLock:Ljava/lang/Object; -Landroid/net/wifi/WifiManager;->mLock:Ljava/lang/Object; -Landroid/net/wifi/WifiManager;->mLOHSCallbackProxy:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy; -Landroid/net/wifi/WifiManager;->mLOHSObserverProxy:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy; -Landroid/net/wifi/WifiManager;->mLooper:Landroid/os/Looper; -Landroid/net/wifi/WifiManager;->mTargetSdkVersion:I -Landroid/net/wifi/WifiManager;->NOT_AUTHORIZED:I -Landroid/net/wifi/WifiManager;->putListener(Ljava/lang/Object;)I -Landroid/net/wifi/WifiManager;->queryPasspointIcon(JLjava/lang/String;)V -Landroid/net/wifi/WifiManager;->registerSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;Landroid/os/Handler;)V -Landroid/net/wifi/WifiManager;->removeListener(I)Ljava/lang/Object; -Landroid/net/wifi/WifiManager;->restoreBackupData([B)V -Landroid/net/wifi/WifiManager;->restoreSupplicantBackupData([B[B)V -Landroid/net/wifi/WifiManager;->retrieveBackupData()[B -Landroid/net/wifi/WifiManager;->RSSI_PKTCNT_FETCH:I -Landroid/net/wifi/WifiManager;->RSSI_PKTCNT_FETCH_FAILED:I -Landroid/net/wifi/WifiManager;->RSSI_PKTCNT_FETCH_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->SAP_START_FAILURE_GENERAL:I -Landroid/net/wifi/WifiManager;->SAP_START_FAILURE_NO_CHANNEL:I -Landroid/net/wifi/WifiManager;->SAVE_NETWORK:I -Landroid/net/wifi/WifiManager;->SAVE_NETWORK_FAILED:I -Landroid/net/wifi/WifiManager;->SAVE_NETWORK_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->setCountryCode(Ljava/lang/String;)V -Landroid/net/wifi/WifiManager;->setEnableAutoJoinWhenAssociated(Z)Z -Landroid/net/wifi/WifiManager;->sServiceHandlerDispatchLock:Ljava/lang/Object; -Landroid/net/wifi/WifiManager;->startSoftAp(Landroid/net/wifi/WifiConfiguration;)Z -Landroid/net/wifi/WifiManager;->startSubscriptionProvisioning(Landroid/net/wifi/hotspot2/OsuProvider;Landroid/net/wifi/hotspot2/ProvisioningCallback;Landroid/os/Handler;)V -Landroid/net/wifi/WifiManager;->START_WPS:I -Landroid/net/wifi/WifiManager;->START_WPS_SUCCEEDED:I -Landroid/net/wifi/WifiManager;->stopLocalOnlyHotspot()V -Landroid/net/wifi/WifiManager;->stopSoftAp()Z -Landroid/net/wifi/WifiManager;->TAG:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->unregisterLocalOnlyHotspotObserver()V -Landroid/net/wifi/WifiManager;->unregisterSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;)V -Landroid/net/wifi/WifiManager;->updateInterfaceIpState(Ljava/lang/String;I)V -Landroid/net/wifi/WifiManager;->watchLocalOnlyHotspot(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;Landroid/os/Handler;)V -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AP_STA:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AWARE:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_BATCH_SCAN:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_CONFIG_NDO:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_CONTROL_ROAMING:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_D2AP_RTT:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_D2D_RTT:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_EPR:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_HAL_EPNO:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_IE_WHITELIST:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_INFRA:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_INFRA_5G:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_LINK_LAYER_STATS:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_LOGGER:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_MKEEP_ALIVE:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_MOBILE_HOTSPOT:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_P2P:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_PASSPOINT:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_PNO:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_RSSI_MONITOR:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_SCANNER:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_SCAN_RAND:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS_OFFCHANNEL:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TRANSMIT_POWER:I -Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TX_POWER_LIMIT:I -Landroid/net/wifi/WifiManager;->WIFI_MODE_NO_LOCKS_HELD:I -Landroid/net/wifi/WifiManager;->WIFI_SCAN_AVAILABLE:Ljava/lang/String; -Landroid/net/wifi/WifiManager;->WPS_COMPLETED:I -Landroid/net/wifi/WifiManager;->WPS_FAILED:I -Landroid/net/wifi/WifiNetworkConnectionStatistics;->TAG:Ljava/lang/String; Landroid/net/wifi/WifiNetworkScoreCache$CacheListener;-><init>(Landroid/os/Handler;)V Landroid/net/wifi/WifiNetworkScoreCache$CacheListener;->mHandler:Landroid/os/Handler; Landroid/net/wifi/WifiNetworkScoreCache$CacheListener;->networkCacheUpdated(Ljava/util/List;)V @@ -40268,116 +37107,6 @@ Landroid/net/wifi/WifiNetworkScoreCache;->registerListener(Landroid/net/wifi/Wif Landroid/net/wifi/WifiNetworkScoreCache;->TAG:Ljava/lang/String; Landroid/net/wifi/WifiNetworkScoreCache;->unregisterListener()V Landroid/net/wifi/WifiNetworkScoreCache;->updateScores(Ljava/util/List;)V -Landroid/net/wifi/WifiScanner$ChannelSpec;->dwellTimeMS:I -Landroid/net/wifi/WifiScanner$ChannelSpec;->passive:Z -Landroid/net/wifi/WifiScanner$HotlistSettings;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$OperationResult;-><init>(ILjava/lang/String;)V -Landroid/net/wifi/WifiScanner$OperationResult;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$OperationResult;->description:Ljava/lang/String; -Landroid/net/wifi/WifiScanner$OperationResult;->reason:I -Landroid/net/wifi/WifiScanner$ParcelableScanData;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$ParcelableScanResults;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$PnoScanListener;->onPnoNetworkFound([Landroid/net/wifi/ScanResult;)V -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->authBitField:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->AUTH_CODE_EAPOL:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->AUTH_CODE_OPEN:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->AUTH_CODE_PSK:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->flags:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->FLAG_A_BAND:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->FLAG_DIRECTED_SCAN:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->FLAG_G_BAND:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->FLAG_SAME_NETWORK:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->FLAG_STRICT_MATCH:B -Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork;->ssid:Ljava/lang/String; -Landroid/net/wifi/WifiScanner$PnoSettings;-><init>()V -Landroid/net/wifi/WifiScanner$PnoSettings;->band5GHzBonus:I -Landroid/net/wifi/WifiScanner$PnoSettings;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$PnoSettings;->currentConnectionBonus:I -Landroid/net/wifi/WifiScanner$PnoSettings;->initialScoreMax:I -Landroid/net/wifi/WifiScanner$PnoSettings;->isConnected:Z -Landroid/net/wifi/WifiScanner$PnoSettings;->min24GHzRssi:I -Landroid/net/wifi/WifiScanner$PnoSettings;->min5GHzRssi:I -Landroid/net/wifi/WifiScanner$PnoSettings;->networkList:[Landroid/net/wifi/WifiScanner$PnoSettings$PnoNetwork; -Landroid/net/wifi/WifiScanner$PnoSettings;->sameNetworkBonus:I -Landroid/net/wifi/WifiScanner$PnoSettings;->secureBonus:I -Landroid/net/wifi/WifiScanner$ScanData;-><init>()V -Landroid/net/wifi/WifiScanner$ScanData;-><init>(IIIZ[Landroid/net/wifi/ScanResult;)V -Landroid/net/wifi/WifiScanner$ScanData;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$ScanData;->getBucketsScanned()I -Landroid/net/wifi/WifiScanner$ScanData;->isAllChannelsScanned()Z -Landroid/net/wifi/WifiScanner$ScanData;->mAllChannelsScanned:Z -Landroid/net/wifi/WifiScanner$ScanData;->mBucketsScanned:I -Landroid/net/wifi/WifiScanner$ScanData;->mFlags:I -Landroid/net/wifi/WifiScanner$ScanData;->mId:I -Landroid/net/wifi/WifiScanner$ScanData;->mResults:[Landroid/net/wifi/ScanResult; -Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;-><init>(Ljava/lang/String;)V -Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;->ssid:Ljava/lang/String; -Landroid/net/wifi/WifiScanner$ScanSettings;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner$ScanSettings;->hiddenNetworks:[Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork; -Landroid/net/wifi/WifiScanner$ScanSettings;->isPnoScan:Z -Landroid/net/wifi/WifiScanner$ScanSettings;->type:I -Landroid/net/wifi/WifiScanner$WifiChangeSettings;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/net/wifi/WifiScanner;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiScanner;Landroid/os/Looper;)V -Landroid/net/wifi/WifiScanner;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;)I -Landroid/net/wifi/WifiScanner;->BASE:I -Landroid/net/wifi/WifiScanner;->CMD_DEREGISTER_SCAN_LISTENER:I -Landroid/net/wifi/WifiScanner;->CMD_FULL_SCAN_RESULT:I -Landroid/net/wifi/WifiScanner;->CMD_GET_SCAN_RESULTS:I -Landroid/net/wifi/WifiScanner;->CMD_GET_SINGLE_SCAN_RESULTS:I -Landroid/net/wifi/WifiScanner;->CMD_OP_FAILED:I -Landroid/net/wifi/WifiScanner;->CMD_OP_SUCCEEDED:I -Landroid/net/wifi/WifiScanner;->CMD_PNO_NETWORK_FOUND:I -Landroid/net/wifi/WifiScanner;->CMD_REGISTER_SCAN_LISTENER:I -Landroid/net/wifi/WifiScanner;->CMD_SCAN_RESULT:I -Landroid/net/wifi/WifiScanner;->CMD_SINGLE_SCAN_COMPLETED:I -Landroid/net/wifi/WifiScanner;->CMD_START_BACKGROUND_SCAN:I -Landroid/net/wifi/WifiScanner;->CMD_START_PNO_SCAN:I -Landroid/net/wifi/WifiScanner;->CMD_START_SINGLE_SCAN:I -Landroid/net/wifi/WifiScanner;->CMD_STOP_BACKGROUND_SCAN:I -Landroid/net/wifi/WifiScanner;->CMD_STOP_PNO_SCAN:I -Landroid/net/wifi/WifiScanner;->CMD_STOP_SINGLE_SCAN:I -Landroid/net/wifi/WifiScanner;->DBG:Z -Landroid/net/wifi/WifiScanner;->deregisterScanListener(Landroid/net/wifi/WifiScanner$ScanListener;)V -Landroid/net/wifi/WifiScanner;->getAvailableChannels(I)Ljava/util/List; -Landroid/net/wifi/WifiScanner;->getListener(I)Ljava/lang/Object; -Landroid/net/wifi/WifiScanner;->getListenerKey(Ljava/lang/Object;)I -Landroid/net/wifi/WifiScanner;->getSingleScanResults()Ljava/util/List; -Landroid/net/wifi/WifiScanner;->GET_AVAILABLE_CHANNELS_EXTRA:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->INVALID_KEY:I -Landroid/net/wifi/WifiScanner;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel; -Landroid/net/wifi/WifiScanner;->mContext:Landroid/content/Context; -Landroid/net/wifi/WifiScanner;->mInternalHandler:Landroid/os/Handler; -Landroid/net/wifi/WifiScanner;->mListenerKey:I -Landroid/net/wifi/WifiScanner;->mListenerMap:Landroid/util/SparseArray; -Landroid/net/wifi/WifiScanner;->mListenerMapLock:Ljava/lang/Object; -Landroid/net/wifi/WifiScanner;->mService:Landroid/net/wifi/IWifiScanner; -Landroid/net/wifi/WifiScanner;->PNO_PARAMS_PNO_SETTINGS_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->PNO_PARAMS_SCAN_SETTINGS_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->putListener(Ljava/lang/Object;)I -Landroid/net/wifi/WifiScanner;->registerScanListener(Landroid/net/wifi/WifiScanner$ScanListener;)V -Landroid/net/wifi/WifiScanner;->removeListener(I)Ljava/lang/Object; -Landroid/net/wifi/WifiScanner;->removeListener(Ljava/lang/Object;)I -Landroid/net/wifi/WifiScanner;->SCAN_PARAMS_SCAN_SETTINGS_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->SCAN_PARAMS_WORK_SOURCE_KEY:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->startConnectedPnoScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$PnoSettings;Landroid/net/wifi/WifiScanner$PnoScanListener;)V -Landroid/net/wifi/WifiScanner;->startDisconnectedPnoScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$PnoSettings;Landroid/net/wifi/WifiScanner$PnoScanListener;)V -Landroid/net/wifi/WifiScanner;->startPnoScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$PnoSettings;I)V -Landroid/net/wifi/WifiScanner;->stopPnoScan(Landroid/net/wifi/WifiScanner$ScanListener;)V -Landroid/net/wifi/WifiScanner;->TAG:Ljava/lang/String; -Landroid/net/wifi/WifiScanner;->TYPE_HIGH_ACCURACY:I -Landroid/net/wifi/WifiScanner;->TYPE_LOW_LATENCY:I -Landroid/net/wifi/WifiScanner;->TYPE_LOW_POWER:I -Landroid/net/wifi/WifiScanner;->validateChannel()V -Landroid/net/wifi/WifiSsid;-><init>()V -Landroid/net/wifi/WifiSsid;->convertToBytes(Ljava/lang/String;)V -Landroid/net/wifi/WifiSsid;->createFromByteArray([B)Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/WifiSsid;->createFromHex(Ljava/lang/String;)Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/WifiSsid;->getHexString()Ljava/lang/String; -Landroid/net/wifi/WifiSsid;->HEX_RADIX:I -Landroid/net/wifi/WifiSsid;->isArrayAllZeroes([B)Z -Landroid/net/wifi/WifiSsid;->isHidden()Z -Landroid/net/wifi/WifiSsid;->TAG:Ljava/lang/String; Landroid/net/wifi/WifiWakeReasonAndCounts;-><init>()V Landroid/net/wifi/WifiWakeReasonAndCounts;->cmdEventWakeCntArray:[I Landroid/net/wifi/WifiWakeReasonAndCounts;->CREATOR:Landroid/os/Parcelable$Creator; @@ -43626,45 +40355,6 @@ Landroid/os/IServiceManager;->listServices(I)[Ljava/lang/String; Landroid/os/IServiceManager;->LIST_SERVICES_TRANSACTION:I Landroid/os/IServiceManager;->setPermissionController(Landroid/os/IPermissionController;)V Landroid/os/IServiceManager;->SET_PERMISSION_CONTROLLER_TRANSACTION:I -Landroid/os/IStatsCompanionService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelAlarmForSubscriberTriggering()V -Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelAnomalyAlarm()V -Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelPullingAlarm()V -Landroid/os/IStatsCompanionService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String; -Landroid/os/IStatsCompanionService$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/os/IStatsCompanionService$Stub$Proxy;->pullData(I)[Landroid/os/StatsLogEventWrapper; -Landroid/os/IStatsCompanionService$Stub$Proxy;->sendDataBroadcast(Landroid/os/IBinder;J)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->sendSubscriberBroadcast(Landroid/os/IBinder;JJJJ[Ljava/lang/String;Landroid/os/StatsDimensionsValue;)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->setAlarmForSubscriberTriggering(J)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->setAnomalyAlarm(J)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->setPullingAlarm(J)V -Landroid/os/IStatsCompanionService$Stub$Proxy;->statsdReady()V -Landroid/os/IStatsCompanionService$Stub$Proxy;->triggerUidSnapshot()V -Landroid/os/IStatsCompanionService$Stub;-><init>()V -Landroid/os/IStatsCompanionService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IStatsCompanionService; -Landroid/os/IStatsCompanionService$Stub;->DESCRIPTOR:Ljava/lang/String; -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelAlarmForSubscriberTriggering:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelAnomalyAlarm:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelPullingAlarm:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_pullData:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_sendDataBroadcast:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_sendSubscriberBroadcast:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setAlarmForSubscriberTriggering:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setAnomalyAlarm:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setPullingAlarm:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_statsdReady:I -Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_triggerUidSnapshot:I -Landroid/os/IStatsCompanionService;->cancelAlarmForSubscriberTriggering()V -Landroid/os/IStatsCompanionService;->cancelAnomalyAlarm()V -Landroid/os/IStatsCompanionService;->cancelPullingAlarm()V -Landroid/os/IStatsCompanionService;->pullData(I)[Landroid/os/StatsLogEventWrapper; -Landroid/os/IStatsCompanionService;->sendDataBroadcast(Landroid/os/IBinder;J)V -Landroid/os/IStatsCompanionService;->sendSubscriberBroadcast(Landroid/os/IBinder;JJJJ[Ljava/lang/String;Landroid/os/StatsDimensionsValue;)V -Landroid/os/IStatsCompanionService;->setAlarmForSubscriberTriggering(J)V -Landroid/os/IStatsCompanionService;->setAnomalyAlarm(J)V -Landroid/os/IStatsCompanionService;->setPullingAlarm(J)V -Landroid/os/IStatsCompanionService;->statsdReady()V -Landroid/os/IStatsCompanionService;->triggerUidSnapshot()V Landroid/os/IStatsManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IStatsManager$Stub$Proxy;->addConfiguration(J[BLjava/lang/String;)V Landroid/os/IStatsManager$Stub$Proxy;->getData(JLjava/lang/String;)[B @@ -45217,13 +41907,6 @@ Landroid/os/ShellCommand;->TAG:Ljava/lang/String; Landroid/os/SimpleClock;-><init>(Ljava/time/ZoneId;)V Landroid/os/SimpleClock;->zone:Ljava/time/ZoneId; Landroid/os/StatFs;->doStat(Ljava/lang/String;)Landroid/system/StructStatVfs; -Landroid/os/StatsDimensionsValue;-><init>(Landroid/os/Parcel;)V -Landroid/os/StatsDimensionsValue;->mField:I -Landroid/os/StatsDimensionsValue;->mValue:Ljava/lang/Object; -Landroid/os/StatsDimensionsValue;->mValueType:I -Landroid/os/StatsDimensionsValue;->readValueFromParcel(ILandroid/os/Parcel;)Ljava/lang/Object; -Landroid/os/StatsDimensionsValue;->TAG:Ljava/lang/String; -Landroid/os/StatsDimensionsValue;->writeValueToParcel(ILjava/lang/Object;Landroid/os/Parcel;I)Z Landroid/os/StatsLogEventWrapper;-><init>(JII)V Landroid/os/StatsLogEventWrapper;-><init>(Landroid/os/Parcel;)V Landroid/os/StatsLogEventWrapper;->CREATOR:Landroid/os/Parcelable$Creator; @@ -48671,33 +45354,6 @@ Landroid/provider/FontsContract;->SYNC_FONT_FETCH_TIMEOUT_MS:J Landroid/provider/FontsContract;->TAG:Ljava/lang/String; Landroid/provider/FontsContract;->THREAD_RENEWAL_THRESHOLD_MS:I Landroid/provider/LiveFolders;-><init>()V -Landroid/provider/MediaStore$Audio$AudioColumns;->ALBUM_ARTIST:Ljava/lang/String; -Landroid/provider/MediaStore$Audio$AudioColumns;->COMPILATION:Ljava/lang/String; -Landroid/provider/MediaStore$Audio$AudioColumns;->GENRE:Ljava/lang/String; -Landroid/provider/MediaStore$Audio$AudioColumns;->TITLE_RESOURCE_URI:Ljava/lang/String; -Landroid/provider/MediaStore$Audio$Media;->EXTERNAL_PATHS:[Ljava/lang/String; -Landroid/provider/MediaStore$Audio$Radio;-><init>()V -Landroid/provider/MediaStore$Files;->getDirectoryUri(Ljava/lang/String;)Landroid/net/Uri; -Landroid/provider/MediaStore$Images$Media;->StoreThumbnail(Landroid/content/ContentResolver;Landroid/graphics/Bitmap;JFFI)Landroid/graphics/Bitmap; -Landroid/provider/MediaStore$InternalThumbnails;-><init>()V -Landroid/provider/MediaStore$InternalThumbnails;->cancelThumbnailRequest(Landroid/content/ContentResolver;JLandroid/net/Uri;J)V -Landroid/provider/MediaStore$InternalThumbnails;->DEFAULT_GROUP_ID:I -Landroid/provider/MediaStore$InternalThumbnails;->FULL_SCREEN_KIND:I -Landroid/provider/MediaStore$InternalThumbnails;->getMiniThumbFromFile(Landroid/database/Cursor;Landroid/net/Uri;Landroid/content/ContentResolver;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap; -Landroid/provider/MediaStore$InternalThumbnails;->getThumbnail(Landroid/content/ContentResolver;JJILandroid/graphics/BitmapFactory$Options;Landroid/net/Uri;Z)Landroid/graphics/Bitmap; -Landroid/provider/MediaStore$InternalThumbnails;->MICRO_KIND:I -Landroid/provider/MediaStore$InternalThumbnails;->MINI_KIND:I -Landroid/provider/MediaStore$InternalThumbnails;->PROJECTION:[Ljava/lang/String; -Landroid/provider/MediaStore$InternalThumbnails;->sThumbBuf:[B -Landroid/provider/MediaStore$InternalThumbnails;->sThumbBufLock:Ljava/lang/Object; -Landroid/provider/MediaStore$MediaColumns;->MEDIA_SCANNER_NEW_OBJECT_ID:Ljava/lang/String; -Landroid/provider/MediaStore;->CONTENT_AUTHORITY_SLASH:Ljava/lang/String; -Landroid/provider/MediaStore;->getDocumentUri(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/util/List;)Landroid/net/Uri; -Landroid/provider/MediaStore;->getFilePath(Landroid/content/ContentResolver;Landroid/net/Uri;)Ljava/lang/String; -Landroid/provider/MediaStore;->PARAM_DELETE_DATA:Ljava/lang/String; -Landroid/provider/MediaStore;->RETRANSLATE_CALL:Ljava/lang/String; -Landroid/provider/MediaStore;->TAG:Ljava/lang/String; -Landroid/provider/MediaStore;->UNHIDE_CALL:Ljava/lang/String; Landroid/provider/MetadataReader;-><init>()V Landroid/provider/MetadataReader;->DEFAULT_EXIF_TAGS:[Ljava/lang/String; Landroid/provider/MetadataReader;->getExifData(Ljava/io/InputStream;[Ljava/lang/String;)Landroid/os/Bundle; @@ -65005,412 +61661,6 @@ Landroid/util/StateSet;->VIEW_STATE_PRESSED:I Landroid/util/StateSet;->VIEW_STATE_SELECTED:I Landroid/util/StateSet;->VIEW_STATE_SETS:[[I Landroid/util/StateSet;->VIEW_STATE_WINDOW_FOCUSED:I -Landroid/util/StatsLog;-><init>()V -Landroid/util/StatsLog;->DEBUG:Z -Landroid/util/StatsLog;->getIStatsManagerLocked()Landroid/os/IStatsManager; -Landroid/util/StatsLog;->sService:Landroid/os/IStatsManager; -Landroid/util/StatsLog;->TAG:Ljava/lang/String; -Landroid/util/StatsLogInternal;-><init>()V -Landroid/util/StatsLogInternal;->ACTIVITY_FOREGROUND_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__BACKGROUND:I -Landroid/util/StatsLogInternal;->ACTIVITY_FOREGROUND_STATE_CHANGED__STATE__FOREGROUND:I -Landroid/util/StatsLogInternal;->ANOMALY_DETECTED:I -Landroid/util/StatsLogInternal;->ANROCCURRED__FOREGROUND_STATE__BACKGROUND:I -Landroid/util/StatsLogInternal;->ANROCCURRED__FOREGROUND_STATE__FOREGROUND:I -Landroid/util/StatsLogInternal;->ANROCCURRED__FOREGROUND_STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->ANROCCURRED__IS_INSTANT_APP__FALSE:I -Landroid/util/StatsLogInternal;->ANROCCURRED__IS_INSTANT_APP__TRUE:I -Landroid/util/StatsLogInternal;->ANROCCURRED__IS_INSTANT_APP__UNAVAILABLE:I -Landroid/util/StatsLogInternal;->ANR_OCCURRED:I -Landroid/util/StatsLogInternal;->APP_BREADCRUMB_REPORTED:I -Landroid/util/StatsLogInternal;->APP_BREADCRUMB_REPORTED__STATE__START:I -Landroid/util/StatsLogInternal;->APP_BREADCRUMB_REPORTED__STATE__STOP:I -Landroid/util/StatsLogInternal;->APP_BREADCRUMB_REPORTED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_BREADCRUMB_REPORTED__STATE__UNSPECIFIED:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE:I -Landroid/util/StatsLogInternal;->APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE:I -Landroid/util/StatsLogInternal;->APP_DIED:I -Landroid/util/StatsLogInternal;->APP_START_CANCELED:I -Landroid/util/StatsLogInternal;->APP_START_CANCELED__TYPE__COLD:I -Landroid/util/StatsLogInternal;->APP_START_CANCELED__TYPE__HOT:I -Landroid/util/StatsLogInternal;->APP_START_CANCELED__TYPE__UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_START_CANCELED__TYPE__WARM:I -Landroid/util/StatsLogInternal;->APP_START_FULLY_DRAWN:I -Landroid/util/StatsLogInternal;->APP_START_FULLY_DRAWN__TYPE__UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_START_FULLY_DRAWN__TYPE__WITHOUT_BUNDLE:I -Landroid/util/StatsLogInternal;->APP_START_FULLY_DRAWN__TYPE__WITH_BUNDLE:I -Landroid/util/StatsLogInternal;->APP_START_MEMORY_STATE_CAPTURED:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_REASON_UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_RECENTS_ANIM:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_SNAPSHOT:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_SPLASH_SCREEN:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_TIMEOUT:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__REASON__APP_TRANSITION_WINDOWS_DRAWN:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__TYPE__COLD:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__TYPE__HOT:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__TYPE__UNKNOWN:I -Landroid/util/StatsLogInternal;->APP_START_OCCURRED__TYPE__WARM:I -Landroid/util/StatsLogInternal;->AUDIO_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->AUDIO_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->AUDIO_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->AUDIO_STATE_CHANGED__STATE__RESET:I -Landroid/util/StatsLogInternal;->BATTERY_LEVEL_CHANGED:I -Landroid/util/StatsLogInternal;->BATTERY_SAVER_MODE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->BLE_SCAN_RESULT_RECEIVED:I -Landroid/util/StatsLogInternal;->BLE_SCAN_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->BLE_SCAN_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->BLE_SCAN_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->BLE_SCAN_STATE_CHANGED__STATE__RESET:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ACTIVITY_INFO:I -Landroid/util/StatsLogInternal;->BLUETOOTH_BYTES_TRANSFER:I -Landroid/util/StatsLogInternal;->BLUETOOTH_CONNECTION_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_CONNECTION_STATE_CHANGED__STATE__CONNECTION_STATE_CONNECTED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_CONNECTION_STATE_CHANGED__STATE__CONNECTION_STATE_CONNECTING:I -Landroid/util/StatsLogInternal;->BLUETOOTH_CONNECTION_STATE_CHANGED__STATE__CONNECTION_STATE_DISCONNECTED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_CONNECTION_STATE_CHANGED__STATE__CONNECTION_STATE_DISCONNECTING:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_AIRPLANE_MODE:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_APPLICATION_REQUEST:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_CRASH:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_DISALLOWED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_RESTARTED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_RESTORE_USER_SETTING:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_START_ERROR:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_SYSTEM_BOOT:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_UNSPECIFIED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__REASON__ENABLE_DISABLE_REASON_USER_SWITCH:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED:I -Landroid/util/StatsLogInternal;->BLUETOOTH_ENABLED_STATE_CHANGED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->BOOT_SEQUENCE_REPORTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__ABORTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__ACTIVE:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__CONNECTING:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__DIALING:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__DISCONNECTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__DISCONNECTING:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__NEW:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__ON_HOLD:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__PULLING:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__RINGING:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__CALL_STATE__SELECT_PHONE_ACCOUNT:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__ANSWERED_ELSEWHERE:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__BUSY:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__CALL_PULLED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__CANCELED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__CONNECTION_MANAGER_NOT_SUPPORTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__ERROR:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__LOCAL:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__MISSED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__OTHER:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__REJECTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__REMOTE:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__RESTRICTED:I -Landroid/util/StatsLogInternal;->CALL_STATE_CHANGED__DISCONNECT_CAUSE__UNKNOWN:I -Landroid/util/StatsLogInternal;->CAMERA_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->CAMERA_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->CAMERA_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->CAMERA_STATE_CHANGED__STATE__RESET:I -Landroid/util/StatsLogInternal;->CHARGE_CYCLES_REPORTED:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_CHARGING:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_DISCHARGING:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_FULL:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_INVALID:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_NOT_CHARGING:I -Landroid/util/StatsLogInternal;->CHARGING_STATE_CHANGED__STATE__BATTERY_STATUS_UNKNOWN:I -Landroid/util/StatsLogInternal;->CPU_ACTIVE_TIME:I -Landroid/util/StatsLogInternal;->CPU_CLUSTER_TIME:I -Landroid/util/StatsLogInternal;->CPU_TIME_PER_FREQ:I -Landroid/util/StatsLogInternal;->CPU_TIME_PER_UID:I -Landroid/util/StatsLogInternal;->CPU_TIME_PER_UID_FREQ:I -Landroid/util/StatsLogInternal;->DAVEY_OCCURRED:I -Landroid/util/StatsLogInternal;->DEVICE_IDLE_MODE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->DEVICE_IDLE_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_DEEP:I -Landroid/util/StatsLogInternal;->DEVICE_IDLE_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_LIGHT:I -Landroid/util/StatsLogInternal;->DEVICE_IDLE_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_OFF:I -Landroid/util/StatsLogInternal;->DEVICE_IDLING_MODE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->DEVICE_IDLING_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_DEEP:I -Landroid/util/StatsLogInternal;->DEVICE_IDLING_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_LIGHT:I -Landroid/util/StatsLogInternal;->DEVICE_IDLING_MODE_STATE_CHANGED__STATE__DEVICE_IDLE_MODE_OFF:I -Landroid/util/StatsLogInternal;->DISK_SPACE:I -Landroid/util/StatsLogInternal;->FLASHLIGHT_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->FLASHLIGHT_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->FLASHLIGHT_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->FLASHLIGHT_STATE_CHANGED__STATE__RESET:I -Landroid/util/StatsLogInternal;->FOREGROUND_SERVICE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER:I -Landroid/util/StatsLogInternal;->FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT:I -Landroid/util/StatsLogInternal;->FULL_BATTERY_CAPACITY:I -Landroid/util/StatsLogInternal;->GPS_SCAN_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->GPS_SCAN_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->GPS_SCAN_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED__HARDWARE_TYPE__HARDWARE_FAILED_CODEC:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED__HARDWARE_TYPE__HARDWARE_FAILED_FINGERPRINT:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED__HARDWARE_TYPE__HARDWARE_FAILED_MICROPHONE:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED__HARDWARE_TYPE__HARDWARE_FAILED_SPEAKER:I -Landroid/util/StatsLogInternal;->HARDWARE_FAILED__HARDWARE_TYPE__HARDWARE_FAILED_UNKNOWN:I -Landroid/util/StatsLogInternal;->ISOLATED_UID_CHANGED:I -Landroid/util/StatsLogInternal;->ISOLATED_UID_CHANGED__EVENT__CREATED:I -Landroid/util/StatsLogInternal;->ISOLATED_UID_CHANGED__EVENT__REMOVED:I -Landroid/util/StatsLogInternal;->KERNEL_WAKELOCK:I -Landroid/util/StatsLogInternal;->KERNEL_WAKEUP_REPORTED:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_PASSWORD_ENTERED:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__UNKNOWN:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN:I -Landroid/util/StatsLogInternal;->KEYGUARD_BOUNCER_STATE_CHANGED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->KEYGUARD_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->KEYGUARD_STATE_CHANGED__STATE__HIDDEN:I -Landroid/util/StatsLogInternal;->KEYGUARD_STATE_CHANGED__STATE__OCCLUDED:I -Landroid/util/StatsLogInternal;->KEYGUARD_STATE_CHANGED__STATE__SHOWN:I -Landroid/util/StatsLogInternal;->KEYGUARD_STATE_CHANGED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->LMK_KILL_OCCURRED:I -Landroid/util/StatsLogInternal;->LMK_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->LMK_STATE_CHANGED__STATE__START:I -Landroid/util/StatsLogInternal;->LMK_STATE_CHANGED__STATE__STOP:I -Landroid/util/StatsLogInternal;->LMK_STATE_CHANGED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->LONG_PARTIAL_WAKELOCK_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->LOW_MEM_REPORTED:I -Landroid/util/StatsLogInternal;->MEDIA_CODEC_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->MEDIA_CODEC_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->MEDIA_CODEC_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->MEDIA_CODEC_STATE_CHANGED__STATE__RESET:I -Landroid/util/StatsLogInternal;->MOBILE_BYTES_TRANSFER:I -Landroid/util/StatsLogInternal;->MOBILE_BYTES_TRANSFER_BY_FG_BG:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVATING:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__ACTIVE:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTING:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__DISCONNECTION_ERROR_CREATING_CONNECTION:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__INACTIVE:I -Landroid/util/StatsLogInternal;->MOBILE_CONNECTION_STATE_CHANGED__STATE__UNKNOWN:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_POWER_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_HIGH:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_LOW:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_MEDIUM:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_UNKNOWN:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_1XRTT:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_CDMA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_EDGE:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_EHRPD:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_EVDO_0:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_EVDO_A:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_EVDO_B:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_GPRS:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_GSM:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_HSDPA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_HSPA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_HSPAP:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_HSUPA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_IDEN:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_IWLAN:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_LTE:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_LTE_CA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_TD_SCDMA:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_UMTS:I -Landroid/util/StatsLogInternal;->MOBILE_RADIO_TECHNOLOGY_CHANGED__STATE__NETWORK_TYPE_UNKNOWN:I -Landroid/util/StatsLogInternal;->MODEM_ACTIVITY_INFO:I -Landroid/util/StatsLogInternal;->OVERLAY_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->OVERLAY_STATE_CHANGED__STATE__ENTERED:I -Landroid/util/StatsLogInternal;->OVERLAY_STATE_CHANGED__STATE__EXITED:I -Landroid/util/StatsLogInternal;->PACKET_WAKEUP_OCCURRED:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_GOOD:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_GREAT:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_MODERATE:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_NONE_OR_UNKNOWN:I -Landroid/util/StatsLogInternal;->PHONE_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_POOR:I -Landroid/util/StatsLogInternal;->PHYSICAL_DROP_DETECTED:I -Landroid/util/StatsLogInternal;->PICTURE_IN_PICTURE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->PICTURE_IN_PICTURE_STATE_CHANGED__STATE__DISMISSED:I -Landroid/util/StatsLogInternal;->PICTURE_IN_PICTURE_STATE_CHANGED__STATE__ENTERED:I -Landroid/util/StatsLogInternal;->PICTURE_IN_PICTURE_STATE_CHANGED__STATE__EXPANDED_TO_FULL_SCREEN:I -Landroid/util/StatsLogInternal;->PICTURE_IN_PICTURE_STATE_CHANGED__STATE__MINIMIZED:I -Landroid/util/StatsLogInternal;->PLUGGED_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->PLUGGED_STATE_CHANGED__STATE__BATTERY_PLUGGED_AC:I -Landroid/util/StatsLogInternal;->PLUGGED_STATE_CHANGED__STATE__BATTERY_PLUGGED_NONE:I -Landroid/util/StatsLogInternal;->PLUGGED_STATE_CHANGED__STATE__BATTERY_PLUGGED_USB:I -Landroid/util/StatsLogInternal;->PLUGGED_STATE_CHANGED__STATE__BATTERY_PLUGGED_WIRELESS:I -Landroid/util/StatsLogInternal;->PROCESS_LIFE_CYCLE_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__CRASHED:I -Landroid/util/StatsLogInternal;->PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__FINISHED:I -Landroid/util/StatsLogInternal;->PROCESS_LIFE_CYCLE_STATE_CHANGED__STATE__STARTED:I -Landroid/util/StatsLogInternal;->PROCESS_MEMORY_STATE:I -Landroid/util/StatsLogInternal;->REMAINING_BATTERY_CAPACITY:I -Landroid/util/StatsLogInternal;->RESOURCE_CONFIGURATION_CHANGED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STATE__FINISHED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STATE__SCHEDULED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STATE__STARTED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_CANCELLED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_CONSTRAINTS_NOT_SATISFIED:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_DEVICE_IDLE:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_PREEMPT:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_TIMEOUT:I -Landroid/util/StatsLogInternal;->SCHEDULED_JOB_STATE_CHANGED__STOP_REASON__STOP_REASON_UNKNOWN:I -Landroid/util/StatsLogInternal;->SCREEN_BRIGHTNESS_CHANGED:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_DOZE:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_DOZE_SUSPEND:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_OFF:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_ON:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_ON_SUSPEND:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_UNKNOWN:I -Landroid/util/StatsLogInternal;->SCREEN_STATE_CHANGED__STATE__DISPLAY_STATE_VR:I -Landroid/util/StatsLogInternal;->SENSOR_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->SENSOR_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->SENSOR_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->SETTING_CHANGED:I -Landroid/util/StatsLogInternal;->SETTING_CHANGED__REASON__DELETED:I -Landroid/util/StatsLogInternal;->SETTING_CHANGED__REASON__UPDATED:I -Landroid/util/StatsLogInternal;->SHUTDOWN_SEQUENCE_REPORTED:I -Landroid/util/StatsLogInternal;->SPEAKER_IMPEDANCE_REPORTED:I -Landroid/util/StatsLogInternal;->SUBSYSTEM_SLEEP_STATE:I -Landroid/util/StatsLogInternal;->SYNC_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->SYNC_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->SYNC_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->SYSTEM_ELAPSED_REALTIME:I -Landroid/util/StatsLogInternal;->SYSTEM_UPTIME:I -Landroid/util/StatsLogInternal;->TEMPERATURE:I -Landroid/util/StatsLogInternal;->TEMPERATURE__SENSOR_LOCATION__TEMPERATURE_TYPE_BATTERY:I -Landroid/util/StatsLogInternal;->TEMPERATURE__SENSOR_LOCATION__TEMPERATURE_TYPE_CPU:I -Landroid/util/StatsLogInternal;->TEMPERATURE__SENSOR_LOCATION__TEMPERATURE_TYPE_GPU:I -Landroid/util/StatsLogInternal;->TEMPERATURE__SENSOR_LOCATION__TEMPERATURE_TYPE_SKIN:I -Landroid/util/StatsLogInternal;->TEMPERATURE__SENSOR_LOCATION__TEMPERATURE_TYPE_UNKNOWN:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_BACKUP:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_BOUND_FOREGROUND_SERVICE:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_CACHED_ACTIVITY:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_CACHED_ACTIVITY_CLIENT:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_CACHED_EMPTY:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_CACHED_RECENT:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_FOREGROUND_SERVICE:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_HEAVY_WEIGHT:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_HOME:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_IMPORTANT_BACKGROUND:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_IMPORTANT_FOREGROUND:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_LAST_ACTIVITY:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_NONEXISTENT:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_PERSISTENT:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_PERSISTENT_UI:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_RECEIVER:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_SERVICE:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_TOP:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_TOP_SLEEPING:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_TRANSIENT_BACKGROUND:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_UNKNOWN:I -Landroid/util/StatsLogInternal;->UID_PROCESS_STATE_CHANGED__STATE__PROCESS_STATE_UNKNOWN_TO_PROTO:I -Landroid/util/StatsLogInternal;->USB_CONNECTOR_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->USB_CONNECTOR_STATE_CHANGED__STATE__CONNECTED:I -Landroid/util/StatsLogInternal;->USB_CONNECTOR_STATE_CHANGED__STATE__DISCONNECTED:I -Landroid/util/StatsLogInternal;->USB_DEVICE_ATTACHED:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__DOZE_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__DRAW_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__FULL_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__PARTIAL_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__PROXIMITY_SCREEN_OFF_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__SCREEN_BRIGHT_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__LEVEL__SCREEN_DIM_WAKE_LOCK:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__STATE__ACQUIRE:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__STATE__CHANGE_ACQUIRE:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__STATE__CHANGE_RELEASE:I -Landroid/util/StatsLogInternal;->WAKELOCK_STATE_CHANGED__STATE__RELEASE:I -Landroid/util/StatsLogInternal;->WAKEUP_ALARM_OCCURRED:I -Landroid/util/StatsLogInternal;->WIFI_ACTIVITY_INFO:I -Landroid/util/StatsLogInternal;->WIFI_BYTES_TRANSFER:I -Landroid/util/StatsLogInternal;->WIFI_BYTES_TRANSFER_BY_FG_BG:I -Landroid/util/StatsLogInternal;->WIFI_LOCK_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->WIFI_LOCK_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->WIFI_LOCK_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->WIFI_MULTICAST_LOCK_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->WIFI_MULTICAST_LOCK_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->WIFI_MULTICAST_LOCK_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->WIFI_RADIO_POWER_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->WIFI_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_HIGH:I -Landroid/util/StatsLogInternal;->WIFI_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_LOW:I -Landroid/util/StatsLogInternal;->WIFI_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_MEDIUM:I -Landroid/util/StatsLogInternal;->WIFI_RADIO_POWER_STATE_CHANGED__STATE__DATA_CONNECTION_POWER_STATE_UNKNOWN:I -Landroid/util/StatsLogInternal;->WIFI_SCAN_STATE_CHANGED:I -Landroid/util/StatsLogInternal;->WIFI_SCAN_STATE_CHANGED__STATE__OFF:I -Landroid/util/StatsLogInternal;->WIFI_SCAN_STATE_CHANGED__STATE__ON:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_GOOD:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_GREAT:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_MODERATE:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_NONE_OR_UNKNOWN:I -Landroid/util/StatsLogInternal;->WIFI_SIGNAL_STRENGTH_CHANGED__SIGNAL_STRENGTH__SIGNAL_STRENGTH_POOR:I -Landroid/util/StatsLogInternal;->write(I)I -Landroid/util/StatsLogInternal;->write(II)I -Landroid/util/StatsLogInternal;->write(III)I -Landroid/util/StatsLogInternal;->write(IIIFIIIIIIIIIIIIII)I -Landroid/util/StatsLogInternal;->write(IIII)I -Landroid/util/StatsLogInternal;->write(IIIIIIIII)I -Landroid/util/StatsLogInternal;->write(IIIIJZ)I -Landroid/util/StatsLogInternal;->write(IIIJ)I -Landroid/util/StatsLogInternal;->write(IIIZZ)I -Landroid/util/StatsLogInternal;->write(IIIZZZ)I -Landroid/util/StatsLogInternal;->write(IIJ)I -Landroid/util/StatsLogInternal;->write(IIJJ)I -Landroid/util/StatsLogInternal;->write(IIJJJJ)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;I)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;IJJJJJ)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;ILjava/lang/String;)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;III)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;ILjava/lang/String;Ljava/lang/String;ZJIIIIILjava/lang/String;II)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;ILjava/lang/String;ZJ)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;Ljava/lang/String;ILjava/lang/String;II)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;Ljava/lang/String;JJJJJ)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;II)I -Landroid/util/StatsLogInternal;->write(IILjava/lang/String;ZI)I -Landroid/util/StatsLogInternal;->write(IIZJJJJ)I -Landroid/util/StatsLogInternal;->write(IJ)I -Landroid/util/StatsLogInternal;->write(IJIJJJJ)I -Landroid/util/StatsLogInternal;->write(IJJJ)I -Landroid/util/StatsLogInternal;->write(IJJJJJJJJJJ)I -Landroid/util/StatsLogInternal;->write(ILjava/lang/String;IIJ)I -Landroid/util/StatsLogInternal;->write(ILjava/lang/String;J)I -Landroid/util/StatsLogInternal;->write(ILjava/lang/String;Ljava/lang/String;JJ)I -Landroid/util/StatsLogInternal;->write(ILjava/lang/String;Ljava/lang/String;JJJJ)I -Landroid/util/StatsLogInternal;->write(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZII)I -Landroid/util/StatsLogInternal;->write(IZLjava/lang/String;JJ)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;II)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;IILjava/lang/String;)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;ILjava/lang/String;I)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;IZZZ)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;Ljava/lang/String;)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;Ljava/lang/String;II)I -Landroid/util/StatsLogInternal;->write(I[I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;I)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;II)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;IILjava/lang/String;)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;ILjava/lang/String;I)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;IZZZ)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;Ljava/lang/String;)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;Ljava/lang/String;II)I -Landroid/util/StatsLogInternal;->write_non_chained(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)I -Landroid/util/StatsLogInternal;->WTF_OCCURRED:I Landroid/util/StringBuilderPrinter;->mBuilder:Ljava/lang/StringBuilder; Landroid/util/SuperNotCalledException;-><init>(Ljava/lang/String;)V Landroid/util/TextLogEntry;-><init>()V diff --git a/boot/hiddenapi/hiddenapi-max-target-r-loprio.txt b/boot/hiddenapi/hiddenapi-max-target-r-loprio.txt index 753bc69be95b..79d2521b892c 100644 --- a/boot/hiddenapi/hiddenapi-max-target-r-loprio.txt +++ b/boot/hiddenapi/hiddenapi-max-target-r-loprio.txt @@ -23,8 +23,6 @@ Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroi Landroid/net/INetworkPolicyListener$Stub;-><init>()V Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager; Landroid/net/sip/ISipSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/sip/ISipSession; -Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I -Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/p2p/IWifiP2pManager; Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I diff --git a/boot/hiddenapi/hiddenapi-unsupported.txt b/boot/hiddenapi/hiddenapi-unsupported.txt index 4281b0dda41a..002d42dbf1dc 100644 --- a/boot/hiddenapi/hiddenapi-unsupported.txt +++ b/boot/hiddenapi/hiddenapi-unsupported.txt @@ -167,28 +167,12 @@ Landroid/media/IMediaScannerListener$Stub;-><init>()V Landroid/media/IMediaScannerService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaScannerService; Landroid/media/session/ISessionManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/session/ISessionManager; Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V -Landroid/net/IConnectivityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveLinkProperties()Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkInfo()Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworkInfo()[Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworks()[Landroid/net/Network; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager; Landroid/net/INetworkManagementEventObserver$Stub;-><init>()V Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager; Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkScoreService; Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String; Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService; -Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager; -Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/IWifiScanner$Stub;-><init>()V -Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner; Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IDeviceIdentifiersPolicyService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdentifiersPolicyService; Landroid/os/IDeviceIdleController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdleController; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index a4ac61b1f086..cb60b011d00e 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2724,12 +2724,12 @@ package android.view { public final class InputDevice implements android.os.Parcelable { method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void disable(); method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void enable(); - field public static final int ACCESSIBILITY_DEVICE_ID = -2; // 0xfffffffe } public class KeyEvent extends android.view.InputEvent implements android.os.Parcelable { method public static String actionToString(int); method public final void setDisplayId(int); + field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800 field public static final int LAST_KEYCODE = 288; // 0x120 } @@ -2747,6 +2747,7 @@ package android.view { method public void setActionButton(int); method public void setButtonState(int); method public void setDisplayId(int); + field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800 } @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface RemotableViewMethod { diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 8a265788a94b..b7d9d9b67758 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -640,4 +640,10 @@ public abstract class ActivityManagerInternal { * Returns the capability of the given uid */ public abstract @ProcessCapability int getUidCapability(int uid); + + /** + * @return The PID list of the isolated process with packages matching the given uid. + */ + @Nullable + public abstract List<Integer> getIsolatedProcesses(int uid); } diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 4182ac3e572d..00ba55c4cb1c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -218,8 +218,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.net.InetAddress; @@ -230,7 +228,6 @@ import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -419,16 +416,6 @@ public final class ActivityThread extends ClientTransactionHandler @GuardedBy("mResourcesManager") @UnsupportedAppUsage final ArrayMap<String, WeakReference<LoadedApk>> mResourcePackages = new ArrayMap<>(); - - @GuardedBy("mResourcesManager") - private final ArrayMap<List<String>, WeakReference<LoadedApk>> mPackageNonAMS = - new ArrayMap<>(); - @GuardedBy("mResourcesManager") - private final ArrayMap<List<String>, WeakReference<LoadedApk>> mResourcePackagesNonAMS = - new ArrayMap<>(); - @GuardedBy("mResourcesManager") - private final ReferenceQueue<LoadedApk> mPackageRefQueue = new ReferenceQueue<>(); - @GuardedBy("mResourcesManager") final ArrayList<ActivityClientRecord> mRelaunchingActivities = new ArrayList<>(); @GuardedBy("mResourcesManager") @@ -2385,229 +2372,6 @@ public final class ActivityThread extends ClientTransactionHandler return mH; } - /** - * If {@code retainReferences} is false, prunes all {@link LoadedApk} representing any of the - * specified packages from the package caches. - * - * @return whether the cache contains a loaded apk representing any of the specified packages - */ - private boolean clearCachedApks() { - synchronized (mResourcesManager) { - Reference<? extends LoadedApk> enqueuedRef = mPackageRefQueue.poll(); - if (enqueuedRef == null) { - return false; - } - - final HashSet<Reference<? extends LoadedApk>> deadReferences = new HashSet<>(); - for (; enqueuedRef != null; enqueuedRef = mPackageRefQueue.poll()) { - deadReferences.add(enqueuedRef); - } - - return cleanWeakMapValues(mPackages, deadReferences) - || cleanWeakMapValues(mResourcePackages, deadReferences) - || cleanWeakMapValues(mPackageNonAMS, deadReferences) - || cleanWeakMapValues(mResourcePackages, deadReferences); - } - } - - private static <K> boolean cleanWeakMapValues(ArrayMap<K, WeakReference<LoadedApk>> map, - HashSet<Reference<? extends LoadedApk>> deadReferences) { - boolean hasPkgInfo = false; - for (int i = map.size() - 1; i >= 0; i--) { - if (deadReferences.contains(map.valueAt(i))) { - map.removeAt(i); - hasPkgInfo = true; - } - } - return hasPkgInfo; - } - - /** - * Retrieves the previously cached {@link LoadedApk} that was created/updated with the most - * recent {@link ApplicationInfo} sent from the activity manager service. - */ - @Nullable - private LoadedApk peekLatestCachedApkFromAMS(@NonNull String packageName, boolean includeCode) { - synchronized (mResourcesManager) { - WeakReference<LoadedApk> ref; - if (includeCode) { - return ((ref = mPackages.get(packageName)) != null) ? ref.get() : null; - } else { - return ((ref = mResourcePackages.get(packageName)) != null) ? ref.get() : null; - } - } - } - - /** - * Updates the previously cached {@link LoadedApk} that was created/updated using an - * {@link ApplicationInfo} sent from activity manager service. - * - * If {@code appInfo} is null, the most up-to-date {@link ApplicationInfo} will be fetched and - * used to update the cached package; otherwise, the specified app info will be used. - */ - private boolean updateLatestCachedApkFromAMS(@NonNull String packageName, - @Nullable ApplicationInfo appInfo, boolean updateActivityRecords) { - final LoadedApk[] loadedPackages = new LoadedApk[]{ - peekLatestCachedApkFromAMS(packageName, true), - peekLatestCachedApkFromAMS(packageName, false) - }; - - try { - if (appInfo == null) { - appInfo = sPackageManager.getApplicationInfo( - packageName, PackageManager.GET_SHARED_LIBRARY_FILES, - UserHandle.myUserId()); - } - } catch (RemoteException e) { - Slog.v(TAG, "Failed to get most recent app info for '" + packageName + "'", e); - return false; - } - - boolean hasPackage = false; - final String[] oldResDirs = new String[loadedPackages.length]; - for (int i = loadedPackages.length - 1; i >= 0; i--) { - final LoadedApk loadedPackage = loadedPackages[i]; - if (loadedPackage == null) { - continue; - } - - // If the package is being updated, yet it still has a valid LoadedApk object, the - // package was updated with PACKAGE_REMOVED_DONT_KILL. Adjust it's internal references - // to the application info and resources. - hasPackage = true; - if (updateActivityRecords && mActivities.size() > 0) { - for (ActivityClientRecord ar : mActivities.values()) { - if (ar.activityInfo.applicationInfo.packageName.equals(packageName)) { - ar.activityInfo.applicationInfo = appInfo; - ar.packageInfo = loadedPackage; - } - } - } - - updateLoadedApk(loadedPackage, appInfo); - oldResDirs[i] = loadedPackage.getResDir(); - } - if (hasPackage) { - synchronized (mResourcesManager) { - mResourcesManager.applyNewResourceDirs(appInfo, oldResDirs); - } - } - return hasPackage; - } - - private static List<String> makeNonAMSKey(@NonNull ApplicationInfo appInfo) { - final List<String> paths = new ArrayList<>(); - paths.add(appInfo.sourceDir); - if (appInfo.resourceDirs != null) { - for (String path : appInfo.resourceDirs) { - paths.add(path); - } - } - return paths; - } - - /** - * Retrieves the previously cached {@link LoadedApk}. - * - * If {@code isAppInfoFromAMS} is true, then {@code appInfo} will be used to update the paths - * of the previously cached {@link LoadedApk} that was created/updated using an - * {@link ApplicationInfo} sent from activity manager service. - */ - @Nullable - private LoadedApk retrieveCachedApk(@NonNull ApplicationInfo appInfo, boolean includeCode, - boolean isAppInfoFromAMS) { - if (UserHandle.myUserId() != UserHandle.getUserId(appInfo.uid)) { - // Caching not supported across users. - return null; - } - - if (isAppInfoFromAMS) { - LoadedApk loadedPackage = peekLatestCachedApkFromAMS(appInfo.packageName, includeCode); - if (loadedPackage != null) { - updateLoadedApk(loadedPackage, appInfo); - } - return loadedPackage; - } - - synchronized (mResourcesManager) { - WeakReference<LoadedApk> ref; - if (includeCode) { - return ((ref = mPackageNonAMS.get(makeNonAMSKey(appInfo))) != null) - ? ref.get() : null; - } else { - return ((ref = mResourcePackagesNonAMS.get(makeNonAMSKey(appInfo))) != null) - ? ref.get() : null; - } - } - } - - private static boolean isLoadedApkResourceDirsUpToDate(LoadedApk loadedApk, - ApplicationInfo appInfo) { - boolean baseDirsUpToDate = loadedApk.getResDir().equals(appInfo.sourceDir); - boolean resourceDirsUpToDate = Arrays.equals( - ArrayUtils.defeatNullable(appInfo.resourceDirs), - ArrayUtils.defeatNullable(loadedApk.getOverlayDirs())); - boolean overlayPathsUpToDate = Arrays.equals( - ArrayUtils.defeatNullable(appInfo.overlayPaths), - ArrayUtils.defeatNullable(loadedApk.getOverlayPaths())); - - return (loadedApk.mResources == null || loadedApk.mResources.getAssets().isUpToDate()) - && baseDirsUpToDate && resourceDirsUpToDate && overlayPathsUpToDate; - } - - private void updateLoadedApk(@NonNull LoadedApk loadedPackage, - @NonNull ApplicationInfo appInfo) { - if (isLoadedApkResourceDirsUpToDate(loadedPackage, appInfo)) { - return; - } - - final List<String> oldPaths = new ArrayList<>(); - LoadedApk.makePaths(this, appInfo, oldPaths); - loadedPackage.updateApplicationInfo(appInfo, oldPaths); - } - - @Nullable - private LoadedApk createLoadedPackage(@NonNull ApplicationInfo appInfo, - @Nullable CompatibilityInfo compatInfo, @Nullable ClassLoader baseLoader, - boolean securityViolation, boolean includeCode, boolean registerPackage, - boolean isAppInfoFromAMS) { - final LoadedApk packageInfo = - new LoadedApk(this, appInfo, compatInfo, baseLoader, - securityViolation, includeCode - && (appInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0, registerPackage); - - if (mSystemThread && "android".equals(appInfo.packageName)) { - packageInfo.installSystemApplicationInfo(appInfo, - getSystemContext().mPackageInfo.getClassLoader()); - } - - if (UserHandle.myUserId() != UserHandle.getUserId(appInfo.uid)) { - // Caching not supported across users - return packageInfo; - } - - synchronized (mResourcesManager) { - if (includeCode) { - if (isAppInfoFromAMS) { - mPackages.put(appInfo.packageName, - new WeakReference<>(packageInfo, mPackageRefQueue)); - } else { - mPackageNonAMS.put(makeNonAMSKey(appInfo), - new WeakReference<>(packageInfo, mPackageRefQueue)); - } - } else { - if (isAppInfoFromAMS) { - mResourcePackages.put(appInfo.packageName, - new WeakReference<>(packageInfo, mPackageRefQueue)); - } else { - mResourcePackagesNonAMS.put(makeNonAMSKey(appInfo), - new WeakReference<>(packageInfo, mPackageRefQueue)); - } - } - return packageInfo; - } - } - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo, int flags) { @@ -2616,50 +2380,58 @@ public final class ActivityThread extends ClientTransactionHandler public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo, int flags, int userId) { - final ApplicationInfo ai = PackageManager.getApplicationInfoAsUserCached( + final boolean differentUser = (UserHandle.myUserId() != userId); + ApplicationInfo ai = PackageManager.getApplicationInfoAsUserCached( packageName, PackageManager.GET_SHARED_LIBRARY_FILES | PackageManager.MATCH_DEBUG_TRIAGED_MISSING, (userId < 0) ? UserHandle.myUserId() : userId); - LoadedApk packageInfo = null; - if (ai != null) { - packageInfo = retrieveCachedApk(ai, - (flags & Context.CONTEXT_INCLUDE_CODE) != 0, - false); - } + synchronized (mResourcesManager) { + WeakReference<LoadedApk> ref; + if (differentUser) { + // Caching not supported across users + ref = null; + } else if ((flags & Context.CONTEXT_INCLUDE_CODE) != 0) { + ref = mPackages.get(packageName); + } else { + ref = mResourcePackages.get(packageName); + } - if (packageInfo != null) { - if (packageInfo.isSecurityViolation() - && (flags & Context.CONTEXT_IGNORE_SECURITY) == 0) { - throw new SecurityException( - "Requesting code from " + packageName - + " to be run in process " - + mBoundApplication.processName - + "/" + mBoundApplication.appInfo.uid); + LoadedApk packageInfo = ref != null ? ref.get() : null; + if (ai != null && packageInfo != null) { + if (!isLoadedApkResourceDirsUpToDate(packageInfo, ai)) { + List<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, ai, oldPaths); + packageInfo.updateApplicationInfo(ai, oldPaths); + } + + if (packageInfo.isSecurityViolation() + && (flags&Context.CONTEXT_IGNORE_SECURITY) == 0) { + throw new SecurityException( + "Requesting code from " + packageName + + " to be run in process " + + mBoundApplication.processName + + "/" + mBoundApplication.appInfo.uid); + } + return packageInfo; } - return packageInfo; } - return ai == null ? null : getPackageInfo(ai, compatInfo, flags, false); + if (ai != null) { + return getPackageInfo(ai, compatInfo, flags); + } + + return null; } - /** - * @deprecated Use {@link #getPackageInfo(ApplicationInfo, CompatibilityInfo, int, boolean)} - * instead. - */ - @Deprecated @UnsupportedAppUsage(trackingBug = 171933273) public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo, int flags) { - return getPackageInfo(ai, compatInfo, flags, true); - } - - public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo, - @Context.CreatePackageOptions int flags, boolean isAppInfoFromAMS) { boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0; boolean securityViolation = includeCode && ai.uid != 0 - && ai.uid != Process.SYSTEM_UID && (mBoundApplication == null - || !UserHandle.isSameApp(ai.uid, mBoundApplication.appInfo.uid)); + && ai.uid != Process.SYSTEM_UID && (mBoundApplication != null + ? !UserHandle.isSameApp(ai.uid, mBoundApplication.appInfo.uid) + : true); boolean registerPackage = includeCode && (flags&Context.CONTEXT_REGISTER_PACKAGE) != 0; if ((flags&(Context.CONTEXT_INCLUDE_CODE |Context.CONTEXT_IGNORE_SECURITY)) @@ -2669,47 +2441,107 @@ public final class ActivityThread extends ClientTransactionHandler + " (with uid " + ai.uid + ")"; if (mBoundApplication != null) { msg = msg + " to be run in process " - + mBoundApplication.processName + " (with uid " - + mBoundApplication.appInfo.uid + ")"; + + mBoundApplication.processName + " (with uid " + + mBoundApplication.appInfo.uid + ")"; } throw new SecurityException(msg); } } return getPackageInfo(ai, compatInfo, null, securityViolation, includeCode, - registerPackage, isAppInfoFromAMS); + registerPackage); } @Override @UnsupportedAppUsage public final LoadedApk getPackageInfoNoCheck(ApplicationInfo ai, CompatibilityInfo compatInfo) { - return getPackageInfo(ai, compatInfo, null, false, true, false, true); + return getPackageInfo(ai, compatInfo, null, false, true, false); } @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) public final LoadedApk peekPackageInfo(String packageName, boolean includeCode) { synchronized (mResourcesManager) { - return peekLatestCachedApkFromAMS(packageName, includeCode); + WeakReference<LoadedApk> ref; + if (includeCode) { + ref = mPackages.get(packageName); + } else { + ref = mResourcePackages.get(packageName); + } + return ref != null ? ref.get() : null; } } private LoadedApk getPackageInfo(ApplicationInfo aInfo, CompatibilityInfo compatInfo, ClassLoader baseLoader, boolean securityViolation, boolean includeCode, - boolean registerPackage, boolean isAppInfoFromAMS) { - LoadedApk packageInfo = retrieveCachedApk(aInfo, includeCode, - isAppInfoFromAMS); - if (packageInfo != null) { + boolean registerPackage) { + final boolean differentUser = (UserHandle.myUserId() != UserHandle.getUserId(aInfo.uid)); + synchronized (mResourcesManager) { + WeakReference<LoadedApk> ref; + if (differentUser) { + // Caching not supported across users + ref = null; + } else if (includeCode) { + ref = mPackages.get(aInfo.packageName); + } else { + ref = mResourcePackages.get(aInfo.packageName); + } + + LoadedApk packageInfo = ref != null ? ref.get() : null; + + if (packageInfo != null) { + if (!isLoadedApkResourceDirsUpToDate(packageInfo, aInfo)) { + List<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, aInfo, oldPaths); + packageInfo.updateApplicationInfo(aInfo, oldPaths); + } + + return packageInfo; + } + + if (localLOGV) { + Slog.v(TAG, (includeCode ? "Loading code package " + : "Loading resource-only package ") + aInfo.packageName + + " (in " + (mBoundApplication != null + ? mBoundApplication.processName : null) + + ")"); + } + + packageInfo = + new LoadedApk(this, aInfo, compatInfo, baseLoader, + securityViolation, includeCode + && (aInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0, registerPackage); + + if (mSystemThread && "android".equals(aInfo.packageName)) { + packageInfo.installSystemApplicationInfo(aInfo, + getSystemContext().mPackageInfo.getClassLoader()); + } + + if (differentUser) { + // Caching not supported across users + } else if (includeCode) { + mPackages.put(aInfo.packageName, + new WeakReference<LoadedApk>(packageInfo)); + } else { + mResourcePackages.put(aInfo.packageName, + new WeakReference<LoadedApk>(packageInfo)); + } + return packageInfo; } - if (localLOGV) { - Slog.v(TAG, (includeCode ? "Loading code package " - : "Loading resource-only package ") + aInfo.packageName - + " (in " + (mBoundApplication != null - ? mBoundApplication.processName : null) - + ")"); - } - return createLoadedPackage(aInfo, compatInfo, baseLoader, - securityViolation, includeCode, registerPackage, isAppInfoFromAMS); + } + + private static boolean isLoadedApkResourceDirsUpToDate(LoadedApk loadedApk, + ApplicationInfo appInfo) { + Resources packageResources = loadedApk.mResources; + boolean resourceDirsUpToDate = Arrays.equals( + ArrayUtils.defeatNullable(appInfo.resourceDirs), + ArrayUtils.defeatNullable(loadedApk.getOverlayDirs())); + boolean overlayPathsUpToDate = Arrays.equals( + ArrayUtils.defeatNullable(appInfo.overlayPaths), + ArrayUtils.defeatNullable(loadedApk.getOverlayPaths())); + + return (packageResources == null || packageResources.getAssets().isUpToDate()) + && resourceDirsUpToDate && overlayPathsUpToDate; } @UnsupportedAppUsage @@ -3671,7 +3503,7 @@ public final class ActivityThread extends ClientTransactionHandler ActivityInfo aInfo = r.activityInfo; if (r.packageInfo == null) { r.packageInfo = getPackageInfo(aInfo.applicationInfo, r.compatInfo, - Context.CONTEXT_INCLUDE_CODE, true); + Context.CONTEXT_INCLUDE_CODE); } ComponentName component = r.intent.getComponent(); @@ -6154,10 +5986,40 @@ public final class ActivityThread extends ClientTransactionHandler @VisibleForTesting(visibility = PACKAGE) public void handleApplicationInfoChanged(@NonNull final ApplicationInfo ai) { - // Updates triggered by package installation go through a package update receiver. Here we - // try to capture ApplicationInfo changes that are caused by other sources, such as - // overlays. That means we want to be as conservative about code changes as possible. - updateLatestCachedApkFromAMS(ai.packageName, ai, false); + // Updates triggered by package installation go through a package update + // receiver. Here we try to capture ApplicationInfo changes that are + // caused by other sources, such as overlays. That means we want to be as conservative + // about code changes as possible. Take the diff of the old ApplicationInfo and the new + // to see if anything needs to change. + LoadedApk apk; + LoadedApk resApk; + // Update all affected loaded packages with new package information + synchronized (mResourcesManager) { + WeakReference<LoadedApk> ref = mPackages.get(ai.packageName); + apk = ref != null ? ref.get() : null; + ref = mResourcePackages.get(ai.packageName); + resApk = ref != null ? ref.get() : null; + } + + final String[] oldResDirs = new String[2]; + + if (apk != null) { + oldResDirs[0] = apk.getResDir(); + final ArrayList<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, apk.getApplicationInfo(), oldPaths); + apk.updateApplicationInfo(ai, oldPaths); + } + if (resApk != null) { + oldResDirs[1] = resApk.getResDir(); + final ArrayList<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, resApk.getApplicationInfo(), oldPaths); + resApk.updateApplicationInfo(ai, oldPaths); + } + + synchronized (mResourcesManager) { + // Update all affected Resources objects to use new ResourcesImpl + mResourcesManager.applyNewResourceDirs(ai, oldResDirs); + } } /** @@ -6334,7 +6196,29 @@ public final class ActivityThread extends ClientTransactionHandler case ApplicationThreadConstants.PACKAGE_REMOVED: case ApplicationThreadConstants.PACKAGE_REMOVED_DONT_KILL: { - hasPkgInfo = clearCachedApks(); + final boolean killApp = cmd == ApplicationThreadConstants.PACKAGE_REMOVED; + if (packages == null) { + break; + } + synchronized (mResourcesManager) { + for (int i = packages.length - 1; i >= 0; i--) { + if (!hasPkgInfo) { + WeakReference<LoadedApk> ref = mPackages.get(packages[i]); + if (ref != null && ref.get() != null) { + hasPkgInfo = true; + } else { + ref = mResourcePackages.get(packages[i]); + if (ref != null && ref.get() != null) { + hasPkgInfo = true; + } + } + } + if (killApp) { + mPackages.remove(packages[i]); + mResourcePackages.remove(packages[i]); + } + } + } break; } case ApplicationThreadConstants.PACKAGE_REPLACED: @@ -6342,19 +6226,68 @@ public final class ActivityThread extends ClientTransactionHandler if (packages == null) { break; } - final List<String> packagesHandled = new ArrayList<>(); - for (int i = packages.length - 1; i >= 0; i--) { - final String packageName = packages[i]; - if (updateLatestCachedApkFromAMS(packageName, null, true)) { - hasPkgInfo = true; - packagesHandled.add(packageName); + + List<String> packagesHandled = new ArrayList<>(); + + synchronized (mResourcesManager) { + for (int i = packages.length - 1; i >= 0; i--) { + String packageName = packages[i]; + WeakReference<LoadedApk> ref = mPackages.get(packageName); + LoadedApk pkgInfo = ref != null ? ref.get() : null; + if (pkgInfo != null) { + hasPkgInfo = true; + } else { + ref = mResourcePackages.get(packageName); + pkgInfo = ref != null ? ref.get() : null; + if (pkgInfo != null) { + hasPkgInfo = true; + } + } + // If the package is being replaced, yet it still has a valid + // LoadedApk object, the package was updated with _DONT_KILL. + // Adjust it's internal references to the application info and + // resources. + if (pkgInfo != null) { + packagesHandled.add(packageName); + try { + final ApplicationInfo aInfo = + sPackageManager.getApplicationInfo( + packageName, + PackageManager.GET_SHARED_LIBRARY_FILES, + UserHandle.myUserId()); + + if (mActivities.size() > 0) { + for (ActivityClientRecord ar : mActivities.values()) { + if (ar.activityInfo.applicationInfo.packageName + .equals(packageName)) { + ar.activityInfo.applicationInfo = aInfo; + ar.packageInfo = pkgInfo; + } + } + } + + final String[] oldResDirs = { pkgInfo.getResDir() }; + + final ArrayList<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, pkgInfo.getApplicationInfo(), oldPaths); + pkgInfo.updateApplicationInfo(aInfo, oldPaths); + + synchronized (mResourcesManager) { + // Update affected Resources objects to use new ResourcesImpl + mResourcesManager.applyNewResourceDirs(aInfo, oldResDirs); + } + } catch (RemoteException e) { + } + } } } + try { getPackageManager().notifyPackagesReplacedReceived( packagesHandled.toArray(new String[0])); } catch (RemoteException ignored) { } + break; } } @@ -6913,7 +6846,7 @@ public final class ActivityThread extends ClientTransactionHandler ii.copyTo(instrApp); instrApp.initForUser(UserHandle.myUserId()); final LoadedApk pi = getPackageInfo(instrApp, data.compatInfo, - appContext.getClassLoader(), false, true, false, true); + appContext.getClassLoader(), false, true, false); // The test context's op package name == the target app's op package name, because // the app ops manager checks the op package name against the real calling UID, diff --git a/core/java/android/app/AppOpsManagerInternal.java b/core/java/android/app/AppOpsManagerInternal.java index 7c85df831ce9..363b5a75b214 100644 --- a/core/java/android/app/AppOpsManagerInternal.java +++ b/core/java/android/app/AppOpsManagerInternal.java @@ -209,4 +209,10 @@ public abstract class AppOpsManagerInternal { */ public abstract void setModeFromPermissionPolicy(int code, int uid, @NonNull String packageName, int mode, @Nullable IAppOpsCallback callback); + + + /** + * Sets a global restriction on an op code. + */ + public abstract void setGlobalRestriction(int code, boolean restricted, IBinder token); } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index d24196813387..5e99c79a7497 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -26,7 +26,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UiContext; import android.compat.annotation.UnsupportedAppUsage; -import android.content.AttributionSource; import android.content.AutofillOptions; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -61,6 +60,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.content.AttributionSource; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -2461,7 +2461,7 @@ class ContextImpl extends Context { public Context createApplicationContext(ApplicationInfo application, int flags) throws NameNotFoundException { LoadedApk pi = mMainThread.getPackageInfo(application, mResources.getCompatibilityInfo(), - flags | CONTEXT_REGISTER_PACKAGE, false); + flags | CONTEXT_REGISTER_PACKAGE); if (pi != null) { ContextImpl c = new ContextImpl(this, mMainThread, pi, ContextParams.EMPTY, mAttributionSource.getAttributionTag(), diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index ba3fc1e55c54..8aa27853b462 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -282,11 +282,10 @@ public class AppWidgetHostView extends FrameLayout { } private SizeF computeSizeFromLayout(int left, int top, int right, int bottom) { - Rect padding = getDefaultPadding(); float density = getResources().getDisplayMetrics().density; return new SizeF( - (right - left - padding.right - padding.left) / density, - (bottom - top - padding.bottom - padding.top) / density + (right - left - getPaddingLeft() - getPaddingRight()) / density, + (bottom - top - getPaddingTop() - getPaddingBottom()) / density ); } @@ -386,7 +385,7 @@ public class AppWidgetHostView extends FrameLayout { maxHeight = Math.max(maxHeight, paddedSize.getHeight()); } if (paddedSizes.equals( - widgetManager.getAppWidgetOptions(mAppWidgetId).<PointF>getParcelableArrayList( + widgetManager.getAppWidgetOptions(mAppWidgetId).<SizeF>getParcelableArrayList( AppWidgetManager.OPTION_APPWIDGET_SIZES))) { return; } diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java index 54b39bd215bf..0bc459a19e7d 100644 --- a/core/java/android/content/ClipData.java +++ b/core/java/android/content/ClipData.java @@ -179,6 +179,10 @@ public class ClipData implements Parcelable { final ArrayList<Item> mItems; + // This is false by default unless the ClipData is obtained via + // {@link #copyForTransferWithActivityInfo}. + private boolean mParcelItemActivityInfos; + /** * Description of a single item in a ClipData. * @@ -204,9 +208,11 @@ public class ClipData implements Parcelable { final Intent mIntent; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) Uri mUri; - // Additional activity info resolved by the system - ActivityInfo mActivityInfo; private TextLinks mTextLinks; + // Additional activity info resolved by the system. This is only parceled with the ClipData + // if the data is obtained from {@link #copyForTransferWithActivityInfo} + private ActivityInfo mActivityInfo; + /** @hide */ public Item(Item other) { @@ -214,6 +220,8 @@ public class ClipData implements Parcelable { mHtmlText = other.mHtmlText; mIntent = other.mIntent; mUri = other.mUri; + mActivityInfo = other.mActivityInfo; + mTextLinks = other.mTextLinks; } /** @@ -817,6 +825,24 @@ public class ClipData implements Parcelable { } /** + * Returns a copy of the ClipData which will parcel the Item's activity infos. + * @hide + */ + public ClipData copyForTransferWithActivityInfo() { + ClipData copy = new ClipData(this); + copy.mParcelItemActivityInfos = true; + return copy; + } + + /** + * Returns whether this clip data will parcel the Item's activity infos. + * @hide + */ + public boolean willParcelWithActivityInfo() { + return mParcelItemActivityInfos; + } + + /** * Create a new ClipData holding data of the type * {@link ClipDescription#MIMETYPE_TEXT_PLAIN}. * @@ -1208,7 +1234,7 @@ public class ClipData implements Parcelable { dest.writeString8(item.mHtmlText); dest.writeTypedObject(item.mIntent, flags); dest.writeTypedObject(item.mUri, flags); - dest.writeTypedObject(item.mActivityInfo, flags); + dest.writeTypedObject(mParcelItemActivityInfos ? item.mActivityInfo : null, flags); dest.writeTypedObject(item.mTextLinks, flags); } } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 688483a5c969..9e35a32638a8 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5736,12 +5736,20 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_REPLACING = "android.intent.extra.REPLACING"; /** - * Used as an int extra field in {@link android.app.AlarmManager} intents + * Used as an int extra field in {@link android.app.AlarmManager} pending intents * to tell the application being invoked how many pending alarms are being - * delievered with the intent. For one-shot alarms this will always be 1. + * delivered with the intent. For one-shot alarms this will always be 1. * For recurring alarms, this might be greater than 1 if the device was * asleep or powered off at the time an earlier alarm would have been * delivered. + * + * <p>Note: You must supply a <b>mutable</b> {@link android.app.PendingIntent} to + * {@code AlarmManager} while setting your alarms to be able to read this value on receiving + * them. <em>Mutability of pending intents must be explicitly specified by apps targeting + * {@link Build.VERSION_CODES#S} or higher</em>. + * + * @see android.app.PendingIntent#FLAG_MUTABLE + * */ public static final String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT"; diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 75dd9fb24e35..3f8aedb31ea9 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -2111,28 +2111,28 @@ public class PackageInstaller { * <p> * Defaults to {@link #USER_ACTION_UNSPECIFIED} unless otherwise set. When unspecified for * installers using the - * {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES android.permission - * #REQUEST_INSTALL_PACKAGES} permission will behave as if set to - * {@link #USER_ACTION_REQUIRED}, and {@link #USER_ACTION_NOT_REQUIRED} otherwise. - * When {@code requireUserAction} is set to {@link #USER_ACTION_REQUIRED}, installers will - * receive a {@link #STATUS_PENDING_USER_ACTION} callback once the session is committed, - * indicating that user action is required for the install to proceed. + * {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES REQUEST_INSTALL_PACKAGES} + * permission will behave as if set to {@link #USER_ACTION_REQUIRED}, and + * {@link #USER_ACTION_NOT_REQUIRED} otherwise. When {@code requireUserAction} is set to + * {@link #USER_ACTION_REQUIRED}, installers will receive a + * {@link #STATUS_PENDING_USER_ACTION} callback once the session is committed, indicating + * that user action is required for the install to proceed. * <p> * For installers that have been granted the - * {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES android.permission - * .REQUEST_INSTALL_PACKAGES} permission, user action will not be required when all of - * the following conditions are met: + * {@link android.Manifest.permission#REQUEST_INSTALL_PACKAGES REQUEST_INSTALL_PACKAGES} + * permission, user action will not be required when all of the following conditions are + * met: * * <ul> * <li>{@code requireUserAction} is set to {@link #USER_ACTION_NOT_REQUIRED}.</li> * <li>The app being installed targets {@link android.os.Build.VERSION_CODES#Q API 29} * or higher.</li> * <li>The installer is the {@link InstallSourceInfo#getInstallingPackageName() - * installer of record} of an existing version of the app (i.e.: this install session - * is an app update) or the installer is updating itself.</li> + * installer of record} of an existing version of the app (in other words, this install + * session is an app update) or the installer is updating itself.</li> * <li>The installer declares the - * {@link android.Manifest.permission#UPDATE_PACKAGES_WITHOUT_USER_ACTION android - * .permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION} permission.</li> + * {@link android.Manifest.permission#UPDATE_PACKAGES_WITHOUT_USER_ACTION + * UPDATE_PACKAGES_WITHOUT_USER_ACTION} permission.</li> * </ul> * <p> * Note: The target API level requirement will advance in future Android versions. diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 65ce1e7ef079..dd2080b60b37 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -61,7 +61,7 @@ public class PackageItemInfo { public static final int MAX_SAFE_LABEL_LENGTH = 1000; /** @hide */ - public static final float DEFAULT_MAX_LABEL_SIZE_PX = 500f; + public static final float DEFAULT_MAX_LABEL_SIZE_PX = 1000f; /** * Remove {@link Character#isWhitespace(int) whitespace} and non-breaking spaces from the edges diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING index 1eb4504bf591..8bc3734e060d 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -49,9 +49,6 @@ "include-filter": "android.appsecurity.cts.AppSecurityTests#testPermissionDiffCert" } ] - }, - { - "name": "CtsPackageManagerBootTestCases" } ] } diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index e665d0fcc836..abdc64c56ead 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -61,7 +61,7 @@ public interface BiometricFingerprintConstants { BIOMETRIC_ERROR_RE_ENROLL, BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED, FINGERPRINT_ERROR_UNKNOWN, - FINGERPRINT_ERROR_BAD_CALIBARTION}) + FINGERPRINT_ERROR_BAD_CALIBRATION}) @Retention(RetentionPolicy.SOURCE) @interface FingerprintError {} @@ -185,7 +185,7 @@ public interface BiometricFingerprintConstants { * Error indicating that the fingerprint sensor has bad calibration. * @hide */ - int FINGERPRINT_ERROR_BAD_CALIBARTION = 18; + int FINGERPRINT_ERROR_BAD_CALIBRATION = 18; /** * @hide @@ -209,7 +209,8 @@ public interface BiometricFingerprintConstants { FINGERPRINT_ACQUIRED_VENDOR, FINGERPRINT_ACQUIRED_START, FINGERPRINT_ACQUIRED_UNKNOWN, - FINGERPRINT_ACQUIRED_IMMOBILE}) + FINGERPRINT_ACQUIRED_IMMOBILE, + FINGERPRINT_ACQUIRED_TOO_BRIGHT}) @Retention(RetentionPolicy.SOURCE) @interface FingerprintAcquired {} @@ -287,6 +288,13 @@ public interface BiometricFingerprintConstants { int FINGERPRINT_ACQUIRED_IMMOBILE = 9; /** + * For sensors that require illumination, such as optical under-display fingerprint sensors, + * the image was too bright to be used for matching. + * @hide + */ + int FINGERPRINT_ACQUIRED_TOO_BRIGHT = 10; + + /** * @hide */ int FINGERPRINT_ACQUIRED_VENDOR_BASE = 1000; diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java index 0ec508a8c9bf..ada51559a38d 100644 --- a/core/java/android/hardware/biometrics/BiometricManager.java +++ b/core/java/android/hardware/biometrics/BiometricManager.java @@ -223,10 +223,6 @@ public class BiometricManager { @NonNull private final IAuthService mService; @Authenticators.Types int mAuthenticators; - @Nullable CharSequence mButtonLabel; - @Nullable CharSequence mPromptMessage; - @Nullable CharSequence mSettingName; - private Strings(@NonNull Context context, @NonNull IAuthService service, @Authenticators.Types int authenticators) { mContext = context; @@ -259,16 +255,13 @@ public class BiometricManager { @RequiresPermission(USE_BIOMETRIC) @Nullable public CharSequence getButtonLabel() { - if (mButtonLabel == null) { - final int userId = mContext.getUserId(); - final String opPackageName = mContext.getOpPackageName(); - try { - mButtonLabel = mService.getButtonLabel(userId, opPackageName, mAuthenticators); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + final int userId = mContext.getUserId(); + final String opPackageName = mContext.getOpPackageName(); + try { + return mService.getButtonLabel(userId, opPackageName, mAuthenticators); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - return mButtonLabel; } /** @@ -296,16 +289,13 @@ public class BiometricManager { @RequiresPermission(USE_BIOMETRIC) @Nullable public CharSequence getPromptMessage() { - if (mPromptMessage == null) { - final int userId = mContext.getUserId(); - final String opPackageName = mContext.getOpPackageName(); - try { - return mService.getPromptMessage(userId, opPackageName, mAuthenticators); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + final int userId = mContext.getUserId(); + final String opPackageName = mContext.getOpPackageName(); + try { + return mService.getPromptMessage(userId, opPackageName, mAuthenticators); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - return mPromptMessage; } /** @@ -335,16 +325,13 @@ public class BiometricManager { @RequiresPermission(USE_BIOMETRIC) @Nullable public CharSequence getSettingName() { - if (mSettingName == null) { - final int userId = mContext.getUserId(); - final String opPackageName = mContext.getOpPackageName(); - try { - return mService.getSettingName(userId, opPackageName, mAuthenticators); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } + final int userId = mContext.getUserId(); + final String opPackageName = mContext.getOpPackageName(); + try { + return mService.getSettingName(userId, opPackageName, mAuthenticators); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - return mSettingName; } } diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index 1c0ae281d9fe..abcc33c43c74 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -207,6 +207,8 @@ public abstract class DisplayManagerInternal { * has a preference. * @param requestedModeId The preferred mode id for the top-most visible window that has a * preference. + * @param requestedMinRefreshRate The preferred lowest refresh rate for the top-most visible + * window that has a preference. * @param requestedMaxRefreshRate The preferred highest refresh rate for the top-most visible * window that has a preference. * @param requestedMinimalPostProcessing The preferred minimal post processing setting for the @@ -216,8 +218,9 @@ public abstract class DisplayManagerInternal { * prior to call to performTraversalInTransactionFromWindowManager. */ public abstract void setDisplayProperties(int displayId, boolean hasContent, - float requestedRefreshRate, int requestedModeId, float requestedMaxRefreshRate, - boolean requestedMinimalPostProcessing, boolean inTraversal); + float requestedRefreshRate, int requestedModeId, float requestedMinRefreshRate, + float requestedMaxRefreshRate, boolean requestedMinimalPostProcessing, + boolean inTraversal); /** * Applies an offset to the contents of a display, for example to avoid burn-in. diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 68dd62343eb0..0cb996b118b4 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -1375,7 +1375,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing case BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED: return context.getString( com.android.internal.R.string.fingerprint_error_security_update_required); - case FINGERPRINT_ERROR_BAD_CALIBARTION: + case FINGERPRINT_ERROR_BAD_CALIBRATION: return context.getString( com.android.internal.R.string.fingerprint_error_bad_calibration); case FINGERPRINT_ERROR_VENDOR: { @@ -1420,6 +1420,9 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing case FINGERPRINT_ACQUIRED_IMMOBILE: return context.getString( com.android.internal.R.string.fingerprint_acquired_immobile); + case FINGERPRINT_ACQUIRED_TOO_BRIGHT: + return context.getString( + com.android.internal.R.string.fingerprint_acquired_too_bright); case FINGERPRINT_ACQUIRED_VENDOR: { String[] msgArray = context.getResources().getStringArray( com.android.internal.R.array.fingerprint_acquired_vendor); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cb87653718c2..a6332d76ca65 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11005,7 +11005,7 @@ public final class Settings { */ @Readable public static final String SHOW_MEDIA_ON_QUICK_SETTINGS = - "qs_media_player"; + "qs_media_controls"; /** * The interval in milliseconds at which location requests will be throttled when they are diff --git a/core/java/android/service/autofill/augmented/Helper.java b/core/java/android/service/autofill/augmented/Helper.java index afcd8b7afedc..e5cbff490f91 100644 --- a/core/java/android/service/autofill/augmented/Helper.java +++ b/core/java/android/service/autofill/augmented/Helper.java @@ -32,9 +32,12 @@ public final class Helper { */ public static void logResponse(int type, @NonNull String servicePackageName, @NonNull ComponentName componentName, int mSessionId, long durationMs) { + // Remove activity name from logging + final ComponentName sanitizedComponentName = + new ComponentName(componentName.getPackageName(), ""); final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_AUGMENTED_RESPONSE) .setType(type) - .setComponentName(componentName) + .setComponentName(sanitizedComponentName) .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, mSessionId) .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName) .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, durationMs); diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletClient.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletClient.java index f12256173c43..f69c89d45312 100644 --- a/core/java/android/service/quickaccesswallet/QuickAccessWalletClient.java +++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletClient.java @@ -178,6 +178,14 @@ public interface QuickAccessWalletClient extends Closeable { Drawable getLogo(); /** + * Returns the tile icon associated with the {@link QuickAccessWalletService}. + * + * @hide + */ + @Nullable + Drawable getTileIcon(); + + /** * Returns the service label specified by {@code android:label} in the service manifest entry. * * @hide diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java index 2e4af3fad1b5..2d0faad8cb13 100644 --- a/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java +++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java @@ -307,6 +307,12 @@ public class QuickAccessWalletClientImpl implements QuickAccessWalletClient, Ser return mServiceInfo == null ? null : mServiceInfo.getWalletLogo(mContext); } + @Nullable + @Override + public Drawable getTileIcon() { + return mServiceInfo == null ? null : mServiceInfo.getTileIcon(); + } + @Override @Nullable public CharSequence getServiceLabel() { diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletService.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletService.java index ef6150dd02f9..db20a51e23ed 100644 --- a/core/java/android/service/quickaccesswallet/QuickAccessWalletService.java +++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletService.java @@ -195,6 +195,13 @@ public abstract class QuickAccessWalletService extends Service { */ public static final String SERVICE_META_DATA = "android.quickaccesswallet"; + /** + * Name of the QuickAccessWallet tile service meta-data. + * + * @hide + */ + public static final String TILE_SERVICE_META_DATA = "android.quickaccesswallet.tile"; + private final Handler mHandler = new Handler(Looper.getMainLooper()); /** diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java index c87407e9d38c..0d290eee5777 100644 --- a/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java +++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java @@ -56,12 +56,15 @@ class QuickAccessWalletServiceInfo { private final ServiceInfo mServiceInfo; private final ServiceMetadata mServiceMetadata; + private final TileServiceMetadata mTileServiceMetadata; private QuickAccessWalletServiceInfo( @NonNull ServiceInfo serviceInfo, - @NonNull ServiceMetadata metadata) { + @NonNull ServiceMetadata metadata, + @NonNull TileServiceMetadata tileServiceMetadata) { mServiceInfo = serviceInfo; mServiceMetadata = metadata; + mTileServiceMetadata = tileServiceMetadata; } @Nullable @@ -84,7 +87,9 @@ class QuickAccessWalletServiceInfo { } ServiceMetadata metadata = parseServiceMetadata(context, serviceInfo); - return new QuickAccessWalletServiceInfo(serviceInfo, metadata); + TileServiceMetadata tileServiceMetadata = + new TileServiceMetadata(parseTileServiceMetadata(context, serviceInfo)); + return new QuickAccessWalletServiceInfo(serviceInfo, metadata, tileServiceMetadata); } private static ComponentName getDefaultPaymentApp(Context context) { @@ -105,6 +110,31 @@ class QuickAccessWalletServiceInfo { return resolveInfos.isEmpty() ? null : resolveInfos.get(0).serviceInfo; } + private static class TileServiceMetadata { + @Nullable + private final Drawable mTileIcon; + + private TileServiceMetadata(@Nullable Drawable tileIcon) { + mTileIcon = tileIcon; + } + } + + @Nullable + private static Drawable parseTileServiceMetadata(Context context, ServiceInfo serviceInfo) { + PackageManager pm = context.getPackageManager(); + int tileIconDrawableId = + serviceInfo.metaData.getInt(QuickAccessWalletService.TILE_SERVICE_META_DATA); + if (tileIconDrawableId != 0) { + try { + Resources resources = pm.getResourcesForApplication(serviceInfo.applicationInfo); + return resources.getDrawable(tileIconDrawableId, null); + } catch (PackageManager.NameNotFoundException e) { + Log.e(TAG, "Error parsing quickaccesswallet tile service meta-data", e); + } + } + return null; + } + private static class ServiceMetadata { @Nullable private final String mSettingsActivity; @@ -216,6 +246,11 @@ class QuickAccessWalletServiceInfo { return mServiceInfo.loadIcon(context.getPackageManager()); } + @Nullable + Drawable getTileIcon() { + return mTileServiceMetadata.mTileIcon; + } + @NonNull CharSequence getShortcutShortLabel(Context context) { if (!TextUtils.isEmpty(mServiceMetadata.mShortcutShortLabel)) { diff --git a/core/java/android/service/voice/HotwordDetectedResult.java b/core/java/android/service/voice/HotwordDetectedResult.java index 315392bf6a58..5c660216065c 100644 --- a/core/java/android/service/voice/HotwordDetectedResult.java +++ b/core/java/android/service/voice/HotwordDetectedResult.java @@ -237,6 +237,55 @@ public final class HotwordDetectedResult implements Parcelable { return size; } + /** + * Returns how many bits have been written into the HotwordDetectedResult. + * + * @hide + */ + public static int getUsageSize(@NonNull HotwordDetectedResult hotwordDetectedResult) { + int totalBits = 0; + + if (hotwordDetectedResult.getConfidenceLevel() != defaultConfidenceLevel()) { + totalBits += bitCount(CONFIDENCE_LEVEL_VERY_HIGH); + } + if (hotwordDetectedResult.getHotwordOffsetMillis() != HOTWORD_OFFSET_UNSET) { + totalBits += Integer.SIZE; + } + if (hotwordDetectedResult.getHotwordDurationMillis() != 0) { + totalBits += bitCount(AudioRecord.getMaxSharedAudioHistoryMillis()); + } + if (hotwordDetectedResult.getAudioChannel() != AUDIO_CHANNEL_UNSET) { + totalBits += Integer.SIZE; + } + + // Add one bit for HotwordDetectionPersonalized + totalBits += 1; + + if (hotwordDetectedResult.getScore() != defaultScore()) { + totalBits += bitCount(HotwordDetectedResult.getMaxScore()); + } + if (hotwordDetectedResult.getPersonalizedScore() != defaultPersonalizedScore()) { + totalBits += bitCount(HotwordDetectedResult.getMaxScore()); + } + if (hotwordDetectedResult.getHotwordPhraseId() != defaultHotwordPhraseId()) { + totalBits += bitCount(HotwordDetectedResult.getMaxHotwordPhraseId()); + } + PersistableBundle persistableBundle = hotwordDetectedResult.getExtras(); + if (!persistableBundle.isEmpty()) { + totalBits += getParcelableSize(persistableBundle) * Byte.SIZE; + } + return totalBits; + } + + private static int bitCount(long value) { + int bits = 0; + while (value > 0) { + bits++; + value = value >> 1; + } + return bits; + } + private void onConstructed() { Preconditions.checkArgumentInRange(mScore, 0, getMaxScore(), "score"); Preconditions.checkArgumentInRange(mPersonalizedScore, 0, getMaxScore(), @@ -784,10 +833,10 @@ public final class HotwordDetectedResult implements Parcelable { } @DataClass.Generated( - time = 1624361647985L, + time = 1625198973370L, codegenVersion = "1.0.23", sourceFile = "frameworks/base/core/java/android/service/voice/HotwordDetectedResult.java", - inputSignatures = "public static final int CONFIDENCE_LEVEL_NONE\npublic static final int CONFIDENCE_LEVEL_LOW\npublic static final int CONFIDENCE_LEVEL_LOW_MEDIUM\npublic static final int CONFIDENCE_LEVEL_MEDIUM\npublic static final int CONFIDENCE_LEVEL_MEDIUM_HIGH\npublic static final int CONFIDENCE_LEVEL_HIGH\npublic static final int CONFIDENCE_LEVEL_VERY_HIGH\npublic static final int HOTWORD_OFFSET_UNSET\npublic static final int AUDIO_CHANNEL_UNSET\nprivate final @android.service.voice.HotwordDetectedResult.HotwordConfidenceLevelValue int mConfidenceLevel\nprivate @android.annotation.Nullable android.media.MediaSyncEvent mMediaSyncEvent\nprivate int mHotwordOffsetMillis\nprivate int mHotwordDurationMillis\nprivate int mAudioChannel\nprivate boolean mHotwordDetectionPersonalized\nprivate final int mScore\nprivate final int mPersonalizedScore\nprivate final int mHotwordPhraseId\nprivate final @android.annotation.NonNull android.os.PersistableBundle mExtras\nprivate static int sMaxBundleSize\nprivate static int defaultConfidenceLevel()\nprivate static int defaultScore()\nprivate static int defaultPersonalizedScore()\npublic static int getMaxScore()\nprivate static int defaultHotwordPhraseId()\npublic static int getMaxHotwordPhraseId()\nprivate static android.os.PersistableBundle defaultExtras()\npublic static int getMaxBundleSize()\npublic @android.annotation.Nullable android.media.MediaSyncEvent getMediaSyncEvent()\npublic static int getParcelableSize(android.os.Parcelable)\nprivate void onConstructed()\nclass HotwordDetectedResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)") + inputSignatures = "public static final int CONFIDENCE_LEVEL_NONE\npublic static final int CONFIDENCE_LEVEL_LOW\npublic static final int CONFIDENCE_LEVEL_LOW_MEDIUM\npublic static final int CONFIDENCE_LEVEL_MEDIUM\npublic static final int CONFIDENCE_LEVEL_MEDIUM_HIGH\npublic static final int CONFIDENCE_LEVEL_HIGH\npublic static final int CONFIDENCE_LEVEL_VERY_HIGH\npublic static final int HOTWORD_OFFSET_UNSET\npublic static final int AUDIO_CHANNEL_UNSET\nprivate final @android.service.voice.HotwordDetectedResult.HotwordConfidenceLevelValue int mConfidenceLevel\nprivate @android.annotation.Nullable android.media.MediaSyncEvent mMediaSyncEvent\nprivate int mHotwordOffsetMillis\nprivate int mHotwordDurationMillis\nprivate int mAudioChannel\nprivate boolean mHotwordDetectionPersonalized\nprivate final int mScore\nprivate final int mPersonalizedScore\nprivate final int mHotwordPhraseId\nprivate final @android.annotation.NonNull android.os.PersistableBundle mExtras\nprivate static int sMaxBundleSize\nprivate static int defaultConfidenceLevel()\nprivate static int defaultScore()\nprivate static int defaultPersonalizedScore()\npublic static int getMaxScore()\nprivate static int defaultHotwordPhraseId()\npublic static int getMaxHotwordPhraseId()\nprivate static android.os.PersistableBundle defaultExtras()\npublic static int getMaxBundleSize()\npublic @android.annotation.Nullable android.media.MediaSyncEvent getMediaSyncEvent()\npublic static int getParcelableSize(android.os.Parcelable)\npublic static int getUsageSize(android.service.voice.HotwordDetectedResult)\nprivate static int bitCount(long)\nprivate void onConstructed()\nclass HotwordDetectedResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index a88d5b9d4122..fe1fcfc489c1 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -20,6 +20,7 @@ import static android.graphics.Matrix.MSCALE_X; import static android.graphics.Matrix.MSCALE_Y; import static android.graphics.Matrix.MSKEW_X; import static android.graphics.Matrix.MSKEW_Y; +import static android.view.SurfaceControl.METADATA_WINDOW_TYPE; import static android.view.View.SYSTEM_UI_FLAG_VISIBLE; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; @@ -1024,6 +1025,8 @@ public abstract class WallpaperService extends Service { mBbqSurfaceControl = new SurfaceControl.Builder() .setName("Wallpaper BBQ wrapper") .setHidden(false) + // TODO(b/192291754) + .setMetadata(METADATA_WINDOW_TYPE, TYPE_WALLPAPER) .setBLASTLayer() .setParent(mSurfaceControl) .setCallsite("Wallpaper#relayout") diff --git a/core/java/android/speech/RecognitionService.java b/core/java/android/speech/RecognitionService.java index 8b4c0d9e21f5..b4964c3d902f 100644 --- a/core/java/android/speech/RecognitionService.java +++ b/core/java/android/speech/RecognitionService.java @@ -259,6 +259,7 @@ public abstract class RecognitionService extends Service { @Override public void onDestroy() { if (DBG) Log.d(TAG, "onDestroy"); + finishDataDelivery(); mCurrentCallback = null; mBinder.clearReference(); super.onDestroy(); diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index a1ffe345d457..d39b56ddabed 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -621,7 +621,11 @@ public class PhoneStateListener { * The instance of {@link ServiceState} passed as an argument here will have various levels of * location information stripped from it depending on the location permissions that your app * holds. Only apps holding the {@link Manifest.permission#ACCESS_FINE_LOCATION} permission will - * receive all the information in {@link ServiceState}. + * receive all the information in {@link ServiceState}, otherwise the cellIdentity will be null + * if apps only holding the {@link Manifest.permission#ACCESS_COARSE_LOCATION} permission. + * Network operator name in long/short alphanumeric format and numeric id will be null if apps + * holding neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. * * @see ServiceState#STATE_EMERGENCY_ONLY * @see ServiceState#STATE_IN_SERVICE diff --git a/core/java/android/telephony/TelephonyCallback.java b/core/java/android/telephony/TelephonyCallback.java index 1a25c8b4e671..dd4de0a81392 100644 --- a/core/java/android/telephony/TelephonyCallback.java +++ b/core/java/android/telephony/TelephonyCallback.java @@ -663,7 +663,12 @@ public class TelephonyCallback { * levels of location information stripped from it depending on the location permissions * that your app holds. * Only apps holding the {@link Manifest.permission#ACCESS_FINE_LOCATION} permission will - * receive all the information in {@link ServiceState}. + * receive all the information in {@link ServiceState}, otherwise the cellIdentity + * will be null if apps only holding the {@link Manifest.permission#ACCESS_COARSE_LOCATION} + * permission. + * Network operator name in long/short alphanumeric format and numeric id will be null if + * apps holding neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. * * @see ServiceState#STATE_EMERGENCY_ONLY * @see ServiceState#STATE_IN_SERVICE diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 782a992d28e5..4f1354d7eee6 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -444,13 +444,6 @@ public final class InputDevice implements Parcelable { private static final int VIBRATOR_ID_ALL = -1; - /** - * The device id of input events generated inside accessibility service. - * @hide - */ - @TestApi - public static final int ACCESSIBILITY_DEVICE_ID = -2; - public static final @android.annotation.NonNull Parcelable.Creator<InputDevice> CREATOR = new Parcelable.Creator<InputDevice>() { public InputDevice createFromParcel(Parcel in) { diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 37f0a64df613..cda9b233576c 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -16,6 +16,7 @@ package android.view; +import static android.os.IInputConstants.INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT; import static android.view.Display.INVALID_DISPLAY; import android.annotation.NonNull; @@ -1222,6 +1223,14 @@ public class KeyEvent extends InputEvent implements Parcelable { public static final int FLAG_FALLBACK = 0x400; /** + * This flag indicates that this event was modified by or generated from an accessibility + * service. Value = 0x800 + * @hide + */ + @TestApi + public static final int FLAG_IS_ACCESSIBILITY_EVENT = INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT; + + /** * Signifies that the key is being predispatched. * @hide */ diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 0483d0ba7615..69ff64f3d6a5 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -16,6 +16,7 @@ package android.view; +import static android.os.IInputConstants.INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT; import static android.view.Display.DEFAULT_DISPLAY; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -494,6 +495,14 @@ public final class MotionEvent extends InputEvent implements Parcelable { public static final int FLAG_NO_FOCUS_CHANGE = 0x40; /** + * This flag indicates that this event was modified by or generated from an accessibility + * service. Value = 0x800 + * @hide + */ + @TestApi + public static final int FLAG_IS_ACCESSIBILITY_EVENT = INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT; + + /** * Private flag that indicates when the system has detected that this motion event * may be inconsistent with respect to the sequence of previously delivered motion events, * such as when a pointer move event is sent but the pointer is not down. diff --git a/core/java/android/view/VerifiedInputEvent.java b/core/java/android/view/VerifiedInputEvent.java index e2db50165f77..cc6fbe7f5171 100644 --- a/core/java/android/view/VerifiedInputEvent.java +++ b/core/java/android/view/VerifiedInputEvent.java @@ -20,6 +20,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SuppressLint; import android.os.Parcel; import android.os.Parcelable; @@ -157,4 +158,28 @@ public abstract class VerifiedInputEvent implements Parcelable { throw new IllegalArgumentException("Unexpected input event type in parcel."); } }; + + @Override + public boolean equals(@Nullable Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + @SuppressWarnings("unchecked") + VerifiedInputEvent that = (VerifiedInputEvent) o; + return mType == that.mType + && getDeviceId() == that.getDeviceId() + && getEventTimeNanos() == that.getEventTimeNanos() + && getSource() == that.getSource() + && getDisplayId() == that.getDisplayId(); + } + + @Override + public int hashCode() { + int _hash = 1; + _hash = 31 * _hash + mType; + _hash = 31 * _hash + getDeviceId(); + _hash = 31 * _hash + Long.hashCode(getEventTimeNanos()); + _hash = 31 * _hash + getSource(); + _hash = 31 * _hash + getDisplayId(); + return _hash; + } } diff --git a/core/java/android/view/VerifiedKeyEvent.java b/core/java/android/view/VerifiedKeyEvent.java index 77a7d0944521..fc357cc9d278 100644 --- a/core/java/android/view/VerifiedKeyEvent.java +++ b/core/java/android/view/VerifiedKeyEvent.java @@ -17,6 +17,7 @@ package android.view; import static android.view.KeyEvent.FLAG_CANCELED; +import static android.view.KeyEvent.FLAG_IS_ACCESSIBILITY_EVENT; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -72,6 +73,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel * * @see KeyEvent#getFlags() * @see KeyEvent#FLAG_CANCELED + * @see KeyEvent#FLAG_IS_ACCESSIBILITY_EVENT * * @hide */ @@ -125,6 +127,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel // InputDispatcher only verifies a subset of the KeyEvent flags. // These values must be kept in sync with Input.cpp case FLAG_CANCELED: + case FLAG_IS_ACCESSIBILITY_EVENT: return (mFlags & flag) != 0; } return null; diff --git a/core/java/android/view/VerifiedMotionEvent.java b/core/java/android/view/VerifiedMotionEvent.java index 7d8345928bf0..948575cf3104 100644 --- a/core/java/android/view/VerifiedMotionEvent.java +++ b/core/java/android/view/VerifiedMotionEvent.java @@ -16,6 +16,7 @@ package android.view; +import static android.view.MotionEvent.FLAG_IS_ACCESSIBILITY_EVENT; import static android.view.MotionEvent.FLAG_WINDOW_IS_OBSCURED; import static android.view.MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED; @@ -83,6 +84,9 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par * Returns the flags for this motion event. * * @see MotionEvent#getFlags() + * @see MotionEvent#FLAG_IS_ACCESSIBILITY_EVENT + * @see MotionEvent#FLAG_WINDOW_IS_OBSCURED + * @see MotionEvent#FLAG_WINDOW_IS_PARTIALLY_OBSCURED * @hide */ private int mFlags; @@ -117,6 +121,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par switch(flag) { // InputDispatcher only verifies a subset of the MotionEvent flags. // These values must be kept in sync with Input.cpp + case FLAG_IS_ACCESSIBILITY_EVENT: case FLAG_WINDOW_IS_OBSCURED: case FLAG_WINDOW_IS_PARTIALLY_OBSCURED: return (mFlags & flag) != 0; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 5a248af7a097..23faac6c0787 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1442,8 +1442,10 @@ public final class ViewRootImpl implements ViewParent, if (mHardwareRendererObserver != null) { mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver); } - addPrepareSurfaceControlForWebviewCallback(); - addASurfaceTransactionCallback(); + if (HardwareRenderer.isWebViewOverlaysEnabled()) { + addPrepareSurfaceControlForWebviewCallback(); + addASurfaceTransactionCallback(); + } mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); } } @@ -7777,8 +7779,10 @@ public final class ViewRootImpl implements ViewParent, } } if (mAttachInfo.mThreadedRenderer != null) { - addPrepareSurfaceControlForWebviewCallback(); - addASurfaceTransactionCallback(); + if (HardwareRenderer.isWebViewOverlaysEnabled()) { + addPrepareSurfaceControlForWebviewCallback(); + addASurfaceTransactionCallback(); + } mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); } } else { diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 5964f632da1a..55beae0f7b3d 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -3023,6 +3023,14 @@ public interface WindowManager extends ViewManager { public int preferredDisplayModeId; /** + * The min display refresh rate while the window is in focus. + * + * This value is ignored if {@link #preferredDisplayModeId} is set. + * @hide + */ + public float preferredMinDisplayRefreshRate; + + /** * The max display refresh rate while the window is in focus. * * This value is ignored if {@link #preferredDisplayModeId} is set. @@ -3781,6 +3789,8 @@ public interface WindowManager extends ViewManager { out.writeInt(screenOrientation); out.writeFloat(preferredRefreshRate); out.writeInt(preferredDisplayModeId); + out.writeFloat(preferredMinDisplayRefreshRate); + out.writeFloat(preferredMaxDisplayRefreshRate); out.writeInt(systemUiVisibility); out.writeInt(subtreeSystemUiVisibility); out.writeBoolean(hasSystemUiListeners); @@ -3851,6 +3861,8 @@ public interface WindowManager extends ViewManager { screenOrientation = in.readInt(); preferredRefreshRate = in.readFloat(); preferredDisplayModeId = in.readInt(); + preferredMinDisplayRefreshRate = in.readFloat(); + preferredMaxDisplayRefreshRate = in.readFloat(); systemUiVisibility = in.readInt(); subtreeSystemUiVisibility = in.readInt(); hasSystemUiListeners = in.readBoolean(); @@ -3928,6 +3940,10 @@ public interface WindowManager extends ViewManager { public static final int MINIMAL_POST_PROCESSING_PREFERENCE_CHANGED = 1 << 28; /** {@hide} */ public static final int BLUR_BEHIND_RADIUS_CHANGED = 1 << 29; + /** {@hide} */ + public static final int PREFERRED_MIN_DISPLAY_REFRESH_RATE = 1 << 30; + /** {@hide} */ + public static final int PREFERRED_MAX_DISPLAY_REFRESH_RATE = 1 << 31; // internal buffer to backup/restore parameters under compatibility mode. private int[] mCompatibilityParamsBackup = null; @@ -4059,6 +4075,16 @@ public interface WindowManager extends ViewManager { changes |= PREFERRED_DISPLAY_MODE_ID; } + if (preferredMinDisplayRefreshRate != o.preferredMinDisplayRefreshRate) { + preferredMinDisplayRefreshRate = o.preferredMinDisplayRefreshRate; + changes |= PREFERRED_MIN_DISPLAY_REFRESH_RATE; + } + + if (preferredMaxDisplayRefreshRate != o.preferredMaxDisplayRefreshRate) { + preferredMaxDisplayRefreshRate = o.preferredMaxDisplayRefreshRate; + changes |= PREFERRED_MAX_DISPLAY_REFRESH_RATE; + } + if (systemUiVisibility != o.systemUiVisibility || subtreeSystemUiVisibility != o.subtreeSystemUiVisibility) { systemUiVisibility = o.systemUiVisibility; @@ -4263,6 +4289,14 @@ public interface WindowManager extends ViewManager { sb.append(" preferredDisplayMode="); sb.append(preferredDisplayModeId); } + if (preferredMinDisplayRefreshRate != 0) { + sb.append(" preferredMinDisplayRefreshRate="); + sb.append(preferredMinDisplayRefreshRate); + } + if (preferredMaxDisplayRefreshRate != 0) { + sb.append(" preferredMaxDisplayRefreshRate="); + sb.append(preferredMaxDisplayRefreshRate); + } if (hasSystemUiListeners) { sb.append(" sysuil="); sb.append(hasSystemUiListeners); diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index 81c934dffa47..bbef3e6aeefa 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -17,7 +17,6 @@ package android.view; import static android.os.IInputConstants.POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY; -import static android.os.IInputConstants.POLICY_FLAG_INPUTFILTER_TRUSTED; import android.annotation.IntDef; import android.os.PowerManager; @@ -35,7 +34,6 @@ public interface WindowManagerPolicyConstants { int FLAG_WAKE = 0x00000001; int FLAG_VIRTUAL = 0x00000002; - int FLAG_INPUTFILTER_TRUSTED = POLICY_FLAG_INPUTFILTER_TRUSTED; int FLAG_INJECTED_FROM_ACCESSIBILITY = POLICY_FLAG_INJECTED_FROM_ACCESSIBILITY; int FLAG_INJECTED = 0x01000000; int FLAG_TRUSTED = 0x02000000; diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 4df8fd29c64d..d0651472bd16 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -2459,7 +2459,10 @@ public final class AutofillManager { // Client should never be null here, but it doesn't hurt to check... log.setPackageName(mContext.getPackageName()); } else { - log.setComponentName(client.autofillClientGetComponentName()); + // Remove activity name from logging + final ComponentName sanitizedComponentName = + new ComponentName(client.autofillClientGetComponentName().getPackageName(), ""); + log.setComponentName(sanitizedComponentName); } return log; } diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index e0a7bf23f488..4cf553207b6e 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -773,7 +773,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { void notifyContextUpdated(int sessionId, @Nullable ContentCaptureContext context) { mHandler.post(() -> sendEvent(new ContentCaptureEvent(sessionId, TYPE_CONTEXT_UPDATED) - .setClientContext(context))); + .setClientContext(context), FORCE_FLUSH)); } @Override diff --git a/core/java/android/view/translation/ITranslationManager.aidl b/core/java/android/view/translation/ITranslationManager.aidl index 5fbf228ec72f..cce0193e75e0 100644 --- a/core/java/android/view/translation/ITranslationManager.aidl +++ b/core/java/android/view/translation/ITranslationManager.aidl @@ -16,6 +16,7 @@ package android.view.translation; +import android.content.ComponentName; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.ResultReceiver; @@ -47,4 +48,6 @@ oneway interface ITranslationManager { void registerUiTranslationStateCallback(in IRemoteCallback callback, int userId); void unregisterUiTranslationStateCallback(in IRemoteCallback callback, int userId); void getServiceSettingsActivity(in IResultReceiver result, int userId); + void onTranslationFinished(boolean activityDestroyed, IBinder token, + in ComponentName componentName, int userId); } diff --git a/core/java/android/view/translation/TranslationManager.java b/core/java/android/view/translation/TranslationManager.java index aec53206402b..54c455c19621 100644 --- a/core/java/android/view/translation/TranslationManager.java +++ b/core/java/android/view/translation/TranslationManager.java @@ -168,8 +168,10 @@ public final class TranslationManager { return; } - mTranslators.put(tId, translator); - mTranslatorIds.put(translationContext, tId); + synchronized (mLock) { + mTranslators.put(tId, translator); + mTranslatorIds.put(translationContext, tId); + } final long token = Binder.clearCallingIdentity(); try { executor.execute(() -> callback.accept(translator)); diff --git a/core/java/android/view/translation/Translator.java b/core/java/android/view/translation/Translator.java index 8dbce1b4f53e..edd0d16a5ccb 100644 --- a/core/java/android/view/translation/Translator.java +++ b/core/java/android/view/translation/Translator.java @@ -102,19 +102,19 @@ public class Translator { static class ServiceBinderReceiver extends IResultReceiver.Stub { // TODO: refactor how translator is instantiated after removing deprecated createTranslator. - private final WeakReference<Translator> mTranslator; + private final Translator mTranslator; private final CountDownLatch mLatch = new CountDownLatch(1); private int mSessionId; private Consumer<Translator> mCallback; ServiceBinderReceiver(Translator translator, Consumer<Translator> callback) { - mTranslator = new WeakReference<>(translator); + mTranslator = translator; mCallback = callback; } ServiceBinderReceiver(Translator translator) { - mTranslator = new WeakReference<>(translator); + mTranslator = translator; } int getSessionStateResult() throws TimeoutException { @@ -139,14 +139,9 @@ public class Translator { } return; } - mSessionId = resultData.getInt(EXTRA_SESSION_ID); - final Translator translator = mTranslator.get(); - if (translator == null) { - Log.w(TAG, "received result after session is finished"); - return; - } final IBinder binder; if (resultData != null) { + mSessionId = resultData.getInt(EXTRA_SESSION_ID); binder = resultData.getBinder(EXTRA_SERVICE_BINDER); if (binder == null) { Log.wtf(TAG, "No " + EXTRA_SERVICE_BINDER + " extra result"); @@ -155,10 +150,10 @@ public class Translator { } else { binder = null; } - translator.setServiceBinder(binder); + mTranslator.setServiceBinder(binder); mLatch.countDown(); if (mCallback != null) { - mCallback.accept(translator); + mCallback.accept(mTranslator); } } diff --git a/core/java/android/view/translation/UiTranslationController.java b/core/java/android/view/translation/UiTranslationController.java index 592993cc3d3e..a8335918cc84 100644 --- a/core/java/android/view/translation/UiTranslationController.java +++ b/core/java/android/view/translation/UiTranslationController.java @@ -24,8 +24,8 @@ import static android.view.translation.UiTranslationManager.STATE_UI_TRANSLATION import android.annotation.NonNull; import android.annotation.WorkerThread; import android.app.Activity; +import android.app.assist.ActivityId; import android.content.Context; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Process; @@ -62,10 +62,7 @@ import java.util.function.BiConsumer; */ public class UiTranslationController { - // TODO(b/182433547): remove Build.IS_DEBUGGABLE before ship. Enable the logging in debug build - // to help the debug during the development phase - public static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG) - || Build.IS_DEBUGGABLE; + public static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG); private static final String TAG = "UiTranslationController"; @NonNull @@ -161,6 +158,7 @@ public class UiTranslationController { view.setHasTranslationTransientState(false); } }); + notifyTranslationFinished(/* activityDestroyed= */ false); synchronized (mLock) { mViews.clear(); } @@ -175,12 +173,28 @@ public class UiTranslationController { */ public void onActivityDestroyed() { synchronized (mLock) { + if (DEBUG) { + Log.i(TAG, + "onActivityDestroyed(): mCurrentState is " + stateToString(mCurrentState)); + } + if (mCurrentState != STATE_UI_TRANSLATION_FINISHED) { + notifyTranslationFinished(/* activityDestroyed= */ true); + } mViews.clear(); destroyTranslators(); mWorkerThread.quitSafely(); } } + private void notifyTranslationFinished(boolean activityDestroyed) { + UiTranslationManager manager = mContext.getSystemService(UiTranslationManager.class); + if (manager != null) { + manager.onTranslationFinished(activityDestroyed, + new ActivityId(mActivity.getTaskId(), mActivity.getShareableActivityToken()), + mActivity.getComponentName()); + } + } + private void setLastRequestAutofillIdsLocked(List<AutofillId> views) { if (mLastRequestAutofillIds == null) { mLastRequestAutofillIds = new ArraySet<>(); @@ -220,9 +234,7 @@ public class UiTranslationController { } pw.print(outerPrefix); pw.print("padded views: "); pw.println(mViewsToPadContent); } - // TODO(b/182433547): we will remove debug rom condition before S release then we change - // change this back to "DEBUG" - if (Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG)) { + if (DEBUG) { dumpViewByTraversal(outerPrefix, pw); } } @@ -396,7 +408,6 @@ public class UiTranslationController { for (int i = 0; i < resultCount; i++) { final ViewTranslationResponse response = translatedResult.valueAt(i); if (DEBUG) { - // TODO(b/182433547): remove before S release Log.v(TAG, "onTranslationCompleted: " + sanitizedViewTranslationResponse(response)); } @@ -617,8 +628,8 @@ public class UiTranslationController { for (int i = 0; i < viewCounts; i++) { final View view = views.valueAt(i).get(); if (DEBUG) { - // TODO(b/182433547): remove before S release - Log.d(TAG, "runForEachView: view= " + view); + Log.d(TAG, "runForEachView for autofillId = " + (view != null + ? view.getAutofillId() : " null")); } if (view == null || view.getViewTranslationCallback() == null) { if (DEBUG) { @@ -679,8 +690,6 @@ public class UiTranslationController { } } - // TODO(b/182433547): maybe remove below before S release - /** * Returns a sanitized string representation of {@link ViewTranslationRequest}; */ diff --git a/core/java/android/view/translation/UiTranslationManager.java b/core/java/android/view/translation/UiTranslationManager.java index 3350c9310823..b9ed32ce248b 100644 --- a/core/java/android/view/translation/UiTranslationManager.java +++ b/core/java/android/view/translation/UiTranslationManager.java @@ -22,6 +22,7 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.app.assist.ActivityId; +import android.content.ComponentName; import android.content.Context; import android.icu.util.ULocale; import android.os.Binder; @@ -308,6 +309,26 @@ public final class UiTranslationManager { } } + /** + * Notify apps the translation is finished because {@link #finishTranslation(ActivityId)} is + * called or Activity is destroyed. + * + * @param activityDestroyed if the ui translation is finished because of activity destroyed. + * @param activityId the identifier for the Activity which needs ui translation + * @param componentName the ui translated Activity componentName. + * + * @hide + */ + public void onTranslationFinished(boolean activityDestroyed, ActivityId activityId, + ComponentName componentName) { + try { + mService.onTranslationFinished(activityDestroyed, + activityId.getToken(), componentName, mContext.getUserId()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + @NonNull @GuardedBy("mCallbacks") private final Map<UiTranslationStateCallback, IRemoteCallback> mCallbacks = new ArrayMap<>(); diff --git a/core/java/android/widget/AnalogClock.java b/core/java/android/widget/AnalogClock.java index d5966269a753..9c1285064afb 100644 --- a/core/java/android/widget/AnalogClock.java +++ b/core/java/android/widget/AnalogClock.java @@ -111,7 +111,9 @@ public class AnalogClock extends View { mSecondsHandFps = AppGlobals.getIntCoreSetting( WidgetFlags.KEY_ANALOG_CLOCK_SECONDS_HAND_FPS, - WidgetFlags.ANALOG_CLOCK_SECONDS_HAND_FPS_DEFAULT); + context.getResources() + .getInteger(com.android.internal.R.integer + .config_defaultAnalogClockSecondsHandFps)); final TypedArray a = context.obtainStyledAttributes( attrs, com.android.internal.R.styleable.AnalogClock, defStyleAttr, defStyleRes); @@ -720,7 +722,7 @@ public class AnalogClock extends View { canvas.restore(); final Drawable secondHand = mSecondHand; - if (secondHand != null) { + if (secondHand != null && mSecondsHandFps > 0) { canvas.save(); canvas.rotate(mSeconds / 60.0f * 360.0f, x, y); @@ -752,7 +754,10 @@ public class AnalogClock extends View { // n positions between two given numbers, where n is the number of ticks per second. This // ensures the second hand advances by a consistent distance despite our handler callbacks // occurring at inconsistent frequencies. - mSeconds = Math.round(rawSeconds * mSecondsHandFps) / (float) mSecondsHandFps; + mSeconds = + mSecondsHandFps <= 0 + ? rawSeconds + : Math.round(rawSeconds * mSecondsHandFps) / (float) mSecondsHandFps; mMinutes = localTime.getMinute() + mSeconds / 60.0f; mHour = localTime.getHour() + mMinutes / 60.0f; mChanged = true; @@ -789,7 +794,7 @@ public class AnalogClock extends View { LocalTime localTime = zonedDateTime.toLocalTime(); long millisUntilNextTick; - if (mSecondHand == null) { + if (mSecondHand == null || mSecondsHandFps <= 0) { // If there's no second hand, then tick at the start of the next minute. // // This must be done with ZonedDateTime as opposed to LocalDateTime to ensure proper diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index eb6bce4a2f59..2d1f17a420fa 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -565,6 +565,7 @@ public final class SelectionActionModeHelper { */ public void onSmartSelection(SelectionResult result) { onClassifiedSelection(result); + mTextView.notifyContentCaptureTextChanged(); mLogger.logSelectionModified( result.mStart, result.mEnd, result.mClassification, result.mSelection); } @@ -595,6 +596,7 @@ public final class SelectionActionModeHelper { mSelectionStart = selectionStart; mSelectionEnd = selectionEnd; mAllowReset = false; + mTextView.notifyContentCaptureTextChanged(); mLogger.logSelectionModified(selectionStart, selectionEnd, classification, null); } } @@ -604,6 +606,7 @@ public final class SelectionActionModeHelper { */ public void onSelectionDestroyed() { mAllowReset = false; + mTextView.notifyContentCaptureTextChanged(); // Wait a few ms to see if the selection was destroyed because of a text change event. mDelayedLogAbandon.schedule(100 /* ms */); } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 37374ef37ada..87301dcaa5dd 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -13901,7 +13901,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public void onCreateViewTranslationRequest(@NonNull int[] supportedFormats, @NonNull Consumer<ViewTranslationRequest> requestsCollector) { if (supportedFormats == null || supportedFormats.length == 0) { - // TODO(b/182433547): remove before S release if (UiTranslationController.DEBUG) { Log.w(LOG_TAG, "Do not provide the support translation formats."); } @@ -13912,7 +13911,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // Support Text translation if (ArrayUtils.contains(supportedFormats, TranslationSpec.DATA_FORMAT_TEXT)) { if (mText == null || mText.length() == 0) { - // TODO(b/182433547): remove before S release if (UiTranslationController.DEBUG) { Log.w(LOG_TAG, "Cannot create translation request for the empty text."); } @@ -13926,7 +13924,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // it, it needs broader changes to text APIs, we only allow to translate non selectable // and editable text in S. if (isTextEditable() || isPassword || isTextSelectable()) { - // TODO(b/182433547): remove before S release if (UiTranslationController.DEBUG) { Log.w(LOG_TAG, "Cannot create translation request. editable = " + isTextEditable() + ", isPassword = " + isPassword + ", selectable = " diff --git a/core/java/android/widget/TextViewTranslationCallback.java b/core/java/android/widget/TextViewTranslationCallback.java index e1b04f8957e5..9d60009031f9 100644 --- a/core/java/android/widget/TextViewTranslationCallback.java +++ b/core/java/android/widget/TextViewTranslationCallback.java @@ -22,7 +22,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.ColorStateList; import android.graphics.Color; -import android.os.Build; import android.text.TextUtils; import android.text.method.TransformationMethod; import android.text.method.TranslationTransformationMethod; @@ -43,10 +42,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { private static final String TAG = "TextViewTranslationCb"; - // TODO(b/182433547): remove Build.IS_DEBUGGABLE before ship. Enable the logging in debug build - // to help the debug during the development phase - private static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG) - || Build.IS_DEBUGGABLE; + private static final boolean DEBUG = Log.isLoggable(UiTranslationManager.LOG_TAG, Log.DEBUG); private TranslationTransformationMethod mTranslationTransformation; private boolean mIsShowingTranslation = false; @@ -124,7 +120,6 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { } } else { if (DEBUG) { - // TODO(b/182433547): remove before S release Log.w(TAG, "onHideTranslation(): no translated text."); } return false; @@ -145,7 +140,6 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { mContentDescription = null; } else { if (DEBUG) { - // TODO(b/182433547): remove before S release Log.w(TAG, "onClearTranslation(): no translated text."); } return false; diff --git a/core/java/android/widget/WidgetFlags.java b/core/java/android/widget/WidgetFlags.java index 097126807f71..fb40ee5ec843 100644 --- a/core/java/android/widget/WidgetFlags.java +++ b/core/java/android/widget/WidgetFlags.java @@ -207,9 +207,6 @@ public final class WidgetFlags { public static final String KEY_ANALOG_CLOCK_SECONDS_HAND_FPS = "widget__analog_clock_seconds_hand_fps"; - /** Default value for the flag {@link #ANALOG_CLOCK_SECONDS_HAND_FPS}. */ - public static final int ANALOG_CLOCK_SECONDS_HAND_FPS_DEFAULT = 1; - private WidgetFlags() { } } diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 7000ed75d5be..a6bf3cf9b806 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -1186,7 +1186,7 @@ public class ChooserActivity extends ResolverActivity implements final DisplayResolveInfo dri = new DisplayResolveInfo( originalIntent, ri, getString(R.string.screenshot_edit), "", resolveIntent, null); - dri.setDisplayIcon(getDrawable(R.drawable.ic_menu_edit)); + dri.setDisplayIcon(getDrawable(R.drawable.ic_screenshot_edit)); return dri; } diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl index 9ad457200700..30da4b470ab6 100644 --- a/core/java/com/android/internal/app/IAppOpsService.aidl +++ b/core/java/com/android/internal/app/IAppOpsService.aidl @@ -97,6 +97,7 @@ interface IAppOpsService { void setUserRestrictions(in Bundle restrictions, IBinder token, int userHandle); void setUserRestriction(int code, boolean restricted, IBinder token, int userHandle, in PackageTagsList excludedPackageTags); + void removeUser(int userHandle); void startWatchingActive(in int[] ops, IAppOpsActiveCallback callback); diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java index c74c39a434fa..10750b695a39 100644 --- a/core/java/com/android/internal/content/NativeLibraryHelper.java +++ b/core/java/com/android/internal/content/NativeLibraryHelper.java @@ -40,7 +40,6 @@ import android.os.incremental.IncrementalManager; import android.os.incremental.IncrementalStorage; import android.system.ErrnoException; import android.system.Os; -import android.util.ArraySet; import android.util.Slog; import dalvik.system.CloseGuard; @@ -551,18 +550,4 @@ public class NativeLibraryHelper { } return false; } - - /** - * Wait for all native library extraction to complete for the passed storages. - * - * @param incrementalStorages A list of the storages to wait for. - */ - public static void waitForNativeBinariesExtraction( - ArraySet<IncrementalStorage> incrementalStorages) { - for (int i = 0; i < incrementalStorages.size(); ++i) { - IncrementalStorage storage = incrementalStorages.valueAtUnchecked(i); - storage.waitForNativeBinariesExtraction(); - } - } - } diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index 6e1d3ce9a297..5f84b5a92305 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -377,12 +377,15 @@ public final class VpnProfile implements Cloneable, Parcelable { /** Checks if this profile specifies a LegacyVpn type. */ public static boolean isLegacyType(int type) { switch (type) { - case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: // fall through - case VpnProfile.TYPE_IKEV2_IPSEC_RSA: // fall through - case VpnProfile.TYPE_IKEV2_IPSEC_PSK: - return false; - default: + case VpnProfile.TYPE_PPTP: + case VpnProfile.TYPE_L2TP_IPSEC_PSK: + case VpnProfile.TYPE_L2TP_IPSEC_RSA: + case VpnProfile.TYPE_IPSEC_XAUTH_PSK: + case VpnProfile.TYPE_IPSEC_XAUTH_RSA: + case VpnProfile.TYPE_IPSEC_HYBRID_RSA: return true; + default: + return false; } } diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index dab3e9fa15fa..be059a1e195b 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -191,6 +191,11 @@ public class BatteryStatsImpl extends BatteryStats { @VisibleForTesting public static final int WAKE_LOCK_WEIGHT = 50; + public static final int RESET_REASON_CORRUPT_FILE = 1; + public static final int RESET_REASON_ADB_COMMAND = 2; + public static final int RESET_REASON_FULL_CHARGE = 3; + public static final int RESET_REASON_MEASURED_ENERGY_BUCKETS_CHANGE = 4; + protected Clocks mClocks; private final AtomicFile mStatsFile; @@ -348,8 +353,9 @@ public class BatteryStatsImpl extends BatteryStats { /** * Callback invoked immediately prior to resetting battery stats. + * @param resetReason One of the RESET_REASON_* constants. */ - void prepareForBatteryStatsReset(); + void prepareForBatteryStatsReset(int resetReason); } private BatteryResetListener mBatteryResetListener; @@ -747,6 +753,7 @@ public class BatteryStatsImpl extends BatteryStats { // CPU update, even if we aren't currently running wake locks. boolean mDistributeWakelockCpu; + private boolean mSystemReady; boolean mShuttingDown; final HistoryEventTracker mActiveEvents = new HistoryEventTracker(); @@ -11210,7 +11217,7 @@ public class BatteryStatsImpl extends BatteryStats { long uptimeUs = mSecUptime * 1000; long mSecRealtime = mClocks.elapsedRealtime(); long realtimeUs = mSecRealtime * 1000; - resetAllStatsLocked(mSecUptime, mSecRealtime); + resetAllStatsLocked(mSecUptime, mSecRealtime, RESET_REASON_ADB_COMMAND); mDischargeStartLevel = mHistoryCur.batteryLevel; pullPendingStateUpdatesLocked(); addHistoryRecordLocked(mSecRealtime, mSecUptime); @@ -11239,9 +11246,10 @@ public class BatteryStatsImpl extends BatteryStats { initActiveHistoryEventsLocked(mSecRealtime, mSecUptime); } - private void resetAllStatsLocked(long uptimeMillis, long elapsedRealtimeMillis) { + private void resetAllStatsLocked(long uptimeMillis, long elapsedRealtimeMillis, + int resetReason) { if (mBatteryResetListener != null) { - mBatteryResetListener.prepareForBatteryStatsReset(); + mBatteryResetListener.prepareForBatteryStatsReset(resetReason); } final long uptimeUs = uptimeMillis * 1000; @@ -13477,6 +13485,13 @@ public class BatteryStatsImpl extends BatteryStats { return false; } + /** + * Notifies BatteryStatsImpl that the system server is ready. + */ + public void onSystemReady() { + mSystemReady = true; + } + @GuardedBy("this") protected void setOnBatteryLocked(final long mSecRealtime, final long mSecUptime, final boolean onBattery, final int oldStatus, final int level, final int chargeUah) { @@ -13493,10 +13508,17 @@ public class BatteryStatsImpl extends BatteryStats { // battery was last full, or the level is at 100, or // we have gone through a significant charge (from a very low // level to a now very high level). + // Also, we will reset the stats if battery got partially charged + // and discharged repeatedly without ever reaching the full charge. + // This reset is done in order to prevent stats sessions from going on forever. + // Exceedingly long battery sessions would lead to an overflow of + // data structures such as mWakeupReasonStats. boolean reset = false; - if (!mNoAutoReset && (oldStatus == BatteryManager.BATTERY_STATUS_FULL + if (!mNoAutoReset && mSystemReady + && (oldStatus == BatteryManager.BATTERY_STATUS_FULL || level >= 90 - || (mDischargeCurrentLevel < 20 && level >= 80))) { + || (mDischargeCurrentLevel < 20 && level >= 80) + || getHighDischargeAmountSinceCharge() >= 200)) { Slog.i(TAG, "Resetting battery stats: level=" + level + " status=" + oldStatus + " dischargeLevel=" + mDischargeCurrentLevel + " lowAmount=" + getLowDischargeAmountSinceCharge() @@ -13534,7 +13556,7 @@ public class BatteryStatsImpl extends BatteryStats { }); } doWrite = true; - resetAllStatsLocked(mSecUptime, mSecRealtime); + resetAllStatsLocked(mSecUptime, mSecRealtime, RESET_REASON_FULL_CHARGE); if (chargeUah > 0 && level > 0) { // Only use the reported coulomb charge value if it is supported and reported. mEstimatedBatteryCapacityMah = (int) ((chargeUah / 1000) / (level / 100.0)); @@ -14502,7 +14524,8 @@ public class BatteryStatsImpl extends BatteryStats { ? null : new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames); // Supported power buckets changed since last boot. // Existing data is no longer reliable. - resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime()); + resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime(), + RESET_REASON_MEASURED_ENERGY_BUCKETS_CHANGE); } } @@ -14949,7 +14972,8 @@ public class BatteryStatsImpl extends BatteryStats { } } catch (Exception e) { Slog.e(TAG, "Error reading battery statistics", e); - resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime()); + resetAllStatsLocked(SystemClock.uptimeMillis(), SystemClock.elapsedRealtime(), + RESET_REASON_CORRUPT_FILE); } finally { stats.recycle(); } diff --git a/core/java/com/android/internal/os/BatteryUsageStatsStore.java b/core/java/com/android/internal/os/BatteryUsageStatsStore.java index 5c976025d39d..fd54b32bd12f 100644 --- a/core/java/com/android/internal/os/BatteryUsageStatsStore.java +++ b/core/java/com/android/internal/os/BatteryUsageStatsStore.java @@ -69,6 +69,7 @@ public class BatteryUsageStatsStore { private final Context mContext; private final BatteryStatsImpl mBatteryStats; + private boolean mSystemReady; private final File mStoreDir; private final File mLockFile; private final AtomicFile mConfigFile; @@ -95,7 +96,18 @@ public class BatteryUsageStatsStore { mBatteryUsageStatsProvider = new BatteryUsageStatsProvider(mContext, mBatteryStats); } - private void prepareForBatteryStatsReset() { + /** + * Notifies BatteryUsageStatsStore that the system server is ready. + */ + public void onSystemReady() { + mSystemReady = true; + } + + private void prepareForBatteryStatsReset(int resetReason) { + if (resetReason == BatteryStatsImpl.RESET_REASON_CORRUPT_FILE || !mSystemReady) { + return; + } + final List<BatteryUsageStats> stats = mBatteryUsageStatsProvider.getBatteryUsageStats(BATTERY_USAGE_STATS_QUERY); if (stats.isEmpty()) { diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 6ff656c3f8db..0f26f57e2155 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -127,6 +127,12 @@ public class ZygoteInit { private static boolean sPreloadComplete; + /** + * Cached classloader to use for the system server. Will only be populated in the system + * server process. + */ + private static ClassLoader sCachedSystemServerClassLoader = null; + static void preload(TimingsTraceLog bootTimingsTraceLog) { Log.d(TAG, "begin preload"); bootTimingsTraceLog.traceBegin("BeginPreload"); @@ -540,10 +546,8 @@ public class ZygoteInit { throw new IllegalStateException("Unexpected return from WrapperInit.execApplication"); } else { - ClassLoader cl = null; - if (systemServerClasspath != null) { - cl = createPathClassLoader(systemServerClasspath, parsedArgs.mTargetSdkVersion); - + ClassLoader cl = getOrCreateSystemServerClassLoader(); + if (cl != null) { Thread.currentThread().setContextClassLoader(cl); } @@ -559,6 +563,23 @@ public class ZygoteInit { } /** + * Create the classloader for the system server and store it in + * {@link sCachedSystemServerClassLoader}. This function may be called through JNI in + * system server startup, when the runtime is in a critically low state. Do not do + * extended computation etc here. + */ + private static ClassLoader getOrCreateSystemServerClassLoader() { + if (sCachedSystemServerClassLoader == null) { + final String systemServerClasspath = Os.getenv("SYSTEMSERVERCLASSPATH"); + if (systemServerClasspath != null) { + sCachedSystemServerClassLoader = createPathClassLoader(systemServerClasspath, + VMRuntime.SDK_VERSION_CUR_DEVELOPMENT); + } + } + return sCachedSystemServerClassLoader; + } + + /** * Note that preparing the profiles for system server does not require special selinux * permissions. From the installer perspective the system server is a regular package which can * capture profile information. diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 134b1587ee58..bfc57b403a41 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -2512,14 +2512,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } params.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION; } - if (a.getBoolean(R.styleable.Window_windowLightStatusBar, false)) { - decor.setSystemUiVisibility( - decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - } - if (a.getBoolean(R.styleable.Window_windowLightNavigationBar, false)) { - decor.setSystemUiVisibility( - decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); - } + final int sysUiVis = decor.getSystemUiVisibility(); + final int statusLightFlag = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; + final int statusFlag = a.getBoolean(R.styleable.Window_windowLightStatusBar, false) + ? statusLightFlag : 0; + final int navLightFlag = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + final int navFlag = a.getBoolean(R.styleable.Window_windowLightNavigationBar, false) + ? navLightFlag : 0; + decor.setSystemUiVisibility( + (sysUiVis & ~(statusLightFlag | navLightFlag)) | (statusFlag | navFlag)); if (a.hasValue(R.styleable.Window_windowLayoutInDisplayCutoutMode)) { int mode = a.getInt(R.styleable.Window_windowLayoutInDisplayCutoutMode, -1); if (mode < LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 502849e4824a..64bf47cee6ec 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -122,6 +122,10 @@ static jclass gZygoteClass; static jmethodID gCallPostForkSystemServerHooks; static jmethodID gCallPostForkChildHooks; +static constexpr const char* kZygoteInitClassName = "com/android/internal/os/ZygoteInit"; +static jclass gZygoteInitClass; +static jmethodID gGetOrCreateSystemServerClassLoader; + static bool gIsSecurityEnforced = true; /** @@ -170,6 +174,7 @@ static constexpr const uint64_t UPPER_HALF_WORD_MASK = 0xFFFF'FFFF'0000'0000; static constexpr const uint64_t LOWER_HALF_WORD_MASK = 0x0000'0000'FFFF'FFFF; static constexpr const char* kCurProfileDirPath = "/data/misc/profiles/cur"; +static constexpr const char* kRefProfileDirPath = "/data/misc/profiles/ref"; /** * The maximum value that the gUSAPPoolSizeMax variable may take. This value @@ -1433,6 +1438,7 @@ static void isolateJitProfile(JNIEnv* env, jobjectArray pkg_data_info_list, // Mount (namespace) tmpfs on profile directory, so apps no longer access // the original profile directory anymore. MountAppDataTmpFs(kCurProfileDirPath, fail_fn); + MountAppDataTmpFs(kRefProfileDirPath, fail_fn); // Create profile directory for this user. std::string actualCurUserProfile = StringPrintf("%s/%d", kCurProfileDirPath, user_id); @@ -1446,14 +1452,24 @@ static void isolateJitProfile(JNIEnv* env, jobjectArray pkg_data_info_list, packageName.c_str()); std::string mirrorCurPackageProfile = StringPrintf("/data_mirror/cur_profiles/%d/%s", user_id, packageName.c_str()); + std::string actualRefPackageProfile = StringPrintf("%s/%s", kRefProfileDirPath, + packageName.c_str()); + std::string mirrorRefPackageProfile = StringPrintf("/data_mirror/ref_profiles/%s", + packageName.c_str()); if (access(mirrorCurPackageProfile.c_str(), F_OK) != 0) { ALOGW("Can't access app profile directory: %s", mirrorCurPackageProfile.c_str()); continue; } + if (access(mirrorRefPackageProfile.c_str(), F_OK) != 0) { + ALOGW("Can't access app profile directory: %s", mirrorRefPackageProfile.c_str()); + continue; + } PrepareDir(actualCurPackageProfile, DEFAULT_DATA_DIR_PERMISSION, uid, uid, fail_fn); BindMount(mirrorCurPackageProfile, actualCurPackageProfile, fail_fn); + PrepareDir(actualRefPackageProfile, DEFAULT_DATA_DIR_PERMISSION, uid, uid, fail_fn); + BindMount(mirrorRefPackageProfile, actualRefPackageProfile, fail_fn); } } @@ -1613,6 +1629,17 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, instruction_set.value().c_str()); } + if (is_system_server) { + // Prefetch the classloader for the system server. This is done early to + // allow a tie-down of the proper system server selinux domain. + env->CallStaticObjectMethod(gZygoteInitClass, gGetOrCreateSystemServerClassLoader); + if (env->ExceptionCheck()) { + // Be robust here. The Java code will attempt to create the classloader + // at a later point (but may not have rights to use AoT artifacts). + env->ExceptionClear(); + } + } + if (setresgid(gid, gid, gid) == -1) { fail_fn(CREATE_ERROR("setresgid(%d) failed: %s", gid, strerror(errno))); } @@ -2676,6 +2703,13 @@ int register_com_android_internal_os_Zygote(JNIEnv* env) { gCallPostForkChildHooks = GetStaticMethodIDOrDie(env, gZygoteClass, "callPostForkChildHooks", "(IZZLjava/lang/String;)V"); - return RegisterMethodsOrDie(env, "com/android/internal/os/Zygote", gMethods, NELEM(gMethods)); + gZygoteInitClass = MakeGlobalRefOrDie(env, FindClassOrDie(env, kZygoteInitClassName)); + gGetOrCreateSystemServerClassLoader = + GetStaticMethodIDOrDie(env, gZygoteInitClass, "getOrCreateSystemServerClassLoader", + "()Ljava/lang/ClassLoader;"); + + RegisterMethodsOrDie(env, "com/android/internal/os/Zygote", gMethods, NELEM(gMethods)); + + return JNI_OK; } } // namespace android diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 64b8a1a81e69..14d200d00d56 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1663,11 +1663,6 @@ <permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE" android:protectionLevel="signature|privileged" /> - <!-- The system server uses this permission to install a default secondary location time zone - provider. - --> - <uses-permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE"/> - <!-- @SystemApi @hide Allows an application to bind to a android.service.TimeZoneProviderService for the purpose of detecting the device's time zone. This prevents arbitrary clients connecting to the time zone provider service. The system server checks that the provider's @@ -5809,10 +5804,6 @@ android:label="@string/sensor_notification_service"/> <!-- Attribution for Twilight service. --> <attribution android:tag="TwilightService" android:label="@string/twilight_service"/> - <!-- Attribution for the Offline LocationTimeZoneProvider, used to detect time zone using - on-device data --> - <attribution android:tag="OfflineLocationTimeZoneProviderService" - android:label="@string/offline_location_time_zone_detection_service_attribution"/> <!-- Attribution for Gnss Time Update service. --> <attribution android:tag="GnssTimeUpdateService" android:label="@string/gnss_time_update_service"/> @@ -6292,19 +6283,6 @@ </intent-filter> </service> - <!-- AOSP configures a default secondary LocationTimeZoneProvider that uses an on-device - data set from the com.android.geotz APEX. --> - <service android:name="com.android.timezone.location.provider.OfflineLocationTimeZoneProviderService" - android:enabled="@bool/config_enableSecondaryLocationTimeZoneProvider" - android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE" - android:exported="false"> - <intent-filter> - <action android:name="android.service.timezone.SecondaryLocationTimeZoneProviderService" /> - </intent-filter> - <meta-data android:name="serviceVersion" android:value="1" /> - <meta-data android:name="serviceIsMultiuser" android:value="true" /> - </service> - <provider android:name="com.android.server.textclassifier.IconsContentProvider" android:authorities="com.android.textclassifier.icons" diff --git a/core/res/res/drawable/chooser_action_button_bg.xml b/core/res/res/drawable/chooser_action_button_bg.xml index 18bbd93d1535..518d51a3f580 100644 --- a/core/res/res/drawable/chooser_action_button_bg.xml +++ b/core/res/res/drawable/chooser_action_button_bg.xml @@ -23,8 +23,9 @@ android:insetRight="0dp" android:insetBottom="8dp"> <shape android:shape="rectangle"> - <corners android:radius="16dp" /> - <solid android:color="@color/system_neutral2_100" /> + <corners android:radius="8dp" /> + <stroke android:width="1dp" + android:color="?android:attr/colorAccentPrimaryVariant"/> </shape> </inset> </item> diff --git a/core/res/res/drawable/ic_screenshot_edit.xml b/core/res/res/drawable/ic_screenshot_edit.xml new file mode 100644 index 000000000000..2d9148f90b73 --- /dev/null +++ b/core/res/res/drawable/ic_screenshot_edit.xml @@ -0,0 +1,24 @@ +<!-- +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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0l0,0L3,16.82V21h4.18L20.41,7.77C21.2,6.99 21.2,5.72 20.41,4.94zM6.41,19.06L5,19v-1.36l9.82,-9.82l1.41,1.41L6.41,19.06z"/> +</vector>
\ No newline at end of file diff --git a/core/res/res/layout/chooser_action_button.xml b/core/res/res/layout/chooser_action_button.xml index def429ecd62b..2b68cccaf291 100644 --- a/core/res/res/layout/chooser_action_button.xml +++ b/core/res/res/layout/chooser_action_button.xml @@ -19,13 +19,13 @@ android:paddingStart="12dp" android:paddingEnd="12dp" android:drawablePadding="8dp" - android:textColor="@color/text_color_primary_device_default_light" + android:textColor="?android:attr/textColorPrimary" android:textSize="12sp" android:maxWidth="192dp" android:singleLine="true" android:clickable="true" android:background="@drawable/chooser_action_button_bg" - android:drawableTint="@color/text_color_primary_device_default_light" + android:drawableTint="?android:attr/textColorPrimary" android:drawableTintMode="src_in" style="?android:attr/borderlessButtonStyle" /> diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index 10683b189fc5..90caaccfbff4 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -51,6 +51,7 @@ android:paddingBottom="@dimen/chooser_view_spacing" android:paddingLeft="24dp" android:paddingRight="24dp" + android:visibility="gone" android:layout_below="@id/drag" android:layout_centerHorizontal="true"/> </RelativeLayout> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 39e3021c128e..664c31437789 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -614,8 +614,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"ليست هناك بصمات إصبع مسجَّلة."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"لا يحتوي هذا الجهاز على مستشعِر بصمات إصبع."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"تم إيقاف جهاز الاستشعار مؤقتًا."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"لا يمكن استخدام مستشعر بصمات الإصبع. يُرجى التواصل مع مقدِّم خدمات إصلاح."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"الإصبع <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"استخدام بصمة الإصبع"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"استخدام بصمة الإصبع أو قفل الشاشة"</string> @@ -631,12 +630,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"يمكنك فتح قفل هاتفك بمجرّد النظر إلى الشاشة."</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"إعداد المزيد من الطرق لفتح قفل الجهاز"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"انقر لإضافة بصمة إصبع."</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"فتح الجهاز ببصمة الإصبع"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"لا يمكن استخدام مستشعر بصمات الإصبع"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"يُرجى التواصل مع مقدِّم خدمات إصلاح."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"تعذّر تسجيل بيانات دقيقة للوجه. حاول مرة أخرى."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"ساطع للغاية. تجربة مستوى سطوع أقلّ."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"الصورة معتمة للغاية. يُرجى زيادة السطوع."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index ad3d74697e70..a55785fd29a4 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"কোনো ফিংগাৰপ্ৰিণ্ট যোগ কৰা নহ\'ল।"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"এই ডিভাইচটোত ফিংগাৰপ্ৰিণ্ট ছেন্সৰ নাই।"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"ছেন্সৰটো সাময়িকভাৱে অক্ষম হৈ আছে।"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰ ব্যৱহাৰ কৰিব নোৱাৰি। মেৰামতি সেৱা প্ৰদানকাৰী কোনো প্ৰতিষ্ঠানলৈ যাওক"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g> আঙুলি"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ফিংগাৰপ্ৰিণ্ট অথবা স্ক্ৰীন লক ব্যৱহাৰ কৰক"</string> @@ -613,20 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"ফিংগাৰপ্ৰিণ্ট আইকন"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"মুখাৱয়বৰ দ্বাৰা আনলক কৰাৰ সুবিধা"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"মুখাৱয়বৰ দ্বাৰা আনলক কৰাৰ সুবিধাটোৰ ব্যৱহাৰ কৰোঁতে সমস্যা হৈছে"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"আপোনাৰ মুখাৱয়বৰ মডেলটো মচিবলৈ টিপক, তাৰ পাছত পুনৰ আপোনাৰ মুখাৱয়ব যোগ দিয়ক"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"মুখাৱয়বৰে আনলক কৰাৰ সুবিধাটো ছেট আপ কৰক"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"আপোনাৰ ফ’নটোলৈ চাই সেইটো আনলক কৰক"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"আনলক কৰাৰ অধিক উপায় ছেট আপ কৰক"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"এটা ফিংগাৰপ্ৰিণ্ট যোগ দিবলৈ টিপক"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ফিংগাৰপ্ৰিণ্টৰ দ্বাৰা আনলক কৰা সুবিধা"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰ ব্যৱহাৰ কৰিব নোৱাৰি"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"মেৰামতি সেৱা প্ৰদানকাৰী কোনো প্ৰতিষ্ঠানলৈ যাওক।"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"সঠিক মুখমণ্ডলৰ ডেটা কেপচাৰ নহ’ল। আকৌ চেষ্টা কৰক।"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"অতি উজ্জ্বল। ইয়াতকৈ কম পোহৰৰ উৎস ব্যৱহাৰ কৰক।"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"অতি আন্ধাৰ। উজ্জ্বল লাইট ব্যৱহাৰ কৰক।"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 85f1b4708080..a9b8ccbaff43 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Barmaq izi qeydə alınmayıb."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Bu cihazda barmaq izi sensoru yoxdur."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensor müvəqqəti deaktivdir."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Barmaq izi sensorundan istifadə etmək mümkün deyil. Təmir provayderini ziyarət edin"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Barmaq <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Barmaq izini istifadə edin"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Barmaq izi və ya ekran kilidindən istifadə edin"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Telefona baxaraq onu kiliddən çıxarın"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Kiliddən çıxarmağın daha çox yolunu ayarlayın"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Barmaq izi əlavə etmək üçün toxunun"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Barmaq izi ilə kiliddən çıxarma"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Barmaq izi sensorundan istifadə etmək mümkün deyil"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Təmir provayderini ziyarət edin."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Dəqiq üz datası əldə edilmədi. Yenidən cəhd edin."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Çox işıqlıdır. Daha az işıqlı şəkli sınayın."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Çox qaranlıqdır. Parlaq işıqdan istifadə edin."</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 003b5e560d78..9c5b71f56af4 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -608,8 +608,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Адбіткі пальцаў не зарэгістраваны."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"На гэтай прыладзе няма сканера адбіткаў пальцаў."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Датчык часова выключаны."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Не ўдалося скарыстаць сканер адбіткаў пальцаў. Звярніцеся ў сэрвісны цэнтр."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Палец <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Выкарыстоўваць адбітак пальца"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Выкарыстоўваць адбітак пальца ці блакіроўку экрана"</string> @@ -625,12 +624,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Разблакіруйце свой тэлефон, паглядзеўшы на яго"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Наладзьце дадатковыя спосабы разблакіроўкі"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Націсніце, каб дадаць адбітак пальца"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Разблакіраванне адбіткам пальца"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Не ўдалося скарыстаць сканер адбіткаў пальцаў"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Звярніцеся ў сэрвісны цэнтр."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Не атрымалася распазнаць твар. Паўтарыце спробу."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Занадта светла. Прыглушыце асвятленне."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Занадта цёмна. Павялічце асвятленне."</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 43a7d8006a20..718eef00d159 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -613,10 +613,8 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"আঙ্গুলের ছাপ আইকন"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"\'ফেস আনলক\'"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"\'ফেস আনলক\' ফিচার ব্যবহার করার ক্ষেত্রে হওয়া সমস্যা"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"আপনার ফেস মডেল মুছে দেওয়ার জন্য ট্যাপ করুন এবং তারপরে আবার ফেস যোগ করুন"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"\'ফেস আনলক\' সেট আপ করুন"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"আপনার ফোনের দিকে তাকিয়ে এটিকে আনলক করুন"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"আনলক করার জন্য বিভিন্ন উপায়ে সেট আপ করুন"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 5bf82730e53c..1ec443e53a96 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -608,8 +608,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Nejsou zaregistrovány žádné otisky prstů."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Toto zařízení nemá snímač otisků prstů."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Senzor je dočasně deaktivován."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Snímač otisků prstů nelze použít. Navštivte servis"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Prst <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Použít otisk prstu"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Použít otisk prstu nebo zámek obrazovky"</string> @@ -625,12 +624,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Telefon odemknete pohledem"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Nastavte si více způsobů odemykání"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Klepnutím přidáte otisk prstu"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Odemknutí otiskem prstu"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Snímač otisků prstů nelze použít"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Navštivte servis"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Obličej se nepodařilo zachytit. Zkuste to znovu."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Je příliš světlo. Zmírněte osvětlení."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Je moc velká tma. Přejděte na světlo."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index fee723db35ef..e0bfb592bb25 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Der er ikke registreret nogen fingeraftryk."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Denne enhed har ingen fingeraftrykslæser."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensoren er midlertidigt deaktiveret."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Fingeraftrykslæseren kan ikke bruges. Få den repareret"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Fingeraftryk <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Brug fingeraftryk"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Brug fingeraftryk eller skærmlås"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Lås din telefon op ved at kigge på den"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Konfigurer flere måder at låse op på"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Tryk for at tilføje et fingeraftryk"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Oplåsning med fingeraftryk"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Fingeraftrykslæseren kan ikke bruges"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Få den repareret."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Der blev ikke registreret ansigtsdata. Prøv igen."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Der er for lyst. Prøv en mere dæmpet belysning."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"For mørkt. Prøv med mere belysning."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 5af538dc703e..ededf282c3e2 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Keine Fingerabdrücke erfasst."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Dieses Gerät hat keinen Fingerabdrucksensor."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Der Sensor ist vorübergehend deaktiviert."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Der Fingerabdrucksensor kann nicht verwendet werden. Suche einen Reparaturdienstleister auf."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Finger <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Fingerabdruck verwenden"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Fingerabdruck oder Displaysperre verwenden"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Entsperre dein Smartphone, indem du es ansiehst"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Weitere Möglichkeiten zum Entsperren einrichten"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Tippe, um einen Fingerabdruck hinzuzufügen"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Entsperrung per Fingerabdruck"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Der Fingerabdrucksensor kann nicht verwendet werden"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Suche einen Reparaturdienstleister auf."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Gesichtsdaten nicht gut erfasst. Erneut versuchen."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Zu hell. Schwächere Beleuchtung ausprobieren."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Zu dunkel. Probier eine hellere Beleuchtung aus."</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index c3172a6c3589..6e0cdafa21c7 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -602,7 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Ez da erregistratu hatz-markarik."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Gailu honek ez du hatz-marken sentsorerik."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sentsorea aldi baterako desgaitu da."</string> - <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Ezin da erabili hatz-marken sentsorea. Jo konponketak egiten dituen hornitzaile batenera."</string> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Ezin da erabili hatz-marken sentsorea. Jarri harremanetan konponketak egiten dituen hornitzaile batekin."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>. hatza"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Erabili hatz-marka"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Erabili hatz-marka edo pantailaren blokeoa"</string> @@ -620,7 +620,7 @@ <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Sakatu hau hatz-marka bat gehitzeko"</string> <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Hatz-marka bidez desblokeatzea"</string> <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Ezin da erabili hatz-marken sentsorea"</string> - <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Jo konponketak egiten dituen hornitzaile batenera."</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Jarri harremanetan konponketak egiten dituen hornitzaile batekin."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Ezin izan dira bildu argazkiaren datu zehatzak. Saiatu berriro."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Argi gehiegi dago. Joan toki ilunago batera."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Ilunegi dago. Erabili argi gehiago."</string> @@ -2061,7 +2061,7 @@ <string name="mmcc_illegal_ms" msgid="7509650265233909445">"SIM txartela ezin da erabili ahotsa erabiltzeko"</string> <string name="mmcc_illegal_me" msgid="6505557881889904915">"Telefonoa ezin da erabili ahotsa erabiltzeko"</string> <string name="mmcc_authentication_reject_msim_template" msgid="4480853038909922153">"Ezin da erabili <xliff:g id="SIMNUMBER">%d</xliff:g> SIM txartela"</string> - <string name="mmcc_imsi_unknown_in_hlr_msim_template" msgid="3688508325248599657">"Ez dago <xliff:g id="SIMNUMBER">%d</xliff:g> SIM txartelik"</string> + <string name="mmcc_imsi_unknown_in_hlr_msim_template" msgid="3688508325248599657">"Ez dago <xliff:g id="SIMNUMBER">%d</xliff:g> SIMik"</string> <string name="mmcc_illegal_ms_msim_template" msgid="832644375774599327">"Ezin da erabili <xliff:g id="SIMNUMBER">%d</xliff:g> SIM txartela"</string> <string name="mmcc_illegal_me_msim_template" msgid="4802735138861422802">"Ezin da erabili <xliff:g id="SIMNUMBER">%d</xliff:g> SIM txartela"</string> <string name="popup_window_default_title" msgid="6907717596694826919">"Leiho gainerakorra"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index e0b3a8dfced0..4105e266b96d 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"اثر انگشتی ثبت نشده است."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"این دستگاه حسگر اثر انگشت ندارد."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"حسگر بهطور موقت غیرفعال است."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"امکان استفاده از حسگر اثر انگشت وجود ندارد. به ارائهدهنده خدمات تعمیر مراجعه کنید"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"انگشت <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"استفاده از اثر انگشت"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"استفاده از اثر انگشت یا قفل صفحه"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"برای باز کردن قفل تلفن خود به آن نگاه کنید"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"راهاندازی روشهای بیشتر برای باز کردن قفل"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"برای افزودن اثر انگشت، ضربه بزنید"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"قفلگشایی با اثر انگشت"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"امکان استفاده از حسگر اثر انگشت وجود ندارد"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"به ارائهدهنده خدمات تعمیر مراجعه کنید."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"دادههای دقیق چهره ضبط نشد. دوباره امتحان کنید."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"خیلی روشن است. روشناییاش را ملایمتر کنید."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"خیلی تاریک است. تصویر را روشنتر کنید."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index c2414acd2e40..cbf8d690c370 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Aucune empreinte digitale enregistrée."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Cet appareil ne possède pas de capteur d\'empreintes digitales."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Le capteur a été désactivé temporairement."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Impossible utiliser capteur empreinte digitale. Consultez un fournisseur de services de réparation"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Doigt <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Utiliser l\'empreinte digitale"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Utiliser l\'empreinte digitale ou le verrouillage de l\'écran"</string> @@ -613,20 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Icône d\'empreinte digitale"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Déverrouillage par reconnaissance faciale"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problème avec la fonctionnalité de déverrouillage par reconnaissance faciale"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Touchez pour supprimer votre modèle facial, puis ajoutez votre visage de nouveau"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"Configurer le déverrouillage par reconnaissance faciale"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"Déverrouillez votre téléphone en le regardant"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Configurer d\'autres méthodes de déverrouillage"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Touchez pour ajouter une empreinte digitale"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Déverrouillage par empreinte digitale"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Impossible d\'utiliser le capteur d\'empreintes digitales"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Consultez un fournisseur de services de réparation."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Imposs. capt. données visage précises. Réessayez."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Trop lumineux. Essayez un éclairage plus faible."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Trop sombre. Essayez avec un éclairage plus fort."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 69daf30ff2fa..57b99f046170 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Aucune empreinte digitale enregistrée."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Aucun lecteur d\'empreinte digitale n\'est installé sur cet appareil."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Capteur temporairement désactivé."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Impossible d\'utiliser le lecteur d\'empreinte digitale. Contactez un réparateur"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Doigt <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Utiliser l\'empreinte digitale"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Utiliser votre empreinte digitale ou le verrouillage de l\'écran"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Déverrouillez votre téléphone en le regardant"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Configurer d\'autres méthodes de déverrouillage"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Appuyez pour ajouter une empreinte digitale"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Déverrouillage par empreinte digitale"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Impossible d\'utiliser le lecteur d\'empreinte digitale"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Contactez un réparateur."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Capture du visage impossible. Réessayez."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Trop lumineux. Essayez de baisser la lumière."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Trop sombre. Essayez une éclairage plus lumineux."</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index c727b4f1d960..157f01f7cfda 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Non se rexistraron impresións dixitais."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Este dispositivo non ten sensor de impresión dixital."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Desactivouse o sensor temporalmente."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Non se puido usar o sensor de impresión dixital. Visita un provedor de reparacións"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Dedo <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Utilizar impresión dixital"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Utilizar impresión dixital ou credencial do dispositivo"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Mira o teléfono para desbloquealo"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Configura máis maneiras de desbloquear o dispositivo"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Toca para engadir unha impresión dixital"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Desbloqueo mediante impresión dixital"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Non se puido usar o sensor de impresión dixital"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Visita un provedor de reparacións."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Sen datos faciais exactos. Téntao de novo."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Hai demasiada iluminación. Proba cunha máis suave."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Hai demasiada escuridade. Proba con máis luz."</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 6dcb8ef5ed0d..7ebd2d92c50e 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -613,10 +613,8 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"ફિંગરપ્રિન્ટ આયકન"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"ફેસ અનલૉક"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"ફેસ અનલૉકની સુવિધામાં સમસ્યા"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"તમારા ચહેરાનું મૉડલ ડિલીટ કરવા માટે ટૅપ કરો, પછી તમારો ચહેરો ફરીથી ઉમેરો"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"ફેસ અનલૉક સુવિધાનું સેટઅપ કરો"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"તમારા ફોનની તરફ જોઈને તેને અનલૉક કરો"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"અનલૉક કરવાની બીજી રીતોનું સેટઅપ કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 9a205dd2ab1c..6aa2570a2d71 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -176,9 +176,9 @@ <string name="contentServiceSync" msgid="2341041749565687871">"समन्वयन"</string> <string name="contentServiceSyncNotificationTitle" msgid="5766411446676388623">"सिंक नहीं किया जा सकता"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="4562226280528716090">"बहुत ज़्यादा <xliff:g id="CONTENT_TYPE">%s</xliff:g> मिटाने की कोशिश की गई."</string> - <string name="low_memory" product="tablet" msgid="5557552311566179924">"टैबलेट की मेमोरी भर गई है. जगह खाली करने के लिए कुछ फ़ाइलें मिटाएं."</string> - <string name="low_memory" product="watch" msgid="3479447988234030194">"घड़ी की मेमोरी भर गई है. स्थान खाली करने के लिए कुछ फ़ाइलें मिटाएं."</string> - <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV डिवाइस की मेमोरी में जगह नहीं बची है. जगह बनाने के लिए कुछ फाइलें मिटाएं."</string> + <string name="low_memory" product="tablet" msgid="5557552311566179924">"टैबलेट का स्टोरेज भर गया है. जगह खाली करने के लिए कुछ फ़ाइलें मिटाएं."</string> + <string name="low_memory" product="watch" msgid="3479447988234030194">"घड़ी का स्टोरेज भर गया है. स्थान खाली करने के लिए कुछ फ़ाइलें मिटाएं."</string> + <string name="low_memory" product="tv" msgid="6663680413790323318">"Android TV डिवाइस के स्टोरेज में जगह नहीं बची है. जगह बनाने के लिए कुछ फाइलें मिटाएं."</string> <string name="low_memory" product="default" msgid="2539532364144025569">"फ़ोन मेमोरी भर गयी है. जगह खाली करने के लिए कुछ फ़ाइलें मिटाएं."</string> <plurals name="ssl_ca_cert_warning" formatted="false" msgid="2288194355006173029"> <item quantity="one">प्रमाणपत्र अनुमतियों को इंस्टॉल किया गया</item> @@ -408,9 +408,9 @@ <string name="permdesc_receiveBootCompleted" product="tv" msgid="4900842256047614307">"यह ऐप्लिकेशन को सिस्टम के शुरू होने की प्रक्रिया पूरा होते ही अपने आप चालू होने की अनुमति देता है. इससे आपके Android TV डिवाइस को चालू होने में ज़्यादा समय लग सकता है और ऐप्लिकेशन के हमेशा चालू रहने की वजह से आपके टीवी की परफ़ॉर्मेंस पर असर पड़ सकता है."</string> <string name="permdesc_receiveBootCompleted" product="default" msgid="7912677044558690092">"सिस्टम के चालू होते ही ऐप को अपने आप शुरू होने देती है. इससे फ़ोन को चालू होने में ज़्यादा समय लग सकता है और ऐप के लगातार चलते रहने से पूरा फ़ोन धीमा हो सकता है."</string> <string name="permlab_broadcastSticky" msgid="4552241916400572230">"स्टिकी प्रसारण भेजें"</string> - <string name="permdesc_broadcastSticky" product="tablet" msgid="5058486069846384013">"ऐप्स को स्टिकी प्रसारण भेजने देता है, जो प्रसारण खत्म होने के बाद भी बने रहते हैं. अत्यधिक उपयोग, टैबलेट की बहुत ज़्यादा मेमोरी का उपयोग करके उसे धीमा या अस्थिर कर सकता है."</string> + <string name="permdesc_broadcastSticky" product="tablet" msgid="5058486069846384013">"ऐप्स को स्टिकी प्रसारण भेजने देता है, जो प्रसारण खत्म होने के बाद भी बने रहते हैं. अत्यधिक उपयोग, टैबलेट की बहुत ज़्यादा स्टोरेज का उपयोग करके उसे धीमा या अस्थिर कर सकता है."</string> <string name="permdesc_broadcastSticky" product="tv" msgid="2338185920171000650">"यह ऐप्लिकेशन को स्टिकी ब्रॉडकास्ट भेजने की अनुमति देता है जो ब्रॉडकास्ट खत्म होने के बाद भी बने रहते हैं. इस सुविधा के ज़्यादा इस्तेमाल से आपके Android TV डिवाइस की मेमोरी कम हो सकती है जिससे टीवी की परफ़ॉर्मेंस पर असर पड़ सकता है और उसे इस्तेमाल करने में समस्याएं आ सकती हैं."</string> - <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"ऐप्स को स्टिकी प्रसारण भेजने देता है, जो प्रसारण खत्म होने के बाद भी बने रहते हैं. अत्यधिक उपयोग, फ़ोन की बहुत ज़्यादा मेमोरी का उपयोग करके उसे धीमा या अस्थिर कर सकता है."</string> + <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"ऐप्स को स्टिकी प्रसारण भेजने देता है, जो प्रसारण खत्म होने के बाद भी बने रहते हैं. अत्यधिक उपयोग, फ़ोन की बहुत ज़्यादा स्टोरेज का उपयोग करके उसे धीमा या अस्थिर कर सकता है."</string> <string name="permlab_readContacts" msgid="8776395111787429099">"अपने संपर्क पढ़ें"</string> <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"यह ऐप्लिकेशन को आपके टैबलेट पर मौजूद संपर्कों का डेटा देखने की अनुमति देता है. ऐप्लिकेशन को आपके टैबलेट पर मौजूद उन खातों को ऐक्सेस करने की अनुमति भी होगी जिनसे संपर्क बनाए गए हैं. इसमें वे खाते भी शामिल हो सकते हैं जिन्हें आपके इंस्टॉल किए हुए ऐप्लिकेशन ने बनाया है. इस अनुमति के बाद, ऐप्लिकेशन आपके संपर्कों का डेटा सेव कर सकते हैं. हालांकि, नुकसान पहुंचाने वाले ऐप्लिकेशन, आपको बताए बिना ही संपर्कों का डेटा शेयर कर सकते हैं."</string> <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"यह ऐप्लिकेशन को आपके Android TV डिवाइस पर सेव किए संपर्कों का डेटा देखने की अनुमति देता है. ऐप्लिकेशन को आपके Android TV डिवाइस पर मौजूद उन खातों को ऐक्सेस करने की अनुमति भी होगी जिनसे संपर्क बनाए गए हैं. इसमें वे खाते भी शामिल हो सकते हैं जिन्हें आपके इंस्टॉल किए हुए ऐप्लिकेशन ने बनाया है. इस अनुमति के बाद, ऐप्लिकेशन आपके संपर्कों का डेटा सेव कर सकते हैं. हालांकि, नुकसान पहुंचाने वाले ऐप्लिकेशन, आपको बताए बिना ही संपर्कों का डेटा शेयर कर सकते हैं."</string> @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"कोई फ़िंगरप्रिंट रजिस्टर नहीं किया गया है."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"इस डिवाइस में फ़िंगरप्रिंट सेंसर नहीं है."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"सेंसर कुछ समय के लिए बंद कर दिया गया है."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"फ़िंगरप्रिंट सेंसर इस्तेमाल नहीं किया जा सकता. रिपेयर की सेवा देने वाली कंपनी से संपर्क करें"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"फ़िंगरप्रिंट <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"फ़िंगरप्रिंट इस्तेमाल करें"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"फ़िंगरप्रिंट या स्क्रीन लॉक का क्रेडेंशियल इस्तेमाल करें"</string> @@ -613,18 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"फ़िंगरप्रिंट आइकॉन"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"फ़ेस अनलॉक"</string> - <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"फ़ेस अनलॉक के साथ कोई समस्या है"</string> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"फ़ेस अनलॉक से जुड़ी समस्या"</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"अपने चेहरे का मॉडल मिटाने के लिए टैप करें. इसके बाद, अपना चेहरा फिर से रजिस्टर करें"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"फे़स अनलॉक की सुविधा सेट अप करें"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"अपने फ़ोन की तरफ़ देखकर उसे अनलॉक करें"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"फ़ोन को अनलॉक करने के दूसरे तरीके सेट अप करें"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"फ़िंगरप्रिंट जोड़ने के लिए टैप करें"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"फ़िंगरप्रिंट अनलॉक"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"फ़िंगरप्रिंट सेंसर इस्तेमाल नहीं किया जा सकता"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"फ़िंगरप्रिंट सेंसर को रिपेयर करने की सेवा देने वाली कंपनी से संपर्क करें."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"चेहरे से जुड़ा सटीक डेटा कैप्चर नहीं किया जा सका. फिर से कोशिश करें."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"बहुत रोशनी है. हल्की रोशनी आज़माएं."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"बहुत अंधेरा है. बेहतर रोशनी में आज़माएं."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 08699ecf7f4e..1a4723c8612a 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Nincsenek regisztrált ujjlenyomatok."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Ez az eszköz nem rendelkezik ujjlenyomat-érzékelővel."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Az érzékelő átmenetileg le van tiltva."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Nem lehet használni az ujjlenyomat-érzékelőt. Keresse fel a szervizt."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>. ujj"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Ujjlenyomat használata"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"A folytatás ujjlenyomattal vagy képernyőzárral lehetséges"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Feloldhatja a zárolást úgy, hogy ránéz a telefonra"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"További feloldási módszerek beállítása"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Koppintson ide ujjlenyomat hozzáadásához"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Feloldás ujjlenyomattal"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Nem lehet használni az ujjlenyomat-érzékelőt"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Keresse fel a szervizt."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Sikertelen az arc pontos rögzítése. Próbálja újra."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Túl világos. Próbálja kevésbé erős világítással."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Túl sötét. Próbálja jobb megvilágítás mellett."</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 4e6ee682e4f8..3429d8b323b8 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Tidak ada sidik jari yang terdaftar."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Perangkat ini tidak memiliki sensor sidik jari."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensor dinonaktifkan untuk sementara."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Tidak dapat menggunakan sensor sidik jari. Kunjungi penyedia reparasi"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Jari <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Gunakan sidik jari"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Gunakan sidik jari atau kunci layar"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Buka kunci ponsel dengan melihat ke ponsel"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Siapkan lebih banyak cara untuk membuka kunci"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Ketuk untuk menambahkan sidik jari"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Fingerprint Unlock"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Tidak dapat menggunakan sensor sidik jari"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Kunjungi penyedia reparasi."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Tidak bisa mengambil data wajah akurat. Coba lagi."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Terlalu terang. Coba cahaya yang lebih lembut."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Terlalu gelap. Coba pencahayaan yang lebih cerah."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 5aacfa719213..874d56dfe6b5 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -608,8 +608,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"לא נסרקו טביעות אצבע."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"במכשיר הזה אין חיישן טביעות אצבע."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"החיישן מושבת באופן זמני."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"לא ניתן להשתמש בחיישן טביעות האצבע. צריך ליצור קשר עם ספק תיקונים"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"אצבע <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"שימוש בטביעת אצבע"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"שימוש בטביעת אצבע או בנעילת מסך"</string> @@ -625,12 +624,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"יש להביט בטלפון כדי לבטל את נעילתו"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"אפשר להגדיר דרכים נוספות לביטול נעילה"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"יש להקיש כדי להוסיף טביעת אצבע"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ביטול הנעילה בטביעת אצבע"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"לא ניתן להשתמש בחיישן טביעות האצבע"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"צריך ליצור קשר עם ספק תיקונים."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"לא ניתן היה לקלוט את הפנים במדויק. יש לנסות שוב."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"בהירה מדי. צריך תאורה עדינה יותר."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"התמונה חשוכה מדי. צריך תאורה חזקה יותר."</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 8a68fb923e87..d6950deee99c 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"თითის ანაბეჭდები რეგისტრირებული არ არის."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ამ მოწყობილობას არ აქვს თითის ანაბეჭდის სენსორი."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"სენსორი დროებით გათიშულია."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"თითის ანაბეჭდის სენსორის გამოყენება ვერ ხერხდება. ეწვიეთ შეკეთების სერვისის პროვაიდერს"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"თითი <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"გამოიყენეთ თითის ანაბეჭდი"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"გამოიყენეთ თითის ანაბეჭდი ან ეკრანის დაბლოკვა"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"განბლოკეთ თქვენი ტელეფონი შეხედვით"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"დააყენეთ განბლოკვის სხვა ხერხები"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"შეეხეთ თითის ანაბეჭდის დასამატებლად"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"თითის ანაბეჭდით განბლოკვა"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"თითის ანაბეჭდის სენსორის გამოყენება ვერ ხერხდება"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ეწვიეთ შეკეთების სერვისის პროვაიდერს."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"სახის ზუსტი მონაცემები არ აღიბეჭდა. ცადეთ ხელახლა."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"მეტისმეტად ნათელია. ცადეთ უფრო სუსტი განათება."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"მეტისმეტად ბნელია. ცადეთ უფრო ძლიერი განათება."</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index df6a2aafe4e3..9a283e6d2735 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Саусақ іздері тіркелмеген."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Бұл құрылғыда саусақ ізін оқу сканері жоқ."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Датчик уақытша өшірулі."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Саусақ ізін оқу сканерін пайдалану мүмкін емес. Жөндеу қызметіне барыңыз."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>-саусақ"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Саусақ ізін пайдалану"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Саусақ ізін немесе экран құлпын пайдалану"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Телефоныңызға қарап, оның құлпын ашыңыз."</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Құлыпты ашудың басқа тәсілдерін реттеу"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Саусақ ізін қосу үшін түртіңіз."</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Құлыпты саусақ ізімен ашу"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Саусақ ізін оқу сканерін пайдалану мүмкін емес"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Жөндеу қызметіне барыңыз."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Бет деректері дұрыс алынбады. Әрекетті қайталаңыз."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Тым ашық. Күңгірттеу жарық керек."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Тым қараңғы. Молырақ жарық керек."</string> @@ -2103,7 +2099,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"Жарайды"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Өшіру"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Толығырақ"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Android 12 жүйесінде кеңейтілген хабарландырулар функциясы бейімделетін хабарландырулар функциясын алмастырды. Бұл функция ұсынылған әрекеттер мен жауаптарды көрсетіп, хабарландыруларыңызды ретке келтіреді.\n\nОл хабарландыру мазмұнын, соның ішінде жеке ақпаратыңызды (мысалы, контакт аттары мен хабарлар) пайдалана алады. Сондай-ақ бұл функция арқылы хабарландыруларды жабуға немесе оларға жауап беруге (мысалы, телефон қоңырауларына жауап беру және \"Мазаламау\" режимін басқару) болады."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"Android 12 жүйесінде кеңейтілген хабарландырулар функциясы бейімделетін хабарландырулар функциясын алмастырды. Бұл функция ұсынылған әрекеттер мен жауаптарды көрсетіп, хабарландыруларыңызды ретке келтіреді.\n\nОл хабарландыру мазмұнын, соның ішінде жеке ақпаратыңызды (мысалы, контакт аттары мен хабарлар) пайдалана алады. Сондай-ақ бұл функция арқылы хабарландыруларды жабуға немесе оларға жауап беруге (мысалы, телефон қоңырауларына жауап беру және Мазаламау режимін басқару) болады."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Режим туралы хабарландыру"</string> <string name="dynamic_mode_notification_title" msgid="9205715501274608016">"Батарея заряды азаюы мүмкін"</string> <string name="dynamic_mode_notification_summary" msgid="4141614604437372157">"Батарея ұзаққа жетуі үшін, Батареяны үнемдеу режимі іске қосылды"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 1bf8625697af..edbd547371ce 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"មិនមានការចុះឈ្មោះស្នាមម្រាមដៃទេ។"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ឧបករណ៍នេះមិនមានឧបករណ៍ចាប់ស្នាមម្រាមដៃទេ។"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"បានបិទឧបករណ៍ចាប់សញ្ញាជាបណ្តោះអាសន្ន។"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"មិនអាចប្រើឧបករណ៍ចាប់ស្នាមម្រាមដៃបានទេ។ សូមទាក់ទងក្រុមហ៊ុនផ្ដល់ការជួសជុល"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"ម្រាមដៃ <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ប្រើស្នាមម្រាមដៃ"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ប្រើស្នាមម្រាមដៃ ឬការចាក់សោអេក្រង់"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"ដោះសោទូរសព្ទរបស់អ្នកដោយសម្លឹងមើលវា"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"រៀបចំវិធីច្រើនទៀតដើម្បីដោះសោ"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"ចុចដើម្បីបញ្ចូលស្នាមម្រាមដៃ"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ការដោះសោដោយប្រើស្នាមម្រាមដៃ"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"មិនអាចប្រើឧបករណ៍ចាប់ស្នាមម្រាមដៃបានទេ"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ទាក់ទងក្រុមហ៊ុនផ្ដល់ការជួសជុល។"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"មិនអាចថតទិន្នន័យទម្រង់មុខបានត្រឹមត្រូវទេ។ សូមព្យាយាមម្ដងទៀត។"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"ភ្លឺពេក។ សូមសាកល្បងប្រើពន្លឺស្រាលជាងនេះ។"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"ងងឹតជ្រុល។ សូមសាកល្បងប្រើពន្លឺភ្លឺជាងនេះ។"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 1a394ace8f4f..21725539722a 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -228,7 +228,7 @@ <string name="reboot_to_update_prepare" msgid="6978842143587422365">"ಅಪ್ಡೇಟೇ ಮಾಡಲು ಸಿದ್ಧಪಡಿಸಲಾಗುತ್ತಿದೆ..."</string> <string name="reboot_to_update_package" msgid="4644104795527534811">"ಅಪ್ಡೇಟ್ ಪ್ಯಾಕೇಜ್ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</string> <string name="reboot_to_update_reboot" msgid="4474726009984452312">"ಮರುಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string> - <string name="reboot_to_reset_title" msgid="2226229680017882787">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ"</string> + <string name="reboot_to_reset_title" msgid="2226229680017882787">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್"</string> <string name="reboot_to_reset_message" msgid="3347690497972074356">"ಮರುಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string> <string name="shutdown_progress" msgid="5017145516412657345">"ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತಿದೆ…"</string> <string name="shutdown_confirm" product="tablet" msgid="2872769463279602432">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತದೆ."</string> @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"ಯಾವುದೇ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ನು ನೋಂದಣಿ ಮಾಡಿಲ್ಲ."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ಈ ಸಾಧನವು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"ಸೆನ್ಸಾರ್ ಅನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ರಿಪೇರಿ ಮಾಡುವವರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"ಫಿಂಗರ್ <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸಿ"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅಥವಾ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸಿ"</string> @@ -613,20 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಐಕಾನ್"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"ಫೇಸ್ ಅನ್ಲಾಕ್"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಕುರಿತು ಸಮಸ್ಯೆ ಇದೆ"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"ನಿಮ್ಮ ಫೇಸ್ ಮಾಡೆಲ್ ಅನ್ನು ಅಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ನಿಮ್ಮ ಫೇಸ್ ಮಾಡೆಲ್ ಅನ್ನು ಪುನಃ ಸೇರಿಸಿ"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"ಫೋನ್ ಅನ್ನು ನೋಡುವ ಮೂಲಕ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಹೆಚ್ಚಿನ ಮಾರ್ಗಗಳನ್ನು ಹೊಂದಿಸಿ"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಸೇರಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ರಿಪೇರಿ ಮಾಡುವವರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"ಸರಿಯಾಗಿ ಮುಖ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಲಾಗಲಿಲ್ಲ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"ತುಂಬಾ ಪ್ರಕಾಶಮಾನವಾಗಿದೆ ಮಂದ ಪ್ರಕಾಶಮಾನವಿರುವ ಲೈಟ್ ಬಳಸಿ"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"ತುಂಬಾ ಕಪ್ಪು ಛಾಯೆಯಿದೆ. ಪ್ರಕಾಶಮಾನವಾದ ಲೈಟಿಂಗ್ ಬಳಸಿ."</string> @@ -743,9 +737,9 @@ <string name="policylab_forceLock" msgid="7360335502968476434">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಮಾಡಿ"</string> <string name="policydesc_forceLock" msgid="1008844760853899693">"ಪರದೆಯು ಯಾವಾಗ ಮತ್ತು ಹೇಗೆ ಲಾಕ್ ಆಗಬೇಕೆಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಿ."</string> <string name="policylab_wipeData" msgid="1359485247727537311">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string> - <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆಯನ್ನು ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆಯನ್ನು ನೀಡದೆಯೇ ಟ್ಯಾಬ್ಲೆಟ್ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> - <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆ ಮಾಡುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆ ಇಲ್ಲದೆ ನಿಮ್ಮ Android TV ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕುತ್ತದೆ."</string> - <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆಯನ್ನು ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆಯನ್ನು ನೀಡದೆಯೇ ಫೋನ್ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> + <string name="policydesc_wipeData" product="tablet" msgid="7245372676261947507">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್ ಅನ್ನು ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆಯನ್ನು ನೀಡದೆಯೇ ಟ್ಯಾಬ್ಲೆಟ್ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> + <string name="policydesc_wipeData" product="tv" msgid="513862488950801261">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್ ಮಾಡುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆ ಇಲ್ಲದೆ ನಿಮ್ಮ Android TV ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕುತ್ತದೆ."</string> + <string name="policydesc_wipeData" product="default" msgid="8036084184768379022">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ರೀಸೆಟ್ ಅನ್ನು ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆಯನ್ನು ನೀಡದೆಯೇ ಫೋನ್ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> <string name="policylab_wipeData_secondaryUser" msgid="413813645323433166">"ಬಳಕೆದಾರ ಡೇಟಾ ಅಳಿಸಿ"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="2336676480090926470">"ಯಾವುದೇ ಸೂಚನೆ ಇಲ್ಲದೆ ಈ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಈ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಿ."</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2293713284515865200">"ಎಚ್ಚರಿಕೆ ಇಲ್ಲದೆ ಈ Android TV ಸಾಧನದಲ್ಲಿನ ಈ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕುತ್ತದೆ."</string> @@ -923,9 +917,9 @@ <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3069635524964070596">"ನಿಮ್ಮ ಅನ್ಲಾಕ್ ನಮೂನೆಯನ್ನು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಚಿತ್ರಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ವಿಫಲ ಪ್ರಯತ್ನಗಳನ್ನು ಮಾಡಿರುವಿರಿ, Google ಸೈನ್ ಇನ್ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮನ್ನು ಕೇಳಲಾಗುತ್ತದೆ.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="6399092175942158529">"ನಿಮ್ಮ ಅನ್ಲಾಕ್ ನಮೂನೆಯನ್ನು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಚಿತ್ರಿಸಿರುವಿರಿ. ಇನ್ನೂ <xliff:g id="NUMBER_1">%2$d</xliff:g> ಬಾರಿಯ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ನಿಮ್ಮ Google ಸೈನ್ ಇನ್ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮನ್ನು ಕೇಳಲಾಗುತ್ತದೆ.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="5691623136957148335">"ನಿಮ್ಮ ಅನ್ಲಾಕ್ ನಮೂನೆಯನ್ನು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಚಿತ್ರಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ವಿಫಲ ಪ್ರಯತ್ನಗಳನ್ನು ಮಾಡಿರುವಿರಿ, Google ಸೈನ್ ಇನ್ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮನ್ನು ಕೇಳಲಾಗುತ್ತದೆ.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> - <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="7914445759242151426">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> - <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="4275591249631864248">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಬಾರಿಯ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> - <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="1166532464798446579">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ಫೋನ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="7914445759242151426">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="4275591249631864248">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಬಾರಿಯ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="1166532464798446579">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ಫೋನ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="8682445539263683414">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಇದೀಗ ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="2205435033340091883">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಇದೀಗ ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="2203704707679895487">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. ಫೋನ್ ಅನ್ನು ಇದೀಗ ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> @@ -1681,9 +1675,9 @@ <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="23741434207544038">"ನಿಮ್ಮ ಪಿನ್ ಅನ್ನು ನೀವು <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="3328686432962224215">"ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ನೀವು <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="7357404233979139075">"ನಿಮ್ಮ ಅನ್ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಚಿತ್ರಿಸಿರುವಿರಿ. \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> - <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="3479940221343361587">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಕ್ಕೂ ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ಬಳಿಕ, ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> - <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="9064457748587850217">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಬಾರಿಯ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> - <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="5955398963754432548">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಕ್ಕೂ ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ಫೋನ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಬಳಕೆದಾರರ ಎಲ್ಲಾ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="3479940221343361587">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಕ್ಕೂ ಹೆಚ್ಚಿನ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ಬಳಿಕ, ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="9064457748587850217">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER_0">%1$d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. <xliff:g id="NUMBER_1">%2$d</xliff:g> ಬಾರಿಯ ವಿಫಲ ಪ್ರಯತ್ನಗಳ ನಂತರ, ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="5955398963754432548">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <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_wiping" product="tablet" msgid="2299099385175083308">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಇದೀಗ ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="5045460916106267585">"ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಇದೀಗ ನಿಮ್ಮ Android TV ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್ಗೆ ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="5043730590446071189">"ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ. ಫೋನ್ ಅನ್ನು ಇದೀಗ ಫ್ಯಾಕ್ಟರಿ ಢೀಫಾಲ್ಟ್ಗೆ ಮರು ಹೊಂದಿಸಲಾಗುತ್ತದೆ."</string> @@ -1930,7 +1924,7 @@ <string name="zen_mode_default_events_name" msgid="2280682960128512257">"ಈವೆಂಟ್"</string> <string name="zen_mode_default_every_night_name" msgid="1467765312174275823">"ನಿದ್ರೆಯ ಸಮಯ"</string> <string name="muted_by" msgid="91464083490094950">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಧ್ವನಿ ಮ್ಯೂಟ್ ಮಾಡುತ್ತಿದ್ದಾರೆ"</string> - <string name="system_error_wipe_data" msgid="5910572292172208493">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ ಹಾಗೂ ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾವನ್ನು ಮರುಹೊಂದಿಸುವರೆಗೂ ಅದು ಅಸ್ಥಿರವಾಗಬಹುದು."</string> + <string name="system_error_wipe_data" msgid="5910572292172208493">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ ಹಾಗೂ ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾವನ್ನು ರೀಸೆಟ್ ಮಾಡುವವರೆಗೂ ಅದು ಅಸ್ಥಿರವಾಗಬಹುದು."</string> <string name="system_error_manufacturer" msgid="703545241070116315">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ. ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="stk_cc_ussd_to_dial" msgid="3139884150741157610">"USSD ವಿನಂತಿಯನ್ನು ಸಾಮಾನ್ಯ ಕರೆಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string> <string name="stk_cc_ussd_to_ss" msgid="4826846653052609738">"USSD ವಿನಂತಿಯನ್ನು SS ವಿನಂತಿಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index a762a859942e..9df09b494099 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"등록된 지문이 없습니다."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"기기에 지문 센서가 없습니다."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"센서가 일시적으로 사용 중지되었습니다."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"지문 센서를 사용할 수 없습니다. 수리업체에 방문하세요."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"손가락 <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"지문 사용"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"지문 또는 화면 잠금 사용"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"휴대전화의 화면을 응시하여 잠금 해제할 수 있습니다."</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"다른 잠금 해제 방법 설정"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"지문을 추가하려면 탭하세요."</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"지문 잠금 해제"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"지문 센서를 사용할 수 없음"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"수리업체에 방문하세요."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"정확한 얼굴 데이터를 캡처하지 못했습니다. 다시 시도하세요."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"너무 밝습니다. 조명 밝기를 조금 낮춰보세요."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"너무 어둡습니다. 조명을 밝게 해 보세요."</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 820a79cbe4ef..fb79335fd289 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Бир да манжа изи катталган эмес."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Бул түзмөктө манжа изинин сенсору жок."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Сенсор убактылуу өчүрүлгөн."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Манжа изинин сенсорун колдонууга болбойт. Тейлөө кызматына кайрылыңыз"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>-манжа"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Манжа изин колдонуу"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Манжа изин же экрандын кулпусун колдонуу"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Телефонуңузду карап туруп эле кулпусун ачып алыңыз"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Кулпусун ачуунун көбүрөөк жолдорун жөндөңүз"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Манжа изин кошуу үчүн басыңыз"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Кулпуланган түзмөктү манжа изи менен ачуу"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Манжа изинин сенсорун колдонууга болбойт"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Тейлөө кызматына кайрылыңыз."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Жүзүңүз жакшы тартылган жок. Кайталап көрүңүз."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Өтө жарык. Жарыктыкты азайтып көрүңүз."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Өтө караңгы. Жарыгыраак жерден тартып көрүңүз."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 451683c51066..c76c8119f1a3 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -608,8 +608,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Neužregistruota jokių kontrolinių kodų."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Šiame įrenginyje nėra kontrolinio kodo jutiklio."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Jutiklis laikinai išjungtas."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Negalima naudoti kontrolinio kodo jutiklio. Apsilankykite pas taisymo paslaugos teikėją"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g> pirštas"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Naudoti kontrolinį kodą"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Naudoti kontrolinį kodą arba ekrano užraktą"</string> @@ -625,12 +624,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Atrakinkite telefoną pažiūrėję į jį"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Daugiau atrakinimo metodų nustatymas"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Palieskite, kad pridėtumėte kontrolinį kodą"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Atrakinimas kontroliniu kodu"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Negalima naudoti kontrolinio kodo jutiklio"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Apsilankykite pas taisymo paslaugos teikėją."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Neužfiks. tikslūs veido duom. Bandykite dar kartą."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Per šviesu. Išbandykite mažesnį apšvietimą."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Per tamsu. Išbandykite šviesesnį apšvietimą."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index a00523c2754d..c787e508702a 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -605,8 +605,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Nav reģistrēts neviens pirksta nospiedums."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Šajā ierīcē nav pirksta nospieduma sensora."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensors ir īslaicīgi atspējots."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Nevar izmantot pirksta nospieduma sensoru. Sazinieties ar remonta pakalpojumu sniedzēju."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>. pirksts"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Pirksta nospieduma izmantošana"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Pirksta nospieduma vai ekrāna bloķēšanas metodes izmantošana"</string> @@ -622,12 +621,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Atbloķējiet tālruni, skatoties uz to"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Citi atbloķēšanas veidi"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Pieskarieties, lai pievienotu pirksta nospiedumu"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Autorizācija ar pirksta nospiedumu"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Nevar izmantot pirksta nospieduma sensoru"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Sazinieties ar remonta pakalpojumu sniedzēju."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Neizdevās tvert sejas datus. Mēģiniet vēlreiz."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Pārāk spilgts. Izmēģiniet maigāku apgaismojumu."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Pārāk tumšs. Izmēģiniet spožāku apgaismojumu."</string> diff --git a/core/res/res/values-mcc310-mnc030-eu/strings.xml b/core/res/res/values-mcc310-mnc030-eu/strings.xml index 936ec1e61c92..45ce09126146 100644 --- a/core/res/res/values-mcc310-mnc030-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc030-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="656054059094417927">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="656054059094417927">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="1782569305985001089">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="8246632898824321280">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc170-eu/strings.xml b/core/res/res/values-mcc310-mnc170-eu/strings.xml index 7cffce7be690..76e30b01c29d 100644 --- a/core/res/res/values-mcc310-mnc170-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc170-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="5424518490295341205">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="5424518490295341205">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="3527626511418944853">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="3948912590657398489">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc280-eu/strings.xml b/core/res/res/values-mcc310-mnc280-eu/strings.xml index a2f013028b68..fbf70441fe4c 100644 --- a/core/res/res/values-mcc310-mnc280-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc280-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="1070849538022865416">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="1070849538022865416">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="499832197298480670">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="2346111479504469688">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc380-eu/strings.xml b/core/res/res/values-mcc310-mnc380-eu/strings.xml index 0f2ae51bbb43..c3fb1bc649d4 100644 --- a/core/res/res/values-mcc310-mnc380-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc380-eu/strings.xml @@ -20,6 +20,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="6178029798083341927">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="6178029798083341927">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="6084322234976891423">"Ez da onartzen SIM txartela MM#3"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc410-eu/strings.xml b/core/res/res/values-mcc310-mnc410-eu/strings.xml index a41129a3c189..b023bccae8b4 100644 --- a/core/res/res/values-mcc310-mnc410-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc410-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="8861901652350883183">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="8861901652350883183">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="2604694337529846283">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="3099618295079374317">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc560-eu/strings.xml b/core/res/res/values-mcc310-mnc560-eu/strings.xml index 5f1e1fff4e0a..a0a46f666782 100644 --- a/core/res/res/values-mcc310-mnc560-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc560-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="3526528316378889524">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="3526528316378889524">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="4618730283812066268">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="8522039751358990401">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc310-mnc950-eu/strings.xml b/core/res/res/values-mcc310-mnc950-eu/strings.xml index 355b55130bcb..5a34371f80c7 100644 --- a/core/res/res/values-mcc310-mnc950-eu/strings.xml +++ b/core/res/res/values-mcc310-mnc950-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="615419724607901560">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="615419724607901560">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="7801541624846497489">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="7066936962628406316">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-mcc311-mnc180-eu/strings.xml b/core/res/res/values-mcc311-mnc180-eu/strings.xml index f5d7afbe5ac1..d843c4fa4f19 100644 --- a/core/res/res/values-mcc311-mnc180-eu/strings.xml +++ b/core/res/res/values-mcc311-mnc180-eu/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="mmcc_imsi_unknown_in_hlr" msgid="604133804161351810">"Ez dago SIM txartelik MM#2"</string> + <string name="mmcc_imsi_unknown_in_hlr" msgid="604133804161351810">"Ez dago SIMik MM#2"</string> <string name="mmcc_illegal_ms" msgid="4073997279280371621">"Ez da onartzen SIM txartela MM#3"</string> <string name="mmcc_illegal_me" msgid="4936539345546223576">"Telefonoa ez da onartzen MM#6"</string> </resources> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 8c6565e64bc3..2274cda930f0 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"വിരലടയാളങ്ങൾ എൻറോൾ ചെയ്തിട്ടില്ല."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ഈ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസറില്ല."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"സെൻസർ താൽക്കാലികമായി പ്രവർത്തനരഹിതമാക്കി."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"വിരലടയാള സെൻസർ ഉപയോഗിക്കാനാകുന്നില്ല. റിപ്പയർ കേന്ദ്രം സന്ദർശിക്കുക"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"ഫിംഗർ <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ഫിംഗർപ്രിന്റ് അല്ലെങ്കിൽ സ്ക്രീൻ ലോക്ക് ഉപയോഗിക്കുക"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"ഫോണിലേക്ക് നോക്കി അത് അൺലോക്ക് ചെയ്യുക"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"അൺലോക്ക് ചെയ്യുന്നതിനുള്ള കൂടുതൽ വഴികൾ സജ്ജീകരിക്കുക"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"ഫിംഗർപ്രിന്റ് ചേർക്കാൻ ടാപ്പ് ചെയ്യുക"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ഫിംഗർപ്രിന്റ് അൺലോക്ക്"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"വിരലടയാള സെൻസർ ഉപയോഗിക്കാനാകുന്നില്ല"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"റിപ്പയർ കേന്ദ്രം സന്ദർശിക്കുക."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"കൃത്യ മുഖ ഡാറ്റ എടുക്കാനായില്ല. വീണ്ടും ശ്രമിക്കൂ."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"വളരെയധികം തെളിച്ചം. സൗമ്യതയേറിയ പ്രകാശം ശ്രമിക്കൂ."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"വളരെ ഇരുണ്ടത്. തിളക്കമേറിയ ലൈറ്റിംഗ് പരീക്ഷിക്കുക."</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index e699ebea3415..095c3d320d59 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Tiada cap jari didaftarkan."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Peranti ini tiada penderia cap jari."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Penderia dilumpuhkan sementara."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Tidak boleh menggunakan penderia cap jari. Lawati penyedia pembaikan"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Jari <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Gunakan cap jari"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Gunakan cap jari atau kunci skrin"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Buka kunci telefon anda dengan melihat telefon anda"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Sediakan lebih banyak cara untuk membuka kunci"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Ketik untuk menambahkan cap jari"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Buka Kunci Cap Jari"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Tidak boleh menggunakan penderia cap jari"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Lawati penyedia pembaikan."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Gagal menangkap data wajah dgn tepat. Cuba lagi."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Terlalu terang. Cuba pencahayaan yang lebih lembut."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Terlalu gelap. Cuba pencahayaan yang lebih cerah."</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index f0b5b0fead76..bcd4ace5bad8 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"မည်သည့် လက်ဗွေကိုမျှ ထည့်သွင်းမထားပါ။"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ဤစက်တွင် လက်ဗွေအာရုံခံကိရိယာ မရှိပါ။"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"အာရုံခံကိရိယာကို ယာယီပိတ်ထားသည်။"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"လက်ဗွေ အာရုံခံကိရိယာကို အသုံးပြု၍ မရပါ။ ပြုပြင်ရေး ဝန်ဆောင်မှုပေးသူထံသို့ သွားပါ"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"လက်ချောင်း <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"လက်ဗွေ သုံးခြင်း"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"လက်ဗွေ (သို့) ဖန်သားပြင်လော့ခ်ချခြင်းကို သုံးခြင်း"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"သင့်ဖုန်းကိုကြည့်၍ သော့ဖွင့်ပါ"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"သော့ဖွင့်ရန် နောက်ထပ်နည်းလမ်းများကို စနစ်ထည့်သွင်းပါ"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"လက်ဗွေထည့်ရန် တို့ပါ"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"လက်ဗွေ အာရုံခံကိရိယာကို အသုံးပြု၍ မရပါ"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ပြုပြင်ရေး ဝန်ဆောင်မှုပေးသူထံသို့ သွားပါ။"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"မျက်နှာဒေတာ အမှန် မရိုက်ယူနိုင်ပါ၊ ထပ်စမ်းကြည့်ပါ။"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"အလွန် လင်းသည်။ အလင်းလျှော့ကြည့်ပါ။"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"အလွန်မှောင်သည်။ ပိုလင်းအောင် လုပ်ကြည့်ပါ။"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 929d032edc27..69c803dab365 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"कुनै पनि फिंगरप्रिन्ट दर्ता गरिएको छैन।"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"यो डिभाइसमा कुनै पनि फिंगरप्रिन्ट सेन्सर छैन।"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"केही समयका लागि सेन्सर असक्षम पारियो।"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"फिंगरप्रिन्ट सेन्सर प्रयोग गर्न मिल्दैन। फिंगरप्रिन्ट सेन्सर मर्मत गर्ने सेवा प्रदायक कम्पनीमा सम्पर्क गर्नुहोस्"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"औंला <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"फिंगरप्रिन्ट प्रयोग गर्नुहोस्"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"फिंगरप्रिन्ट वा स्क्रिन लक प्रयोग गर्नुहोस्"</string> @@ -613,20 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"फिंगरप्रिन्ट आइकन"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"फेस अनलक"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"फेस अनलक सुविधामा अनुहार दर्ता गर्ने क्रममा त्रुटि भयो"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"आफ्नो फेस मोडेल मेटाउन ट्याप गर्नुहोस् अनि आफ्नो अनुहार फेरि दर्ता गर्नुहोस्"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"फेस अनलक सेटअप गर्नुहोस्"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"फोनमा हेरेकै भरमा फोन अनलक गर्नुहोस्"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"अनलक गर्ने अन्य तरिकाहरू सेटअप गर्नुहोस्"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"फिंगरप्रिन्ट हाल्न ट्याप गर्नुहोस्"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"फिंगरप्रिन्ट अनलक"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"फिंगरप्रिन्ट सेन्सर प्रयोग गर्न मिल्दैन"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"फिंगरप्रिन्ट सेन्सर मर्मत गर्ने सेवा प्रदायक कम्पनीमा सम्पर्क गर्नुहोस्।"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"अनुहारको सटीक डेटा खिच्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"ज्यादै चम्किलो। अझ मधुरो प्रकाश प्रयोग गरी हेर्नु…"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"ज्यादै अँध्यारो छ। अझ बढी प्रकाशमा गई हेर्नुहोस्"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 74012129e2b4..867bb85ccae6 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1717,7 +1717,7 @@ <string name="leave_accessibility_shortcut_on" msgid="6543362062336990814">"Sneltoets gebruiken"</string> <string name="color_inversion_feature_name" msgid="326050048927789012">"Kleurinversie"</string> <string name="color_correction_feature_name" msgid="3655077237805422597">"Kleurcorrectie"</string> - <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Bediening met één hand"</string> + <string name="one_handed_mode_feature_name" msgid="2334330034828094891">"Bediening met 1 hand"</string> <string name="reduce_bright_colors_feature_name" msgid="3222994553174604132">"Extra gedimd"</string> <string name="accessibility_shortcut_enabling_service" msgid="5473495203759847687">"Volumetoetsen ingedrukt gehouden. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> staat aan."</string> <string name="accessibility_shortcut_disabling_service" msgid="8675244165062700619">"Volumetoetsen ingedrukt gehouden. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> staat uit."</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 005d9ccc212f..277e0a5d161c 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -585,8 +585,7 @@ <string name="fingerprint_acquired_already_enrolled" msgid="2285166003936206785">"ଅନ୍ୟ ଏକ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ"</string> <string name="fingerprint_acquired_too_bright" msgid="3863560181670915607">"ବହୁତ ଉଜ୍ଜ୍ୱଳ"</string> <string name="fingerprint_acquired_try_adjusting" msgid="3667006071003809364">"ଆଡଜଷ୍ଟ କରି ଦେଖନ୍ତୁ"</string> - <!-- no translation found for fingerprint_acquired_immobile (1621891895241888048) --> - <skip /> + <string name="fingerprint_acquired_immobile" msgid="1621891895241888048">"ପ୍ରତି ଥର ଆପଣଙ୍କ ଆଙ୍ଗୁଠିର ସ୍ଥାନ ସାମାନ୍ୟ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string> <string-array name="fingerprint_acquired_vendor"> </string-array> <string name="fingerprint_authenticated" msgid="2024862866860283100">"ଟିପଚିହ୍ନ ପ୍ରମାଣିତ ହେଲା"</string> @@ -603,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"କୌଣସି ଆଙ୍ଗୁଠି ଚିହ୍ନ ପଞ୍ଜୀକୃତ ହୋଇନାହିଁ।"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"ଏହି ଡିଭାଇସ୍ରେ ଟିପଚିହ୍ନ ସେନ୍ସର୍ ନାହିଁ।"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"ସେନ୍ସରକୁ ଅସ୍ଥାୟୀ ଭାବେ ଅକ୍ଷମ କରାଯାଇଛି।"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"ଟିପଚିହ୍ନ ସେନ୍ସରକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ। ଏକ ମରାମତି କେନ୍ଦ୍ରକୁ ଭିଜିଟ୍ କରନ୍ତୁ"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"ଆଙ୍ଗୁଠି <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ଟିପଚିହ୍ନ ବା ସ୍କ୍ରିନ୍ ଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string> @@ -620,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"ଫୋନକୁ ଦେଖି ଏହାକୁ ଅନଲକ୍ କରନ୍ତୁ"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"ଅନଲକ୍ କରିବା ପାଇଁ ଆହୁରି ଅଧିକ ଉପାୟ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"ଏକ ଟିପଚିହ୍ନ ଯୋଗ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"ଟିପଚିହ୍ନ ସେନ୍ସରକୁ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ଏକ ମରାମତି କେନ୍ଦ୍ରକୁ ଭିଜିଟ୍ କରନ୍ତୁ।"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"ମୁହଁର ଡାଟା କ୍ୟାପଚର୍ ହେଲାନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"ଅତ୍ୟଧିକ ଉଜ୍ଵଳ। କମ୍ ଉଜ୍ବଳକରଣରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"ଅତ୍ୟଧିକ ଅନ୍ଧକାର। ଉଜ୍ବଳ ଲାଇଟ୍ ବ୍ୟବହାର କରନ୍ତୁ।"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index f5f8a5548abc..ea94b05a5f21 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -613,10 +613,8 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"ਫ਼ੇਸ ਅਣਲਾਕ"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"ਫ਼ੇਸ ਅਣਲਾਕ ਨਾਲ ਸਮੱਸਿਆ"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"ਆਪਣੇ ਚਿਹਰੇ ਦਾ ਮਾਡਲ ਮਿਟਾਉਣ ਲਈ ਟੈਪ ਕਰੋ, ਫਿਰ ਆਪਣਾ ਚਿਹਰਾ ਦੁਬਾਰਾ ਸ਼ਾਮਲ ਕਰੋ"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"ਆਪਣੇ ਫ਼ੋਨ ਵੱਲ ਦੇਖ ਕੇ ਇਸਨੂੰ ਅਣਲਾਕ ਕਰੋ"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"ਅਣਲਾਕ ਕਰਨ ਦੇ ਹੋਰ ਤਰੀਕਿਆਂ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 8e0f2b4ceb97..8ff3837e3a51 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -2165,7 +2165,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"OK"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Wyłącz"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Więcej informacji"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"W Androidzie 12 ulepszone powiadomienia zastąpiły dotychczasowe powiadomienia adaptacyjne. Ta funkcja pokazuje sugerowane działania i odpowiedzi oraz porządkuje powiadomienia.\n\nUlepszone powiadomienia mogą czytać całą zawartość powiadomień, w tym dane osobowe takie jak nazwy kontaktów i treść wiadomości. Funkcja może też zamykać powiadomienia oraz reagować na nie, np. odbierać połączenia telefoniczne i sterować trybem Nie przeszkadzać."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"W Androidzie 12 ulepszone powiadomienia zastąpiły dotychczasowe powiadomienia adaptacyjne. Ta funkcja pokazuje sugerowane działania i odpowiedzi oraz porządkuje powiadomienia.\n\nUlepszone powiadomienia mogą czytać całą zawartość powiadomień, w tym informacje osobiste takie jak nazwy kontaktów i treść wiadomości. Funkcja może też zamykać powiadomienia oraz reagować na nie, np. odbierać połączenia telefoniczne i sterować trybem Nie przeszkadzać."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Powiadomienie z informacją o trybie rutynowym"</string> <string name="dynamic_mode_notification_title" msgid="9205715501274608016">"Bateria może się wyczerpać przed zwykłą porą ładowania"</string> <string name="dynamic_mode_notification_summary" msgid="4141614604437372157">"Włączono Oszczędzanie baterii, by wydłużyć czas pracy na baterii"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 5a37821f8a2c..d4befd447f0f 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -605,8 +605,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Nu au fost înregistrate amprente."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Dispozitivul nu are senzor de amprentă."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Senzorul este dezactivat temporar."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Nu se poate folosi senzorul de amprentă. Vizitați un furnizor de servicii de reparații."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Degetul <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Folosiți amprenta"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Folosiți amprenta sau blocarea ecranului"</string> @@ -622,12 +621,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Deblocați-vă telefonul uitându-vă la acesta"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Configurați mai multe moduri de deblocare"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Atingeți ca să adăugați o amprentă"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Deblocare cu amprenta"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Nu se poate folosi senzorul de amprentă"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Vizitați un furnizor de servicii de reparații."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Nu s-a putut fotografia fața cu precizie. Încercați din nou."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Prea luminos. Încercați o lumină mai slabă."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Prea întunecat. Încercați o lumină mai puternică."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 6820452f85a8..e73a3c63fb22 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -2165,7 +2165,7 @@ <string name="nas_upgrade_notification_enable_action" msgid="3046406808378726874">"ОК"</string> <string name="nas_upgrade_notification_disable_action" msgid="3794833210043497982">"Отключить"</string> <string name="nas_upgrade_notification_learn_more_action" msgid="7011130656195423947">"Подробнее"</string> - <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"В Android 12 адаптивные уведомления заменены улучшенными. Эта функция упорядочивает все ваши уведомления и подсказывает ответы и действия.\n\nЕй доступно содержимое всех уведомлений, в том числе имена контактов, сообщения и другие личные данные. Также эта функция может закрывать уведомления и нажимать кнопки в них, например отвечать на звонки и управлять режимом \"Не беспокоить\"."</string> + <string name="nas_upgrade_notification_learn_more_content" msgid="3735480566983530650">"В Android 12 доступны улучшенные уведомления. Эта функция упорядочивает все ваши уведомления и подсказывает ответы и действия.\n\nЕй доступно содержимое всех уведомлений, в том числе имена контактов, сообщения и другие личные данные. Также эта функция может закрывать уведомления и нажимать кнопки в них, например отвечать на звонки и управлять режимом \"Не беспокоить\"."</string> <string name="dynamic_mode_notification_channel_name" msgid="2986926422100223328">"Уведомление о батарее"</string> <string name="dynamic_mode_notification_title" msgid="9205715501274608016">"Батарея может разрядиться"</string> <string name="dynamic_mode_notification_summary" msgid="4141614604437372157">"Чтобы увеличить время работы от батареи, был включен режим энергосбережения."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 5e404520cf04..20a8e15d033d 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -26,7 +26,7 @@ <string name="gigabyteShort" msgid="7515809460261287991">"GB"</string> <string name="terabyteShort" msgid="1822367128583886496">"TB"</string> <string name="petabyteShort" msgid="5651571254228534832">"PB"</string> - <string name="fileSizeSuffix" msgid="4233671691980131257">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string> + <string name="fileSizeSuffix" msgid="4233671691980131257">"<xliff:g id="NUMBER">%1$s</xliff:g>&#160;<xliff:g id="UNIT">%2$s</xliff:g>"</string> <string name="untitled" msgid="3381766946944136678">"<Bez mena>"</string> <string name="emptyPhoneNumber" msgid="5812172618020360048">"(žiadne telefónne číslo)"</string> <string name="unknownName" msgid="7078697621109055330">"Bez názvu"</string> @@ -608,8 +608,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Neregistrovali ste žiadne odtlačky prstov."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Toto zariadenie nemá senzor odtlačkov prstov."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Senzor je dočasne vypnutý."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Senzor odtlačkov prstov nie je možné používať. Navštívte poskytovateľa opráv."</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Prst: <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Použiť odtlačok prsta"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Použiť odtlačok prsta alebo zámku obrazovky"</string> @@ -625,12 +624,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Odomykajte telefón tak, že sa naň pozriete"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Nastavte viac spôsobov odomknutia"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Klepnutím pridajte odtlačok prsta"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Odomknutie odtlačkom prsta"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Senzor odtlačkov prstov nie je možné používať"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Navštívte poskytovateľa opráv."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Nepodarilo sa nasnímať presné údaje o tvári. Skúste to znova."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Príliš veľa svetla. Skúste jemnejšie osvetlenie."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Príliš veľká tma. Skúste lepšie osvetlenie."</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 57c1297cae0d..1a4531f03cbe 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Nuk ka asnjë gjurmë gishti të regjistruar."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Kjo pajisje nuk ka sensor të gjurmës së gishtit."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensori është çaktivizuar përkohësisht."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Sensori i gjurmës së gishtit nuk mund të përdoret. Vizito një ofrues të shërbimit të riparimit"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Gishti <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Përdor gjurmën e gishtit"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Përdor gjurmën e gishtit ose kyçjen e ekranit"</string> @@ -613,18 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Ikona e gjurmës së gishtit"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Shkyçja me fytyrë"</string> - <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Lëshoje me \"Shkyçjen me fytyrë\""</string> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"Problem me \"Shkyçjen me fytyrë\""</string> <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"Trokit për të fshirë modelin tënd të fytyrës, pastaj shtoje përsëri fytyrën tënde"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"Konfiguro \"Shkyçjen me fytyrë\""</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"Shkyçe telefonin duke parë tek ai"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Konfiguri më shumë mënyra për të shkyçur"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Trokit për të shtuar një gjurmë gishti"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Shkyçja me gjurmën e gishtit"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Sensori i gjurmës së gishtit nuk mund të përdoret"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Vizito një ofrues të shërbimit të riparimit."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"S\'mund të regjistroheshin të dhëna të sakta të fytyrës. Provo përsëri."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Me shumë ndriçim. Provo një ndriçim më të butë."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Shumë i errët. Provo një ndriçim më të fortë."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 657f10244954..163ad5363d01 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Hakuna alama za vidole zilizojumuishwa."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Kifaa hiki hakina kitambua alama ya kidole."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Kitambuzi kimezimwa kwa muda."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Imeshindwa kutumia kitambua alama ya kidole. Tembelea mtoa huduma za urekebishaji"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Kidole cha <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Tumia alama ya kidole"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Tumia alama ya kidole au mbinu ya kufunga skrini"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Fungua simu yako kwa kuiangalia"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Weka mipangilio ya mbinu zaidi za kufungua"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Gusa ili uweke alama ya kidole"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Kufungua kwa Alama ya Kidole"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Imeshindwa kutumia kitambua alama ya kidole"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Tembelea mtoa huduma za urekebishaji."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Imeshindwa kunasa data sahihi ya uso. Jaribu tena."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Inang\'aa mno. Jaribu mwangaza hafifu"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Hakuna mwangaza wa kutosha. Jaribu kuongeza mwangaza."</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index f14d6e4db852..dd75160af023 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -47,7 +47,7 @@ <string name="mismatchPin" msgid="2929611853228707473">"உள்ளிட்ட பின்கள் பொருந்தவில்லை."</string> <string name="invalidPin" msgid="7542498253319440408">"4 இலிருந்து 8 எண்கள் வரையுள்ள பின் ஐத் தட்டச்சு செய்யவும்."</string> <string name="invalidPuk" msgid="8831151490931907083">"8 அல்லது அதற்கு மேல் எண்கள் உள்ள PUK ஐத் தட்டச்சு செய்யவும்."</string> - <string name="needPuk" msgid="7321876090152422918">"உங்கள் சிம் கார்டு PUK பூட்டுதல் செய்யப்பட்டுள்ளது. அதைத் திறக்க PUK குறியீட்டைத் உள்ளிடவும்."</string> + <string name="needPuk" msgid="7321876090152422918">"உங்கள் சிம் கார்டு PUK பூட்டுதல் செய்யப்பட்டுள்ளது. அதை அன்லாக் செய்ய PUK குறியீட்டை உள்ளிடவும்."</string> <string name="needPuk2" msgid="7032612093451537186">"சிம் கார்டைத் தடுப்பு நீக்க PUK2 ஐ உள்ளிடவும்."</string> <string name="enablePin" msgid="2543771964137091212">"தோல்வி, சிம்/RUIM பூட்டை இயக்கவும்."</string> <plurals name="pinpuk_attempts" formatted="false" msgid="1619867269012213584"> @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"கைரேகைப் பதிவுகள் எதுவும் இல்லை."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"இந்தச் சாதனத்தில் கைரேகை சென்சார் இல்லை."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"சென்சார் தற்காலிகமாக முடக்கப்பட்டுள்ளது."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"கைரேகை சென்சாரைப் பயன்படுத்த முடியவில்லை. பழுதுபார்ப்புச் சேவை வழங்குநரைத் தொடர்புகொள்ளவும்"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"கைரேகை <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"கைரேகையைப் பயன்படுத்து"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"கைரேகையையோ திரைப் பூட்டையோ பயன்படுத்து"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"மொபைலைப் பார்ப்பதன் மூலம் அதைத் திறக்கலாம்"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"திறக்க, மேலும் பல வழிகளை அமையுங்கள்"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"கைரேகையைச் சேர்க்கத் தட்டுங்கள்"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"கைரேகை அன்லாக்"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"கைரேகை சென்சாரைப் பயன்படுத்த முடியவில்லை"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"பழுதுபார்ப்புச் சேவை வழங்குநரைத் தொடர்புகொள்ளவும்."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"முகம் தெளிவாகப் பதிவாகவில்லை. மீண்டும் முயலவும்."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"அதிக ஒளிர்வு. மிதமான ஒளியில் முயலவும்."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"இருட்டாக உள்ளது. பிரகாசமான ஒளியில் முயலவும்."</string> @@ -892,7 +888,7 @@ <string name="lockscreen_pattern_correct" msgid="8050630103651508582">"சரி!"</string> <string name="lockscreen_pattern_wrong" msgid="2940138714468358458">"மீண்டும் முயற்சிக்கவும்"</string> <string name="lockscreen_password_wrong" msgid="8605355913868947490">"மீண்டும் முயற்சிக்கவும்"</string> - <string name="lockscreen_storage_locked" msgid="634993789186443380">"எல்லா அம்சங்கள் & தரவை பெற, சாதனத்தை திறக்கவும்"</string> + <string name="lockscreen_storage_locked" msgid="634993789186443380">"எல்லா அம்சங்கள் & தரவை பெற, சாதனத்தை அன்லாக் செய்யவும்"</string> <string name="faceunlock_multiple_failures" msgid="681991538434031708">"முகம் காட்டித் திறத்தல் அம்சத்தை அதிகமுறை பயன்படுத்துவிட்டீர்கள்"</string> <string name="lockscreen_missing_sim_message_short" msgid="1248431165144893792">"சிம் கார்டு இல்லை"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="8596805728510570760">"டேப்லெட்டில் சிம் கார்டு இல்லை."</string> @@ -918,10 +914,10 @@ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6458790975898594240">"திறப்பதற்கான வடிவத்தை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="3118353451602377380">"உங்கள் கடவுச்சொல்லை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக உள்ளிட்டீர்கள். \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="2874278239714821984">"உங்கள் பின்னை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக உள்ளிட்டீர்கள். \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3069635524964070596">"திறப்பதற்கான வடிவத்தை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால், உங்கள் Google உள்நுழைவைப் பயன்படுத்தி டேப்லெட்டைத் திறக்குமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="6399092175942158529">"திறப்பதற்கான பேட்டர்னை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால் உங்கள் Google உள்நுழைவைப் பயன்படுத்தி Android TVயைத் திறக்குமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகளில் மீண்டும் முயலவும்."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="5691623136957148335">"திறப்பதற்கான வடிவத்தை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால், உங்கள் Google உள்நுழைவைப் பயன்படுத்தி மொபைலைத் திறக்குமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> - <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="7914445759242151426">"டேப்லெட்டைத் தடைநீக்க <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> தோல்வி முயற்சிகளுக்குப் பிறகு, டேப்லெட்டானது ஆரம்ப இயல்புநிலைக்கு மீட்டமைக்கப்பட்டு, எல்லா பயனர் தரவும் இழக்கப்படும்."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3069635524964070596">"அன்லாக் வடிவத்தை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால், உங்கள் Google உள்நுழைவைப் பயன்படுத்தி டேப்லெட்டை அன்லாக் செய்யுமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="6399092175942158529">"அன்லாக் பேட்டர்னை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால் உங்கள் Google உள்நுழைவைப் பயன்படுத்தி Android TVயை அன்லாக் செய்யுமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகளில் மீண்டும் முயலவும்."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="5691623136957148335">"அன்லாக் பேட்டர்னை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால், உங்கள் Google உள்நுழைவைப் பயன்படுத்தி மொபைலை அன்லாக் செய்யுமாறு கேட்கப்படுவீர்கள். \n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகள் கழித்து முயற்சிக்கவும்."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="7914445759242151426">"டேப்லெட்டை அன்லாக் செய்ய <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> தோல்வி முயற்சிகளுக்குப் பிறகு, டேப்லெட்டானது ஆரம்ப இயல்புநிலைக்கு மீட்டமைக்கப்பட்டு, எல்லா பயனர் தரவும் இழக்கப்படும்."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="4275591249631864248">"உங்கள் Android TVயில் <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறான கடவுச்சொல்லை உள்ளிட்டுத் திறக்க முயன்றுள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறான கடவுச்சொல்லை உள்ளிட்டு முயன்றால் உங்கள் Android TV ஆரம்ப நிலைக்கு மீட்டமைக்கப்படுவதுடன் பயனரின் அனைத்துத் தரவையும் இழக்க நேரிடும்."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="1166532464798446579">"தொலைபேசியைத் தடைநீக்க <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> தோல்வி முயற்சிகளுக்குப் பிறகு, தொலைபேசியானது ஆரம்ப இயல்புநிலைக்கு மீட்டமைக்கப்பட்டு, எல்லா பயனர் தரவும் இழக்கப்படும்."</string> <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="8682445539263683414">"நீங்கள் டேப்லெட்டைத் தடைநீக்க <xliff:g id="NUMBER">%d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். டேப்லெட் இப்போது ஆரம்ப இயல்புநிலைக்கு மீட்டமைக்கப்படும்."</string> @@ -929,7 +925,7 @@ <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="2203704707679895487">"நீங்கள் தொலைபேசியைத் தடைநீக்க <xliff:g id="NUMBER">%d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். தொலைபேசி இப்போது ஆரம்ப இயல்புநிலைக்கு மீட்டமைக்கப்படும்."</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6807200118164539589">"<xliff:g id="NUMBER">%d</xliff:g> வினாடிகள் கழித்து மீண்டும் முயற்சிக்கவும்."</string> <string name="lockscreen_forgot_pattern_button_text" msgid="8362442730606839031">"வடிவத்தை மறந்துவிட்டீர்களா?"</string> - <string name="lockscreen_glogin_forgot_pattern" msgid="9218940117797602518">"கணக்கைத் திற"</string> + <string name="lockscreen_glogin_forgot_pattern" msgid="9218940117797602518">"கணக்கை அன்லாக் செய்"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="3775904917743034195">"அதிகமான வடிவ முயற்சிகள்"</string> <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"திறக்க, Google கணக்கு மூலம் உள்நுழையவும்."</string> <string name="lockscreen_glogin_username_hint" msgid="6916101478673157045">"பயனர்பெயர் (மின்னஞ்சல் முகவரி)"</string> @@ -951,7 +947,7 @@ <string name="keyguard_accessibility_add_widget" msgid="8245795023551343672">"விட்ஜெட்டைச் சேர்க்கவும்."</string> <string name="keyguard_accessibility_widget_empty_slot" msgid="544239307077644480">"காலியானது"</string> <string name="keyguard_accessibility_unlock_area_expanded" msgid="7768634718706488951">"திறக்கும் பகுதி விரிவாக்கப்பட்டது."</string> - <string name="keyguard_accessibility_unlock_area_collapsed" msgid="4729922043778400434">"திறக்கும் பகுதி சுருக்கப்பட்டது."</string> + <string name="keyguard_accessibility_unlock_area_collapsed" msgid="4729922043778400434">"அன்லாக் செய்வதற்கான பகுதி சுருக்கப்பட்டது."</string> <string name="keyguard_accessibility_widget" msgid="6776892679715699875">"<xliff:g id="WIDGET_INDEX">%1$s</xliff:g> விட்ஜெட்."</string> <string name="keyguard_accessibility_user_selector" msgid="1466067610235696600">"பயனர் தேர்வி"</string> <string name="keyguard_accessibility_status" msgid="6792745049712397237">"நிலை"</string> @@ -960,12 +956,12 @@ <string name="keyguard_accessibility_widget_reorder_start" msgid="7066213328912939191">"விட்ஜெட்டை மீண்டும் வரிசைப்படுத்துவது தொடங்கியது."</string> <string name="keyguard_accessibility_widget_reorder_end" msgid="1083806817600593490">"விட்ஜெட்டை மீண்டும் வரிசைப்படுத்துவது முடிந்தது."</string> <string name="keyguard_accessibility_widget_deleted" msgid="1509738950119878705">"விட்ஜெட் <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> நீக்கப்பட்டது."</string> - <string name="keyguard_accessibility_expand_lock_area" msgid="4215280881346033434">"திறப்பதற்கான பகுதியை விவரிக்கவும்."</string> + <string name="keyguard_accessibility_expand_lock_area" msgid="4215280881346033434">"அன்லாக் செய்வதற்கான பகுதியை விரிவாக்கவும்"</string> <string name="keyguard_accessibility_slide_unlock" msgid="2968195219692413046">"ஸ்லைடு மூலம் திறத்தல்."</string> <string name="keyguard_accessibility_pattern_unlock" msgid="8669128146589233293">"பேட்டர்ன் மூலம் திறத்தல்."</string> <string name="keyguard_accessibility_face_unlock" msgid="4533832120787386728">"முகம் காட்டித் திறத்தல்."</string> <string name="keyguard_accessibility_pin_unlock" msgid="4020864007967340068">"Pin மூலம் திறத்தல்."</string> - <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"சிம்மைத் திறக்கும் பின்."</string> + <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"சிம் பின் அன்லாக்."</string> <string name="keyguard_accessibility_sim_puk_unlock" msgid="3459003464041899101">"சிம்மைத் திறக்கும் Puk."</string> <string name="keyguard_accessibility_password_unlock" msgid="6130186108581153265">"கடவுச்சொல் மூலம் திறத்தல்."</string> <string name="keyguard_accessibility_pattern_area" msgid="1419570880512350689">"வடிவப் பகுதி."</string> @@ -1572,7 +1568,7 @@ <string name="shareactionprovider_share_with" msgid="2753089758467748982">"இவர்களுடன் பகிர்"</string> <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> உடன் பகிர்"</string> <string name="content_description_sliding_handle" msgid="982510275422590757">"ஸ்லைடிங் ஹேன்டில். தொட்டுப் பிடிக்கவும்."</string> - <string name="description_target_unlock_tablet" msgid="7431571180065859551">"திறக்க ஸ்வைப் செய்யவும்."</string> + <string name="description_target_unlock_tablet" msgid="7431571180065859551">"அன்லாக் செய்ய ஸ்வைப் செய்யவும்."</string> <string name="action_bar_home_description" msgid="1501655419158631974">"முகப்பிற்கு வழிசெலுத்து"</string> <string name="action_bar_up_description" msgid="6611579697195026932">"மேலே வழிசெலுத்து"</string> <string name="action_menu_overflow_description" msgid="4579536843510088170">"மேலும் விருப்பங்கள்"</string> @@ -1669,7 +1665,7 @@ <string name="kg_invalid_puk" msgid="4809502818518963344">"சரியான PUK குறியீட்டை மீண்டும் உள்ளிடவும். தொடர் முயற்சிகள் சிம் ஐ நிரந்தரமாக முடக்கிவிடும்."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"பின் குறியீடுகள் பொருந்தவில்லை"</string> <string name="kg_login_too_many_attempts" msgid="699292728290654121">"அதிகமான வடிவ முயற்சிகள்"</string> - <string name="kg_login_instructions" msgid="3619844310339066827">"திறக்க, உங்கள் Google கணக்கு மூலம் உள்நுழையவும்."</string> + <string name="kg_login_instructions" msgid="3619844310339066827">"அன்லாக் செய்ய உங்கள் Google கணக்கு மூலம் உள்நுழையவும்."</string> <string name="kg_login_username_hint" msgid="1765453775467133251">"பயனர்பெயர் (மின்னஞ்சல்)"</string> <string name="kg_login_password_hint" msgid="3330530727273164402">"கடவுச்சொல்"</string> <string name="kg_login_submit_button" msgid="893611277617096870">"உள்நுழைக"</string> @@ -1682,12 +1678,12 @@ <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="3479940221343361587">"டேப்லெட்டைத் திறக்க <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> தோல்வி முயற்சிகளுக்குப் பிறகு, டேப்லெட்டானது ஆரம்பநிலைக்கு மீட்டமைக்கப்பட்டு, எல்லா பயனர் தரவையும் இழப்பீர்கள்."</string> <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="9064457748587850217">"உங்கள் Android TVயில் <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறான கடவுச்சொல்லை உள்ளிட்டுத் திறக்க முயன்றுள்ளீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறான கடவுச்சொல்லை உள்ளிட்டு முயன்றால் உங்கள் Android TV ஆரம்ப நிலைக்கு மீட்டமைக்கப்படுவதுடன் பயனரின் அனைத்துத் தரவையும் இழக்க நேரிடும்."</string> <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="5955398963754432548">"மொபைலைத் திறக்க <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_wiping" product="tablet" msgid="2299099385175083308">"டேப்லெட்டைத் திறக்க <xliff:g id="NUMBER">%d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். டேப்லெட் இப்போது ஆரம்பநிலைக்கு மீட்டமைக்கப்படும்."</string> + <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2299099385175083308">"டேப்லெட்டை அன்லாக் செய்ய <xliff:g id="NUMBER">%d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். டேப்லெட் இப்போது ஆரம்பநிலைக்கு மீட்டமைக்கப்படும்."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="5045460916106267585">"உங்கள் Android TVயில் <xliff:g id="NUMBER">%d</xliff:g> முறை தவறான கடவுச்சொல்லை உள்ளிட்டுத் திறக்க முயன்றுள்ளீர்கள். இப்போது உங்கள் Android TV ஆரம்ப நிலைக்கு மீட்டமைக்கப்படும்."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="5043730590446071189">"மொபைலைத் திறக்க <xliff:g id="NUMBER">%d</xliff:g> முறை தவறாக முயற்சித்துள்ளீர்கள். மொபைல் இப்போது ஆரம்பநிலைக்கு மீட்டமைக்கப்படும்."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="7086799295109717623">"திறப்பதற்கான வடிவத்தை <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="tv" msgid="4670840383567106114">"திறப்பதற்கான பேட்டர்னை <xliff:g id="NUMBER_0">%1$d</xliff:g> முறை தவறாக வரைந்துவிட்டீர்கள். இன்னும் <xliff:g id="NUMBER_1">%2$d</xliff:g> முறை தவறாக வரைந்தால் மின்னஞ்சல் கணக்கைப் பயன்படுத்தி Android TVயைத் திறக்கும்படி கேட்கப்படுவீர்கள்.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> வினாடிகளில் மீண்டும் முயலவும்."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="5270861875006378092">"திறப்பதற்கான வடிவத்தை <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="5270861875006378092">"அன்லாக் வடிவத்தை <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_text_message_separator" product="default" msgid="4503708889934976866">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="2034358143731750914">"அகற்று"</string> <string name="safe_media_volume_warning" product="default" msgid="3751676824423049994">"பரிந்துரைத்த அளவை விட ஒலியை அதிகரிக்கவா?\n\nநீண்ட நேரத்திற்கு அதிகளவில் ஒலி கேட்பது கேட்கும் திறனைப் பாதிக்கலாம்."</string> @@ -1871,7 +1867,7 @@ <string name="managed_profile_label_badge_2" msgid="5673187309555352550">"2வது பணி <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge_3" msgid="6882151970556391957">"3வது பணி <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_unlock_pin" msgid="3890940811866290782">"அகற்றும் முன் PINஐக் கேள்"</string> - <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string> + <string name="lock_to_app_unlock_pattern" msgid="2694204070499712503">"அகற்றும் முன் அன்லாக் பேட்டர்னைக் கேள்"</string> <string name="lock_to_app_unlock_password" msgid="9126722403506560473">"அகற்றும் முன் கடவுச்சொல்லைக் கேள்"</string> <string name="package_installed_device_owner" msgid="7035926868974878525">"உங்கள் நிர்வாகி நிறுவியுள்ளார்"</string> <string name="package_updated_device_owner" msgid="7560272363805506941">"உங்கள் நிர்வாகி புதுப்பித்துள்ளார்"</string> @@ -1992,7 +1988,7 @@ <string name="new_sms_notification_content" msgid="3197949934153460639">"பார்க்க, SMS பயன்பாட்டைத் திறக்கவும்"</string> <string name="profile_encrypted_title" msgid="9001208667521266472">"சில செயலுக்கு கட்டுப்பாடு இருக்கலாம்"</string> <string name="profile_encrypted_detail" msgid="5279730442756849055">"பணிக் கணக்கு பூட்டியுள்ளது"</string> - <string name="profile_encrypted_message" msgid="1128512616293157802">"பணிக் கணக்கை திறக்க, தட்டுக"</string> + <string name="profile_encrypted_message" msgid="1128512616293157802">"பணிக் கணக்கை அன்லாக் செய்யத் தட்டுக"</string> <string name="usb_mtp_launch_notification_title" msgid="774319638256707227">"<xliff:g id="PRODUCT_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டது"</string> <string name="usb_mtp_launch_notification_description" msgid="6942535713629852684">"கோப்புகளைப் பார்க்க, தட்டவும்"</string> <string name="pin_target" msgid="8036028973110156895">"பின் செய்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 6c9226810361..017f4cfbb1df 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -787,7 +787,7 @@ <item msgid="7640927178025203330">"అనుకూలం"</item> </string-array> <string-array name="organizationTypes"> - <item msgid="6144047813304847762">"కార్యాలయం"</item> + <item msgid="6144047813304847762">"వర్క్"</item> <item msgid="7402720230065674193">"ఇతరం"</item> <item msgid="808230403067569648">"అనుకూలం"</item> </string-array> @@ -849,7 +849,7 @@ <string name="imProtocolIcq" msgid="2410325380427389521">"ICQ"</string> <string name="imProtocolJabber" msgid="7919269388889582015">"Jabber"</string> <string name="imProtocolNetMeeting" msgid="4985002408136148256">"NetMeeting"</string> - <string name="orgTypeWork" msgid="8684458700669564172">"కార్యాలయం"</string> + <string name="orgTypeWork" msgid="8684458700669564172">"వర్క్"</string> <string name="orgTypeOther" msgid="5450675258408005553">"ఇతరం"</string> <string name="orgTypeCustom" msgid="1126322047677329218">"అనుకూలం"</string> <string name="relationTypeCustom" msgid="282938315217441351">"అనుకూలం"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index d2ff9d88e637..1ea7cbf67c35 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"ไม่มีลายนิ้วมือที่ลงทะเบียน"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"อุปกรณ์นี้ไม่มีเซ็นเซอร์ลายนิ้วมือ"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"ปิดใช้เซ็นเซอร์ชั่วคราวแล้ว"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"ใช้เซ็นเซอร์ลายนิ้วมือไม่ได้ โปรดติดต่อผู้ให้บริการซ่อม"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"นิ้ว <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"ใช้ลายนิ้วมือ"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"ใช้ลายนิ้วมือหรือการล็อกหน้าจอ"</string> @@ -613,20 +612,15 @@ </string-array> <string name="fingerprint_icon_content_description" msgid="4741068463175388817">"ไอคอนลายนิ้วมือ"</string> <string name="face_recalibrate_notification_name" msgid="7311163114750748686">"การปลดล็อกด้วยใบหน้า"</string> - <!-- no translation found for face_recalibrate_notification_title (2524791952735579082) --> - <skip /> - <!-- no translation found for face_recalibrate_notification_content (3064513770251355594) --> - <skip /> + <string name="face_recalibrate_notification_title" msgid="2524791952735579082">"มีปัญหาเกี่ยวกับฟีเจอร์ปลดล็อกด้วยใบหน้า"</string> + <string name="face_recalibrate_notification_content" msgid="3064513770251355594">"แตะเพื่อลบรูปแบบใบหน้า แล้วเพิ่มใบหน้าอีกครั้ง"</string> <string name="face_setup_notification_title" msgid="8843461561970741790">"ตั้งค่าการปลดล็อกด้วยใบหน้า"</string> <string name="face_setup_notification_content" msgid="5463999831057751676">"ปลดล็อกโทรศัพท์โดยมองไปที่โทรศัพท์"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"ตั้งค่าการปลดล็อกด้วยวิธีอื่น"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"แตะเพื่อเพิ่มลายนิ้วมือ"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"ปลดล็อกด้วยลายนิ้วมือ"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"ใช้เซ็นเซอร์ลายนิ้วมือไม่ได้"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"โปรดติดต่อผู้ให้บริการซ่อม"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"บันทึกข้อมูลใบหน้าที่ถูกต้องไม่ได้ ลองอีกครั้ง"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"สว่างเกินไป ลองหาตำแหน่งที่แสงน้อยกว่านี้"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"มืดเกินไป ลองหาตำแหน่งที่สว่างขึ้น"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 30a8042b16aa..d28a73dc1d19 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Walang naka-enroll na fingerprint."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Walang sensor ng fingerprint ang device na ito."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Pansamantalang na-disable ang sensor."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Hindi magamit ang sensor para sa fingerprint. Bumisita sa provider ng pag-aayos"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Daliri <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Gumamit ng fingerprint"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Gumamit ng fingerprint o lock ng screen"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"I-unlock ang iyong telepono sa pamamagitan ng pagtingin dito"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Mag-set up ng higit pang paraan para mag-unlock"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"I-tap para magdagdag ng fingerprint"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Pag-unlock Gamit ang Fingerprint"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Hindi magamit ang sensor para sa fingerprint"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Bumisita sa provider ng pag-aayos."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Hindi makakuha ng tamang face data. Subukang muli."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Masyadong maliwanag. Subukang bawasan ang liwanag."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Masyadong madilim. Subukan sa mas maliwanag."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index e864e2bda7e2..b7afbdeced7f 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Parmak izi kaydedilmedi."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Bu cihazda parmak izi sensörü yok."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensör geçici olarak devre dışı bırakıldı."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Parmak izi sensörü kullanılamıyor. Bir onarım hizmeti sağlayıcıyı ziyaret edin"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"<xliff:g id="FINGERID">%d</xliff:g>. parmak"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Parmak izi kullan"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Parmak izi veya ekran kilidi kullan"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Telefonunuza bakarak kilidini açın"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Kilidi açmak için daha fazla yöntem ayarlayın"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Parmak izi eklemek için dokunun"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Parmak İzi Kilidi"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Parmak izi sensörü kullanılamıyor"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Bir onarım hizmeti sağlayıcıyı ziyaret edin."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Doğru yüz verileri yakalanamadı. Tekrar deneyin."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Çok parlak. Parlaklığı daha az bir ışıklandırma deneyin."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Çok karanlık. Daha parlak ışıkta deneyin."</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index a00b051eece5..85624f19f8b9 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"کوئی فنگر پرنٹ مندرج شدہ نہیں ہے۔"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"اس آلہ میں فنگر پرنٹ سینسر نہیں ہے۔"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"سینسر عارضی طور غیر فعال ہے۔"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"فنگر پرنٹ سینسر کا استعمال نہیں کر سکتے۔ ایک مرمت فراہم کنندہ کو ملاحظہ کریں"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"انگلی <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"فنگر پرنٹ استعمال کریں"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"فنگر پرنٹ یا اسکرین لاک استعمال کریں"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"اپنے فون کی طرف دیکھ کر اسے غیر مقفل کریں"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"غیر مقفل کرنے کے مزید طریقے سیٹ اپ کریں"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"فنگر پرنٹ شامل کرنے کیلئے تھپتھپائیں"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"فنگر پرنٹ اَن لاک"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"فنگر پرنٹ سینسر کا استعمال نہیں کر سکتے"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"ایک مرمت فراہم کنندہ کو ملاحظہ کریں۔"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"چہرے کا درست ڈيٹا کیپچر نہیں ہو سکا۔ پھر آزمائيں۔"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"کافی روشنی ہے۔ ہلکی روشنی میں آزمائیں۔"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"کافی اندھیرا ہے۔ تیز روشنی میں آزمائیں۔"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 045c62db29d4..51e2b884ab9b 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Hech qanday barmoq izi qayd qilinmagan."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Bu qurilmada barmoq izi skaneri mavjud emas."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensor vaqtincha faol emas."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Barmoq izi skaneridan foydalanish imkonsiz. Xizmat koʻrsatish markaziga murojaat qiling"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Barmoq izi <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Barmoq izi ishlatish"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Barmoq izi yoki ekran qulfi"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Telefoningizni yuz tekshiruvi yordamida qulfdan chiqaring"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Qulfdan chiqarishning boshqa usullarini sozlang"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Barmoq izi kiritish uchun bosing"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Barmoq izi bilan ochish"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Barmoq izi skaneridan foydalanish imkonsiz"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Xizmat koʻrsatish markaziga murojaat qiling."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Yuz ravshan suratga olinmadi. Qaytadan urining."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Juda yorqin. Biroz soyaroq joy tanlang."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Juda qorongʻi. Atrofingizni yoriting."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index d0e41c108dc0..050eb96a07b7 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Chưa đăng ký vân tay."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Thiết bị này không có cảm biến vân tay."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Đã tạm thời tắt cảm biến."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Không thể dùng cảm biến vân tay. Hãy liên hệ với một nhà cung cấp dịch vụ sửa chữa"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Ngón tay <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Dùng vân tay"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Dùng vân tay hoặc phương thức khóa màn hình"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Mở khóa điện thoại bằng cách nhìn vào điện thoại"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Thiết lập thêm những cách mở khóa khác"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Nhấn để thêm vân tay"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Mở khóa bằng vân tay"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Không thể dùng cảm biến vân tay"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Hãy liên hệ với một nhà cung cấp dịch vụ sửa chữa."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Không thể ghi lại đúng dữ liệu mặt. Hãy thử lại."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Quá sáng. Hãy thử giảm độ sáng."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Quá tối. Hãy thử tăng độ sáng."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index eb231303c91c..77b48e730884 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"未注册任何指纹。"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"此设备没有指纹传感器。"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"传感器已暂时停用。"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"无法使用指纹传感器。请联系维修服务提供商"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"手指 <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"使用指纹"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"使用指纹或屏幕锁定凭据"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"脸部对准手机即可将其解锁"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"设置更多解锁方式"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"点按即可添加指纹"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"指纹解锁"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"无法使用指纹传感器"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"请联系维修服务提供商。"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"无法捕获准确的人脸数据，请重试。"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"亮度过高，请尝试使用较柔和的亮度。"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"亮度不足，请尝试将光线调亮。"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 365fefe6fc60..06bb2d90ce54 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"未註冊任何指紋"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"此裝置沒有指紋感應器。"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"感應器已暫時停用。"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"無法使用指紋感應器。請諮詢維修服務供應商"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"手指 <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"使用指紋鎖定"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"使用指紋或螢幕鎖定"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"直望手機即可解鎖"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"設定更多解鎖方法"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"輕按即可新增指紋"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"指紋解鎖"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"無法使用指紋感應器"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"請諮詢維修服務供應商。"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"無法擷取準確的臉容資料。請再試一次。"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"影像太亮。請嘗試在更暗的環境下使用。"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"影像太暗。請嘗試在更明亮的環境下使用。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index ff4ee609f8c4..0dae86f859a4 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"未登錄任何指紋。"</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"這個裝置沒有指紋感應器。"</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"感應器已暫時停用。"</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"指紋感應器無法使用，請洽詢維修供應商"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"手指 <xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"使用指紋"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"使用指紋或螢幕鎖定功能"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"看著手機就能解鎖"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"設定更多解鎖方式"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"輕觸即可新增指紋"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"指紋解鎖"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"指紋感應器無法使用"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"請洽詢維修供應商。"</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"無法擷取精準臉孔資料，請再試一次。"</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"亮度過高，請嘗試使用較柔和的照明方式。"</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"亮度不足，請嘗試使用較明亮的照明方式。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 6b0a1d1735bf..7ff6bb330dea 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -602,8 +602,7 @@ <string name="fingerprint_error_no_fingerprints" msgid="8671811719699072411">"Azikho izigxivizo zeminwe ezibhalisiwe."</string> <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Le divayisi ayinayo inzwa yezigxivizo zeminwe."</string> <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Inzwa ikhutshazwe okwesikhashana."</string> - <!-- no translation found for fingerprint_error_bad_calibration (4385512597740168120) --> - <skip /> + <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Ayikwazi ukusebenzisa inzwa yesigxivizo somunwe. Vakashela umhlinzeki wokulungisa"</string> <string name="fingerprint_name_template" msgid="8941662088160289778">"Umunwe ongu-<xliff:g id="FINGERID">%d</xliff:g>"</string> <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Sebenzisa izigxivizo zeminwe"</string> <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Sebenzisa izigxivizo zeminwe noma ukukhiya isikrini"</string> @@ -619,12 +618,9 @@ <string name="face_setup_notification_content" msgid="5463999831057751676">"Vula ifoni yakho ngokuyibheka"</string> <string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Setha izindlela eziningi zokuvula"</string> <string name="fingerprint_setup_notification_content" msgid="205578121848324852">"Thepha ukuze ungeze izigxivizo zomunwe"</string> - <!-- no translation found for fingerprint_recalibrate_notification_name (1414578431898579354) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_title (2406561052064558497) --> - <skip /> - <!-- no translation found for fingerprint_recalibrate_notification_content (8519935717822194943) --> - <skip /> + <string name="fingerprint_recalibrate_notification_name" msgid="1414578431898579354">"Ukuvula ngesigxivizo somunwe"</string> + <string name="fingerprint_recalibrate_notification_title" msgid="2406561052064558497">"Ayikwazi ukusebenzisa inzwa yesigxivizo somunwe"</string> + <string name="fingerprint_recalibrate_notification_content" msgid="8519935717822194943">"Vakashela umhlinzeki wokulungisa."</string> <string name="face_acquired_insufficient" msgid="2150805835949162453">"Ayikwazanga ukuthwebula idatha enembile yobuso. Zama futhi."</string> <string name="face_acquired_too_bright" msgid="8070756048978079164">"Kukhanya kakhulu. Zama ukukhanya okuthambile."</string> <string name="face_acquired_too_dark" msgid="252573548464426546">"Kumnyama kakhulu Zama ukukhanyisa okukhanyayo."</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 646fbd3978fd..8dfbdccf5706 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5038,4 +5038,8 @@ <!-- The amount of dimming to apply to wallpapers with mid range luminance. 0 displays the wallpaper at full brightness. 1 displays the wallpaper as fully black. --> <item name="config_wallpaperDimAmount" format="float" type="dimen">0.05</item> + + <!-- The default number of times per second that the seconds hand on AnalogClock ticks. If set + to 0, the seconds hand will be disabled. --> + <integer name="config_defaultAnalogClockSecondsHandFps">1</integer> </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index ea93520502d5..de7a1175b4a3 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -886,7 +886,7 @@ <dimen name="seekbar_thumb_exclusion_max_size">48dp</dimen> <!-- chooser/resolver (sharesheet) spacing --> - <dimen name="chooser_corner_radius">8dp</dimen> + <dimen name="chooser_corner_radius">16dp</dimen> <dimen name="chooser_row_text_option_translate">25dp</dimen> <dimen name="chooser_view_spacing">18dp</dimen> <dimen name="chooser_edge_margin_thin">16dp</dimen> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d1a5cc49be9f..a99a22009e3b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -444,12 +444,6 @@ <string name="sensor_notification_service">Sensor Notification Service</string> <!-- Attribution for Twilight service. [CHAR LIMIT=NONE]--> <string name="twilight_service">Twilight Service</string> - <!-- Attribution for the Offline LocationTimeZoneProvider service, i.e. the service capable of - performing time zone detection using time zone geospatial information held on the device. - This text is shown in UIs related to an application name to help users and developers to - understand which sub-unit of an application is requesting permissions and using power. - [CHAR LIMIT=NONE]--> - <string name="offline_location_time_zone_detection_service_attribution">Time Zone Detector (No connectivity)</string> <!-- Attribution for Gnss Time Update service. [CHAR LIMIT=NONE]--> <string name="gnss_time_update_service">GNSS Time Update Service</string> @@ -3964,6 +3958,8 @@ <string name="deny">Deny</string> <string name="permission_request_notification_title">Permission requested</string> <string name="permission_request_notification_with_subtitle">Permission requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string> + <!-- Title and subtitle for notification shown when app request account access (two lines) [CHAR LIMIT=NONE] --> + <string name="permission_request_notification_for_app_with_subtitle">Permission requested by <xliff:g id="app" example="Gmail">%1$s</xliff:g>\nfor account <xliff:g id="account" example="foo@gmail.com">%2$s</xliff:g>.</string> <!-- Message to show when an intent automatically switches users into the personal profile. --> <string name="forward_intent_to_owner">You\'re using this app outside of your work profile</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c05adfd4ba2e..bfd39a3c4234 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -490,6 +490,7 @@ <java-symbol type="integer" name="config_smartSelectionInitializedTimeoutMillis" /> <java-symbol type="integer" name="config_smartSelectionInitializingTimeoutMillis" /> <java-symbol type="bool" name="config_hibernationDeletesOatArtifactsEnabled"/> + <java-symbol type="integer" name="config_defaultAnalogClockSecondsHandFps"/> <java-symbol type="color" name="tab_indicator_text_v4" /> @@ -560,6 +561,7 @@ <java-symbol type="string" name="notification_title" /> <java-symbol type="string" name="other_networks_no_internet" /> <java-symbol type="string" name="permission_request_notification_with_subtitle" /> + <java-symbol type="string" name="permission_request_notification_for_app_with_subtitle" /> <java-symbol type="string" name="prepend_shortcut_label" /> <java-symbol type="string" name="private_dns_broken_detailed" /> <java-symbol type="string" name="paste_as_plain_text" /> @@ -2526,6 +2528,7 @@ <java-symbol type="string" name="fingerprint_acquired_imager_dirty" /> <java-symbol type="string" name="fingerprint_acquired_too_slow" /> <java-symbol type="string" name="fingerprint_acquired_too_fast" /> + <java-symbol type="string" name="fingerprint_acquired_too_bright" /> <java-symbol type="array" name="fingerprint_acquired_vendor" /> <java-symbol type="string" name="fingerprint_error_canceled" /> <java-symbol type="string" name="fingerprint_error_user_canceled" /> @@ -4165,6 +4168,7 @@ <java-symbol type="drawable" name="ic_work_apps_off" /> <java-symbol type="drawable" name="ic_sharing_disabled" /> <java-symbol type="drawable" name="ic_no_apps" /> + <java-symbol type="drawable" name="ic_screenshot_edit" /> <java-symbol type="dimen" name="resolver_empty_state_height" /> <java-symbol type="dimen" name="resolver_empty_state_height_with_tabs" /> <java-symbol type="dimen" name="resolver_max_collapsed_height_with_tabs" /> diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index 8fae80d602d9..93e4a294a2cb 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -121,8 +121,6 @@ java_genrule { ":FrameworksCoreTests_keyset_splat_api", ":FrameworksCoreTests_locales", ":FrameworksCoreTests_overlay_config", - ":FrameworksCoreTests_res_version_after", - ":FrameworksCoreTests_res_version_before", ":FrameworksCoreTests_version_1", ":FrameworksCoreTests_version_1_diff", ":FrameworksCoreTests_version_1_nosys", diff --git a/core/tests/coretests/apks/res_upgrade/Android.bp b/core/tests/coretests/apks/res_upgrade/Android.bp deleted file mode 100644 index c58614f2c946..000000000000 --- a/core/tests/coretests/apks/res_upgrade/Android.bp +++ /dev/null @@ -1,22 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], -} - -android_test_helper_app { - name: "FrameworksCoreTests_res_version_before", - defaults: ["FrameworksCoreTests_apks_defaults"], - resource_dirs: ["res_before"], - certificate: ":FrameworksCoreTests_unit_test_cert", -} - -android_test_helper_app { - name: "FrameworksCoreTests_res_version_after", - defaults: ["FrameworksCoreTests_apks_defaults"], - resource_dirs: ["res_after"], - certificate: ":FrameworksCoreTests_unit_test_cert", -} diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index 8488a84dbe01..d1776fb7e5c1 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -25,23 +25,15 @@ import static com.google.common.truth.Truth.assertThat; 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.assertTrue; import android.app.ActivityThread; -import android.app.PendingIntent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInstaller; -import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.PixelFormat; import android.hardware.display.DisplayManager; import android.hardware.display.VirtualDisplay; import android.inputmethodservice.InputMethodService; import android.media.ImageReader; -import android.os.FileUtils; import android.os.UserHandle; import android.view.Display; @@ -50,20 +42,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; -import com.android.compatibility.common.util.ShellIdentityUtils; -import com.android.frameworks.coretests.R; - import org.junit.Test; import org.junit.runner.RunWith; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.TimeUnit; - /** - * Build/Install/Run: - * atest FrameworksCoreTests:ContextTest + * Build/Install/Run: + * atest FrameworksCoreTests:ContextTest */ @SmallTest @RunWith(AndroidJUnit4.class) @@ -232,132 +216,6 @@ public class ContextTest { assertFalse(context.isUiContext()); } - private static class TestReceiver extends BroadcastReceiver implements AutoCloseable { - private static final String INTENT_ACTION = "com.android.server.pm.test.test_app.action"; - private final ArrayBlockingQueue<Intent> mResults = new ArrayBlockingQueue<>(1); - - public IntentSender makeIntentSender() { - return PendingIntent.getBroadcast(getContext(), 0, new Intent(INTENT_ACTION), - PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED) - .getIntentSender(); - } - - public void waitForIntent() throws InterruptedException { - assertNotNull(mResults.poll(30, TimeUnit.SECONDS)); - } - - @Override - public void onReceive(Context context, Intent intent) { - mResults.add(intent); - } - - public void register() { - getContext().registerReceiver(this, new IntentFilter(INTENT_ACTION)); - } - - @Override - public void close() throws Exception { - getContext().unregisterReceiver(this); - } - - private Context getContext() { - return InstrumentationRegistry.getInstrumentation().getContext(); - } - } - - @Test - public void applicationContextBeforeAndAfterUpgrade() throws Exception { - final Context context = InstrumentationRegistry.getInstrumentation().getContext(); - final String testPackageName = "com.android.frameworks.coretests.res_version"; - try { - final PackageManager pm = context.getPackageManager(); - final int versionRes = 0x7f010000; - - final Context appContext = ApplicationProvider.getApplicationContext(); - installApk(appContext, R.raw.res_version_before); - - ApplicationInfo info = pm.getApplicationInfo(testPackageName, 0); - final Context beforeContext = appContext.createApplicationContext(info, 0); - assertEquals("before", beforeContext.getResources().getString(versionRes)); - - installApk(appContext, R.raw.res_version_after); - - info = pm.getApplicationInfo(testPackageName, 0); - final Context afterContext = appContext.createApplicationContext(info, 0); - assertEquals("before", beforeContext.createConfigurationContext(Configuration.EMPTY) - .getResources().getString(versionRes)); - assertEquals("after", afterContext.createConfigurationContext(Configuration.EMPTY) - .getResources().getString(versionRes)); - assertNotEquals(beforeContext.getPackageResourcePath(), - afterContext.getPackageResourcePath()); - } finally { - uninstallPackage(context, testPackageName); - } - } - - @Test - public void packageContextBeforeAndAfterUpgrade() throws Exception { - final Context context = InstrumentationRegistry.getInstrumentation().getContext(); - final String testPackageName = "com.android.frameworks.coretests.res_version"; - try { - final int versionRes = 0x7f010000; - final Context appContext = ApplicationProvider.getApplicationContext(); - installApk(appContext, R.raw.res_version_before); - - final Context beforeContext = appContext.createPackageContext(testPackageName, 0); - assertEquals("before", beforeContext.getResources().getString(versionRes)); - - installApk(appContext, R.raw.res_version_after); - - final Context afterContext = appContext.createPackageContext(testPackageName, 0); - assertEquals("before", beforeContext.createConfigurationContext(Configuration.EMPTY) - .getResources().getString(versionRes)); - assertEquals("after", afterContext.createConfigurationContext(Configuration.EMPTY) - .getResources().getString(versionRes)); - assertNotEquals(beforeContext.getPackageResourcePath(), - afterContext.getPackageResourcePath()); - } finally { - uninstallPackage(context, testPackageName); - } - } - - private void installApk(Context context, int rawApkResId) throws Exception { - final PackageManager pm = context.getPackageManager(); - final PackageInstaller pi = pm.getPackageInstaller(); - final PackageInstaller.SessionParams params = new PackageInstaller.SessionParams( - PackageInstaller.SessionParams.MODE_FULL_INSTALL); - final int sessionId = pi.createSession(params); - - try (PackageInstaller.Session session = pi.openSession(sessionId)) { - // Copy the apk to the install session. - final Resources resources = context.getResources(); - try (InputStream is = resources.openRawResource(rawApkResId); - OutputStream sessionOs = session.openWrite("base", 0, -1)) { - FileUtils.copy(is, sessionOs); - } - - // Wait for the installation to finish - try (TestReceiver receiver = new TestReceiver()) { - receiver.register(); - ShellIdentityUtils.invokeMethodWithShellPermissions(session, - (s) -> { - s.commit(receiver.makeIntentSender()); - return true; - }); - receiver.waitForIntent(); - } - } - } - - private void uninstallPackage(Context context, String packageName) throws Exception { - try (TestReceiver receiver = new TestReceiver()) { - receiver.register(); - final PackageInstaller pi = context.getPackageManager().getPackageInstaller(); - pi.uninstall(packageName, receiver.makeIntentSender()); - receiver.waitForIntent(); - } - } - private Context createUiContext() { final Context appContext = ApplicationProvider.getApplicationContext(); final DisplayManager displayManager = appContext.getSystemService(DisplayManager.class); diff --git a/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt b/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt index 2c4851f0ab4e..29ad0aa43672 100644 --- a/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt +++ b/core/tests/coretests/src/android/view/VerifiedMotionEventTest.kt @@ -18,6 +18,7 @@ package android.view import android.view.InputDevice.SOURCE_TOUCHSCREEN import android.view.MotionEvent.ACTION_MOVE +import android.view.MotionEvent.FLAG_IS_ACCESSIBILITY_EVENT import android.view.MotionEvent.FLAG_WINDOW_IS_OBSCURED import android.view.MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED import android.view.MotionEvent.FLAG_TAINTED @@ -49,6 +50,7 @@ class VerifiedMotionEventTest { assertEquals(RAW_Y, event.rawY, 0f) assertEquals(ACTION_MASKED, event.actionMasked) assertEquals(DOWN_TIME_NANOS, event.downTimeNanos) + assertEquals(FLAGS, event.flags) assertEquals(META_STATE, event.metaState) assertEquals(BUTTON_STATE, event.buttonState) } @@ -128,8 +130,9 @@ class VerifiedMotionEventTest { assertNull(motionEvent.getFlag(0)) // Flag that was not set assertEquals(false, motionEvent.getFlag(FLAG_WINDOW_IS_PARTIALLY_OBSCURED)) - // Flag that was set + // Flags that were set assertEquals(true, motionEvent.getFlag(FLAG_WINDOW_IS_OBSCURED)) + assertEquals(true, motionEvent.getFlag(FLAG_IS_ACCESSIBILITY_EVENT)) // Only 1 flag at a time is accepted assertNull(motionEvent.getFlag( FLAG_WINDOW_IS_PARTIALLY_OBSCURED or FLAG_WINDOW_IS_OBSCURED)) @@ -153,7 +156,7 @@ class VerifiedMotionEventTest { private const val RAW_Y = 200f private const val ACTION_MASKED = ACTION_MOVE private const val DOWN_TIME_NANOS: Long = 1000 - private const val FLAGS = FLAG_WINDOW_IS_OBSCURED + private const val FLAGS = FLAG_WINDOW_IS_OBSCURED or FLAG_IS_ACCESSIBILITY_EVENT private const val META_STATE = 11 private const val BUTTON_STATE = 22 @@ -178,6 +181,7 @@ class VerifiedMotionEventTest { assertEquals(event1.rawY, event2.rawY, 0f) assertEquals(event1.actionMasked, event2.actionMasked) assertEquals(event1.downTimeNanos, event2.downTimeNanos) + assertEquals(event1.flags, event2.flags) assertEquals(event1.metaState, event2.metaState) assertEquals(event1.buttonState, event2.buttonState) } diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsProviderTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsProviderTest.java index cbd67c8324f4..0147cdb186f3 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsProviderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsProviderTest.java @@ -204,6 +204,7 @@ public class BatteryUsageStatsProviderTest { BatteryUsageStatsStore batteryUsageStatsStore = new BatteryUsageStatsStore(context, batteryStats, new File(context.getCacheDir(), "BatteryUsageStatsProviderTest"), new TestHandler(), Integer.MAX_VALUE); + batteryUsageStatsStore.onSystemReady(); BatteryUsageStatsProvider provider = new BatteryUsageStatsProvider(context, batteryStats, batteryUsageStatsStore); diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java index 961e85950b29..083090c54619 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsRule.java @@ -66,6 +66,7 @@ public class BatteryUsageStatsRule implements TestRule { mMockClocks.currentTime = currentTime; mBatteryStats = new MockBatteryStatsImpl(mMockClocks); mBatteryStats.setPowerProfile(mPowerProfile); + mBatteryStats.onSystemReady(); } public BatteryUsageStatsRule setAveragePower(String key, double value) { diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsStoreTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsStoreTest.java index 141a9fa30c85..e478cd776558 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsStoreTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsStoreTest.java @@ -59,6 +59,7 @@ public class BatteryUsageStatsStoreTest { mBatteryStats = new MockBatteryStatsImpl(mMockClocks); mBatteryStats.setNoAutoReset(true); mBatteryStats.setPowerProfile(mock(PowerProfile.class)); + mBatteryStats.onSystemReady(); Context context = InstrumentationRegistry.getContext(); @@ -67,6 +68,7 @@ public class BatteryUsageStatsStoreTest { mBatteryUsageStatsStore = new BatteryUsageStatsStore(context, mBatteryStats, mStoreDirectory, new TestHandler(), MAX_BATTERY_STATS_SNAPSHOT_STORAGE_BYTES); + mBatteryUsageStatsStore.onSystemReady(); mBatteryUsageStatsProvider = new BatteryUsageStatsProvider(context, mBatteryStats); } diff --git a/data/etc/car/com.android.car.dialer.xml b/data/etc/car/com.android.car.dialer.xml index 61ae53a30209..97da67bbd23c 100644 --- a/data/etc/car/com.android.car.dialer.xml +++ b/data/etc/car/com.android.car.dialer.xml @@ -18,6 +18,7 @@ <privapp-permissions package="com.android.car.dialer"> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> + <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/> </privapp-permissions> </permissions> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 12eb50e5bee0..6385952fe884 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -496,6 +496,8 @@ applications that come with the platform <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" /> <!-- Permission required for CTS test - CtsAlarmManagerTestCases --> <permission name="android.permission.UPDATE_DEVICE_STATS" /> + <!-- Permission required for GTS test - PendingSystemUpdateTest --> + <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/graphics/java/android/graphics/HardwareRenderer.java b/graphics/java/android/graphics/HardwareRenderer.java index 30d1e0fdb9d8..fe04f0dd4c83 100644 --- a/graphics/java/android/graphics/HardwareRenderer.java +++ b/graphics/java/android/graphics/HardwareRenderer.java @@ -1304,6 +1304,11 @@ public class HardwareRenderer { */ public static native void preload(); + /** + * @hide + */ + public static native boolean isWebViewOverlaysEnabled(); + /** @hide */ protected static native void setupShadersDiskCache(String cacheFile, String skiaCacheFile); diff --git a/keystore/java/android/security/LegacyVpnProfileStore.java b/keystore/java/android/security/LegacyVpnProfileStore.java index 1d2738e71311..c85b6b1efd9a 100644 --- a/keystore/java/android/security/LegacyVpnProfileStore.java +++ b/keystore/java/android/security/LegacyVpnProfileStore.java @@ -19,7 +19,7 @@ package android.security; import android.annotation.NonNull; import android.os.ServiceManager; import android.os.ServiceSpecificException; -import android.security.vpnprofilestore.IVpnProfileStore; +import android.security.legacykeystore.ILegacyKeystore; import android.util.Log; /** @@ -32,14 +32,14 @@ import android.util.Log; public class LegacyVpnProfileStore { private static final String TAG = "LegacyVpnProfileStore"; - public static final int SYSTEM_ERROR = IVpnProfileStore.ERROR_SYSTEM_ERROR; - public static final int PROFILE_NOT_FOUND = IVpnProfileStore.ERROR_PROFILE_NOT_FOUND; + public static final int SYSTEM_ERROR = ILegacyKeystore.ERROR_SYSTEM_ERROR; + public static final int PROFILE_NOT_FOUND = ILegacyKeystore.ERROR_ENTRY_NOT_FOUND; - private static final String VPN_PROFILE_STORE_SERVICE_NAME = "android.security.vpnprofilestore"; + private static final String LEGACY_KEYSTORE_SERVICE_NAME = "android.security.legacykeystore"; - private static IVpnProfileStore getService() { - return IVpnProfileStore.Stub.asInterface( - ServiceManager.checkService(VPN_PROFILE_STORE_SERVICE_NAME)); + private static ILegacyKeystore getService() { + return ILegacyKeystore.Stub.asInterface( + ServiceManager.checkService(LEGACY_KEYSTORE_SERVICE_NAME)); } /** @@ -52,7 +52,7 @@ public class LegacyVpnProfileStore { */ public static boolean put(@NonNull String alias, @NonNull byte[] profile) { try { - getService().put(alias, profile); + getService().put(alias, ILegacyKeystore.UID_SELF, profile); return true; } catch (Exception e) { Log.e(TAG, "Failed to put vpn profile.", e); @@ -71,7 +71,7 @@ public class LegacyVpnProfileStore { */ public static byte[] get(@NonNull String alias) { try { - return getService().get(alias); + return getService().get(alias, ILegacyKeystore.UID_SELF); } catch (ServiceSpecificException e) { if (e.errorCode != PROFILE_NOT_FOUND) { Log.e(TAG, "Failed to get vpn profile.", e); @@ -90,7 +90,7 @@ public class LegacyVpnProfileStore { */ public static boolean remove(@NonNull String alias) { try { - getService().remove(alias); + getService().remove(alias, ILegacyKeystore.UID_SELF); return true; } catch (ServiceSpecificException e) { if (e.errorCode != PROFILE_NOT_FOUND) { @@ -110,7 +110,7 @@ public class LegacyVpnProfileStore { */ public static @NonNull String[] list(@NonNull String prefix) { try { - final String[] aliases = getService().list(prefix); + final String[] aliases = getService().list(prefix, ILegacyKeystore.UID_SELF); for (int i = 0; i < aliases.length; ++i) { aliases[i] = aliases[i].substring(prefix.length()); } diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 69fc25a378cf..06aaad7d65ca 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -45,10 +45,10 @@ <string name="accessibility_action_divider_top_50" msgid="8649582798829048946">"Bovenste scherm 50%"</string> <string name="accessibility_action_divider_top_30" msgid="3572788224908570257">"Bovenste scherm 30%"</string> <string name="accessibility_action_divider_bottom_full" msgid="2831868345092314060">"Onderste scherm op volledig scherm"</string> - <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Bediening met één hand gebruiken"</string> + <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Bediening met 1 hand gebruiken"</string> <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Als je wilt afsluiten, swipe je omhoog vanaf de onderkant van het scherm of tik je ergens boven de app"</string> - <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Bediening met één hand starten"</string> - <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Bediening met één hand afsluiten"</string> + <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Bediening met 1 hand starten"</string> + <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Bediening met 1 hand afsluiten"</string> <string name="bubbles_settings_button_description" msgid="1301286017420516912">"Instellingen voor <xliff:g id="APP_NAME">%1$s</xliff:g>-bubbels"</string> <string name="bubble_overflow_button_content_description" msgid="8160974472718594382">"Overloop"</string> <string name="bubble_accessibility_action_add_back" msgid="1830101076853540953">"Weer toevoegen aan stack"</string> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java index cb27ad9f58f5..f565724813eb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java @@ -159,6 +159,14 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged } } + private void dispatchImeControlTargetChanged(int displayId, boolean controlling) { + synchronized (mPositionProcessors) { + for (ImePositionProcessor pp : mPositionProcessors) { + pp.onImeControlTargetChanged(displayId, controlling); + } + } + } + private void dispatchVisibilityChanged(int displayId, boolean isShowing) { synchronized (mPositionProcessors) { for (ImePositionProcessor pp : mPositionProcessors) { @@ -237,42 +245,52 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged protected void insetsControlChanged(InsetsState insetsState, InsetsSourceControl[] activeControls) { insetsChanged(insetsState); + InsetsSourceControl imeSourceControl = null; if (activeControls != null) { for (InsetsSourceControl activeControl : activeControls) { if (activeControl == null) { continue; } if (activeControl.getType() == InsetsState.ITYPE_IME) { - final Point lastSurfacePosition = mImeSourceControl != null - ? mImeSourceControl.getSurfacePosition() : null; - final boolean positionChanged = - !activeControl.getSurfacePosition().equals(lastSurfacePosition); - final boolean leashChanged = - !haveSameLeash(mImeSourceControl, activeControl); - final InsetsSourceControl lastImeControl = mImeSourceControl; - mImeSourceControl = activeControl; - if (mAnimation != null) { - if (positionChanged) { - startAnimation(mImeShowing, true /* forceRestart */); - } - } else { - if (leashChanged) { - applyVisibilityToLeash(); - } - if (!mImeShowing) { - removeImeSurface(); - } - } - if (lastImeControl != null) { - lastImeControl.release(SurfaceControl::release); - } + imeSourceControl = activeControl; + } + } + } + + final boolean hadImeSourceControl = mImeSourceControl != null; + final boolean hasImeSourceControl = imeSourceControl != null; + if (hadImeSourceControl != hasImeSourceControl) { + dispatchImeControlTargetChanged(mDisplayId, hasImeSourceControl); + } + + if (hasImeSourceControl) { + final Point lastSurfacePosition = mImeSourceControl != null + ? mImeSourceControl.getSurfacePosition() : null; + final boolean positionChanged = + !imeSourceControl.getSurfacePosition().equals(lastSurfacePosition); + final boolean leashChanged = + !haveSameLeash(mImeSourceControl, imeSourceControl); + if (mAnimation != null) { + if (positionChanged) { + startAnimation(mImeShowing, true /* forceRestart */); + } + } else { + if (leashChanged) { + applyVisibilityToLeash(imeSourceControl); } + if (!mImeShowing) { + removeImeSurface(); + } + } + if (mImeSourceControl != null) { + mImeSourceControl.release(SurfaceControl::release); } + mImeSourceControl = imeSourceControl; } } - private void applyVisibilityToLeash() { - SurfaceControl leash = mImeSourceControl.getLeash(); + private void applyVisibilityToLeash(InsetsSourceControl imeSourceControl) { + SurfaceControl leash = imeSourceControl.getLeash(); if (leash != null) { SurfaceControl.Transaction t = mTransactionPool.acquire(); if (mImeShowing) { @@ -584,6 +602,15 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged } /** + * Called when the IME control target changed. So that the processor can restore its + * adjusted layout when the IME insets is not controlling by the current controller anymore. + * + * @param controlling indicates whether the current controller is controlling IME insets. + */ + default void onImeControlTargetChanged(int displayId, boolean controlling) { + } + + /** * Called when the IME visibility changed. * * @param isShowing {@code true} if the IME is shown. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java index e42f511eb391..5b158d2063ba 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java @@ -366,6 +366,7 @@ public final class SplitLayout { private final int mDisplayId; + private boolean mImeShown; private int mYOffsetForIme; private float mDimValue1; private float mDimValue2; @@ -392,6 +393,7 @@ public final class SplitLayout { if (!mInitialized || imeTargetPosition == SPLIT_POSITION_UNDEFINED) return 0; mStartImeTop = showing ? hiddenTop : shownTop; mEndImeTop = showing ? shownTop : hiddenTop; + mImeShown = showing; // Update target dim values mLastDim1 = mDimValue1; @@ -414,7 +416,7 @@ public final class SplitLayout { mSplitWindowManager.setInteractive( !showing || imeTargetPosition == SPLIT_POSITION_UNDEFINED); - return 0; + return needOffset ? IME_ANIMATION_NO_ALPHA : 0; } @Override @@ -432,6 +434,17 @@ public final class SplitLayout { mSplitLayoutHandler.onBoundsChanging(SplitLayout.this); } + @Override + public void onImeControlTargetChanged(int displayId, boolean controlling) { + if (displayId != mDisplayId) return; + // Restore the split layout when wm-shell is not controlling IME insets anymore. + if (!controlling && mImeShown) { + reset(); + mSplitWindowManager.setInteractive(true); + mSplitLayoutHandler.onBoundsChanging(SplitLayout.this); + } + } + private int getTargetYOffset() { final int desireOffset = Math.abs(mEndImeTop - mStartImeTop); // Make sure to keep at least 30% visible for the top split. @@ -461,8 +474,10 @@ public final class SplitLayout { } private void reset() { - mYOffsetForIme = 0; - mDimValue1 = mDimValue2 = 0.0f; + mImeShown = false; + mYOffsetForIme = mLastYOffset = mTargetYOffset = 0; + mDimValue1 = mLastDim1 = mTargetDim1 = 0.0f; + mDimValue2 = mLastDim2 = mTargetDim2 = 0.0f; } /* Adjust bounds with IME offset. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java index 23171bb9575c..aced072c8c71 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java @@ -91,7 +91,6 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor private boolean mPaused = true; private boolean mPausedTargetAdjusted = false; - private boolean mAdjustedWhileHidden = false; DividerImeController(LegacySplitScreenTaskListener splits, TransactionPool pool, ShellExecutor mainExecutor, TaskOrganizer taskOrganizer) { @@ -123,7 +122,6 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor void reset() { mPaused = true; mPausedTargetAdjusted = false; - mAdjustedWhileHidden = false; mAnimation = null; mAdjusted = mTargetAdjusted = false; mImeWasShown = mTargetShown = false; @@ -140,6 +138,19 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor ? ADJUSTED_NONFOCUS_DIM : 0.f; } + + @Override + public void onImeControlTargetChanged(int displayId, boolean controlling) { + // Restore the split layout when wm-shell is not controlling IME insets anymore. + if (!controlling && mTargetShown) { + mPaused = false; + mTargetAdjusted = mTargetShown = false; + mTargetPrimaryDim = mTargetSecondaryDim = 0.f; + updateImeAdjustState(true /* force */); + startAsyncAnimation(); + } + } + @Override @ImeAnimationFlags public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop, @@ -151,8 +162,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor mShownTop = shownTop; mTargetShown = imeShouldShow; mSecondaryHasFocus = getSecondaryHasFocus(displayId); - final boolean splitIsVisible = !getView().isHidden(); - final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus + final boolean targetAdjusted = imeShouldShow && mSecondaryHasFocus && !imeIsFloating && !getLayout().mDisplayLayout.isLandscape() && !mSplits.mSplitScreenController.isMinimized(); if (mLastAdjustTop < 0) { @@ -176,7 +186,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor } mTargetAdjusted = targetAdjusted; updateDimTargets(); - if (DEBUG) Slog.d(TAG, " ime starting. vis:" + splitIsVisible + " " + dumpState()); + if (DEBUG) Slog.d(TAG, " ime starting. " + dumpState()); if (mAnimation != null || (mImeWasShown && imeShouldShow && mTargetAdjusted != mAdjusted)) { // We need to animate adjustment independently of the IME position, so @@ -184,13 +194,8 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor // different split's editor has gained focus while the IME is still visible. startAsyncAnimation(); } - if (splitIsVisible) { - // If split is hidden, we don't want to trigger any relayouts that would cause the - // divider to show again. - updateImeAdjustState(); - } else { - mAdjustedWhileHidden = true; - } + updateImeAdjustState(); + return (mTargetAdjusted || mAdjusted) ? IME_ANIMATION_NO_ALPHA : 0; } @@ -256,11 +261,6 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor mSplits.mSplitScreenController.setAdjustedForIme(mTargetShown && !mPaused); } - public void updateAdjustForIme() { - updateImeAdjustState(mAdjustedWhileHidden); - mAdjustedWhileHidden = false; - } - @Override public void onImePositionChanged(int displayId, int imeTop, SurfaceControl.Transaction t) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenController.java index 261ff2f8de83..80ab166d0649 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenController.java @@ -146,10 +146,8 @@ public class LegacySplitScreenController implements DisplayController.OnDisplays new LegacySplitDisplayLayout(mContext, displayLayout, mSplits); sdl.rotateTo(toRotation); mRotateSplitLayout = sdl; - final int position = isDividerVisible() - ? (mMinimized ? mView.mSnapTargetBeforeMinimized.position - : mView.getCurrentPosition()) - // snap resets to middle target when not in split-mode + // snap resets to middle target when not minimized and rotation changed. + final int position = mMinimized ? mView.mSnapTargetBeforeMinimized.position : sdl.getSnapAlgorithm().getMiddleTarget().position; DividerSnapAlgorithm snap = sdl.getSnapAlgorithm(); final DividerSnapAlgorithm.SnapTarget target = @@ -229,9 +227,6 @@ public class LegacySplitScreenController implements DisplayController.OnDisplays return; } mView.setHidden(showing); - if (!showing) { - mImePositionProcessor.updateAdjustForIme(); - } mIsKeyguardShowing = showing; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java index 046c32071358..a4b866aa3f5e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java @@ -19,6 +19,7 @@ package com.android.wm.shell.pip; import static android.util.TypedValue.COMPLEX_UNIT_DIP; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.PictureInPictureParams; import android.content.Context; import android.content.pm.ActivityInfo; @@ -454,6 +455,56 @@ public class PipBoundsAlgorithm { } /** + * @return the normal bounds adjusted so that they fit the menu actions. + */ + public Rect adjustNormalBoundsToFitMenu(@NonNull Rect normalBounds, + @Nullable Size minMenuSize) { + if (minMenuSize == null) { + return normalBounds; + } + if (normalBounds.width() >= minMenuSize.getWidth() + && normalBounds.height() >= minMenuSize.getHeight()) { + // The normal bounds can fit the menu as is, no need to adjust the bounds. + return normalBounds; + } + final Rect adjustedNormalBounds = new Rect(); + final boolean needsWidthAdj = minMenuSize.getWidth() > normalBounds.width(); + final boolean needsHeightAdj = minMenuSize.getHeight() > normalBounds.height(); + final int adjWidth; + final int adjHeight; + if (needsWidthAdj && needsHeightAdj) { + // Both the width and the height are too small - find the edge that needs the larger + // adjustment and scale that edge. The other edge will scale beyond the minMenuSize + // when the aspect ratio is applied. + final float widthScaleFactor = + ((float) (minMenuSize.getWidth())) / ((float) (normalBounds.width())); + final float heightScaleFactor = + ((float) (minMenuSize.getHeight())) / ((float) (normalBounds.height())); + if (widthScaleFactor > heightScaleFactor) { + adjWidth = minMenuSize.getWidth(); + adjHeight = Math.round(adjWidth / mPipBoundsState.getAspectRatio()); + } else { + adjHeight = minMenuSize.getHeight(); + adjWidth = Math.round(adjHeight * mPipBoundsState.getAspectRatio()); + } + } else if (needsWidthAdj) { + // Width is too small - use the min menu size width instead. + adjWidth = minMenuSize.getWidth(); + adjHeight = Math.round(adjWidth / mPipBoundsState.getAspectRatio()); + } else { + // Height is too small - use the min menu size height instead. + adjHeight = minMenuSize.getHeight(); + adjWidth = Math.round(adjHeight * mPipBoundsState.getAspectRatio()); + } + adjustedNormalBounds.set(0, 0, adjWidth, adjHeight); + // Make sure the bounds conform to the aspect ratio and min edge size. + transformBoundsToAspectRatio(adjustedNormalBounds, + mPipBoundsState.getAspectRatio(), true /* useCurrentMinEdgeSize */, + true /* useCurrentSize */); + return adjustedNormalBounds; + } + + /** * Dumps internal states. */ public void dump(PrintWriter pw, String prefix) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 324a6e27a242..f367cd608f37 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -722,6 +722,14 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) { mOnDisplayIdChangeCallback.accept(Display.DEFAULT_DISPLAY); } + + final PipAnimationController.PipTransitionAnimator animator = + mPipAnimationController.getCurrentAnimator(); + if (animator != null) { + animator.removeAllUpdateListeners(); + animator.removeAllListeners(); + animator.cancel(); + } } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java index f0bd8a2846ed..c816f18c2fc2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java @@ -246,10 +246,20 @@ public class PipResizeGestureHandler { } if (ev instanceof MotionEvent) { + MotionEvent mv = (MotionEvent) ev; + int action = mv.getActionMasked(); + final Rect pipBounds = mPipBoundsState.getBounds(); + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + if (!pipBounds.contains((int) mv.getRawX(), (int) mv.getRawY()) + && mPhonePipMenuController.isMenuVisible()) { + mPhonePipMenuController.hideMenu(); + } + } + if (mEnablePinchResize && mOngoingPinchToResize) { - onPinchResize((MotionEvent) ev); + onPinchResize(mv); } else if (mEnableDragCornerResize) { - onDragCornerResize((MotionEvent) ev); + onDragCornerResize(mv); } } } @@ -450,7 +460,6 @@ public class PipResizeGestureHandler { float x = ev.getX(); float y = ev.getY() - mOhmOffset; if (action == MotionEvent.ACTION_DOWN) { - final Rect currentPipBounds = mPipBoundsState.getBounds(); mLastResizeBounds.setEmpty(); mAllowGesture = isInValidSysUiState() && isWithinDragResizeRegion((int) x, (int) y); if (mAllowGesture) { @@ -458,11 +467,6 @@ public class PipResizeGestureHandler { mDownPoint.set(x, y); mDownBounds.set(mPipBoundsState.getBounds()); } - if (!currentPipBounds.contains((int) x, (int) y) - && mPhonePipMenuController.isMenuVisible()) { - mPhonePipMenuController.hideMenu(); - } - } else if (mAllowGesture) { switch (action) { case MotionEvent.ACTION_POINTER_DOWN: diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java index b1086c575f49..0bcd1a363eb6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java @@ -726,12 +726,17 @@ public class PipTouchHandler { } private void animateToNormalSize(Runnable callback) { + // Save the current bounds as the user-resize bounds. mPipResizeGestureHandler.setUserResizeBounds(mPipBoundsState.getBounds()); - final Rect normalBounds = new Rect(mPipBoundsState.getNormalBounds()); + + final Size minMenuSize = mMenuController.getEstimatedMinMenuSize(); + final Rect normalBounds = mPipBoundsState.getNormalBounds(); + final Rect destBounds = mPipBoundsAlgorithm.adjustNormalBoundsToFitMenu(normalBounds, + minMenuSize); Rect restoredMovementBounds = new Rect(); - mPipBoundsAlgorithm.getMovementBounds(normalBounds, + mPipBoundsAlgorithm.getMovementBounds(destBounds, mInsetBounds, restoredMovementBounds, mIsImeShowing ? mImeHeight : 0); - mSavedSnapFraction = mMotionHelper.animateToExpandedState(normalBounds, + mSavedSnapFraction = mMotionHelper.animateToExpandedState(destBounds, mPipBoundsState.getMovementBounds(), restoredMovementBounds, callback); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java index 9986154b051d..4e477ca104dd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java @@ -85,7 +85,10 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener { } View iconView = view.getIconView(); - if (iconView == null || iconView.getBackground() == null) { + + // If the icon and the background are invisible, don't animate it + if (iconView == null || iconView.getLayoutParams().width == 0 + || iconView.getLayoutParams().height == 0) { mIconFadeOutDuration = 0; mIconStartAlpha = 0; mAppRevealDelay = 0; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java index df3fee043419..b09d0d89a6b9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java @@ -77,6 +77,13 @@ public class SplashscreenContentDrawer { // For example, an icon with the foreground 108*108 opaque pixels and it's background // also 108*108 pixels, then do not enlarge this icon if only need to show foreground icon. private static final float ENLARGE_FOREGROUND_ICON_THRESHOLD = (72f * 72f) / (108f * 108f); + + /** + * If the developer doesn't specify a background for the icon, we slightly scale it up. + * + * The background is either manually specified in the theme or the Adaptive Icon + * background is used if it's different from the window background. + */ private static final float NO_BACKGROUND_SCALE = 192f / 160; private final Context mContext; private final IconProvider mIconProvider; @@ -228,7 +235,7 @@ public class SplashscreenContentDrawer { attrs.mWindowBgColor = safeReturnAttrDefault((def) -> typedArray.getColor( R.styleable.Window_windowSplashScreenBackground, def), Color.TRANSPARENT); - attrs.mReplaceIcon = safeReturnAttrDefault((def) -> typedArray.getDrawable( + attrs.mSplashScreenIcon = safeReturnAttrDefault((def) -> typedArray.getDrawable( R.styleable.Window_windowSplashScreenAnimatedIcon), null); attrs.mAnimationDuration = safeReturnAttrDefault((def) -> typedArray.getInt( R.styleable.Window_windowSplashScreenAnimationDuration, def), 0); @@ -241,7 +248,7 @@ public class SplashscreenContentDrawer { if (DEBUG) { Slog.d(TAG, "window attributes color: " + Integer.toHexString(attrs.mWindowBgColor) - + " icon " + attrs.mReplaceIcon + " duration " + attrs.mAnimationDuration + + " icon " + attrs.mSplashScreenIcon + " duration " + attrs.mAnimationDuration + " brandImage " + attrs.mBrandingImage); } } @@ -250,7 +257,7 @@ public class SplashscreenContentDrawer { public static class SplashScreenWindowAttrs { private int mWindowBgResId = 0; private int mWindowBgColor = Color.TRANSPARENT; - private Drawable mReplaceIcon = null; + private Drawable mSplashScreenIcon = null; private Drawable mBrandingImage = null; private int mIconBgColor = Color.TRANSPARENT; private int mAnimationDuration = 0; @@ -287,10 +294,15 @@ public class SplashscreenContentDrawer { // empty splash screen case animationDuration = 0; mFinalIconSize = 0; - } else if (mTmpAttrs.mReplaceIcon != null) { + } else if (mTmpAttrs.mSplashScreenIcon != null) { // replaced icon, don't process - iconDrawable = mTmpAttrs.mReplaceIcon; + iconDrawable = mTmpAttrs.mSplashScreenIcon; animationDuration = mTmpAttrs.mAnimationDuration; + + // There is no background below the icon, so scale the icon up + if (mTmpAttrs.mIconBgColor == Color.TRANSPARENT) { + mFinalIconSize *= NO_BACKGROUND_SCALE; + } createIconDrawable(iconDrawable, false); } else { final float iconScale = (float) mIconSize / (float) mDefaultIconSize; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java index dae7055ede53..211941f44c8e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java @@ -162,6 +162,7 @@ public class SplashscreenIconDrawableFactory { @Override public void draw(Canvas canvas) { + canvas.clipPath(mMaskScaleOnly); if (mMaskScaleOnly != null) { canvas.drawPath(mMaskScaleOnly, mPaint); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java index a0c6d1138698..90f898aa09da 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java @@ -402,6 +402,64 @@ public class PipBoundsAlgorithmTest extends ShellTestCase { assertBoundsInclusionWithMargin("useDefaultBounds", defaultBounds, actualBounds); } + @Test + public void adjustNormalBoundsToFitMenu_alreadyFits() { + final Rect normalBounds = new Rect(0, 0, 400, 711); + final Size minMenuSize = new Size(396, 292); + mPipBoundsState.setAspectRatio( + ((float) normalBounds.width()) / ((float) normalBounds.height())); + + final Rect bounds = + mPipBoundsAlgorithm.adjustNormalBoundsToFitMenu(normalBounds, minMenuSize); + + assertEquals(normalBounds, bounds); + } + + @Test + public void adjustNormalBoundsToFitMenu_widthTooSmall() { + final Rect normalBounds = new Rect(0, 0, 297, 528); + final Size minMenuSize = new Size(396, 292); + mPipBoundsState.setAspectRatio( + ((float) normalBounds.width()) / ((float) normalBounds.height())); + + final Rect bounds = + mPipBoundsAlgorithm.adjustNormalBoundsToFitMenu(normalBounds, minMenuSize); + + assertEquals(minMenuSize.getWidth(), bounds.width()); + assertEquals(minMenuSize.getWidth() / mPipBoundsState.getAspectRatio(), + bounds.height(), 0.3f); + } + + @Test + public void adjustNormalBoundsToFitMenu_heightTooSmall() { + final Rect normalBounds = new Rect(0, 0, 400, 280); + final Size minMenuSize = new Size(396, 292); + mPipBoundsState.setAspectRatio( + ((float) normalBounds.width()) / ((float) normalBounds.height())); + + final Rect bounds = + mPipBoundsAlgorithm.adjustNormalBoundsToFitMenu(normalBounds, minMenuSize); + + assertEquals(minMenuSize.getHeight(), bounds.height()); + assertEquals(minMenuSize.getHeight() * mPipBoundsState.getAspectRatio(), + bounds.width(), 0.3f); + } + + @Test + public void adjustNormalBoundsToFitMenu_widthAndHeightTooSmall() { + final Rect normalBounds = new Rect(0, 0, 350, 280); + final Size minMenuSize = new Size(396, 292); + mPipBoundsState.setAspectRatio( + ((float) normalBounds.width()) / ((float) normalBounds.height())); + + final Rect bounds = + mPipBoundsAlgorithm.adjustNormalBoundsToFitMenu(normalBounds, minMenuSize); + + assertEquals(minMenuSize.getWidth(), bounds.width()); + assertEquals(minMenuSize.getWidth() / mPipBoundsState.getAspectRatio(), + bounds.height(), 0.3f); + } + private void overrideDefaultAspectRatio(float aspectRatio) { final TestableResources res = mContext.getOrCreateTestableResources(); res.addOverride( diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index 894b479c11db..eb5878d95561 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -133,6 +133,12 @@ public: } } + void onRemovedFromTree() { + if (mImpl) { + mImpl->onRemovedFromTree(); + } + } + [[nodiscard]] bool hasText() const { return mImpl && mImpl->hasText(); } @@ -172,6 +178,7 @@ private: return false; } void syncContents(const WebViewSyncData& data) { } + void onRemovedFromTree() { } void applyColorTransform(ColorTransform transform) { } }; @@ -298,6 +305,10 @@ public: apply([&](auto& it) { it.syncContents(data); }); } + void onRemovedFromTree() { + apply([&](auto& it) { it.onRemovedFromTree(); }); + } + [[nodiscard]] bool hasText() const { return apply([](const auto& it) -> auto { return it.hasText(); }); } diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index f0995c4f324b..b8fa55a18dac 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -84,6 +84,8 @@ float Properties::defaultSdrWhitePoint = 200.f; bool Properties::useHintManager = true; int Properties::targetCpuTimePercentage = 70; +bool Properties::enableWebViewOverlays = false; + StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI; bool Properties::load() { @@ -137,6 +139,8 @@ bool Properties::load() { targetCpuTimePercentage = base::GetIntProperty(PROPERTY_TARGET_CPU_TIME_PERCENTAGE, 70); if (targetCpuTimePercentage <= 0 || targetCpuTimePercentage > 100) targetCpuTimePercentage = 70; + enableWebViewOverlays = base::GetBoolProperty(PROPERTY_WEBVIEW_OVERLAYS_ENABLED, false); + return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw); } diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index f5fd0036f7be..7df6e2c92247 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -182,6 +182,11 @@ enum DebugLevel { */ #define PROPERTY_REDUCE_OPS_TASK_SPLITTING "renderthread.skia.reduceopstasksplitting" +/** + * Enable WebView Overlays feature. + */ +#define PROPERTY_WEBVIEW_OVERLAYS_ENABLED "debug.hwui.webview_overlays_enabled" + /////////////////////////////////////////////////////////////////////////////// // Misc /////////////////////////////////////////////////////////////////////////////// @@ -276,6 +281,8 @@ public: static bool useHintManager; static int targetCpuTimePercentage; + static bool enableWebViewOverlays; + static StretchEffectBehavior getStretchEffectBehavior() { return stretchEffectBehavior; } diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 44c335f6adb3..0c422df65881 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -18,6 +18,7 @@ #include "DamageAccumulator.h" #include "Debug.h" +#include "Properties.h" #include "TreeInfo.h" #include "VectorDrawable.h" #include "private/hwui/WebViewFunctor.h" @@ -473,6 +474,9 @@ void RenderNode::decParentRefCount(TreeObserver& observer, TreeInfo* info) { } void RenderNode::onRemovedFromTree(TreeInfo* info) { + if (Properties::enableWebViewOverlays && mDisplayList) { + mDisplayList.onRemovedFromTree(); + } destroyHardwareResources(info); } diff --git a/libs/hwui/WebViewFunctorManager.cpp b/libs/hwui/WebViewFunctorManager.cpp index 92e20c477669..df4101109a18 100644 --- a/libs/hwui/WebViewFunctorManager.cpp +++ b/libs/hwui/WebViewFunctorManager.cpp @@ -108,6 +108,13 @@ void WebViewFunctor::sync(const WebViewSyncData& syncData) const { mCallbacks.onSync(mFunctor, mData, syncData); } +void WebViewFunctor::onRemovedFromTree() { + ATRACE_NAME("WebViewFunctor::onRemovedFromTree"); + if (mSurfaceControl) { + removeOverlays(); + } +} + void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) { ATRACE_NAME("WebViewFunctor::drawGl"); if (!mHasContext) { @@ -121,12 +128,19 @@ void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) { .mergeTransaction = currentFunctor.mergeTransaction, }; - if (!drawInfo.isLayer) { + if (Properties::enableWebViewOverlays && !drawInfo.isLayer) { renderthread::CanvasContext* activeContext = renderthread::CanvasContext::getActiveContext(); if (activeContext != nullptr) { ASurfaceControl* rootSurfaceControl = activeContext->getSurfaceControl(); - if (rootSurfaceControl) overlayParams.overlaysMode = OverlaysMode::Enabled; + if (rootSurfaceControl) { + overlayParams.overlaysMode = OverlaysMode::Enabled; + int32_t rgid = activeContext->getSurfaceControlGenerationId(); + if (mParentSurfaceControlGenerationId != rgid) { + reparentSurfaceControl(rootSurfaceControl); + mParentSurfaceControlGenerationId = rgid; + } + } } } @@ -178,6 +192,7 @@ void WebViewFunctor::removeOverlays() { ScopedCurrentFunctor currentFunctor(this); mCallbacks.removeOverlays(mFunctor, mData, currentFunctor.mergeTransaction); if (mSurfaceControl) { + reparentSurfaceControl(nullptr); auto funcs = renderthread::RenderThread::getInstance().getASurfaceControlFunctions(); funcs.releaseFunc(mSurfaceControl); mSurfaceControl = nullptr; @@ -195,6 +210,7 @@ ASurfaceControl* WebViewFunctor::getSurfaceControl() { LOG_ALWAYS_FATAL_IF(rootSurfaceControl == nullptr, "Null root surface control!"); auto funcs = renderthread::RenderThread::getInstance().getASurfaceControlFunctions(); + mParentSurfaceControlGenerationId = activeContext->getSurfaceControlGenerationId(); mSurfaceControl = funcs.createFunc(rootSurfaceControl, "Webview Overlay SurfaceControl"); ASurfaceTransaction* transaction = funcs.transactionCreateFunc(); activeContext->prepareSurfaceControlForWebview(); @@ -209,15 +225,29 @@ ASurfaceControl* WebViewFunctor::getSurfaceControl() { void WebViewFunctor::mergeTransaction(ASurfaceTransaction* transaction) { ATRACE_NAME("WebViewFunctor::mergeTransaction"); if (transaction == nullptr) return; + bool done = false; renderthread::CanvasContext* activeContext = renderthread::CanvasContext::getActiveContext(); - LOG_ALWAYS_FATAL_IF(activeContext == nullptr, "Null active canvas context!"); - bool done = activeContext->mergeTransaction(transaction, mSurfaceControl); + // activeContext might be null when called from mCallbacks.removeOverlays() + if (activeContext != nullptr) { + done = activeContext->mergeTransaction(transaction, mSurfaceControl); + } if (!done) { auto funcs = renderthread::RenderThread::getInstance().getASurfaceControlFunctions(); funcs.transactionApplyFunc(transaction); } } +void WebViewFunctor::reparentSurfaceControl(ASurfaceControl* parent) { + ATRACE_NAME("WebViewFunctor::reparentSurfaceControl"); + if (mSurfaceControl == nullptr) return; + + auto funcs = renderthread::RenderThread::getInstance().getASurfaceControlFunctions(); + ASurfaceTransaction* transaction = funcs.transactionCreateFunc(); + funcs.transactionReparentFunc(transaction, mSurfaceControl, parent); + mergeTransaction(transaction); + funcs.transactionDeleteFunc(transaction); +} + WebViewFunctorManager& WebViewFunctorManager::instance() { static WebViewFunctorManager sInstance; return sInstance; diff --git a/libs/hwui/WebViewFunctorManager.h b/libs/hwui/WebViewFunctorManager.h index a84cda550567..f28f310993ec 100644 --- a/libs/hwui/WebViewFunctorManager.h +++ b/libs/hwui/WebViewFunctorManager.h @@ -58,6 +58,8 @@ public: void removeOverlays() { mReference.removeOverlays(); } + void onRemovedFromTree() { mReference.onRemovedFromTree(); } + private: friend class WebViewFunctor; @@ -74,6 +76,7 @@ public: void postDrawVk(); void destroyContext(); void removeOverlays(); + void onRemovedFromTree(); ASurfaceControl* getSurfaceControl(); void mergeTransaction(ASurfaceTransaction* transaction); @@ -85,12 +88,16 @@ public: } private: + void reparentSurfaceControl(ASurfaceControl* parent); + +private: WebViewFunctorCallbacks mCallbacks; void* const mData; int mFunctor; RenderMode mMode; bool mHasContext = false; bool mCreatedHandle = false; + int32_t mParentSurfaceControlGenerationId = 0; ASurfaceControl* mSurfaceControl = nullptr; }; diff --git a/libs/hwui/canvas/CanvasOpBuffer.cpp b/libs/hwui/canvas/CanvasOpBuffer.cpp index 6089c572b0d5..336c5d8dab35 100644 --- a/libs/hwui/canvas/CanvasOpBuffer.cpp +++ b/libs/hwui/canvas/CanvasOpBuffer.cpp @@ -46,6 +46,10 @@ void CanvasOpBuffer::syncContents(const WebViewSyncData& data) { LOG_ALWAYS_FATAL("TODO"); } +void CanvasOpBuffer::onRemovedFromTree() { + LOG_ALWAYS_FATAL("TODO"); +} + void CanvasOpBuffer::applyColorTransform(ColorTransform transform) { LOG_ALWAYS_FATAL("TODO"); } diff --git a/libs/hwui/canvas/CanvasOpBuffer.h b/libs/hwui/canvas/CanvasOpBuffer.h index af797ca8288b..529546d5c49c 100644 --- a/libs/hwui/canvas/CanvasOpBuffer.h +++ b/libs/hwui/canvas/CanvasOpBuffer.h @@ -100,6 +100,7 @@ public: TreeObserver& observer, TreeInfo& info, bool functorsNeedLayer, std::function<void(RenderNode*, TreeObserver&, TreeInfo&, bool)> childFn); void syncContents(const WebViewSyncData& data); + void onRemovedFromTree(); void applyColorTransform(ColorTransform transform); [[nodiscard]] bool isEmpty() const { return !mHas.content; } diff --git a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp index 4d31cd90d40f..ef3a11c13469 100644 --- a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp +++ b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp @@ -933,6 +933,11 @@ static void android_view_ThreadedRenderer_setupShadersDiskCache(JNIEnv* env, job env->ReleaseStringUTFChars(skiaDiskCachePath, skiaCacheArray); } +static jboolean android_view_ThreadedRenderer_isWebViewOverlaysEnabled(JNIEnv* env, jobject clazz) { + // this value is valid only after loadSystemProperties() is called + return Properties::enableWebViewOverlays; +} + // ---------------------------------------------------------------------------- // JNI Glue // ---------------------------------------------------------------------------- @@ -1025,6 +1030,8 @@ static const JNINativeMethod gMethods[] = { (void*)android_view_ThreadedRenderer_setDisplayDensityDpi}, {"nInitDisplayInfo", "(IIFIJJ)V", (void*)android_view_ThreadedRenderer_initDisplayInfo}, {"preload", "()V", (void*)android_view_ThreadedRenderer_preload}, + {"isWebViewOverlaysEnabled", "()Z", + (void*)android_view_ThreadedRenderer_isWebViewOverlaysEnabled}, }; static JavaVM* mJvm = nullptr; diff --git a/libs/hwui/pipeline/skia/FunctorDrawable.h b/libs/hwui/pipeline/skia/FunctorDrawable.h index 988a896b6267..9bbd0a92600b 100644 --- a/libs/hwui/pipeline/skia/FunctorDrawable.h +++ b/libs/hwui/pipeline/skia/FunctorDrawable.h @@ -44,6 +44,10 @@ public: mWebViewHandle->sync(data); } + virtual void onRemovedFromTree() { + mWebViewHandle->onRemovedFromTree(); + } + protected: virtual SkRect onGetBounds() override { return mBounds; } diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp index 3498f715b455..fcfc4f82abed 100644 --- a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp +++ b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp @@ -47,6 +47,12 @@ void SkiaDisplayList::syncContents(const WebViewSyncData& data) { } } +void SkiaDisplayList::onRemovedFromTree() { + for (auto& functor : mChildFunctors) { + functor->onRemovedFromTree(); + } +} + bool SkiaDisplayList::reuseDisplayList(RenderNode* node) { reset(); node->attachAvailableList(this); diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.h b/libs/hwui/pipeline/skia/SkiaDisplayList.h index 90e9bc6a1a28..2a677344b7b2 100644 --- a/libs/hwui/pipeline/skia/SkiaDisplayList.h +++ b/libs/hwui/pipeline/skia/SkiaDisplayList.h @@ -111,6 +111,13 @@ public: */ void syncContents(const WebViewSyncData& data); + /** + * ONLY to be called by RenderNode::onRemovedFromTree so that we can notify any + * contained VectorDrawables or GLFunctors. + * + */ + void onRemovedFromTree(); + void applyColorTransform(ColorTransform transform) { mDisplayList.applyColorTransform(transform); } diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index 5462623e75ff..44a6e4354608 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -59,6 +59,10 @@ void SkiaPipeline::onDestroyHardwareResources() { } bool SkiaPipeline::pinImages(std::vector<SkImage*>& mutableImages) { + if (!mRenderThread.getGrContext()) { + ALOGD("Trying to pin an image with an invalid GrContext"); + return false; + } for (SkImage* image : mutableImages) { if (SkImage_pinAsTexture(image, mRenderThread.getGrContext())) { mPinnedImages.emplace_back(sk_ref_sp(image)); diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 0c9711ba8025..81cee6103d22 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -201,6 +201,7 @@ void CanvasContext::setSurfaceControl(ASurfaceControl* surfaceControl) { funcs.releaseFunc(mSurfaceControl); } mSurfaceControl = surfaceControl; + mSurfaceControlGenerationId++; mExpectSurfaceStats = surfaceControl != nullptr; if (mSurfaceControl != nullptr) { funcs.acquireFunc(mSurfaceControl); diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index 3279ccb8e597..85af3e4fb0b6 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -110,6 +110,7 @@ public: GrDirectContext* getGrContext() const { return mRenderThread.getGrContext(); } ASurfaceControl* getSurfaceControl() const { return mSurfaceControl; } + int32_t getSurfaceControlGenerationId() const { return mSurfaceControlGenerationId; } // Won't take effect until next EGLSurface creation void setSwapBehavior(SwapBehavior swapBehavior); @@ -253,6 +254,9 @@ private: // The SurfaceControl reference is passed from ViewRootImpl, can be set to // NULL to remove the reference ASurfaceControl* mSurfaceControl = nullptr; + // id to track surface control changes and WebViewFunctor uses it to determine + // whether reparenting is needed + int32_t mSurfaceControlGenerationId = 0; // stopped indicates the CanvasContext will reject actual redraw operations, // and defer repaint until it is un-stopped bool mStopped = false; diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 524407d2b9b0..f83c0a4926f9 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -98,6 +98,10 @@ ASurfaceControlFunctions::ASurfaceControlFunctions() { LOG_ALWAYS_FATAL_IF(transactionApplyFunc == nullptr, "Failed to find required symbol ASurfaceTransaction_apply!"); + transactionReparentFunc = (AST_reparent)dlsym(handle_, "ASurfaceTransaction_reparent"); + LOG_ALWAYS_FATAL_IF(transactionReparentFunc == nullptr, + "Failed to find required symbol transactionReparentFunc!"); + transactionSetVisibilityFunc = (AST_setVisibility)dlsym(handle_, "ASurfaceTransaction_setVisibility"); LOG_ALWAYS_FATAL_IF(transactionSetVisibilityFunc == nullptr, diff --git a/libs/hwui/renderthread/RenderThread.h b/libs/hwui/renderthread/RenderThread.h index c5e3746587b8..05d225b856db 100644 --- a/libs/hwui/renderthread/RenderThread.h +++ b/libs/hwui/renderthread/RenderThread.h @@ -94,6 +94,9 @@ typedef uint64_t (*ASCStats_getFrameNumber)(ASurfaceControlStats* stats); typedef ASurfaceTransaction* (*AST_create)(); typedef void (*AST_delete)(ASurfaceTransaction* transaction); typedef void (*AST_apply)(ASurfaceTransaction* transaction); +typedef void (*AST_reparent)(ASurfaceTransaction* aSurfaceTransaction, + ASurfaceControl* aSurfaceControl, + ASurfaceControl* newParentASurfaceControl); typedef void (*AST_setVisibility)(ASurfaceTransaction* transaction, ASurfaceControl* surface_control, int8_t visibility); typedef void (*AST_setZOrder)(ASurfaceTransaction* transaction, ASurfaceControl* surface_control, @@ -113,6 +116,7 @@ struct ASurfaceControlFunctions { AST_create transactionCreateFunc; AST_delete transactionDeleteFunc; AST_apply transactionApplyFunc; + AST_reparent transactionReparentFunc; AST_setVisibility transactionSetVisibilityFunc; AST_setZOrder transactionSetZOrderFunc; }; diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index c8412f214cfa..1644ec892c7e 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -310,6 +310,10 @@ public final class AudioFormat implements Parcelable { public static final int ENCODING_LEGACY_SHORT_ARRAY_THRESHOLD = ENCODING_OPUS; /** Audio data format: PCM 24 bit per sample packed as 3 bytes. + * + * The bytes are in little-endian order, so the least significant byte + * comes first in the byte array. + * * Not guaranteed to be supported by devices, may be emulated if not supported. */ public static final int ENCODING_PCM_24BIT_PACKED = 21; /** Audio data format: PCM 32 bit per sample. diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 1efd4c6846e6..341bb8d5309a 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -840,7 +840,7 @@ public class MediaRecorder implements AudioRouting, setVideoSize(profile.getWidth(), profile.getHeight()); setVideoEncodingBitRate(profile.getBitrate()); setVideoEncoder(profile.getCodec()); - if (profile.getProfile() > 0) { + if (profile.getProfile() >= 0) { setVideoEncodingProfileLevel(profile.getProfile(), 0 /* level */); } } @@ -1121,10 +1121,10 @@ public class MediaRecorder implements AudioRouting, * @throws IllegalArgumentException when an invalid profile or level value is used. */ public void setVideoEncodingProfileLevel(int profile, int level) { - if (profile <= 0) { + if (profile < 0) { throw new IllegalArgumentException("Video encoding profile is not positive"); } - if (level <= 0) { + if (level < 0) { throw new IllegalArgumentException("Video encoding level is not positive"); } setParameter("video-param-encoder-profile=" + profile); diff --git a/media/java/android/media/MediaRouter2Manager.java b/media/java/android/media/MediaRouter2Manager.java index 915cb1272040..628f7eef84f9 100644 --- a/media/java/android/media/MediaRouter2Manager.java +++ b/media/java/android/media/MediaRouter2Manager.java @@ -221,10 +221,24 @@ public final class MediaRouter2Manager { Objects.requireNonNull(packageName, "packageName must not be null"); List<RoutingSessionInfo> sessions = getRoutingSessions(packageName); - return getAvailableRoutesForRoutingSession(sessions.get(sessions.size() - 1)); + return getAvailableRoutes(sessions.get(sessions.size() - 1)); } /** + * Gets routes that can be transferable seamlessly for an application. + * + * @param packageName the package name of the application + */ + @NonNull + public List<MediaRoute2Info> getTransferableRoutes(@NonNull String packageName) { + Objects.requireNonNull(packageName, "packageName must not be null"); + + List<RoutingSessionInfo> sessions = getRoutingSessions(packageName); + return getTransferableRoutes(sessions.get(sessions.size() - 1)); + } + + + /** * Gets available routes for the given routing session. * The returned routes can be passed to * {@link #transfer(RoutingSessionInfo, MediaRoute2Info)} for transferring the routing session. @@ -232,8 +246,7 @@ public final class MediaRouter2Manager { * @param sessionInfo the routing session that would be transferred */ @NonNull - public List<MediaRoute2Info> getAvailableRoutesForRoutingSession( - @NonNull RoutingSessionInfo sessionInfo) { + public List<MediaRoute2Info> getAvailableRoutes(@NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); List<MediaRoute2Info> routes = new ArrayList<>(); @@ -256,6 +269,45 @@ public final class MediaRouter2Manager { } /** + * Gets routes that can be transferable seamlessly for the given routing session. + * The returned routes can be passed to + * {@link #transfer(RoutingSessionInfo, MediaRoute2Info)} for transferring the routing session. + * <p> + * This includes routes that are {@link RoutingSessionInfo#getTransferableRoutes() transferable} + * by provider itself and routes that are different playback type (e.g. local/remote) + * from the given routing session. + * + * @param sessionInfo the routing session that would be transferred + */ + @NonNull + public List<MediaRoute2Info> getTransferableRoutes(@NonNull RoutingSessionInfo sessionInfo) { + Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); + + List<MediaRoute2Info> routes = new ArrayList<>(); + + String packageName = sessionInfo.getClientPackageName(); + List<String> preferredFeatures = mPreferredFeaturesMap.get(packageName); + if (preferredFeatures == null) { + preferredFeatures = Collections.emptyList(); + } + synchronized (mRoutesLock) { + for (MediaRoute2Info route : mRoutes.values()) { + if (sessionInfo.getSelectedRoutes().contains(route.getId()) + || sessionInfo.getTransferableRoutes().contains(route.getId())) { + routes.add(route); + continue; + } + // Add Phone -> Cast and Cast -> Phone + if (route.hasAnyFeatures(preferredFeatures) + && (sessionInfo.isSystemSession() ^ route.isSystemRoute())) { + routes.add(route); + } + } + } + return routes; + } + + /** * Returns the preferred features of the specified package name. */ @NonNull diff --git a/media/java/android/media/MediaServiceManager.java b/media/java/android/media/MediaServiceManager.java index b899559d2e50..fd89c0c67e71 100644 --- a/media/java/android/media/MediaServiceManager.java +++ b/media/java/android/media/MediaServiceManager.java @@ -45,12 +45,21 @@ public class MediaServiceManager { */ public static final class ServiceRegisterer { private final String mServiceName; + private final boolean mLazyStart; /** * @hide */ - public ServiceRegisterer(String serviceName) { + public ServiceRegisterer(String serviceName, boolean lazyStart) { mServiceName = serviceName; + mLazyStart = lazyStart; + } + + /** + * @hide + */ + public ServiceRegisterer(String serviceName) { + this(serviceName, false /*lazyStart*/); } /** @@ -61,6 +70,9 @@ public class MediaServiceManager { */ @Nullable public IBinder get() { + if (mLazyStart) { + return ServiceManager.waitForService(mServiceName); + } return ServiceManager.getService(mServiceName); } } @@ -78,7 +90,7 @@ public class MediaServiceManager { */ @NonNull public ServiceRegisterer getMediaTranscodingServiceRegisterer() { - return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE); + return new ServiceRegisterer(MEDIA_TRANSCODING_SERVICE, true /*lazyStart*/); } /** diff --git a/packages/CompanionDeviceManager/res/values-az/strings.xml b/packages/CompanionDeviceManager/res/values-az/strings.xml index 4710dbe4513f..2ec13c587166 100644 --- a/packages/CompanionDeviceManager/res/values-az/strings.xml +++ b/packages/CompanionDeviceManager/res/values-az/strings.xml @@ -20,7 +20,7 @@ <string name="chooser_title" msgid="2262294130493605839">"<strong><xliff:g id="APP_NAME">%2$s</xliff:g></strong> tərəfindən idarə ediləcək <xliff:g id="PROFILE_NAME">%1$s</xliff:g> seçin"</string> <string name="profile_name_generic" msgid="6851028682723034988">"cihaz"</string> <string name="profile_name_watch" msgid="576290739483672360">"izləyin"</string> - <string name="confirmation_title" msgid="8455544820286920304">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tətbiqinin <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazınızı idarə etməsinə icazə verin"</string> + <string name="confirmation_title" msgid="8455544820286920304">"<strong><xliff:g id="APP_NAME">%1$s</xliff:g></strong> tətbiqinə <strong><xliff:g id="DEVICE_NAME">%2$s</xliff:g></strong> cihazınızı idarə etməsinə icazə verin"</string> <string name="profile_summary" msgid="2059360676631420073">"Bu tətbiq <xliff:g id="PROFILE_NAME">%1$s</xliff:g> profilinizi idarə etmək üçün lazımdır. <xliff:g id="PRIVILEGES_DISCPLAIMER">%2$s</xliff:g>"</string> <string name="consent_yes" msgid="8344487259618762872">"İcazə verin"</string> <string name="consent_no" msgid="2640796915611404382">"İcazə verməyin"</string> diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java index 395a9a716a9b..8b1e397c2199 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java @@ -58,7 +58,9 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements super.setContentView(R.layout.collapsing_toolbar_base_layout); mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar); mAppBarLayout = findViewById(R.id.app_bar); - mAppBarLayout.addOnOffsetChangedListener(this); + if (mAppBarLayout != null) { + mAppBarLayout.addOnOffsetChangedListener(this); + } if (savedInstanceState != null) { mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED); } diff --git a/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml b/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml index 0734aca2ab90..a027f287a0aa 100644 --- a/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml +++ b/packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml @@ -20,6 +20,8 @@ <shape android:shape="rectangle"> <solid android:color="@color/settingslib_protection_color"/> <corners android:radius="28dp"/> + <size android:width="@dimen/settingslib_illustration_width" + android:height="@dimen/settingslib_illustration_height"/> </shape> </item> </layer-list> diff --git a/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml b/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml index efcd41c2778b..54145d60fb32 100644 --- a/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml +++ b/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml @@ -27,27 +27,29 @@ <FrameLayout android:id="@+id/illustration_frame" android:layout_width="wrap_content" - android:layout_height="@dimen/settingslib_illustration_height" + android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center_vertical" - android:padding="@dimen/settingslib_illustration_padding" + android:paddingHorizontal="@dimen/settingslib_illustration_padding" android:orientation="vertical"> - <View - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/protection_background"/> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="centerInside" + android:src="@drawable/protection_background"/> <com.airbnb.lottie.LottieAnimationView android:id="@+id/lottie_view" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:adjustViewBounds="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center" /> <FrameLayout android:id="@+id/middleground_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:background="@android:color/transparent" android:layout_gravity="center" android:visibility="gone"/> diff --git a/packages/SettingsLib/IllustrationPreference/res/values/dimens.xml b/packages/SettingsLib/IllustrationPreference/res/values/dimens.xml index 3f38769973db..fc273dc7403b 100644 --- a/packages/SettingsLib/IllustrationPreference/res/values/dimens.xml +++ b/packages/SettingsLib/IllustrationPreference/res/values/dimens.xml @@ -17,7 +17,7 @@ <resources> <!-- Padding of illustration --> - <dimen name="settingslib_illustration_padding">12dp</dimen> + <dimen name="settingslib_illustration_padding">16dp</dimen> <dimen name="settingslib_illustration_width">412dp</dimen> <dimen name="settingslib_illustration_height">300dp</dimen> diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java index e91dd94c715d..f04b0e338959 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java @@ -18,18 +18,29 @@ package com.android.settingslib.widget; import android.content.Context; import android.content.res.TypedArray; +import android.graphics.drawable.Animatable; +import android.graphics.drawable.Animatable2; +import android.graphics.drawable.AnimationDrawable; +import android.graphics.drawable.Drawable; +import android.net.Uri; import android.util.AttributeSet; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.FrameLayout; import android.widget.ImageView; -import androidx.annotation.VisibleForTesting; +import androidx.annotation.RawRes; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; +import androidx.vectordrawable.graphics.drawable.Animatable2Compat; import com.airbnb.lottie.LottieAnimationView; +import com.airbnb.lottie.LottieDrawable; + +import java.io.FileNotFoundException; +import java.io.InputStream; /** * IllustrationPreference is a preference that can play lottie format animation @@ -40,11 +51,32 @@ public class IllustrationPreference extends Preference { private static final boolean IS_ENABLED_LOTTIE_ADAPTIVE_COLOR = false; - private int mAnimationId; + private int mImageResId; private boolean mIsAutoScale; - private LottieAnimationView mIllustrationView; + private Uri mImageUri; + private Drawable mImageDrawable; private View mMiddleGroundView; - private FrameLayout mMiddleGroundLayout; + + private final Animatable2.AnimationCallback mAnimationCallback = + new Animatable2.AnimationCallback() { + @Override + public void onAnimationEnd(Drawable drawable) { + ((Animatable) drawable).start(); + } + }; + + private final Animatable2Compat.AnimationCallback mAnimationCallbackCompat = + new Animatable2Compat.AnimationCallback() { + @Override + public void onAnimationEnd(Drawable drawable) { + ((Animatable) drawable).start(); + } + }; + + public IllustrationPreference(Context context) { + super(context); + init(context, /* attrs= */ null); + } public IllustrationPreference(Context context, AttributeSet attrs) { super(context, attrs); @@ -65,10 +97,11 @@ public class IllustrationPreference extends Preference { @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); - if (mAnimationId == 0) { - Log.w(TAG, "Invalid illustration resource id."); - return; - } + + final FrameLayout middleGroundLayout = + (FrameLayout) holder.findViewById(R.id.middleground_layout); + final LottieAnimationView illustrationView = + (LottieAnimationView) holder.findViewById(R.id.lottie_view); // To solve the problem of non-compliant illustrations, we set the frame height // to 300dp and set the length of the short side of the screen to @@ -81,73 +114,208 @@ public class IllustrationPreference extends Preference { lp.width = screenWidth < screenHeight ? screenWidth : screenHeight; illustrationFrame.setLayoutParams(lp); - mMiddleGroundLayout = (FrameLayout) holder.findViewById(R.id.middleground_layout); - mIllustrationView = (LottieAnimationView) holder.findViewById(R.id.lottie_view); - mIllustrationView.setAnimation(mAnimationId); - mIllustrationView.loop(true); - mIllustrationView.playAnimation(); + handleImageWithAnimation(illustrationView); + if (mIsAutoScale) { - enableAnimationAutoScale(mIsAutoScale); - } - if (mMiddleGroundView != null) { - enableMiddleGroundView(); + illustrationView.setScaleType(mIsAutoScale + ? ImageView.ScaleType.CENTER_CROP + : ImageView.ScaleType.CENTER_INSIDE); } + + handleMiddleGroundView(middleGroundLayout); + if (IS_ENABLED_LOTTIE_ADAPTIVE_COLOR) { - ColorUtils.applyDynamicColors(getContext(), mIllustrationView); + ColorUtils.applyDynamicColors(getContext(), illustrationView); } } - @VisibleForTesting - boolean isAnimating() { - return mIllustrationView.isAnimating(); - } - /** - * Set the middle ground view to preference. The user + * Sets the middle ground view to preference. The user * can overlay a view on top of the animation. */ public void setMiddleGroundView(View view) { - mMiddleGroundView = view; - if (mMiddleGroundLayout == null) { - return; + if (view != mMiddleGroundView) { + mMiddleGroundView = view; + notifyChanged(); } - enableMiddleGroundView(); } /** - * Remove the middle ground view of preference. + * Removes the middle ground view of preference. */ public void removeMiddleGroundView() { - if (mMiddleGroundLayout == null) { - return; - } - mMiddleGroundLayout.removeAllViews(); - mMiddleGroundLayout.setVisibility(View.GONE); + mMiddleGroundView = null; + notifyChanged(); } /** * Enables the auto scale feature of animation view. */ public void enableAnimationAutoScale(boolean enable) { - mIsAutoScale = enable; - if (mIllustrationView == null) { - return; + if (enable != mIsAutoScale) { + mIsAutoScale = enable; + notifyChanged(); } - mIllustrationView.setScaleType( - mIsAutoScale ? ImageView.ScaleType.CENTER_CROP : ImageView.ScaleType.CENTER_INSIDE); } /** - * Set the lottie illustration resource id. + * Sets the lottie illustration resource id. */ public void setLottieAnimationResId(int resId) { - mAnimationId = resId; + if (resId != mImageResId) { + resetImageResourceCache(); + mImageResId = resId; + notifyChanged(); + } + } + + /** + * Sets image drawable to display image in {@link LottieAnimationView} + * + * @param imageDrawable the drawable of an image + */ + public void setImageDrawable(Drawable imageDrawable) { + if (imageDrawable != mImageDrawable) { + resetImageResourceCache(); + mImageDrawable = imageDrawable; + notifyChanged(); + } + } + + /** + * Sets image uri to display image in {@link LottieAnimationView} + * + * @param imageUri the Uri of an image + */ + public void setImageUri(Uri imageUri) { + if (imageUri != mImageUri) { + resetImageResourceCache(); + mImageUri = imageUri; + notifyChanged(); + } + } + + private void resetImageResourceCache() { + mImageDrawable = null; + mImageUri = null; + mImageResId = 0; + } + + private void handleMiddleGroundView(ViewGroup middleGroundLayout) { + middleGroundLayout.removeAllViews(); + + if (mMiddleGroundView != null) { + middleGroundLayout.addView(mMiddleGroundView); + middleGroundLayout.setVisibility(View.VISIBLE); + } else { + middleGroundLayout.setVisibility(View.GONE); + } + } + + private void handleImageWithAnimation(LottieAnimationView illustrationView) { + if (mImageDrawable != null) { + resetAnimations(illustrationView); + illustrationView.setImageDrawable(mImageDrawable); + final Drawable drawable = illustrationView.getDrawable(); + if (drawable != null) { + startAnimation(drawable); + } + } + + if (mImageUri != null) { + resetAnimations(illustrationView); + illustrationView.setImageURI(mImageUri); + final Drawable drawable = illustrationView.getDrawable(); + if (drawable != null) { + startAnimation(drawable); + } else { + // The lottie image from the raw folder also returns null because the ImageView + // couldn't handle it now. + startLottieAnimationWith(illustrationView, mImageUri); + } + } + + if (mImageResId > 0) { + resetAnimations(illustrationView); + illustrationView.setImageResource(mImageResId); + final Drawable drawable = illustrationView.getDrawable(); + if (drawable != null) { + startAnimation(drawable); + } else { + // The lottie image from the raw folder also returns null because the ImageView + // couldn't handle it now. + startLottieAnimationWith(illustrationView, mImageResId); + } + } + } + + private void startAnimation(Drawable drawable) { + if (!(drawable instanceof Animatable)) { + return; + } + + if (drawable instanceof Animatable2) { + ((Animatable2) drawable).registerAnimationCallback(mAnimationCallback); + } else if (drawable instanceof Animatable2Compat) { + ((Animatable2Compat) drawable).registerAnimationCallback(mAnimationCallbackCompat); + } else if (drawable instanceof AnimationDrawable) { + ((AnimationDrawable) drawable).setOneShot(false); + } + + ((Animatable) drawable).start(); } - private void enableMiddleGroundView() { - mMiddleGroundLayout.removeAllViews(); - mMiddleGroundLayout.addView(mMiddleGroundView); - mMiddleGroundLayout.setVisibility(View.VISIBLE); + private static void startLottieAnimationWith(LottieAnimationView illustrationView, + Uri imageUri) { + try { + final InputStream inputStream = + getInputStreamFromUri(illustrationView.getContext(), imageUri); + illustrationView.setAnimation(inputStream, /* cacheKey= */ null); + illustrationView.setRepeatCount(LottieDrawable.INFINITE); + illustrationView.playAnimation(); + } catch (IllegalStateException e) { + Log.w(TAG, "Invalid illustration image uri: " + imageUri, e); + } + } + + private static void startLottieAnimationWith(LottieAnimationView illustrationView, + @RawRes int rawRes) { + try { + illustrationView.setAnimation(rawRes); + illustrationView.setRepeatCount(LottieDrawable.INFINITE); + illustrationView.playAnimation(); + } catch (IllegalStateException e) { + Log.w(TAG, "Invalid illustration resource id: " + rawRes, e); + } + } + + private static void resetAnimations(LottieAnimationView illustrationView) { + resetAnimation(illustrationView.getDrawable()); + + illustrationView.cancelAnimation(); + } + + private static void resetAnimation(Drawable drawable) { + if (!(drawable instanceof Animatable)) { + return; + } + + if (drawable instanceof Animatable2) { + ((Animatable2) drawable).clearAnimationCallbacks(); + } else if (drawable instanceof Animatable2Compat) { + ((Animatable2Compat) drawable).clearAnimationCallbacks(); + } + + ((Animatable) drawable).stop(); + } + + private static InputStream getInputStreamFromUri(Context context, Uri uri) { + try { + return context.getContentResolver().openInputStream(uri); + } catch (FileNotFoundException e) { + Log.w(TAG, "Cannot find content uri: " + uri, e); + return null; + } } private void init(Context context, AttributeSet attrs) { @@ -157,7 +325,7 @@ public class IllustrationPreference extends Preference { if (attrs != null) { final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LottieAnimationView, 0 /*defStyleAttr*/, 0 /*defStyleRes*/); - mAnimationId = a.getResourceId(R.styleable.LottieAnimationView_lottie_rawRes, 0); + mImageResId = a.getResourceId(R.styleable.LottieAnimationView_lottie_rawRes, 0); a.recycle(); } } diff --git a/packages/SettingsLib/MainSwitchPreference/Android.bp b/packages/SettingsLib/MainSwitchPreference/Android.bp index 76d1ea78258d..fc06fdcce131 100644 --- a/packages/SettingsLib/MainSwitchPreference/Android.bp +++ b/packages/SettingsLib/MainSwitchPreference/Android.bp @@ -21,4 +21,8 @@ android_library { sdk_version: "system_current", min_sdk_version: "28", + apex_available: [ + "//apex_available:platform", + "com.android.cellbroadcast", + ], } diff --git a/packages/SettingsLib/MainSwitchPreference/lint-baseline.xml b/packages/SettingsLib/MainSwitchPreference/lint-baseline.xml deleted file mode 100644 index 0a5eb52ae459..000000000000 --- a/packages/SettingsLib/MainSwitchPreference/lint-baseline.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0"> - - <issue - id="NewApi" - message="`@android:id/switch_widget` requires API level 24 (current min is 21)" - errorLine1=" android:id="@android:id/switch_widget"" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml" - line="49" - column="9"/> - </issue> - - <issue - id="NewApi" - message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)" - errorLine1=" <style name="MainSwitch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" - line="24" - column="39"/> - </issue> - - <issue - id="NewApi" - message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)" - errorLine1=" <style name="SwitchBar.Switch.Settingslib" parent="@android:style/Widget.Material.CompoundButton.Switch">" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" - line="28" - column="43"/> - </issue> - - <issue - id="NewApi" - message="`android:trackTint` requires API level 23 (current min is 21)" - errorLine1=" <item name="android:trackTint">@color/settingslib_switchbar_switch_track_tint</item>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml" - line="29" - column="15"/> - </issue> - - <issue - id="NewApi" - severity="Error" - message="`@android:color/system_neutral2_300` requires API level 31 (current min is 21)" - errorLine1=" <color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color>" - errorLine2=" ^"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml" - line="23" - column="47"/> - </issue> - - <issue - id="NewApi" - severity="Error" - message="`@android:color/system_accent2_700` requires API level 31 (current min is 21)" - errorLine1=" <color name="settingslib_track_on_color">@android:color/system_accent2_700</color>" - errorLine2=" ^"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml" - line="26" - column="46"/> - </issue> - - <issue - id="NewApi" - severity="Error" - message="`@android:color/system_neutral1_700` requires API level 31 (current min is 21)" - errorLine1=" <color name="settingslib_track_off_color">@android:color/system_neutral1_700</color>" - errorLine2=" ^"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml" - line="29" - column="47"/> - </issue> - - <issue - id="NewApi" - severity="Error" - message="`@android:color/system_neutral2_100` requires API level 31 (current min is 21)" - errorLine1=" <color name="settingslib_thumb_off_color">@android:color/system_neutral2_100</color>" - errorLine2=" ^"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml" - line="30" - column="47"/> - </issue> - - <issue - id="NewApi" - severity="Error" - message="`@android:color/system_neutral2_600` requires API level 31 (current min is 21)" - errorLine1=" <color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>" - errorLine2=" ^"> - <location - file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml" - line="36" - column="47"/> - </issue> - -</issues> diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml index 2518a6d06255..6e5911cbf0a0 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml @@ -36,9 +36,9 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" - android:layout_marginEnd="16dp" + android:layout_marginEnd="@dimen/settingslib_switch_title_margin" + android:layout_marginVertical="@dimen/settingslib_switch_title_margin" android:layout_gravity="center_vertical" - android:maxLines="2" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceListItem" style="@style/MainSwitchText.Settingslib" /> diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml b/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml index eccf0c091e49..bef6e352d854 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml @@ -15,9 +15,10 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" - android:layout_width="match_parent" > + android:layout_width="match_parent" + android:importantForAccessibility="no"> <com.android.settingslib.widget.MainSwitchBar android:id="@+id/settingslib_main_switch_bar" @@ -25,6 +26,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent" /> -</LinearLayout> +</FrameLayout> diff --git a/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml b/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml index a386adbafe2a..16b8af6a2dab 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml @@ -41,6 +41,9 @@ <!-- Radius of switch bar --> <dimen name="settingslib_switch_bar_radius">28dp</dimen> + <!-- Size of title margin --> + <dimen name="settingslib_switch_title_margin">16dp</dimen> + <!-- SwitchBar sub settings margin start / end --> <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen> diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java index 5f47be4b0642..cb858c85e888 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java @@ -152,9 +152,6 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec public void setTitle(CharSequence text) { if (mTextView != null) { mTextView.setText(text); - if (mSwitch != null) { - mSwitch.setContentDescription(mTextView.getText()); - } } } diff --git a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml index 80c95f5f2f33..139cd95684be 100644 --- a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml +++ b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml @@ -15,28 +15,30 @@ limitations under the License. --> -<layer-list +<ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:priv-android="http://schemas.android.com/apk/prv/res/android" - android:paddingMode="stack"> + android:color="@color/ripple_color"> - <item - android:top="8dp" - android:bottom="8dp"> - <shape> - <corners - android:radius="28dp"/> - <solid - android:color="?priv-android:attr/colorAccentPrimary"/> - <size - android:height="@dimen/spinner_height"/> - </shape> - </item> + <item android:id="@android:id/background"> + <layer-list android:paddingMode="stack"> + <item + android:top="8dp" + android:bottom="8dp"> + + <shape> + <corners android:radius="28dp"/> + <solid android:color="?priv-android:attr/colorAccentPrimary"/> + <size android:height="@dimen/spinner_height"/> + </shape> + </item> - <item - android:gravity="center|end" - android:width="18dp" - android:height="18dp" - android:end="8dp" - android:drawable="@drawable/arrow_drop_down"/> -</layer-list>
\ No newline at end of file + <item + android:gravity="center|end" + android:width="18dp" + android:height="18dp" + android:end="8dp" + android:drawable="@drawable/arrow_drop_down"/> + </layer-list> + </item> +</ripple> diff --git a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml index 7bdf643122b6..aa451aee41c2 100644 --- a/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml +++ b/packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2021 The Android Open Source Project + Copyright (C) 2018 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,15 +15,14 @@ limitations under the License. --> -<layer-list +<ripple xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"> + xmlns:priv-android="http://schemas.android.com/apk/prv/res/android" + android:color="@color/ripple_color"> - <item> + <item android:id="@android:id/background"> <shape> - <solid - android:color="?priv-android:attr/colorAccentSecondary"/> + <solid android:color="?priv-android:attr/colorAccentSecondary"/> </shape> </item> - -</layer-list>
\ No newline at end of file +</ripple> diff --git a/packages/SettingsLib/SettingsSpinner/res/values-night/colors.xml b/packages/SettingsLib/SettingsSpinner/res/values-night/colors.xml new file mode 100644 index 000000000000..abcf822c6d78 --- /dev/null +++ b/packages/SettingsLib/SettingsSpinner/res/values-night/colors.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <color name="ripple_color">@*android:color/material_grey_900</color> +</resources> diff --git a/packages/SettingsLib/SettingsSpinner/res/values/colors.xml b/packages/SettingsLib/SettingsSpinner/res/values/colors.xml new file mode 100644 index 000000000000..799b35ee3a92 --- /dev/null +++ b/packages/SettingsLib/SettingsSpinner/res/values/colors.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + <color name="ripple_color">?android:attr/colorControlHighlight</color> +</resources> diff --git a/packages/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml b/packages/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml new file mode 100644 index 000000000000..81ddf29ac9df --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/color-night-v31/settingslib_switch_track_on.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="@android:color/system_accent2_500" android:lStar="51" /> +</selector>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml index df3bad4ee377..8ccbb06f3edf 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_thumb_color.xml @@ -17,7 +17,7 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Disabled status of thumb --> <item android:state_enabled="false" - android:color="@color/settingslib_thumb_off_color" /> + android:color="@color/settingslib_thumb_disabled_color" /> <!-- Toggle off status of thumb --> <item android:state_checked="false" android:color="@color/settingslib_thumb_off_color" /> diff --git a/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml new file mode 100644 index 000000000000..762bb31243a2 --- /dev/null +++ b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_switch_track_off.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="@android:color/system_neutral2_500" android:lStar="45" /> +</selector>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml index 69975cd2dad5..8c7c7ed5b120 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml @@ -16,11 +16,14 @@ --> <resources> + <!-- Material next thumb disable color--> + <color name="settingslib_thumb_disabled_color">@android:color/system_neutral1_700</color> + <!-- Material next thumb off color--> - <color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color> + <color name="settingslib_thumb_off_color">@android:color/system_neutral1_400</color> <!-- Material next track on color--> - <color name="settingslib_track_on_color">@android:color/system_accent2_700</color> + <color name="settingslib_track_on_color">@color/settingslib_switch_track_on</color> <!-- Material next track off color--> <color name="settingslib_track_off_color">@android:color/system_neutral1_700</color> diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml index b78da90ba239..77f1bcd17371 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml @@ -22,14 +22,17 @@ <!-- Material next state off color--> <color name="settingslib_state_off_color">@android:color/system_accent2_100</color> + <!-- Material next thumb disable color--> + <color name="settingslib_thumb_disabled_color">@android:color/system_neutral2_100</color> + <!-- Material next thumb off color--> - <color name="settingslib_thumb_off_color">@android:color/system_neutral2_100</color> + <color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color> <!-- Material next track on color--> <color name="settingslib_track_on_color">@android:color/system_accent1_600</color> <!-- Material next track off color--> - <color name="settingslib_track_off_color">@android:color/system_neutral2_600</color> + <color name="settingslib_track_off_color">@color/settingslib_switch_track_off</color> <!-- Dialog accent color --> <color name="settingslib_dialog_accent">@android:color/system_accent1_600</color> diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp index 1cf42ff1c566..7d5eb69190b6 100644 --- a/packages/SettingsLib/Utils/Android.bp +++ b/packages/SettingsLib/Utils/Android.bp @@ -13,6 +13,10 @@ android_library { srcs: ["src/**/*.java"], resource_dirs: ["res"], + static_libs: [ + "androidx.annotation_annotation", + ], + sdk_version: "system_current", min_sdk_version: "21", @@ -20,5 +24,6 @@ android_library { "//apex_available:platform", "com.android.permission", + "com.android.cellbroadcast", ], } diff --git a/packages/SettingsLib/Utils/lint-baseline.xml b/packages/SettingsLib/Utils/lint-baseline.xml deleted file mode 100644 index 172bde3df541..000000000000 --- a/packages/SettingsLib/Utils/lint-baseline.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0"> - - <issue - id="NewApi" - message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`" - errorLine1=" return context.getSystemService(UserManager.class).isManagedProfile(userId)" - errorLine2=" ~~~~~~~~~~~~~~~~"> - <location - file="frameworks/base/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java" - line="58" - column="24"/> - </issue> - -</issues> diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java index 5dc0b7274408..cf45c0b46835 100644 --- a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java +++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java @@ -19,9 +19,12 @@ package com.android.settingslib.utils.applications; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.os.UserManager; import android.util.Log; +import androidx.annotation.RequiresApi; + import com.android.settingslib.utils.R; public class AppUtils { @@ -49,6 +52,7 @@ public class AppUtils { * work app for accessibility purpose. * If the app is in a work profile, then add a "work" prefix to the app name. */ + @RequiresApi(Build.VERSION_CODES.M) public static String getAppContentDescription(Context context, String packageName, int userId) { final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName); diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java index 44cafb17e1d8..bd9e0d341b2e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java +++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerFactory.java @@ -33,15 +33,17 @@ public final class ActionDisabledByAdminControllerFactory { /** * Returns the relevant instance of {@link ActionDisabledByAdminController}. + * @param userHandle user on which to launch the help page, if necessary */ public static ActionDisabledByAdminController createInstance(Context context, - String restriction, DeviceAdminStringProvider stringProvider) { + String restriction, DeviceAdminStringProvider stringProvider, + UserHandle userHandle) { if (doesBiometricRequireParentalConsent(context, restriction)) { return new BiometricActionDisabledByAdminController(stringProvider); } else if (isFinancedDevice(context)) { return new FinancedDeviceActionDisabledByAdminController(stringProvider); } else { - return new ManagedDeviceActionDisabledByAdminController(stringProvider); + return new ManagedDeviceActionDisabledByAdminController(stringProvider, userHandle); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java index 849c3d97d731..411487976fe5 100644 --- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java +++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java @@ -54,11 +54,12 @@ public abstract class ActionDisabledLearnMoreButtonLauncher { /** * Sets up a "learn more" button which launches a help page */ - public final void setupLearnMoreButtonToLaunchHelpPage(Context context, String url) { + public final void setupLearnMoreButtonToLaunchHelpPage( + Context context, String url, UserHandle userHandle) { requireNonNull(context, "context cannot be null"); requireNonNull(url, "url cannot be null"); - setLearnMoreButton(() -> showHelpPage(context, url)); + setLearnMoreButton(() -> showHelpPage(context, url, userHandle)); } /** @@ -105,8 +106,8 @@ public abstract class ActionDisabledLearnMoreButtonLauncher { * Shows the help page using the given {@code url}. */ @VisibleForTesting - public void showHelpPage(Context context, String url) { - context.startActivityAsUser(createLearnMoreIntent(url), UserHandle.of(context.getUserId())); + public void showHelpPage(Context context, String url, UserHandle userHandle) { + context.startActivityAsUser(createLearnMoreIntent(url), userHandle); finishSelf(); } diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java index 814d5d23f458..1472980efd4e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java +++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminController.java @@ -32,8 +32,10 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled // These MUST not change, as they are the stable API between here and device admin specified // by the component below. - private static final String ACTION_LEARN_MORE = "android.settings.LEARN_MORE"; - private static final String EXTRA_FROM_BIOMETRIC_SETUP = "from_biometric_setup"; + private static final String ACTION_LEARN_MORE = + "android.intent.action.MANAGE_RESTRICTED_SETTING"; + private static final String EXTRA_SETTING_KEY = "extra_setting"; + private static final String EXTRA_SETTING_VALUE = "biometric_disabled_by_admin_controller"; BiometricActionDisabledByAdminController( DeviceAdminStringProvider stringProvider) { @@ -63,7 +65,7 @@ public class BiometricActionDisabledByAdminController extends BaseActionDisabled Log.d(TAG, "Positive button clicked, component: " + enforcedAdmin.component); final Intent intent = new Intent(ACTION_LEARN_MORE) .setComponent(enforcedAdmin.component) - .putExtra(EXTRA_FROM_BIOMETRIC_SETUP, true) + .putExtra(EXTRA_SETTING_KEY, EXTRA_SETTING_VALUE) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); }; diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminController.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminController.java index df6bab74e014..93e811d6baaa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminController.java +++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminController.java @@ -16,13 +16,18 @@ package com.android.settingslib.enterprise; +import static java.util.Objects.requireNonNull; + import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; import androidx.annotation.Nullable; +import java.util.Objects; + /** * An {@link ActionDisabledByAdminController} to be used with managed devices. @@ -30,8 +35,17 @@ import androidx.annotation.Nullable; final class ManagedDeviceActionDisabledByAdminController extends BaseActionDisabledByAdminController { - ManagedDeviceActionDisabledByAdminController(DeviceAdminStringProvider stringProvider) { + private final UserHandle mUserHandle; + + /** + * Constructs a {@link ManagedDeviceActionDisabledByAdminController} + * @param userHandle - user on which to launch the help web page, if necessary + */ + ManagedDeviceActionDisabledByAdminController( + DeviceAdminStringProvider stringProvider, + UserHandle userHandle) { super(stringProvider); + mUserHandle = requireNonNull(userHandle); } @Override @@ -43,7 +57,7 @@ final class ManagedDeviceActionDisabledByAdminController mLauncher.setupLearnMoreButtonToShowAdminPolicies(context, mEnforcementAdminUserId, mEnforcedAdmin); } else { - mLauncher.setupLearnMoreButtonToLaunchHelpPage(context, url); + mLauncher.setupLearnMoreButtonToLaunchHelpPage(context, url, mUserHandle); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index 6b1e282ecdd8..79446e430d4f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -372,7 +372,7 @@ public class InfoMediaManager extends MediaManager { Log.w(TAG, "shouldDisableMediaOutput() package name is null or empty!"); return false; } - final List<MediaRoute2Info> infos = mRouterManager.getAvailableRoutes(packageName); + final List<MediaRoute2Info> infos = mRouterManager.getTransferableRoutes(packageName); if (infos.size() == 1) { final MediaRoute2Info info = infos.get(0); final int deviceType = info.getType(); @@ -456,7 +456,7 @@ public class InfoMediaManager extends MediaManager { } private void buildAvailableRoutes() { - for (MediaRoute2Info route : mRouterManager.getAvailableRoutes(mPackageName)) { + for (MediaRoute2Info route : mRouterManager.getTransferableRoutes(mPackageName)) { if (DEBUG) { Log.d(TAG, "buildAvailableRoutes() route : " + route.getName() + ", volume : " + route.getVolume() + ", type : " + route.getType()); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerTestUtils.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerTestUtils.java index e57335fbd3c5..636d08182a24 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerTestUtils.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledByAdminControllerTestUtils.java @@ -73,7 +73,7 @@ public final class ActionDisabledByAdminControllerTestUtils { } @Override - public void showHelpPage(Context context, String url) { + public void showHelpPage(Context context, String url, UserHandle userHandle) { mLearnMoreButtonAction = LEARN_MORE_ACTION_LAUNCH_HELP_PAGE; } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java index 62582d71f8fb..c2063c65d9c8 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java @@ -181,18 +181,20 @@ public final class ActionDisabledLearnMoreButtonLauncherTest { @Test public void testSetupLearnMoreButtonToLaunchHelpPage_nullContext() { assertThrows(NullPointerException.class, - () -> mLauncher.setupLearnMoreButtonToLaunchHelpPage(/* context= */ null, URL)); + () -> mLauncher.setupLearnMoreButtonToLaunchHelpPage( + /* context= */ null, URL, CONTEXT_USER)); } @Test public void testSetupLearnMoreButtonToLaunchHelpPage_nullUrl() { assertThrows(NullPointerException.class, - () -> mLauncher.setupLearnMoreButtonToLaunchHelpPage(mContext, /* url= */ null)); + () -> mLauncher.setupLearnMoreButtonToLaunchHelpPage( + mContext, /* url= */ null, CONTEXT_USER)); } @Test public void testSetupLearnMoreButtonToLaunchHelpPage() { - mLauncher.setupLearnMoreButtonToLaunchHelpPage(mContext, URL); + mLauncher.setupLearnMoreButtonToLaunchHelpPage(mContext, URL, CONTEXT_USER); tapLearnMore(); verify(mContext).startActivityAsUser(mIntentCaptor.capture(), eq(CONTEXT_USER)); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminControllerTest.java index 19f6aa1d55a6..d9be4f336797 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ManagedDeviceActionDisabledByAdminControllerTest.java @@ -116,7 +116,7 @@ public class ManagedDeviceActionDisabledByAdminControllerTest { private ManagedDeviceActionDisabledByAdminController createController(String url) { ManagedDeviceActionDisabledByAdminController controller = new ManagedDeviceActionDisabledByAdminController( - new FakeDeviceAdminStringProvider(url)); + new FakeDeviceAdminStringProvider(url), mContext.getUser()); controller.initialize(mTestUtils.createLearnMoreButtonLauncher()); controller.updateEnforcedAdmin(ENFORCED_ADMIN, ENFORCEMENT_ADMIN_USER_ID); return controller; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java index 89b0fe72ca16..ea9be04527be 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java @@ -18,12 +18,25 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import android.content.Context; +import android.graphics.drawable.AnimatedImageDrawable; +import android.graphics.drawable.AnimatedVectorDrawable; +import android.graphics.drawable.AnimationDrawable; +import android.net.Uri; import android.util.AttributeSet; import android.view.View; +import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; +import androidx.preference.PreferenceViewHolder; +import androidx.test.core.app.ApplicationProvider; + import com.airbnb.lottie.LottieAnimationView; import org.junit.Before; @@ -33,47 +46,88 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) public class IllustrationPreferenceTest { @Mock - LottieAnimationView mAnimationView; - - private Context mContext; + private ViewGroup mRootView; + private Uri mImageUri; + private LottieAnimationView mAnimationView; private IllustrationPreference mPreference; + private PreferenceViewHolder mViewHolder; + private FrameLayout mMiddleGroundLayout; + private final Context mContext = ApplicationProvider.getApplicationContext(); @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; + + mImageUri = new Uri.Builder().build(); + mAnimationView = spy(new LottieAnimationView(mContext)); + mMiddleGroundLayout = new FrameLayout(mContext); + final FrameLayout illustrationFrame = new FrameLayout(mContext); + illustrationFrame.setLayoutParams( + new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT)); + doReturn(mMiddleGroundLayout).when(mRootView).findViewById(R.id.middleground_layout); + doReturn(mAnimationView).when(mRootView).findViewById(R.id.lottie_view); + doReturn(illustrationFrame).when(mRootView).findViewById(R.id.illustration_frame); + mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView)); + final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new IllustrationPreference(mContext, attributeSet); - ReflectionHelpers.setField(mPreference, "mIllustrationView", mAnimationView); } @Test public void setMiddleGroundView_middleGroundView_shouldVisible() { final View view = new View(mContext); - final FrameLayout layout = new FrameLayout(mContext); - layout.setVisibility(View.GONE); - ReflectionHelpers.setField(mPreference, "mMiddleGroundView", view); - ReflectionHelpers.setField(mPreference, "mMiddleGroundLayout", layout); + mMiddleGroundLayout.setVisibility(View.GONE); mPreference.setMiddleGroundView(view); + mPreference.onBindViewHolder(mViewHolder); - assertThat(layout.getVisibility()).isEqualTo(View.VISIBLE); + assertThat(mMiddleGroundLayout.getVisibility()).isEqualTo(View.VISIBLE); } @Test public void enableAnimationAutoScale_shouldChangeScaleType() { - final LottieAnimationView animationView = new LottieAnimationView(mContext); - ReflectionHelpers.setField(mPreference, "mIllustrationView", animationView); - mPreference.enableAnimationAutoScale(true); + mPreference.onBindViewHolder(mViewHolder); + + assertThat(mAnimationView.getScaleType()).isEqualTo(ImageView.ScaleType.CENTER_CROP); + } + + @Test + public void playAnimationWithUri_animatedImageDrawable_success() { + final AnimatedImageDrawable drawable = mock(AnimatedImageDrawable.class); + doReturn(drawable).when(mAnimationView).getDrawable(); + + mPreference.setImageUri(mImageUri); + mPreference.onBindViewHolder(mViewHolder); + + verify(drawable).start(); + } + + @Test + public void playAnimationWithUri_animatedVectorDrawable_success() { + final AnimatedVectorDrawable drawable = mock(AnimatedVectorDrawable.class); + doReturn(drawable).when(mAnimationView).getDrawable(); + + mPreference.setImageUri(mImageUri); + mPreference.onBindViewHolder(mViewHolder); + + verify(drawable).start(); + } + + @Test + public void playAnimationWithUri_animationDrawable_success() { + final AnimationDrawable drawable = mock(AnimationDrawable.class); + doReturn(drawable).when(mAnimationView).getDrawable(); + + mPreference.setImageUri(mImageUri); + mPreference.onBindViewHolder(mViewHolder); - assertThat(animationView.getScaleType()).isEqualTo(ImageView.ScaleType.CENTER_CROP); + verify(drawable).start(); } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java index 0845ca325d38..d86bd014988e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java @@ -19,6 +19,7 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import android.text.TextUtils; import android.view.View; import android.widget.Switch; import android.widget.TextView; @@ -59,13 +60,13 @@ public class MainSwitchBarTest { } @Test - public void setTitle_switchShouldHasContentDescription() { + public void setTitle_switchShouldNotHasContentDescription() { final String title = "title"; mBar.setTitle(title); final Switch switchObj = mBar.getSwitch(); - assertThat(switchObj.getContentDescription()).isEqualTo(title); + assertThat(TextUtils.isEmpty(switchObj.getContentDescription())).isTrue(); } @Test diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index dd9a6eee7327..1e3ee22fee2f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1145,6 +1145,7 @@ public class SettingsProvider extends ContentProvider { } enforceWritePermission(Manifest.permission.WRITE_DEVICE_CONFIG); + final String callingPackage = resolveCallingPackage(); synchronized (mLock) { if (isSyncDisabledConfigLocked()) { @@ -1152,7 +1153,7 @@ public class SettingsProvider extends ContentProvider { } final int key = makeKey(SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM); boolean success = mSettingsRegistry.setConfigSettingsLocked(key, prefix, keyValues, - resolveCallingPackage()); + callingPackage); return success ? SET_ALL_RESULT_SUCCESS : SET_ALL_RESULT_FAILURE; } } @@ -1258,6 +1259,7 @@ public class SettingsProvider extends ContentProvider { private boolean mutateConfigSetting(String name, String value, String prefix, boolean makeDefault, int operation, int mode) { enforceWritePermission(Manifest.permission.WRITE_DEVICE_CONFIG); + final String callingPackage = resolveCallingPackage(); // Perform the mutation. synchronized (mLock) { @@ -1265,7 +1267,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_INSERT: { return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM, name, value, null, makeDefault, true, - resolveCallingPackage(), false, null, + callingPackage, false, null, /* overrideableByRestore */ false); } @@ -1276,7 +1278,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_RESET: { mSettingsRegistry.resetSettingsLocked(SETTINGS_TYPE_CONFIG, - UserHandle.USER_SYSTEM, resolveCallingPackage(), mode, null, prefix); + UserHandle.USER_SYSTEM, callingPackage, mode, null, prefix); } return true; } } @@ -1434,13 +1436,15 @@ public class SettingsProvider extends ContentProvider { return false; } + final String callingPackage = getCallingPackage(); + // Perform the mutation. synchronized (mLock) { switch (operation) { case MUTATION_OPERATION_INSERT: { return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, name, value, tag, makeDefault, - getCallingPackage(), forceNotify, + callingPackage, forceNotify, CRITICAL_GLOBAL_SETTINGS, overrideableByRestore); } @@ -1452,12 +1456,12 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_UPDATE: { return mSettingsRegistry.updateSettingLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, name, value, tag, makeDefault, - getCallingPackage(), forceNotify, CRITICAL_GLOBAL_SETTINGS); + callingPackage, forceNotify, CRITICAL_GLOBAL_SETTINGS); } case MUTATION_OPERATION_RESET: { mSettingsRegistry.resetSettingsLocked(SETTINGS_TYPE_GLOBAL, - UserHandle.USER_SYSTEM, getCallingPackage(), mode, tag); + UserHandle.USER_SYSTEM, callingPackage, mode, tag); } return true; } } @@ -1466,11 +1470,12 @@ public class SettingsProvider extends ContentProvider { } private PackageInfo getCallingPackageInfo(int userId) { + final String callingPackage = getCallingPackage(); try { - return mPackageManager.getPackageInfo(getCallingPackage(), + return mPackageManager.getPackageInfo(callingPackage, PackageManager.GET_SIGNATURES, userId); } catch (RemoteException e) { - throw new IllegalStateException("Package " + getCallingPackage() + " doesn't exist"); + throw new IllegalStateException("Package " + callingPackage + " doesn't exist"); } } @@ -1720,13 +1725,15 @@ public class SettingsProvider extends ContentProvider { return false; } + final String callingPackage = getCallingPackage(); + // Mutate the value. synchronized (mLock) { switch (operation) { case MUTATION_OPERATION_INSERT: { return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_SECURE, owningUserId, name, value, tag, makeDefault, - getCallingPackage(), forceNotify, CRITICAL_SECURE_SETTINGS, + callingPackage, forceNotify, CRITICAL_SECURE_SETTINGS, overrideableByRestore); } @@ -1738,12 +1745,12 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_UPDATE: { return mSettingsRegistry.updateSettingLocked(SETTINGS_TYPE_SECURE, owningUserId, name, value, tag, makeDefault, - getCallingPackage(), forceNotify, CRITICAL_SECURE_SETTINGS); + callingPackage, forceNotify, CRITICAL_SECURE_SETTINGS); } case MUTATION_OPERATION_RESET: { mSettingsRegistry.resetSettingsLocked(SETTINGS_TYPE_SECURE, - UserHandle.USER_SYSTEM, getCallingPackage(), mode, tag); + UserHandle.USER_SYSTEM, callingPackage, mode, tag); } return true; } } @@ -1840,11 +1847,12 @@ public class SettingsProvider extends ContentProvider { private boolean mutateSystemSetting(String name, String value, int runAsUserId, int operation, boolean overrideableByRestore) { + final String callingPackage = getCallingPackage(); if (!hasWriteSecureSettingsPermission()) { // If the caller doesn't hold WRITE_SECURE_SETTINGS, we verify whether this // operation is allowed for the calling package through appops. if (!Settings.checkAndNoteWriteSettingsOperation(getContext(), - Binder.getCallingUid(), getCallingPackage(), getCallingAttributionTag(), + Binder.getCallingUid(), callingPackage, getCallingAttributionTag(), true)) { return false; } @@ -1889,7 +1897,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_INSERT: { validateSystemSettingValue(name, value); return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_SYSTEM, - owningUserId, name, value, null, false, getCallingPackage(), + owningUserId, name, value, null, false, callingPackage, false, null, overrideableByRestore); } @@ -1901,7 +1909,7 @@ public class SettingsProvider extends ContentProvider { case MUTATION_OPERATION_UPDATE: { validateSystemSettingValue(name, value); return mSettingsRegistry.updateSettingLocked(SETTINGS_TYPE_SYSTEM, - owningUserId, name, value, null, false, getCallingPackage(), + owningUserId, name, value, null, false, callingPackage, false, null); } } @@ -2169,14 +2177,15 @@ public class SettingsProvider extends ContentProvider { // user is a system permission and the app must be uninstalled in B and then installed as // an Instant App that situation is not realistic or supported. ApplicationInfo ai = null; + final String callingPackage = getCallingPackage(); try { - ai = mPackageManager.getApplicationInfo(getCallingPackage(), 0 + ai = mPackageManager.getApplicationInfo(callingPackage, 0 , UserHandle.getCallingUserId()); } catch (RemoteException ignored) { } if (ai == null) { throw new IllegalStateException("Failed to lookup info for package " - + getCallingPackage()); + + callingPackage); } return ai; } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java b/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java index c33f02dff561..dc51c4012021 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java @@ -15,17 +15,24 @@ */ package com.android.providers.settings; +import android.app.ActivityManager; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Resources; +import android.os.UserHandle; +import android.provider.Settings; import com.android.internal.messages.nano.SystemMessageProto; import com.android.internal.notification.SystemNotificationChannels; +import java.util.List; + /** * Helper class for sending notifications when the user's Soft AP config was changed upon restore. */ @@ -81,8 +88,25 @@ public class WifiSoftApConfigChangedNotifier { private static PendingIntent getPendingActivity(Context context) { Intent intent = new Intent("com.android.settings.WIFI_TETHER_SETTINGS") - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .setPackage(getSettingsPackageName(context)); return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } + + /** + * @return Get settings package name. + */ + private static String getSettingsPackageName(Context context) { + if (context == null) return null; + + Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS); + List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivitiesAsUser( + intent, PackageManager.MATCH_SYSTEM_ONLY | PackageManager.MATCH_DEFAULT_ONLY, + UserHandle.of(ActivityManager.getCurrentUser())); + if (resolveInfos == null || resolveInfos.isEmpty()) { + return "com.android.settings"; + } + return resolveInfos.get(0).activityInfo.packageName; + } } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 491f0d9f615f..bc1d420eaa3d 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -104,7 +104,6 @@ <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY" /> <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> - <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" /> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> @@ -568,6 +567,9 @@ <!-- Permission required for CTS test - GlobalSearchSessionPlatformCtsTests --> <uses-permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA" /> + <!-- Permission required for GTS test - PendingSystemUpdateTest --> + <uses-permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" diff --git a/packages/Shell/res/values-mr/strings.xml b/packages/Shell/res/values-mr/strings.xml index 89b49a2a6295..38427332894d 100644 --- a/packages/Shell/res/values-mr/strings.xml +++ b/packages/Shell/res/values-mr/strings.xml @@ -23,11 +23,11 @@ <string name="bugreport_updating_title" msgid="4423539949559634214">"बग रिपोर्टमध्ये तपशील जोडत आहे"</string> <string name="bugreport_updating_wait" msgid="3322151947853929470">"कृपया प्रतीक्षा करा..."</string> <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"फोनवर बग रिपोर्ट लवकरच दिसेल"</string> - <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"तुमचा बग रीपोर्ट शेअर करण्यासाठी निवडा"</string> + <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"तुमचा बग रिपोर्ट शेअर करण्यासाठी निवडा"</string> <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"तुमचा बग रिपोर्ट शेअर करण्यासाठी टॅप करा"</string> - <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"तुमचा बग रीपोर्ट स्क्रीनशॉटशिवाय शेअर करण्यासाठी टॅप करा किंवा स्क्रीनशॉट पूर्ण होण्याची प्रतीक्षा करा"</string> - <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय तुमचा बग रीपोर्ट शेअर करण्यासाठी टॅप करा किंवा समाप्त करण्यासाठी स्क्रीनशॉटची प्रतीक्षा करा"</string> - <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय तुमचा बग रीपोर्ट शेअर करण्यासाठी टॅप करा किंवा समाप्त करण्यासाठी स्क्रीनशॉटची प्रतीक्षा करा"</string> + <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"तुमचा बग रिपोर्ट स्क्रीनशॉटशिवाय शेअर करण्यासाठी टॅप करा किंवा स्क्रीनशॉट पूर्ण होईपर्यंत थांबा"</string> + <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय तुमचा बग रिपोर्ट शेअर करण्यासाठी टॅप करा किंवा स्क्रीनशॉट पूर्ण होईपर्यंत थांबा"</string> + <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"स्क्रीनशॉट शिवाय तुमचा बग रिपोर्ट शेअर करण्यासाठी टॅप करा किंवा स्क्रीनशॉट पूर्ण होईपर्यंत थांबा"</string> <string name="bugreport_confirm" msgid="5917407234515812495">"बग रीपोर्टांमध्ये तुम्ही संवेदनशील (अॅप-वापर आणि स्थान डेटा यासारखा) डेटा म्हणून विचार करता त्या डेटाच्या समावेशासह सिस्टीमच्या विविध लॉग फायलींमधील डेटा असतो. ज्या लोकांवर आणि अॅपवर तुमचा विश्वास आहे केवळ त्यांच्यासह हा बग रीपोर्ट शेअर करा."</string> <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"पुन्हा दर्शवू नका"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"बग रीपोर्ट"</string> diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index b357a9478ab6..d051290cb4b4 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -94,6 +94,7 @@ android_library { "SystemUI-proto", "dagger2", "jsr330", + "lottie", ], manifest: "AndroidManifest.xml", diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 604310a9e905..8963ddaece35 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -281,6 +281,8 @@ <!-- Permission for Smartspace. --> <uses-permission android:name="android.permission.MANAGE_SMARTSPACE" /> + <uses-permission android:name="android.permission.READ_PEOPLE_DATA" /> + <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> @@ -604,7 +606,8 @@ </activity> <activity android:name=".people.widget.LaunchConversationActivity" - android:windowDisablePreview="true" /> + android:windowDisablePreview="true" + android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" /> <!-- People Space Widget --> <receiver @@ -630,6 +633,9 @@ android:permission="android.permission.GET_PEOPLE_TILE_PREVIEW"> </provider> + <service android:name=".people.PeopleBackupFollowUpJob" + android:permission="android.permission.BIND_JOB_SERVICE"/> + <!-- a gallery of delicious treats --> <service android:name=".DessertCaseDream" diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java index 98ef9e20ac3b..bd2209b0d292 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java @@ -23,6 +23,8 @@ import com.android.systemui.plugins.annotations.DependsOn; import com.android.systemui.plugins.annotations.ProvidesInterface; import com.android.systemui.plugins.qs.QS.HeightListener; +import java.util.function.Consumer; + /** * Fragment that contains QS in the notification shade. Most of the interface is for * handling the expand/collapsing of the view interaction. @@ -33,7 +35,7 @@ public interface QS extends FragmentBase { String ACTION = "com.android.systemui.action.PLUGIN_QS"; - int VERSION = 9; + int VERSION = 11; String TAG = "QS"; @@ -101,6 +103,25 @@ public interface QS extends FragmentBase { return true; } + /** + * Add a listener for when the collapsed media visibility changes. + */ + void setCollapsedMediaVisibilityChangedListener(Consumer<Boolean> listener); + + /** + * Set a scroll listener for the QSPanel container + */ + default void setScrollListener(ScrollListener scrollListener) {} + + /** + * Callback for when QSPanel container is scrolled + */ + @ProvidesInterface(version = ScrollListener.VERSION) + interface ScrollListener { + int VERSION = 1; + void onQsPanelScrollChanged(int scrollY); + } + @ProvidesInterface(version = HeightListener.VERSION) interface HeightListener { int VERSION = 1; diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml index 9811434906b7..29fcf577da89 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml @@ -57,7 +57,7 @@ android:id="@+id/animatable_clock_view_large" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" + android:layout_gravity="center" android:gravity="center_horizontal" android:textSize="@dimen/large_clock_text_size" android:fontFamily="@font/clock" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml index a957df6537ff..02cb2bcfad81 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml @@ -44,7 +44,7 @@ android:id="@+id/row0" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="16dp" + android:paddingBottom="@dimen/num_pad_entry_row_margin_bottom" > <com.android.keyguard.PasswordTextView android:id="@+id/pinEntry" @@ -192,7 +192,7 @@ android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" android:layout_marginTop="@dimen/keyguard_eca_top_margin" - android:layout_marginBottom="12dp" + android:layout_marginBottom="@dimen/keyguard_eca_bottom_margin" android:gravity="center_horizontal"/> </com.android.keyguard.KeyguardPINView> diff --git a/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml b/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml new file mode 100644 index 000000000000..eb5843b5a1b7 --- /dev/null +++ b/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2021, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources> + <dimen name="num_pad_row_margin_bottom">4dp</dimen> + <dimen name="keyguard_eca_top_margin">4dp</dimen> + <dimen name="keyguard_eca_bottom_margin">4dp</dimen> + <dimen name="keyguard_password_height">50dp</dimen> + <dimen name="num_pad_entry_row_margin_bottom">4dp</dimen> +</resources> diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml index e5031c8213a3..937ad064e689 100644 --- a/packages/SystemUI/res-keyguard/values-ta/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml @@ -26,7 +26,7 @@ <string name="keyguard_password_enter_puk_prompt" msgid="3529260761374385243">"சிம் PUK குறியீடு"</string> <string name="keyguard_password_enter_pin_prompt" msgid="2304037870481240781">"புதிய சிம் பின் குறியீடு"</string> <string name="keyguard_password_entry_touch_hint" msgid="6180028658339706333"><font size="17">"கடவுச்சொல்லை உள்ளிட, தொடவும்"</font></string> - <string name="keyguard_password_enter_password_code" msgid="7393393239623946777">"திறக்க, கடவுச்சொல்லை உள்ளிடவும்"</string> + <string name="keyguard_password_enter_password_code" msgid="7393393239623946777">"அன்லாக் செய்ய கடவுச்சொல்லை உள்ளிடவும்"</string> <string name="keyguard_password_enter_pin_password_code" msgid="3692259677395250509">"திறக்க, பின்னை உள்ளிடவும்"</string> <string name="keyguard_enter_your_pin" msgid="5429932527814874032">"பின்னை உள்ளிடுக"</string> <string name="keyguard_enter_your_pattern" msgid="351503370332324745">"பேட்டர்னை உள்ளிடுக"</string> @@ -40,7 +40,7 @@ <string name="keyguard_plugged_in_charging_slowly" msgid="217655355424210">"<xliff:g id="PERCENTAGE">%s</xliff:g> • மெதுவாகச் சார்ஜாகிறது"</string> <string name="keyguard_plugged_in_charging_limited" msgid="6091488837901216962">"<xliff:g id="PERCENTAGE">%s</xliff:g> • சார்ஜாவது தற்காலிகமாக வரம்பிடப்பட்டுள்ளது"</string> <string name="keyguard_low_battery" msgid="1868012396800230904">"சார்ஜரை இணைக்கவும்."</string> - <string name="keyguard_instructions_when_pattern_disabled" msgid="8448804180089936954">"திறக்க, மெனுவை அழுத்தவும்."</string> + <string name="keyguard_instructions_when_pattern_disabled" msgid="8448804180089936954">"அன்லாக் செய்ய மெனுவை அழுத்தவும்."</string> <string name="keyguard_network_locked_message" msgid="407096292844868608">"நெட்வொர்க் பூட்டப்பட்டது"</string> <string name="keyguard_missing_sim_message_short" msgid="704159478161444907">"சிம் கார்டு இல்லை"</string> <string name="keyguard_missing_sim_instructions" msgid="1162120926141335918">"சிம் கார்டைச் செருகவும்."</string> @@ -85,11 +85,11 @@ <string name="kg_login_too_many_attempts" msgid="4519957179182578690">"பேட்டர்னை அதிக முறை தவறாக வரைந்துவிட்டீர்கள்"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="544687656831558971">"உங்கள் பின்னை <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_password_wrong_pin_code_pukked" msgid="8047350661459040581">"சிம்மின் பின் குறியீடு தவறானது. இனி சாதனத்தைத் திறக்க, உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</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">"சிம்மின் பின் குறியீடு தவறானது. இனி சாதனத்தை அன்லாக் செய்ய, உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="7030584350995485026"> <item quantity="other">சிம்மின் பின் குறியீடு தவறானது, இன்னும் நீங்கள் <xliff:g id="NUMBER_1">%d</xliff:g> முறை முயலலாம்.</item> - <item quantity="one">சிம்மின் பின் குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER_0">%d</xliff:g> முயற்சிகளுக்குப் பின்னர், உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்பு கொண்டு மட்டுமே சாதனத்தைத் திறக்க முடியும்.</item> + <item quantity="one">சிம்மின் பின் குறியீடு தவறானது, மேலும் <xliff:g id="NUMBER_0">%d</xliff:g> முயற்சிகளுக்குப் பின்னர், உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்பு கொண்டு மட்டுமே சாதனத்தை அன்லாக் செய்ய முடியும்.</item> </plurals> <string name="kg_password_wrong_puk_code_dead" msgid="3698285357028468617">"பயன்படுத்த முடியாத சிம். உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்புகொள்ளவும்."</string> <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="3937306685604862886"> @@ -129,7 +129,7 @@ <string name="kg_face_not_recognized" msgid="7903950626744419160">"அடையாளங்காணபடவில்லை"</string> <plurals name="kg_password_default_pin_message" formatted="false" msgid="7730152526369857818"> <item quantity="other">சிம் பின்னை உள்ளிடவும். மேலும், <xliff:g id="NUMBER_1">%d</xliff:g> வாய்ப்புகள் மீதமுள்ளன.</item> - <item quantity="one">சிம் பின்னை உள்ளிடவும். மீதமுள்ள <xliff:g id="NUMBER_0">%d</xliff:g> வாய்ப்பில் தவறுதலான பின் உள்ளிடப்பட்டால், உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்பு கொண்டு மட்டுமே சாதனத்தைத் திறக்க முடியும்.</item> + <item quantity="one">சிம் பின்னை உள்ளிடவும். மீதமுள்ள <xliff:g id="NUMBER_0">%d</xliff:g> வாய்ப்பில் தவறுதலான பின் உள்ளிடப்பட்டால், உங்கள் தொலைத்தொடர்பு நிறுவனத்தைத் தொடர்பு கொண்டு மட்டுமே சாதனத்தை அன்லாக் செய்ய முடியும்.</item> </plurals> <plurals name="kg_password_default_puk_message" formatted="false" msgid="571308542462946935"> <item quantity="other">சிம் தற்போது முடக்கப்பட்டுள்ளது. தொடர்வதற்கு, PUK குறியீட்டை உள்ளிடவும். நீங்கள் <xliff:g id="_NUMBER_1">%d</xliff:g> முறை மட்டுமே முயற்சிக்க முடியும். அதன்பிறகு சிம் நிரந்தரமாக முடக்கப்படும். விவரங்களுக்கு, மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்.</item> diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index ec0500ffea5d..34c892675a14 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -36,7 +36,7 @@ <string name="keyguard_charged" msgid="5478247181205188995">"已完成充電"</string> <string name="keyguard_plugged_in_wireless" msgid="2537874724955057383">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 無線充電中"</string> <string name="keyguard_plugged_in" msgid="8169926454348380863">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在充電"</string> - <string name="keyguard_plugged_in_charging_fast" msgid="4386594091107340426">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在快速充電"</string> + <string name="keyguard_plugged_in_charging_fast" msgid="4386594091107340426">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 快速充電中"</string> <string name="keyguard_plugged_in_charging_slowly" msgid="217655355424210">"<xliff:g id="PERCENTAGE">%s</xliff:g> •正在慢速充電"</string> <string name="keyguard_plugged_in_charging_limited" msgid="6091488837901216962">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 充電暫時受限"</string> <string name="keyguard_low_battery" msgid="1868012396800230904">"請連接充電器。"</string> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml index e8f7b353f7a9..7e3c87b24f07 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -41,6 +41,7 @@ <dimen name="keyguard_security_view_lateral_margin">20dp</dimen> <dimen name="keyguard_eca_top_margin">18dp</dimen> + <dimen name="keyguard_eca_bottom_margin">12dp</dimen> <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text. Should be 0 on devices with plenty of room (e.g. tablets) --> @@ -88,6 +89,7 @@ <!-- Spacing around each button used for PIN view --> <dimen name="num_pad_key_width">72dp</dimen> + <dimen name="num_pad_entry_row_margin_bottom">16dp</dimen> <dimen name="num_pad_row_margin_bottom">6dp</dimen> <dimen name="num_pad_key_margin_end">12dp</dimen> diff --git a/packages/SystemUI/res/color/screenrecord_switch_thumb_color.xml b/packages/SystemUI/res/color/screenrecord_switch_thumb_color.xml new file mode 100644 index 000000000000..22b7a1e50dd6 --- /dev/null +++ b/packages/SystemUI/res/color/screenrecord_switch_thumb_color.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Disabled status of thumb --> + <item android:state_enabled="false" + android:color="@android:color/system_neutral2_100" /> + <!-- Toggle off status of thumb --> + <item android:state_checked="false" + android:color="@android:color/system_neutral2_100" /> + <!-- Enabled or toggle on status of thumb --> + <item android:color="@android:color/system_accent1_100" /> +</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/color/screenrecord_switch_track_color.xml b/packages/SystemUI/res/color/screenrecord_switch_track_color.xml new file mode 100644 index 000000000000..bb55b07a6731 --- /dev/null +++ b/packages/SystemUI/res/color/screenrecord_switch_track_color.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Disabled status of thumb --> + <item android:state_enabled="false" + android:color="@android:color/system_neutral2_600" + android:alpha="?android:attr/disabledAlpha" /> + <!-- Toggle off status of thumb --> + <item android:state_checked="false" + android:color="@android:color/system_neutral2_600" /> + <!-- Enabled or toggle on status of thumb --> + <item android:color="@android:color/system_accent1_600" /> +</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/global_actions_popup_bg.xml b/packages/SystemUI/res/drawable/global_actions_popup_bg.xml new file mode 100644 index 000000000000..fc781a065527 --- /dev/null +++ b/packages/SystemUI/res/drawable/global_actions_popup_bg.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="?android:attr/colorBackgroundFloating" /> + <corners + android:bottomLeftRadius="?android:attr/dialogCornerRadius" + android:topLeftRadius="?android:attr/dialogCornerRadius" + android:bottomRightRadius="?android:attr/dialogCornerRadius" + android:topRightRadius="?android:attr/dialogCornerRadius" + /> +</shape> diff --git a/packages/SystemUI/res/drawable/ic_touch.xml b/packages/SystemUI/res/drawable/ic_touch.xml index 4f6698de5251..18ad3679bd1a 100644 --- a/packages/SystemUI/res/drawable/ic_touch.xml +++ b/packages/SystemUI/res/drawable/ic_touch.xml @@ -13,14 +13,13 @@ Copyright (C) 2020 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> -<!-- maybe need android:fillType="evenOdd" --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> <path - android:fillColor="#FF000000" - android:pathData="M9,7.5V11.24C7.79,10.43 7,9.06 7,7.5C7,5.01 9.01,3 11.5,3C13.99,3 16,5.01 16,7.5C16,9.06 15.21,10.43 14,11.24V7.5C14,6.12 12.88,5 11.5,5C10.12,5 9,6.12 9,7.5ZM14.3,13.61L18.84,15.87C19.37,16.09 19.75,16.63 19.75,17.25C19.75,17.31 19.74,17.38 19.73,17.45L18.98,22.72C18.87,23.45 18.29,24 17.54,24H10.75C10.34,24 9.96,23.83 9.69,23.56L4.75,18.62L5.54,17.82C5.74,17.62 6.02,17.49 6.33,17.49C6.39,17.49 6.4411,17.4989 6.4922,17.5078C6.5178,17.5122 6.5433,17.5167 6.57,17.52L10,18.24V7.5C10,6.67 10.67,6 11.5,6C12.33,6 13,6.67 13,7.5V13.5H13.76C13.95,13.5 14.13,13.54 14.3,13.61Z" - /> + android:fillColor="@android:color/white" + android:pathData="M18.19,12.44l-3.24,-1.62c1.29,-1 2.12,-2.56 2.12,-4.32c0,-3.03 -2.47,-5.5 -5.5,-5.5s-5.5,2.47 -5.5,5.5c0,2.13 1.22,3.98 3,4.89v3.26c-2.11,-0.45 -2.01,-0.44 -2.26,-0.44c-0.53,0 -1.03,0.21 -1.41,0.59L4,16.22l5.09,5.09C9.52,21.75 10.12,22 10.74,22h6.3c0.98,0 1.81,-0.7 1.97,-1.67l0.8,-4.71C20.03,14.32 19.38,13.04 18.19,12.44zM17.84,15.29L17.04,20h-6.3c-0.09,0 -0.17,-0.04 -0.24,-0.1l-3.68,-3.68l4.25,0.89V6.5c0,-0.28 0.22,-0.5 0.5,-0.5c0.28,0 0.5,0.22 0.5,0.5v6h1.76l3.46,1.73C17.69,14.43 17.91,14.86 17.84,15.29zM8.07,6.5c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,0.95 -0.38,1.81 -1,2.44V6.5c0,-1.38 -1.12,-2.5 -2.5,-2.5c-1.38,0 -2.5,1.12 -2.5,2.5v2.44C8.45,8.31 8.07,7.45 8.07,6.5z"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_wallet_lockscreen.xml b/packages/SystemUI/res/drawable/ic_wallet_lockscreen.xml index 2f8f11d72331..def7b3136f30 100644 --- a/packages/SystemUI/res/drawable/ic_wallet_lockscreen.xml +++ b/packages/SystemUI/res/drawable/ic_wallet_lockscreen.xml @@ -17,21 +17,12 @@ */ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <group> - <clip-path - android:pathData="M2.15,1.54h20v21h-20z"/> - <path - android:pathData="M19,21.83H5.35a3.19,3.19 0,0 1,-3.2 -3.19v-7A3.19,3.19 0,0 1,5.35 8.5H19a3.19,3.19 0,0 1,3.19 3.19v7A3.19,3.19 0,0 1,19 21.83ZM5.35,10.44A1.25,1.25 0,0 0,4.1 11.69v7a1.25,1.25 0,0 0,1.25 1.24H19a1.25,1.25 0,0 0,1.25 -1.24v-7A1.25,1.25 0,0 0,19 10.44Z" - android:fillColor="#FF000000" /> - <path - android:pathData="M4.7,10.16 L4.21,8.57 16,5a3.56,3.56 0,0 1,3.1 0.25c1,0.67 1.65,2 1.89,4l-1.66,0.2C19.12,8 18.72,7 18.15,6.62a2,2 0,0 0,-1.7 0Z" - android:fillColor="#FF000000" /> - <path - android:pathData="M4.43,10.47l-1,-1.34 7.31,-5.44c3,-1.86 5.51,1 6.33,2L15.82,6.77c-2.1,-2.44 -3.23,-2.26 -4.14,-1.7Z" - android:fillColor="#FF000000" /> - </group> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"/> </vector> diff --git a/packages/SystemUI/res/drawable/screenrecord_button_background_outline.xml b/packages/SystemUI/res/drawable/screenrecord_button_background_outline.xml new file mode 100644 index 000000000000..59a31e8f6136 --- /dev/null +++ b/packages/SystemUI/res/drawable/screenrecord_button_background_outline.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle"> + <stroke + android:color="?androidprv:attr/colorAccentPrimary" + android:width="1dp"/> + <corners android:radius="24dp"/> + <padding + android:left="16dp" + android:right="16dp" + android:top="8dp" + android:bottom="8dp" /> + <solid android:color="@android:color/transparent" /> +</shape> diff --git a/core/tests/coretests/apks/res_upgrade/res_before/values/values.xml b/packages/SystemUI/res/drawable/screenrecord_button_background_solid.xml index 63fc79020e3f..d6446fc87ea0 100644 --- a/core/tests/coretests/apks/res_upgrade/res_before/values/values.xml +++ b/packages/SystemUI/res/drawable/screenrecord_button_background_solid.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- ~ Copyright (C) 2021 The Android Open Source Project ~ @@ -15,8 +14,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<resources> - <string name="version">before</string> - <public type="string" name="version" id="0x7f010000"/> -</resources> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle"> + <corners android:radius="24dp"/> + <padding + android:left="16dp" + android:right="16dp" + android:top="8dp" + android:bottom="8dp" /> + <solid android:color="?androidprv:attr/colorAccentPrimary" /> +</shape>
\ No newline at end of file diff --git a/core/tests/coretests/apks/res_upgrade/res_after/values/values.xml b/packages/SystemUI/res/drawable/screenrecord_spinner_background.xml index db4fd54c7aee..e82fb8f23ce0 100644 --- a/core/tests/coretests/apks/res_upgrade/res_after/values/values.xml +++ b/packages/SystemUI/res/drawable/screenrecord_spinner_background.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- ~ Copyright (C) 2021 The Android Open Source Project ~ @@ -15,8 +14,10 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<resources> - <string name="version">after</string> - <public type="string" name="version" id="0x7f010000"/> -</resources> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:shape="rectangle" + android:padding="12dp"> + <corners android:radius="24dp"/> + <solid android:color="?androidprv:attr/colorAccentSecondary" /> +</shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/screenrecord_switch_thumb.xml b/packages/SystemUI/res/drawable/screenrecord_switch_thumb.xml new file mode 100644 index 000000000000..f78c582dffd9 --- /dev/null +++ b/packages/SystemUI/res/drawable/screenrecord_switch_thumb.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:top="4dp" + android:left="4dp" + android:right="4dp" + android:bottom="4dp"> + <shape android:shape="oval" > + <size android:height="20dp" android:width="20dp" /> + <solid android:color="@color/screenrecord_switch_thumb_color" /> + </shape> + </item> +</layer-list>
\ No newline at end of file diff --git a/core/tests/coretests/apks/res_upgrade/AndroidManifest.xml b/packages/SystemUI/res/drawable/screenrecord_switch_track.xml index 1c607c9fd249..82595e4d6d65 100644 --- a/core/tests/coretests/apks/res_upgrade/AndroidManifest.xml +++ b/packages/SystemUI/res/drawable/screenrecord_switch_track.xml @@ -14,7 +14,11 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.frameworks.coretests.res_version"> - <application android:hasCode="false"/> -</manifest> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" + android:width="52dp" + android:height="28dp"> + <solid android:color="@color/screenrecord_switch_track_color" /> + <corners android:radius="35dp" /> +</shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/screenshot_save_background.xml b/packages/SystemUI/res/drawable/screenshot_button_background.xml index b61b28ed1d9e..3c39fe2ecb06 100644 --- a/packages/SystemUI/res/drawable/screenshot_save_background.xml +++ b/packages/SystemUI/res/drawable/screenshot_button_background.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<!-- Long screenshot save button background --> +<!-- Long screenshot save/cancel button background --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:color="?android:textColorPrimary"> diff --git a/packages/SystemUI/res/drawable/wallet_app_button_bg.xml b/packages/SystemUI/res/drawable/wallet_app_button_bg.xml index 1136b9d208af..ecf09c2e2e2d 100644 --- a/packages/SystemUI/res/drawable/wallet_app_button_bg.xml +++ b/packages/SystemUI/res/drawable/wallet_app_button_bg.xml @@ -14,10 +14,11 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <item> <shape android:shape="rectangle"> - <stroke android:width="1dp" android:color="@color/GM2_grey_300"/> + <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentSecondary"/> <solid android:color="@android:color/transparent"/> <corners android:radius="24dp"/> </shape> diff --git a/packages/SystemUI/res/layout/global_screenshot_static.xml b/packages/SystemUI/res/layout/global_screenshot_static.xml index ba46edced03c..665d4a04b00b 100644 --- a/packages/SystemUI/res/layout/global_screenshot_static.xml +++ b/packages/SystemUI/res/layout/global_screenshot_static.xml @@ -127,6 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="matrix" + android:visibility="gone" app:layout_constraintStart_toStartOf="@id/global_screenshot_preview" app:layout_constraintTop_toTopOf="@id/global_screenshot_preview" android:elevation="@dimen/screenshot_preview_elevation"/> diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml index 50f38b6fa67f..8a2c8f09948d 100644 --- a/packages/SystemUI/res/layout/long_screenshot.xml +++ b/packages/SystemUI/res/layout/long_screenshot.xml @@ -32,12 +32,27 @@ android:text="@string/save" android:layout_marginStart="8dp" android:layout_marginTop="4dp" - android:background="@drawable/screenshot_save_background" + android:background="@drawable/screenshot_button_background" android:textColor="?android:textColorSecondary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/preview" /> + <Button + android:id="@+id/cancel" + style="@android:style/Widget.DeviceDefault.Button.Colored" + android:layout_width="wrap_content" + android:layout_height="40dp" + android:text="@android:string/cancel" + android:layout_marginStart="6dp" + android:layout_marginTop="4dp" + android:background="@drawable/screenshot_button_background" + android:textColor="?android:textColorSecondary" + app:layout_constraintStart_toEndOf="@id/save" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/preview" + /> + <ImageButton android:id="@+id/share" style="@android:style/Widget.Material.Button.Borderless" @@ -98,8 +113,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:handleThickness="@dimen/screenshot_crop_handle_thickness" - app:handleColor="?androidprv:attr/colorAccentPrimary" - app:scrimColor="@color/screenshot_crop_scrim" + app:handleColor="?android:attr/colorAccent" + app:scrimColor="?android:colorBackgroundFloating" + app:scrimAlpha="128" app:containerBackgroundColor="?android:colorBackgroundFloating" tools:background="?android:colorBackground" tools:minHeight="100dp" @@ -114,8 +130,9 @@ app:layout_constraintTop_toTopOf="@id/preview" app:layout_constraintLeft_toLeftOf="parent" app:handleThickness="@dimen/screenshot_crop_handle_thickness" - app:handleColor="?androidprv:attr/colorAccentSecondary" - app:scrimColor="@color/screenshot_crop_scrim" + app:handleColor="?android:attr/colorAccent" + app:scrimColor="?android:colorBackgroundFloating" + app:scrimAlpha="128" app:borderThickness="4dp" app:borderColor="#fff" /> diff --git a/packages/SystemUI/res/layout/people_space_initial_layout.xml b/packages/SystemUI/res/layout/people_space_initial_layout.xml index 98920417b0ef..a06a499b42f2 100644 --- a/packages/SystemUI/res/layout/people_space_initial_layout.xml +++ b/packages/SystemUI/res/layout/people_space_initial_layout.xml @@ -26,6 +26,7 @@ android:id="@android:id/background" android:orientation="horizontal" android:gravity="center" + android:contentDescription="@string/status_before_loading" android:layout_gravity="top" android:paddingVertical="16dp" android:paddingHorizontal="16dp" diff --git a/packages/SystemUI/res/layout/people_tile_medium_empty.xml b/packages/SystemUI/res/layout/people_tile_medium_empty.xml index 4a186831a2b0..80078e8940d8 100644 --- a/packages/SystemUI/res/layout/people_tile_medium_empty.xml +++ b/packages/SystemUI/res/layout/people_tile_medium_empty.xml @@ -34,8 +34,8 @@ android:orientation="horizontal"> <ImageView android:id="@+id/person_icon" - android:layout_width="64dp" - android:layout_height="64dp" /> + android:layout_width="@dimen/avatar_size_for_medium_empty" + android:layout_height="@dimen/avatar_size_for_medium_empty" /> <ImageView android:id="@+id/availability" android:layout_width="10dp" @@ -46,8 +46,9 @@ android:background="@drawable/availability_dot_10dp" /> </LinearLayout> <LinearLayout + android:id="@+id/padding_before_availability" android:orientation="vertical" - android:paddingStart="4dp" + android:paddingStart="@dimen/availability_dot_shown_padding" android:gravity="top" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/packages/SystemUI/res/layout/people_tile_small.xml b/packages/SystemUI/res/layout/people_tile_small.xml index 44e68e544271..48a588a629ab 100644 --- a/packages/SystemUI/res/layout/people_tile_small.xml +++ b/packages/SystemUI/res/layout/people_tile_small.xml @@ -44,7 +44,7 @@ android:tint="?android:attr/textColorSecondary" android:layout_gravity="center" android:layout_width="18dp" - android:layout_height="22dp" /> + android:layout_height="18dp" /> <TextView android:id="@+id/messages_count" diff --git a/packages/SystemUI/res/layout/people_tile_small_horizontal.xml b/packages/SystemUI/res/layout/people_tile_small_horizontal.xml new file mode 100644 index 000000000000..950d7ac34225 --- /dev/null +++ b/packages/SystemUI/res/layout/people_tile_small_horizontal.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + android:theme="@android:style/Theme.DeviceDefault.DayNight" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:id="@android:id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:background="@drawable/people_space_tile_view_card" + android:clipToOutline="true" + android:orientation="horizontal" + android:paddingHorizontal="8dp" + android:paddingTop="4dp" + android:paddingBottom="6dp"> + + <ImageView + android:id="@+id/person_icon" + android:layout_gravity="start|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingEnd="4dp"/> + + <ImageView + android:id="@+id/predefined_icon" + android:layout_weight="1" + android:tint="?android:attr/textColorSecondary" + android:layout_gravity="start|center_vertical" + android:layout_width="18dp" + android:layout_height="18dp" /> + + <TextView + android:id="@+id/messages_count" + android:layout_weight="1" + android:layout_gravity="start|center_vertical" + android:gravity="center" + android:paddingHorizontal="8dp" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title" + android:textColor="?androidprv:attr/textColorOnAccent" + android:background="@drawable/people_space_messages_count_background" + android:textSize="@dimen/name_text_size_for_small" + android:maxLines="1" + android:ellipsize="end" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + /> + + <TextView + android:id="@+id/name" + android:layout_weight="1" + android:layout_gravity="start|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/name_text_size_for_small" /> + </LinearLayout> +</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_horizontal.xml b/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_horizontal.xml index f7e12eba689d..8e84ec84e439 100644 --- a/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_horizontal.xml +++ b/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_horizontal.xml @@ -21,26 +21,27 @@ android:id="@android:id/background" android:background="@drawable/people_tile_suppressed_background" android:clipToOutline="true" - android:padding="8dp" + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" android:orientation="horizontal"> <ImageView android:id="@+id/person_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_width="@dimen/avatar_size_for_medium_empty" + android:layout_height="@dimen/avatar_size_for_medium_empty"/> <TextView android:gravity="start" android:id="@+id/text_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" + android:layout_marginStart="12dp" android:ellipsize="end" android:maxLines="2" android:singleLine="false" android:text="@string/empty_status" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title" - android:textColor="?android:attr/textColorPrimary" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/content_text_size_for_medium" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_vertical.xml b/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_vertical.xml index c488d890986d..25ee1096b1bc 100644 --- a/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_vertical.xml +++ b/packages/SystemUI/res/layout/people_tile_with_suppression_detail_content_vertical.xml @@ -32,6 +32,7 @@ <ImageView android:id="@+id/person_icon" + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/packages/SystemUI/res/layout/screen_record_dialog.xml b/packages/SystemUI/res/layout/screen_record_dialog.xml index c1767ee89743..d1cc01f0694e 100644 --- a/packages/SystemUI/res/layout/screen_record_dialog.xml +++ b/packages/SystemUI/res/layout/screen_record_dialog.xml @@ -28,6 +28,10 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:paddingTop="26dp" + android:paddingBottom="30dp" android:orientation="vertical"> <!-- Header --> @@ -35,27 +39,28 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:gravity="center" - android:padding="@dimen/screenrecord_dialog_padding"> + android:gravity="center"> <ImageView android:layout_width="@dimen/screenrecord_logo_size" android:layout_height="@dimen/screenrecord_logo_size" android:src="@drawable/ic_screenrecord" - android:tint="@color/GM2_red_500" - android:layout_marginBottom="@dimen/screenrecord_dialog_padding"/> + android:tint="@color/screenrecord_icon_color"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:fontFamily="@*android:string/config_headlineFontFamily" - android:text="@string/screenrecord_start_label"/> + android:text="@string/screenrecord_start_label" + android:layout_marginTop="22dp" + android:layout_marginBottom="15dp"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/screenrecord_description" android:textAppearance="?android:attr/textAppearanceSmall" - android:paddingTop="@dimen/screenrecord_dialog_padding" - android:paddingBottom="@dimen/screenrecord_dialog_padding"/> + android:textColor="?android:textColorSecondary" + android:gravity="center" + android:layout_marginBottom="20dp"/> <!-- Options --> <LinearLayout @@ -63,18 +68,21 @@ android:layout_height="wrap_content" android:orientation="horizontal"> <ImageView - android:layout_width="@dimen/screenrecord_logo_size" - android:layout_height="@dimen/screenrecord_logo_size" + android:layout_width="@dimen/screenrecord_option_icon_size" + android:layout_height="@dimen/screenrecord_option_icon_size" android:src="@drawable/ic_mic_26dp" - android:tint="@color/GM2_grey_700" + android:tint="?android:attr/textColorSecondary" android:layout_gravity="center" android:layout_weight="0" - android:layout_marginRight="@dimen/screenrecord_dialog_padding"/> + android:layout_marginRight="@dimen/screenrecord_option_padding"/> <Spinner android:id="@+id/screen_recording_options" android:layout_width="0dp" - android:layout_height="48dp" + android:layout_height="wrap_content" + android:minHeight="48dp" android:layout_weight="1" + android:popupBackground="@drawable/screenrecord_spinner_background" + android:dropDownWidth="274dp" android:prompt="@string/screenrecord_audio_label"/> <Switch android:layout_width="wrap_content" @@ -83,63 +91,76 @@ android:layout_weight="0" android:layout_gravity="end" android:contentDescription="@string/screenrecord_audio_label" - android:id="@+id/screenrecord_audio_switch"/> + android:id="@+id/screenrecord_audio_switch" + style="@style/ScreenRecord.Switch"/> </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_marginTop="@dimen/screenrecord_option_padding"> <ImageView - android:layout_width="@dimen/screenrecord_logo_size" - android:layout_height="@dimen/screenrecord_logo_size" + android:layout_width="@dimen/screenrecord_option_icon_size" + android:layout_height="@dimen/screenrecord_option_icon_size" + android:layout_weight="0" android:src="@drawable/ic_touch" - android:tint="@color/GM2_grey_700" + android:tint="?android:attr/textColorSecondary" android:layout_gravity="center" - android:layout_marginRight="@dimen/screenrecord_dialog_padding"/> + android:layout_marginRight="@dimen/screenrecord_option_padding"/> + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:minHeight="48dp" + android:layout_weight="1" + android:text="@string/screenrecord_taps_label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:fontFamily="@*android:string/config_headlineFontFamily" + android:textColor="?android:attr/textColorPrimary" + android:importantForAccessibility="no"/> <Switch - android:layout_width="match_parent" + android:layout_width="wrap_content" + android:minWidth="48dp" android:layout_height="48dp" + android:layout_weight="0" android:id="@+id/screenrecord_taps_switch" - android:text="@string/screenrecord_taps_label" - android:textColor="?android:attr/textColorPrimary" - android:textAppearance="?android:attr/textAppearanceSmall"/> - + android:contentDescription="@string/screenrecord_taps_label" + style="@style/ScreenRecord.Switch"/> </LinearLayout> </LinearLayout> - <!-- hr --> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="@color/GM2_grey_300"/> - <!-- Buttons --> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="@dimen/screenrecord_dialog_padding"> - <Button + android:layout_marginTop="36dp"> + <TextView android:id="@+id/button_cancel" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" android:layout_gravity="start" android:text="@string/cancel" - style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"/> + android:textColor="?android:textColorPrimary" + android:background="@drawable/screenrecord_button_background_outline" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="14sp"/> <Space android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"/> - <Button + <TextView android:id="@+id/button_start" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_weight="0" android:layout_gravity="end" android:text="@string/screenrecord_start" - style="@android:style/Widget.DeviceDefault.Button.Colored"/> + android:textColor="@android:color/system_neutral1_900" + android:background="@drawable/screenrecord_button_background_solid" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="14sp"/> </LinearLayout> </LinearLayout> </ScrollView> diff --git a/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml b/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml index 0c4d5a26f95b..ab600b3758bc 100644 --- a/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml +++ b/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml @@ -19,18 +19,19 @@ android:layout_width="250dp" android:layout_height="48dp" android:orientation="vertical" - android:padding="13dp"> + android:padding="12dp"> <TextView android:id="@+id/screen_recording_dialog_source_text" - android:layout_width="250dp" + android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorPrimary"/> + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="14sp" + android:textColor="@android:color/system_neutral1_900"/> <TextView android:id="@+id/screen_recording_dialog_source_description" - android:layout_width="250dp" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary"/> + android:textColor="@android:color/system_neutral2_700"/> </LinearLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml b/packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml index fabe9e2d4453..e2b8d33e3d8e 100644 --- a/packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml +++ b/packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml @@ -24,7 +24,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/screenrecord_audio_label" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" + android:fontFamily="@*android:string/config_headlineFontFamily" android:textColor="?android:attr/textColorPrimary"/> <TextView android:id="@+id/screen_recording_dialog_source_text" diff --git a/packages/SystemUI/res/layout/udfps_keyguard_view.xml b/packages/SystemUI/res/layout/udfps_keyguard_view.xml index 562040b0ad82..33baa4e07dc7 100644 --- a/packages/SystemUI/res/layout/udfps_keyguard_view.xml +++ b/packages/SystemUI/res/layout/udfps_keyguard_view.xml @@ -16,6 +16,7 @@ --> <com.android.systemui.biometrics.UdfpsKeyguardView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/udfps_animation_view" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -29,8 +30,28 @@ android:visibility="gone"/> <!-- Fingerprint --> - <ImageView - android:id="@+id/udfps_keyguard_animation_fp_view" + + <!-- AOD dashed fingerprint icon with moving dashes --> + <com.airbnb.lottie.LottieAnimationView + android:id="@+id/udfps_aod_fp" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:scaleType="centerCrop" + app:lottie_autoPlay="false" + android:padding="16dp" + app:lottie_loop="true" + app:lottie_rawRes="@raw/udfps_aod_fp"/> + + <!-- LockScreen fingerprint icon from 0 stroke width to full width --> + <com.airbnb.lottie.LottieAnimationView + android:id="@+id/udfps_lockscreen_fp" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" + android:layout_gravity="center" + android:scaleType="centerCrop" + app:lottie_autoPlay="false" + app:lottie_loop="false" + android:padding="16dp" + app:lottie_rawRes="@raw/udfps_lockscreen_fp"/> </com.android.systemui.biometrics.UdfpsKeyguardView> diff --git a/packages/SystemUI/res/layout/wallet_fullscreen.xml b/packages/SystemUI/res/layout/wallet_fullscreen.xml index 71006f08e8fa..1dd400a62f7f 100644 --- a/packages/SystemUI/res/layout/wallet_fullscreen.xml +++ b/packages/SystemUI/res/layout/wallet_fullscreen.xml @@ -27,12 +27,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:navigationContentDescription="@null" /> + android:navigationContentDescription="@null"> + <Button + android:id="@+id/wallet_toolbar_app_button" + android:layout_width="wrap_content" + android:layout_height="30dp" + android:layout_gravity="end|center_horizontal" + android:paddingHorizontal="@dimen/wallet_button_horizontal_padding" + android:background="@drawable/wallet_app_button_bg" + android:text="@string/wallet_app_button_label" + android:textColor="?androidprv:attr/colorAccentPrimary" + android:textAlignment="center" + android:visibility="gone"/> + </Toolbar> <LinearLayout android:id="@+id/card_carousel_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="48dp" + android:layout_marginTop="@dimen/wallet_card_carousel_container_top_margin" android:orientation="vertical"> <androidx.core.widget.NestedScrollView android:layout_width="match_parent" @@ -54,6 +66,7 @@ android:id="@+id/label" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="24dp" android:layout_marginHorizontal="48dp" android:textColor="?androidprv:attr/textColorPrimary" android:textAlignment="center"/> @@ -67,7 +80,7 @@ android:transitionName="dotIndicator" android:clipChildren="false" android:clipToPadding="false" - android:layout_marginVertical="24dp"/> + android:layout_marginBottom="24dp"/> <Button android:id="@+id/wallet_action_button" android:layout_width="wrap_content" @@ -83,6 +96,7 @@ </LinearLayout> </androidx.core.widget.NestedScrollView> <View + android:id="@+id/dynamic_placeholder" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.1"/> diff --git a/packages/SystemUI/res/raw/udfps_aod_fp.json b/packages/SystemUI/res/raw/udfps_aod_fp.json new file mode 100644 index 000000000000..cdac33244345 --- /dev/null +++ b/packages/SystemUI/res/raw/udfps_aod_fp.json @@ -0,0 +1,2445 @@ +{ + "v": "5.7.8", + "fr": 60, + "ip": 0, + "op": 361, + "w": 180, + "h": 185, + "nm": "fingerprint_burn_in_Loop", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "Layer 1 Outlines 10", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -3.684, + 0 + ], + [ + -2.883, + -1.583 + ] + ], + "o": [ + [ + 2.883, + -1.583 + ], + [ + 3.683, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -10.417, + 1.25 + ], + [ + 0.001, + -1.25 + ], + [ + 10.417, + 1.25 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 17, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 246 + ] + }, + { + "t": 360, + "s": [ + 1326 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.999, + 7.5 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 3", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 2, + "ty": 4, + "nm": "Layer 1 Outlines 5", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -3.684, + 0 + ], + [ + -2.883, + -1.583 + ] + ], + "o": [ + [ + 2.883, + -1.583 + ], + [ + 3.683, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -10.417, + 1.25 + ], + [ + 0.001, + -1.25 + ], + [ + 10.417, + 1.25 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 54, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 360, + "s": [ + 1080 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.999, + 7.5 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 3", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 3, + "ty": 4, + "nm": "Layer 1 Outlines 8", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -5.883, + 0 + ], + [ + -2.367, + -3.933 + ] + ], + "o": [ + [ + 2.367, + -3.933 + ], + [ + 5.883, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -13.75, + 3.333 + ], + [ + 0, + -3.333 + ], + [ + 13.75, + 3.333 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 38.235, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 170 + ] + }, + { + "t": 360, + "s": [ + 890 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 20, + 16.25 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 2", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 4, + "ty": 4, + "nm": "Layer 1 Outlines 4", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -5.883, + 0 + ], + [ + -2.367, + -3.933 + ] + ], + "o": [ + [ + 2.367, + -3.933 + ], + [ + 5.883, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -13.75, + 3.333 + ], + [ + 0, + -3.333 + ], + [ + 13.75, + 3.333 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 34.235, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 360, + "s": [ + 720 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 20, + 16.25 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 2", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 5, + "ty": 4, + "nm": "Layer 1 Outlines 7", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + -6.65, + 0 + ], + [ + 0, + -5.9 + ], + [ + 0, + 0 + ], + [ + 2.333, + 0 + ], + [ + 0.633, + 1.601 + ], + [ + 0, + 0 + ], + [ + 1.717, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + -2.2 + ], + [ + -2.15, + -1.716 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + -0.767, + -2.134 + ], + [ + 0, + -5.917 + ], + [ + 6.65, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 2.333 + ], + [ + -1.734, + 0 + ], + [ + 0, + 0 + ], + [ + -0.634, + -1.599 + ], + [ + 0, + 0 + ], + [ + -2.2, + 0 + ], + [ + 0, + 2.75 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -11.108, + 5.825 + ], + [ + -11.875, + 1.525 + ], + [ + -0.208, + -9.175 + ], + [ + 11.875, + 1.525 + ], + [ + 11.875, + 1.592 + ], + [ + 7.659, + 5.808 + ], + [ + 3.742, + 3.158 + ], + [ + 2.526, + 0.141 + ], + [ + -1.391, + -2.508 + ], + [ + -1.641, + -2.508 + ], + [ + -5.625, + 1.475 + ], + [ + -2.225, + 8.558 + ], + [ + -1.458, + 9.175 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 35, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + -159 + ] + }, + { + "t": 360, + "s": [ + 201 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 4, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.992, + 28.758 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 4", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 6, + "ty": 4, + "nm": "Layer 1 Outlines 6", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + -6.65, + 0 + ], + [ + 0, + -5.9 + ], + [ + 0, + 0 + ], + [ + 2.333, + 0 + ], + [ + 0.633, + 1.601 + ], + [ + 0, + 0 + ], + [ + 1.717, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + -2.2 + ], + [ + -2.15, + -1.716 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + -0.767, + -2.134 + ], + [ + 0, + -5.917 + ], + [ + 6.65, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 2.333 + ], + [ + -1.734, + 0 + ], + [ + 0, + 0 + ], + [ + -0.634, + -1.599 + ], + [ + 0, + 0 + ], + [ + -2.2, + 0 + ], + [ + 0, + 2.75 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -11.108, + 5.825 + ], + [ + -11.875, + 1.525 + ], + [ + -0.208, + -9.175 + ], + [ + 11.875, + 1.525 + ], + [ + 11.875, + 1.592 + ], + [ + 7.659, + 5.808 + ], + [ + 3.742, + 3.158 + ], + [ + 2.526, + 0.141 + ], + [ + -1.391, + -2.508 + ], + [ + -1.641, + -2.508 + ], + [ + -5.625, + 1.475 + ], + [ + -2.225, + 8.558 + ], + [ + -1.458, + 9.175 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 9, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 135 + ] + }, + { + "t": 360, + "s": [ + 495 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 4, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.992, + 28.758 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 4", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 7, + "ty": 4, + "nm": "Layer 1 Outlines 3", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + -6.65, + 0 + ], + [ + 0, + -5.9 + ], + [ + 0, + 0 + ], + [ + 2.333, + 0 + ], + [ + 0.633, + 1.601 + ], + [ + 0, + 0 + ], + [ + 1.717, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + -2.2 + ], + [ + -2.15, + -1.716 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + -0.767, + -2.134 + ], + [ + 0, + -5.917 + ], + [ + 6.65, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 2.333 + ], + [ + -1.734, + 0 + ], + [ + 0, + 0 + ], + [ + -0.634, + -1.599 + ], + [ + 0, + 0 + ], + [ + -2.2, + 0 + ], + [ + 0, + 2.75 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -11.108, + 5.825 + ], + [ + -11.875, + 1.525 + ], + [ + -0.208, + -9.175 + ], + [ + 11.875, + 1.525 + ], + [ + 11.875, + 1.592 + ], + [ + 7.659, + 5.808 + ], + [ + 3.742, + 3.158 + ], + [ + 2.526, + 0.141 + ], + [ + -1.391, + -2.508 + ], + [ + -1.641, + -2.508 + ], + [ + -5.625, + 1.475 + ], + [ + -2.225, + 8.558 + ], + [ + -1.458, + 9.175 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 30, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 360, + "s": [ + 360 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 4, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.992, + 28.758 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 4", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + }, + { + "ddd": 0, + "ind": 8, + "ty": 4, + "nm": "Layer 1 Outlines 2", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 3.2, + 0 + ], + [ + 2.217, + 2.066 + ] + ], + "o": [ + [ + -2.217, + 2.066 + ], + [ + -3.2, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 8.75, + -1.667 + ], + [ + 0, + 1.667 + ], + [ + -8.75, + -1.667 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 69, + "ix": 2 + }, + "o": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0.833 + ], + "y": [ + 0.833 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 360, + "s": [ + 720 + ] + } + ], + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 0, + "k": 1, + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "d": [ + { + "n": "d", + "nm": "dash", + "v": { + "a": 0, + "k": 0, + "ix": 1 + } + }, + { + "n": "o", + "nm": "offset", + "v": { + "a": 0, + "k": 25, + "ix": 7 + } + } + ], + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 20, + 42.083 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + } + ], + "markers": [ + { + "tm": 210, + "cm": "2", + "dr": 0 + }, + { + "tm": 255, + "cm": "1", + "dr": 0 + } + ] +}
\ No newline at end of file diff --git a/packages/SystemUI/res/raw/udfps_lockscreen_fp.json b/packages/SystemUI/res/raw/udfps_lockscreen_fp.json new file mode 100644 index 000000000000..cef433ef95d2 --- /dev/null +++ b/packages/SystemUI/res/raw/udfps_lockscreen_fp.json @@ -0,0 +1,1017 @@ +{ + "v": "5.7.8", + "fr": 60, + "ip": 0, + "op": 46, + "w": 180, + "h": 185, + "nm": "fingerprint_build_on", + "ddd": 0, + "assets": [], + "layers": [ + { + "ddd": 0, + "ind": 1, + "ty": 4, + "nm": "fingerprint_build_on", + "sr": 1, + "ks": { + "o": { + "a": 0, + "k": 100, + "ix": 11 + }, + "r": { + "a": 0, + "k": 0, + "ix": 10 + }, + "p": { + "a": 0, + "k": [ + 91.456, + 92.206, + 0 + ], + "ix": 2, + "l": 2 + }, + "a": { + "a": 0, + "k": [ + 20, + 25, + 0 + ], + "ix": 1, + "l": 2 + }, + "s": { + "a": 0, + "k": [ + 350, + 350, + 100 + ], + "ix": 6, + "l": 2 + } + }, + "ao": 0, + "shapes": [ + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 3.2, + 0 + ], + [ + 2.217, + 2.066 + ] + ], + "o": [ + [ + -2.217, + 2.066 + ], + [ + -3.2, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + 8.75, + -1.667 + ], + [ + 0, + 1.667 + ], + [ + -8.75, + -1.667 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 100, + "ix": 2 + }, + "o": { + "a": 0, + "k": 0, + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 24, + "s": [ + 2.5 + ] + } + ], + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "d": [ + { + "n": "d", + "nm": "dash", + "v": { + "a": 0, + "k": 0, + "ix": 1 + } + }, + { + "n": "o", + "nm": "offset", + "v": { + "a": 0, + "k": 0, + "ix": 7 + } + } + ], + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 20, + 42.083 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 1", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 1, + "mn": "ADBE Vector Group", + "hd": false + }, + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -5.883, + 0 + ], + [ + -2.367, + -3.933 + ] + ], + "o": [ + [ + 2.367, + -3.933 + ], + [ + 5.883, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -13.75, + 3.333 + ], + [ + 0, + -3.333 + ], + [ + 13.75, + 3.333 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 100, + "ix": 2 + }, + "o": { + "a": 0, + "k": 0, + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 24, + "s": [ + 2.5 + ] + } + ], + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 20, + 16.25 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 2", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 2, + "mn": "ADBE Vector Group", + "hd": false + }, + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + -3.684, + 0 + ], + [ + -2.883, + -1.583 + ] + ], + "o": [ + [ + 2.883, + -1.583 + ], + [ + 3.683, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -10.417, + 1.25 + ], + [ + 0.001, + -1.25 + ], + [ + 10.417, + 1.25 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 100, + "ix": 2 + }, + "o": { + "a": 0, + "k": 0, + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 24, + "s": [ + 2.5 + ] + } + ], + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.999, + 7.5 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 3", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 3, + "mn": "ADBE Vector Group", + "hd": false + }, + { + "ty": "gr", + "it": [ + { + "ind": 0, + "ty": "sh", + "ix": 1, + "ks": { + "a": 0, + "k": { + "i": [ + [ + 0, + 0 + ], + [ + 0, + 0 + ], + [ + -6.65, + 0 + ], + [ + 0, + -5.9 + ], + [ + 0, + 0 + ], + [ + 2.333, + 0 + ], + [ + 0.633, + 1.601 + ], + [ + 0, + 0 + ], + [ + 1.717, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + -2.2 + ], + [ + -2.15, + -1.716 + ], + [ + 0, + 0 + ] + ], + "o": [ + [ + -0.767, + -2.134 + ], + [ + 0, + -5.917 + ], + [ + 6.65, + 0 + ], + [ + 0, + 0 + ], + [ + 0, + 2.333 + ], + [ + -1.734, + 0 + ], + [ + 0, + 0 + ], + [ + -0.634, + -1.599 + ], + [ + 0, + 0 + ], + [ + -2.2, + 0 + ], + [ + 0, + 2.75 + ], + [ + 0, + 0 + ], + [ + 0, + 0 + ] + ], + "v": [ + [ + -11.108, + 5.825 + ], + [ + -11.875, + 1.525 + ], + [ + -0.208, + -9.175 + ], + [ + 11.875, + 1.525 + ], + [ + 11.875, + 1.592 + ], + [ + 7.659, + 5.808 + ], + [ + 3.742, + 3.158 + ], + [ + 2.526, + 0.141 + ], + [ + -1.391, + -2.508 + ], + [ + -1.641, + -2.508 + ], + [ + -5.625, + 1.475 + ], + [ + -2.225, + 8.558 + ], + [ + -1.458, + 9.175 + ] + ], + "c": false + }, + "ix": 2 + }, + "nm": "Path 1", + "mn": "ADBE Vector Shape - Group", + "hd": false + }, + { + "ty": "tm", + "s": { + "a": 0, + "k": 0, + "ix": 1 + }, + "e": { + "a": 0, + "k": 100, + "ix": 2 + }, + "o": { + "a": 0, + "k": 0, + "ix": 3 + }, + "m": 1, + "ix": 2, + "nm": "Trim Paths 1", + "mn": "ADBE Vector Filter - Trim", + "hd": false + }, + { + "ty": "st", + "c": { + "a": 0, + "k": [ + 1, + 1, + 1, + 1 + ], + "ix": 3 + }, + "o": { + "a": 0, + "k": 100, + "ix": 4 + }, + "w": { + "a": 1, + "k": [ + { + "i": { + "x": [ + 0 + ], + "y": [ + 1 + ] + }, + "o": { + "x": [ + 0.167 + ], + "y": [ + 0.167 + ] + }, + "t": 0, + "s": [ + 0 + ] + }, + { + "t": 24, + "s": [ + 2.5 + ] + } + ], + "ix": 5 + }, + "lc": 2, + "lj": 1, + "ml": 10, + "bm": 0, + "nm": "Stroke 1", + "mn": "ADBE Vector Graphic - Stroke", + "hd": false + }, + { + "ty": "tr", + "p": { + "a": 0, + "k": [ + 19.992, + 28.758 + ], + "ix": 2 + }, + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "nm": "Transform" + } + ], + "nm": "Group 4", + "np": 3, + "cix": 2, + "bm": 0, + "ix": 4, + "mn": "ADBE Vector Group", + "hd": false + } + ], + "ip": 0, + "op": 600, + "st": 0, + "bm": 0 + } + ], + "markers": [ + { + "tm": 210, + "cm": "2", + "dr": 0 + }, + { + "tm": 255, + "cm": "1", + "dr": 0 + } + ] +}
\ No newline at end of file diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index ab91e7844720..bb48ad5c4e44 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Stel op om vinniger, veiliger aankope met jou foon te doen"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Wys alles"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ontsluit om te betaal"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nie opgestel nie"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Voeg \'n kaart by"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Dateer tans op"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ontsluit om te gebruik"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Kon nie jou kaarte kry nie; probeer later weer"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Sluitskerminstellings"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Maak gesprek oop"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Gespreklegstukke"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tik op \'n gesprek om dit by jou tuisskerm te voeg"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Jou onlangse gesprekke sal hier verskyn"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriteitgesprekke"</string> <string name="recent_conversations" msgid="8531874684782574622">"Onlangse gesprekke"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Sien onlangse boodskappe, gemiste oproepe en statusopdaterings"</string> <string name="people_tile_title" msgid="6589377493334871272">"Gesprek"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Onderbreek deur Moenie Steur nie"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> het \'n boodskap gestuur"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> het \'n prent gestuur"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Kon nie jou batterymeter lees nie"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tik vir meer inligting"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Geen wekker nie"</string> diff --git a/packages/SystemUI/res/values-af/tiles_states_strings.xml b/packages/SystemUI/res/values-af/tiles_states_strings.xml new file mode 100644 index 000000000000..5ce5340479c9 --- /dev/null +++ b/packages/SystemUI/res/values-af/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Onbeskikbaar"</item> + <item msgid="3048856902433862868">"Af"</item> + <item msgid="6877982264300789870">"Aan"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Onbeskikbaar"</item> + <item msgid="4293012229142257455">"Af"</item> + <item msgid="6221288736127914861">"Aan"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Onbeskikbaar"</item> + <item msgid="2074416252859094119">"Af"</item> + <item msgid="287997784730044767">"Aan"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Onbeskikbaar"</item> + <item msgid="7838121007534579872">"Af"</item> + <item msgid="1578872232501319194">"Aan"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Onbeskikbaar"</item> + <item msgid="5376619709702103243">"Af"</item> + <item msgid="4875147066469902392">"Aan"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Onbeskikbaar"</item> + <item msgid="5044688398303285224">"Af"</item> + <item msgid="8527389108867454098">"Aan"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Onbeskikbaar"</item> + <item msgid="5776427577477729185">"Af"</item> + <item msgid="7105052717007227415">"Aan"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Onbeskikbaar"</item> + <item msgid="5315121904534729843">"Af"</item> + <item msgid="503679232285959074">"Aan"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Onbeskikbaar"</item> + <item msgid="4801037224991420996">"Af"</item> + <item msgid="1982293347302546665">"Aan"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Onbeskikbaar"</item> + <item msgid="4813655083852587017">"Af"</item> + <item msgid="6744077414775180687">"Aan"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Onbeskikbaar"</item> + <item msgid="5715725170633593906">"Af"</item> + <item msgid="2075645297847971154">"Aan"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Onbeskikbaar"</item> + <item msgid="9103697205127645916">"Af"</item> + <item msgid="8067744885820618230">"Aan"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Onbeskikbaar"</item> + <item msgid="6983679487661600728">"Af"</item> + <item msgid="7520663805910678476">"Aan"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Onbeskikbaar"</item> + <item msgid="400477985171353">"Af"</item> + <item msgid="630890598801118771">"Aan"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Onbeskikbaar"</item> + <item msgid="8045580926543311193">"Af"</item> + <item msgid="4913460972266982499">"Aan"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Onbeskikbaar"</item> + <item msgid="1488620600954313499">"Af"</item> + <item msgid="588467578853244035">"Aan"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Onbeskikbaar"</item> + <item msgid="2744885441164350155">"Af"</item> + <item msgid="151121227514952197">"Aan"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Onbeskikbaar"</item> + <item msgid="8259411607272330225">"Af"</item> + <item msgid="578444932039713369">"Aan"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Onbeskikbaar"</item> + <item msgid="8707481475312432575">"Af"</item> + <item msgid="8031106212477483874">"Aan"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Onbeskikbaar"</item> + <item msgid="4572245614982283078">"Af"</item> + <item msgid="6536448410252185664">"Aan"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Onbeskikbaar"</item> + <item msgid="4765607635752003190">"Af"</item> + <item msgid="1697460731949649844">"Aan"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Onbeskikbaar"</item> + <item msgid="3296179158646568218">"Af"</item> + <item msgid="8998632451221157987">"Aan"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Onbeskikbaar"</item> + <item msgid="4544919905196727508">"Af"</item> + <item msgid="3422023746567004609">"Aan"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Onbeskikbaar"</item> + <item msgid="7571394439974244289">"Af"</item> + <item msgid="6866424167599381915">"Aan"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Onbeskikbaar"</item> + <item msgid="2710157085538036590">"Af"</item> + <item msgid="7809470840976856149">"Aan"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 823f9a12dbf2..10371c4d0179 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"በስልክዎ በመጠቀም ፈጣን እና የበለጠ ደህንነቱ በተጠበቀ መንገድ ግዢዎችን ለመፈጸም ዝግጁ ይሁኑ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ሁሉንም አሳይ"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ለመክፈል ይክፈቱ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"አልተዋቀረም"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"ውይይት ይክፈቱ"</string> <string name="select_conversation_title" msgid="6716364118095089519">"የውይይት ምግብሮች"</string> <string name="select_conversation_text" msgid="3376048251434956013">"በመነሻ ማያ ገጽዎ ላይ ለማከል አንድ ውይይት መታ ያድርጉ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"የቅርብ ጊዜ ውይይቶችዎ እዚህ ይታያሉ"</string> <string name="priority_conversations" msgid="3967482288896653039">"የቅድሚያ ውይይቶች"</string> <string name="recent_conversations" msgid="8531874684782574622">"የቅርብ ጊዜ ውይይቶች"</string> <string name="okay" msgid="6490552955618608554">"እሺ"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"የቅርብ ጊዜ መልዕክቶችን፣ ያመለጡ ጥሪዎች እና፣ የሁኔታ ዝመናዎችን ይመልከቱ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ውይይት"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"በአትረብሽ ባለበት ቆሟል"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> መልዕክት ልኳል"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ምስል ልኳል"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"የባትሪ መለኪያዎን የማንበብ ችግር"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ለበለጠ መረጃ መታ ያድርጉ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ምንም ማንቂያ አልተቀናበረም"</string> diff --git a/packages/SystemUI/res/values-am/tiles_states_strings.xml b/packages/SystemUI/res/values-am/tiles_states_strings.xml new file mode 100644 index 000000000000..0a53d20330ed --- /dev/null +++ b/packages/SystemUI/res/values-am/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"አይገኝም"</item> + <item msgid="3048856902433862868">"ጠፍቷል"</item> + <item msgid="6877982264300789870">"በርቷል"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"አይገኝም"</item> + <item msgid="4293012229142257455">"ጠፍቷል"</item> + <item msgid="6221288736127914861">"በርቷል"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"አይገኝም"</item> + <item msgid="2074416252859094119">"ጠፍቷል"</item> + <item msgid="287997784730044767">"በርቷል"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"አይገኝም"</item> + <item msgid="7838121007534579872">"ጠፍቷል"</item> + <item msgid="1578872232501319194">"በርቷል"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"አይገኝም"</item> + <item msgid="5376619709702103243">"ጠፍቷል"</item> + <item msgid="4875147066469902392">"በርቷል"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"አይገኝም"</item> + <item msgid="5044688398303285224">"ጠፍቷል"</item> + <item msgid="8527389108867454098">"በርቷል"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"አይገኝም"</item> + <item msgid="5776427577477729185">"ጠፍቷል"</item> + <item msgid="7105052717007227415">"በርቷል"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"አይገኝም"</item> + <item msgid="5315121904534729843">"ጠፍቷል"</item> + <item msgid="503679232285959074">"በርቷል"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"አይገኝም"</item> + <item msgid="4801037224991420996">"ጠፍቷል"</item> + <item msgid="1982293347302546665">"በርቷል"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"አይገኝም"</item> + <item msgid="4813655083852587017">"ጠፍቷል"</item> + <item msgid="6744077414775180687">"በርቷል"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"አይገኝም"</item> + <item msgid="5715725170633593906">"ጠፍቷል"</item> + <item msgid="2075645297847971154">"በርቷል"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"አይገኝም"</item> + <item msgid="9103697205127645916">"ጠፍቷል"</item> + <item msgid="8067744885820618230">"በርቷል"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"አይገኝም"</item> + <item msgid="6983679487661600728">"ጠፍቷል"</item> + <item msgid="7520663805910678476">"በርቷል"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"አይገኝም"</item> + <item msgid="400477985171353">"ጠፍቷል"</item> + <item msgid="630890598801118771">"በርቷል"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"አይገኝም"</item> + <item msgid="8045580926543311193">"ጠፍቷል"</item> + <item msgid="4913460972266982499">"በርቷል"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"አይገኝም"</item> + <item msgid="1488620600954313499">"ጠፍቷል"</item> + <item msgid="588467578853244035">"በርቷል"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"አይገኝም"</item> + <item msgid="2744885441164350155">"ጠፍቷል"</item> + <item msgid="151121227514952197">"በርቷል"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"አይገኝም"</item> + <item msgid="8259411607272330225">"ጠፍቷል"</item> + <item msgid="578444932039713369">"በርቷል"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"አይገኝም"</item> + <item msgid="8707481475312432575">"ጠፍቷል"</item> + <item msgid="8031106212477483874">"በርቷል"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"አይገኝም"</item> + <item msgid="4572245614982283078">"ጠፍቷል"</item> + <item msgid="6536448410252185664">"በርቷል"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"አይገኝም"</item> + <item msgid="4765607635752003190">"ጠፍቷል"</item> + <item msgid="1697460731949649844">"በርቷል"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"አይገኝም"</item> + <item msgid="3296179158646568218">"ጠፍቷል"</item> + <item msgid="8998632451221157987">"በርቷል"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"አይገኝም"</item> + <item msgid="4544919905196727508">"ጠፍቷል"</item> + <item msgid="3422023746567004609">"በርቷል"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"አይገኝም"</item> + <item msgid="7571394439974244289">"ጠፍቷል"</item> + <item msgid="6866424167599381915">"በርቷል"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"አይገኝም"</item> + <item msgid="2710157085538036590">"ጠፍቷል"</item> + <item msgid="7809470840976856149">"በርቷል"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 999f4abfded8..3360546378ca 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -681,7 +681,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"يمكنك إعداد طريقة دفع لإجراء عمليات شراء بسرعة وأمان أكبر باستخدام هاتفك."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"عرض الكل"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"فتح القفل للدفع"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"لم يتم الإعداد."</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1139,8 +1142,7 @@ <string name="basic_status" msgid="2315371112182658176">"محادثة مفتوحة"</string> <string name="select_conversation_title" msgid="6716364118095089519">"أدوات المحادثة"</string> <string name="select_conversation_text" msgid="3376048251434956013">"انقر على محادثة لإضافتها إلى \"الشاشة الرئيسية\"."</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ستظهر هنا المحادثات الحديثة."</string> <string name="priority_conversations" msgid="3967482288896653039">"المحادثات ذات الأولوية"</string> <string name="recent_conversations" msgid="8531874684782574622">"المحادثات الحديثة"</string> <string name="okay" msgid="6490552955618608554">"حسنًا"</string> @@ -1170,8 +1172,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"عرض أحدث الرسائل والمكالمات الفائتة والتغييرات في الحالة"</string> <string name="people_tile_title" msgid="6589377493334871272">"محادثة"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"تم إيقاف الإشعار مؤقتًا من خلال ميزة \"عدم الإزعاج\""</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"تم إرسال رسالة من <xliff:g id="NAME">%1$s</xliff:g>."</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"تم إرسال صورة من <xliff:g id="NAME">%1$s</xliff:g>."</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"حدثت مشكلة أثناء قراءة مقياس مستوى شحن البطارية."</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"انقر للحصول على مزيد من المعلومات."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"لم يتم ضبط منبّه."</string> diff --git a/packages/SystemUI/res/values-ar/tiles_states_strings.xml b/packages/SystemUI/res/values-ar/tiles_states_strings.xml new file mode 100644 index 000000000000..90baf043a8a3 --- /dev/null +++ b/packages/SystemUI/res/values-ar/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"الميزة غير متاحة"</item> + <item msgid="3048856902433862868">"الميزة غير مفعّلة"</item> + <item msgid="6877982264300789870">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"الميزة غير متاحة"</item> + <item msgid="4293012229142257455">"الميزة غير مفعّلة"</item> + <item msgid="6221288736127914861">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"الميزة غير متاحة"</item> + <item msgid="2074416252859094119">"الميزة غير مفعّلة"</item> + <item msgid="287997784730044767">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"الميزة غير متاحة"</item> + <item msgid="7838121007534579872">"الميزة غير مفعّلة"</item> + <item msgid="1578872232501319194">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"الميزة غير متاحة"</item> + <item msgid="5376619709702103243">"الميزة غير مفعّلة"</item> + <item msgid="4875147066469902392">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"الميزة غير متاحة"</item> + <item msgid="5044688398303285224">"الميزة غير مفعّلة"</item> + <item msgid="8527389108867454098">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"الميزة غير متاحة"</item> + <item msgid="5776427577477729185">"الميزة غير مفعّلة"</item> + <item msgid="7105052717007227415">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"الميزة غير متاحة"</item> + <item msgid="5315121904534729843">"الميزة غير مفعّلة"</item> + <item msgid="503679232285959074">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"الميزة غير متاحة"</item> + <item msgid="4801037224991420996">"الميزة غير مفعّلة"</item> + <item msgid="1982293347302546665">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"الميزة غير متاحة"</item> + <item msgid="4813655083852587017">"الميزة غير مفعّلة"</item> + <item msgid="6744077414775180687">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"الميزة غير متاحة"</item> + <item msgid="5715725170633593906">"الميزة غير مفعّلة"</item> + <item msgid="2075645297847971154">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"الميزة غير متاحة"</item> + <item msgid="9103697205127645916">"الميزة غير مفعّلة"</item> + <item msgid="8067744885820618230">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"الميزة غير متاحة"</item> + <item msgid="6983679487661600728">"الميزة غير مفعّلة"</item> + <item msgid="7520663805910678476">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"الميزة غير متاحة"</item> + <item msgid="400477985171353">"الميزة غير مفعّلة"</item> + <item msgid="630890598801118771">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"الميزة غير متاحة"</item> + <item msgid="8045580926543311193">"الميزة غير مفعّلة"</item> + <item msgid="4913460972266982499">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"الميزة غير متاحة"</item> + <item msgid="1488620600954313499">"الميزة غير مفعّلة"</item> + <item msgid="588467578853244035">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"الميزة غير متاحة"</item> + <item msgid="2744885441164350155">"الميزة غير مفعّلة"</item> + <item msgid="151121227514952197">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"الميزة غير متاحة"</item> + <item msgid="8259411607272330225">"الميزة غير مفعّلة"</item> + <item msgid="578444932039713369">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"الميزة غير متاحة"</item> + <item msgid="8707481475312432575">"الميزة غير مفعّلة"</item> + <item msgid="8031106212477483874">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"الميزة غير متاحة"</item> + <item msgid="4572245614982283078">"الميزة غير مفعّلة"</item> + <item msgid="6536448410252185664">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"الميزة غير متاحة"</item> + <item msgid="4765607635752003190">"الميزة غير مفعّلة"</item> + <item msgid="1697460731949649844">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"الميزة غير متاحة"</item> + <item msgid="3296179158646568218">"الميزة غير مفعّلة"</item> + <item msgid="8998632451221157987">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"الميزة غير متاحة"</item> + <item msgid="4544919905196727508">"الميزة غير مفعّلة"</item> + <item msgid="3422023746567004609">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"الميزة غير متاحة"</item> + <item msgid="7571394439974244289">"الميزة غير مفعّلة"</item> + <item msgid="6866424167599381915">"الميزة مفعّلة"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"الميزة غير متاحة"</item> + <item msgid="2710157085538036590">"الميزة غير مفعّلة"</item> + <item msgid="7809470840976856149">"الميزة مفعّلة"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 110bf2e50ca4..dd09dde7c57a 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"আপোনাৰ ফ’নটোৰে দ্ৰুত তথা অধিক সুৰক্ষিত ক্ৰয় কৰিবলৈ ছেট আপ পাওক"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"আটাইবোৰ দেখুৱাওক"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"পৰিশোধ কৰিবলৈ আনলক কৰক"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ছেট আপ কৰা হোৱা নাই"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"বাৰ্তালাপ খোলক"</string> <string name="select_conversation_title" msgid="6716364118095089519">"বাৰ্তালাপ ৱিজেট"</string> <string name="select_conversation_text" msgid="3376048251434956013">"আপোনাৰ গৃহ স্ক্ৰীনত কোনো বাৰ্তালাপ যোগ দিবলৈ সেইটোত টিপক"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"আপোনাৰ শেহতীয়া বাৰ্তালাপসমূহ ইয়াত দেখা পোৱা যাব"</string> <string name="priority_conversations" msgid="3967482288896653039">"অগ্ৰাধিকাৰপ্ৰাপ্ত বাৰ্তালাপ"</string> <string name="recent_conversations" msgid="8531874684782574622">"শেহতীয়া বাৰ্তালাপ"</string> <string name="okay" msgid="6490552955618608554">"ঠিক আছে"</string> @@ -1145,10 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"শেহতীয়া বাৰ্তা, মিছড্ কল আৰু স্থিতিৰ আপডে’ট চাওক"</string> <string name="people_tile_title" msgid="6589377493334871272">"বাৰ্তালাপ"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"অসুবিধা নিদিব সুবিধাটোৱে পজ কৰিছে"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>এ এটা বাৰ্তা পঠিয়াইছে"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>এ এখন প্ৰতিচ্ছবি পঠিয়াইছে"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"অধিক তথ্যৰ বাবে টিপক"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"কোনো এলাৰ্ম ছেট কৰা হোৱা নাই"</string> diff --git a/packages/SystemUI/res/values-as/tiles_states_strings.xml b/packages/SystemUI/res/values-as/tiles_states_strings.xml new file mode 100644 index 000000000000..fa333df39a49 --- /dev/null +++ b/packages/SystemUI/res/values-as/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"উপলব্ধ নহয়"</item> + <item msgid="3048856902433862868">"অফ আছে"</item> + <item msgid="6877982264300789870">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"উপলব্ধ নহয়"</item> + <item msgid="4293012229142257455">"অফ আছে"</item> + <item msgid="6221288736127914861">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"উপলব্ধ নহয়"</item> + <item msgid="2074416252859094119">"অফ আছে"</item> + <item msgid="287997784730044767">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"উপলব্ধ নহয়"</item> + <item msgid="7838121007534579872">"অফ আছে"</item> + <item msgid="1578872232501319194">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"উপলব্ধ নহয়"</item> + <item msgid="5376619709702103243">"অফ আছে"</item> + <item msgid="4875147066469902392">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"উপলব্ধ নহয়"</item> + <item msgid="5044688398303285224">"অফ আছে"</item> + <item msgid="8527389108867454098">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"উপলব্ধ নহয়"</item> + <item msgid="5776427577477729185">"অফ আছে"</item> + <item msgid="7105052717007227415">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"উপলব্ধ নহয়"</item> + <item msgid="5315121904534729843">"অফ আছে"</item> + <item msgid="503679232285959074">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"উপলব্ধ নহয়"</item> + <item msgid="4801037224991420996">"অফ আছে"</item> + <item msgid="1982293347302546665">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"উপলব্ধ নহয়"</item> + <item msgid="4813655083852587017">"অফ আছে"</item> + <item msgid="6744077414775180687">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"উপলব্ধ নহয়"</item> + <item msgid="5715725170633593906">"অফ আছে"</item> + <item msgid="2075645297847971154">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"উপলব্ধ নহয়"</item> + <item msgid="9103697205127645916">"অফ আছে"</item> + <item msgid="8067744885820618230">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"উপলব্ধ নহয়"</item> + <item msgid="6983679487661600728">"অফ আছে"</item> + <item msgid="7520663805910678476">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"উপলব্ধ নহয়"</item> + <item msgid="400477985171353">"অফ আছে"</item> + <item msgid="630890598801118771">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"উপলব্ধ নহয়"</item> + <item msgid="8045580926543311193">"অফ আছে"</item> + <item msgid="4913460972266982499">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"উপলব্ধ নহয়"</item> + <item msgid="1488620600954313499">"অফ আছে"</item> + <item msgid="588467578853244035">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"উপলব্ধ নহয়"</item> + <item msgid="2744885441164350155">"অফ আছে"</item> + <item msgid="151121227514952197">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"উপলব্ধ নহয়"</item> + <item msgid="8259411607272330225">"অফ আছে"</item> + <item msgid="578444932039713369">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"উপলব্ধ নহয়"</item> + <item msgid="8707481475312432575">"অফ আছে"</item> + <item msgid="8031106212477483874">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"উপলব্ধ নহয়"</item> + <item msgid="4572245614982283078">"অফ আছে"</item> + <item msgid="6536448410252185664">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"উপলব্ধ নহয়"</item> + <item msgid="4765607635752003190">"অফ আছে"</item> + <item msgid="1697460731949649844">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"উপলব্ধ নহয়"</item> + <item msgid="3296179158646568218">"অফ আছে"</item> + <item msgid="8998632451221157987">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"উপলব্ধ নহয়"</item> + <item msgid="4544919905196727508">"অফ আছে"</item> + <item msgid="3422023746567004609">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"উপলব্ধ নহয়"</item> + <item msgid="7571394439974244289">"অফ আছে"</item> + <item msgid="6866424167599381915">"অন কৰা আছে"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"উপলব্ধ নহয়"</item> + <item msgid="2710157085538036590">"অফ আছে"</item> + <item msgid="7809470840976856149">"অন কৰা আছে"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index b47f2510f8c1..035df7c95576 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Telefonunuzla daha sürətli və təhlükəsiz satınalmalar etmək üçün ayarlayın"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Hamısını göstər"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ödəmək üçün kiliddən çıxarın"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Quraşdırılmayıb"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"İstifadə etmək üçün kiliddən çıxarın"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Kartların əldə edilməsində problem oldu, sonra yenidən cəhd edin"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Kilid ekranı ayarları"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Açıq söhbət"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Söhbət vidcetləri"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Əsas ekranınıza əlavə etmək üçün söhbətə toxunun"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Son söhbətləriniz burada görünəcək"</string> <string name="priority_conversations" msgid="3967482288896653039">"Önəmli söhbətlər"</string> <string name="recent_conversations" msgid="8531874684782574622">"Son söhbətlər"</string> <string name="okay" msgid="6490552955618608554">"Oldu"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Son mesajlar, buraxılmış zənglər və status güncəlləmələrinə baxın"</string> <string name="people_tile_title" msgid="6589377493334871272">"Söhbət"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\"Narahat Etməyin\" rejimini tərəfindən durdurulub"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> mesaj göndərdi"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> şəkil göndərdi"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batareya ölçüsünü oxuyarkən problem yarandı"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ətraflı məlumat üçün toxunun"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Siqnal ayarlanmayıb"</string> diff --git a/packages/SystemUI/res/values-az/tiles_states_strings.xml b/packages/SystemUI/res/values-az/tiles_states_strings.xml new file mode 100644 index 000000000000..1a3a2dc25f64 --- /dev/null +++ b/packages/SystemUI/res/values-az/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Əlçatan deyil"</item> + <item msgid="3048856902433862868">"Deaktiv"</item> + <item msgid="6877982264300789870">"Aktiv"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Əlçatan deyil"</item> + <item msgid="4293012229142257455">"Deaktiv"</item> + <item msgid="6221288736127914861">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Əlçatan deyil"</item> + <item msgid="2074416252859094119">"Deaktiv"</item> + <item msgid="287997784730044767">"Aktiv"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Əlçatan deyil"</item> + <item msgid="7838121007534579872">"Deaktiv"</item> + <item msgid="1578872232501319194">"Aktiv"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Əlçatan deyil"</item> + <item msgid="5376619709702103243">"Deaktiv"</item> + <item msgid="4875147066469902392">"Aktiv"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Əlçatan deyil"</item> + <item msgid="5044688398303285224">"Deaktiv"</item> + <item msgid="8527389108867454098">"Aktiv"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Əlçatan deyil"</item> + <item msgid="5776427577477729185">"Deaktiv"</item> + <item msgid="7105052717007227415">"Aktiv"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Əlçatan deyil"</item> + <item msgid="5315121904534729843">"Deaktiv"</item> + <item msgid="503679232285959074">"Aktiv"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Əlçatan deyil"</item> + <item msgid="4801037224991420996">"Deaktiv"</item> + <item msgid="1982293347302546665">"Aktiv"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Əlçatan deyil"</item> + <item msgid="4813655083852587017">"Deaktiv"</item> + <item msgid="6744077414775180687">"Aktiv"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Əlçatan deyil"</item> + <item msgid="5715725170633593906">"Deaktiv"</item> + <item msgid="2075645297847971154">"Aktiv"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Əlçatan deyil"</item> + <item msgid="9103697205127645916">"Deaktiv"</item> + <item msgid="8067744885820618230">"Aktiv"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Əlçatan deyil"</item> + <item msgid="6983679487661600728">"Deaktiv"</item> + <item msgid="7520663805910678476">"Aktiv"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Əlçatan deyil"</item> + <item msgid="400477985171353">"Deaktiv"</item> + <item msgid="630890598801118771">"Aktiv"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Əlçatan deyil"</item> + <item msgid="8045580926543311193">"Deaktiv"</item> + <item msgid="4913460972266982499">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Əlçatan deyil"</item> + <item msgid="1488620600954313499">"Deaktiv"</item> + <item msgid="588467578853244035">"Aktiv"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Əlçatan deyil"</item> + <item msgid="2744885441164350155">"Deaktiv"</item> + <item msgid="151121227514952197">"Aktiv"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Əlçatan deyil"</item> + <item msgid="8259411607272330225">"Deaktiv"</item> + <item msgid="578444932039713369">"Aktiv"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Əlçatan deyil"</item> + <item msgid="8707481475312432575">"Deaktiv"</item> + <item msgid="8031106212477483874">"Aktiv"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Əlçatan deyil"</item> + <item msgid="4572245614982283078">"Deaktiv"</item> + <item msgid="6536448410252185664">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Əlçatan deyil"</item> + <item msgid="4765607635752003190">"Deaktiv"</item> + <item msgid="1697460731949649844">"Aktiv"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Əlçatan deyil"</item> + <item msgid="3296179158646568218">"Deaktiv"</item> + <item msgid="8998632451221157987">"Aktiv"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Əlçatan deyil"</item> + <item msgid="4544919905196727508">"Deaktiv"</item> + <item msgid="3422023746567004609">"Aktiv"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Əlçatan deyil"</item> + <item msgid="7571394439974244289">"Deaktiv"</item> + <item msgid="6866424167599381915">"Aktiv"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Əlçatan deyil"</item> + <item msgid="2710157085538036590">"Deaktiv"</item> + <item msgid="7809470840976856149">"Aktiv"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 2bf692090eaa..80652c749761 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -672,7 +672,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Obavite konfigurisanje da biste mogli brže i sigurnije da kupujete pomoću telefona"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Prikaži sve"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Otključaj radi plaćanja"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nije podešeno"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Dodajte karticu"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Ažurira se"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključaj radi korišćenja"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Došlo je do problema pri preuzimanju kartica. Probajte ponovo kasnije"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Podešavanja zaključanog ekrana"</string> @@ -1121,8 +1122,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otvorite konverzaciju"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Vidžeti za konverzaciju"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Dodirnite konverzaciju da biste je dodali na početni ekran"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Nedavne konverzacije će se prikazati ovde"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritetne konverzacije"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nedavne konverzacije"</string> <string name="okay" msgid="6490552955618608554">"Važi"</string> @@ -1152,8 +1152,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzacija"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirano režimom Ne uznemiravaj"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> šalje poruku"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> šalje sliku"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem sa očitavanjem merača baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarm nije podešen"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml b/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml new file mode 100644 index 000000000000..5622a82ee6d5 --- /dev/null +++ b/packages/SystemUI/res/values-b+sr+Latn/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nedostupno"</item> + <item msgid="3048856902433862868">"Isključeno"</item> + <item msgid="6877982264300789870">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nedostupno"</item> + <item msgid="4293012229142257455">"Isključeno"</item> + <item msgid="6221288736127914861">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nedostupno"</item> + <item msgid="2074416252859094119">"Isključeno"</item> + <item msgid="287997784730044767">"Uključeno"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nedostupno"</item> + <item msgid="7838121007534579872">"Isključeno"</item> + <item msgid="1578872232501319194">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nedostupno"</item> + <item msgid="5376619709702103243">"Isključeno"</item> + <item msgid="4875147066469902392">"Uključeno"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nedostupno"</item> + <item msgid="5044688398303285224">"Isključeno"</item> + <item msgid="8527389108867454098">"Uključeno"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nedostupno"</item> + <item msgid="5776427577477729185">"Isključeno"</item> + <item msgid="7105052717007227415">"Uključeno"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nedostupno"</item> + <item msgid="5315121904534729843">"Isključeno"</item> + <item msgid="503679232285959074">"Uključeno"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nedostupno"</item> + <item msgid="4801037224991420996">"Isključeno"</item> + <item msgid="1982293347302546665">"Uključeno"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nedostupno"</item> + <item msgid="4813655083852587017">"Isključeno"</item> + <item msgid="6744077414775180687">"Uključeno"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nedostupno"</item> + <item msgid="5715725170633593906">"Isključeno"</item> + <item msgid="2075645297847971154">"Uključeno"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nedostupno"</item> + <item msgid="9103697205127645916">"Isključeno"</item> + <item msgid="8067744885820618230">"Uključeno"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nedostupno"</item> + <item msgid="6983679487661600728">"Isključeno"</item> + <item msgid="7520663805910678476">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nedostupno"</item> + <item msgid="400477985171353">"Isključeno"</item> + <item msgid="630890598801118771">"Uključeno"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nedostupno"</item> + <item msgid="8045580926543311193">"Isključeno"</item> + <item msgid="4913460972266982499">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nedostupno"</item> + <item msgid="1488620600954313499">"Isključeno"</item> + <item msgid="588467578853244035">"Uključeno"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nedostupno"</item> + <item msgid="2744885441164350155">"Isključeno"</item> + <item msgid="151121227514952197">"Uključeno"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nedostupno"</item> + <item msgid="8259411607272330225">"Isključeno"</item> + <item msgid="578444932039713369">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nedostupno"</item> + <item msgid="8707481475312432575">"Isključeno"</item> + <item msgid="8031106212477483874">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nedostupno"</item> + <item msgid="4572245614982283078">"Isključeno"</item> + <item msgid="6536448410252185664">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nedostupno"</item> + <item msgid="4765607635752003190">"Isključeno"</item> + <item msgid="1697460731949649844">"Uključeno"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nedostupno"</item> + <item msgid="3296179158646568218">"Isključeno"</item> + <item msgid="8998632451221157987">"Uključeno"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nedostupno"</item> + <item msgid="4544919905196727508">"Isključeno"</item> + <item msgid="3422023746567004609">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nedostupno"</item> + <item msgid="7571394439974244289">"Isključeno"</item> + <item msgid="6866424167599381915">"Uključeno"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nedostupno"</item> + <item msgid="2710157085538036590">"Isključeno"</item> + <item msgid="7809470840976856149">"Uključeno"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 922ebb0bfea3..b2a463befc01 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Наладзьце картку, каб рабіць больш хуткія і бяспечныя куплі з дапамогай тэлефона"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Паказаць усе"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Разблакіраваць для аплаты"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Не наладжана"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Адкрытая размова"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Віджэты размовы"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Націсніце на размову, каб дадаць яе на галоўны экран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Тут будуць паказвацца вашы нядаўнія размовы"</string> <string name="priority_conversations" msgid="3967482288896653039">"Прыярытэтныя размовы"</string> <string name="recent_conversations" msgid="8531874684782574622">"Нядаўнія размовы"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Глядзець нядаўнія паведамленні, прапушчаныя выклікі і абнаўленні стану"</string> <string name="people_tile_title" msgid="6589377493334871272">"Размова"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Прыпынена функцыяй \"Не турбаваць\""</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> адправіў паведамленне"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> адправіў відарыс"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Праблема з чытаннем індыкатара зараду акумулятара"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Націсніце, каб убачыць больш"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Няма будзільнікаў"</string> diff --git a/packages/SystemUI/res/values-be/tiles_states_strings.xml b/packages/SystemUI/res/values-be/tiles_states_strings.xml new file mode 100644 index 000000000000..b70a813507a9 --- /dev/null +++ b/packages/SystemUI/res/values-be/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Недаступна"</item> + <item msgid="3048856902433862868">"Выключана"</item> + <item msgid="6877982264300789870">"Уключана"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Недаступна"</item> + <item msgid="4293012229142257455">"Выключана"</item> + <item msgid="6221288736127914861">"Уключана"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Недаступна"</item> + <item msgid="2074416252859094119">"Выключана"</item> + <item msgid="287997784730044767">"Уключана"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Недаступна"</item> + <item msgid="7838121007534579872">"Выключана"</item> + <item msgid="1578872232501319194">"Уключана"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Недаступна"</item> + <item msgid="5376619709702103243">"Выключана"</item> + <item msgid="4875147066469902392">"Уключана"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Недаступна"</item> + <item msgid="5044688398303285224">"Выключана"</item> + <item msgid="8527389108867454098">"Уключана"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Недаступна"</item> + <item msgid="5776427577477729185">"Выключана"</item> + <item msgid="7105052717007227415">"Уключана"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Недаступна"</item> + <item msgid="5315121904534729843">"Выключана"</item> + <item msgid="503679232285959074">"Уключана"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Недаступна"</item> + <item msgid="4801037224991420996">"Выключана"</item> + <item msgid="1982293347302546665">"Уключана"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Недаступна"</item> + <item msgid="4813655083852587017">"Выключана"</item> + <item msgid="6744077414775180687">"Уключана"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Недаступна"</item> + <item msgid="5715725170633593906">"Выключана"</item> + <item msgid="2075645297847971154">"Уключана"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Недаступна"</item> + <item msgid="9103697205127645916">"Выключана"</item> + <item msgid="8067744885820618230">"Уключана"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Недаступна"</item> + <item msgid="6983679487661600728">"Выключана"</item> + <item msgid="7520663805910678476">"Уключана"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Недаступна"</item> + <item msgid="400477985171353">"Выключана"</item> + <item msgid="630890598801118771">"Уключана"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Недаступна"</item> + <item msgid="8045580926543311193">"Выключана"</item> + <item msgid="4913460972266982499">"Уключана"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Недаступна"</item> + <item msgid="1488620600954313499">"Выключана"</item> + <item msgid="588467578853244035">"Уключана"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Недаступна"</item> + <item msgid="2744885441164350155">"Выключана"</item> + <item msgid="151121227514952197">"Уключана"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Недаступна"</item> + <item msgid="8259411607272330225">"Выключана"</item> + <item msgid="578444932039713369">"Уключана"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Недаступна"</item> + <item msgid="8707481475312432575">"Выключана"</item> + <item msgid="8031106212477483874">"Уключана"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Недаступна"</item> + <item msgid="4572245614982283078">"Выключана"</item> + <item msgid="6536448410252185664">"Уключана"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Недаступна"</item> + <item msgid="4765607635752003190">"Выключана"</item> + <item msgid="1697460731949649844">"Уключана"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Недаступна"</item> + <item msgid="3296179158646568218">"Выключана"</item> + <item msgid="8998632451221157987">"Уключана"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Недаступна"</item> + <item msgid="4544919905196727508">"Выключана"</item> + <item msgid="3422023746567004609">"Уключана"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Недаступна"</item> + <item msgid="7571394439974244289">"Выключана"</item> + <item msgid="6866424167599381915">"Уключана"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Недаступна"</item> + <item msgid="2710157085538036590">"Выключана"</item> + <item msgid="7809470840976856149">"Уключана"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 21971d0a5d52..2fc165eca9d5 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Купувайте по-бързо и по-сигурно с телефона си"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Показване на всички"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Отключване с цел плащане"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Не е настроено"</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_device_locked" msgid="5175862019125370506">"Отключване с цел използване"</string> <string name="wallet_error_generic" msgid="257704570182963611">"При извличането на картите ви възникна проблем. Моля, опитайте отново по-късно"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Настройки за заключения екран"</string> @@ -734,7 +735,7 @@ <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_with_bubbles" msgid="1782419896613644568">"Може да звъни или да вибрира според настройките за телефона. Разговорите от <xliff:g id="APP_NAME">%1$s</xliff:g> се показват като балончета по подразбиране."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Задържа вниманието ви посредством плаващ пряк път към това съдържание."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Нека системата да определя дали дадено известие да се придружава от звук, или вибриране"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Състояние:</b> Повишено до основно"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Отворен разговор"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Приспособления за разговор"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Докоснете разговор, за да го добавите към началния си екран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Скорошните ви разговори ще се показват тук"</string> <string name="priority_conversations" msgid="3967482288896653039">"Разговори с приоритет"</string> <string name="recent_conversations" msgid="8531874684782574622">"Скорошни разговори"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Преглеждайте скорошни съобщения, пропуснати обаждания и информация за състоянието"</string> <string name="people_tile_title" msgid="6589377493334871272">"Разговор"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Поставено на пауза от режима „Не безпокойте“"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> изпрати съобщение"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> изпрати изображение"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Възникна проблем при четенето на данните за нивото на батерията"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Докоснете за още информация"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Няма зададен будилник"</string> diff --git a/packages/SystemUI/res/values-bg/tiles_states_strings.xml b/packages/SystemUI/res/values-bg/tiles_states_strings.xml new file mode 100644 index 000000000000..85d93931afc7 --- /dev/null +++ b/packages/SystemUI/res/values-bg/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Не е налице"</item> + <item msgid="3048856902433862868">"Изкл."</item> + <item msgid="6877982264300789870">"Вкл."</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Не е налице"</item> + <item msgid="4293012229142257455">"Изкл."</item> + <item msgid="6221288736127914861">"Вкл."</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Не е налице"</item> + <item msgid="2074416252859094119">"Изкл."</item> + <item msgid="287997784730044767">"Вкл."</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Не е налице"</item> + <item msgid="7838121007534579872">"Изкл."</item> + <item msgid="1578872232501319194">"Вкл."</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Не е налице"</item> + <item msgid="5376619709702103243">"Изкл."</item> + <item msgid="4875147066469902392">"Вкл."</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Не е налице"</item> + <item msgid="5044688398303285224">"Изкл."</item> + <item msgid="8527389108867454098">"Вкл."</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Не е налице"</item> + <item msgid="5776427577477729185">"Изкл."</item> + <item msgid="7105052717007227415">"Вкл."</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Не е налице"</item> + <item msgid="5315121904534729843">"Изкл."</item> + <item msgid="503679232285959074">"Вкл."</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Не е налице"</item> + <item msgid="4801037224991420996">"Изкл."</item> + <item msgid="1982293347302546665">"Вкл."</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Не е налице"</item> + <item msgid="4813655083852587017">"Изкл."</item> + <item msgid="6744077414775180687">"Вкл."</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Не е налице"</item> + <item msgid="5715725170633593906">"Изкл."</item> + <item msgid="2075645297847971154">"Вкл."</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Не е налице"</item> + <item msgid="9103697205127645916">"Изкл."</item> + <item msgid="8067744885820618230">"Вкл."</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Не е налице"</item> + <item msgid="6983679487661600728">"Изкл."</item> + <item msgid="7520663805910678476">"Вкл."</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Не е налице"</item> + <item msgid="400477985171353">"Изкл."</item> + <item msgid="630890598801118771">"Вкл."</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Не е налице"</item> + <item msgid="8045580926543311193">"Изкл."</item> + <item msgid="4913460972266982499">"Вкл."</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Не е налице"</item> + <item msgid="1488620600954313499">"Изкл."</item> + <item msgid="588467578853244035">"Вкл."</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Не е налице"</item> + <item msgid="2744885441164350155">"Изкл."</item> + <item msgid="151121227514952197">"Вкл."</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Не е налице"</item> + <item msgid="8259411607272330225">"Изкл."</item> + <item msgid="578444932039713369">"Вкл."</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Не е налице"</item> + <item msgid="8707481475312432575">"Изкл."</item> + <item msgid="8031106212477483874">"Вкл."</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Не е налице"</item> + <item msgid="4572245614982283078">"Изкл."</item> + <item msgid="6536448410252185664">"Вкл."</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Не е налице"</item> + <item msgid="4765607635752003190">"Изкл."</item> + <item msgid="1697460731949649844">"Вкл."</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Не е налице"</item> + <item msgid="3296179158646568218">"Изкл."</item> + <item msgid="8998632451221157987">"Вкл."</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Не е налице"</item> + <item msgid="4544919905196727508">"Изкл."</item> + <item msgid="3422023746567004609">"Вкл."</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Не е налице"</item> + <item msgid="7571394439974244289">"Изкл."</item> + <item msgid="6866424167599381915">"Вкл."</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Не е налице"</item> + <item msgid="2710157085538036590">"Изкл."</item> + <item msgid="7809470840976856149">"Вкл."</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 568398c191cb..f6d3975fc7d1 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ফোন ব্যবহার করে আরও দ্রুত ও আরও নিরাপদে কেনাকাটা করার জন্য সেট-আপ করুন"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"সবকটি দেখুন"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"পেমেন্ট করতে ডিভাইস আনলক করুন"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"সেট আপ করা নেই"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"খোলা কথোপকথন"</string> <string name="select_conversation_title" msgid="6716364118095089519">"কথোপকথন উইজেট"</string> <string name="select_conversation_text" msgid="3376048251434956013">"কোনও কথোপথন আপনার হোম স্ক্রিনে যোগ করার জন্য এতে ট্যাপ করুন"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"আপনার সাম্প্রতিক কথোপকথন এখানে দেখা যাবে"</string> <string name="priority_conversations" msgid="3967482288896653039">"গুরুত্বপূর্ণ কথোপকথন"</string> <string name="recent_conversations" msgid="8531874684782574622">"সাম্প্রতিক কথোপকথন"</string> <string name="okay" msgid="6490552955618608554">"ঠিক আছে"</string> @@ -1145,10 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"সাম্প্রতিক মেসেজ, মিসড কল এবং স্ট্যাটাস সংক্রান্ত আপডেট দেখুন"</string> <string name="people_tile_title" msgid="6589377493334871272">"কথোপকথন"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'বিরক্ত করবে না\' মোডের মাধ্যমে পজ করা আছে"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> একটি মেসেজ পাঠিয়েছেন"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> একটি ছবি পাঠিয়েছেন"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ব্যাটারির মিটারের রিডিং নেওয়ার সময় সমস্যা হয়েছে"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"আরও তথ্যের জন্য ট্যাপ করুন"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"কোনও অ্যালার্ম সেট করা নেই"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 769da0a91933..27ddcaf7f9ee 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -672,7 +672,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Postavite aplikaciju za brže i sigurnije kupovine putem telefona"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Prikaži sve"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Otključaj za plaćanje"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nije postavljeno"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Dodaj karticu"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Ažuriranje"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključajte da koristite"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Došlo je do problema prilikom preuzimanja vaših kartica. Pokušajte ponovo kasnije"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Postavke zaključavanja ekrana"</string> @@ -1121,8 +1122,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Vidžeti za razgovor"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Dodirnite razgovor da ga dodate na početni ekran"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Vaši nedavni razgovori će se pojaviti ovdje"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritetni razgovori"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nedavni razgovori"</string> <string name="okay" msgid="6490552955618608554">"Uredu"</string> @@ -1152,8 +1152,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Pregledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirala je funkcija Ne ometaj"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la poruku"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> je poslao/la sliku"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Došlo je do problema prilikom očitavanja mjerača stanja baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nije postavljen alarm"</string> diff --git a/packages/SystemUI/res/values-bs/tiles_states_strings.xml b/packages/SystemUI/res/values-bs/tiles_states_strings.xml new file mode 100644 index 000000000000..5622a82ee6d5 --- /dev/null +++ b/packages/SystemUI/res/values-bs/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nedostupno"</item> + <item msgid="3048856902433862868">"Isključeno"</item> + <item msgid="6877982264300789870">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nedostupno"</item> + <item msgid="4293012229142257455">"Isključeno"</item> + <item msgid="6221288736127914861">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nedostupno"</item> + <item msgid="2074416252859094119">"Isključeno"</item> + <item msgid="287997784730044767">"Uključeno"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nedostupno"</item> + <item msgid="7838121007534579872">"Isključeno"</item> + <item msgid="1578872232501319194">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nedostupno"</item> + <item msgid="5376619709702103243">"Isključeno"</item> + <item msgid="4875147066469902392">"Uključeno"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nedostupno"</item> + <item msgid="5044688398303285224">"Isključeno"</item> + <item msgid="8527389108867454098">"Uključeno"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nedostupno"</item> + <item msgid="5776427577477729185">"Isključeno"</item> + <item msgid="7105052717007227415">"Uključeno"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nedostupno"</item> + <item msgid="5315121904534729843">"Isključeno"</item> + <item msgid="503679232285959074">"Uključeno"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nedostupno"</item> + <item msgid="4801037224991420996">"Isključeno"</item> + <item msgid="1982293347302546665">"Uključeno"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nedostupno"</item> + <item msgid="4813655083852587017">"Isključeno"</item> + <item msgid="6744077414775180687">"Uključeno"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nedostupno"</item> + <item msgid="5715725170633593906">"Isključeno"</item> + <item msgid="2075645297847971154">"Uključeno"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nedostupno"</item> + <item msgid="9103697205127645916">"Isključeno"</item> + <item msgid="8067744885820618230">"Uključeno"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nedostupno"</item> + <item msgid="6983679487661600728">"Isključeno"</item> + <item msgid="7520663805910678476">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nedostupno"</item> + <item msgid="400477985171353">"Isključeno"</item> + <item msgid="630890598801118771">"Uključeno"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nedostupno"</item> + <item msgid="8045580926543311193">"Isključeno"</item> + <item msgid="4913460972266982499">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nedostupno"</item> + <item msgid="1488620600954313499">"Isključeno"</item> + <item msgid="588467578853244035">"Uključeno"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nedostupno"</item> + <item msgid="2744885441164350155">"Isključeno"</item> + <item msgid="151121227514952197">"Uključeno"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nedostupno"</item> + <item msgid="8259411607272330225">"Isključeno"</item> + <item msgid="578444932039713369">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nedostupno"</item> + <item msgid="8707481475312432575">"Isključeno"</item> + <item msgid="8031106212477483874">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nedostupno"</item> + <item msgid="4572245614982283078">"Isključeno"</item> + <item msgid="6536448410252185664">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nedostupno"</item> + <item msgid="4765607635752003190">"Isključeno"</item> + <item msgid="1697460731949649844">"Uključeno"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nedostupno"</item> + <item msgid="3296179158646568218">"Isključeno"</item> + <item msgid="8998632451221157987">"Uključeno"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nedostupno"</item> + <item msgid="4544919905196727508">"Isključeno"</item> + <item msgid="3422023746567004609">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nedostupno"</item> + <item msgid="7571394439974244289">"Isključeno"</item> + <item msgid="6866424167599381915">"Uključeno"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nedostupno"</item> + <item msgid="2710157085538036590">"Isključeno"</item> + <item msgid="7809470840976856149">"Uključeno"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 055e68a17b4e..1d77e0d4b0a4 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configura una manera més ràpida i segura de fer compres amb el telèfon"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostra-ho tot"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloqueja per pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"No s\'ha configurat"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Afegeix una targeta"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"S\'està actualitzant"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloqueja per utilitzar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Hi ha hagut un problema en obtenir les teves targetes; torna-ho a provar més tard"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Configuració de la pantalla de bloqueig"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversa oberta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toca una conversa per afegir-la a la teva pantalla d\'inici"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Les converses recents es mostraran aquí"</string> <string name="priority_conversations" msgid="3967482288896653039">"Converses prioritàries"</string> <string name="recent_conversations" msgid="8531874684782574622">"Converses recents"</string> <string name="okay" msgid="6490552955618608554">"D\'acord"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Consulta els missatges recents, les trucades perdudes i les actualitzacions d\'estat"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Posat en pausa pel mode No molestis"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat un missatge"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviat una imatge"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Hi ha hagut un problema en llegir el mesurador de la bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca per obtenir més informació"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Cap alarma configurada"</string> diff --git a/packages/SystemUI/res/values-ca/tiles_states_strings.xml b/packages/SystemUI/res/values-ca/tiles_states_strings.xml new file mode 100644 index 000000000000..ddb9dc8211e1 --- /dev/null +++ b/packages/SystemUI/res/values-ca/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"No disponible"</item> + <item msgid="3048856902433862868">"Desactivat"</item> + <item msgid="6877982264300789870">"Activat"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"No disponible"</item> + <item msgid="4293012229142257455">"Desactivat"</item> + <item msgid="6221288736127914861">"Activat"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"No disponible"</item> + <item msgid="2074416252859094119">"Desactivat"</item> + <item msgid="287997784730044767">"Activat"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"No disponible"</item> + <item msgid="7838121007534579872">"Desactivat"</item> + <item msgid="1578872232501319194">"Activat"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"No disponible"</item> + <item msgid="5376619709702103243">"Desactivat"</item> + <item msgid="4875147066469902392">"Activat"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"No disponible"</item> + <item msgid="5044688398303285224">"Desactivat"</item> + <item msgid="8527389108867454098">"Activat"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"No disponible"</item> + <item msgid="5776427577477729185">"Desactivat"</item> + <item msgid="7105052717007227415">"Activat"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"No disponible"</item> + <item msgid="5315121904534729843">"Desactivat"</item> + <item msgid="503679232285959074">"Activat"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"No disponible"</item> + <item msgid="4801037224991420996">"Desactivat"</item> + <item msgid="1982293347302546665">"Activat"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"No disponible"</item> + <item msgid="4813655083852587017">"Desactivat"</item> + <item msgid="6744077414775180687">"Activat"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"No disponible"</item> + <item msgid="5715725170633593906">"Desactivat"</item> + <item msgid="2075645297847971154">"Activat"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"No disponible"</item> + <item msgid="9103697205127645916">"Desactivat"</item> + <item msgid="8067744885820618230">"Activat"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"No disponible"</item> + <item msgid="6983679487661600728">"Desactivat"</item> + <item msgid="7520663805910678476">"Activat"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"No disponible"</item> + <item msgid="400477985171353">"Desactivat"</item> + <item msgid="630890598801118771">"Activat"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"No disponible"</item> + <item msgid="8045580926543311193">"Desactivat"</item> + <item msgid="4913460972266982499">"Activat"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"No disponible"</item> + <item msgid="1488620600954313499">"Desactivat"</item> + <item msgid="588467578853244035">"Activat"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"No disponible"</item> + <item msgid="2744885441164350155">"Desactivat"</item> + <item msgid="151121227514952197">"Activat"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"No disponible"</item> + <item msgid="8259411607272330225">"Desactivat"</item> + <item msgid="578444932039713369">"Activat"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"No disponible"</item> + <item msgid="8707481475312432575">"Desactivat"</item> + <item msgid="8031106212477483874">"Activat"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"No disponible"</item> + <item msgid="4572245614982283078">"Desactivat"</item> + <item msgid="6536448410252185664">"Activat"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"No disponible"</item> + <item msgid="4765607635752003190">"Desactivat"</item> + <item msgid="1697460731949649844">"Activat"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"No disponible"</item> + <item msgid="3296179158646568218">"Desactivat"</item> + <item msgid="8998632451221157987">"Activat"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"No disponible"</item> + <item msgid="4544919905196727508">"Desactivat"</item> + <item msgid="3422023746567004609">"Activat"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"No disponible"</item> + <item msgid="7571394439974244289">"Desactivat"</item> + <item msgid="6866424167599381915">"Activat"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"No disponible"</item> + <item msgid="2710157085538036590">"Desactivat"</item> + <item msgid="7809470840976856149">"Activat"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 6545eec36eb0..a3f7a9517777 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Nastavte si rychlejší a bezpečnější platby pomocí telefonu"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Zobrazit vše"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Odemknout a zaplatit"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Není nastaveno"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odemknout a použít"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Při načítání karet došlo k problému, zkuste to později"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Nastavení obrazovky uzamčení"</string> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otevřít konverzaci"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgety konverzací"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Klepnutím na konverzaci ji přidáte na plochu"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Tady se zobrazí vaše nedávné konverzace"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritní konverzace"</string> <string name="recent_conversations" msgid="8531874684782574622">"Poslední konverzace"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Zobrazit poslední zprávy, zmeškané hovory a aktualizace stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzace"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pozastaveno funkcí Nerušit"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> posílá zprávu"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> posílá obrázek"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problém s načtením měřiče baterie"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Klepnutím zobrazíte další informace"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Budík nenastaven"</string> diff --git a/packages/SystemUI/res/values-cs/tiles_states_strings.xml b/packages/SystemUI/res/values-cs/tiles_states_strings.xml new file mode 100644 index 000000000000..427770d7a782 --- /dev/null +++ b/packages/SystemUI/res/values-cs/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nedostupné"</item> + <item msgid="3048856902433862868">"Vyp"</item> + <item msgid="6877982264300789870">"Zap"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nedostupné"</item> + <item msgid="4293012229142257455">"Vyp"</item> + <item msgid="6221288736127914861">"Zap"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nedostupné"</item> + <item msgid="2074416252859094119">"Vyp"</item> + <item msgid="287997784730044767">"Zap"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nedostupné"</item> + <item msgid="7838121007534579872">"Vyp"</item> + <item msgid="1578872232501319194">"Zap"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nedostupné"</item> + <item msgid="5376619709702103243">"Vyp"</item> + <item msgid="4875147066469902392">"Zap"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nedostupné"</item> + <item msgid="5044688398303285224">"Vyp"</item> + <item msgid="8527389108867454098">"Zap"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nedostupné"</item> + <item msgid="5776427577477729185">"Vyp"</item> + <item msgid="7105052717007227415">"Zap"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nedostupné"</item> + <item msgid="5315121904534729843">"Vyp"</item> + <item msgid="503679232285959074">"Zap"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nedostupné"</item> + <item msgid="4801037224991420996">"Vyp"</item> + <item msgid="1982293347302546665">"Zap"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nedostupné"</item> + <item msgid="4813655083852587017">"Vyp"</item> + <item msgid="6744077414775180687">"Zap"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nedostupné"</item> + <item msgid="5715725170633593906">"Vyp"</item> + <item msgid="2075645297847971154">"Zap"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nedostupné"</item> + <item msgid="9103697205127645916">"Vyp"</item> + <item msgid="8067744885820618230">"Zap"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nedostupné"</item> + <item msgid="6983679487661600728">"Vyp"</item> + <item msgid="7520663805910678476">"Zap"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nedostupné"</item> + <item msgid="400477985171353">"Vyp"</item> + <item msgid="630890598801118771">"Zap"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nedostupné"</item> + <item msgid="8045580926543311193">"Vyp"</item> + <item msgid="4913460972266982499">"Zap"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nedostupné"</item> + <item msgid="1488620600954313499">"Vyp"</item> + <item msgid="588467578853244035">"Zap"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nedostupné"</item> + <item msgid="2744885441164350155">"Vyp"</item> + <item msgid="151121227514952197">"Zap"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nedostupné"</item> + <item msgid="8259411607272330225">"Vyp"</item> + <item msgid="578444932039713369">"Zap"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nedostupné"</item> + <item msgid="8707481475312432575">"Vyp"</item> + <item msgid="8031106212477483874">"Zap"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nedostupné"</item> + <item msgid="4572245614982283078">"Vyp"</item> + <item msgid="6536448410252185664">"Zap"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nedostupné"</item> + <item msgid="4765607635752003190">"Vyp"</item> + <item msgid="1697460731949649844">"Zap"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nedostupné"</item> + <item msgid="3296179158646568218">"Vyp"</item> + <item msgid="8998632451221157987">"Zap"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nedostupné"</item> + <item msgid="4544919905196727508">"Vyp"</item> + <item msgid="3422023746567004609">"Zap"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nedostupné"</item> + <item msgid="7571394439974244289">"Vyp"</item> + <item msgid="6866424167599381915">"Zap"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nedostupné"</item> + <item msgid="2710157085538036590">"Vyp"</item> + <item msgid="7809470840976856149">"Zap"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index caa47a958288..9e69a00bc594 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Bliv klar til at foretage hurtigere og mere sikre køb med din telefon"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Vis alle"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Lås op for at betale"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ikke konfigureret"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås op for at bruge"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Dine kort kunne ikke hentes. Prøv igen senere."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lås skærmindstillinger"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Åben samtale"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Samtalewidgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tryk på en samtale for at føje den til din startskærm"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Dine seneste samtaler vises her"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriterede samtaler"</string> <string name="recent_conversations" msgid="8531874684782574622">"Seneste samtaler"</string> <string name="okay" msgid="6490552955618608554">"Okay"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Se dine seneste beskeder, mistede opkald og statusopdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Sat på pause af Forstyr ikke"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en sms"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et billede"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Der er problemer med at aflæse dit batteriniveau"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tryk for at få flere oplysninger"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ingen alarm er indstillet"</string> diff --git a/packages/SystemUI/res/values-da/tiles_states_strings.xml b/packages/SystemUI/res/values-da/tiles_states_strings.xml new file mode 100644 index 000000000000..6c7d4d9d7af0 --- /dev/null +++ b/packages/SystemUI/res/values-da/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ikke tilgængelig"</item> + <item msgid="3048856902433862868">"Fra"</item> + <item msgid="6877982264300789870">"Til"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ikke tilgængelig"</item> + <item msgid="4293012229142257455">"Fra"</item> + <item msgid="6221288736127914861">"Til"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ikke tilgængelig"</item> + <item msgid="2074416252859094119">"Fra"</item> + <item msgid="287997784730044767">"Til"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ikke tilgængelig"</item> + <item msgid="7838121007534579872">"Fra"</item> + <item msgid="1578872232501319194">"Til"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ikke tilgængelig"</item> + <item msgid="5376619709702103243">"Fra"</item> + <item msgid="4875147066469902392">"Til"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ikke tilgængelig"</item> + <item msgid="5044688398303285224">"Fra"</item> + <item msgid="8527389108867454098">"Til"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ikke tilgængelig"</item> + <item msgid="5776427577477729185">"Fra"</item> + <item msgid="7105052717007227415">"Til"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ikke tilgængelig"</item> + <item msgid="5315121904534729843">"Fra"</item> + <item msgid="503679232285959074">"Til"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ikke tilgængelig"</item> + <item msgid="4801037224991420996">"Fra"</item> + <item msgid="1982293347302546665">"Til"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ikke tilgængelig"</item> + <item msgid="4813655083852587017">"Fra"</item> + <item msgid="6744077414775180687">"Til"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ikke tilgængelig"</item> + <item msgid="5715725170633593906">"Fra"</item> + <item msgid="2075645297847971154">"Til"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ikke tilgængelig"</item> + <item msgid="9103697205127645916">"Fra"</item> + <item msgid="8067744885820618230">"Til"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ikke tilgængelig"</item> + <item msgid="6983679487661600728">"Fra"</item> + <item msgid="7520663805910678476">"Til"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ikke tilgængelig"</item> + <item msgid="400477985171353">"Fra"</item> + <item msgid="630890598801118771">"Til"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ikke tilgængelig"</item> + <item msgid="8045580926543311193">"Fra"</item> + <item msgid="4913460972266982499">"Til"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ikke tilgængelig"</item> + <item msgid="1488620600954313499">"Fra"</item> + <item msgid="588467578853244035">"Til"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ikke tilgængelig"</item> + <item msgid="2744885441164350155">"Fra"</item> + <item msgid="151121227514952197">"Til"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ikke tilgængelig"</item> + <item msgid="8259411607272330225">"Fra"</item> + <item msgid="578444932039713369">"Til"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ikke tilgængelig"</item> + <item msgid="8707481475312432575">"Fra"</item> + <item msgid="8031106212477483874">"Til"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ikke tilgængelig"</item> + <item msgid="4572245614982283078">"Fra"</item> + <item msgid="6536448410252185664">"Til"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ikke tilgængelig"</item> + <item msgid="4765607635752003190">"Fra"</item> + <item msgid="1697460731949649844">"Til"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ikke tilgængelig"</item> + <item msgid="3296179158646568218">"Fra"</item> + <item msgid="8998632451221157987">"Til"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ikke tilgængelig"</item> + <item msgid="4544919905196727508">"Fra"</item> + <item msgid="3422023746567004609">"Til"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ikke tilgængelig"</item> + <item msgid="7571394439974244289">"Fra"</item> + <item msgid="6866424167599381915">"Til"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ikke tilgængelig"</item> + <item msgid="2710157085538036590">"Fra"</item> + <item msgid="7809470840976856149">"Til"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 7da6f8825b18..461c2574b6de 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Füge eine Zahlungsmethode hinzu, um noch schneller und sicherer mit deinem Smartphone zu bezahlen"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Alle anzeigen"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Zum Bezahlen entsperren"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nicht eingerichtet"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Karte hinzufügen"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Wird aktualisiert"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Zum Verwenden entsperren"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Beim Abrufen deiner Karten ist ein Fehler aufgetreten – bitte versuch es später noch einmal"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Einstellungen für den Sperrbildschirm"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Offene Unterhaltung"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Unterhaltungs-Widgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tippe auf eine Unterhaltung, um sie deinem Startbildschirm hinzuzufügen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Deine letzten Unterhaltungen werden hier angezeigt"</string> <string name="priority_conversations" msgid="3967482288896653039">"Vorrangige Unterhaltungen"</string> <string name="recent_conversations" msgid="8531874684782574622">"Neueste Unterhaltungen"</string> <string name="okay" msgid="6490552955618608554">"Ok"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Letzte Nachrichten, verpasste Anrufe und Statusaktualisierungen ansehen"</string> <string name="people_tile_title" msgid="6589377493334871272">"Unterhaltung"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Durch „Bitte nicht stören“ pausiert"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> hat eine Nachricht gesendet"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> hat ein Bild gesendet"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem beim Lesen des Akkustands"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Für weitere Informationen tippen"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Kein Wecker gestellt"</string> diff --git a/packages/SystemUI/res/values-de/tiles_states_strings.xml b/packages/SystemUI/res/values-de/tiles_states_strings.xml new file mode 100644 index 000000000000..19ceead2e494 --- /dev/null +++ b/packages/SystemUI/res/values-de/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nicht verfügbar"</item> + <item msgid="3048856902433862868">"Aus"</item> + <item msgid="6877982264300789870">"An"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nicht verfügbar"</item> + <item msgid="4293012229142257455">"Aus"</item> + <item msgid="6221288736127914861">"An"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nicht verfügbar"</item> + <item msgid="2074416252859094119">"Aus"</item> + <item msgid="287997784730044767">"An"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nicht verfügbar"</item> + <item msgid="7838121007534579872">"Aus"</item> + <item msgid="1578872232501319194">"An"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nicht verfügbar"</item> + <item msgid="5376619709702103243">"Aus"</item> + <item msgid="4875147066469902392">"An"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nicht verfügbar"</item> + <item msgid="5044688398303285224">"Aus"</item> + <item msgid="8527389108867454098">"An"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nicht verfügbar"</item> + <item msgid="5776427577477729185">"Aus"</item> + <item msgid="7105052717007227415">"An"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nicht verfügbar"</item> + <item msgid="5315121904534729843">"Aus"</item> + <item msgid="503679232285959074">"An"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nicht verfügbar"</item> + <item msgid="4801037224991420996">"Aus"</item> + <item msgid="1982293347302546665">"An"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nicht verfügbar"</item> + <item msgid="4813655083852587017">"Aus"</item> + <item msgid="6744077414775180687">"An"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nicht verfügbar"</item> + <item msgid="5715725170633593906">"Aus"</item> + <item msgid="2075645297847971154">"An"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nicht verfügbar"</item> + <item msgid="9103697205127645916">"Aus"</item> + <item msgid="8067744885820618230">"An"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nicht verfügbar"</item> + <item msgid="6983679487661600728">"Aus"</item> + <item msgid="7520663805910678476">"An"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nicht verfügbar"</item> + <item msgid="400477985171353">"Aus"</item> + <item msgid="630890598801118771">"An"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nicht verfügbar"</item> + <item msgid="8045580926543311193">"Aus"</item> + <item msgid="4913460972266982499">"An"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nicht verfügbar"</item> + <item msgid="1488620600954313499">"Aus"</item> + <item msgid="588467578853244035">"An"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nicht verfügbar"</item> + <item msgid="2744885441164350155">"Aus"</item> + <item msgid="151121227514952197">"An"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nicht verfügbar"</item> + <item msgid="8259411607272330225">"Aus"</item> + <item msgid="578444932039713369">"An"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nicht verfügbar"</item> + <item msgid="8707481475312432575">"Aus"</item> + <item msgid="8031106212477483874">"An"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nicht verfügbar"</item> + <item msgid="4572245614982283078">"Aus"</item> + <item msgid="6536448410252185664">"An"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nicht verfügbar"</item> + <item msgid="4765607635752003190">"Aus"</item> + <item msgid="1697460731949649844">"An"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nicht verfügbar"</item> + <item msgid="3296179158646568218">"Aus"</item> + <item msgid="8998632451221157987">"An"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nicht verfügbar"</item> + <item msgid="4544919905196727508">"Aus"</item> + <item msgid="3422023746567004609">"An"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nicht verfügbar"</item> + <item msgid="7571394439974244289">"Aus"</item> + <item msgid="6866424167599381915">"An"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nicht verfügbar"</item> + <item msgid="2710157085538036590">"Aus"</item> + <item msgid="7809470840976856149">"An"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 11bc5ad2c901..98692faa1cf1 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Ολοκληρώστε τη ρύθμιση για να κάνετε πιο γρήγορες και πιο ασφαλείς αγορές με το τηλέφωνό σας"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Εμφάνιση όλων"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ξεκλείδωμα για πληρωμή"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Δεν έχει ρυθμιστεί"</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_device_locked" msgid="5175862019125370506">"Ξεκλείδωμα για χρήση"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Παρουσιάστηκε πρόβλημα με τη λήψη των καρτών σας. Δοκιμάστε ξανά αργότερα"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Ρυθμίσεις κλειδώματος οθόνης"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Άνοιγμα συνομιλίας"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Γραφικά στοιχεία συνομιλίας"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Πατήστε μια συνομιλία για να την προσθέσετε στην αρχική οθόνη"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Οι πρόσφατες συνομιλίες σας θα εμφανίζονται εδώ"</string> <string name="priority_conversations" msgid="3967482288896653039">"Συζητήσεις προτεραιότητας"</string> <string name="recent_conversations" msgid="8531874684782574622">"Πρόσφατες συζητήσεις"</string> <string name="okay" msgid="6490552955618608554">"Εντάξει"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Δείτε πρόσφατα μηνύματα, αναπάντητες κλήσεις και ενημερώσεις κατάστασης"</string> <string name="people_tile_title" msgid="6589377493334871272">"Συνομιλία"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Σε παύση από τη λειτουργία Μην ενοχλείτε"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε ένα μήνυμα"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> έστειλε μια εικόνα"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Υπάρχει κάποιο πρόβλημα με την ανάγνωση του μετρητή μπαταρίας"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Πατήστε για περισσότερες πληροφορίες."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Δεν ορίστηκε ξυπνητ."</string> diff --git a/packages/SystemUI/res/values-el/tiles_states_strings.xml b/packages/SystemUI/res/values-el/tiles_states_strings.xml new file mode 100644 index 000000000000..1dbaaa6c9b9b --- /dev/null +++ b/packages/SystemUI/res/values-el/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Μη διαθέσιμο"</item> + <item msgid="3048856902433862868">"Ανενεργό"</item> + <item msgid="6877982264300789870">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Μη διαθέσιμο"</item> + <item msgid="4293012229142257455">"Ανενεργό"</item> + <item msgid="6221288736127914861">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Μη διαθέσιμο"</item> + <item msgid="2074416252859094119">"Ανενεργό"</item> + <item msgid="287997784730044767">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Μη διαθέσιμο"</item> + <item msgid="7838121007534579872">"Ανενεργό"</item> + <item msgid="1578872232501319194">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Μη διαθέσιμο"</item> + <item msgid="5376619709702103243">"Ανενεργό"</item> + <item msgid="4875147066469902392">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Μη διαθέσιμο"</item> + <item msgid="5044688398303285224">"Ανενεργό"</item> + <item msgid="8527389108867454098">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Μη διαθέσιμο"</item> + <item msgid="5776427577477729185">"Ανενεργό"</item> + <item msgid="7105052717007227415">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Μη διαθέσιμο"</item> + <item msgid="5315121904534729843">"Ανενεργό"</item> + <item msgid="503679232285959074">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Μη διαθέσιμο"</item> + <item msgid="4801037224991420996">"Ανενεργό"</item> + <item msgid="1982293347302546665">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Μη διαθέσιμο"</item> + <item msgid="4813655083852587017">"Ανενεργό"</item> + <item msgid="6744077414775180687">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Μη διαθέσιμο"</item> + <item msgid="5715725170633593906">"Ανενεργό"</item> + <item msgid="2075645297847971154">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Μη διαθέσιμο"</item> + <item msgid="9103697205127645916">"Ανενεργό"</item> + <item msgid="8067744885820618230">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Μη διαθέσιμο"</item> + <item msgid="6983679487661600728">"Ανενεργό"</item> + <item msgid="7520663805910678476">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Μη διαθέσιμο"</item> + <item msgid="400477985171353">"Ανενεργό"</item> + <item msgid="630890598801118771">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Μη διαθέσιμο"</item> + <item msgid="8045580926543311193">"Ανενεργό"</item> + <item msgid="4913460972266982499">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Μη διαθέσιμο"</item> + <item msgid="1488620600954313499">"Ανενεργό"</item> + <item msgid="588467578853244035">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Μη διαθέσιμο"</item> + <item msgid="2744885441164350155">"Ανενεργό"</item> + <item msgid="151121227514952197">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Μη διαθέσιμο"</item> + <item msgid="8259411607272330225">"Ανενεργό"</item> + <item msgid="578444932039713369">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Μη διαθέσιμο"</item> + <item msgid="8707481475312432575">"Ανενεργό"</item> + <item msgid="8031106212477483874">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Μη διαθέσιμο"</item> + <item msgid="4572245614982283078">"Ανενεργό"</item> + <item msgid="6536448410252185664">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Μη διαθέσιμο"</item> + <item msgid="4765607635752003190">"Ανενεργό"</item> + <item msgid="1697460731949649844">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Μη διαθέσιμο"</item> + <item msgid="3296179158646568218">"Ανενεργό"</item> + <item msgid="8998632451221157987">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Μη διαθέσιμο"</item> + <item msgid="4544919905196727508">"Ανενεργό"</item> + <item msgid="3422023746567004609">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Μη διαθέσιμο"</item> + <item msgid="7571394439974244289">"Ανενεργό"</item> + <item msgid="6866424167599381915">"Ενεργό"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Μη διαθέσιμο"</item> + <item msgid="2710157085538036590">"Ανενεργό"</item> + <item msgid="7809470840976856149">"Ενεργό"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 8403d40b6868..a200eae42359 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Get set up to make faster, more secure purchases with your phone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Not set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Add a card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards. Please try again later."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Conversation widgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your home screen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Your recent conversations will show up here"</string> <string name="priority_conversations" msgid="3967482288896653039">"Priority conversations"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recent conversations"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sent a message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem reading your battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml new file mode 100644 index 000000000000..0496502a40fb --- /dev/null +++ b/packages/SystemUI/res/values-en-rAU/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Unavailable"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Unavailable"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Unavailable"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Unavailable"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Unavailable"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Unavailable"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Unavailable"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Unavailable"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Unavailable"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Unavailable"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Unavailable"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Unavailable"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Unavailable"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Unavailable"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Unavailable"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Unavailable"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Unavailable"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Unavailable"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Unavailable"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Unavailable"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Unavailable"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Unavailable"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Unavailable"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Unavailable"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Unavailable"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index c104c2c1d039..023d53398aaf 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Get set up to make faster, more secure purchases with your phone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Not set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Add a card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards. Please try again later."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Conversation widgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your home screen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Your recent conversations will show up here"</string> <string name="priority_conversations" msgid="3967482288896653039">"Priority conversations"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recent conversations"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sent a message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem reading your battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml new file mode 100644 index 000000000000..0496502a40fb --- /dev/null +++ b/packages/SystemUI/res/values-en-rCA/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Unavailable"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Unavailable"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Unavailable"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Unavailable"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Unavailable"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Unavailable"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Unavailable"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Unavailable"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Unavailable"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Unavailable"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Unavailable"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Unavailable"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Unavailable"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Unavailable"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Unavailable"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Unavailable"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Unavailable"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Unavailable"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Unavailable"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Unavailable"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Unavailable"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Unavailable"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Unavailable"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Unavailable"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Unavailable"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 8403d40b6868..a200eae42359 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Get set up to make faster, more secure purchases with your phone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Not set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Add a card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards. Please try again later."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Conversation widgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your home screen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Your recent conversations will show up here"</string> <string name="priority_conversations" msgid="3967482288896653039">"Priority conversations"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recent conversations"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sent a message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem reading your battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml new file mode 100644 index 000000000000..0496502a40fb --- /dev/null +++ b/packages/SystemUI/res/values-en-rGB/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Unavailable"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Unavailable"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Unavailable"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Unavailable"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Unavailable"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Unavailable"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Unavailable"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Unavailable"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Unavailable"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Unavailable"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Unavailable"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Unavailable"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Unavailable"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Unavailable"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Unavailable"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Unavailable"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Unavailable"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Unavailable"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Unavailable"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Unavailable"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Unavailable"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Unavailable"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Unavailable"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Unavailable"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Unavailable"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 8403d40b6868..a200eae42359 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Get set up to make faster, more secure purchases with your phone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Not set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Add a card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards. Please try again later."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Open conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Conversation widgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tap a conversation to add it to your home screen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Your recent conversations will show up here"</string> <string name="priority_conversations" msgid="3967482288896653039">"Priority conversations"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recent conversations"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sent a message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem reading your battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml new file mode 100644 index 000000000000..0496502a40fb --- /dev/null +++ b/packages/SystemUI/res/values-en-rIN/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Unavailable"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Unavailable"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Unavailable"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Unavailable"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Unavailable"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Unavailable"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Unavailable"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Unavailable"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Unavailable"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Unavailable"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Unavailable"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Unavailable"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Unavailable"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Unavailable"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Unavailable"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Unavailable"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Unavailable"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Unavailable"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Unavailable"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Unavailable"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Unavailable"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Unavailable"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Unavailable"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Unavailable"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Unavailable"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 7fe3a635a2f3..8a1ce130bc97 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Get set up to make faster, more secure purchases with your phone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Show all"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Unlock to pay"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Not set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Add a card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updating"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Unlock to use"</string> <string name="wallet_error_generic" msgid="257704570182963611">"There was a problem getting your cards, please try again later"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lock screen settings"</string> @@ -1145,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"See recent messages, missed calls, and status updates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Paused by Do Not Disturb"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sent a message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sent an image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem reading your battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tap for more information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No alarm set"</string> diff --git a/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml b/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml new file mode 100644 index 000000000000..3bc03c01b3b3 --- /dev/null +++ b/packages/SystemUI/res/values-en-rXC/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Unavailable"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Unavailable"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Unavailable"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Unavailable"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Unavailable"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Unavailable"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Unavailable"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Unavailable"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Unavailable"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Unavailable"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Unavailable"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Unavailable"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Unavailable"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Unavailable"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Unavailable"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Unavailable"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Unavailable"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Unavailable"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Unavailable"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Unavailable"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Unavailable"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Unavailable"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Unavailable"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Unavailable"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Unavailable"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index f41a02c9c6ff..fa19aabe6169 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Prepárate para realizar compras rápidas y seguras con tu teléfono"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar todo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloquear para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Sin configurar"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Agregar una tarjeta"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Actualizando"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Ocurrió un problema al obtener las tarjetas; vuelve a intentarlo más tarde"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Configuración de pantalla de bloqueo"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversación"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Presiona una conversación para agregarla a tu pantalla principal"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Tus conversaciones recientes se mostrarán aquí"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversaciones prioritarias"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversaciones recientes"</string> <string name="okay" msgid="6490552955618608554">"Aceptar"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Consulta mensajes recientes, llamadas perdidas y actualizaciones de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Se detuvo por el modo No interrumpir"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> envió un mensaje"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> envió una imagen"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema al leer el medidor de batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Presiona para obtener más información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"No se estableció alarma"</string> diff --git a/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml b/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml new file mode 100644 index 000000000000..6e6c148e1962 --- /dev/null +++ b/packages/SystemUI/res/values-es-rUS/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"No disponible"</item> + <item msgid="3048856902433862868">"No"</item> + <item msgid="6877982264300789870">"Sí"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"No disponible"</item> + <item msgid="4293012229142257455">"No"</item> + <item msgid="6221288736127914861">"Sí"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"No disponible"</item> + <item msgid="2074416252859094119">"No"</item> + <item msgid="287997784730044767">"Sí"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"No disponible"</item> + <item msgid="7838121007534579872">"No"</item> + <item msgid="1578872232501319194">"Sí"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"No disponible"</item> + <item msgid="5376619709702103243">"No"</item> + <item msgid="4875147066469902392">"Sí"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"No disponible"</item> + <item msgid="5044688398303285224">"No"</item> + <item msgid="8527389108867454098">"Sí"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"No disponible"</item> + <item msgid="5776427577477729185">"No"</item> + <item msgid="7105052717007227415">"Sí"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"No disponible"</item> + <item msgid="5315121904534729843">"No"</item> + <item msgid="503679232285959074">"Sí"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"No disponible"</item> + <item msgid="4801037224991420996">"No"</item> + <item msgid="1982293347302546665">"Sí"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"No disponible"</item> + <item msgid="4813655083852587017">"No"</item> + <item msgid="6744077414775180687">"Sí"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"No disponible"</item> + <item msgid="5715725170633593906">"No"</item> + <item msgid="2075645297847971154">"Sí"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"No disponible"</item> + <item msgid="9103697205127645916">"No"</item> + <item msgid="8067744885820618230">"Sí"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"No disponible"</item> + <item msgid="6983679487661600728">"No"</item> + <item msgid="7520663805910678476">"Sí"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"No disponible"</item> + <item msgid="400477985171353">"No"</item> + <item msgid="630890598801118771">"Sí"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"No disponible"</item> + <item msgid="8045580926543311193">"No"</item> + <item msgid="4913460972266982499">"Sí"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"No disponible"</item> + <item msgid="1488620600954313499">"No"</item> + <item msgid="588467578853244035">"Sí"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"No disponible"</item> + <item msgid="2744885441164350155">"No"</item> + <item msgid="151121227514952197">"Sí"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"No disponible"</item> + <item msgid="8259411607272330225">"No"</item> + <item msgid="578444932039713369">"Sí"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"No disponible"</item> + <item msgid="8707481475312432575">"No"</item> + <item msgid="8031106212477483874">"Sí"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"No disponible"</item> + <item msgid="4572245614982283078">"No"</item> + <item msgid="6536448410252185664">"Sí"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"No disponible"</item> + <item msgid="4765607635752003190">"No"</item> + <item msgid="1697460731949649844">"Sí"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"No disponible"</item> + <item msgid="3296179158646568218">"No"</item> + <item msgid="8998632451221157987">"Sí"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"No disponible"</item> + <item msgid="4544919905196727508">"No"</item> + <item msgid="3422023746567004609">"Sí"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"No disponible"</item> + <item msgid="7571394439974244289">"No"</item> + <item msgid="6866424167599381915">"Sí"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"No disponible"</item> + <item msgid="2710157085538036590">"No"</item> + <item msgid="7809470840976856149">"Sí"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index b5d1b22f6ffb..c11773353dc7 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configura un método de pago para comprar de forma más rápida y segura con tu teléfono"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar todo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloquear para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Sin configurar"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Añade una tarjeta"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Actualizando"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Se ha producido un problema al obtener tus tarjetas. Inténtalo de nuevo más tarde."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Ajustes de pantalla de bloqueo"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversación abierta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversación"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toca una conversación para añadirla a la pantalla de inicio"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Tus conversaciones recientes se mostrarán aquí"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversaciones prioritarias"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversaciones recientes"</string> <string name="okay" msgid="6490552955618608554">"Vale"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Consulta los mensajes recientes, las llamadas perdidas y los cambios de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversación"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado por No molestar"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado un mensaje"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha enviado una imagen"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"No se ha podido leer el indicador de batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca la pantalla para consultar más información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ninguna alarma puesta"</string> diff --git a/packages/SystemUI/res/values-es/tiles_states_strings.xml b/packages/SystemUI/res/values-es/tiles_states_strings.xml new file mode 100644 index 000000000000..1c2f211e8b94 --- /dev/null +++ b/packages/SystemUI/res/values-es/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"No disponible"</item> + <item msgid="3048856902433862868">"Desactivado"</item> + <item msgid="6877982264300789870">"Activado"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"No disponible"</item> + <item msgid="4293012229142257455">"Desactivado"</item> + <item msgid="6221288736127914861">"Activado"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"No disponible"</item> + <item msgid="2074416252859094119">"Desactivado"</item> + <item msgid="287997784730044767">"Activado"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"No disponible"</item> + <item msgid="7838121007534579872">"Desactivado"</item> + <item msgid="1578872232501319194">"Activado"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"No disponible"</item> + <item msgid="5376619709702103243">"Desactivado"</item> + <item msgid="4875147066469902392">"Activado"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"No disponible"</item> + <item msgid="5044688398303285224">"Desactivado"</item> + <item msgid="8527389108867454098">"Activado"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"No disponible"</item> + <item msgid="5776427577477729185">"Desactivado"</item> + <item msgid="7105052717007227415">"Activado"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"No disponible"</item> + <item msgid="5315121904534729843">"Desactivado"</item> + <item msgid="503679232285959074">"Activado"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"No disponible"</item> + <item msgid="4801037224991420996">"Desactivado"</item> + <item msgid="1982293347302546665">"Activado"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"No disponible"</item> + <item msgid="4813655083852587017">"Desactivado"</item> + <item msgid="6744077414775180687">"Activado"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"No disponible"</item> + <item msgid="5715725170633593906">"Desactivado"</item> + <item msgid="2075645297847971154">"Activado"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"No disponible"</item> + <item msgid="9103697205127645916">"Desactivado"</item> + <item msgid="8067744885820618230">"Activado"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"No disponible"</item> + <item msgid="6983679487661600728">"Desactivado"</item> + <item msgid="7520663805910678476">"Activado"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"No disponible"</item> + <item msgid="400477985171353">"Desactivado"</item> + <item msgid="630890598801118771">"Activado"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"No disponible"</item> + <item msgid="8045580926543311193">"Desactivado"</item> + <item msgid="4913460972266982499">"Activado"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"No disponible"</item> + <item msgid="1488620600954313499">"Desactivado"</item> + <item msgid="588467578853244035">"Activado"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"No disponible"</item> + <item msgid="2744885441164350155">"Desactivado"</item> + <item msgid="151121227514952197">"Activado"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"No disponible"</item> + <item msgid="8259411607272330225">"Desactivado"</item> + <item msgid="578444932039713369">"Activado"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"No disponible"</item> + <item msgid="8707481475312432575">"Desactivado"</item> + <item msgid="8031106212477483874">"Activado"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"No disponible"</item> + <item msgid="4572245614982283078">"Desactivado"</item> + <item msgid="6536448410252185664">"Activado"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"No disponible"</item> + <item msgid="4765607635752003190">"Desactivado"</item> + <item msgid="1697460731949649844">"Activado"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"No disponible"</item> + <item msgid="3296179158646568218">"Desactivado"</item> + <item msgid="8998632451221157987">"Activado"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"No disponible"</item> + <item msgid="4544919905196727508">"Desactivado"</item> + <item msgid="3422023746567004609">"Activado"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"No disponible"</item> + <item msgid="7571394439974244289">"Desactivado"</item> + <item msgid="6866424167599381915">"Activado"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"No disponible"</item> + <item msgid="2710157085538036590">"Desactivado"</item> + <item msgid="7809470840976856149">"Activado"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 7d04f8157201..682a24f5bcde 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Seadistage kiirem ja turvalisem viis telefoniga ostmiseks"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Kuva kõik"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Avage maksmiseks"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Pole seadistatud"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Lisage kaart"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Värskendamine"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Avage kasutamiseks"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Teie kaartide hankimisel ilmnes probleem, proovige hiljem uuesti"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lukustuskuva seaded"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Avage vestlus"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Vestlusvidinad"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Puudutage vestlust, et lisada see oma avakuvale"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Teie hiljutised vestlused kuvatakse siin"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriteetsed vestlused"</string> <string name="recent_conversations" msgid="8531874684782574622">"Hiljutised vestlused"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Vaadake hiljutisi sõnumeid, vastamata kõnesid ja olekuvärskendusi"</string> <string name="people_tile_title" msgid="6589377493334871272">"Vestlus"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Peatas režiim Mitte segada"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> saatis sõnumi"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> saatis pildi"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Probleem akumõõdiku lugemisel"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Puudutage lisateabe saamiseks"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Äratust pole"</string> diff --git a/packages/SystemUI/res/values-et/tiles_states_strings.xml b/packages/SystemUI/res/values-et/tiles_states_strings.xml new file mode 100644 index 000000000000..bba2d829ff9e --- /dev/null +++ b/packages/SystemUI/res/values-et/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Pole saadaval"</item> + <item msgid="3048856902433862868">"Väljas"</item> + <item msgid="6877982264300789870">"Sees"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Pole saadaval"</item> + <item msgid="4293012229142257455">"Väljas"</item> + <item msgid="6221288736127914861">"Sees"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Pole saadaval"</item> + <item msgid="2074416252859094119">"Väljas"</item> + <item msgid="287997784730044767">"Sees"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Pole saadaval"</item> + <item msgid="7838121007534579872">"Väljas"</item> + <item msgid="1578872232501319194">"Sees"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Pole saadaval"</item> + <item msgid="5376619709702103243">"Väljas"</item> + <item msgid="4875147066469902392">"Sees"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Pole saadaval"</item> + <item msgid="5044688398303285224">"Väljas"</item> + <item msgid="8527389108867454098">"Sees"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Pole saadaval"</item> + <item msgid="5776427577477729185">"Väljas"</item> + <item msgid="7105052717007227415">"Sees"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Pole saadaval"</item> + <item msgid="5315121904534729843">"Väljas"</item> + <item msgid="503679232285959074">"Sees"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Pole saadaval"</item> + <item msgid="4801037224991420996">"Väljas"</item> + <item msgid="1982293347302546665">"Sees"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Pole saadaval"</item> + <item msgid="4813655083852587017">"Väljas"</item> + <item msgid="6744077414775180687">"Sees"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Pole saadaval"</item> + <item msgid="5715725170633593906">"Väljas"</item> + <item msgid="2075645297847971154">"Sees"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Pole saadaval"</item> + <item msgid="9103697205127645916">"Väljas"</item> + <item msgid="8067744885820618230">"Sees"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Pole saadaval"</item> + <item msgid="6983679487661600728">"Väljas"</item> + <item msgid="7520663805910678476">"Sees"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Pole saadaval"</item> + <item msgid="400477985171353">"Väljas"</item> + <item msgid="630890598801118771">"Sees"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Pole saadaval"</item> + <item msgid="8045580926543311193">"Väljas"</item> + <item msgid="4913460972266982499">"Sees"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Pole saadaval"</item> + <item msgid="1488620600954313499">"Väljas"</item> + <item msgid="588467578853244035">"Sees"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Pole saadaval"</item> + <item msgid="2744885441164350155">"Väljas"</item> + <item msgid="151121227514952197">"Sees"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Pole saadaval"</item> + <item msgid="8259411607272330225">"Väljas"</item> + <item msgid="578444932039713369">"Sees"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Pole saadaval"</item> + <item msgid="8707481475312432575">"Väljas"</item> + <item msgid="8031106212477483874">"Sees"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Pole saadaval"</item> + <item msgid="4572245614982283078">"Väljas"</item> + <item msgid="6536448410252185664">"Sees"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Pole saadaval"</item> + <item msgid="4765607635752003190">"Väljas"</item> + <item msgid="1697460731949649844">"Sees"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Pole saadaval"</item> + <item msgid="3296179158646568218">"Väljas"</item> + <item msgid="8998632451221157987">"Sees"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Pole saadaval"</item> + <item msgid="4544919905196727508">"Väljas"</item> + <item msgid="3422023746567004609">"Sees"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Pole saadaval"</item> + <item msgid="7571394439974244289">"Väljas"</item> + <item msgid="6866424167599381915">"Sees"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Pole saadaval"</item> + <item msgid="2710157085538036590">"Väljas"</item> + <item msgid="7809470840976856149">"Sees"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 633c91fa4c57..6c3f37a7f0fe 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -218,7 +218,7 @@ <string name="data_connection_hspa" msgid="6096234094857660873">"HSPA"</string> <string name="data_connection_roaming" msgid="375650836665414797">"Ibiltaritza"</string> <string name="accessibility_data_connection_wifi" msgid="4422160347472742434">"Wifia"</string> - <string name="accessibility_no_sim" msgid="1140839832913084973">"Ez dago SIM txartelik."</string> + <string name="accessibility_no_sim" msgid="1140839832913084973">"Ez dago SIMik."</string> <string name="accessibility_cell_data" msgid="172950885786007392">"Datu-konexioa"</string> <string name="accessibility_cell_data_on" msgid="691666434519443162">"Datu-konexioa aktibatuta"</string> <string name="cell_data_off" msgid="4886198950247099526">"Desaktibatuta"</string> @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Konfiguratu erosketa bizkorrago eta seguruagoak egiteko telefonoarekin"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Erakutsi guztiak"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desblokeatu ordaintzeko"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Konfiguratu gabe"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desblokeatu erabiltzeko"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Arazo bat izan da txartelak eskuratzean. Saiatu berriro geroago."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Pantaila blokeatuaren ezarpenak"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Elkarrizketa irekia"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Elkarrizketa-widgetak"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Sakatu elkarrizketa bat hasierako pantailan gehitzeko"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Azken elkarrizketak agertuko dira hemen"</string> <string name="priority_conversations" msgid="3967482288896653039">"Lehentasunezko elkarrizketak"</string> <string name="recent_conversations" msgid="8531874684782574622">"Azken elkarrizketak"</string> <string name="okay" msgid="6490552955618608554">"Ados"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Ikusi azken mezuak, dei galduak eta egoerari buruzko informazio eguneratua"</string> <string name="people_tile_title" msgid="6589377493334871272">"Elkarrizketa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Ez molestatzeko moduak pausatu du"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak mezu bat bidali du"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzaileak irudi bat bidali du"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Arazo bat gertatu da bateria-neurgailua irakurtzean"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Informazio gehiago lortzeko, sakatu hau"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ez da ezarri alarmarik"</string> diff --git a/packages/SystemUI/res/values-eu/tiles_states_strings.xml b/packages/SystemUI/res/values-eu/tiles_states_strings.xml new file mode 100644 index 000000000000..2fcddd425fcb --- /dev/null +++ b/packages/SystemUI/res/values-eu/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ez dago erabilgarri"</item> + <item msgid="3048856902433862868">"Desaktibatuta"</item> + <item msgid="6877982264300789870">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ez dago erabilgarri"</item> + <item msgid="4293012229142257455">"Desaktibatuta"</item> + <item msgid="6221288736127914861">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ez dago erabilgarri"</item> + <item msgid="2074416252859094119">"Desaktibatuta"</item> + <item msgid="287997784730044767">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ez dago erabilgarri"</item> + <item msgid="7838121007534579872">"Desaktibatuta"</item> + <item msgid="1578872232501319194">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ez dago erabilgarri"</item> + <item msgid="5376619709702103243">"Desaktibatuta"</item> + <item msgid="4875147066469902392">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ez dago erabilgarri"</item> + <item msgid="5044688398303285224">"Desaktibatuta"</item> + <item msgid="8527389108867454098">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ez dago erabilgarri"</item> + <item msgid="5776427577477729185">"Desaktibatuta"</item> + <item msgid="7105052717007227415">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ez dago erabilgarri"</item> + <item msgid="5315121904534729843">"Desaktibatuta"</item> + <item msgid="503679232285959074">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ez dago erabilgarri"</item> + <item msgid="4801037224991420996">"Desaktibatuta"</item> + <item msgid="1982293347302546665">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ez dago erabilgarri"</item> + <item msgid="4813655083852587017">"Desaktibatuta"</item> + <item msgid="6744077414775180687">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ez dago erabilgarri"</item> + <item msgid="5715725170633593906">"Desaktibatuta"</item> + <item msgid="2075645297847971154">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ez dago erabilgarri"</item> + <item msgid="9103697205127645916">"Desaktibatuta"</item> + <item msgid="8067744885820618230">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ez dago erabilgarri"</item> + <item msgid="6983679487661600728">"Desaktibatuta"</item> + <item msgid="7520663805910678476">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ez dago erabilgarri"</item> + <item msgid="400477985171353">"Desaktibatuta"</item> + <item msgid="630890598801118771">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ez dago erabilgarri"</item> + <item msgid="8045580926543311193">"Desaktibatuta"</item> + <item msgid="4913460972266982499">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ez dago erabilgarri"</item> + <item msgid="1488620600954313499">"Desaktibatuta"</item> + <item msgid="588467578853244035">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ez dago erabilgarri"</item> + <item msgid="2744885441164350155">"Desaktibatuta"</item> + <item msgid="151121227514952197">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ez dago erabilgarri"</item> + <item msgid="8259411607272330225">"Desaktibatuta"</item> + <item msgid="578444932039713369">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ez dago erabilgarri"</item> + <item msgid="8707481475312432575">"Desaktibatuta"</item> + <item msgid="8031106212477483874">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ez dago erabilgarri"</item> + <item msgid="4572245614982283078">"Desaktibatuta"</item> + <item msgid="6536448410252185664">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ez dago erabilgarri"</item> + <item msgid="4765607635752003190">"Desaktibatuta"</item> + <item msgid="1697460731949649844">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ez dago erabilgarri"</item> + <item msgid="3296179158646568218">"Desaktibatuta"</item> + <item msgid="8998632451221157987">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ez dago erabilgarri"</item> + <item msgid="4544919905196727508">"Desaktibatuta"</item> + <item msgid="3422023746567004609">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ez dago erabilgarri"</item> + <item msgid="7571394439974244289">"Desaktibatuta"</item> + <item msgid="6866424167599381915">"Aktibatuta"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ez dago erabilgarri"</item> + <item msgid="2710157085538036590">"Desaktibatuta"</item> + <item msgid="7809470840976856149">"Aktibatuta"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 7420ad60ffed..7b4e23625caf 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"برای خرید سریعتر و امنتر با تلفن، راهاندازی کنید"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"نمایش همه"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"باز کردن قفل برای پرداخت"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"تنظیمنشده"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"باز کردن مکالمه"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ابزارکهای مکالمه"</string> <string name="select_conversation_text" msgid="3376048251434956013">"روی مکالمهای ضربه بزنید تا به «صفحه اصلی» اضافه شود"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"آخرین مکالمههای شما اینجا نشان داده میشود"</string> <string name="priority_conversations" msgid="3967482288896653039">"مکالمههای اولویتدار"</string> <string name="recent_conversations" msgid="8531874684782574622">"گفتگوهای اخیر"</string> <string name="okay" msgid="6490552955618608554">"تأیید"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"دیدن بهروزرسانیهای وضعیت، تماسهای بیپاسخ، و پیامهای اخیر"</string> <string name="people_tile_title" msgid="6589377493334871272">"مکالمه"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"با «مزاحم نشوید» موقتاً متوقف شده است"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> پیامی ارسال کرد"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> تصویری ارسال کرد"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"مشکلی در خواندن میزان باتری وجود دارد"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"برای اطلاعات بیشتر ضربه بزنید"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"هشداری تنظیم نشده است"</string> diff --git a/packages/SystemUI/res/values-fa/tiles_states_strings.xml b/packages/SystemUI/res/values-fa/tiles_states_strings.xml new file mode 100644 index 000000000000..d3662f9d43ec --- /dev/null +++ b/packages/SystemUI/res/values-fa/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"دردسترس نیست"</item> + <item msgid="3048856902433862868">"خاموش"</item> + <item msgid="6877982264300789870">"روشن"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"دردسترس نیست"</item> + <item msgid="4293012229142257455">"خاموش"</item> + <item msgid="6221288736127914861">"روشن"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"دردسترس نیست"</item> + <item msgid="2074416252859094119">"خاموش"</item> + <item msgid="287997784730044767">"روشن"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"دردسترس نیست"</item> + <item msgid="7838121007534579872">"خاموش"</item> + <item msgid="1578872232501319194">"روشن"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"دردسترس نیست"</item> + <item msgid="5376619709702103243">"خاموش"</item> + <item msgid="4875147066469902392">"روشن"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"دردسترس نیست"</item> + <item msgid="5044688398303285224">"خاموش"</item> + <item msgid="8527389108867454098">"روشن"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"دردسترس نیست"</item> + <item msgid="5776427577477729185">"خاموش"</item> + <item msgid="7105052717007227415">"روشن"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"دردسترس نیست"</item> + <item msgid="5315121904534729843">"خاموش"</item> + <item msgid="503679232285959074">"روشن"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"دردسترس نیست"</item> + <item msgid="4801037224991420996">"خاموش"</item> + <item msgid="1982293347302546665">"روشن"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"دردسترس نیست"</item> + <item msgid="4813655083852587017">"خاموش"</item> + <item msgid="6744077414775180687">"روشن"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"دردسترس نیست"</item> + <item msgid="5715725170633593906">"خاموش"</item> + <item msgid="2075645297847971154">"روشن"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"دردسترس نیست"</item> + <item msgid="9103697205127645916">"خاموش"</item> + <item msgid="8067744885820618230">"روشن"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"دردسترس نیست"</item> + <item msgid="6983679487661600728">"خاموش"</item> + <item msgid="7520663805910678476">"روشن"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"دردسترس نیست"</item> + <item msgid="400477985171353">"خاموش"</item> + <item msgid="630890598801118771">"روشن"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"دردسترس نیست"</item> + <item msgid="8045580926543311193">"خاموش"</item> + <item msgid="4913460972266982499">"روشن"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"دردسترس نیست"</item> + <item msgid="1488620600954313499">"خاموش"</item> + <item msgid="588467578853244035">"روشن"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"دردسترس نیست"</item> + <item msgid="2744885441164350155">"خاموش"</item> + <item msgid="151121227514952197">"روشن"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"دردسترس نیست"</item> + <item msgid="8259411607272330225">"خاموش"</item> + <item msgid="578444932039713369">"روشن"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"دردسترس نیست"</item> + <item msgid="8707481475312432575">"خاموش"</item> + <item msgid="8031106212477483874">"روشن"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"دردسترس نیست"</item> + <item msgid="4572245614982283078">"خاموش"</item> + <item msgid="6536448410252185664">"روشن"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"دردسترس نیست"</item> + <item msgid="4765607635752003190">"خاموش"</item> + <item msgid="1697460731949649844">"روشن"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"دردسترس نیست"</item> + <item msgid="3296179158646568218">"خاموش"</item> + <item msgid="8998632451221157987">"روشن"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"دردسترس نیست"</item> + <item msgid="4544919905196727508">"خاموش"</item> + <item msgid="3422023746567004609">"روشن"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"دردسترس نیست"</item> + <item msgid="7571394439974244289">"خاموش"</item> + <item msgid="6866424167599381915">"روشن"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"دردسترس نیست"</item> + <item msgid="2710157085538036590">"خاموش"</item> + <item msgid="7809470840976856149">"روشن"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 8c546f7b456a..0f6328873956 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Lisää maksutapa, niin voit maksaa nopeasti ja turvallisesti puhelimella"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Näytä kaikki"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Avaa lukitus ja maksa"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ei otettu käyttöön"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Avaa lukitus ja käytä"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Korttien noutamisessa oli ongelma, yritä myöhemmin uudelleen"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lukitusnäytön asetukset"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Avaa keskustelu"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Keskusteluwidgetit"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Lisää keskustelu aloitusnäytölle napauttamalla sitä"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Viimeaikaiset keskustelusi näkyvät täällä"</string> <string name="priority_conversations" msgid="3967482288896653039">"Tärkeät keskustelut"</string> <string name="recent_conversations" msgid="8531874684782574622">"Uusimmat keskustelut"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Katso viimeaikaiset viestit, vastaamattomat puhelut ja tilapäivitykset"</string> <string name="people_tile_title" msgid="6589377493334871272">"Keskustelu"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Älä häiritse ‑tilan keskeyttämä"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> lähetti viestin"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> lähetti kuvan"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Ongelma akkumittarin lukemisessa"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Saat lisätietoja napauttamalla"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ei herätyksiä"</string> diff --git a/packages/SystemUI/res/values-fi/tiles_states_strings.xml b/packages/SystemUI/res/values-fi/tiles_states_strings.xml new file mode 100644 index 000000000000..5a88f19263b0 --- /dev/null +++ b/packages/SystemUI/res/values-fi/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ei saatavilla"</item> + <item msgid="3048856902433862868">"Poissa päältä"</item> + <item msgid="6877982264300789870">"Päällä"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ei saatavilla"</item> + <item msgid="4293012229142257455">"Poissa päältä"</item> + <item msgid="6221288736127914861">"Päällä"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ei saatavilla"</item> + <item msgid="2074416252859094119">"Poissa päältä"</item> + <item msgid="287997784730044767">"Päällä"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ei saatavilla"</item> + <item msgid="7838121007534579872">"Poissa päältä"</item> + <item msgid="1578872232501319194">"Päällä"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ei saatavilla"</item> + <item msgid="5376619709702103243">"Poissa päältä"</item> + <item msgid="4875147066469902392">"Päällä"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ei saatavilla"</item> + <item msgid="5044688398303285224">"Poissa päältä"</item> + <item msgid="8527389108867454098">"Päällä"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ei saatavilla"</item> + <item msgid="5776427577477729185">"Poissa päältä"</item> + <item msgid="7105052717007227415">"Päällä"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ei saatavilla"</item> + <item msgid="5315121904534729843">"Poissa päältä"</item> + <item msgid="503679232285959074">"Päällä"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ei saatavilla"</item> + <item msgid="4801037224991420996">"Poissa päältä"</item> + <item msgid="1982293347302546665">"Päällä"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ei saatavilla"</item> + <item msgid="4813655083852587017">"Poissa päältä"</item> + <item msgid="6744077414775180687">"Päällä"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ei saatavilla"</item> + <item msgid="5715725170633593906">"Poissa päältä"</item> + <item msgid="2075645297847971154">"Päällä"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ei saatavilla"</item> + <item msgid="9103697205127645916">"Poissa päältä"</item> + <item msgid="8067744885820618230">"Päällä"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ei saatavilla"</item> + <item msgid="6983679487661600728">"Poissa päältä"</item> + <item msgid="7520663805910678476">"Päällä"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ei saatavilla"</item> + <item msgid="400477985171353">"Poissa päältä"</item> + <item msgid="630890598801118771">"Päällä"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ei saatavilla"</item> + <item msgid="8045580926543311193">"Poissa päältä"</item> + <item msgid="4913460972266982499">"Päällä"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ei saatavilla"</item> + <item msgid="1488620600954313499">"Poissa päältä"</item> + <item msgid="588467578853244035">"Päällä"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ei saatavilla"</item> + <item msgid="2744885441164350155">"Poissa päältä"</item> + <item msgid="151121227514952197">"Päällä"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ei saatavilla"</item> + <item msgid="8259411607272330225">"Poissa päältä"</item> + <item msgid="578444932039713369">"Päällä"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ei saatavilla"</item> + <item msgid="8707481475312432575">"Poissa päältä"</item> + <item msgid="8031106212477483874">"Päällä"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ei saatavilla"</item> + <item msgid="4572245614982283078">"Poissa päältä"</item> + <item msgid="6536448410252185664">"Päällä"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ei saatavilla"</item> + <item msgid="4765607635752003190">"Poissa päältä"</item> + <item msgid="1697460731949649844">"Päällä"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ei saatavilla"</item> + <item msgid="3296179158646568218">"Poissa päältä"</item> + <item msgid="8998632451221157987">"Päällä"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ei saatavilla"</item> + <item msgid="4544919905196727508">"Poissa päältä"</item> + <item msgid="3422023746567004609">"Päällä"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ei saatavilla"</item> + <item msgid="7571394439974244289">"Poissa päältä"</item> + <item msgid="6866424167599381915">"Päällä"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ei saatavilla"</item> + <item msgid="2710157085538036590">"Poissa päältä"</item> + <item msgid="7809470840976856149">"Päällä"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 9a66364ae2bb..6ec354240710 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Préparez-vous à faire des achats plus rapidement et de façon plus sûre avec votre téléphone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Tout afficher"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Déverrouiller pour payer"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Non configuré"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Déverrouiller pour utiliser"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Un problème est survenu lors de la récupération de vos cartes, veuillez réessayer plus tard"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Paramètres de l\'écran de verrouillage"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Ouvrir la conversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversation"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Touchez une conversation pour l\'ajouter à votre écran d\'accueil"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Vos récentes conversations s\'afficheront ici"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversations prioritaires"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversations récentes"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1145,10 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Affichez les messages récents, les appels manqués et les mises à jour d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"Interrompue par la fonctionnalité Ne pas déranger"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Un problème est survenu lors de la lecture du niveau de charge de la pile"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Touchez pour en savoir plus"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Aucune alarme définie"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index d67cac4a1e34..63a909f076fa 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configurez pour régler vos achats de façon sûre et rapide via votre téléphone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Tout afficher"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Déverrouiller pour payer"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Non configuré"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Déverrouiller pour utiliser"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Problème de récupération de vos cartes. Réessayez plus tard"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Paramètres de l\'écran de verrouillage"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversation ouverte"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversation"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Appuyez sur une conversation pour l\'ajouter à votre écran d\'accueil"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Vos conversations récentes s\'afficheront ici"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversations prioritaires"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversations récentes"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Voir les messages récents, les appels manqués et les notifications d\'état"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Mise en pause par Ne pas déranger"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé un message"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a envoyé une image"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Un problème est survenu au niveau de la lecture de votre outil de mesure de batterie"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Appuyer pour en savoir plus"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Pas d\'alarme définie"</string> diff --git a/packages/SystemUI/res/values-fr/tiles_states_strings.xml b/packages/SystemUI/res/values-fr/tiles_states_strings.xml new file mode 100644 index 000000000000..e66169dff505 --- /dev/null +++ b/packages/SystemUI/res/values-fr/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Indisponible"</item> + <item msgid="3048856902433862868">"Désactivé"</item> + <item msgid="6877982264300789870">"Activé"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Indisponible"</item> + <item msgid="4293012229142257455">"Désactivé"</item> + <item msgid="6221288736127914861">"Activé"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Indisponibles"</item> + <item msgid="2074416252859094119">"Désactivées"</item> + <item msgid="287997784730044767">"Activées"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Indisponible"</item> + <item msgid="7838121007534579872">"Désactivé"</item> + <item msgid="1578872232501319194">"Activé"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Indisponible"</item> + <item msgid="5376619709702103243">"Désactivé"</item> + <item msgid="4875147066469902392">"Activé"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Indisponible"</item> + <item msgid="5044688398303285224">"Désactivée"</item> + <item msgid="8527389108867454098">"Activée"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Indisponible"</item> + <item msgid="5776427577477729185">"Désactivé"</item> + <item msgid="7105052717007227415">"Activé"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Indisponible"</item> + <item msgid="5315121904534729843">"Désactivé"</item> + <item msgid="503679232285959074">"Activé"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Indisponible"</item> + <item msgid="4801037224991420996">"Désactivé"</item> + <item msgid="1982293347302546665">"Activé"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Indisponible"</item> + <item msgid="4813655083852587017">"Désactivée"</item> + <item msgid="6744077414775180687">"Activée"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Indisponible"</item> + <item msgid="5715725170633593906">"Désactivé"</item> + <item msgid="2075645297847971154">"Activé"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Indisponible"</item> + <item msgid="9103697205127645916">"Désactivée"</item> + <item msgid="8067744885820618230">"Activée"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Indisponible"</item> + <item msgid="6983679487661600728">"Désactivé"</item> + <item msgid="7520663805910678476">"Activé"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Indisponible"</item> + <item msgid="400477985171353">"Désactivé"</item> + <item msgid="630890598801118771">"Activé"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Indisponible"</item> + <item msgid="8045580926543311193">"Désactivé"</item> + <item msgid="4913460972266982499">"Activé"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Indisponible"</item> + <item msgid="1488620600954313499">"Désactivé"</item> + <item msgid="588467578853244035">"Activé"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Indisponible"</item> + <item msgid="2744885441164350155">"Désactivé"</item> + <item msgid="151121227514952197">"Activé"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Indisponible"</item> + <item msgid="8259411607272330225">"Désactivé"</item> + <item msgid="578444932039713369">"Activé"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Indisponible"</item> + <item msgid="8707481475312432575">"Désactivée"</item> + <item msgid="8031106212477483874">"Activée"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Indisponible"</item> + <item msgid="4572245614982283078">"Désactivée"</item> + <item msgid="6536448410252185664">"Activée"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Indisponible"</item> + <item msgid="4765607635752003190">"Désactivé"</item> + <item msgid="1697460731949649844">"Activé"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Indisponible"</item> + <item msgid="3296179158646568218">"Désactivé"</item> + <item msgid="8998632451221157987">"Activé"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Indisponibles"</item> + <item msgid="4544919905196727508">"Désactivées"</item> + <item msgid="3422023746567004609">"Activées"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Indisponible"</item> + <item msgid="7571394439974244289">"Désactivé"</item> + <item msgid="6866424167599381915">"Activé"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Indisponible"</item> + <item msgid="2710157085538036590">"Désactivée"</item> + <item msgid="7809470840976856149">"Activée"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 5f47203e0a3f..c9d5ddc54586 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configura un método de pago para comprar de xeito máis rápido e seguro co teléfono"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Amosar todo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloquear para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Sen configurar"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Produciuse un problema ao obter as tarxetas. Téntao de novo máis tarde"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Configuración da pantalla de bloqueo"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toca unha conversa para engadila á pantalla de inicio"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"As túas conversas recentes aparecerán aquí"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversas prioritarias"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversas recentes"</string> <string name="okay" msgid="6490552955618608554">"De acordo"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Consulta as mensaxes recentes, as chamadas perdidas e as actualizacións dos estados"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Púxose en pausa debido ao modo Non molestar"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha mensaxe"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou unha imaxe"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Produciuse un problema ao ler o medidor da batería"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toca para obter máis información"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Sen alarmas postas"</string> diff --git a/packages/SystemUI/res/values-gl/tiles_states_strings.xml b/packages/SystemUI/res/values-gl/tiles_states_strings.xml new file mode 100644 index 000000000000..c627ec06e599 --- /dev/null +++ b/packages/SystemUI/res/values-gl/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Non dispoñible"</item> + <item msgid="3048856902433862868">"Non"</item> + <item msgid="6877982264300789870">"Si"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Non dispoñible"</item> + <item msgid="4293012229142257455">"Non"</item> + <item msgid="6221288736127914861">"Si"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Non dispoñible"</item> + <item msgid="2074416252859094119">"Non"</item> + <item msgid="287997784730044767">"Si"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Non dispoñible"</item> + <item msgid="7838121007534579872">"Non"</item> + <item msgid="1578872232501319194">"Si"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Non dispoñible"</item> + <item msgid="5376619709702103243">"Non"</item> + <item msgid="4875147066469902392">"Si"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Non dispoñible"</item> + <item msgid="5044688398303285224">"Non"</item> + <item msgid="8527389108867454098">"Si"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Non dispoñible"</item> + <item msgid="5776427577477729185">"Non"</item> + <item msgid="7105052717007227415">"Si"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Non dispoñible"</item> + <item msgid="5315121904534729843">"Non"</item> + <item msgid="503679232285959074">"Si"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Non dispoñible"</item> + <item msgid="4801037224991420996">"Non"</item> + <item msgid="1982293347302546665">"Si"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Non dispoñible"</item> + <item msgid="4813655083852587017">"Non"</item> + <item msgid="6744077414775180687">"Si"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Non dispoñible"</item> + <item msgid="5715725170633593906">"Non"</item> + <item msgid="2075645297847971154">"Si"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Non dispoñible"</item> + <item msgid="9103697205127645916">"Non"</item> + <item msgid="8067744885820618230">"Si"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Non dispoñible"</item> + <item msgid="6983679487661600728">"Non"</item> + <item msgid="7520663805910678476">"Si"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Non dispoñible"</item> + <item msgid="400477985171353">"Non"</item> + <item msgid="630890598801118771">"Si"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Non dispoñible"</item> + <item msgid="8045580926543311193">"Non"</item> + <item msgid="4913460972266982499">"Si"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Non dispoñible"</item> + <item msgid="1488620600954313499">"Non"</item> + <item msgid="588467578853244035">"Si"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Non dispoñible"</item> + <item msgid="2744885441164350155">"Non"</item> + <item msgid="151121227514952197">"Si"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Non dispoñible"</item> + <item msgid="8259411607272330225">"Non"</item> + <item msgid="578444932039713369">"Si"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Non dispoñible"</item> + <item msgid="8707481475312432575">"Non"</item> + <item msgid="8031106212477483874">"Si"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Non dispoñible"</item> + <item msgid="4572245614982283078">"Non"</item> + <item msgid="6536448410252185664">"Si"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Non dispoñible"</item> + <item msgid="4765607635752003190">"Non"</item> + <item msgid="1697460731949649844">"Si"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Non dispoñible"</item> + <item msgid="3296179158646568218">"Non"</item> + <item msgid="8998632451221157987">"Si"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Non dispoñible"</item> + <item msgid="4544919905196727508">"Non"</item> + <item msgid="3422023746567004609">"Si"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Non dispoñible"</item> + <item msgid="7571394439974244289">"Non"</item> + <item msgid="6866424167599381915">"Si"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Non dispoñible"</item> + <item msgid="2710157085538036590">"Non"</item> + <item msgid="7809470840976856149">"Si"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 25968efd2f4e..2236d7d992b0 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"તમારા ફોન વડે વધુ ઝડપી તેમજ સુરક્ષિત ખરીદીઓ કરવાની રીત સેટઅપ કરી લો"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"બધું બતાવો"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ચુકવણી કરવા માટે અનલૉક કરો"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"કોઈ સેટઅપ કર્યું નથી"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <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> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"વાતચીત ખોલો"</string> <string name="select_conversation_title" msgid="6716364118095089519">"વાતચીતના વિજેટ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"તમારી હોમ સ્ક્રીનમાં વાતચીત ઉમેરવા માટે તેના પર ટૅપ કરો"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"તમારી તાજેતરની વાતચીતો અહીં બતાવવામાં આવશે"</string> <string name="priority_conversations" msgid="3967482288896653039">"પ્રાધાન્યતા ધરાવતી વાતચીતો"</string> <string name="recent_conversations" msgid="8531874684782574622">"તાજેતરની વાતચીતો"</string> <string name="okay" msgid="6490552955618608554">"ઓકે"</string> @@ -1145,10 +1146,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"તાજેતરના સંદેશા, ચૂકી ગયેલા કૉલ અને સ્ટેટસ અપડેટ જુઓ"</string> <string name="people_tile_title" msgid="6589377493334871272">"વાતચીત"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ખલેલ પાડશો નહીં\'ની સુવિધા દ્વારા થોભાવેલું"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ સંદેશ મોકલવામાં આવ્યો"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કોઈ છબી મોકલવામાં આવી"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"વધુ માહિતી માટે ટૅપ કરો"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"કોઈ અલાર્મ સેટ નથી"</string> diff --git a/packages/SystemUI/res/values-h800dp/dimens.xml b/packages/SystemUI/res/values-h800dp/dimens.xml index cfacbec0dff2..19ec8cee18a8 100644 --- a/packages/SystemUI/res/values-h800dp/dimens.xml +++ b/packages/SystemUI/res/values-h800dp/dimens.xml @@ -20,4 +20,7 @@ <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) --> <dimen name="large_clock_text_size">200dp</dimen> + + <!-- With the large clock, move up slightly from the center --> + <dimen name="keyguard_large_clock_top_margin">-104dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 894e6ee56cc3..e90fd7d91b44 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"फ़ोन के ज़रिए तेज़ी से और सुरक्षित तरीके से खरीदारी करने के लिए सेट अप करें"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"सभी दिखाएं"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"पैसे चुकाने के लिए, डिवाइस अनलॉक करें"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"सेट अप नहीं किया गया है"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"ऐसी बातचीत जिसमें इंटरैक्शन डेटा मौजूद नहीं है"</string> <string name="select_conversation_title" msgid="6716364118095089519">"बातचीत विजेट"</string> <string name="select_conversation_text" msgid="3376048251434956013">"किसी बातचीत को होम स्क्रीन पर जोड़ने के लिए, उस बातचीत पर टैप करें"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"हाल ही में हुई बातचीत यहां दिखेंगी"</string> <string name="priority_conversations" msgid="3967482288896653039">"प्राथमिकता वाली बातचीत"</string> <string name="recent_conversations" msgid="8531874684782574622">"हाल ही में की गई बातचीत"</string> <string name="okay" msgid="6490552955618608554">"ठीक है"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"हाल के मैसेज, मिस्ड कॉल, और स्टेटस अपडेट देखें"</string> <string name="people_tile_title" msgid="6589377493334871272">"बातचीत"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\'परेशान न करें\' की वजह से सूचनाएं नहीं दिख रहीं"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ने एक मैसेज भेजा है"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ने एक इमेज भेजी है"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ज़्यादा जानकारी के लिए टैप करें"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"कोई अलार्म सेट नहीं है"</string> diff --git a/packages/SystemUI/res/values-hi/tiles_states_strings.xml b/packages/SystemUI/res/values-hi/tiles_states_strings.xml new file mode 100644 index 000000000000..40d15e7cadb9 --- /dev/null +++ b/packages/SystemUI/res/values-hi/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"उपलब्ध नहीं है"</item> + <item msgid="3048856902433862868">"बंद है"</item> + <item msgid="6877982264300789870">"चालू है"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"उपलब्ध नहीं है"</item> + <item msgid="4293012229142257455">"बंद है"</item> + <item msgid="6221288736127914861">"चालू है"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"उपलब्ध नहीं है"</item> + <item msgid="2074416252859094119">"बंद है"</item> + <item msgid="287997784730044767">"चालू है"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"उपलब्ध नहीं है"</item> + <item msgid="7838121007534579872">"बंद है"</item> + <item msgid="1578872232501319194">"चालू है"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"उपलब्ध नहीं है"</item> + <item msgid="5376619709702103243">"बंद है"</item> + <item msgid="4875147066469902392">"चालू है"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"उपलब्ध नहीं है"</item> + <item msgid="5044688398303285224">"बंद है"</item> + <item msgid="8527389108867454098">"चालू है"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"उपलब्ध नहीं है"</item> + <item msgid="5776427577477729185">"बंद है"</item> + <item msgid="7105052717007227415">"चालू है"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"उपलब्ध नहीं है"</item> + <item msgid="5315121904534729843">"बंद है"</item> + <item msgid="503679232285959074">"चालू है"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"उपलब्ध नहीं है"</item> + <item msgid="4801037224991420996">"बंद है"</item> + <item msgid="1982293347302546665">"चालू है"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"उपलब्ध नहीं है"</item> + <item msgid="4813655083852587017">"बंद है"</item> + <item msgid="6744077414775180687">"चालू है"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"उपलब्ध नहीं है"</item> + <item msgid="5715725170633593906">"बंद है"</item> + <item msgid="2075645297847971154">"चालू है"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"उपलब्ध नहीं है"</item> + <item msgid="9103697205127645916">"बंद है"</item> + <item msgid="8067744885820618230">"चालू है"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"उपलब्ध नहीं है"</item> + <item msgid="6983679487661600728">"बंद है"</item> + <item msgid="7520663805910678476">"चालू है"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"उपलब्ध नहीं है"</item> + <item msgid="400477985171353">"बंद है"</item> + <item msgid="630890598801118771">"चालू है"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"उपलब्ध नहीं है"</item> + <item msgid="8045580926543311193">"बंद है"</item> + <item msgid="4913460972266982499">"चालू है"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"उपलब्ध नहीं है"</item> + <item msgid="1488620600954313499">"बंद है"</item> + <item msgid="588467578853244035">"चालू है"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"उपलब्ध नहीं है"</item> + <item msgid="2744885441164350155">"बंद है"</item> + <item msgid="151121227514952197">"चालू है"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"उपलब्ध नहीं है"</item> + <item msgid="8259411607272330225">"बंद है"</item> + <item msgid="578444932039713369">"चालू है"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"उपलब्ध नहीं है"</item> + <item msgid="8707481475312432575">"बंद है"</item> + <item msgid="8031106212477483874">"चालू है"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"उपलब्ध नहीं है"</item> + <item msgid="4572245614982283078">"बंद है"</item> + <item msgid="6536448410252185664">"चालू है"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"उपलब्ध नहीं है"</item> + <item msgid="4765607635752003190">"बंद है"</item> + <item msgid="1697460731949649844">"चालू है"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"उपलब्ध नहीं है"</item> + <item msgid="3296179158646568218">"बंद है"</item> + <item msgid="8998632451221157987">"चालू है"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"उपलब्ध नहीं है"</item> + <item msgid="4544919905196727508">"बंद है"</item> + <item msgid="3422023746567004609">"चालू है"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"उपलब्ध नहीं है"</item> + <item msgid="7571394439974244289">"बंद है"</item> + <item msgid="6866424167599381915">"चालू है"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"उपलब्ध नहीं है"</item> + <item msgid="2710157085538036590">"बंद है"</item> + <item msgid="7809470840976856149">"चालू है"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index ee13344fdcf5..993364666550 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -672,7 +672,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Postavite aplikaciju za bržu i sigurniju kupnju telefonom"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Prikaži sve"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Otključajte da biste platili"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nije postavljeno"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Dodaj karticu"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Ažuriranje"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Otključajte da biste koristili"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Pojavio se problem prilikom dohvaćanja kartica, pokušajte ponovo kasnije"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Postavke zaključanog zaslona"</string> @@ -749,7 +750,7 @@ <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu, prekida Ne uznemiravaj"</string> <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikazuje se pri vrhu obavijesti razgovora i kao profilna slika na zaključanom zaslonu, izgleda kao oblačić, prekida Ne uznemiravaj"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Postavke"</string> - <string name="notification_priority_title" msgid="2079708866333537093">"Prioritet"</string> + <string name="notification_priority_title" msgid="2079708866333537093">"Prioritetno"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podržava značajke razgovora"</string> <string name="notification_unblockable_desc" msgid="2073030886006190804">"Te se obavijesti ne mogu izmijeniti."</string> <string name="notification_multichannel_desc" msgid="7414593090056236179">"Ta se grupa obavijesti ne može konfigurirati ovdje"</string> @@ -935,7 +936,7 @@ <string name="accessibility_quick_settings_not_available" msgid="6860875849497473854">"Nije dostupno jer <xliff:g id="REASON">%s</xliff:g>"</string> <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"Otvaranje postavki za <xliff:g id="ID_1">%s</xliff:g>."</string> <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"Uređivanje redoslijeda postavki."</string> - <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"Izbornik tipke za uključivanje (/isključivanje)"</string> + <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"Izbornik tipke za uključivanje/isključivanje"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"Stranica <xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g>"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"Zaključan zaslon"</string> <string name="thermal_shutdown_title" msgid="2702966892682930264">"Telefon se isključio zbog vrućine"</string> @@ -1121,8 +1122,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otvoreni razgovor"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgeti razgovora"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Dodirnite razgovor da biste ga dodali na početni zaslon"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Ovdje će se prikazati vaši nedavni razgovori"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritetni razgovori"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nedavni razgovori"</string> <string name="okay" msgid="6490552955618608554">"U redu"</string> @@ -1152,8 +1152,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Pogledajte nedavne poruke, propuštene pozive i ažuriranja statusa"</string> <string name="people_tile_title" msgid="6589377493334871272">"Razgovor"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pauzirala značajka Ne uznemiravaj"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> šalje poruku"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Korisnik <xliff:g id="NAME">%1$s</xliff:g> poslao je sliku"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem s očitavanjem mjerača baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dodirnite za više informacija"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nema nijednog alarma"</string> diff --git a/packages/SystemUI/res/values-hr/tiles_states_strings.xml b/packages/SystemUI/res/values-hr/tiles_states_strings.xml new file mode 100644 index 000000000000..5622a82ee6d5 --- /dev/null +++ b/packages/SystemUI/res/values-hr/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nedostupno"</item> + <item msgid="3048856902433862868">"Isključeno"</item> + <item msgid="6877982264300789870">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nedostupno"</item> + <item msgid="4293012229142257455">"Isključeno"</item> + <item msgid="6221288736127914861">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nedostupno"</item> + <item msgid="2074416252859094119">"Isključeno"</item> + <item msgid="287997784730044767">"Uključeno"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nedostupno"</item> + <item msgid="7838121007534579872">"Isključeno"</item> + <item msgid="1578872232501319194">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nedostupno"</item> + <item msgid="5376619709702103243">"Isključeno"</item> + <item msgid="4875147066469902392">"Uključeno"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nedostupno"</item> + <item msgid="5044688398303285224">"Isključeno"</item> + <item msgid="8527389108867454098">"Uključeno"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nedostupno"</item> + <item msgid="5776427577477729185">"Isključeno"</item> + <item msgid="7105052717007227415">"Uključeno"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nedostupno"</item> + <item msgid="5315121904534729843">"Isključeno"</item> + <item msgid="503679232285959074">"Uključeno"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nedostupno"</item> + <item msgid="4801037224991420996">"Isključeno"</item> + <item msgid="1982293347302546665">"Uključeno"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nedostupno"</item> + <item msgid="4813655083852587017">"Isključeno"</item> + <item msgid="6744077414775180687">"Uključeno"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nedostupno"</item> + <item msgid="5715725170633593906">"Isključeno"</item> + <item msgid="2075645297847971154">"Uključeno"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nedostupno"</item> + <item msgid="9103697205127645916">"Isključeno"</item> + <item msgid="8067744885820618230">"Uključeno"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nedostupno"</item> + <item msgid="6983679487661600728">"Isključeno"</item> + <item msgid="7520663805910678476">"Uključeno"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nedostupno"</item> + <item msgid="400477985171353">"Isključeno"</item> + <item msgid="630890598801118771">"Uključeno"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nedostupno"</item> + <item msgid="8045580926543311193">"Isključeno"</item> + <item msgid="4913460972266982499">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nedostupno"</item> + <item msgid="1488620600954313499">"Isključeno"</item> + <item msgid="588467578853244035">"Uključeno"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nedostupno"</item> + <item msgid="2744885441164350155">"Isključeno"</item> + <item msgid="151121227514952197">"Uključeno"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nedostupno"</item> + <item msgid="8259411607272330225">"Isključeno"</item> + <item msgid="578444932039713369">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nedostupno"</item> + <item msgid="8707481475312432575">"Isključeno"</item> + <item msgid="8031106212477483874">"Uključeno"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nedostupno"</item> + <item msgid="4572245614982283078">"Isključeno"</item> + <item msgid="6536448410252185664">"Uključeno"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nedostupno"</item> + <item msgid="4765607635752003190">"Isključeno"</item> + <item msgid="1697460731949649844">"Uključeno"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nedostupno"</item> + <item msgid="3296179158646568218">"Isključeno"</item> + <item msgid="8998632451221157987">"Uključeno"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nedostupno"</item> + <item msgid="4544919905196727508">"Isključeno"</item> + <item msgid="3422023746567004609">"Uključeno"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nedostupno"</item> + <item msgid="7571394439974244289">"Isključeno"</item> + <item msgid="6866424167599381915">"Uključeno"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nedostupno"</item> + <item msgid="2710157085538036590">"Isključeno"</item> + <item msgid="7809470840976856149">"Uključeno"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index fae365d2cbf7..a7ee0d8617ba 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Végezze el a beállítást a telefonjával való gyorsabb és biztonságosabb vásárláshoz"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Összes mutatása"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Feloldás a fizetéshez"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nincs beállítva"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Kártya hozzáadása"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Frissítés"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Oldja fel a használathoz"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Probléma merült fel a kártyák lekérésekor, próbálja újra később"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Lezárási képernyő beállításai"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Beszélgetés megnyitása"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Beszélgetési modulok"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Koppintson a kívánt beszélgetésre a kezdőképernyőre való felvételhez"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Legutóbbi beszélgetései itt jelennek majd meg"</string> <string name="priority_conversations" msgid="3967482288896653039">"Fontos beszélgetések"</string> <string name="recent_conversations" msgid="8531874684782574622">"Legutóbbi beszélgetések"</string> <string name="okay" msgid="6490552955618608554">"Rendben"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Megtekintheti a legutóbbi üzeneteket, a nem fogadott hívásokat és az állapotfrissítéseket."</string> <string name="people_tile_title" msgid="6589377493334871272">"Beszélgetés"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"A Ne zavarjanak mód által szüneteltetve"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> üzenetet küldött"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> képet küldött"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Probléma merült fel az akkumulátor-töltésmérő olvasásakor"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Koppintással további információkat érhet el."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nincs ébresztés"</string> diff --git a/packages/SystemUI/res/values-hu/tiles_states_strings.xml b/packages/SystemUI/res/values-hu/tiles_states_strings.xml new file mode 100644 index 000000000000..113e61f71165 --- /dev/null +++ b/packages/SystemUI/res/values-hu/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nem áll rendelkezésre"</item> + <item msgid="3048856902433862868">"Ki"</item> + <item msgid="6877982264300789870">"Be"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nem áll rendelkezésre"</item> + <item msgid="4293012229142257455">"Ki"</item> + <item msgid="6221288736127914861">"Be"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nem áll rendelkezésre"</item> + <item msgid="2074416252859094119">"Ki"</item> + <item msgid="287997784730044767">"Be"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nem áll rendelkezésre"</item> + <item msgid="7838121007534579872">"Ki"</item> + <item msgid="1578872232501319194">"Be"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nem áll rendelkezésre"</item> + <item msgid="5376619709702103243">"Ki"</item> + <item msgid="4875147066469902392">"Be"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nem áll rendelkezésre"</item> + <item msgid="5044688398303285224">"Ki"</item> + <item msgid="8527389108867454098">"Be"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nem áll rendelkezésre"</item> + <item msgid="5776427577477729185">"Ki"</item> + <item msgid="7105052717007227415">"Be"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nem áll rendelkezésre"</item> + <item msgid="5315121904534729843">"Ki"</item> + <item msgid="503679232285959074">"Be"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nem áll rendelkezésre"</item> + <item msgid="4801037224991420996">"Ki"</item> + <item msgid="1982293347302546665">"Be"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nem áll rendelkezésre"</item> + <item msgid="4813655083852587017">"Ki"</item> + <item msgid="6744077414775180687">"Be"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nem áll rendelkezésre"</item> + <item msgid="5715725170633593906">"Ki"</item> + <item msgid="2075645297847971154">"Be"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nem áll rendelkezésre"</item> + <item msgid="9103697205127645916">"Ki"</item> + <item msgid="8067744885820618230">"Be"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nem áll rendelkezésre"</item> + <item msgid="6983679487661600728">"Ki"</item> + <item msgid="7520663805910678476">"Be"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nem áll rendelkezésre"</item> + <item msgid="400477985171353">"Ki"</item> + <item msgid="630890598801118771">"Be"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nem áll rendelkezésre"</item> + <item msgid="8045580926543311193">"Ki"</item> + <item msgid="4913460972266982499">"Be"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nem áll rendelkezésre"</item> + <item msgid="1488620600954313499">"Ki"</item> + <item msgid="588467578853244035">"Be"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nem áll rendelkezésre"</item> + <item msgid="2744885441164350155">"Ki"</item> + <item msgid="151121227514952197">"Be"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nem áll rendelkezésre"</item> + <item msgid="8259411607272330225">"Ki"</item> + <item msgid="578444932039713369">"Be"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nem áll rendelkezésre"</item> + <item msgid="8707481475312432575">"Ki"</item> + <item msgid="8031106212477483874">"Be"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nem áll rendelkezésre"</item> + <item msgid="4572245614982283078">"Ki"</item> + <item msgid="6536448410252185664">"Be"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nem áll rendelkezésre"</item> + <item msgid="4765607635752003190">"Ki"</item> + <item msgid="1697460731949649844">"Be"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nem áll rendelkezésre"</item> + <item msgid="3296179158646568218">"Ki"</item> + <item msgid="8998632451221157987">"Be"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nem áll rendelkezésre"</item> + <item msgid="4544919905196727508">"Ki"</item> + <item msgid="3422023746567004609">"Be"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nem áll rendelkezésre"</item> + <item msgid="7571394439974244289">"Ki"</item> + <item msgid="6866424167599381915">"Be"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nem áll rendelkezésre"</item> + <item msgid="2710157085538036590">"Ki"</item> + <item msgid="7809470840976856149">"Be"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 404a8a7acc95..5760e13bbc31 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Վճարեք հեռախոսով՝ ավելի արագ և ապահով"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Ցույց տալ բոլորը"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ապակողպել՝ վճարելու համար"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Կարգավորված չէ"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Բաց զրույց"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Զրույցի վիջեթներ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Հպեք զրույցին՝ այն հիմնական էկրանին ավելացնելու համար"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Ձեր վերջին զրույցները կցուցադրվեն այստեղ"</string> <string name="priority_conversations" msgid="3967482288896653039">"Կարևոր զրույցներ"</string> <string name="recent_conversations" msgid="8531874684782574622">"Վերջին հաղորդագրությունները"</string> <string name="okay" msgid="6490552955618608554">"Եղավ"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Տեսեք վերջին հաղորդագրությունները, բաց թողնված զանգերը և կարգավիճակի մասին թարմացումները"</string> <string name="people_tile_title" msgid="6589377493334871272">"Զրույց"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Դադարեցվել է «Չանհանգստացնել» գործառույթի կողմից"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը հաղորդագրություն է ուղարկել"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը պատկեր է ուղարկել"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Մարտկոցի ցուցիչի ցուցմունքը կարդալու հետ կապված խնդիր կա"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Հպեք՝ ավելին իմանալու համար"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Զարթուցիչ դրված չէ"</string> diff --git a/packages/SystemUI/res/values-hy/tiles_states_strings.xml b/packages/SystemUI/res/values-hy/tiles_states_strings.xml new file mode 100644 index 000000000000..a8d89d22e290 --- /dev/null +++ b/packages/SystemUI/res/values-hy/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Հասանելի չէ"</item> + <item msgid="3048856902433862868">"Անջատված է"</item> + <item msgid="6877982264300789870">"Միացված է"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Հասանելի չէ"</item> + <item msgid="4293012229142257455">"Անջատված է"</item> + <item msgid="6221288736127914861">"Միացված է"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Հասանելի չէ"</item> + <item msgid="2074416252859094119">"Անջատված է"</item> + <item msgid="287997784730044767">"Միացված է"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Հասանելի չէ"</item> + <item msgid="7838121007534579872">"Անջատված է"</item> + <item msgid="1578872232501319194">"Միացված է"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Հասանելի չէ"</item> + <item msgid="5376619709702103243">"Անջատված է"</item> + <item msgid="4875147066469902392">"Միացված է"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Հասանելի չէ"</item> + <item msgid="5044688398303285224">"Անջատված է"</item> + <item msgid="8527389108867454098">"Միացված է"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Հասանելի չէ"</item> + <item msgid="5776427577477729185">"Անջատված է"</item> + <item msgid="7105052717007227415">"Միացված է"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Հասանելի չէ"</item> + <item msgid="5315121904534729843">"Անջատված է"</item> + <item msgid="503679232285959074">"Միացված է"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Հասանելի չէ"</item> + <item msgid="4801037224991420996">"Անջատված է"</item> + <item msgid="1982293347302546665">"Միացված է"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Հասանելի չէ"</item> + <item msgid="4813655083852587017">"Անջատված է"</item> + <item msgid="6744077414775180687">"Միացված է"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Հասանելի չէ"</item> + <item msgid="5715725170633593906">"Անջատված է"</item> + <item msgid="2075645297847971154">"Միացված է"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Հասանելի չէ"</item> + <item msgid="9103697205127645916">"Անջատված է"</item> + <item msgid="8067744885820618230">"Միացված է"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Հասանելի չէ"</item> + <item msgid="6983679487661600728">"Անջատված է"</item> + <item msgid="7520663805910678476">"Միացված է"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Հասանելի չէ"</item> + <item msgid="400477985171353">"Անջատված է"</item> + <item msgid="630890598801118771">"Միացված է"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Հասանելի չէ"</item> + <item msgid="8045580926543311193">"Անջատված է"</item> + <item msgid="4913460972266982499">"Միացված է"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Հասանելի չէ"</item> + <item msgid="1488620600954313499">"Անջատված է"</item> + <item msgid="588467578853244035">"Միացված է"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Հասանելի չէ"</item> + <item msgid="2744885441164350155">"Անջատված է"</item> + <item msgid="151121227514952197">"Միացված է"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Հասանելի չէ"</item> + <item msgid="8259411607272330225">"Անջատված է"</item> + <item msgid="578444932039713369">"Միացված է"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Հասանելի չէ"</item> + <item msgid="8707481475312432575">"Անջատված է"</item> + <item msgid="8031106212477483874">"Միացված է"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Հասանելի չէ"</item> + <item msgid="4572245614982283078">"Անջատված է"</item> + <item msgid="6536448410252185664">"Միացված է"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Հասանելի չէ"</item> + <item msgid="4765607635752003190">"Անջատված է"</item> + <item msgid="1697460731949649844">"Միացված է"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Հասանելի չէ"</item> + <item msgid="3296179158646568218">"Անջատված է"</item> + <item msgid="8998632451221157987">"Միացված է"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Հասանելի չէ"</item> + <item msgid="4544919905196727508">"Անջատված է"</item> + <item msgid="3422023746567004609">"Միացված է"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Հասանելի չէ"</item> + <item msgid="7571394439974244289">"Անջատված է"</item> + <item msgid="6866424167599381915">"Միացված է"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Հասանելի չէ"</item> + <item msgid="2710157085538036590">"Անջատված է"</item> + <item msgid="7809470840976856149">"Միացված է"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 7da7482cc2bc..dc4f8b2d3257 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Siapkan metode pembayaran untuk melakukan pembelian dengan lebih cepat dan aman menggunakan ponsel Anda"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Tampilkan semua"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Buka kunci untuk membayar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Belum disiapkan"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Tambahkan kartu"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Mengupdate"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Buka kunci untuk menggunakan"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Terjadi masalah saat mendapatkan kartu Anda, coba lagi nanti"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Setelan layar kunci"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Membuka percakapan"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widget Percakapan"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Ketuk percakapan untuk menambahkannya ke Layar utama"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Percakapan terbaru Anda akan ditampilkan di sini"</string> <string name="priority_conversations" msgid="3967482288896653039">"Percakapan prioritas"</string> <string name="recent_conversations" msgid="8531874684782574622">"Percakapan terbaru"</string> <string name="okay" msgid="6490552955618608554">"Oke"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Lihat pesan terbaru, panggilan tak terjawab, dan pembaruan status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Percakapan"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Dijeda oleh fitur Jangan Ganggu"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> mengirim pesan"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> mengirim gambar"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Terjadi masalah saat membaca indikator baterai"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ketuk untuk informasi selengkapnya"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarm tidak disetel"</string> diff --git a/packages/SystemUI/res/values-in/tiles_states_strings.xml b/packages/SystemUI/res/values-in/tiles_states_strings.xml new file mode 100644 index 000000000000..84a9342e2f09 --- /dev/null +++ b/packages/SystemUI/res/values-in/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Tidak tersedia"</item> + <item msgid="3048856902433862868">"Nonaktif"</item> + <item msgid="6877982264300789870">"Aktif"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Tidak tersedia"</item> + <item msgid="4293012229142257455">"Nonaktif"</item> + <item msgid="6221288736127914861">"Aktif"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Tidak tersedia"</item> + <item msgid="2074416252859094119">"Nonaktif"</item> + <item msgid="287997784730044767">"Aktif"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Tidak tersedia"</item> + <item msgid="7838121007534579872">"Nonaktif"</item> + <item msgid="1578872232501319194">"Aktif"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Tidak tersedia"</item> + <item msgid="5376619709702103243">"Nonaktif"</item> + <item msgid="4875147066469902392">"Aktif"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Tidak tersedia"</item> + <item msgid="5044688398303285224">"Nonaktif"</item> + <item msgid="8527389108867454098">"Aktif"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Tidak tersedia"</item> + <item msgid="5776427577477729185">"Nonaktif"</item> + <item msgid="7105052717007227415">"Aktif"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Tidak tersedia"</item> + <item msgid="5315121904534729843">"Nonaktif"</item> + <item msgid="503679232285959074">"Aktif"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Tidak tersedia"</item> + <item msgid="4801037224991420996">"Nonaktif"</item> + <item msgid="1982293347302546665">"Aktif"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Tidak tersedia"</item> + <item msgid="4813655083852587017">"Nonaktif"</item> + <item msgid="6744077414775180687">"Aktif"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Tidak tersedia"</item> + <item msgid="5715725170633593906">"Nonaktif"</item> + <item msgid="2075645297847971154">"Aktif"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Tidak tersedia"</item> + <item msgid="9103697205127645916">"Nonaktif"</item> + <item msgid="8067744885820618230">"Aktif"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Tidak tersedia"</item> + <item msgid="6983679487661600728">"Nonaktif"</item> + <item msgid="7520663805910678476">"Aktif"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Tidak tersedia"</item> + <item msgid="400477985171353">"Nonaktif"</item> + <item msgid="630890598801118771">"Aktif"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Tidak tersedia"</item> + <item msgid="8045580926543311193">"Nonaktif"</item> + <item msgid="4913460972266982499">"Aktif"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Tidak tersedia"</item> + <item msgid="1488620600954313499">"Nonaktif"</item> + <item msgid="588467578853244035">"Aktif"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Tidak tersedia"</item> + <item msgid="2744885441164350155">"Nonaktif"</item> + <item msgid="151121227514952197">"Aktif"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Tidak tersedia"</item> + <item msgid="8259411607272330225">"Nonaktif"</item> + <item msgid="578444932039713369">"Aktif"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Tidak tersedia"</item> + <item msgid="8707481475312432575">"Nonaktif"</item> + <item msgid="8031106212477483874">"Aktif"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Tidak tersedia"</item> + <item msgid="4572245614982283078">"Nonaktif"</item> + <item msgid="6536448410252185664">"Aktif"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Tidak tersedia"</item> + <item msgid="4765607635752003190">"Nonaktif"</item> + <item msgid="1697460731949649844">"Aktif"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Tidak tersedia"</item> + <item msgid="3296179158646568218">"Nonaktif"</item> + <item msgid="8998632451221157987">"Aktif"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Tidak tersedia"</item> + <item msgid="4544919905196727508">"Nonaktif"</item> + <item msgid="3422023746567004609">"Aktif"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Tidak tersedia"</item> + <item msgid="7571394439974244289">"Nonaktif"</item> + <item msgid="6866424167599381915">"Aktif"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Tidak tersedia"</item> + <item msgid="2710157085538036590">"Nonaktif"</item> + <item msgid="7809470840976856149">"Aktif"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index a996cb11c7bb..2fef80db4d06 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Stilltu hlutina þannig að þú getir verslað með símanum á hraðari og öruggari hátt"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Sýna allt"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Taka úr lás til að greiða"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ekki uppsett"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Taktu úr lás til að nota"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Vandamál kom upp við að sækja kortin þín. Reyndu aftur síðar"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Stillingar fyrir læstan skjá"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Opna samtal"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Samtalsgræjur"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Ýttu á samtal til að bæta því á heimaskjáinn"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Hér birtast nýleg samtöl frá þér"</string> <string name="priority_conversations" msgid="3967482288896653039">"Forgangssamtöl"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nýleg samtöl"</string> <string name="okay" msgid="6490552955618608554">"Í lagi"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Sjá nýleg skilboð, ósvöruð símtöl og stöðuuppfærslur"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtal"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Sett í bið af „Ónáðið ekki“"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> sendi skilaboð"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> sendi mynd"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Vandamál við að lesa stöðu rafhlöðu"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ýttu til að fá frekari upplýsingar"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Enginn vekjari"</string> diff --git a/packages/SystemUI/res/values-is/tiles_states_strings.xml b/packages/SystemUI/res/values-is/tiles_states_strings.xml new file mode 100644 index 000000000000..5616d74dc7dd --- /dev/null +++ b/packages/SystemUI/res/values-is/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ekki í boði"</item> + <item msgid="3048856902433862868">"Slökkt"</item> + <item msgid="6877982264300789870">"Kveikt"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ekki í boði"</item> + <item msgid="4293012229142257455">"Slökkt"</item> + <item msgid="6221288736127914861">"Kveikt"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ekki í boði"</item> + <item msgid="2074416252859094119">"Slökkt"</item> + <item msgid="287997784730044767">"Kveikt"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ekki í boði"</item> + <item msgid="7838121007534579872">"Slökkt"</item> + <item msgid="1578872232501319194">"Kveikt"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ekki í boði"</item> + <item msgid="5376619709702103243">"Slökkt"</item> + <item msgid="4875147066469902392">"Kveikt"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ekki í boði"</item> + <item msgid="5044688398303285224">"Slökkt"</item> + <item msgid="8527389108867454098">"Kveikt"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ekki í boði"</item> + <item msgid="5776427577477729185">"Slökkt"</item> + <item msgid="7105052717007227415">"Kveikt"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ekki í boði"</item> + <item msgid="5315121904534729843">"Slökkt"</item> + <item msgid="503679232285959074">"Kveikt"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ekki í boði"</item> + <item msgid="4801037224991420996">"Slökkt"</item> + <item msgid="1982293347302546665">"Kveikt"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ekki í boði"</item> + <item msgid="4813655083852587017">"Slökkt"</item> + <item msgid="6744077414775180687">"Kveikt"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ekki í boði"</item> + <item msgid="5715725170633593906">"Slökkt"</item> + <item msgid="2075645297847971154">"Kveikt"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ekki í boði"</item> + <item msgid="9103697205127645916">"Slökkt"</item> + <item msgid="8067744885820618230">"Kveikt"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ekki í boði"</item> + <item msgid="6983679487661600728">"Slökkt"</item> + <item msgid="7520663805910678476">"Kveikt"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ekki í boði"</item> + <item msgid="400477985171353">"Slökkt"</item> + <item msgid="630890598801118771">"Kveikt"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ekki í boði"</item> + <item msgid="8045580926543311193">"Slökkt"</item> + <item msgid="4913460972266982499">"Kveikt"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ekki í boði"</item> + <item msgid="1488620600954313499">"Slökkt"</item> + <item msgid="588467578853244035">"Kveikt"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ekki í boði"</item> + <item msgid="2744885441164350155">"Slökkt"</item> + <item msgid="151121227514952197">"Kveikt"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ekki í boði"</item> + <item msgid="8259411607272330225">"Slökkt"</item> + <item msgid="578444932039713369">"Kveikt"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ekki í boði"</item> + <item msgid="8707481475312432575">"Slökkt"</item> + <item msgid="8031106212477483874">"Kveikt"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ekki í boði"</item> + <item msgid="4572245614982283078">"Slökkt"</item> + <item msgid="6536448410252185664">"Kveikt"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ekki í boði"</item> + <item msgid="4765607635752003190">"Slökkt"</item> + <item msgid="1697460731949649844">"Kveikt"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ekki í boði"</item> + <item msgid="3296179158646568218">"Slökkt"</item> + <item msgid="8998632451221157987">"Kveikt"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ekki í boði"</item> + <item msgid="4544919905196727508">"Slökkt"</item> + <item msgid="3422023746567004609">"Kveikt"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ekki í boði"</item> + <item msgid="7571394439974244289">"Slökkt"</item> + <item msgid="6866424167599381915">"Kveikt"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ekki í boði"</item> + <item msgid="2710157085538036590">"Slökkt"</item> + <item msgid="7809470840976856149">"Kveikt"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index c03c4b76b824..c5c9289c0478 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -136,7 +136,7 @@ <string name="accessibility_camera_button" msgid="2938898391716647247">"Fotocamera"</string> <string name="accessibility_phone_button" msgid="4256353121703100427">"Telefono"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Voice Assist"</string> - <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> + <string name="accessibility_wallet_button" msgid="1458258783460555507">"Portafoglio"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Sblocca"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Dispositivo bloccato"</string> <string name="accessibility_waiting_for_fingerprint" msgid="5209142744692162598">"In attesa dell\'impronta"</string> @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Imposta un metodo di pagamento per effettuare acquisti in modo più rapido e sicuro con il telefono"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Espandi"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Sblocca per pagare"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nessuna configurazione"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Aggiungi una carta"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Aggiornamento in corso…"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Sblocca per usare"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Si è verificato un problema durante il recupero delle tue carte. Riprova più tardi."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Impostazioni schermata di blocco"</string> @@ -734,7 +735,7 @@ <string name="notification_channel_summary_low" msgid="4860617986908931158">"Nessun suono o vibrazione"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Nessun suono o vibrazione e appare più in basso nella sezione delle conversazioni"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Può suonare o vibrare in base alle impostazioni del telefono"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Può suonare o vibrare in base alle impostazioni del telefono. Conversazioni dalla bolla <xliff:g id="APP_NAME">%1$s</xliff:g> per impostazione predefinita."</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Può suonare o vibrare in base alle impostazioni del telefono. Le conversazioni di <xliff:g id="APP_NAME">%1$s</xliff:g> appaiono come bolla per impostazione predefinita."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mantiene la tua attenzione con una scorciatoia mobile a questi contenuti."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Fai stabilire al sistema se questa notifica deve emettere suoni o vibrazioni"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Stato:</b> promossa a Predefinita"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Apri conversazione"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widget di conversazione"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tocca una conversazione per aggiungerla alla schermata Home"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Le tue conversazioni recenti verranno visualizzate qui"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversazioni prioritarie"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversazioni recenti"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Visualizza messaggi recenti, chiamate senza risposta e aggiornamenti dello stato"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversazione"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"In pausa in base alla modalità Non disturbare"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un messaggio"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ha inviato un\'immagine"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema durante la lettura dell\'indicatore di livello della batteria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tocca per ulteriori informazioni"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nessuna sveglia"</string> diff --git a/packages/SystemUI/res/values-it/tiles_states_strings.xml b/packages/SystemUI/res/values-it/tiles_states_strings.xml new file mode 100644 index 000000000000..d14206974fd5 --- /dev/null +++ b/packages/SystemUI/res/values-it/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Elemento non disponibile"</item> + <item msgid="3048856902433862868">"Off"</item> + <item msgid="6877982264300789870">"On"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Elemento non disponibile"</item> + <item msgid="4293012229142257455">"Off"</item> + <item msgid="6221288736127914861">"On"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Elemento non disponibile"</item> + <item msgid="2074416252859094119">"Off"</item> + <item msgid="287997784730044767">"On"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Elemento non disponibile"</item> + <item msgid="7838121007534579872">"Off"</item> + <item msgid="1578872232501319194">"On"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Elemento non disponibile"</item> + <item msgid="5376619709702103243">"Off"</item> + <item msgid="4875147066469902392">"On"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Elemento non disponibile"</item> + <item msgid="5044688398303285224">"Off"</item> + <item msgid="8527389108867454098">"On"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Elemento non disponibile"</item> + <item msgid="5776427577477729185">"Off"</item> + <item msgid="7105052717007227415">"On"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Elemento non disponibile"</item> + <item msgid="5315121904534729843">"Off"</item> + <item msgid="503679232285959074">"On"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Elemento non disponibile"</item> + <item msgid="4801037224991420996">"Off"</item> + <item msgid="1982293347302546665">"On"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Elemento non disponibile"</item> + <item msgid="4813655083852587017">"Off"</item> + <item msgid="6744077414775180687">"On"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Elemento non disponibile"</item> + <item msgid="5715725170633593906">"Off"</item> + <item msgid="2075645297847971154">"On"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Elemento non disponibile"</item> + <item msgid="9103697205127645916">"Off"</item> + <item msgid="8067744885820618230">"On"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Elemento non disponibile"</item> + <item msgid="6983679487661600728">"Off"</item> + <item msgid="7520663805910678476">"On"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Elemento non disponibile"</item> + <item msgid="400477985171353">"Off"</item> + <item msgid="630890598801118771">"On"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Elemento non disponibile"</item> + <item msgid="8045580926543311193">"Off"</item> + <item msgid="4913460972266982499">"On"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Elemento non disponibile"</item> + <item msgid="1488620600954313499">"Off"</item> + <item msgid="588467578853244035">"On"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Elemento non disponibile"</item> + <item msgid="2744885441164350155">"Off"</item> + <item msgid="151121227514952197">"On"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Elemento non disponibile"</item> + <item msgid="8259411607272330225">"Off"</item> + <item msgid="578444932039713369">"On"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Elemento non disponibile"</item> + <item msgid="8707481475312432575">"Off"</item> + <item msgid="8031106212477483874">"On"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Elemento non disponibile"</item> + <item msgid="4572245614982283078">"Off"</item> + <item msgid="6536448410252185664">"On"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Elemento non disponibile"</item> + <item msgid="4765607635752003190">"Off"</item> + <item msgid="1697460731949649844">"On"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Elemento non disponibile"</item> + <item msgid="3296179158646568218">"Off"</item> + <item msgid="8998632451221157987">"On"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Elemento non disponibile"</item> + <item msgid="4544919905196727508">"Off"</item> + <item msgid="3422023746567004609">"On"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Elemento non disponibile"</item> + <item msgid="7571394439974244289">"Off"</item> + <item msgid="6866424167599381915">"On"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Elemento non disponibile"</item> + <item msgid="2710157085538036590">"Off"</item> + <item msgid="7809470840976856149">"On"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 75a9d753323f..ad923c28acf0 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"מגדירים אמצעי תשלום ונהנים מביצוע מהיר ומאובטח יותר של רכישות באמצעות הטלפון"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"הצגת הכול"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"לביטול הנעילה ולתשלום"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"לא מוגדר"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"פתיחת שיחה"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ווידג\'טים של שיחות"</string> <string name="select_conversation_text" msgid="3376048251434956013">"יש להקיש על שיחה כדי להוסיף אותה למסך הבית"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"השיחות האחרונות שלך יופיעו כאן"</string> <string name="priority_conversations" msgid="3967482288896653039">"שיחות בעדיפות גבוהה"</string> <string name="recent_conversations" msgid="8531874684782574622">"שיחות אחרונות"</string> <string name="okay" msgid="6490552955618608554">"בסדר"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"ההודעות האחרונות, שיחות שלא נענו ועדכוני סטטוס"</string> <string name="people_tile_title" msgid="6589377493334871272">"שיחה"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"ההתראה הושהתה על ידי \'נא לא להפריע\'"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> שלח/ה הודעה"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> שלח/ה תמונה"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"בעיה בקריאת מדדי הסוללה"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"יש להקיש כדי להציג מידע נוסף"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"לא הוגדרה התראה"</string> diff --git a/packages/SystemUI/res/values-iw/tiles_states_strings.xml b/packages/SystemUI/res/values-iw/tiles_states_strings.xml new file mode 100644 index 000000000000..0be95b8dd5a6 --- /dev/null +++ b/packages/SystemUI/res/values-iw/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"לא זמין"</item> + <item msgid="3048856902433862868">"כבוי"</item> + <item msgid="6877982264300789870">"פועל"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"לא זמין"</item> + <item msgid="4293012229142257455">"כבוי"</item> + <item msgid="6221288736127914861">"פועל"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"לא זמין"</item> + <item msgid="2074416252859094119">"כבוי"</item> + <item msgid="287997784730044767">"פועל"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"לא זמין"</item> + <item msgid="7838121007534579872">"כבוי"</item> + <item msgid="1578872232501319194">"פועל"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"לא זמין"</item> + <item msgid="5376619709702103243">"כבוי"</item> + <item msgid="4875147066469902392">"פועל"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"לא זמין"</item> + <item msgid="5044688398303285224">"כבוי"</item> + <item msgid="8527389108867454098">"פועל"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"לא זמין"</item> + <item msgid="5776427577477729185">"כבוי"</item> + <item msgid="7105052717007227415">"פועל"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"לא זמין"</item> + <item msgid="5315121904534729843">"כבוי"</item> + <item msgid="503679232285959074">"פועל"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"לא זמין"</item> + <item msgid="4801037224991420996">"כבוי"</item> + <item msgid="1982293347302546665">"פועל"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"לא זמין"</item> + <item msgid="4813655083852587017">"כבוי"</item> + <item msgid="6744077414775180687">"פועל"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"לא זמין"</item> + <item msgid="5715725170633593906">"כבוי"</item> + <item msgid="2075645297847971154">"פועל"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"לא זמין"</item> + <item msgid="9103697205127645916">"כבוי"</item> + <item msgid="8067744885820618230">"פועל"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"לא זמין"</item> + <item msgid="6983679487661600728">"כבוי"</item> + <item msgid="7520663805910678476">"פועל"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"לא זמין"</item> + <item msgid="400477985171353">"כבוי"</item> + <item msgid="630890598801118771">"פועל"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"לא זמין"</item> + <item msgid="8045580926543311193">"כבוי"</item> + <item msgid="4913460972266982499">"פועל"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"לא זמין"</item> + <item msgid="1488620600954313499">"כבוי"</item> + <item msgid="588467578853244035">"פועל"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"לא זמין"</item> + <item msgid="2744885441164350155">"כבוי"</item> + <item msgid="151121227514952197">"פועל"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"לא זמין"</item> + <item msgid="8259411607272330225">"כבוי"</item> + <item msgid="578444932039713369">"פועל"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"לא זמין"</item> + <item msgid="8707481475312432575">"כבוי"</item> + <item msgid="8031106212477483874">"פועל"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"לא זמין"</item> + <item msgid="4572245614982283078">"כבוי"</item> + <item msgid="6536448410252185664">"פועל"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"לא זמין"</item> + <item msgid="4765607635752003190">"כבוי"</item> + <item msgid="1697460731949649844">"פועל"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"לא זמין"</item> + <item msgid="3296179158646568218">"כבוי"</item> + <item msgid="8998632451221157987">"פועל"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"לא זמין"</item> + <item msgid="4544919905196727508">"כבוי"</item> + <item msgid="3422023746567004609">"פועל"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"לא זמין"</item> + <item msgid="7571394439974244289">"כבוי"</item> + <item msgid="6866424167599381915">"פועל"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"לא זמין"</item> + <item msgid="2710157085538036590">"כבוי"</item> + <item msgid="7809470840976856149">"פועל"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 0742bf0672b8..bd425f8ee8b0 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"スマートフォンを使ってよりすばやく安全に購入できるように設定しましょう"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"すべて表示"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ロックを解除して支払う"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"未設定"</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_device_locked" msgid="5175862019125370506">"ロックを解除して使用"</string> <string name="wallet_error_generic" msgid="257704570182963611">"カードの取得中に問題が発生しました。しばらくしてからもう一度お試しください"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"ロック画面の設定"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"空の会話"</string> <string name="select_conversation_title" msgid="6716364118095089519">"会話ウィジェット"</string> <string name="select_conversation_text" msgid="3376048251434956013">"会話をタップするとホーム画面に追加されます"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"最近の会話がここに表示されます"</string> <string name="priority_conversations" msgid="3967482288896653039">"優先度の高い会話"</string> <string name="recent_conversations" msgid="8531874684782574622">"最近の会話"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"最近のメッセージ、不在着信、最新のステータスが表示されます"</string> <string name="people_tile_title" msgid="6589377493334871272">"会話"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"サイレント モードにより一時停止"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> さんからメッセージが届きました"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> さんが画像を送信しました"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"バッテリー残量の読み込み中に問題が発生しました"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"タップすると詳細が表示されます"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"アラーム未設定"</string> diff --git a/packages/SystemUI/res/values-ja/tiles_states_strings.xml b/packages/SystemUI/res/values-ja/tiles_states_strings.xml new file mode 100644 index 000000000000..bee2deb88f0e --- /dev/null +++ b/packages/SystemUI/res/values-ja/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"使用不可"</item> + <item msgid="3048856902433862868">"OFF"</item> + <item msgid="6877982264300789870">"ON"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"使用不可"</item> + <item msgid="4293012229142257455">"OFF"</item> + <item msgid="6221288736127914861">"ON"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"使用不可"</item> + <item msgid="2074416252859094119">"OFF"</item> + <item msgid="287997784730044767">"ON"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"使用不可"</item> + <item msgid="7838121007534579872">"OFF"</item> + <item msgid="1578872232501319194">"ON"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"使用不可"</item> + <item msgid="5376619709702103243">"OFF"</item> + <item msgid="4875147066469902392">"ON"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"使用不可"</item> + <item msgid="5044688398303285224">"OFF"</item> + <item msgid="8527389108867454098">"ON"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"使用不可"</item> + <item msgid="5776427577477729185">"OFF"</item> + <item msgid="7105052717007227415">"ON"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"使用不可"</item> + <item msgid="5315121904534729843">"OFF"</item> + <item msgid="503679232285959074">"ON"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"使用不可"</item> + <item msgid="4801037224991420996">"OFF"</item> + <item msgid="1982293347302546665">"ON"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"使用不可"</item> + <item msgid="4813655083852587017">"OFF"</item> + <item msgid="6744077414775180687">"ON"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"使用不可"</item> + <item msgid="5715725170633593906">"OFF"</item> + <item msgid="2075645297847971154">"ON"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"使用不可"</item> + <item msgid="9103697205127645916">"OFF"</item> + <item msgid="8067744885820618230">"ON"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"使用不可"</item> + <item msgid="6983679487661600728">"OFF"</item> + <item msgid="7520663805910678476">"ON"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"使用不可"</item> + <item msgid="400477985171353">"OFF"</item> + <item msgid="630890598801118771">"ON"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"使用不可"</item> + <item msgid="8045580926543311193">"OFF"</item> + <item msgid="4913460972266982499">"ON"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"使用不可"</item> + <item msgid="1488620600954313499">"OFF"</item> + <item msgid="588467578853244035">"ON"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"使用不可"</item> + <item msgid="2744885441164350155">"OFF"</item> + <item msgid="151121227514952197">"ON"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"使用不可"</item> + <item msgid="8259411607272330225">"OFF"</item> + <item msgid="578444932039713369">"ON"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"使用不可"</item> + <item msgid="8707481475312432575">"OFF"</item> + <item msgid="8031106212477483874">"ON"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"使用不可"</item> + <item msgid="4572245614982283078">"OFF"</item> + <item msgid="6536448410252185664">"ON"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"使用不可"</item> + <item msgid="4765607635752003190">"OFF"</item> + <item msgid="1697460731949649844">"ON"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"使用不可"</item> + <item msgid="3296179158646568218">"OFF"</item> + <item msgid="8998632451221157987">"ON"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"使用不可"</item> + <item msgid="4544919905196727508">"OFF"</item> + <item msgid="3422023746567004609">"ON"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"使用不可"</item> + <item msgid="7571394439974244289">"OFF"</item> + <item msgid="6866424167599381915">"ON"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"使用不可"</item> + <item msgid="2710157085538036590">"OFF"</item> + <item msgid="7809470840976856149">"ON"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index dd66db3988c7..e952d7879d19 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"დააყენეთ შესყიდვების თქვენი ტელეფონით უფრო სწრაფად და უსაფრთხოდ შესასრულებლად"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ყველას ჩვენება"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"გადასახდელად განბლოკვა"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"არ არის დაყენებული"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"მიმოწერის გახსნა"</string> <string name="select_conversation_title" msgid="6716364118095089519">"საუბრის ვიჯეტები"</string> <string name="select_conversation_text" msgid="3376048251434956013">"შეეხეთ საუბარს მის თქვენს მთავარ ეკრანზე დასამატებლად"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"თქვენი ბოლოდროინდელი საუბრები აქ გამოჩნდება"</string> <string name="priority_conversations" msgid="3967482288896653039">"პრიორიტეტული საუბრები"</string> <string name="recent_conversations" msgid="8531874684782574622">"ბოლო მიმოწერები"</string> <string name="okay" msgid="6490552955618608554">"კარგი"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"ბოლოდროინდელი შეტყობინებების, გამოტოვებული ზარების და სტატუსის განახლებების ნახვა"</string> <string name="people_tile_title" msgid="6589377493334871272">"მიმოწერა"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"დაპაუზებულია ფუნქციის „არ შემაწუხოთ“ მიერ"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>-მ(ა) შეტყობინება გამოგზავნა"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>-მ(ა) სურათი გამოგზავნა"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"თქვენი ბატარეის მზომის წაკითხვასთან დაკავშირებით პრობლემა დაფიქსირდა"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"შეეხეთ მეტი ინფორმაციისთვის"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"მაღვიძარა არ არის"</string> diff --git a/packages/SystemUI/res/values-ka/tiles_states_strings.xml b/packages/SystemUI/res/values-ka/tiles_states_strings.xml new file mode 100644 index 000000000000..eb5f47041d1f --- /dev/null +++ b/packages/SystemUI/res/values-ka/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"მიუწვდომელია"</item> + <item msgid="3048856902433862868">"გამორთულია"</item> + <item msgid="6877982264300789870">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"მიუწვდომელია"</item> + <item msgid="4293012229142257455">"გამორთულია"</item> + <item msgid="6221288736127914861">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"მიუწვდომელია"</item> + <item msgid="2074416252859094119">"გამორთულია"</item> + <item msgid="287997784730044767">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"მიუწვდომელია"</item> + <item msgid="7838121007534579872">"გამორთულია"</item> + <item msgid="1578872232501319194">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"მიუწვდომელია"</item> + <item msgid="5376619709702103243">"გამორთულია"</item> + <item msgid="4875147066469902392">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"მიუწვდომელია"</item> + <item msgid="5044688398303285224">"გამორთულია"</item> + <item msgid="8527389108867454098">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"მიუწვდომელია"</item> + <item msgid="5776427577477729185">"გამორთულია"</item> + <item msgid="7105052717007227415">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"მიუწვდომელია"</item> + <item msgid="5315121904534729843">"გამორთულია"</item> + <item msgid="503679232285959074">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"მიუწვდომელია"</item> + <item msgid="4801037224991420996">"გამორთულია"</item> + <item msgid="1982293347302546665">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"მიუწვდომელია"</item> + <item msgid="4813655083852587017">"გამორთულია"</item> + <item msgid="6744077414775180687">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"მიუწვდომელია"</item> + <item msgid="5715725170633593906">"გამორთულია"</item> + <item msgid="2075645297847971154">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"მიუწვდომელია"</item> + <item msgid="9103697205127645916">"გამორთულია"</item> + <item msgid="8067744885820618230">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"მიუწვდომელია"</item> + <item msgid="6983679487661600728">"გამორთულია"</item> + <item msgid="7520663805910678476">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"მიუწვდომელია"</item> + <item msgid="400477985171353">"გამორთულია"</item> + <item msgid="630890598801118771">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"მიუწვდომელია"</item> + <item msgid="8045580926543311193">"გამორთულია"</item> + <item msgid="4913460972266982499">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"მიუწვდომელია"</item> + <item msgid="1488620600954313499">"გამორთულია"</item> + <item msgid="588467578853244035">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"მიუწვდომელია"</item> + <item msgid="2744885441164350155">"გამორთულია"</item> + <item msgid="151121227514952197">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"მიუწვდომელია"</item> + <item msgid="8259411607272330225">"გამორთულია"</item> + <item msgid="578444932039713369">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"მიუწვდომელია"</item> + <item msgid="8707481475312432575">"გამორთულია"</item> + <item msgid="8031106212477483874">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"მიუწვდომელია"</item> + <item msgid="4572245614982283078">"გამორთულია"</item> + <item msgid="6536448410252185664">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"მიუწვდომელია"</item> + <item msgid="4765607635752003190">"გამორთულია"</item> + <item msgid="1697460731949649844">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"მიუწვდომელია"</item> + <item msgid="3296179158646568218">"გამორთულია"</item> + <item msgid="8998632451221157987">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"მიუწვდომელია"</item> + <item msgid="4544919905196727508">"გამორთულია"</item> + <item msgid="3422023746567004609">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"მიუწვდომელია"</item> + <item msgid="7571394439974244289">"გამორთულია"</item> + <item msgid="6866424167599381915">"ჩართულია"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"მიუწვდომელია"</item> + <item msgid="2710157085538036590">"გამორთულია"</item> + <item msgid="7809470840976856149">"ჩართულია"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index c6a9e9a1e290..4ecba36bc73f 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Телефоныңызбен бұрынғыдан да жылдам әрі қауіпсіз сатып алу үшін параметрлерді орнатыңыз."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Барлығын көрсету"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Төлеу үшін құлыпты ашу"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Реттелмеген"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -743,7 +746,7 @@ <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_dnd" msgid="6665395023264154361">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті ретінде көрсетіледі, Мазаламау режимін тоқтатады."</string> <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Әңгіме туралы хабарландырулардың жоғарғы жағында тұрады және құлыптаулы экранда профиль суреті болып көрсетіледі, қалқыма хабар түрінде шығады, Мазаламау режимін тоқтатады."</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Параметрлер"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Маңызды"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Ашық әңгіме"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Әңгіме виджеттері"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Негізгі экранға қосқыңыз келетін әңгімені түртіңіз."</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Соңғы әңгімелеріңіз осы жерде көрсетіледі."</string> <string name="priority_conversations" msgid="3967482288896653039">"Маңызды әңгімелер"</string> <string name="recent_conversations" msgid="8531874684782574622">"Соңғы әңгімелер"</string> <string name="okay" msgid="6490552955618608554">"Жарайды"</string> @@ -1145,9 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"Соңғы хабарларды, өткізіп алған қоңыраулар мен жаңартылған күйлерді көруге болады."</string> <string name="people_tile_title" msgid="6589377493334871272">"Әңгіме"</string> - <string name="paused_by_dnd" msgid="7856941866433556428">"\"Мазаламау\" режимі арқылы кідіртілді."</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> хабар жіберді."</string> + <string name="paused_by_dnd" msgid="7856941866433556428">"Мазаламау режимі арқылы кідіртілді."</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сурет жіберді."</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Батарея зарядының дерегі алынбай жатыр"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Толығырақ ақпарат алу үшін түртіңіз."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Оятқыш орнатылмаған."</string> diff --git a/packages/SystemUI/res/values-kk/tiles_states_strings.xml b/packages/SystemUI/res/values-kk/tiles_states_strings.xml new file mode 100644 index 000000000000..cdb553069f09 --- /dev/null +++ b/packages/SystemUI/res/values-kk/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Қолжетімсіз"</item> + <item msgid="3048856902433862868">"Өшірулі"</item> + <item msgid="6877982264300789870">"Қосулы"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Қолжетімсіз"</item> + <item msgid="4293012229142257455">"Өшірулі"</item> + <item msgid="6221288736127914861">"Қосулы"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Қолжетімсіз"</item> + <item msgid="2074416252859094119">"Өшірулі"</item> + <item msgid="287997784730044767">"Қосулы"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Қолжетімсіз"</item> + <item msgid="7838121007534579872">"Өшірулі"</item> + <item msgid="1578872232501319194">"Қосулы"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Қолжетімсіз"</item> + <item msgid="5376619709702103243">"Өшірулі"</item> + <item msgid="4875147066469902392">"Қосулы"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Қолжетімсіз"</item> + <item msgid="5044688398303285224">"Өшірулі"</item> + <item msgid="8527389108867454098">"Қосулы"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Қолжетімсіз"</item> + <item msgid="5776427577477729185">"Өшірулі"</item> + <item msgid="7105052717007227415">"Қосулы"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Қолжетімсіз"</item> + <item msgid="5315121904534729843">"Өшірулі"</item> + <item msgid="503679232285959074">"Қосулы"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Қолжетімсіз"</item> + <item msgid="4801037224991420996">"Өшірулі"</item> + <item msgid="1982293347302546665">"Қосулы"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Қолжетімсіз"</item> + <item msgid="4813655083852587017">"Өшірулі"</item> + <item msgid="6744077414775180687">"Қосулы"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Қолжетімсіз"</item> + <item msgid="5715725170633593906">"Өшірулі"</item> + <item msgid="2075645297847971154">"Қосулы"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Қолжетімсіз"</item> + <item msgid="9103697205127645916">"Өшірулі"</item> + <item msgid="8067744885820618230">"Қосулы"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Қолжетімсіз"</item> + <item msgid="6983679487661600728">"Өшірулі"</item> + <item msgid="7520663805910678476">"Қосулы"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Қолжетімсіз"</item> + <item msgid="400477985171353">"Өшірулі"</item> + <item msgid="630890598801118771">"Қосулы"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Қолжетімсіз"</item> + <item msgid="8045580926543311193">"Өшірулі"</item> + <item msgid="4913460972266982499">"Қосулы"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Қолжетімсіз"</item> + <item msgid="1488620600954313499">"Өшірулі"</item> + <item msgid="588467578853244035">"Қосулы"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Қолжетімсіз"</item> + <item msgid="2744885441164350155">"Өшірулі"</item> + <item msgid="151121227514952197">"Қосулы"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Қолжетімсіз"</item> + <item msgid="8259411607272330225">"Өшірулі"</item> + <item msgid="578444932039713369">"Қосулы"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Қолжетімсіз"</item> + <item msgid="8707481475312432575">"Өшірулі"</item> + <item msgid="8031106212477483874">"Қосулы"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Қолжетімсіз"</item> + <item msgid="4572245614982283078">"Өшірулі"</item> + <item msgid="6536448410252185664">"Қосулы"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Қолжетімсіз"</item> + <item msgid="4765607635752003190">"Өшірулі"</item> + <item msgid="1697460731949649844">"Қосулы"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Қолжетімсіз"</item> + <item msgid="3296179158646568218">"Өшірулі"</item> + <item msgid="8998632451221157987">"Қосулы"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Қолжетімсіз"</item> + <item msgid="4544919905196727508">"Өшірулі"</item> + <item msgid="3422023746567004609">"Қосулы"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Қолжетімсіз"</item> + <item msgid="7571394439974244289">"Өшірулі"</item> + <item msgid="6866424167599381915">"Қосулы"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Қолжетімсіз"</item> + <item msgid="2710157085538036590">"Өшірулі"</item> + <item msgid="7809470840976856149">"Қосулы"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 7a586cd7bc45..87ecbbebbe28 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ធ្វើការរៀបចំ ដើម្បីធ្វើការទិញកាន់តែលឿនជាងមុន សុវត្ថិភាពជាងមុន ដោយប្រើទូរសព្ទរបស់អ្នក"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"បង្ហាញទាំងអស់"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ដោះសោដើម្បីបង់ប្រាក់"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"មិនបានរៀបចំទេ"</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_device_locked" msgid="5175862019125370506">"ដោះសោដើម្បីប្រើប្រាស់"</string> <string name="wallet_error_generic" msgid="257704570182963611">"មានបញ្ហាក្នុងការទាញយកកាតរបស់អ្នក សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"ការកំណត់អេក្រង់ចាក់សោ"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"បើកការសន្ទនា"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ធាតុក្រាហ្វិកនៃការសន្ទនា"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ចុចការសន្ទនា ដើម្បីបញ្ចូលវាទៅក្នុងអេក្រង់ដើមរបស់អ្នក"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ការសន្ទនាថ្មីៗរបស់អ្នកនឹងបង្ហាញនៅទីនេះ"</string> <string name="priority_conversations" msgid="3967482288896653039">"ការសន្ទនាអាទិភាព"</string> <string name="recent_conversations" msgid="8531874684782574622">"ការសន្ទនាថ្មីៗ"</string> <string name="okay" msgid="6490552955618608554">"យល់ព្រម"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"មើលព័ត៌មានថ្មីៗអំពីស្ថានភាព ការខកខានទទួល និងសារថ្មីៗ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ការសន្ទនា"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"បានផ្អាកដោយមុខងារកុំរំខាន"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើសារ"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> បានផ្ញើរូបភាព"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"មានបញ្ហាក្នុងការអានឧបករណ៍រង្វាស់កម្រិតថ្មរបស់អ្នក"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ចុចដើម្បីទទួលបានព័ត៌មានបន្ថែម"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"មិនបានកំណត់ម៉ោងរោទ៍ទេ"</string> diff --git a/packages/SystemUI/res/values-km/tiles_states_strings.xml b/packages/SystemUI/res/values-km/tiles_states_strings.xml new file mode 100644 index 000000000000..4ac3c83cf1b0 --- /dev/null +++ b/packages/SystemUI/res/values-km/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"មិនមានទេ"</item> + <item msgid="3048856902433862868">"បិទ"</item> + <item msgid="6877982264300789870">"បើក"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"មិនមានទេ"</item> + <item msgid="4293012229142257455">"បិទ"</item> + <item msgid="6221288736127914861">"បើក"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"មិនមានទេ"</item> + <item msgid="2074416252859094119">"បិទ"</item> + <item msgid="287997784730044767">"បើក"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"មិនមានទេ"</item> + <item msgid="7838121007534579872">"បិទ"</item> + <item msgid="1578872232501319194">"បើក"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"មិនមានទេ"</item> + <item msgid="5376619709702103243">"បិទ"</item> + <item msgid="4875147066469902392">"បើក"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"មិនមានទេ"</item> + <item msgid="5044688398303285224">"បិទ"</item> + <item msgid="8527389108867454098">"បើក"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"មិនមានទេ"</item> + <item msgid="5776427577477729185">"បិទ"</item> + <item msgid="7105052717007227415">"បើក"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"មិនមានទេ"</item> + <item msgid="5315121904534729843">"បិទ"</item> + <item msgid="503679232285959074">"បើក"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"មិនមានទេ"</item> + <item msgid="4801037224991420996">"បិទ"</item> + <item msgid="1982293347302546665">"បើក"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"មិនមានទេ"</item> + <item msgid="4813655083852587017">"បិទ"</item> + <item msgid="6744077414775180687">"បើក"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"មិនមានទេ"</item> + <item msgid="5715725170633593906">"បិទ"</item> + <item msgid="2075645297847971154">"បើក"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"មិនមានទេ"</item> + <item msgid="9103697205127645916">"បិទ"</item> + <item msgid="8067744885820618230">"បើក"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"មិនមានទេ"</item> + <item msgid="6983679487661600728">"បិទ"</item> + <item msgid="7520663805910678476">"បើក"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"មិនមានទេ"</item> + <item msgid="400477985171353">"បិទ"</item> + <item msgid="630890598801118771">"បើក"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"មិនមានទេ"</item> + <item msgid="8045580926543311193">"បិទ"</item> + <item msgid="4913460972266982499">"បើក"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"មិនមានទេ"</item> + <item msgid="1488620600954313499">"បិទ"</item> + <item msgid="588467578853244035">"បើក"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"មិនមានទេ"</item> + <item msgid="2744885441164350155">"បិទ"</item> + <item msgid="151121227514952197">"បើក"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"មិនមានទេ"</item> + <item msgid="8259411607272330225">"បិទ"</item> + <item msgid="578444932039713369">"បើក"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"មិនមានទេ"</item> + <item msgid="8707481475312432575">"បិទ"</item> + <item msgid="8031106212477483874">"បើក"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"មិនមានទេ"</item> + <item msgid="4572245614982283078">"បិទ"</item> + <item msgid="6536448410252185664">"បើក"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"មិនមានទេ"</item> + <item msgid="4765607635752003190">"បិទ"</item> + <item msgid="1697460731949649844">"បើក"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"មិនមានទេ"</item> + <item msgid="3296179158646568218">"បិទ"</item> + <item msgid="8998632451221157987">"បើក"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"មិនមានទេ"</item> + <item msgid="4544919905196727508">"បិទ"</item> + <item msgid="3422023746567004609">"បើក"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"មិនមានទេ"</item> + <item msgid="7571394439974244289">"បិទ"</item> + <item msgid="6866424167599381915">"បើក"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"មិនមានទេ"</item> + <item msgid="2710157085538036590">"បិទ"</item> + <item msgid="7809470840976856149">"បើក"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index daca7e5ebfd5..bcf31e8bbe65 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ನಿಮ್ಮ ಫೋನ್ ಮೂಲಕ ವೇಗವಾದ, ಹೆಚ್ಚು ಸುರಕ್ಷಿತ ಖರೀದಿಗಳನ್ನು ಮಾಡಲು ಸೆಟಪ್ ಮಾಡಿಕೊಳ್ಳಿ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ಎಲ್ಲವನ್ನೂ ತೋರಿಸಿ"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ಪಾವತಿಸಲು ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ಇನ್ನೂ ಸೆಟಪ್ ಮಾಡಿಲ್ಲ"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"ಸಂಭಾಷಣೆಯನ್ನು ತೆರೆಯಿರಿ"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ಸಂಭಾಷಣೆ ವಿಜೆಟ್ಗಳು"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ಸಂಭಾಷಣೆಯನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್ಗೆ ಸೇರಿಸಲು ಅದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ನಿಮ್ಮ ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳನ್ನು ಇಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ"</string> <string name="priority_conversations" msgid="3967482288896653039">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string> <string name="recent_conversations" msgid="8531874684782574622">"ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳು"</string> <string name="okay" msgid="6490552955618608554">"ಸರಿ"</string> @@ -1145,10 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳು, ಮಿಸ್ಡ್ ಕಾಲ್ಗಳು ಮತ್ತು ಸ್ಥಿತಿ ಅಪ್ಡೇಟ್ಗಳು"</string> <string name="people_tile_title" msgid="6589377493334871272">"ಸಂಭಾಷಣೆ"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ನಿಂದ ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರು ಚಿತ್ರವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ಇನ್ನಷ್ಟು ಮಾಹಿತಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ಅಲಾರಾಂ ಸೆಟ್ ಆಗಿಲ್ಲ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 1e48ebd15473..1d470728d7e6 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"설정하여 휴대전화로 더욱 빠르고 안전하게 구매하세요."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"모두 표시"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"잠금 해제하여 결제"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"설정되지 않음"</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_device_locked" msgid="5175862019125370506">"잠금 해제하여 사용"</string> <string name="wallet_error_generic" msgid="257704570182963611">"카드를 가져오는 중에 문제가 발생했습니다. 나중에 다시 시도해 보세요."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"잠금 화면 설정"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"대화 열기"</string> <string name="select_conversation_title" msgid="6716364118095089519">"대화 위젯"</string> <string name="select_conversation_text" msgid="3376048251434956013">"대화를 탭하여 홈 화면에 추가하세요."</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"최근 대화가 여기에 표시됩니다."</string> <string name="priority_conversations" msgid="3967482288896653039">"우선순위 대화"</string> <string name="recent_conversations" msgid="8531874684782574622">"최근 대화"</string> <string name="okay" msgid="6490552955618608554">"확인"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"최근 메시지, 부재중 전화, 상태 업데이트 보기"</string> <string name="people_tile_title" msgid="6589377493334871272">"대화"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"방해 금지 모드로 인해 일시중지됨"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>님이 메시지를 보냈습니다."</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>님이 이미지를 보냈습니다."</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"배터리 수준을 읽는 중에 문제가 발생함"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"탭하여 자세한 정보를 확인하세요."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"설정된 알람 없음"</string> diff --git a/packages/SystemUI/res/values-ko/tiles_states_strings.xml b/packages/SystemUI/res/values-ko/tiles_states_strings.xml new file mode 100644 index 000000000000..38c0185222e1 --- /dev/null +++ b/packages/SystemUI/res/values-ko/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"이용 불가"</item> + <item msgid="3048856902433862868">"꺼짐"</item> + <item msgid="6877982264300789870">"켜짐"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"이용 불가"</item> + <item msgid="4293012229142257455">"꺼짐"</item> + <item msgid="6221288736127914861">"켜짐"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"이용 불가"</item> + <item msgid="2074416252859094119">"꺼짐"</item> + <item msgid="287997784730044767">"켜짐"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"이용 불가"</item> + <item msgid="7838121007534579872">"꺼짐"</item> + <item msgid="1578872232501319194">"켜짐"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"이용 불가"</item> + <item msgid="5376619709702103243">"꺼짐"</item> + <item msgid="4875147066469902392">"켜짐"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"이용 불가"</item> + <item msgid="5044688398303285224">"꺼짐"</item> + <item msgid="8527389108867454098">"켜짐"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"이용 불가"</item> + <item msgid="5776427577477729185">"꺼짐"</item> + <item msgid="7105052717007227415">"켜짐"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"이용 불가"</item> + <item msgid="5315121904534729843">"꺼짐"</item> + <item msgid="503679232285959074">"켜짐"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"이용 불가"</item> + <item msgid="4801037224991420996">"꺼짐"</item> + <item msgid="1982293347302546665">"켜짐"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"이용 불가"</item> + <item msgid="4813655083852587017">"꺼짐"</item> + <item msgid="6744077414775180687">"켜짐"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"이용 불가"</item> + <item msgid="5715725170633593906">"꺼짐"</item> + <item msgid="2075645297847971154">"켜짐"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"이용 불가"</item> + <item msgid="9103697205127645916">"꺼짐"</item> + <item msgid="8067744885820618230">"켜짐"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"이용 불가"</item> + <item msgid="6983679487661600728">"꺼짐"</item> + <item msgid="7520663805910678476">"켜짐"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"이용 불가"</item> + <item msgid="400477985171353">"꺼짐"</item> + <item msgid="630890598801118771">"켜짐"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"이용 불가"</item> + <item msgid="8045580926543311193">"꺼짐"</item> + <item msgid="4913460972266982499">"켜짐"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"이용 불가"</item> + <item msgid="1488620600954313499">"꺼짐"</item> + <item msgid="588467578853244035">"켜짐"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"이용 불가"</item> + <item msgid="2744885441164350155">"꺼짐"</item> + <item msgid="151121227514952197">"켜짐"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"이용 불가"</item> + <item msgid="8259411607272330225">"꺼짐"</item> + <item msgid="578444932039713369">"켜짐"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"이용 불가"</item> + <item msgid="8707481475312432575">"꺼짐"</item> + <item msgid="8031106212477483874">"켜짐"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"이용 불가"</item> + <item msgid="4572245614982283078">"꺼짐"</item> + <item msgid="6536448410252185664">"켜짐"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"이용 불가"</item> + <item msgid="4765607635752003190">"꺼짐"</item> + <item msgid="1697460731949649844">"켜짐"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"이용 불가"</item> + <item msgid="3296179158646568218">"꺼짐"</item> + <item msgid="8998632451221157987">"켜짐"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"이용 불가"</item> + <item msgid="4544919905196727508">"꺼짐"</item> + <item msgid="3422023746567004609">"켜짐"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"이용 불가"</item> + <item msgid="7571394439974244289">"꺼짐"</item> + <item msgid="6866424167599381915">"켜짐"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"이용 불가"</item> + <item msgid="2710157085538036590">"꺼짐"</item> + <item msgid="7809470840976856149">"켜짐"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index bfc899cb5eb8..eb1150d01dcc 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -182,7 +182,7 @@ <string name="fingerprint_dialog_touch_sensor" msgid="2817887108047658975">"Манжа изинин сенсорун басыңыз"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="4465698996175640549">"Манжа изинин сүрөтчөсү"</string> <string name="fingerprint_dialog_use_fingerprint_instead" msgid="6178228876763024452">"Жүз таанылбай жатат. Манжа изин колдонуңуз."</string> - <string name="fingerprint_dialog_use_fingerprint" msgid="923777032861374285">"Улантуу үчүн манжаңыздын изин колдонуңуз"</string> + <string name="fingerprint_dialog_use_fingerprint" msgid="923777032861374285">"Улантуу үчүн манжаңызды сканерге тийгизиңиз"</string> <string name="fingerprint_dialog_cant_recognize_fp_use_screenlock" msgid="4805522676254378353">"Манжа изи таанылбай жатат. Эрканды кулпулоо функциясын колдонуңуз."</string> <string name="face_dialog_looking_for_face" msgid="2656848512116189509">"Жүзүңүз изделүүдө…"</string> <string name="accessibility_face_dialog_face_icon" msgid="8335095612223716768">"Жүздүн сүрөтчөсү"</string> @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Телефонуңуз менен тез жана коопсуз сатып алуу үчүн жөндөңүз"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Баарын көрсөтүү"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Төлөө үчүн кулпусун ачыңыз"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Жөндөлгөн эмес"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -742,9 +745,9 @@ <string name="notification_channel_summary_automatic_promoted" msgid="1301710305149590426">"<b>Абалы:</b> Жогорулады"</string> <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">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме катары көрсөтүлөт"</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү катары көрсөтүлүп, \"Тынчымды алба\" режимин үзгүлтүккө учуратат"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме катары көрсөтүлүп, \"Тынчымды алба\" режимин үзгүлтүккө учуратат"</string> + <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме түрүндө көрүнөт"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү түрүндө көрүнүп, \"Тынчымды алба\" режимин токтотот"</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Cүйлөшүүлөр тууралуу билдирмелердин жогору жагында жана кулпуланган экранда профилдин сүрөтү, ошондой эле калкып чыкма билдирме түрүндө көрүнүп, \"Тынчымды алба\" режимин токтотот"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Жөндөөлөр"</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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Ачык сүйлөшүү"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Сүйлөшүүлөр виджеттери"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Сүйлөшүүнү башкы экранга кошуу үчүн таптап коюңуз"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Акыркы жазышууларыңыз ушул жерде көрүнөт"</string> <string name="priority_conversations" msgid="3967482288896653039">"Маанилүү сүйлөшүүлөр"</string> <string name="recent_conversations" msgid="8531874684782574622">"Акыркы сүйлөшүүлөр"</string> <string name="okay" msgid="6490552955618608554">"Макул"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Акыркы билдирүүлөрдү, жооп берилбеген чалууларды жана статустардын жаңырганын көрөсүз"</string> <string name="people_tile_title" msgid="6589377493334871272">"Сүйлөшүү"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\"Тынчымды алба\" режими тындырды"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> билдирүү жөнөттү"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> сүрөт жөнөттү"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Батареяңыздын кубаты аныкталбай жатат"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Кеңири маалымат алуу үчүн таптап коюңуз"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ойготкуч коюлган жок"</string> diff --git a/packages/SystemUI/res/values-ky/tiles_states_strings.xml b/packages/SystemUI/res/values-ky/tiles_states_strings.xml new file mode 100644 index 000000000000..6e75bf34e544 --- /dev/null +++ b/packages/SystemUI/res/values-ky/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Жеткиликсиз"</item> + <item msgid="3048856902433862868">"Өчүк"</item> + <item msgid="6877982264300789870">"Күйүк"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Жеткиликсиз"</item> + <item msgid="4293012229142257455">"Өчүк"</item> + <item msgid="6221288736127914861">"Күйүк"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Жеткиликсиз"</item> + <item msgid="2074416252859094119">"Өчүк"</item> + <item msgid="287997784730044767">"Күйүк"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Жеткиликсиз"</item> + <item msgid="7838121007534579872">"Өчүк"</item> + <item msgid="1578872232501319194">"Күйүк"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Жеткиликсиз"</item> + <item msgid="5376619709702103243">"Өчүк"</item> + <item msgid="4875147066469902392">"Күйүк"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Жеткиликсиз"</item> + <item msgid="5044688398303285224">"Өчүк"</item> + <item msgid="8527389108867454098">"Күйүк"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Жеткиликсиз"</item> + <item msgid="5776427577477729185">"Өчүк"</item> + <item msgid="7105052717007227415">"Күйүк"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Жеткиликсиз"</item> + <item msgid="5315121904534729843">"Өчүк"</item> + <item msgid="503679232285959074">"Күйүк"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Жеткиликсиз"</item> + <item msgid="4801037224991420996">"Өчүк"</item> + <item msgid="1982293347302546665">"Күйүк"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Жеткиликсиз"</item> + <item msgid="4813655083852587017">"Өчүк"</item> + <item msgid="6744077414775180687">"Күйүк"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Жеткиликсиз"</item> + <item msgid="5715725170633593906">"Өчүк"</item> + <item msgid="2075645297847971154">"Күйүк"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Жеткиликсиз"</item> + <item msgid="9103697205127645916">"Өчүк"</item> + <item msgid="8067744885820618230">"Күйүк"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Жеткиликсиз"</item> + <item msgid="6983679487661600728">"Өчүк"</item> + <item msgid="7520663805910678476">"Күйүк"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Жеткиликсиз"</item> + <item msgid="400477985171353">"Өчүк"</item> + <item msgid="630890598801118771">"Күйүк"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Жеткиликсиз"</item> + <item msgid="8045580926543311193">"Өчүк"</item> + <item msgid="4913460972266982499">"Күйүк"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Жеткиликсиз"</item> + <item msgid="1488620600954313499">"Өчүк"</item> + <item msgid="588467578853244035">"Күйүк"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Жеткиликсиз"</item> + <item msgid="2744885441164350155">"Өчүк"</item> + <item msgid="151121227514952197">"Күйүк"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Жеткиликсиз"</item> + <item msgid="8259411607272330225">"Өчүк"</item> + <item msgid="578444932039713369">"Күйүк"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Жеткиликсиз"</item> + <item msgid="8707481475312432575">"Өчүк"</item> + <item msgid="8031106212477483874">"Күйүк"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Жеткиликсиз"</item> + <item msgid="4572245614982283078">"Өчүк"</item> + <item msgid="6536448410252185664">"Күйүк"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Жеткиликсиз"</item> + <item msgid="4765607635752003190">"Өчүк"</item> + <item msgid="1697460731949649844">"Күйүк"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Жеткиликсиз"</item> + <item msgid="3296179158646568218">"Өчүк"</item> + <item msgid="8998632451221157987">"Күйүк"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Жеткиликсиз"</item> + <item msgid="4544919905196727508">"Өчүк"</item> + <item msgid="3422023746567004609">"Күйүк"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Жеткиликсиз"</item> + <item msgid="7571394439974244289">"Өчүк"</item> + <item msgid="6866424167599381915">"Күйүк"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Жеткиликсиз"</item> + <item msgid="2710157085538036590">"Өчүк"</item> + <item msgid="7809470840976856149">"Күйүк"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-land/dimens.xml b/packages/SystemUI/res/values-land/dimens.xml index 9df9db607b9f..34bf28aa741e 100644 --- a/packages/SystemUI/res/values-land/dimens.xml +++ b/packages/SystemUI/res/values-land/dimens.xml @@ -64,4 +64,6 @@ <!-- (footer_height -48dp)/2 --> <dimen name="controls_management_footer_top_margin">4dp</dimen> <dimen name="controls_management_favorites_top_margin">8dp</dimen> + + <dimen name="wallet_card_carousel_container_top_margin">24dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index fe8211aa580d..3275d282b4e0 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ຕັ້ງຄ່າເພື່ອຊື້ດ້ວຍໂທລະສັບຂອງທ່ານໄດ້ໄວຂຶ້ນ ແລະ ປອດໄພຂຶ້ນ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ສະແດງທັງໝົດ"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ປົດລັອກເພື່ອຈ່າຍ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</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_device_locked" msgid="5175862019125370506">"ປົດລັອກເພື່ອໃຊ້"</string> <string name="wallet_error_generic" msgid="257704570182963611">"ເກີດບັນຫາໃນການໂຫຼດບັດຂອງທ່ານ, ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"ການຕັ້ງຄ່າໜ້າຈໍລັອກ"</string> @@ -734,7 +735,7 @@ <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> ຈະເປັນ bubble ຕາມຄ່າເລີ່ມຕົ້ນ."</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_bubble" msgid="7235935211580860537">"ເອົາໃຈໃສ່ທາງລັດແບບລອຍໄປຫາເນື້ອຫານີ້."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ໃຫ້ລະບົບກຳນົດວ່າການແຈ້ງເຕືອນນິ້ຄວນມີສຽງ ຫຼື ສັ່ນເຕືອນຫຼືບໍ່"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>ສະຖານະ:</b> ເລື່ອນລະດັບເປັນຄ່າເລີ່ມຕົ້ນແລ້ວ"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"ເປີດການສົນທະນາ"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ວິດເຈັດການສົນທະນາ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ແຕະໃສ່ການສົນທະນາໃດໜຶ່ງເພື່ອເພີ່ມມັນໃສ່ໂຮມສະກຣີນຂອງທ່ານ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ການສົນທະນາຫຼ້າສຸດຂອງທ່ານຈະສະແດງຢູ່ບ່ອນນີ້"</string> <string name="priority_conversations" msgid="3967482288896653039">"ການສົນທະນາສຳຄັນ"</string> <string name="recent_conversations" msgid="8531874684782574622">"ການສົນທະນາຫຼ້າສຸດ"</string> <string name="okay" msgid="6490552955618608554">"ຕົກລົງ"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"ເບິ່ງຂໍ້ຄວາມຫຼ້າສຸດ, ສາຍບໍ່ໄດ້ຮັບ ແລະ ອັບເດດສະຖານະ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ການສົນທະນາ"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"ຢຸດຊົ່ວຄາວແລ້ວໂດຍໂໝດຫ້າມລົບກວນ"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ສົ່ງຂໍ້ຄວາມແລ້ວ"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ສົ່ງຮູບພາບແລ້ວ"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ເກີດບັນຫາໃນການອ່ານຕົວວັດແທກແບັດເຕີຣີຂອງທ່ານ"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ແຕະເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ບໍ່ໄດ້ຕັ້ງໂມງປຸກ"</string> diff --git a/packages/SystemUI/res/values-lo/tiles_states_strings.xml b/packages/SystemUI/res/values-lo/tiles_states_strings.xml new file mode 100644 index 000000000000..ac5da6f6e3dc --- /dev/null +++ b/packages/SystemUI/res/values-lo/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="3048856902433862868">"ປິດ"</item> + <item msgid="6877982264300789870">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4293012229142257455">"ປິດ"</item> + <item msgid="6221288736127914861">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="2074416252859094119">"ປິດ"</item> + <item msgid="287997784730044767">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="7838121007534579872">"ປິດ"</item> + <item msgid="1578872232501319194">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="5376619709702103243">"ປິດ"</item> + <item msgid="4875147066469902392">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="5044688398303285224">"ປິດ"</item> + <item msgid="8527389108867454098">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="5776427577477729185">"ປິດ"</item> + <item msgid="7105052717007227415">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="5315121904534729843">"ປິດ"</item> + <item msgid="503679232285959074">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4801037224991420996">"ປິດ"</item> + <item msgid="1982293347302546665">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4813655083852587017">"ປິດ"</item> + <item msgid="6744077414775180687">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="5715725170633593906">"ປິດ"</item> + <item msgid="2075645297847971154">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="9103697205127645916">"ປິດ"</item> + <item msgid="8067744885820618230">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="6983679487661600728">"ປິດ"</item> + <item msgid="7520663805910678476">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="400477985171353">"ປິດ"</item> + <item msgid="630890598801118771">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="8045580926543311193">"ປິດ"</item> + <item msgid="4913460972266982499">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="1488620600954313499">"ປິດ"</item> + <item msgid="588467578853244035">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="2744885441164350155">"ປິດ"</item> + <item msgid="151121227514952197">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="8259411607272330225">"ປິດ"</item> + <item msgid="578444932039713369">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="8707481475312432575">"ປິດ"</item> + <item msgid="8031106212477483874">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4572245614982283078">"ປິດ"</item> + <item msgid="6536448410252185664">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4765607635752003190">"ປິດ"</item> + <item msgid="1697460731949649844">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="3296179158646568218">"ປິດ"</item> + <item msgid="8998632451221157987">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="4544919905196727508">"ປິດ"</item> + <item msgid="3422023746567004609">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="7571394439974244289">"ປິດ"</item> + <item msgid="6866424167599381915">"ເປີດ"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"ບໍ່ສາມາດໃຊ້ໄດ້"</item> + <item msgid="2710157085538036590">"ປິດ"</item> + <item msgid="7809470840976856149">"ເປີດ"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 04dc3fca5a59..284d1fafa935 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Nustatykite, kad galėtumėte greičiau ir saugiau pirkti telefonu"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Rodyti viską"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Atrakinti, kad būtų galima mokėti"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nenustatyta"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Atrakinti, kad būtų galima naudoti"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Gaunant korteles kilo problema, bandykite dar kartą vėliau"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Užrakinimo ekrano nustatymai"</string> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Atidaryti pokalbį"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Pokalbio valdikliai"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Palieskite pokalbį, kad pridėtumėte jį prie pagrindinio ekrano"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Naujausi pokalbiai bus rodomi čia"</string> <string name="priority_conversations" msgid="3967482288896653039">"Svarbiausi pokalbiai"</string> <string name="recent_conversations" msgid="8531874684782574622">"Paskutiniai pokalbiai"</string> <string name="okay" msgid="6490552955618608554">"Gerai"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Peržiūrėkite naujausius pranešimus, praleistus skambučius ir būsenos atnaujinimus"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pokalbis"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pristabdyta dėl netrukdymo režimo"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> išsiuntė pranešimą"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> išsiuntė vaizdą"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Nuskaitant akumuliatoriaus skaitiklį iškilo problema"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Palieskite, kad sužinotumėte daugiau informacijos"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nenustatyta signalų"</string> diff --git a/packages/SystemUI/res/values-lt/tiles_states_strings.xml b/packages/SystemUI/res/values-lt/tiles_states_strings.xml new file mode 100644 index 000000000000..4b328203a1cf --- /dev/null +++ b/packages/SystemUI/res/values-lt/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nepasiekiama"</item> + <item msgid="3048856902433862868">"Išjungta"</item> + <item msgid="6877982264300789870">"Įjungta"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nepasiekiama"</item> + <item msgid="4293012229142257455">"Išjungta"</item> + <item msgid="6221288736127914861">"Įjungta"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nepasiekiama"</item> + <item msgid="2074416252859094119">"Išjungta"</item> + <item msgid="287997784730044767">"Įjungta"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nepasiekiama"</item> + <item msgid="7838121007534579872">"Išjungta"</item> + <item msgid="1578872232501319194">"Įjungta"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nepasiekiama"</item> + <item msgid="5376619709702103243">"Išjungta"</item> + <item msgid="4875147066469902392">"Įjungta"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nepasiekiama"</item> + <item msgid="5044688398303285224">"Išjungta"</item> + <item msgid="8527389108867454098">"Įjungta"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nepasiekiama"</item> + <item msgid="5776427577477729185">"Išjungta"</item> + <item msgid="7105052717007227415">"Įjungta"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nepasiekiama"</item> + <item msgid="5315121904534729843">"Išjungta"</item> + <item msgid="503679232285959074">"Įjungta"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nepasiekiama"</item> + <item msgid="4801037224991420996">"Išjungta"</item> + <item msgid="1982293347302546665">"Įjungta"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nepasiekiama"</item> + <item msgid="4813655083852587017">"Išjungta"</item> + <item msgid="6744077414775180687">"Įjungta"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nepasiekiama"</item> + <item msgid="5715725170633593906">"Išjungta"</item> + <item msgid="2075645297847971154">"Įjungta"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nepasiekiama"</item> + <item msgid="9103697205127645916">"Išjungta"</item> + <item msgid="8067744885820618230">"Įjungta"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nepasiekiama"</item> + <item msgid="6983679487661600728">"Išjungta"</item> + <item msgid="7520663805910678476">"Įjungta"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nepasiekiama"</item> + <item msgid="400477985171353">"Išjungta"</item> + <item msgid="630890598801118771">"Įjungta"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nepasiekiama"</item> + <item msgid="8045580926543311193">"Išjungta"</item> + <item msgid="4913460972266982499">"Įjungta"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nepasiekiama"</item> + <item msgid="1488620600954313499">"Išjungta"</item> + <item msgid="588467578853244035">"Įjungta"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nepasiekiama"</item> + <item msgid="2744885441164350155">"Išjungta"</item> + <item msgid="151121227514952197">"Įjungta"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nepasiekiama"</item> + <item msgid="8259411607272330225">"Išjungta"</item> + <item msgid="578444932039713369">"Įjungta"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nepasiekiama"</item> + <item msgid="8707481475312432575">"Išjungta"</item> + <item msgid="8031106212477483874">"Įjungta"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nepasiekiama"</item> + <item msgid="4572245614982283078">"Išjungta"</item> + <item msgid="6536448410252185664">"Įjungta"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nepasiekiama"</item> + <item msgid="4765607635752003190">"Išjungta"</item> + <item msgid="1697460731949649844">"Įjungta"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nepasiekiama"</item> + <item msgid="3296179158646568218">"Išjungta"</item> + <item msgid="8998632451221157987">"Įjungta"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nepasiekiama"</item> + <item msgid="4544919905196727508">"Išjungta"</item> + <item msgid="3422023746567004609">"Įjungta"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nepasiekiama"</item> + <item msgid="7571394439974244289">"Išjungta"</item> + <item msgid="6866424167599381915">"Įjungta"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nepasiekiama"</item> + <item msgid="2710157085538036590">"Išjungta"</item> + <item msgid="7809470840976856149">"Įjungta"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index ade61cd497aa..8770a1fedcb8 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -672,7 +672,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Iestatiet, lai ātrāk un drošāk veiktu pirkumus, izmantojot tālruni"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Rādīt visu"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Lai maksātu, atbloķējiet ekrānu"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nav iestatīts"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lai izmantotu, atbloķējiet ekrānu"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Ienesot jūsu kartes, radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Bloķēšanas ekrāna iestatījumi"</string> @@ -1121,8 +1124,7 @@ <string name="basic_status" msgid="2315371112182658176">"Atvērt sarunu"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Sarunu logrīki"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Pieskarieties kādai sarunai, lai pievienotu to savam sākuma ekrānam."</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Jūsu pēdējās sarunas būs redzamas šeit"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritārās sarunas"</string> <string name="recent_conversations" msgid="8531874684782574622">"Jaunākās sarunas"</string> <string name="okay" msgid="6490552955618608554">"Labi"</string> @@ -1152,8 +1154,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Skatiet jaunākos ziņojumus, neatbildētos zvanus un statusa atjauninājumus."</string> <string name="people_tile_title" msgid="6589377493334871272">"Saruna"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Rādīšana pārtraukta režīma Netraucēt dēļ"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> nosūtīja ziņojumu"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> nosūtīja attēlu"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Nevar iegūt informāciju par akumulatora uzlādes līmeni."</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Pieskarieties, lai iegūtu plašāku informāciju."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nav iestatīts signāls"</string> diff --git a/packages/SystemUI/res/values-lv/tiles_states_strings.xml b/packages/SystemUI/res/values-lv/tiles_states_strings.xml new file mode 100644 index 000000000000..d000b7c8987f --- /dev/null +++ b/packages/SystemUI/res/values-lv/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nav pieejams"</item> + <item msgid="3048856902433862868">"Izslēgts"</item> + <item msgid="6877982264300789870">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nav pieejams"</item> + <item msgid="4293012229142257455">"Izslēgts"</item> + <item msgid="6221288736127914861">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nav pieejami"</item> + <item msgid="2074416252859094119">"Izslēgti"</item> + <item msgid="287997784730044767">"Ieslēgti"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nav pieejams"</item> + <item msgid="7838121007534579872">"Izslēgts"</item> + <item msgid="1578872232501319194">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nav pieejams"</item> + <item msgid="5376619709702103243">"Izslēgts"</item> + <item msgid="4875147066469902392">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nav pieejams"</item> + <item msgid="5044688398303285224">"Izslēgts"</item> + <item msgid="8527389108867454098">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nav pieejama"</item> + <item msgid="5776427577477729185">"Izslēgta"</item> + <item msgid="7105052717007227415">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nav pieejams"</item> + <item msgid="5315121904534729843">"Izslēgts"</item> + <item msgid="503679232285959074">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nav pieejams"</item> + <item msgid="4801037224991420996">"Izslēgts"</item> + <item msgid="1982293347302546665">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nav pieejama"</item> + <item msgid="4813655083852587017">"Izslēgta"</item> + <item msgid="6744077414775180687">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nav pieejams"</item> + <item msgid="5715725170633593906">"Izslēgts"</item> + <item msgid="2075645297847971154">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nav pieejama"</item> + <item msgid="9103697205127645916">"Izslēgta"</item> + <item msgid="8067744885820618230">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nav pieejams"</item> + <item msgid="6983679487661600728">"Izslēgts"</item> + <item msgid="7520663805910678476">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nav pieejams"</item> + <item msgid="400477985171353">"Izslēgts"</item> + <item msgid="630890598801118771">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nav pieejams"</item> + <item msgid="8045580926543311193">"Izslēgts"</item> + <item msgid="4913460972266982499">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nav pieejama"</item> + <item msgid="1488620600954313499">"Izslēgta"</item> + <item msgid="588467578853244035">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nav pieejams"</item> + <item msgid="2744885441164350155">"Izslēgts"</item> + <item msgid="151121227514952197">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nav pieejama"</item> + <item msgid="8259411607272330225">"Izslēgta"</item> + <item msgid="578444932039713369">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nav pieejama"</item> + <item msgid="8707481475312432575">"Izslēgta"</item> + <item msgid="8031106212477483874">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nav pieejama"</item> + <item msgid="4572245614982283078">"Izslēgta"</item> + <item msgid="6536448410252185664">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nav pieejama"</item> + <item msgid="4765607635752003190">"Izslēgta"</item> + <item msgid="1697460731949649844">"Ieslēgta"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nav pieejams"</item> + <item msgid="3296179158646568218">"Izslēgts"</item> + <item msgid="8998632451221157987">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nav pieejamas"</item> + <item msgid="4544919905196727508">"Izslēgtas"</item> + <item msgid="3422023746567004609">"Ieslēgtas"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nav pieejams"</item> + <item msgid="7571394439974244289">"Izslēgts"</item> + <item msgid="6866424167599381915">"Ieslēgts"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nav pieejams"</item> + <item msgid="2710157085538036590">"Izslēgts"</item> + <item msgid="7809470840976856149">"Ieslēgts"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 4e4793a466de..3bfc4337e7b9 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Поставете за да купувате побрзо и побезбедно преку вашиот телефон"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Прикажи ги сите"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Отклучете за да платите"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Не е поставено"</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_device_locked" msgid="5175862019125370506">"Отклучете за да користите"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Имаше проблем при преземањето на картичките. Обидете се повторно подоцна"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Поставки за заклучен екран"</string> @@ -734,7 +735,7 @@ <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_with_bubbles" msgid="1782419896613644568">"Може да ѕвони или вибрира во зависност од поставките на телефонот. Стандардно, разговорите од <xliff:g id="APP_NAME">%1$s</xliff:g> се во балончиња."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Ви го задржува вниманието со лебдечка кратенка на содржинава."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Дозволете системот да определи дали известувањево треба да испушти звук или да вибрира"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Статус:</b> поставено на „Стандардно“"</string> @@ -743,8 +744,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_conversation_channel_settings" msgid="2409977688430606835">"Поставки"</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> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Започни разговор"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Виџети за разговор"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Допрете на разговор за да го додадете на вашиот почетен екран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Вашите неодамнешни разговори ќе се прикажуваат тука"</string> <string name="priority_conversations" msgid="3967482288896653039">"Приоритетни разговори"</string> <string name="recent_conversations" msgid="8531874684782574622">"Неодамнешни разговори"</string> <string name="okay" msgid="6490552955618608554">"Во ред"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Видете ги неодамнешните пораки, пропуштени повици и промени на статусот"</string> <string name="people_tile_title" msgid="6589377493334871272">"Разговор"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Паузирано од „Не вознемирувај“"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> испрати порака"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> испрати слика"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Проблем при читањето на мерачот на батеријата"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Допрете за повеќе информации"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Не е поставен аларм"</string> diff --git a/packages/SystemUI/res/values-mk/tiles_states_strings.xml b/packages/SystemUI/res/values-mk/tiles_states_strings.xml new file mode 100644 index 000000000000..9d0c49532bca --- /dev/null +++ b/packages/SystemUI/res/values-mk/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Недостапно"</item> + <item msgid="3048856902433862868">"Исклучено"</item> + <item msgid="6877982264300789870">"Вклучено"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Недостапно"</item> + <item msgid="4293012229142257455">"Исклучено"</item> + <item msgid="6221288736127914861">"Вклучено"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Недостапно"</item> + <item msgid="2074416252859094119">"Исклучено"</item> + <item msgid="287997784730044767">"Вклучено"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Недостапно"</item> + <item msgid="7838121007534579872">"Исклучено"</item> + <item msgid="1578872232501319194">"Вклучено"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Недостапно"</item> + <item msgid="5376619709702103243">"Исклучено"</item> + <item msgid="4875147066469902392">"Вклучено"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Недостапно"</item> + <item msgid="5044688398303285224">"Исклучено"</item> + <item msgid="8527389108867454098">"Вклучено"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Недостапно"</item> + <item msgid="5776427577477729185">"Исклучено"</item> + <item msgid="7105052717007227415">"Вклучено"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Недостапно"</item> + <item msgid="5315121904534729843">"Исклучено"</item> + <item msgid="503679232285959074">"Вклучено"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Недостапно"</item> + <item msgid="4801037224991420996">"Исклучено"</item> + <item msgid="1982293347302546665">"Вклучено"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Недостапно"</item> + <item msgid="4813655083852587017">"Исклучено"</item> + <item msgid="6744077414775180687">"Вклучено"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Недостапно"</item> + <item msgid="5715725170633593906">"Исклучено"</item> + <item msgid="2075645297847971154">"Вклучено"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Недостапно"</item> + <item msgid="9103697205127645916">"Исклучено"</item> + <item msgid="8067744885820618230">"Вклучено"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Недостапно"</item> + <item msgid="6983679487661600728">"Исклучено"</item> + <item msgid="7520663805910678476">"Вклучено"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Недостапно"</item> + <item msgid="400477985171353">"Исклучено"</item> + <item msgid="630890598801118771">"Вклучено"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Недостапно"</item> + <item msgid="8045580926543311193">"Исклучено"</item> + <item msgid="4913460972266982499">"Вклучено"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Недостапно"</item> + <item msgid="1488620600954313499">"Исклучено"</item> + <item msgid="588467578853244035">"Вклучено"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Недостапно"</item> + <item msgid="2744885441164350155">"Исклучено"</item> + <item msgid="151121227514952197">"Вклучено"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Недостапно"</item> + <item msgid="8259411607272330225">"Исклучено"</item> + <item msgid="578444932039713369">"Вклучено"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Недостапно"</item> + <item msgid="8707481475312432575">"Исклучено"</item> + <item msgid="8031106212477483874">"Вклучено"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Недостапно"</item> + <item msgid="4572245614982283078">"Исклучено"</item> + <item msgid="6536448410252185664">"Вклучено"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Недостапно"</item> + <item msgid="4765607635752003190">"Исклучено"</item> + <item msgid="1697460731949649844">"Вклучено"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Недостапно"</item> + <item msgid="3296179158646568218">"Исклучено"</item> + <item msgid="8998632451221157987">"Вклучено"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Недостапно"</item> + <item msgid="4544919905196727508">"Исклучено"</item> + <item msgid="3422023746567004609">"Вклучено"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Недостапно"</item> + <item msgid="7571394439974244289">"Исклучено"</item> + <item msgid="6866424167599381915">"Вклучено"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Недостапно"</item> + <item msgid="2710157085538036590">"Исклучено"</item> + <item msgid="7809470840976856149">"Вклучено"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 83efb96ab344..b7c7023de0a9 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"നിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ച് വാങ്ങലുകൾ വേഗത്തിലും സുരക്ഷിതമായും നടത്താനുള്ള സജ്ജീകരണം നടത്തുക"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"എല്ലാം കാണിക്കുക"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"പണമടയ്ക്കാൻ അൺലോക്ക് ചെയ്യുക"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"സജ്ജീകരിച്ചിട്ടില്ല"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -734,7 +737,7 @@ <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_with_bubbles" msgid="1782419896613644568">"ഫോൺ ക്രമീകരണം അടിസ്ഥാനമാക്കി റിംഗ്/വൈബ്രേറ്റ് ചെയ്തേക്കാം. <xliff:g id="APP_NAME">%1$s</xliff:g>-ൽ നിന്നുള്ള സംഭാഷണങ്ങൾ ഡിഫോൾട്ടായി ബബിൾ ചെയ്യുന്നു."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"ഈ ഉള്ളടക്കത്തിലേക്ക് ഒരു ഫ്ലോട്ടിംഗ് കുറുക്കുവഴി ഉപയോഗിച്ച് നിങ്ങളുടെ ശ്രദ്ധ നിലനിർത്തുന്നു."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"ഈ അറിയിപ്പ് വരുമ്പോൾ ശബ്ദിക്കുകയാണോ വൈബ്രേറ്റ് ചെയ്യുകയാണോ വേണ്ടതെന്ന് നിർണ്ണയിക്കാൻ സിസ്റ്റത്തെ അനുവദിക്കുക"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>നില:</b> ഡിഫോൾട്ടാക്കി പ്രമോട്ട് ചെയ്തു"</string> @@ -744,7 +747,7 @@ <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_conversation_channel_settings" msgid="2409977688430606835">"ക്രമീകരണം"</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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"സംഭാഷണം തുറക്കുക"</string> <string name="select_conversation_title" msgid="6716364118095089519">"സംഭാഷണ വിജറ്റുകൾ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"നിങ്ങളുടെ ഹോം സ്ക്രീനിൽ ചേർക്കാൻ സംഭാഷണത്തിൽ ടാപ്പ് ചെയ്യുക"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"നിങ്ങളുടെ സമീപകാല സംഭാഷണങ്ങൾ ഇവിടെ ദൃശ്യമാകും"</string> <string name="priority_conversations" msgid="3967482288896653039">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string> <string name="recent_conversations" msgid="8531874684782574622">"അടുത്തിടെയുള്ള സംഭാഷണങ്ങൾ"</string> <string name="okay" msgid="6490552955618608554">"ശരി"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"അടുത്തിടെയുള്ള സന്ദേശങ്ങൾ, മിസ്ഡ് കോൾ, സ്റ്റാറ്റസ് അപ്ഡേറ്റുകൾ എന്നിവ കാണൂ"</string> <string name="people_tile_title" msgid="6589377493334871272">"സംഭാഷണം"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\'ശല്യപ്പെടുത്തരുത്\' ഓണായതിനാൽ തൽക്കാലം നിർത്തി"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>, ഒരു സന്ദേശം അയച്ചു"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>, ഒരു ചിത്രം അയച്ചു"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"നിങ്ങളുടെ ബാറ്ററി മീറ്റർ വായിക്കുന്നതിൽ പ്രശ്നമുണ്ട്"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"കൂടുതൽ വിവരങ്ങൾക്ക് ടാപ്പ് ചെയ്യുക"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"അലാറം സജ്ജീകരിച്ചിട്ടില്ല"</string> diff --git a/packages/SystemUI/res/values-ml/tiles_states_strings.xml b/packages/SystemUI/res/values-ml/tiles_states_strings.xml new file mode 100644 index 000000000000..af2b960317cc --- /dev/null +++ b/packages/SystemUI/res/values-ml/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"ലഭ്യമല്ല"</item> + <item msgid="3048856902433862868">"ഓഫാണ്"</item> + <item msgid="6877982264300789870">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"ലഭ്യമല്ല"</item> + <item msgid="4293012229142257455">"ഓഫാണ്"</item> + <item msgid="6221288736127914861">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"ലഭ്യമല്ല"</item> + <item msgid="2074416252859094119">"ഓഫാണ്"</item> + <item msgid="287997784730044767">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"ലഭ്യമല്ല"</item> + <item msgid="7838121007534579872">"ഓഫാണ്"</item> + <item msgid="1578872232501319194">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"ലഭ്യമല്ല"</item> + <item msgid="5376619709702103243">"ഓഫാണ്"</item> + <item msgid="4875147066469902392">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"ലഭ്യമല്ല"</item> + <item msgid="5044688398303285224">"ഓഫാണ്"</item> + <item msgid="8527389108867454098">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"ലഭ്യമല്ല"</item> + <item msgid="5776427577477729185">"ഓഫാണ്"</item> + <item msgid="7105052717007227415">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"ലഭ്യമല്ല"</item> + <item msgid="5315121904534729843">"ഓഫാണ്"</item> + <item msgid="503679232285959074">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"ലഭ്യമല്ല"</item> + <item msgid="4801037224991420996">"ഓഫാണ്"</item> + <item msgid="1982293347302546665">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"ലഭ്യമല്ല"</item> + <item msgid="4813655083852587017">"ഓഫാണ്"</item> + <item msgid="6744077414775180687">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"ലഭ്യമല്ല"</item> + <item msgid="5715725170633593906">"ഓഫാണ്"</item> + <item msgid="2075645297847971154">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"ലഭ്യമല്ല"</item> + <item msgid="9103697205127645916">"ഓഫാണ്"</item> + <item msgid="8067744885820618230">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"ലഭ്യമല്ല"</item> + <item msgid="6983679487661600728">"ഓഫാണ്"</item> + <item msgid="7520663805910678476">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"ലഭ്യമല്ല"</item> + <item msgid="400477985171353">"ഓഫാണ്"</item> + <item msgid="630890598801118771">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"ലഭ്യമല്ല"</item> + <item msgid="8045580926543311193">"ഓഫാണ്"</item> + <item msgid="4913460972266982499">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"ലഭ്യമല്ല"</item> + <item msgid="1488620600954313499">"ഓഫാണ്"</item> + <item msgid="588467578853244035">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"ലഭ്യമല്ല"</item> + <item msgid="2744885441164350155">"ഓഫാണ്"</item> + <item msgid="151121227514952197">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"ലഭ്യമല്ല"</item> + <item msgid="8259411607272330225">"ഓഫാണ്"</item> + <item msgid="578444932039713369">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"ലഭ്യമല്ല"</item> + <item msgid="8707481475312432575">"ഓഫാണ്"</item> + <item msgid="8031106212477483874">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"ലഭ്യമല്ല"</item> + <item msgid="4572245614982283078">"ഓഫാണ്"</item> + <item msgid="6536448410252185664">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"ലഭ്യമല്ല"</item> + <item msgid="4765607635752003190">"ഓഫാണ്"</item> + <item msgid="1697460731949649844">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"ലഭ്യമല്ല"</item> + <item msgid="3296179158646568218">"ഓഫാണ്"</item> + <item msgid="8998632451221157987">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"ലഭ്യമല്ല"</item> + <item msgid="4544919905196727508">"ഓഫാണ്"</item> + <item msgid="3422023746567004609">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"ലഭ്യമല്ല"</item> + <item msgid="7571394439974244289">"ഓഫാണ്"</item> + <item msgid="6866424167599381915">"ഓണാണ്"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"ലഭ്യമല്ല"</item> + <item msgid="2710157085538036590">"ഓഫാണ്"</item> + <item msgid="7809470840976856149">"ഓണാണ്"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 900fbd8bf1ec..7e8d0cb5357d 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Утсаараа илүү хурдан, аюулгүй худалдан авалт хийхийн тулд тохируулгыг авна уу"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Бүгдийг харуулах"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Төлөхийн тулд түгжээг тайлна уу"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Тохируулаагүй"</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_device_locked" msgid="5175862019125370506">"Ашиглахын тулд түгжээг тайлах"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Таны картыг авахад асуудал гарлаа. Дараа дахин оролдоно уу"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Түгжигдсэн дэлгэцийн тохиргоо"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Харилцан яриаг нээх"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Харилцан ярианы жижиг хэрэгслүүд"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Үндсэн нүүрэндээ нэмэх харилцан яриаг товшино уу"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Таны сүүлийн харилцан яриа энд харагдана"</string> <string name="priority_conversations" msgid="3967482288896653039">"Чухал харилцан яриа"</string> <string name="recent_conversations" msgid="8531874684782574622">"Саяхны харилцан яриа"</string> <string name="okay" msgid="6490552955618608554">"За"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Саяхны мессеж, аваагүй дуудлага болон төлөвийн шинэчлэлтийг харах"</string> <string name="people_tile_title" msgid="6589377493334871272">"Харилцан яриа"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Бүү саад бол горимоор түр зогсоосон"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> мессеж илгээсэн"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> зураг илгээсэн"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Таны батарей хэмжигчийг уншихад асуудал гарлаа"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Нэмэлт мэдээлэл авахын тулд товшино уу"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Сэрүүлэг тавиагүй"</string> diff --git a/packages/SystemUI/res/values-mn/tiles_states_strings.xml b/packages/SystemUI/res/values-mn/tiles_states_strings.xml new file mode 100644 index 000000000000..47a42ffa2b9a --- /dev/null +++ b/packages/SystemUI/res/values-mn/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Боломжгүй"</item> + <item msgid="3048856902433862868">"Унтраалттай"</item> + <item msgid="6877982264300789870">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Боломжгүй"</item> + <item msgid="4293012229142257455">"Унтраалттай"</item> + <item msgid="6221288736127914861">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Боломжгүй"</item> + <item msgid="2074416252859094119">"Унтраалттай"</item> + <item msgid="287997784730044767">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Боломжгүй"</item> + <item msgid="7838121007534579872">"Унтраалттай"</item> + <item msgid="1578872232501319194">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Боломжгүй"</item> + <item msgid="5376619709702103243">"Унтраалттай"</item> + <item msgid="4875147066469902392">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Боломжгүй"</item> + <item msgid="5044688398303285224">"Унтраалттай"</item> + <item msgid="8527389108867454098">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Боломжгүй"</item> + <item msgid="5776427577477729185">"Унтраалттай"</item> + <item msgid="7105052717007227415">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Боломжгүй"</item> + <item msgid="5315121904534729843">"Унтраалттай"</item> + <item msgid="503679232285959074">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Боломжгүй"</item> + <item msgid="4801037224991420996">"Унтраалттай"</item> + <item msgid="1982293347302546665">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Боломжгүй"</item> + <item msgid="4813655083852587017">"Унтраалттай"</item> + <item msgid="6744077414775180687">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Боломжгүй"</item> + <item msgid="5715725170633593906">"Унтраалттай"</item> + <item msgid="2075645297847971154">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Боломжгүй"</item> + <item msgid="9103697205127645916">"Унтраалттай"</item> + <item msgid="8067744885820618230">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Боломжгүй"</item> + <item msgid="6983679487661600728">"Унтраалттай"</item> + <item msgid="7520663805910678476">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Боломжгүй"</item> + <item msgid="400477985171353">"Унтраалттай"</item> + <item msgid="630890598801118771">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Боломжгүй"</item> + <item msgid="8045580926543311193">"Унтраалттай"</item> + <item msgid="4913460972266982499">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Боломжгүй"</item> + <item msgid="1488620600954313499">"Унтраалттай"</item> + <item msgid="588467578853244035">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Боломжгүй"</item> + <item msgid="2744885441164350155">"Унтраалттай"</item> + <item msgid="151121227514952197">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Боломжгүй"</item> + <item msgid="8259411607272330225">"Унтраалттай"</item> + <item msgid="578444932039713369">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Боломжгүй"</item> + <item msgid="8707481475312432575">"Унтраалттай"</item> + <item msgid="8031106212477483874">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Боломжгүй"</item> + <item msgid="4572245614982283078">"Унтраалттай"</item> + <item msgid="6536448410252185664">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Боломжгүй"</item> + <item msgid="4765607635752003190">"Унтраалттай"</item> + <item msgid="1697460731949649844">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Боломжгүй"</item> + <item msgid="3296179158646568218">"Унтраалттай"</item> + <item msgid="8998632451221157987">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Боломжгүй"</item> + <item msgid="4544919905196727508">"Унтраалттай"</item> + <item msgid="3422023746567004609">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Боломжгүй"</item> + <item msgid="7571394439974244289">"Унтраалттай"</item> + <item msgid="6866424167599381915">"Асаалттай"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Боломжгүй"</item> + <item msgid="2710157085538036590">"Унтраалттай"</item> + <item msgid="7809470840976856149">"Асаалттай"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 5dd7abd86ab7..3aacd40558b2 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"तुमचा फोन वापरून जलदरीत्या, अधिक सुरक्षित खरेदी करण्यासाठी सेट करा"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"सर्व दाखवा"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"पैसे देण्यासाठी अनलॉक करा"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"सेट केलेले नाही"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <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> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"संभाषण उघडा"</string> <string name="select_conversation_title" msgid="6716364118095089519">"संभाषण विजेट"</string> <string name="select_conversation_text" msgid="3376048251434956013">"तुमच्या होम स्क्रीन वर संभाषण जोडण्यासाठी त्यावर टॅप करा"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"तुमची अलीकडील संभाषणे येथे दिसतील"</string> <string name="priority_conversations" msgid="3967482288896653039">"प्राधान्य दिलेली संभाषणे"</string> <string name="recent_conversations" msgid="8531874684782574622">"अलीकडील संभाषणे"</string> <string name="okay" msgid="6490552955618608554">"ओके"</string> @@ -1146,8 +1147,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"अलीकडील मेसेज, मिस्ड कॉल आणि स्टेटस अपडेट पाहा"</string> <string name="people_tile_title" msgid="6589377493334871272">"संभाषण"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"व्यत्यय आणू नका द्वारे थांबवले गेले"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> यांनी मेसेज पाठवला"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> यांनी इमेज पाठवली"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"तुमचे बॅटरी मीटर वाचताना समस्या आली"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"अधिक माहितीसाठी टॅप करा"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"अलार्म सेट केला नाही"</string> diff --git a/packages/SystemUI/res/values-mr/tiles_states_strings.xml b/packages/SystemUI/res/values-mr/tiles_states_strings.xml new file mode 100644 index 000000000000..4a638b5967ca --- /dev/null +++ b/packages/SystemUI/res/values-mr/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"उपलब्ध नाही"</item> + <item msgid="3048856902433862868">"बंद आहे"</item> + <item msgid="6877982264300789870">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"उपलब्ध नाही"</item> + <item msgid="4293012229142257455">"बंद आहे"</item> + <item msgid="6221288736127914861">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"उपलब्ध नाही"</item> + <item msgid="2074416252859094119">"बंद आहे"</item> + <item msgid="287997784730044767">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"उपलब्ध नाही"</item> + <item msgid="7838121007534579872">"बंद आहे"</item> + <item msgid="1578872232501319194">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"उपलब्ध नाही"</item> + <item msgid="5376619709702103243">"बंद आहे"</item> + <item msgid="4875147066469902392">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"उपलब्ध नाही"</item> + <item msgid="5044688398303285224">"बंद आहे"</item> + <item msgid="8527389108867454098">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"उपलब्ध नाही"</item> + <item msgid="5776427577477729185">"बंद आहे"</item> + <item msgid="7105052717007227415">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"उपलब्ध नाही"</item> + <item msgid="5315121904534729843">"बंद आहे"</item> + <item msgid="503679232285959074">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"उपलब्ध नाही"</item> + <item msgid="4801037224991420996">"बंद आहे"</item> + <item msgid="1982293347302546665">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"उपलब्ध नाही"</item> + <item msgid="4813655083852587017">"बंद आहे"</item> + <item msgid="6744077414775180687">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"उपलब्ध नाही"</item> + <item msgid="5715725170633593906">"बंद आहे"</item> + <item msgid="2075645297847971154">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"उपलब्ध नाही"</item> + <item msgid="9103697205127645916">"बंद आहे"</item> + <item msgid="8067744885820618230">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"उपलब्ध नाही"</item> + <item msgid="6983679487661600728">"बंद आहे"</item> + <item msgid="7520663805910678476">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"उपलब्ध नाही"</item> + <item msgid="400477985171353">"बंद आहे"</item> + <item msgid="630890598801118771">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"उपलब्ध नाही"</item> + <item msgid="8045580926543311193">"बंद आहे"</item> + <item msgid="4913460972266982499">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"उपलब्ध नाही"</item> + <item msgid="1488620600954313499">"बंद आहे"</item> + <item msgid="588467578853244035">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"उपलब्ध नाही"</item> + <item msgid="2744885441164350155">"बंद आहे"</item> + <item msgid="151121227514952197">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"उपलब्ध नाही"</item> + <item msgid="8259411607272330225">"बंद आहे"</item> + <item msgid="578444932039713369">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"उपलब्ध नाही"</item> + <item msgid="8707481475312432575">"बंद आहे"</item> + <item msgid="8031106212477483874">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"उपलब्ध नाही"</item> + <item msgid="4572245614982283078">"बंद आहे"</item> + <item msgid="6536448410252185664">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"उपलब्ध नाही"</item> + <item msgid="4765607635752003190">"बंद आहे"</item> + <item msgid="1697460731949649844">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"उपलब्ध नाही"</item> + <item msgid="3296179158646568218">"बंद आहे"</item> + <item msgid="8998632451221157987">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"उपलब्ध नाही"</item> + <item msgid="4544919905196727508">"बंद आहे"</item> + <item msgid="3422023746567004609">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"उपलब्ध नाही"</item> + <item msgid="7571394439974244289">"बंद आहे"</item> + <item msgid="6866424167599381915">"सुरू आहे"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"उपलब्ध नाही"</item> + <item msgid="2710157085538036590">"बंद आहे"</item> + <item msgid="7809470840976856149">"सुरू आहे"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 28ad7a7473b8..9295805f3f80 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Buat persediaan untuk membuat pembelian yang lebih pantas dan selamat dengan telefon anda"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Tunjukkan semua"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Buka kunci untuk membayar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Tidak disediakan"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Tambahkan kad"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Mengemas kini"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Buka kunci untuk menggunakan"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Terdapat masalah sewaktu mendapatkan kad anda. Sila cuba sebentar lagi"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Tetapan skrin kunci"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Buka perbualan"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widget perbualan"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Ketik perbualan untuk menambahkan perbualan itu pada skrin Utama anda"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Perbualan terbaharu anda akan dipaparkan di sini"</string> <string name="priority_conversations" msgid="3967482288896653039">"Perbualan keutamaan"</string> <string name="recent_conversations" msgid="8531874684782574622">"Perbualan terbaharu"</string> <string name="okay" msgid="6490552955618608554">"Okey"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Lihat mesej terbaharu, panggilan terlepas dan kemaskinian status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Perbualan"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Dijeda oleh Jangan Ganggu"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> menghantar mesej"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> menghantar imej"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Masalah membaca meter bateri anda"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Ketik untuk mendapatkan maklumat lanjut"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Tiada penggera"</string> diff --git a/packages/SystemUI/res/values-ms/tiles_states_strings.xml b/packages/SystemUI/res/values-ms/tiles_states_strings.xml new file mode 100644 index 000000000000..93d4e6d7ebac --- /dev/null +++ b/packages/SystemUI/res/values-ms/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Tidak tersedia"</item> + <item msgid="3048856902433862868">"Mati"</item> + <item msgid="6877982264300789870">"Hidup"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Tidak tersedia"</item> + <item msgid="4293012229142257455">"Mati"</item> + <item msgid="6221288736127914861">"Hidup"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Tidak tersedia"</item> + <item msgid="2074416252859094119">"Mati"</item> + <item msgid="287997784730044767">"Hidup"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Tidak tersedia"</item> + <item msgid="7838121007534579872">"Mati"</item> + <item msgid="1578872232501319194">"Hidup"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Tidak tersedia"</item> + <item msgid="5376619709702103243">"Mati"</item> + <item msgid="4875147066469902392">"Hidup"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Tidak tersedia"</item> + <item msgid="5044688398303285224">"Mati"</item> + <item msgid="8527389108867454098">"Hidup"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Tidak tersedia"</item> + <item msgid="5776427577477729185">"Mati"</item> + <item msgid="7105052717007227415">"Hidup"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Tidak tersedia"</item> + <item msgid="5315121904534729843">"Mati"</item> + <item msgid="503679232285959074">"Hidup"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Tidak tersedia"</item> + <item msgid="4801037224991420996">"Mati"</item> + <item msgid="1982293347302546665">"Hidup"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Tidak tersedia"</item> + <item msgid="4813655083852587017">"Mati"</item> + <item msgid="6744077414775180687">"Hidup"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Tidak tersedia"</item> + <item msgid="5715725170633593906">"Mati"</item> + <item msgid="2075645297847971154">"Hidup"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Tidak tersedia"</item> + <item msgid="9103697205127645916">"Mati"</item> + <item msgid="8067744885820618230">"Hidup"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Tidak tersedia"</item> + <item msgid="6983679487661600728">"Mati"</item> + <item msgid="7520663805910678476">"Hidup"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Tidak tersedia"</item> + <item msgid="400477985171353">"Mati"</item> + <item msgid="630890598801118771">"Hidup"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Tidak tersedia"</item> + <item msgid="8045580926543311193">"Mati"</item> + <item msgid="4913460972266982499">"Hidup"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Tidak tersedia"</item> + <item msgid="1488620600954313499">"Mati"</item> + <item msgid="588467578853244035">"Hidup"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Tidak tersedia"</item> + <item msgid="2744885441164350155">"Mati"</item> + <item msgid="151121227514952197">"Hidup"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Tidak tersedia"</item> + <item msgid="8259411607272330225">"Mati"</item> + <item msgid="578444932039713369">"Hidup"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Tidak tersedia"</item> + <item msgid="8707481475312432575">"Mati"</item> + <item msgid="8031106212477483874">"Hidup"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Tidak tersedia"</item> + <item msgid="4572245614982283078">"Mati"</item> + <item msgid="6536448410252185664">"Hidup"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Tidak tersedia"</item> + <item msgid="4765607635752003190">"Mati"</item> + <item msgid="1697460731949649844">"Hidup"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Tidak tersedia"</item> + <item msgid="3296179158646568218">"Mati"</item> + <item msgid="8998632451221157987">"Hidup"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Tidak tersedia"</item> + <item msgid="4544919905196727508">"Mati"</item> + <item msgid="3422023746567004609">"Hidup"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Tidak tersedia"</item> + <item msgid="7571394439974244289">"Mati"</item> + <item msgid="6866424167599381915">"Hidup"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Tidak tersedia"</item> + <item msgid="2710157085538036590">"Mati"</item> + <item msgid="7809470840976856149">"Hidup"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 2e3db1048e12..c6a64d5f897c 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"သင့်ဖုန်းဖြင့် ပိုမိုမြန်ဆန်၊ ပိုမိုစိတ်ချရသော ဝယ်ယူမှုများ ပြုလုပ်ရန် စတင်သတ်မှတ်ပါ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"အားလုံးပြရန်"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ငွေပေးချေရန် လော့ခ်ဖွင့်ပါ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"စနစ် ထည့်သွင်းမထားပါ"</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_device_locked" msgid="5175862019125370506">"သုံးရန် လော့ခ်ဖွင့်ပါ"</string> <string name="wallet_error_generic" msgid="257704570182963611">"သင်၏ကတ်များ ရယူရာတွင် ပြဿနာရှိနေသည်၊ နောက်မှ ထပ်စမ်းကြည့်ပါ"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"လော့ခ်မျက်နှာပြင် ဆက်တင်များ"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"စကားဝိုင်းကို ဖွင့်ရန်"</string> <string name="select_conversation_title" msgid="6716364118095089519">"စကားဝိုင်း ဝိဂျက်များ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"စကားဝိုင်းကို သင်၏ ‘ပင်မစာမျက်နှာ’ သို့ထည့်ရန် တို့ပါ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"သင်၏မကြာသေးမီက စကားဝိုင်းများကို ဤနေရာတွင် ပြပါမည်"</string> <string name="priority_conversations" msgid="3967482288896653039">"ဦးစားပေး စကားဝိုင်းများ"</string> <string name="recent_conversations" msgid="8531874684782574622">"မကြာသေးမီက စကားဝိုင်းများ"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"မကြာသေးမီက မက်ဆေ့ဂျ်၊ လွတ်သွားသောခေါ်ဆိုမှုနှင့် အခြေအနေအပ်ဒိတ်များကို ကြည့်နိုင်သည်"</string> <string name="people_tile_title" msgid="6589377493334871272">"စကားဝိုင်း"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"‘မနှောင့်ယှက်ရ’ ဖြင့် ခဏရပ်ထားသည်"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> က မက်ဆေ့ဂျ်ပို့လိုက်သည်"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> က ပုံပို့လိုက်သည်"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"သင်၏ ဘက်ထရီမီတာကို ဖတ်ရာတွင် ပြဿနာရှိနေသည်"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"နောက်ထပ်အချက်အလက်များအတွက် တို့ပါ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"နှိုးစက်ပေးမထားပါ"</string> diff --git a/packages/SystemUI/res/values-my/tiles_states_strings.xml b/packages/SystemUI/res/values-my/tiles_states_strings.xml new file mode 100644 index 000000000000..3adb16e0ff14 --- /dev/null +++ b/packages/SystemUI/res/values-my/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"မရနိုင်ပါ"</item> + <item msgid="3048856902433862868">"ပိတ်"</item> + <item msgid="6877982264300789870">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"မရနိုင်ပါ"</item> + <item msgid="4293012229142257455">"ပိတ်"</item> + <item msgid="6221288736127914861">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"မရနိုင်ပါ"</item> + <item msgid="2074416252859094119">"ပိတ်"</item> + <item msgid="287997784730044767">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"မရနိုင်ပါ"</item> + <item msgid="7838121007534579872">"ပိတ်"</item> + <item msgid="1578872232501319194">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"မရနိုင်ပါ"</item> + <item msgid="5376619709702103243">"ပိတ်"</item> + <item msgid="4875147066469902392">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"မရနိုင်ပါ"</item> + <item msgid="5044688398303285224">"ပိတ်"</item> + <item msgid="8527389108867454098">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"မရနိုင်ပါ"</item> + <item msgid="5776427577477729185">"ပိတ်"</item> + <item msgid="7105052717007227415">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"မရနိုင်ပါ"</item> + <item msgid="5315121904534729843">"ပိတ်"</item> + <item msgid="503679232285959074">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"မရနိုင်ပါ"</item> + <item msgid="4801037224991420996">"ပိတ်"</item> + <item msgid="1982293347302546665">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"မရနိုင်ပါ"</item> + <item msgid="4813655083852587017">"ပိတ်"</item> + <item msgid="6744077414775180687">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"မရနိုင်ပါ"</item> + <item msgid="5715725170633593906">"ပိတ်"</item> + <item msgid="2075645297847971154">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"မရနိုင်ပါ"</item> + <item msgid="9103697205127645916">"ပိတ်"</item> + <item msgid="8067744885820618230">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"မရနိုင်ပါ"</item> + <item msgid="6983679487661600728">"ပိတ်"</item> + <item msgid="7520663805910678476">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"မရနိုင်ပါ"</item> + <item msgid="400477985171353">"ပိတ်"</item> + <item msgid="630890598801118771">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"မရနိုင်ပါ"</item> + <item msgid="8045580926543311193">"ပိတ်"</item> + <item msgid="4913460972266982499">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"မရနိုင်ပါ"</item> + <item msgid="1488620600954313499">"ပိတ်"</item> + <item msgid="588467578853244035">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"မရနိုင်ပါ"</item> + <item msgid="2744885441164350155">"ပိတ်"</item> + <item msgid="151121227514952197">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"မရနိုင်ပါ"</item> + <item msgid="8259411607272330225">"ပိတ်"</item> + <item msgid="578444932039713369">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"မရနိုင်ပါ"</item> + <item msgid="8707481475312432575">"ပိတ်"</item> + <item msgid="8031106212477483874">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"မရနိုင်ပါ"</item> + <item msgid="4572245614982283078">"ပိတ်"</item> + <item msgid="6536448410252185664">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"မရနိုင်ပါ"</item> + <item msgid="4765607635752003190">"ပိတ်"</item> + <item msgid="1697460731949649844">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"မရနိုင်ပါ"</item> + <item msgid="3296179158646568218">"ပိတ်"</item> + <item msgid="8998632451221157987">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"မရနိုင်ပါ"</item> + <item msgid="4544919905196727508">"ပိတ်"</item> + <item msgid="3422023746567004609">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"မရနိုင်ပါ"</item> + <item msgid="7571394439974244289">"ပိတ်"</item> + <item msgid="6866424167599381915">"ဖွင့်"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"မရနိုင်ပါ"</item> + <item msgid="2710157085538036590">"ပိတ်"</item> + <item msgid="7809470840976856149">"ဖွင့်"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index c549debf9e3f..2c0eaf77ad30 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Legg til en betalingsmåte for å gjennomføre kjøp raskere og sikrere med telefonen"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Vis alle"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Lås opp for å betale"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ikke konfigurert"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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_lockscreen_settings_label" msgid="3539105300870383570">"Innstillinger for låseskjermen"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Åpen samtale"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Samtalemoduler"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Trykk på en samtale for å legge den til på startskjermen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"De nylige samtalene dine vises her"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriterte samtaler"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nylige samtaler"</string> <string name="okay" msgid="6490552955618608554">"Ok"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Se nylige meldinger, tapte anrop og statusoppdateringer"</string> <string name="people_tile_title" msgid="6589377493334871272">"Samtale"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Satt på pause av «Ikke forstyrr»"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> har sendt en melding"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> har sendt et bilde"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Kunne ikke lese batterimåleren"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Trykk for å få mer informasjon"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ingen alarm angitt"</string> diff --git a/packages/SystemUI/res/values-nb/tiles_states_strings.xml b/packages/SystemUI/res/values-nb/tiles_states_strings.xml new file mode 100644 index 000000000000..8ebe050b8a36 --- /dev/null +++ b/packages/SystemUI/res/values-nb/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Utilgjengelig"</item> + <item msgid="3048856902433862868">"Av"</item> + <item msgid="6877982264300789870">"På"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Utilgjengelig"</item> + <item msgid="4293012229142257455">"Av"</item> + <item msgid="6221288736127914861">"På"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Utilgjengelig"</item> + <item msgid="2074416252859094119">"Av"</item> + <item msgid="287997784730044767">"På"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Utilgjengelig"</item> + <item msgid="7838121007534579872">"Av"</item> + <item msgid="1578872232501319194">"På"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Utilgjengelig"</item> + <item msgid="5376619709702103243">"Av"</item> + <item msgid="4875147066469902392">"På"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Utilgjengelig"</item> + <item msgid="5044688398303285224">"Av"</item> + <item msgid="8527389108867454098">"På"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Utilgjengelig"</item> + <item msgid="5776427577477729185">"Av"</item> + <item msgid="7105052717007227415">"På"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Utilgjengelig"</item> + <item msgid="5315121904534729843">"Av"</item> + <item msgid="503679232285959074">"På"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Utilgjengelig"</item> + <item msgid="4801037224991420996">"Av"</item> + <item msgid="1982293347302546665">"På"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Utilgjengelig"</item> + <item msgid="4813655083852587017">"Av"</item> + <item msgid="6744077414775180687">"På"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Utilgjengelig"</item> + <item msgid="5715725170633593906">"Av"</item> + <item msgid="2075645297847971154">"På"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Utilgjengelig"</item> + <item msgid="9103697205127645916">"Av"</item> + <item msgid="8067744885820618230">"På"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Utilgjengelig"</item> + <item msgid="6983679487661600728">"Av"</item> + <item msgid="7520663805910678476">"På"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Utilgjengelig"</item> + <item msgid="400477985171353">"Av"</item> + <item msgid="630890598801118771">"På"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Utilgjengelig"</item> + <item msgid="8045580926543311193">"Av"</item> + <item msgid="4913460972266982499">"På"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Utilgjengelig"</item> + <item msgid="1488620600954313499">"Av"</item> + <item msgid="588467578853244035">"På"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Utilgjengelig"</item> + <item msgid="2744885441164350155">"Av"</item> + <item msgid="151121227514952197">"På"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Utilgjengelig"</item> + <item msgid="8259411607272330225">"Av"</item> + <item msgid="578444932039713369">"På"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Utilgjengelig"</item> + <item msgid="8707481475312432575">"Av"</item> + <item msgid="8031106212477483874">"På"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Utilgjengelig"</item> + <item msgid="4572245614982283078">"Av"</item> + <item msgid="6536448410252185664">"På"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Utilgjengelig"</item> + <item msgid="4765607635752003190">"Av"</item> + <item msgid="1697460731949649844">"På"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Utilgjengelig"</item> + <item msgid="3296179158646568218">"Av"</item> + <item msgid="8998632451221157987">"På"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Utilgjengelig"</item> + <item msgid="4544919905196727508">"Av"</item> + <item msgid="3422023746567004609">"På"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Utilgjengelig"</item> + <item msgid="7571394439974244289">"Av"</item> + <item msgid="6866424167599381915">"På"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Utilgjengelig"</item> + <item msgid="2710157085538036590">"Av"</item> + <item msgid="7809470840976856149">"På"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index b9ef04f2cbbc..31b7a70c3066 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"फोनमार्फत अझ छिटो र थप सुरक्षित तरिकाले खरिद गर्न भुक्तानी विधि सेटअप गर्नुहोस्"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"सबै देखाइयोस्"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"भुक्तानी गर्न अनलक गर्नुहोस्"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"सेटअप गरिएको छैन"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"वार्तालाप खोल्नुहोस्"</string> <string name="select_conversation_title" msgid="6716364118095089519">"वार्तालापसम्बन्धी विजेटहरू"</string> <string name="select_conversation_text" msgid="3376048251434956013">"कुनै वार्तालाप होम स्क्रिनमा हाल्न उक्त वार्तालापमा ट्याप गर्नुहोस्"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"तपाईंले हालसालै गर्नुभएका वार्तालापहरू यहाँ देखिने छन्"</string> <string name="priority_conversations" msgid="3967482288896653039">"महत्त्वपूर्ण वार्तालापहरू"</string> <string name="recent_conversations" msgid="8531874684782574622">"हालसालैका वार्तालापहरू"</string> <string name="okay" msgid="6490552955618608554">"ठिक छ"</string> @@ -1145,10 +1147,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"हालसालैका म्यासेज, मिस कल र स्ट्याटस अपडेट हेर्नुहोस्"</string> <string name="people_tile_title" msgid="6589377493334871272">"वार्तालाप"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'बाधा नपुऱ्याउनुहोस्\' ले पज गरेको छ"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ले एउटा म्यासेज पठाउनुभयो"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ले एउटा फोटो पठाउनुभयो"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"डिभाइसको ब्याट्रीको मिटर रिडिङ क्रममा समस्या भयो"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"थप जानकारी प्राप्त गर्न ट्याप गर्नुहोस्"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"अलार्म राखिएको छैन"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 07decdf1c71e..3626c8efe846 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -136,7 +136,7 @@ <string name="accessibility_camera_button" msgid="2938898391716647247">"Camera"</string> <string name="accessibility_phone_button" msgid="4256353121703100427">"Telefoon"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"Spraakassistent"</string> - <string name="accessibility_wallet_button" msgid="1458258783460555507">"Wallet"</string> + <string name="accessibility_wallet_button" msgid="1458258783460555507">"Portemonnee"</string> <string name="accessibility_unlock_button" msgid="122785427241471085">"Ontgrendelen"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"Apparaat vergrendeld"</string> <string name="accessibility_waiting_for_fingerprint" msgid="5209142744692162598">"Wachten op vingerafdruk"</string> @@ -665,11 +665,12 @@ <string name="show_demo_mode" msgid="3677956462273059726">"Demomodus tonen"</string> <string name="status_bar_ethernet" msgid="5690979758988647484">"Ethernet"</string> <string name="status_bar_alarm" msgid="87160847643623352">"Wekker"</string> - <string name="wallet_title" msgid="5369767670735827105">"Wallet"</string> + <string name="wallet_title" msgid="5369767670735827105">"Portemonnee"</string> <string name="wallet_empty_state_label" msgid="7776761245237530394">"Zorg dat je sneller en beter beveiligd aankopen kunt doen met je telefoon"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Alles tonen"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ontgrendelen om te betalen"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Niet ingesteld"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Kaart toevoegen"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Updaten"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Ontgrendelen om te gebruiken"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Er is een probleem opgetreden bij het ophalen van je kaarten. Probeer het later opnieuw."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Instellingen voor vergrendelscherm"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Gesprek openen"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Gesprekswidgets"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tik op een gesprek om het toe te voegen aan je startscherm"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Je ziet je recente gesprekken hier"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriteitsgesprekken"</string> <string name="recent_conversations" msgid="8531874684782574622">"Recente gesprekken"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Bekijk recente berichten, gemiste gesprekken en statusupdates"</string> <string name="people_tile_title" msgid="6589377493334871272">"Gesprek"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Onderbroken door Niet storen"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> heeft een bericht gestuurd"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> heeft een afbeelding gestuurd"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Probleem bij het lezen van je batterijmeter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tik hier voor meer informatie"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Geen wekker gezet"</string> diff --git a/packages/SystemUI/res/values-nl/tiles_states_strings.xml b/packages/SystemUI/res/values-nl/tiles_states_strings.xml new file mode 100644 index 000000000000..06b1048d04bf --- /dev/null +++ b/packages/SystemUI/res/values-nl/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Niet beschikbaar"</item> + <item msgid="3048856902433862868">"Uit"</item> + <item msgid="6877982264300789870">"Aan"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Niet beschikbaar"</item> + <item msgid="4293012229142257455">"Uit"</item> + <item msgid="6221288736127914861">"Aan"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Niet beschikbaar"</item> + <item msgid="2074416252859094119">"Uit"</item> + <item msgid="287997784730044767">"Aan"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Niet beschikbaar"</item> + <item msgid="7838121007534579872">"Uit"</item> + <item msgid="1578872232501319194">"Aan"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Niet beschikbaar"</item> + <item msgid="5376619709702103243">"Uit"</item> + <item msgid="4875147066469902392">"Aan"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Niet beschikbaar"</item> + <item msgid="5044688398303285224">"Uit"</item> + <item msgid="8527389108867454098">"Aan"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Niet beschikbaar"</item> + <item msgid="5776427577477729185">"Uit"</item> + <item msgid="7105052717007227415">"Aan"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Niet beschikbaar"</item> + <item msgid="5315121904534729843">"Uit"</item> + <item msgid="503679232285959074">"Aan"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Niet beschikbaar"</item> + <item msgid="4801037224991420996">"Uit"</item> + <item msgid="1982293347302546665">"Aan"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Niet beschikbaar"</item> + <item msgid="4813655083852587017">"Uit"</item> + <item msgid="6744077414775180687">"Aan"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Niet beschikbaar"</item> + <item msgid="5715725170633593906">"Uit"</item> + <item msgid="2075645297847971154">"Aan"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Niet beschikbaar"</item> + <item msgid="9103697205127645916">"Uit"</item> + <item msgid="8067744885820618230">"Aan"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Niet beschikbaar"</item> + <item msgid="6983679487661600728">"Uit"</item> + <item msgid="7520663805910678476">"Aan"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Niet beschikbaar"</item> + <item msgid="400477985171353">"Uit"</item> + <item msgid="630890598801118771">"Aan"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Niet beschikbaar"</item> + <item msgid="8045580926543311193">"Uit"</item> + <item msgid="4913460972266982499">"Aan"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Niet beschikbaar"</item> + <item msgid="1488620600954313499">"Uit"</item> + <item msgid="588467578853244035">"Aan"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Niet beschikbaar"</item> + <item msgid="2744885441164350155">"Uit"</item> + <item msgid="151121227514952197">"Aan"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Niet beschikbaar"</item> + <item msgid="8259411607272330225">"Uit"</item> + <item msgid="578444932039713369">"Aan"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Niet beschikbaar"</item> + <item msgid="8707481475312432575">"Uit"</item> + <item msgid="8031106212477483874">"Aan"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Niet beschikbaar"</item> + <item msgid="4572245614982283078">"Uit"</item> + <item msgid="6536448410252185664">"Aan"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Niet beschikbaar"</item> + <item msgid="4765607635752003190">"Uit"</item> + <item msgid="1697460731949649844">"Aan"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Niet beschikbaar"</item> + <item msgid="3296179158646568218">"Uit"</item> + <item msgid="8998632451221157987">"Aan"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Niet beschikbaar"</item> + <item msgid="4544919905196727508">"Uit"</item> + <item msgid="3422023746567004609">"Aan"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Niet beschikbaar"</item> + <item msgid="7571394439974244289">"Uit"</item> + <item msgid="6866424167599381915">"Aan"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Niet beschikbaar"</item> + <item msgid="2710157085538036590">"Uit"</item> + <item msgid="7809470840976856149">"Aan"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index f4b3b3ea5d59..b7098df09a61 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ଆପଣଙ୍କ ଫୋନ୍ ମାଧ୍ୟମରେ ଆହୁରି ଶୀଘ୍ର, ଅଧିକ ସୁରକ୍ଷିତ କ୍ରୟ କରିବା ପାଇଁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ସବୁ ଦେଖାନ୍ତୁ"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ପେମେଣ୍ଟ କରିବାକୁ ଅନଲକ୍ କରନ୍ତୁ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ସେଟ୍ ଅପ୍ କରାଯାଇନାହିଁ"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"ବାର୍ତ୍ତାଳାପ ଖୋଲନ୍ତୁ"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ବାର୍ତ୍ତାଳାପ ୱିଜେଟଗୁଡ଼ିକ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ଏକ ବାର୍ତ୍ତାଳାପକୁ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ଯୋଗ କରିବା ପାଇଁ ସେଥିରେ ଟାପ୍ କରନ୍ତୁ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ"</string> <string name="priority_conversations" msgid="3967482288896653039">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> <string name="recent_conversations" msgid="8531874684782574622">"ବର୍ତ୍ତମାନର ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string> <string name="okay" msgid="6490552955618608554">"ଠିକ୍ ଅଛି"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"ବର୍ତ୍ତମାନର ମେସେଜ୍, ମିସ୍ଡ କଲ୍ ଏବଂ ସ୍ଥିତି ଅପଡେଟଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ବାର୍ତ୍ତାଳାପ"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଦ୍ୱାରା ବିରତ କରାଯାଇଛି"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ମେସେଜ୍ ପଠାଇଛନ୍ତି"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ଏକ ଛବି ପଠାଇଛନ୍ତି"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ଅଧିକ ସୂଚନା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ଆଲାରାମ ସେଟ୍ ହୋଇନାହିଁ"</string> diff --git a/packages/SystemUI/res/values-or/tiles_states_strings.xml b/packages/SystemUI/res/values-or/tiles_states_strings.xml new file mode 100644 index 000000000000..7129c1195c1a --- /dev/null +++ b/packages/SystemUI/res/values-or/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="3048856902433862868">"ବନ୍ଦ ଅଛି"</item> + <item msgid="6877982264300789870">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4293012229142257455">"ବନ୍ଦ ଅଛି"</item> + <item msgid="6221288736127914861">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="2074416252859094119">"ବନ୍ଦ ଅଛି"</item> + <item msgid="287997784730044767">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="7838121007534579872">"ବନ୍ଦ ଅଛି"</item> + <item msgid="1578872232501319194">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="5376619709702103243">"ବନ୍ଦ ଅଛି"</item> + <item msgid="4875147066469902392">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="5044688398303285224">"ବନ୍ଦ ଅଛି"</item> + <item msgid="8527389108867454098">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="5776427577477729185">"ବନ୍ଦ ଅଛି"</item> + <item msgid="7105052717007227415">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="5315121904534729843">"ବନ୍ଦ ଅଛି"</item> + <item msgid="503679232285959074">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4801037224991420996">"ବନ୍ଦ ଅଛି"</item> + <item msgid="1982293347302546665">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4813655083852587017">"ବନ୍ଦ ଅଛି"</item> + <item msgid="6744077414775180687">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="5715725170633593906">"ବନ୍ଦ ଅଛି"</item> + <item msgid="2075645297847971154">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="9103697205127645916">"ବନ୍ଦ ଅଛି"</item> + <item msgid="8067744885820618230">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="6983679487661600728">"ବନ୍ଦ ଅଛି"</item> + <item msgid="7520663805910678476">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="400477985171353">"ବନ୍ଦ ଅଛି"</item> + <item msgid="630890598801118771">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="8045580926543311193">"ବନ୍ଦ ଅଛି"</item> + <item msgid="4913460972266982499">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="1488620600954313499">"ବନ୍ଦ ଅଛି"</item> + <item msgid="588467578853244035">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="2744885441164350155">"ବନ୍ଦ ଅଛି"</item> + <item msgid="151121227514952197">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="8259411607272330225">"ବନ୍ଦ ଅଛି"</item> + <item msgid="578444932039713369">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="8707481475312432575">"ବନ୍ଦ ଅଛି"</item> + <item msgid="8031106212477483874">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4572245614982283078">"ବନ୍ଦ ଅଛି"</item> + <item msgid="6536448410252185664">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4765607635752003190">"ବନ୍ଦ ଅଛି"</item> + <item msgid="1697460731949649844">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="3296179158646568218">"ବନ୍ଦ ଅଛି"</item> + <item msgid="8998632451221157987">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="4544919905196727508">"ବନ୍ଦ ଅଛି"</item> + <item msgid="3422023746567004609">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="7571394439974244289">"ବନ୍ଦ ଅଛି"</item> + <item msgid="6866424167599381915">"ଚାଲୁ ଅଛି"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"ଉପଲବ୍ଧ ନାହିଁ"</item> + <item msgid="2710157085538036590">"ବନ୍ଦ ଅଛି"</item> + <item msgid="7809470840976856149">"ଚାଲୁ ଅଛି"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 7f96ea816321..699fd8fc881a 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ਆਪਣੇ ਫ਼ੋਨ ਨਾਲ ਜ਼ਿਆਦਾ ਤੇਜ਼ ਅਤੇ ਜ਼ਿਆਦਾ ਸੁਰੱਖਿਅਤ ਖਰੀਦਾਂ ਕਰਨ ਲਈ ਸੈੱਟਅੱਪ ਕਰੋ"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"ਸਭ ਦਿਖਾਓ"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ਭੁਗਤਾਨ ਕਰਨ ਲਈ ਅਣਲਾਕ ਕਰੋ"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ਸੈੱਟਅੱਪ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <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> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"</string> <string name="select_conversation_title" msgid="6716364118095089519">"ਗੱਲਬਾਤ ਵਿਜੇਟ"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕੋਈ ਗੱਲਬਾਤ ਚੁਣੋ"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ਤੁਹਾਡੀਆਂ ਹਾਲੀਆ ਗੱਲਾਂਬਾਤਾਂ ਇੱਥੇ ਦਿਸਣਗੀਆਂ"</string> <string name="priority_conversations" msgid="3967482288896653039">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string> <string name="recent_conversations" msgid="8531874684782574622">"ਹਾਲੀਆ ਗੱਲਾਂਬਾਤਾਂ"</string> <string name="okay" msgid="6490552955618608554">"ਠੀਕ ਹੈ"</string> @@ -1145,10 +1146,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ਹਾਲੀਆ ਸੁਨੇਹੇ, ਮਿਸ ਕਾਲਾਂ ਅਤੇ ਸਥਿਤੀ ਸੰਬੰਧੀ ਅੱਪਡੇਟ ਦੇਖੋ"</string> <string name="people_tile_title" msgid="6589377493334871272">"ਗੱਲਬਾਤ"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਵਿਸ਼ੇਸ਼ਤਾ ਨੇ ਰੋਕ ਦਿੱਤਾ"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਿਆ"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ਨੇ ਇੱਕ ਚਿੱਤਰ ਭੇਜਿਆ ਹੈ"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ਕੋਈ ਅਲਾਰਮ ਸੈੱਟ ਨਹੀਂ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 51a9f3786384..04587655d5f5 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Skonfiguruj formę płatności, aby szybciej i bezpieczniej płacić telefonem za zakupy"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Pokaż wszystko"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Odblokuj, aby zapłacić"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nie skonfigurowano"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odblokuj, aby użyć"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Podczas pobierania kart wystąpił problem. Spróbuj ponownie później."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Ustawienia ekranu blokady"</string> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otwarta rozmowa"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widżety Rozmowa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Kliknij rozmowę, aby dodać ją do ekranu głównego"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Tutaj będą pojawiać się Twoje ostatnie rozmowy"</string> <string name="priority_conversations" msgid="3967482288896653039">"Rozmowy priorytetowe"</string> <string name="recent_conversations" msgid="8531874684782574622">"Ostatnie rozmowy"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Zobacz ostatnie wiadomości, nieodebrane połączenia i stany"</string> <string name="people_tile_title" msgid="6589377493334871272">"Rozmowa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Wstrzymane przez tryb Nie przeszkadzać"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> wysyła wiadomość"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> wysyła zdjęcie"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem z odczytaniem pomiaru wykorzystania baterii"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Kliknij, aby uzyskać więcej informacji"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nie ustawiono alarmu"</string> diff --git a/packages/SystemUI/res/values-pl/tiles_states_strings.xml b/packages/SystemUI/res/values-pl/tiles_states_strings.xml new file mode 100644 index 000000000000..1b213b300af5 --- /dev/null +++ b/packages/SystemUI/res/values-pl/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Niedostępny"</item> + <item msgid="3048856902433862868">"Wyłączony"</item> + <item msgid="6877982264300789870">"Włączony"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Niedostępny"</item> + <item msgid="4293012229142257455">"Wyłączony"</item> + <item msgid="6221288736127914861">"Włączony"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Niedostępny"</item> + <item msgid="2074416252859094119">"Wyłączony"</item> + <item msgid="287997784730044767">"Włączony"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Niedostępny"</item> + <item msgid="7838121007534579872">"Wyłączony"</item> + <item msgid="1578872232501319194">"Włączony"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Niedostępny"</item> + <item msgid="5376619709702103243">"Wyłączony"</item> + <item msgid="4875147066469902392">"Włączony"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Niedostępny"</item> + <item msgid="5044688398303285224">"Wyłączony"</item> + <item msgid="8527389108867454098">"Włączony"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Niedostępny"</item> + <item msgid="5776427577477729185">"Wyłączony"</item> + <item msgid="7105052717007227415">"Włączony"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Niedostępny"</item> + <item msgid="5315121904534729843">"Wyłączony"</item> + <item msgid="503679232285959074">"Włączony"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Niedostępny"</item> + <item msgid="4801037224991420996">"Wyłączony"</item> + <item msgid="1982293347302546665">"Włączony"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Niedostępny"</item> + <item msgid="4813655083852587017">"Wyłączony"</item> + <item msgid="6744077414775180687">"Włączony"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Niedostępny"</item> + <item msgid="5715725170633593906">"Wyłączony"</item> + <item msgid="2075645297847971154">"Włączony"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Niedostępny"</item> + <item msgid="9103697205127645916">"Wyłączony"</item> + <item msgid="8067744885820618230">"Włączony"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Niedostępny"</item> + <item msgid="6983679487661600728">"Wyłączony"</item> + <item msgid="7520663805910678476">"Włączony"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Niedostępny"</item> + <item msgid="400477985171353">"Wyłączony"</item> + <item msgid="630890598801118771">"Włączony"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Niedostępny"</item> + <item msgid="8045580926543311193">"Wyłączony"</item> + <item msgid="4913460972266982499">"Włączony"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Niedostępny"</item> + <item msgid="1488620600954313499">"Wyłączony"</item> + <item msgid="588467578853244035">"Włączony"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Niedostępny"</item> + <item msgid="2744885441164350155">"Wyłączony"</item> + <item msgid="151121227514952197">"Włączony"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Niedostępny"</item> + <item msgid="8259411607272330225">"Wyłączony"</item> + <item msgid="578444932039713369">"Włączony"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Niedostępny"</item> + <item msgid="8707481475312432575">"Wyłączony"</item> + <item msgid="8031106212477483874">"Włączony"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Niedostępny"</item> + <item msgid="4572245614982283078">"Wyłączony"</item> + <item msgid="6536448410252185664">"Włączony"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Niedostępny"</item> + <item msgid="4765607635752003190">"Wyłączony"</item> + <item msgid="1697460731949649844">"Włączony"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Niedostępny"</item> + <item msgid="3296179158646568218">"Wyłączony"</item> + <item msgid="8998632451221157987">"Włączony"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Niedostępny"</item> + <item msgid="4544919905196727508">"Wyłączony"</item> + <item msgid="3422023746567004609">"Włączony"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Niedostępny"</item> + <item msgid="7571394439974244289">"Wyłączony"</item> + <item msgid="6866424167599381915">"Włączony"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Niedostępny"</item> + <item msgid="2710157085538036590">"Wyłączony"</item> + <item msgid="7809470840976856149">"Włączony"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 1d7ba07d3d15..e3bd8c7a60cf 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Prepare tudo para fazer compras mais rápidas e seguras com seu smartphone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar tudo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloqueie para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Dispositivos não configurados"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Adicionar um cartão"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Atualizando"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Ocorreu um problema ao carregar os cards. Tente novamente mais tarde"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Configurações de tela de bloqueio"</string> @@ -728,7 +729,7 @@ <string name="inline_silent_button_keep_alerting" msgid="6577845442184724992">"Continuar alertando"</string> <string name="inline_turn_off_notifications" msgid="8543989584403106071">"Desativar notificações"</string> <string name="inline_keep_showing_app" msgid="4393429060390649757">"Continuar mostrando notificações desse app?"</string> - <string name="notification_silence_title" msgid="8608090968400832335">"Silencioso"</string> + <string name="notification_silence_title" msgid="8608090968400832335">"Silenciosas"</string> <string name="notification_alert_title" msgid="3656229781017543655">"Padrão"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Som e vibração desativados"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toque em uma conversa para adicioná-la à tela inicial"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Suas conversas recentes serão exibidas aqui"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversas prioritárias"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversas recentes"</string> <string name="okay" msgid="6490552955618608554">"Ok"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas perdidas e atualizações de status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado pelo Não perturbe"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema para ler seu medidor de bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toque para mais informações"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nenhum alarme definido"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml b/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml new file mode 100644 index 000000000000..5801d30d6efc --- /dev/null +++ b/packages/SystemUI/res/values-pt-rBR/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Indisponível"</item> + <item msgid="3048856902433862868">"Desativada"</item> + <item msgid="6877982264300789870">"Ativada"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Indisponível"</item> + <item msgid="4293012229142257455">"Desativado"</item> + <item msgid="6221288736127914861">"Ativado"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Indisponível"</item> + <item msgid="2074416252859094119">"Desativado"</item> + <item msgid="287997784730044767">"Ativado"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Indisponível"</item> + <item msgid="7838121007534579872">"Desativada"</item> + <item msgid="1578872232501319194">"Ativada"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Indisponível"</item> + <item msgid="5376619709702103243">"Desativado"</item> + <item msgid="4875147066469902392">"Ativado"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Indisponível"</item> + <item msgid="5044688398303285224">"Desativada"</item> + <item msgid="8527389108867454098">"Ativada"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Indisponível"</item> + <item msgid="5776427577477729185">"Desativado"</item> + <item msgid="7105052717007227415">"Ativado"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Indisponível"</item> + <item msgid="5315121904534729843">"Desativado"</item> + <item msgid="503679232285959074">"Ativado"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Indisponível"</item> + <item msgid="4801037224991420996">"Desativado"</item> + <item msgid="1982293347302546665">"Ativado"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Indisponível"</item> + <item msgid="4813655083852587017">"Desativada"</item> + <item msgid="6744077414775180687">"Ativada"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Indisponível"</item> + <item msgid="5715725170633593906">"Desativado"</item> + <item msgid="2075645297847971154">"Ativado"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Indisponível"</item> + <item msgid="9103697205127645916">"Desativada"</item> + <item msgid="8067744885820618230">"Ativada"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Indisponível"</item> + <item msgid="6983679487661600728">"Desativada"</item> + <item msgid="7520663805910678476">"Ativada"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Indisponível"</item> + <item msgid="400477985171353">"Desativado"</item> + <item msgid="630890598801118771">"Ativado"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Indisponível"</item> + <item msgid="8045580926543311193">"Desativado"</item> + <item msgid="4913460972266982499">"Ativado"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Indisponível"</item> + <item msgid="1488620600954313499">"Desativada"</item> + <item msgid="588467578853244035">"Ativada"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Indisponível"</item> + <item msgid="2744885441164350155">"Desativado"</item> + <item msgid="151121227514952197">"Ativado"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Indisponível"</item> + <item msgid="8259411607272330225">"Desativada"</item> + <item msgid="578444932039713369">"Ativada"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Indisponível"</item> + <item msgid="8707481475312432575">"Desativado"</item> + <item msgid="8031106212477483874">"Ativado"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Indisponível"</item> + <item msgid="4572245614982283078">"Desativado"</item> + <item msgid="6536448410252185664">"Ativado"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Indisponível"</item> + <item msgid="4765607635752003190">"Desativada"</item> + <item msgid="1697460731949649844">"Ativada"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Indisponível"</item> + <item msgid="3296179158646568218">"Desativado"</item> + <item msgid="8998632451221157987">"Ativado"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Indisponível"</item> + <item msgid="4544919905196727508">"Desativada"</item> + <item msgid="3422023746567004609">"Ativada"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Indisponível"</item> + <item msgid="7571394439974244289">"Desativado"</item> + <item msgid="6866424167599381915">"Ativado"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Indisponível"</item> + <item msgid="2710157085538036590">"Desativado"</item> + <item msgid="7809470840976856149">"Ativado"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index e89aab361bc1..b560c952727d 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configure para efetuar pagamentos mais rápidos e seguros com o seu telemóvel"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar tudo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloquear para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Não configurado"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Adicionar um cartão"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"A atualizar"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para utilizar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Ocorreu um problema ao obter os seus cartões. Tente novamente mais tarde."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Definições do ecrã de bloqueio"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Abrir conversa"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toque numa conversa para a adicionar ao ecrã principal"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"As suas conversas recentes aparecem aqui"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversas com prioridade"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversas recentes"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas não atendidas e atualizações de estado"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Colocado em pausa pelo modo Não incomodar"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Ocorreu um problema ao ler o medidor da bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toque para obter mais informações"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nenhum alarme defin."</string> diff --git a/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml b/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml new file mode 100644 index 000000000000..9ee9fc2a3815 --- /dev/null +++ b/packages/SystemUI/res/values-pt-rPT/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Indisponível"</item> + <item msgid="3048856902433862868">"Desligado"</item> + <item msgid="6877982264300789870">"Ligado"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Indisponível"</item> + <item msgid="4293012229142257455">"Desligado"</item> + <item msgid="6221288736127914861">"Ligado"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Indisponível"</item> + <item msgid="2074416252859094119">"Desligado"</item> + <item msgid="287997784730044767">"Ligado"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Indisponível"</item> + <item msgid="7838121007534579872">"Desligado"</item> + <item msgid="1578872232501319194">"Ligado"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Indisponível"</item> + <item msgid="5376619709702103243">"Desligado"</item> + <item msgid="4875147066469902392">"Ligado"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Indisponível"</item> + <item msgid="5044688398303285224">"Desligado"</item> + <item msgid="8527389108867454098">"Ligado"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Indisponível"</item> + <item msgid="5776427577477729185">"Desligado"</item> + <item msgid="7105052717007227415">"Ligado"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Indisponível"</item> + <item msgid="5315121904534729843">"Desligado"</item> + <item msgid="503679232285959074">"Ligado"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Indisponível"</item> + <item msgid="4801037224991420996">"Desligado"</item> + <item msgid="1982293347302546665">"Ligado"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Indisponível"</item> + <item msgid="4813655083852587017">"Desligado"</item> + <item msgid="6744077414775180687">"Ligado"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Indisponível"</item> + <item msgid="5715725170633593906">"Desligado"</item> + <item msgid="2075645297847971154">"Ligado"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Indisponível"</item> + <item msgid="9103697205127645916">"Desligado"</item> + <item msgid="8067744885820618230">"Ligado"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Indisponível"</item> + <item msgid="6983679487661600728">"Desligado"</item> + <item msgid="7520663805910678476">"Ligado"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Indisponível"</item> + <item msgid="400477985171353">"Desligado"</item> + <item msgid="630890598801118771">"Ligado"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Indisponível"</item> + <item msgid="8045580926543311193">"Desligado"</item> + <item msgid="4913460972266982499">"Ligado"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Indisponível"</item> + <item msgid="1488620600954313499">"Desligado"</item> + <item msgid="588467578853244035">"Ligado"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Indisponível"</item> + <item msgid="2744885441164350155">"Desligado"</item> + <item msgid="151121227514952197">"Ligado"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Indisponível"</item> + <item msgid="8259411607272330225">"Desligado"</item> + <item msgid="578444932039713369">"Ligado"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Indisponível"</item> + <item msgid="8707481475312432575">"Desligado"</item> + <item msgid="8031106212477483874">"Ligado"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Indisponível"</item> + <item msgid="4572245614982283078">"Desligado"</item> + <item msgid="6536448410252185664">"Ligado"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Indisponível"</item> + <item msgid="4765607635752003190">"Desligado"</item> + <item msgid="1697460731949649844">"Ligado"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Indisponível"</item> + <item msgid="3296179158646568218">"Desligado"</item> + <item msgid="8998632451221157987">"Ligado"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Indisponível"</item> + <item msgid="4544919905196727508">"Desligado"</item> + <item msgid="3422023746567004609">"Ligado"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Indisponível"</item> + <item msgid="7571394439974244289">"Desligado"</item> + <item msgid="6866424167599381915">"Ligado"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Indisponível"</item> + <item msgid="2710157085538036590">"Desligado"</item> + <item msgid="7809470840976856149">"Ligado"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 1d7ba07d3d15..e3bd8c7a60cf 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Prepare tudo para fazer compras mais rápidas e seguras com seu smartphone"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Mostrar tudo"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Desbloqueie para pagar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Dispositivos não configurados"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Adicionar um cartão"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Atualizando"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Desbloquear para usar"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Ocorreu um problema ao carregar os cards. Tente novamente mais tarde"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Configurações de tela de bloqueio"</string> @@ -728,7 +729,7 @@ <string name="inline_silent_button_keep_alerting" msgid="6577845442184724992">"Continuar alertando"</string> <string name="inline_turn_off_notifications" msgid="8543989584403106071">"Desativar notificações"</string> <string name="inline_keep_showing_app" msgid="4393429060390649757">"Continuar mostrando notificações desse app?"</string> - <string name="notification_silence_title" msgid="8608090968400832335">"Silencioso"</string> + <string name="notification_silence_title" msgid="8608090968400832335">"Silenciosas"</string> <string name="notification_alert_title" msgid="3656229781017543655">"Padrão"</string> <string name="notification_automatic_title" msgid="3745465364578762652">"Automática"</string> <string name="notification_channel_summary_low" msgid="4860617986908931158">"Som e vibração desativados"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Conversa aberta"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgets de conversa"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Toque em uma conversa para adicioná-la à tela inicial"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Suas conversas recentes serão exibidas aqui"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversas prioritárias"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversas recentes"</string> <string name="okay" msgid="6490552955618608554">"Ok"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Veja mensagens recentes, chamadas perdidas e atualizações de status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversa"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pausado pelo Não perturbe"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma mensagem"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> enviou uma imagem"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problema para ler seu medidor de bateria"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Toque para mais informações"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nenhum alarme definido"</string> diff --git a/packages/SystemUI/res/values-pt/tiles_states_strings.xml b/packages/SystemUI/res/values-pt/tiles_states_strings.xml new file mode 100644 index 000000000000..5801d30d6efc --- /dev/null +++ b/packages/SystemUI/res/values-pt/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Indisponível"</item> + <item msgid="3048856902433862868">"Desativada"</item> + <item msgid="6877982264300789870">"Ativada"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Indisponível"</item> + <item msgid="4293012229142257455">"Desativado"</item> + <item msgid="6221288736127914861">"Ativado"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Indisponível"</item> + <item msgid="2074416252859094119">"Desativado"</item> + <item msgid="287997784730044767">"Ativado"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Indisponível"</item> + <item msgid="7838121007534579872">"Desativada"</item> + <item msgid="1578872232501319194">"Ativada"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Indisponível"</item> + <item msgid="5376619709702103243">"Desativado"</item> + <item msgid="4875147066469902392">"Ativado"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Indisponível"</item> + <item msgid="5044688398303285224">"Desativada"</item> + <item msgid="8527389108867454098">"Ativada"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Indisponível"</item> + <item msgid="5776427577477729185">"Desativado"</item> + <item msgid="7105052717007227415">"Ativado"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Indisponível"</item> + <item msgid="5315121904534729843">"Desativado"</item> + <item msgid="503679232285959074">"Ativado"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Indisponível"</item> + <item msgid="4801037224991420996">"Desativado"</item> + <item msgid="1982293347302546665">"Ativado"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Indisponível"</item> + <item msgid="4813655083852587017">"Desativada"</item> + <item msgid="6744077414775180687">"Ativada"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Indisponível"</item> + <item msgid="5715725170633593906">"Desativado"</item> + <item msgid="2075645297847971154">"Ativado"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Indisponível"</item> + <item msgid="9103697205127645916">"Desativada"</item> + <item msgid="8067744885820618230">"Ativada"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Indisponível"</item> + <item msgid="6983679487661600728">"Desativada"</item> + <item msgid="7520663805910678476">"Ativada"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Indisponível"</item> + <item msgid="400477985171353">"Desativado"</item> + <item msgid="630890598801118771">"Ativado"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Indisponível"</item> + <item msgid="8045580926543311193">"Desativado"</item> + <item msgid="4913460972266982499">"Ativado"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Indisponível"</item> + <item msgid="1488620600954313499">"Desativada"</item> + <item msgid="588467578853244035">"Ativada"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Indisponível"</item> + <item msgid="2744885441164350155">"Desativado"</item> + <item msgid="151121227514952197">"Ativado"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Indisponível"</item> + <item msgid="8259411607272330225">"Desativada"</item> + <item msgid="578444932039713369">"Ativada"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Indisponível"</item> + <item msgid="8707481475312432575">"Desativado"</item> + <item msgid="8031106212477483874">"Ativado"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Indisponível"</item> + <item msgid="4572245614982283078">"Desativado"</item> + <item msgid="6536448410252185664">"Ativado"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Indisponível"</item> + <item msgid="4765607635752003190">"Desativada"</item> + <item msgid="1697460731949649844">"Ativada"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Indisponível"</item> + <item msgid="3296179158646568218">"Desativado"</item> + <item msgid="8998632451221157987">"Ativado"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Indisponível"</item> + <item msgid="4544919905196727508">"Desativada"</item> + <item msgid="3422023746567004609">"Ativada"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Indisponível"</item> + <item msgid="7571394439974244289">"Desativado"</item> + <item msgid="6866424167599381915">"Ativado"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Indisponível"</item> + <item msgid="2710157085538036590">"Desativado"</item> + <item msgid="7809470840976856149">"Ativado"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 377af789fcda..de0b19c633f4 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -672,7 +672,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Configurați pentru a face achiziții mai rapide și mai sigure cu telefonul dvs."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Afișați-le pe toate"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Deblocați pentru a plăti"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Neconfigurat"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Deblocați pentru a folosi"</string> <string name="wallet_error_generic" msgid="257704570182963611">"A apărut o problemă la preluarea cardurilor. Încercați din nou mai târziu"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Setările ecranului de blocare"</string> @@ -1121,8 +1124,7 @@ <string name="basic_status" msgid="2315371112182658176">"Deschideți conversația"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Widgeturi pentru conversație"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Atingeți o conversație ca să o adăugați pe ecranul de pornire"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Conversațiile dvs. recente se vor afișa aici"</string> <string name="priority_conversations" msgid="3967482288896653039">"Conversații cu prioritate"</string> <string name="recent_conversations" msgid="8531874684782574622">"Conversații recente"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1152,8 +1154,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Vedeți mesaje recente, apeluri pierdute și actualizări de stare"</string> <string name="people_tile_title" msgid="6589377493334871272">"Conversație"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Întrerupt de Nu deranja"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> a trimis un mesaj"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> a trimis o imagine"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problemă la citirea măsurării bateriei"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Atingeți pentru mai multe informații"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nicio alarmă setată"</string> diff --git a/packages/SystemUI/res/values-ro/tiles_states_strings.xml b/packages/SystemUI/res/values-ro/tiles_states_strings.xml new file mode 100644 index 000000000000..3201c3e62c2c --- /dev/null +++ b/packages/SystemUI/res/values-ro/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Indisponibilă"</item> + <item msgid="3048856902433862868">"Dezactivată"</item> + <item msgid="6877982264300789870">"Activată"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Indisponibilă"</item> + <item msgid="4293012229142257455">"Dezactivată"</item> + <item msgid="6221288736127914861">"Activată"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Indisponibilă"</item> + <item msgid="2074416252859094119">"Dezactivată"</item> + <item msgid="287997784730044767">"Activată"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Indisponibilă"</item> + <item msgid="7838121007534579872">"Dezactivată"</item> + <item msgid="1578872232501319194">"Activată"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Indisponibilă"</item> + <item msgid="5376619709702103243">"Dezactivată"</item> + <item msgid="4875147066469902392">"Activată"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Indisponibilă"</item> + <item msgid="5044688398303285224">"Dezactivată"</item> + <item msgid="8527389108867454098">"Activată"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Indisponibilă"</item> + <item msgid="5776427577477729185">"Dezactivată"</item> + <item msgid="7105052717007227415">"Activată"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Indisponibilă"</item> + <item msgid="5315121904534729843">"Dezactivată"</item> + <item msgid="503679232285959074">"Activată"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Indisponibilă"</item> + <item msgid="4801037224991420996">"Dezactivată"</item> + <item msgid="1982293347302546665">"Activată"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Indisponibilă"</item> + <item msgid="4813655083852587017">"Dezactivată"</item> + <item msgid="6744077414775180687">"Activată"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Indisponibilă"</item> + <item msgid="5715725170633593906">"Dezactivată"</item> + <item msgid="2075645297847971154">"Activată"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Indisponibilă"</item> + <item msgid="9103697205127645916">"Dezactivată"</item> + <item msgid="8067744885820618230">"Activată"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Indisponibilă"</item> + <item msgid="6983679487661600728">"Dezactivată"</item> + <item msgid="7520663805910678476">"Activată"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Indisponibilă"</item> + <item msgid="400477985171353">"Dezactivată"</item> + <item msgid="630890598801118771">"Activată"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Indisponibilă"</item> + <item msgid="8045580926543311193">"Dezactivată"</item> + <item msgid="4913460972266982499">"Activată"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Indisponibilă"</item> + <item msgid="1488620600954313499">"Dezactivată"</item> + <item msgid="588467578853244035">"Activată"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Indisponibilă"</item> + <item msgid="2744885441164350155">"Dezactivată"</item> + <item msgid="151121227514952197">"Activată"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Indisponibilă"</item> + <item msgid="8259411607272330225">"Dezactivată"</item> + <item msgid="578444932039713369">"Activată"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Indisponibilă"</item> + <item msgid="8707481475312432575">"Dezactivată"</item> + <item msgid="8031106212477483874">"Activată"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Indisponibilă"</item> + <item msgid="4572245614982283078">"Dezactivată"</item> + <item msgid="6536448410252185664">"Activată"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Indisponibilă"</item> + <item msgid="4765607635752003190">"Dezactivată"</item> + <item msgid="1697460731949649844">"Activată"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Indisponibilă"</item> + <item msgid="3296179158646568218">"Dezactivată"</item> + <item msgid="8998632451221157987">"Activată"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Indisponibilă"</item> + <item msgid="4544919905196727508">"Dezactivată"</item> + <item msgid="3422023746567004609">"Activată"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Indisponibilă"</item> + <item msgid="7571394439974244289">"Dezactivată"</item> + <item msgid="6866424167599381915">"Activată"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Indisponibilă"</item> + <item msgid="2710157085538036590">"Dezactivată"</item> + <item msgid="7809470840976856149">"Activată"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f9bc9b210ea4..7b4e829b29ab 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Расплачивайтесь через телефон быстро и безопасно."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Показать все"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Разблокировать для оплаты"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Не настроено"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Открытый чат"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Виджеты чатов"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Нажмите на чат, чтобы добавить его на главный экран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Здесь появятся ваши недавние разговоры."</string> <string name="priority_conversations" msgid="3967482288896653039">"Важные разговоры"</string> <string name="recent_conversations" msgid="8531874684782574622">"Недавние разговоры"</string> <string name="okay" msgid="6490552955618608554">"ОК"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Будьте в курсе последних сообщений, пропущенных вызовов и обновлений статуса."</string> <string name="people_tile_title" msgid="6589377493334871272">"Чат"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Приостановлено в режиме \"Не беспокоить\""</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил сообщение"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Пользователь <xliff:g id="NAME">%1$s</xliff:g> отправил изображение"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Не удается получить данные об уровне заряда батареи"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Нажмите, чтобы узнать больше."</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Будильников нет"</string> diff --git a/packages/SystemUI/res/values-ru/tiles_states_strings.xml b/packages/SystemUI/res/values-ru/tiles_states_strings.xml new file mode 100644 index 000000000000..29556da73c33 --- /dev/null +++ b/packages/SystemUI/res/values-ru/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Функция недоступна"</item> + <item msgid="3048856902433862868">"Откл."</item> + <item msgid="6877982264300789870">"Вкл."</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Функция недоступна"</item> + <item msgid="4293012229142257455">"Откл."</item> + <item msgid="6221288736127914861">"Вкл."</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Функция недоступна"</item> + <item msgid="2074416252859094119">"Откл."</item> + <item msgid="287997784730044767">"Вкл."</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Функция недоступна"</item> + <item msgid="7838121007534579872">"Откл."</item> + <item msgid="1578872232501319194">"Вкл."</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Функция недоступна"</item> + <item msgid="5376619709702103243">"Откл."</item> + <item msgid="4875147066469902392">"Вкл."</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Функция недоступна"</item> + <item msgid="5044688398303285224">"Откл."</item> + <item msgid="8527389108867454098">"Вкл."</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Функция недоступна"</item> + <item msgid="5776427577477729185">"Откл."</item> + <item msgid="7105052717007227415">"Вкл."</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Функция недоступна"</item> + <item msgid="5315121904534729843">"Откл."</item> + <item msgid="503679232285959074">"Вкл."</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Функция недоступна"</item> + <item msgid="4801037224991420996">"Откл."</item> + <item msgid="1982293347302546665">"Вкл."</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Функция недоступна"</item> + <item msgid="4813655083852587017">"Откл."</item> + <item msgid="6744077414775180687">"Вкл."</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Функция недоступна"</item> + <item msgid="5715725170633593906">"Откл."</item> + <item msgid="2075645297847971154">"Вкл."</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Функция недоступна"</item> + <item msgid="9103697205127645916">"Откл."</item> + <item msgid="8067744885820618230">"Вкл."</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Функция недоступна"</item> + <item msgid="6983679487661600728">"Откл."</item> + <item msgid="7520663805910678476">"Вкл."</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Функция недоступна"</item> + <item msgid="400477985171353">"Откл."</item> + <item msgid="630890598801118771">"Вкл."</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Функция недоступна"</item> + <item msgid="8045580926543311193">"Откл."</item> + <item msgid="4913460972266982499">"Вкл."</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Функция недоступна"</item> + <item msgid="1488620600954313499">"Откл."</item> + <item msgid="588467578853244035">"Вкл."</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Функция недоступна"</item> + <item msgid="2744885441164350155">"Откл."</item> + <item msgid="151121227514952197">"Вкл."</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Функция недоступна"</item> + <item msgid="8259411607272330225">"Откл."</item> + <item msgid="578444932039713369">"Вкл."</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Функция недоступна"</item> + <item msgid="8707481475312432575">"Откл."</item> + <item msgid="8031106212477483874">"Вкл."</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Функция недоступна"</item> + <item msgid="4572245614982283078">"Откл."</item> + <item msgid="6536448410252185664">"Вкл."</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Функция недоступна"</item> + <item msgid="4765607635752003190">"Откл."</item> + <item msgid="1697460731949649844">"Вкл."</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Функция недоступна"</item> + <item msgid="3296179158646568218">"Откл."</item> + <item msgid="8998632451221157987">"Вкл."</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Функция недоступна"</item> + <item msgid="4544919905196727508">"Откл."</item> + <item msgid="3422023746567004609">"Вкл."</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Функция недоступна"</item> + <item msgid="7571394439974244289">"Откл."</item> + <item msgid="6866424167599381915">"Вкл."</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Функция недоступна"</item> + <item msgid="2710157085538036590">"Откл."</item> + <item msgid="7809470840976856149">"Вкл."</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 0339baa323d3..94d29eddbecd 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ඔබගේ දුරකථනය සමඟ වඩා වේගවත්, වඩා සුරක්ෂිත මිලදී ගැනීම් සිදු කිරීමට සූදානම් වන්න"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"සියල්ල පෙන්වන්න"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ගෙවීමට අගුලු හරින්න"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"පිහිටුවා නැත"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"සංවාදය විවෘත කරන්න"</string> <string name="select_conversation_title" msgid="6716364118095089519">"සංවාද විජට්"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ඔබගේ මුල් තිරයට එය එක් කිරීමට සංවාදයක් තට්ටු කරන්න"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"ඔබගේ මෑත සංවාද මෙහි පෙන්වනු ඇත"</string> <string name="priority_conversations" msgid="3967482288896653039">"ප්රමුඛතා සංවාද"</string> <string name="recent_conversations" msgid="8531874684782574622">"මෑත සංවාද"</string> <string name="okay" msgid="6490552955618608554">"හරි"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"මෑත පණිවිඩ, මඟ හැරුණු ඇමතුම් සහ තත්ත්ව යාවත්කාලීන කිරීම් බලන්න"</string> <string name="people_tile_title" msgid="6589377493334871272">"සංවාදය"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"බාධා නොකිරීම මගින් විරාම කර ඇත"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> පණිවිඩයක් එවා ඇත"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> රූපයක් යවන ලදී"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"ඔබගේ බැටරි මනුව කියවීමේ දෝෂයකි"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"තවත් තොරතුරු සඳහා තට්ටු කරන්න"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"එලාම සකසා නැත"</string> diff --git a/packages/SystemUI/res/values-si/tiles_states_strings.xml b/packages/SystemUI/res/values-si/tiles_states_strings.xml new file mode 100644 index 000000000000..9ca8198b24ca --- /dev/null +++ b/packages/SystemUI/res/values-si/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"නොමැත"</item> + <item msgid="3048856902433862868">"අක්රියයි"</item> + <item msgid="6877982264300789870">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"නොමැත"</item> + <item msgid="4293012229142257455">"අක්රියයි"</item> + <item msgid="6221288736127914861">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"නොමැත"</item> + <item msgid="2074416252859094119">"අක්රියයි"</item> + <item msgid="287997784730044767">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"නොමැත"</item> + <item msgid="7838121007534579872">"අක්රියයි"</item> + <item msgid="1578872232501319194">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"නොමැත"</item> + <item msgid="5376619709702103243">"අක්රියයි"</item> + <item msgid="4875147066469902392">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"නොමැත"</item> + <item msgid="5044688398303285224">"අක්රියයි"</item> + <item msgid="8527389108867454098">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"නොමැත"</item> + <item msgid="5776427577477729185">"අක්රියයි"</item> + <item msgid="7105052717007227415">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"නොමැත"</item> + <item msgid="5315121904534729843">"අක්රියයි"</item> + <item msgid="503679232285959074">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"නොමැත"</item> + <item msgid="4801037224991420996">"අක්රියයි"</item> + <item msgid="1982293347302546665">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"නොමැත"</item> + <item msgid="4813655083852587017">"අක්රියයි"</item> + <item msgid="6744077414775180687">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"නොමැත"</item> + <item msgid="5715725170633593906">"අක්රියයි"</item> + <item msgid="2075645297847971154">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"නොමැත"</item> + <item msgid="9103697205127645916">"අක්රියයි"</item> + <item msgid="8067744885820618230">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"නොමැත"</item> + <item msgid="6983679487661600728">"අක්රියයි"</item> + <item msgid="7520663805910678476">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"නොමැත"</item> + <item msgid="400477985171353">"අක්රියයි"</item> + <item msgid="630890598801118771">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"නොමැත"</item> + <item msgid="8045580926543311193">"අක්රියයි"</item> + <item msgid="4913460972266982499">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"නොමැත"</item> + <item msgid="1488620600954313499">"අක්රියයි"</item> + <item msgid="588467578853244035">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"නොමැත"</item> + <item msgid="2744885441164350155">"අක්රියයි"</item> + <item msgid="151121227514952197">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"නොමැත"</item> + <item msgid="8259411607272330225">"අක්රියයි"</item> + <item msgid="578444932039713369">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"නොමැත"</item> + <item msgid="8707481475312432575">"අක්රියයි"</item> + <item msgid="8031106212477483874">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"නොමැත"</item> + <item msgid="4572245614982283078">"අක්රියයි"</item> + <item msgid="6536448410252185664">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"නොමැත"</item> + <item msgid="4765607635752003190">"අක්රියයි"</item> + <item msgid="1697460731949649844">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"නොමැත"</item> + <item msgid="3296179158646568218">"අක්රියයි"</item> + <item msgid="8998632451221157987">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"නොමැත"</item> + <item msgid="4544919905196727508">"අක්රියයි"</item> + <item msgid="3422023746567004609">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"නොමැත"</item> + <item msgid="7571394439974244289">"අක්රියයි"</item> + <item msgid="6866424167599381915">"සක්රියයි"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"නොමැත"</item> + <item msgid="2710157085538036590">"අක්රියයි"</item> + <item msgid="7809470840976856149">"සක්රියයි"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index b0d8d3bf717f..767dc7be5f20 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Nastavte si všetko potrebné na rýchlejšie a bezpečnejšie nákupy telefónom"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Zobraziť všetko"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Odomknúť a zaplatiť"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nenastavené"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odomknúť a použiť"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Pri načítavaní kariet sa vyskytol problém. Skúste to neskôr."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Nastavenia uzamknutej obrazovky"</string> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Otvorená konverzácia"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Miniaplikácie konverzácií"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Klepnite na konverzáciu a pridajte ju tak na plochu"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Vaše nedávne konverzácie sa zobrazia tu"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioritné konverzácie"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nedávne konverzácie"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Pozrite si nedávne správy, zmeškané hovory a aktualizácie stavu"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konverzácia"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pozastavené režimom bez vyrušení"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) správu"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> poslal(a) obrázok"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Pri čítaní meradla batérie sa vyskytol problém"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Klepnutím si zobrazíte ďalšie informácie"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Žiadny budík"</string> diff --git a/packages/SystemUI/res/values-sk/tiles_states_strings.xml b/packages/SystemUI/res/values-sk/tiles_states_strings.xml new file mode 100644 index 000000000000..2e80a8035a51 --- /dev/null +++ b/packages/SystemUI/res/values-sk/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nie je k dispozícii"</item> + <item msgid="3048856902433862868">"Vypnuté"</item> + <item msgid="6877982264300789870">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nie je k dispozícii"</item> + <item msgid="4293012229142257455">"Vypnuté"</item> + <item msgid="6221288736127914861">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nie je k dispozícii"</item> + <item msgid="2074416252859094119">"Vypnuté"</item> + <item msgid="287997784730044767">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nie je k dispozícii"</item> + <item msgid="7838121007534579872">"Vypnuté"</item> + <item msgid="1578872232501319194">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nie je k dispozícii"</item> + <item msgid="5376619709702103243">"Vypnuté"</item> + <item msgid="4875147066469902392">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nie je k dispozícii"</item> + <item msgid="5044688398303285224">"Vypnuté"</item> + <item msgid="8527389108867454098">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nie je k dispozícii"</item> + <item msgid="5776427577477729185">"Vypnuté"</item> + <item msgid="7105052717007227415">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nie je k dispozícii"</item> + <item msgid="5315121904534729843">"Vypnuté"</item> + <item msgid="503679232285959074">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nie je k dispozícii"</item> + <item msgid="4801037224991420996">"Vypnuté"</item> + <item msgid="1982293347302546665">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nie je k dispozícii"</item> + <item msgid="4813655083852587017">"Vypnuté"</item> + <item msgid="6744077414775180687">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nie je k dispozícii"</item> + <item msgid="5715725170633593906">"Vypnuté"</item> + <item msgid="2075645297847971154">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nie je k dispozícii"</item> + <item msgid="9103697205127645916">"Vypnuté"</item> + <item msgid="8067744885820618230">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nie je k dispozícii"</item> + <item msgid="6983679487661600728">"Vypnuté"</item> + <item msgid="7520663805910678476">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nie je k dispozícii"</item> + <item msgid="400477985171353">"Vypnuté"</item> + <item msgid="630890598801118771">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nie je k dispozícii"</item> + <item msgid="8045580926543311193">"Vypnuté"</item> + <item msgid="4913460972266982499">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nie je k dispozícii"</item> + <item msgid="1488620600954313499">"Vypnuté"</item> + <item msgid="588467578853244035">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nie je k dispozícii"</item> + <item msgid="2744885441164350155">"Vypnuté"</item> + <item msgid="151121227514952197">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nie je k dispozícii"</item> + <item msgid="8259411607272330225">"Vypnuté"</item> + <item msgid="578444932039713369">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nie je k dispozícii"</item> + <item msgid="8707481475312432575">"Vypnuté"</item> + <item msgid="8031106212477483874">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nie je k dispozícii"</item> + <item msgid="4572245614982283078">"Vypnuté"</item> + <item msgid="6536448410252185664">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nie je k dispozícii"</item> + <item msgid="4765607635752003190">"Vypnuté"</item> + <item msgid="1697460731949649844">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nie je k dispozícii"</item> + <item msgid="3296179158646568218">"Vypnuté"</item> + <item msgid="8998632451221157987">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nie je k dispozícii"</item> + <item msgid="4544919905196727508">"Vypnuté"</item> + <item msgid="3422023746567004609">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nie je k dispozícii"</item> + <item msgid="7571394439974244289">"Vypnuté"</item> + <item msgid="6866424167599381915">"Zapnuté"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nie je k dispozícii"</item> + <item msgid="2710157085538036590">"Vypnuté"</item> + <item msgid="7809470840976856149">"Zapnuté"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 4802686a729c..69e0cf66c6dc 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -675,7 +675,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Nastavite možnost hitrejšega in varnejšega plačevanja s telefonom."</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Prikaži vse"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Odklenite za plačevanje"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ni nastavljeno"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Dodajte kartico"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Posodabljanje"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Odklenite za uporabo"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Pri pridobivanju kartic je prišlo do težave. Poskusite znova pozneje."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Nastavitve zaklepanja zaslona"</string> @@ -749,8 +750,8 @@ <string name="notification_channel_summary_automatic_demoted" msgid="1831303964660807700">"<b>Stanje:</b> Uvrščeno nižje"</string> <string name="notification_channel_summary_priority_baseline" msgid="46674690072551234">"Prikaz na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu"</string> <string name="notification_channel_summary_priority_bubble" msgid="1275413109619074576">"Prikaz v obliki oblačka na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu."</string> - <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikaz na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti"</string> - <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikaz v obliki oblačka na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti"</string> + <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"Prikaz na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti."</string> + <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"Prikaz v obliki oblačka na vrhu razdelka z obvestili za pogovor in kot profilna slika na zaklenjenem zaslonu, preglasitev načina Ne moti."</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"Nastavitve"</string> <string name="notification_priority_title" msgid="2079708866333537093">"Prednostno"</string> <string name="no_shortcut" msgid="8257177117568230126">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ne podpira pogovornih funkcij."</string> @@ -1127,8 +1128,7 @@ <string name="basic_status" msgid="2315371112182658176">"Odprt pogovor"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Pripomočki za pogovore"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Dotaknite se pogovora, da ga dodate na začetni zaslon."</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Tukaj bodo prikazani nedavni pogovori."</string> <string name="priority_conversations" msgid="3967482288896653039">"Prednostni pogovori"</string> <string name="recent_conversations" msgid="8531874684782574622">"Nedavni pogovori"</string> <string name="okay" msgid="6490552955618608554">"V redu"</string> @@ -1158,8 +1158,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Ogled nedavnih sporočil, neodgovorjenih klicev in posodobitev stanj"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pogovor"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"To je začasno zaustavil način »ne moti«."</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sporočilo."</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Oseba <xliff:g id="NAME">%1$s</xliff:g> je poslala sliko."</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Težava z branjem indikatorja stanja napolnjenosti baterije"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Dotaknite se za več informacij"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Ni nastavljenih alarmov"</string> diff --git a/packages/SystemUI/res/values-sl/tiles_states_strings.xml b/packages/SystemUI/res/values-sl/tiles_states_strings.xml new file mode 100644 index 000000000000..f1d1aabb23ca --- /dev/null +++ b/packages/SystemUI/res/values-sl/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ni na voljo"</item> + <item msgid="3048856902433862868">"Izklopljeno"</item> + <item msgid="6877982264300789870">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ni na voljo"</item> + <item msgid="4293012229142257455">"Izklopljeno"</item> + <item msgid="6221288736127914861">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ni na voljo"</item> + <item msgid="2074416252859094119">"Izklopljeno"</item> + <item msgid="287997784730044767">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ni na voljo"</item> + <item msgid="7838121007534579872">"Izklopljeno"</item> + <item msgid="1578872232501319194">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ni na voljo"</item> + <item msgid="5376619709702103243">"Izklopljeno"</item> + <item msgid="4875147066469902392">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ni na voljo"</item> + <item msgid="5044688398303285224">"Izklopljeno"</item> + <item msgid="8527389108867454098">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ni na voljo"</item> + <item msgid="5776427577477729185">"Izklopljeno"</item> + <item msgid="7105052717007227415">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ni na voljo"</item> + <item msgid="5315121904534729843">"Izklopljeno"</item> + <item msgid="503679232285959074">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ni na voljo"</item> + <item msgid="4801037224991420996">"Izklopljeno"</item> + <item msgid="1982293347302546665">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ni na voljo"</item> + <item msgid="4813655083852587017">"Izklopljeno"</item> + <item msgid="6744077414775180687">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ni na voljo"</item> + <item msgid="5715725170633593906">"Izklopljeno"</item> + <item msgid="2075645297847971154">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ni na voljo"</item> + <item msgid="9103697205127645916">"Izklopljeno"</item> + <item msgid="8067744885820618230">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ni na voljo"</item> + <item msgid="6983679487661600728">"Izklopljeno"</item> + <item msgid="7520663805910678476">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ni na voljo"</item> + <item msgid="400477985171353">"Izklopljeno"</item> + <item msgid="630890598801118771">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ni na voljo"</item> + <item msgid="8045580926543311193">"Izklopljeno"</item> + <item msgid="4913460972266982499">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ni na voljo"</item> + <item msgid="1488620600954313499">"Izklopljeno"</item> + <item msgid="588467578853244035">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ni na voljo"</item> + <item msgid="2744885441164350155">"Izklopljeno"</item> + <item msgid="151121227514952197">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ni na voljo"</item> + <item msgid="8259411607272330225">"Izklopljeno"</item> + <item msgid="578444932039713369">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ni na voljo"</item> + <item msgid="8707481475312432575">"Izklopljeno"</item> + <item msgid="8031106212477483874">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ni na voljo"</item> + <item msgid="4572245614982283078">"Izklopljeno"</item> + <item msgid="6536448410252185664">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ni na voljo"</item> + <item msgid="4765607635752003190">"Izklopljeno"</item> + <item msgid="1697460731949649844">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ni na voljo"</item> + <item msgid="3296179158646568218">"Izklopljeno"</item> + <item msgid="8998632451221157987">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ni na voljo"</item> + <item msgid="4544919905196727508">"Izklopljeno"</item> + <item msgid="3422023746567004609">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ni na voljo"</item> + <item msgid="7571394439974244289">"Izklopljeno"</item> + <item msgid="6866424167599381915">"Vklopljeno"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ni na voljo"</item> + <item msgid="2710157085538036590">"Izklopljeno"</item> + <item msgid="7809470840976856149">"Vklopljeno"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 78ab1fa16823..feb5c872d4bd 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Konfiguro për të kryer pagesa më të shpejta dhe më të sigurta përmes telefonit"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Shfaqi të gjitha"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Shkyçe për të paguar"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Nuk është konfiguruar"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Shkyçe për ta përdorur"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Pati një problem me marrjen e kartave të tua. Provo përsëri më vonë"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Cilësimet e ekranit të kyçjes"</string> @@ -734,7 +737,7 @@ <string name="notification_channel_summary_low" msgid="4860617986908931158">"Asnjë tingull ose dridhje"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Asnjë tingull ose dridhje dhe shfaqet më poshtë në seksionin e bisedave"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Mund të bjerë zilja ose të dridhet në bazë të cilësimeve të telefonit"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Mund të bjerë zilja ose të dridhet në bazë të cilësimeve të telefonit. Bisedat nga flluska e <xliff:g id="APP_NAME">%1$s</xliff:g> si parazgjedhje."</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Mund të bjerë zilja ose të dridhet në bazë të cilësimeve të telefonit. Si parazgjedhje, bisedat nga <xliff:g id="APP_NAME">%1$s</xliff:g> shfaqen si flluska."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Mban vëmendjen tënde me një shkurtore pluskuese te kjo përmbajtje."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Kërkoji sistemit të përcaktojë nëse ky njoftim duhet të lëshojë tingull apo dridhje"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Statusi:</b> Promovuar si parazgjedhje"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Hap bisedën"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Miniaplikacionet e bisedave"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Trokit te një bisedë dhe shtoje në ekranin bazë"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Bisedat tua të fundit do të shfaqen këtu"</string> <string name="priority_conversations" msgid="3967482288896653039">"Bisedat me përparësi"</string> <string name="recent_conversations" msgid="8531874684782574622">"Bisedat e fundit"</string> <string name="okay" msgid="6490552955618608554">"Në rregull"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Shiko mesazhet e fundit, telefonatat e humbura dhe përditësimet e statusit"</string> <string name="people_tile_title" msgid="6589377493334871272">"Biseda"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Vendosur në pauzë nga \"Mos shqetëso\""</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një mesazh"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> dërgoi një imazh"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Problem me leximin e matësit të baterisë"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Trokit për më shumë informacione"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Nuk është caktuar asnjë alarm"</string> diff --git a/packages/SystemUI/res/values-sq/tiles_states_strings.xml b/packages/SystemUI/res/values-sq/tiles_states_strings.xml new file mode 100644 index 000000000000..83069c9e970a --- /dev/null +++ b/packages/SystemUI/res/values-sq/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Nuk ofrohet"</item> + <item msgid="3048856902433862868">"Joaktiv"</item> + <item msgid="6877982264300789870">"Aktiv"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Nuk ofrohet"</item> + <item msgid="4293012229142257455">"Joaktiv"</item> + <item msgid="6221288736127914861">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Nuk ofrohet"</item> + <item msgid="2074416252859094119">"Joaktiv"</item> + <item msgid="287997784730044767">"Aktiv"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Nuk ofrohet"</item> + <item msgid="7838121007534579872">"Joaktiv"</item> + <item msgid="1578872232501319194">"Aktiv"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Nuk ofrohet"</item> + <item msgid="5376619709702103243">"Joaktiv"</item> + <item msgid="4875147066469902392">"Aktiv"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Nuk ofrohet"</item> + <item msgid="5044688398303285224">"Joaktiv"</item> + <item msgid="8527389108867454098">"Aktiv"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Nuk ofrohet"</item> + <item msgid="5776427577477729185">"Joaktiv"</item> + <item msgid="7105052717007227415">"Aktiv"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Nuk ofrohet"</item> + <item msgid="5315121904534729843">"Joaktiv"</item> + <item msgid="503679232285959074">"Aktiv"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Nuk ofrohet"</item> + <item msgid="4801037224991420996">"Joaktiv"</item> + <item msgid="1982293347302546665">"Aktiv"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Nuk ofrohet"</item> + <item msgid="4813655083852587017">"Joaktive"</item> + <item msgid="6744077414775180687">"Aktive"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Nuk ofrohet"</item> + <item msgid="5715725170633593906">"Joaktive"</item> + <item msgid="2075645297847971154">"Aktive"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Nuk ofrohet"</item> + <item msgid="9103697205127645916">"Joaktiv"</item> + <item msgid="8067744885820618230">"Aktiv"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Nuk ofrohet"</item> + <item msgid="6983679487661600728">"Joaktiv"</item> + <item msgid="7520663805910678476">"Aktiv"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Nuk ofrohet"</item> + <item msgid="400477985171353">"Joaktiv"</item> + <item msgid="630890598801118771">"Aktiv"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Nuk ofrohet"</item> + <item msgid="8045580926543311193">"Joaktiv"</item> + <item msgid="4913460972266982499">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Nuk ofrohet"</item> + <item msgid="1488620600954313499">"Joaktiv"</item> + <item msgid="588467578853244035">"Aktiv"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Nuk ofrohet"</item> + <item msgid="2744885441164350155">"Joaktive"</item> + <item msgid="151121227514952197">"Aktive"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Nuk ofrohet"</item> + <item msgid="8259411607272330225">"Joaktiv"</item> + <item msgid="578444932039713369">"Aktiv"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Nuk ofrohet"</item> + <item msgid="8707481475312432575">"Joaktiv"</item> + <item msgid="8031106212477483874">"Aktiv"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Nuk ofrohet"</item> + <item msgid="4572245614982283078">"Joaktiv"</item> + <item msgid="6536448410252185664">"Aktiv"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Nuk ofrohet"</item> + <item msgid="4765607635752003190">"Joaktiv"</item> + <item msgid="1697460731949649844">"Aktiv"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Nuk ofrohet"</item> + <item msgid="3296179158646568218">"Joaktiv"</item> + <item msgid="8998632451221157987">"Aktiv"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Nuk ofrohet"</item> + <item msgid="4544919905196727508">"Joaktiv"</item> + <item msgid="3422023746567004609">"Aktiv"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Nuk ofrohet"</item> + <item msgid="7571394439974244289">"Joaktiv"</item> + <item msgid="6866424167599381915">"Aktiv"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Nuk ofrohet"</item> + <item msgid="2710157085538036590">"Joaktiv"</item> + <item msgid="7809470840976856149">"Aktiv"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index d14854b55f6e..1b6f08d8f2ea 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -672,7 +672,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Обавите конфигурисање да бисте могли брже и сигурније да купујете помоћу телефона"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Прикажи све"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Откључај ради плаћања"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Није подешено"</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_device_locked" msgid="5175862019125370506">"Откључај ради коришћења"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Дошло је до проблема при преузимању картица. Пробајте поново касније"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Подешавања закључаног екрана"</string> @@ -1121,8 +1122,7 @@ <string name="basic_status" msgid="2315371112182658176">"Отворите конверзацију"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Виџети за конверзацију"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Додирните конверзацију да бисте је додали на почетни екран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Недавне конверзације ће се приказати овде"</string> <string name="priority_conversations" msgid="3967482288896653039">"Приоритетне конверзације"</string> <string name="recent_conversations" msgid="8531874684782574622">"Недавне конверзације"</string> <string name="okay" msgid="6490552955618608554">"Важи"</string> @@ -1152,8 +1152,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Погледајте недавне поруке, пропуштене позиве и ажурирања статуса"</string> <string name="people_tile_title" msgid="6589377493334871272">"Конверзација"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Паузирано режимом Не узнемиравај"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> шаље поруку"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> шаље слику"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Проблем са очитавањем мерача батерије"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Додирните за више информација"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Аларм није подешен"</string> diff --git a/packages/SystemUI/res/values-sr/tiles_states_strings.xml b/packages/SystemUI/res/values-sr/tiles_states_strings.xml new file mode 100644 index 000000000000..cec05da86d0c --- /dev/null +++ b/packages/SystemUI/res/values-sr/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Недоступно"</item> + <item msgid="3048856902433862868">"Искључено"</item> + <item msgid="6877982264300789870">"Укључено"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Недоступно"</item> + <item msgid="4293012229142257455">"Искључено"</item> + <item msgid="6221288736127914861">"Укључено"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Недоступно"</item> + <item msgid="2074416252859094119">"Искључено"</item> + <item msgid="287997784730044767">"Укључено"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Недоступно"</item> + <item msgid="7838121007534579872">"Искључено"</item> + <item msgid="1578872232501319194">"Укључено"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Недоступно"</item> + <item msgid="5376619709702103243">"Искључено"</item> + <item msgid="4875147066469902392">"Укључено"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Недоступно"</item> + <item msgid="5044688398303285224">"Искључено"</item> + <item msgid="8527389108867454098">"Укључено"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Недоступно"</item> + <item msgid="5776427577477729185">"Искључено"</item> + <item msgid="7105052717007227415">"Укључено"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Недоступно"</item> + <item msgid="5315121904534729843">"Искључено"</item> + <item msgid="503679232285959074">"Укључено"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Недоступно"</item> + <item msgid="4801037224991420996">"Искључено"</item> + <item msgid="1982293347302546665">"Укључено"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Недоступно"</item> + <item msgid="4813655083852587017">"Искључено"</item> + <item msgid="6744077414775180687">"Укључено"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Недоступно"</item> + <item msgid="5715725170633593906">"Искључено"</item> + <item msgid="2075645297847971154">"Укључено"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Недоступно"</item> + <item msgid="9103697205127645916">"Искључено"</item> + <item msgid="8067744885820618230">"Укључено"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Недоступно"</item> + <item msgid="6983679487661600728">"Искључено"</item> + <item msgid="7520663805910678476">"Укључено"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Недоступно"</item> + <item msgid="400477985171353">"Искључено"</item> + <item msgid="630890598801118771">"Укључено"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Недоступно"</item> + <item msgid="8045580926543311193">"Искључено"</item> + <item msgid="4913460972266982499">"Укључено"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Недоступно"</item> + <item msgid="1488620600954313499">"Искључено"</item> + <item msgid="588467578853244035">"Укључено"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Недоступно"</item> + <item msgid="2744885441164350155">"Искључено"</item> + <item msgid="151121227514952197">"Укључено"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Недоступно"</item> + <item msgid="8259411607272330225">"Искључено"</item> + <item msgid="578444932039713369">"Укључено"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Недоступно"</item> + <item msgid="8707481475312432575">"Искључено"</item> + <item msgid="8031106212477483874">"Укључено"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Недоступно"</item> + <item msgid="4572245614982283078">"Искључено"</item> + <item msgid="6536448410252185664">"Укључено"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Недоступно"</item> + <item msgid="4765607635752003190">"Искључено"</item> + <item msgid="1697460731949649844">"Укључено"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Недоступно"</item> + <item msgid="3296179158646568218">"Искључено"</item> + <item msgid="8998632451221157987">"Укључено"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Недоступно"</item> + <item msgid="4544919905196727508">"Искључено"</item> + <item msgid="3422023746567004609">"Укључено"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Недоступно"</item> + <item msgid="7571394439974244289">"Искључено"</item> + <item msgid="6866424167599381915">"Укључено"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Недоступно"</item> + <item msgid="2710157085538036590">"Искључено"</item> + <item msgid="7809470840976856149">"Укључено"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 708b93828d8b..cf63c43ebfdd 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Lägg till en betalningsmetod för att betala snabbare och säkrare med telefonen"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Visa alla"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Lås upp för att betala"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Har inte konfigurerats"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Lås upp för att använda"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Det gick inte att hämta dina kort. Försök igen senare."</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Inställningar för låsskärm"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Öppen konversation"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Konversationswidgetar"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Tryck på en konversation för att lägga till den på startskärmen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"De senaste konversationerna visas här"</string> <string name="priority_conversations" msgid="3967482288896653039">"Prioriterade konversationer"</string> <string name="recent_conversations" msgid="8531874684782574622">"Senaste konversationerna"</string> <string name="okay" msgid="6490552955618608554">"Okej"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Se de senaste meddelandena, missade samtal och statusuppdateringar"</string> <string name="people_tile_title" msgid="6589377493334871272">"Konversation"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Pausad av Stör ej"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> skickade ett meddelande"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> skickade en bild"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batteriindikatorn visas inte"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Tryck för mer information"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Inget inställt alarm"</string> diff --git a/packages/SystemUI/res/values-sv/tiles_states_strings.xml b/packages/SystemUI/res/values-sv/tiles_states_strings.xml new file mode 100644 index 000000000000..dbe32daea971 --- /dev/null +++ b/packages/SystemUI/res/values-sv/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Inte tillgängligt"</item> + <item msgid="3048856902433862868">"Av"</item> + <item msgid="6877982264300789870">"På"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Inte tillgängligt"</item> + <item msgid="4293012229142257455">"Av"</item> + <item msgid="6221288736127914861">"På"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Inte tillgängligt"</item> + <item msgid="2074416252859094119">"Av"</item> + <item msgid="287997784730044767">"På"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Inte tillgängligt"</item> + <item msgid="7838121007534579872">"Av"</item> + <item msgid="1578872232501319194">"På"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Inte tillgängligt"</item> + <item msgid="5376619709702103243">"Av"</item> + <item msgid="4875147066469902392">"På"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Inte tillgängligt"</item> + <item msgid="5044688398303285224">"Av"</item> + <item msgid="8527389108867454098">"På"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Inte tillgängligt"</item> + <item msgid="5776427577477729185">"Av"</item> + <item msgid="7105052717007227415">"På"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Inte tillgängligt"</item> + <item msgid="5315121904534729843">"Av"</item> + <item msgid="503679232285959074">"På"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Inte tillgängligt"</item> + <item msgid="4801037224991420996">"Av"</item> + <item msgid="1982293347302546665">"På"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Inte tillgängligt"</item> + <item msgid="4813655083852587017">"Av"</item> + <item msgid="6744077414775180687">"På"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Inte tillgängligt"</item> + <item msgid="5715725170633593906">"Av"</item> + <item msgid="2075645297847971154">"På"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Inte tillgängligt"</item> + <item msgid="9103697205127645916">"Av"</item> + <item msgid="8067744885820618230">"På"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Inte tillgängligt"</item> + <item msgid="6983679487661600728">"Av"</item> + <item msgid="7520663805910678476">"På"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Inte tillgängligt"</item> + <item msgid="400477985171353">"Av"</item> + <item msgid="630890598801118771">"På"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Inte tillgängligt"</item> + <item msgid="8045580926543311193">"Av"</item> + <item msgid="4913460972266982499">"På"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Inte tillgängligt"</item> + <item msgid="1488620600954313499">"Av"</item> + <item msgid="588467578853244035">"På"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Inte tillgängligt"</item> + <item msgid="2744885441164350155">"Av"</item> + <item msgid="151121227514952197">"På"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Inte tillgängligt"</item> + <item msgid="8259411607272330225">"Av"</item> + <item msgid="578444932039713369">"På"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Inte tillgängligt"</item> + <item msgid="8707481475312432575">"Av"</item> + <item msgid="8031106212477483874">"På"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Inte tillgängligt"</item> + <item msgid="4572245614982283078">"Av"</item> + <item msgid="6536448410252185664">"På"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Inte tillgängligt"</item> + <item msgid="4765607635752003190">"Av"</item> + <item msgid="1697460731949649844">"På"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Inte tillgängligt"</item> + <item msgid="3296179158646568218">"Av"</item> + <item msgid="8998632451221157987">"På"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Inte tillgängligt"</item> + <item msgid="4544919905196727508">"Av"</item> + <item msgid="3422023746567004609">"På"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Inte tillgängligt"</item> + <item msgid="7571394439974244289">"Av"</item> + <item msgid="6866424167599381915">"På"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Inte tillgängligt"</item> + <item msgid="2710157085538036590">"Av"</item> + <item msgid="7809470840976856149">"På"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index f9f2ca37d3bf..8be37c23725d 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Weka njia ya kulipa ili uweze kununua kwa njia salama na haraka zaidi ukitumia simu yako"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Onyesha zote"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Fungua ili ulipe"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Haijawekwa"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Weka kadi"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Inasasisha"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Fungua ili utumie"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Hitilafu imetokea wakati wa kuleta kadi zako, tafadhali jaribu tena baadaye"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Mipangilio ya kufunga skrini"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Fungua mazungumzo"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Wijeti za mazungumzo"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Gusa mazungumzo ili uyaweke kwenye Skrini yako ya kwanza"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Mazungumzo yako ya hivi majuzi yataonekana hapa"</string> <string name="priority_conversations" msgid="3967482288896653039">"Mazungumzo yenye kipaumbele"</string> <string name="recent_conversations" msgid="8531874684782574622">"Mazungumzo ya hivi majuzi"</string> <string name="okay" msgid="6490552955618608554">"Sawa"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Angalia ujumbe wa hivi majuzi, simu ambazo hukujibu na taarifa za hali"</string> <string name="people_tile_title" msgid="6589377493334871272">"Mazungumzo"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Imesimamishwa na kipengele cha Usinisumbue"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ametuma ujumbe"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ametuma picha"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Tatizo la kusoma mita ya betri yako"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Gusa ili upate maelezo zaidi"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Hujaweka kengele"</string> diff --git a/packages/SystemUI/res/values-sw/tiles_states_strings.xml b/packages/SystemUI/res/values-sw/tiles_states_strings.xml new file mode 100644 index 000000000000..93f99b725ccf --- /dev/null +++ b/packages/SystemUI/res/values-sw/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Hakipatikani"</item> + <item msgid="3048856902433862868">"Kimezimwa"</item> + <item msgid="6877982264300789870">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Hakipatikani"</item> + <item msgid="4293012229142257455">"Kimezimwa"</item> + <item msgid="6221288736127914861">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Hakipatikani"</item> + <item msgid="2074416252859094119">"Kimezimwa"</item> + <item msgid="287997784730044767">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Hakipatikani"</item> + <item msgid="7838121007534579872">"Kimezimwa"</item> + <item msgid="1578872232501319194">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Hakipatikani"</item> + <item msgid="5376619709702103243">"Kimezimwa"</item> + <item msgid="4875147066469902392">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Hakipatikani"</item> + <item msgid="5044688398303285224">"Kimezimwa"</item> + <item msgid="8527389108867454098">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Hakipatikani"</item> + <item msgid="5776427577477729185">"Kimezimwa"</item> + <item msgid="7105052717007227415">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Hakipatikani"</item> + <item msgid="5315121904534729843">"Kimezimwa"</item> + <item msgid="503679232285959074">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Hakipatikani"</item> + <item msgid="4801037224991420996">"Kimezimwa"</item> + <item msgid="1982293347302546665">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Hakipatikani"</item> + <item msgid="4813655083852587017">"Kimezimwa"</item> + <item msgid="6744077414775180687">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Hakipatikani"</item> + <item msgid="5715725170633593906">"Kimezimwa"</item> + <item msgid="2075645297847971154">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Hakipatikani"</item> + <item msgid="9103697205127645916">"Kimezimwa"</item> + <item msgid="8067744885820618230">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Hakipatikani"</item> + <item msgid="6983679487661600728">"Kimezimwa"</item> + <item msgid="7520663805910678476">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Hakipatikani"</item> + <item msgid="400477985171353">"Kimezimwa"</item> + <item msgid="630890598801118771">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Hakipatikani"</item> + <item msgid="8045580926543311193">"Kimezimwa"</item> + <item msgid="4913460972266982499">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Hakipatikani"</item> + <item msgid="1488620600954313499">"Kimezimwa"</item> + <item msgid="588467578853244035">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Hakipatikani"</item> + <item msgid="2744885441164350155">"Kimezimwa"</item> + <item msgid="151121227514952197">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Hakipatikani"</item> + <item msgid="8259411607272330225">"Kimezimwa"</item> + <item msgid="578444932039713369">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Hakipatikani"</item> + <item msgid="8707481475312432575">"Kimezimwa"</item> + <item msgid="8031106212477483874">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Hakipatikani"</item> + <item msgid="4572245614982283078">"Kimezimwa"</item> + <item msgid="6536448410252185664">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Hakipatikani"</item> + <item msgid="4765607635752003190">"Kimezimwa"</item> + <item msgid="1697460731949649844">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Hakipatikani"</item> + <item msgid="3296179158646568218">"Kimezimwa"</item> + <item msgid="8998632451221157987">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Hakipatikani"</item> + <item msgid="4544919905196727508">"Kimezimwa"</item> + <item msgid="3422023746567004609">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Hakipatikani"</item> + <item msgid="7571394439974244289">"Kimezimwa"</item> + <item msgid="6866424167599381915">"Kimewashwa"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Hakipatikani"</item> + <item msgid="2710157085538036590">"Kimezimwa"</item> + <item msgid="7809470840976856149">"Kimewashwa"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 2a9126356d99..32b1fe66c701 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -137,10 +137,10 @@ <string name="accessibility_phone_button" msgid="4256353121703100427">"ஃபோன்"</string> <string name="accessibility_voice_assist_button" msgid="6497706615649754510">"குரல் உதவி"</string> <string name="accessibility_wallet_button" msgid="1458258783460555507">"வாலட்"</string> - <string name="accessibility_unlock_button" msgid="122785427241471085">"திற"</string> + <string name="accessibility_unlock_button" msgid="122785427241471085">"அன்லாக் செய்"</string> <string name="accessibility_lock_icon" msgid="661492842417875775">"சாதனம் பூட்டப்பட்டுள்ளது"</string> <string name="accessibility_waiting_for_fingerprint" msgid="5209142744692162598">"கைரேகைக்காகக் காத்திருக்கிறது"</string> - <string name="accessibility_unlock_without_fingerprint" msgid="1811563723195375298">"உங்கள் கைரேகையைப் பயன்படுத்தாமல் திறக்கவும்"</string> + <string name="accessibility_unlock_without_fingerprint" msgid="1811563723195375298">"உங்கள் கைரேகையைப் பயன்படுத்தாமல் அன்லாக் செய்யுங்கள்"</string> <string name="accessibility_scanning_face" msgid="3093828357921541387">"முகத்தை ஸ்கேன் செய்கிறது"</string> <string name="accessibility_send_smart_reply" msgid="8885032190442015141">"அனுப்பு"</string> <string name="accessibility_manage_notification" msgid="582215815790143983">"அறிவிப்புகளை நிர்வகிக்கும் பட்டன்"</string> @@ -586,10 +586,10 @@ <string name="monitoring_description_app_work" msgid="3713084153786663662">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nமேலும் தகவலுக்கு, நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> <string name="monitoring_description_app_personal_work" msgid="6175816356939166101">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nஉங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> உடனும் இணைக்கப்பட்டுள்ளீர்கள்."</string> <string name="keyguard_indication_trust_unlocked" msgid="7395154975733744547">"TrustAgent இதைத் திறந்தே வைத்துள்ளது"</string> - <string name="keyguard_indication_trust_disabled" msgid="6820793704816727918">"நீங்கள் கைமுறையாகத் திறக்கும் வரை, சாதனம் பூட்டப்பட்டிருக்கும்"</string> + <string name="keyguard_indication_trust_disabled" msgid="6820793704816727918">"நீங்கள் கைமுறையாக அன்லாக் செய்யும் வரை, சாதனம் பூட்டப்பட்டிருக்கும்"</string> <string name="keyguard_indication_trust_unlocked_plugged_in" msgid="2323452175329362855">"<xliff:g id="KEYGUARD_INDICATION">%1$s</xliff:g>\n<xliff:g id="POWER_INDICATION">%2$s</xliff:g>"</string> <string name="hidden_notifications_title" msgid="1782412844777612795">"விரைவாக அறிவிப்புகளைப் பெறுதல்"</string> - <string name="hidden_notifications_text" msgid="5899627470450792578">"திறக்கும் முன் அவற்றைப் பார்க்கவும்"</string> + <string name="hidden_notifications_text" msgid="5899627470450792578">"அன்லாக் செய்யும் முன் அவற்றைப் பார்க்கவும்"</string> <string name="hidden_notifications_cancel" msgid="4805370226181001278">"வேண்டாம்"</string> <string name="hidden_notifications_setup" msgid="2064795578526982467">"அமை"</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> @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"மொபைல் மூலம் விரைவாகவும் பாதுகாப்பாகவும் பர்ச்சேஸ்கள் செய்ய பேமெண்ட் முறையை அமைக்கவும்"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"அனைத்தையும் காட்டு"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"பணம் செலுத்த அன்லாக் செய்க"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"அமைக்கப்படவில்லை"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"திறந்தநிலை உரையாடல்"</string> <string name="select_conversation_title" msgid="6716364118095089519">"உரையாடல் விட்ஜெட்டுகள்"</string> <string name="select_conversation_text" msgid="3376048251434956013">"ஓர் உரையாடலை உங்கள் முகப்புத் திரையில் சேர்க்க அந்த உரையாடலைத் தட்டுங்கள்"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"உங்கள் சமீபத்திய உரையாடல்கள் இங்கே காட்டப்படும்"</string> <string name="priority_conversations" msgid="3967482288896653039">"முன்னுரிமை அளிக்கப்பட்ட உரையாடல்கள்"</string> <string name="recent_conversations" msgid="8531874684782574622">"சமீபத்திய உரையாடல்கள்"</string> <string name="okay" msgid="6490552955618608554">"சரி"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"சமீபத்திய மெசேஜ்களையும் தவறிய அழைப்புகளையும் ஸ்டேட்டஸ் அப்டேட்களையும் பார்க்கலாம்"</string> <string name="people_tile_title" msgid="6589377493334871272">"உரையாடல்"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"தொந்தரவு செய்ய வேண்டாம் அம்சத்தால் இடைநிறுத்தப்பட்டது"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு மெசேஜ் அனுப்பியுள்ளார்"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ஒரு படம் அனுப்பியுள்ளார்"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"பேட்டரி அளவை அறிவதில் சிக்கல்"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"மேலும் தகவல்களுக்கு தட்டவும்"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"அலாரம் எதுவுமில்லை"</string> diff --git a/packages/SystemUI/res/values-ta/tiles_states_strings.xml b/packages/SystemUI/res/values-ta/tiles_states_strings.xml new file mode 100644 index 000000000000..d2ba6a5c7c93 --- /dev/null +++ b/packages/SystemUI/res/values-ta/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"கிடைக்கவில்லை"</item> + <item msgid="3048856902433862868">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="6877982264300789870">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"கிடைக்கவில்லை"</item> + <item msgid="4293012229142257455">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="6221288736127914861">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"கிடைக்கவில்லை"</item> + <item msgid="2074416252859094119">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="287997784730044767">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"கிடைக்கவில்லை"</item> + <item msgid="7838121007534579872">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="1578872232501319194">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"கிடைக்கவில்லை"</item> + <item msgid="5376619709702103243">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="4875147066469902392">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"கிடைக்கவில்லை"</item> + <item msgid="5044688398303285224">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="8527389108867454098">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"கிடைக்கவில்லை"</item> + <item msgid="5776427577477729185">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="7105052717007227415">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"கிடைக்கவில்லை"</item> + <item msgid="5315121904534729843">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="503679232285959074">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"கிடைக்கவில்லை"</item> + <item msgid="4801037224991420996">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="1982293347302546665">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"கிடைக்கவில்லை"</item> + <item msgid="4813655083852587017">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="6744077414775180687">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"கிடைக்கவில்லை"</item> + <item msgid="5715725170633593906">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="2075645297847971154">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"கிடைக்கவில்லை"</item> + <item msgid="9103697205127645916">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="8067744885820618230">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"கிடைக்கவில்லை"</item> + <item msgid="6983679487661600728">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="7520663805910678476">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"கிடைக்கவில்லை"</item> + <item msgid="400477985171353">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="630890598801118771">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"கிடைக்கவில்லை"</item> + <item msgid="8045580926543311193">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="4913460972266982499">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"கிடைக்கவில்லை"</item> + <item msgid="1488620600954313499">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="588467578853244035">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"கிடைக்கவில்லை"</item> + <item msgid="2744885441164350155">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="151121227514952197">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"கிடைக்கவில்லை"</item> + <item msgid="8259411607272330225">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="578444932039713369">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"கிடைக்கவில்லை"</item> + <item msgid="8707481475312432575">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="8031106212477483874">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"கிடைக்கவில்லை"</item> + <item msgid="4572245614982283078">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="6536448410252185664">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"கிடைக்கவில்லை"</item> + <item msgid="4765607635752003190">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="1697460731949649844">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"கிடைக்கவில்லை"</item> + <item msgid="3296179158646568218">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="8998632451221157987">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"கிடைக்கவில்லை"</item> + <item msgid="4544919905196727508">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="3422023746567004609">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"கிடைக்கவில்லை"</item> + <item msgid="7571394439974244289">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="6866424167599381915">"இயக்கப்பட்டுள்ளது"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"கிடைக்கவில்லை"</item> + <item msgid="2710157085538036590">"முடக்கப்பட்டுள்ளது"</item> + <item msgid="7809470840976856149">"இயக்கப்பட்டுள்ளது"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 48dbe3731aaa..1e6ae1858c28 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"మీ ఫోన్తో మరింత వేగంగా, సురక్షితంగా కొనుగోళ్లు చేయడానికి సెటప్ చేయండి"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"అన్నింటినీ చూపు"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"పే చేయడానికి అన్లాక్ చేయండి"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"సెటప్ చేయలేదు"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <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> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"సంభాషణను తెరవండి"</string> <string name="select_conversation_title" msgid="6716364118095089519">"సంభాషణ విడ్జెట్లు"</string> <string name="select_conversation_text" msgid="3376048251434956013">"దీనిని మీ మొదటి స్క్రీన్కు జోడించడానికి సంభాషణను ట్యాప్ చేయండి"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"మీ ఇటీవలి సంభాషణలు ఇక్కడ కనిపిస్తాయి"</string> <string name="priority_conversations" msgid="3967482288896653039">"ప్రాధాన్య సంభాషణలు"</string> <string name="recent_conversations" msgid="8531874684782574622">"ఇటీవలి సంభాషణలు"</string> <string name="okay" msgid="6490552955618608554">"సరే"</string> @@ -1146,8 +1147,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"ఇటీవలి మెసేజ్లు, మిస్డ్ కాల్లు, అలాగే స్టేటస్ అప్డేట్లను చూడండి"</string> <string name="people_tile_title" msgid="6589377493334871272">"సంభాషణ"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"అంతరాయం కలిగించవద్దు ద్వారా పాజ్ చేయబడింది"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> మెసేజ్ను పంపారు"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ఇమేజ్ను పంపారు"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"మీ బ్యాటరీ మీటర్ను చదవడంలో సమస్య"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"మరింత సమాచారం కోసం ట్యాప్ చేయండి"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"అలారం సెట్ చేయలేదు"</string> diff --git a/packages/SystemUI/res/values-te/tiles_states_strings.xml b/packages/SystemUI/res/values-te/tiles_states_strings.xml new file mode 100644 index 000000000000..bbe5c8ee547e --- /dev/null +++ b/packages/SystemUI/res/values-te/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"అందుబాటులో లేదు"</item> + <item msgid="3048856902433862868">"ఆఫ్లో ఉంది"</item> + <item msgid="6877982264300789870">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"అందుబాటులో లేదు"</item> + <item msgid="4293012229142257455">"ఆఫ్లో ఉంది"</item> + <item msgid="6221288736127914861">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"అందుబాటులో లేదు"</item> + <item msgid="2074416252859094119">"ఆఫ్లో ఉంది"</item> + <item msgid="287997784730044767">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"అందుబాటులో లేదు"</item> + <item msgid="7838121007534579872">"ఆఫ్లో ఉంది"</item> + <item msgid="1578872232501319194">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"అందుబాటులో లేదు"</item> + <item msgid="5376619709702103243">"ఆఫ్లో ఉంది"</item> + <item msgid="4875147066469902392">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"అందుబాటులో లేదు"</item> + <item msgid="5044688398303285224">"ఆఫ్లో ఉంది"</item> + <item msgid="8527389108867454098">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"అందుబాటులో లేదు"</item> + <item msgid="5776427577477729185">"ఆఫ్లో ఉంది"</item> + <item msgid="7105052717007227415">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"అందుబాటులో లేదు"</item> + <item msgid="5315121904534729843">"ఆఫ్లో ఉంది"</item> + <item msgid="503679232285959074">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"అందుబాటులో లేదు"</item> + <item msgid="4801037224991420996">"ఆఫ్లో ఉంది"</item> + <item msgid="1982293347302546665">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"అందుబాటులో లేదు"</item> + <item msgid="4813655083852587017">"ఆఫ్లో ఉంది"</item> + <item msgid="6744077414775180687">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"అందుబాటులో లేదు"</item> + <item msgid="5715725170633593906">"ఆఫ్లో ఉంది"</item> + <item msgid="2075645297847971154">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"అందుబాటులో లేదు"</item> + <item msgid="9103697205127645916">"ఆఫ్లో ఉంది"</item> + <item msgid="8067744885820618230">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"అందుబాటులో లేదు"</item> + <item msgid="6983679487661600728">"ఆఫ్లో ఉంది"</item> + <item msgid="7520663805910678476">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"అందుబాటులో లేదు"</item> + <item msgid="400477985171353">"ఆఫ్లో ఉంది"</item> + <item msgid="630890598801118771">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"అందుబాటులో లేదు"</item> + <item msgid="8045580926543311193">"ఆఫ్లో ఉంది"</item> + <item msgid="4913460972266982499">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"అందుబాటులో లేదు"</item> + <item msgid="1488620600954313499">"ఆఫ్లో ఉంది"</item> + <item msgid="588467578853244035">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"అందుబాటులో లేదు"</item> + <item msgid="2744885441164350155">"ఆఫ్లో ఉంది"</item> + <item msgid="151121227514952197">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"అందుబాటులో లేదు"</item> + <item msgid="8259411607272330225">"ఆఫ్లో ఉంది"</item> + <item msgid="578444932039713369">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"అందుబాటులో లేదు"</item> + <item msgid="8707481475312432575">"ఆఫ్లో ఉంది"</item> + <item msgid="8031106212477483874">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"అందుబాటులో లేదు"</item> + <item msgid="4572245614982283078">"ఆఫ్లో ఉంది"</item> + <item msgid="6536448410252185664">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"అందుబాటులో లేదు"</item> + <item msgid="4765607635752003190">"ఆఫ్లో ఉంది"</item> + <item msgid="1697460731949649844">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"అందుబాటులో లేదు"</item> + <item msgid="3296179158646568218">"ఆఫ్లో ఉంది"</item> + <item msgid="8998632451221157987">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"అందుబాటులో లేదు"</item> + <item msgid="4544919905196727508">"ఆఫ్లో ఉంది"</item> + <item msgid="3422023746567004609">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"అందుబాటులో లేదు"</item> + <item msgid="7571394439974244289">"ఆఫ్లో ఉంది"</item> + <item msgid="6866424167599381915">"ఆన్లో ఉంది"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"అందుబాటులో లేదు"</item> + <item msgid="2710157085538036590">"ఆఫ్లో ఉంది"</item> + <item msgid="7809470840976856149">"ఆన్లో ఉంది"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index e63aaadc94b0..8b28b0eec542 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"ตั้งค่าเพื่อซื้อสินค้าและบริการด้วยโทรศัพท์ได้อย่างรวดเร็วและปลอดภัยยิ่งขึ้น"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"แสดงทั้งหมด"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ปลดล็อกเพื่อชำระเงิน"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"ไม่ได้ตั้งค่า"</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_device_locked" msgid="5175862019125370506">"ปลดล็อกเพื่อใช้"</string> <string name="wallet_error_generic" msgid="257704570182963611">"เกิดปัญหาในการดึงข้อมูลบัตรของคุณ โปรดลองอีกครั้งในภายหลัง"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"การตั้งค่าหน้าจอล็อก"</string> @@ -746,7 +747,7 @@ <string name="notification_channel_summary_priority_dnd" msgid="6665395023264154361">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก แสดงในโหมดห้ามรบกวน"</string> <string name="notification_channel_summary_priority_all" msgid="7151752959650048285">"แสดงที่ด้านบนของการแจ้งเตือนการสนทนาและเป็นรูปโปรไฟล์บนหน้าจอล็อก ปรากฏเป็นบับเบิล แสดงในโหมดห้ามรบกวน"</string> <string name="notification_conversation_channel_settings" msgid="2409977688430606835">"การตั้งค่า"</string> - <string name="notification_priority_title" msgid="2079708866333537093">"ลำดับความสำคัญ"</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> <string name="notification_multichannel_desc" msgid="7414593090056236179">"การแจ้งเตือนกลุ่มนี้กำหนดค่าที่นี่ไม่ได้"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"เปิดการสนทนา"</string> <string name="select_conversation_title" msgid="6716364118095089519">"วิดเจ็ตการสนทนา"</string> <string name="select_conversation_text" msgid="3376048251434956013">"แตะการสนทนาเพื่อเพิ่มไปยังหน้าจอหลัก"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"การสนทนาล่าสุดของคุณจะแสดงขึ้นที่นี่"</string> <string name="priority_conversations" msgid="3967482288896653039">"การสนทนาสำคัญ"</string> <string name="recent_conversations" msgid="8531874684782574622">"การสนทนาล่าสุด"</string> <string name="okay" msgid="6490552955618608554">"ตกลง"</string> @@ -1145,10 +1145,12 @@ <string name="messages_count_overflow_indicator" msgid="7850934067082006043">"<xliff:g id="NUMBER">%d</xliff:g>+"</string> <string name="people_tile_description" msgid="8154966188085545556">"ดูข้อความล่าสุด สายที่ไม่ได้รับ และการอัปเดตสถานะ"</string> <string name="people_tile_title" msgid="6589377493334871272">"การสนทนา"</string> - <!-- no translation found for paused_by_dnd (7856941866433556428) --> + <string name="paused_by_dnd" msgid="7856941866433556428">"หยุดชั่วคราวโดยฟีเจอร์ห้ามรบกวน"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> <skip /> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> ส่งข้อความ"</string> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> ส่งรูปภาพ"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"พบปัญหาในการอ่านเครื่องวัดแบตเตอรี่"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"แตะดูข้อมูลเพิ่มเติม"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"ไม่มีการตั้งปลุก"</string> diff --git a/packages/SystemUI/res/values-th/tiles_states_strings.xml b/packages/SystemUI/res/values-th/tiles_states_strings.xml new file mode 100644 index 000000000000..2152e1c4a236 --- /dev/null +++ b/packages/SystemUI/res/values-th/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"ไม่พร้อมใช้งาน"</item> + <item msgid="3048856902433862868">"ปิด"</item> + <item msgid="6877982264300789870">"เปิด"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"ไม่พร้อมใช้งาน"</item> + <item msgid="4293012229142257455">"ปิด"</item> + <item msgid="6221288736127914861">"เปิด"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"ไม่พร้อมใช้งาน"</item> + <item msgid="2074416252859094119">"ปิด"</item> + <item msgid="287997784730044767">"เปิด"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"ไม่พร้อมใช้งาน"</item> + <item msgid="7838121007534579872">"ปิด"</item> + <item msgid="1578872232501319194">"เปิด"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"ไม่พร้อมใช้งาน"</item> + <item msgid="5376619709702103243">"ปิด"</item> + <item msgid="4875147066469902392">"เปิด"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"ไม่พร้อมใช้งาน"</item> + <item msgid="5044688398303285224">"ปิด"</item> + <item msgid="8527389108867454098">"เปิด"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"ไม่พร้อมใช้งาน"</item> + <item msgid="5776427577477729185">"ปิด"</item> + <item msgid="7105052717007227415">"เปิด"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"ไม่พร้อมใช้งาน"</item> + <item msgid="5315121904534729843">"ปิด"</item> + <item msgid="503679232285959074">"เปิด"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"ไม่พร้อมใช้งาน"</item> + <item msgid="4801037224991420996">"ปิด"</item> + <item msgid="1982293347302546665">"เปิด"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"ไม่พร้อมใช้งาน"</item> + <item msgid="4813655083852587017">"ปิด"</item> + <item msgid="6744077414775180687">"เปิด"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"ไม่พร้อมใช้งาน"</item> + <item msgid="5715725170633593906">"ปิด"</item> + <item msgid="2075645297847971154">"เปิด"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"ไม่พร้อมใช้งาน"</item> + <item msgid="9103697205127645916">"ปิด"</item> + <item msgid="8067744885820618230">"เปิด"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"ไม่พร้อมใช้งาน"</item> + <item msgid="6983679487661600728">"ปิด"</item> + <item msgid="7520663805910678476">"เปิด"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"ไม่พร้อมใช้งาน"</item> + <item msgid="400477985171353">"ปิด"</item> + <item msgid="630890598801118771">"เปิด"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"ไม่พร้อมใช้งาน"</item> + <item msgid="8045580926543311193">"ปิด"</item> + <item msgid="4913460972266982499">"เปิด"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"ไม่พร้อมใช้งาน"</item> + <item msgid="1488620600954313499">"ปิด"</item> + <item msgid="588467578853244035">"เปิด"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"ไม่พร้อมใช้งาน"</item> + <item msgid="2744885441164350155">"ปิด"</item> + <item msgid="151121227514952197">"เปิด"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"ไม่พร้อมใช้งาน"</item> + <item msgid="8259411607272330225">"ปิด"</item> + <item msgid="578444932039713369">"เปิด"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"ไม่พร้อมใช้งาน"</item> + <item msgid="8707481475312432575">"ปิด"</item> + <item msgid="8031106212477483874">"เปิด"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"ไม่พร้อมใช้งาน"</item> + <item msgid="4572245614982283078">"ปิด"</item> + <item msgid="6536448410252185664">"เปิด"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"ไม่พร้อมใช้งาน"</item> + <item msgid="4765607635752003190">"ปิด"</item> + <item msgid="1697460731949649844">"เปิด"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"ไม่พร้อมใช้งาน"</item> + <item msgid="3296179158646568218">"ปิด"</item> + <item msgid="8998632451221157987">"เปิด"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"ไม่พร้อมใช้งาน"</item> + <item msgid="4544919905196727508">"ปิด"</item> + <item msgid="3422023746567004609">"เปิด"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"ไม่พร้อมใช้งาน"</item> + <item msgid="7571394439974244289">"ปิด"</item> + <item msgid="6866424167599381915">"เปิด"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"ไม่พร้อมใช้งาน"</item> + <item msgid="2710157085538036590">"ปิด"</item> + <item msgid="7809470840976856149">"เปิด"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 7b4a4d18bc55..096581606b84 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"I-set up para makapagsagawa ng mas mabibilis, mas secure na pagbili gamit ang telepono mo"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Ipakita lahat"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"I-unlock para magbayad"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Hindi naka-set up"</string> + <string name="wallet_secondary_label_no_card" msgid="530725155985223497">"Magdagdag ng card"</string> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Ina-update"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"I-unlock para magamit"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Nagkaproblema sa pagkuha ng iyong mga card, pakisubukan ulit sa ibang pagkakataon"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Mga setting ng lock screen"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"Buksan ang pag-uusap"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Mga widget ng pag-uusap"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Mag-tap sa isang pag-uusap para idagdag ito sa iyong Home screen"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Lalabas dito ang mga kamakailan mong pag-uusap"</string> <string name="priority_conversations" msgid="3967482288896653039">"Mga priyoridad na pag-uusap"</string> <string name="recent_conversations" msgid="8531874684782574622">"Mga kamakailang pag-uusap"</string> <string name="okay" msgid="6490552955618608554">"Okay"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Tingnan ang mga kamakailang mensahe, hindi nasagot na tawag, at update sa status"</string> <string name="people_tile_title" msgid="6589377493334871272">"Pag-uusap"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Na-pause ng Huwag Istorbohin"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"Nagpadala si <xliff:g id="NAME">%1$s</xliff:g> ng mensahe"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"Nagpadala si <xliff:g id="NAME">%1$s</xliff:g> ng larawan"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Nagkaproblema sa pagbabasa ng iyong battery meter"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"I-tap para sa higit pang impormasyon"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Walang alarm"</string> diff --git a/packages/SystemUI/res/values-tl/tiles_states_strings.xml b/packages/SystemUI/res/values-tl/tiles_states_strings.xml new file mode 100644 index 000000000000..83b9f1864ffb --- /dev/null +++ b/packages/SystemUI/res/values-tl/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Hindi available"</item> + <item msgid="3048856902433862868">"Naka-off"</item> + <item msgid="6877982264300789870">"Naka-on"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Hindi available"</item> + <item msgid="4293012229142257455">"Naka-off"</item> + <item msgid="6221288736127914861">"Naka-on"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Hindi available"</item> + <item msgid="2074416252859094119">"Naka-off"</item> + <item msgid="287997784730044767">"Naka-on"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Hindi available"</item> + <item msgid="7838121007534579872">"Naka-off"</item> + <item msgid="1578872232501319194">"Naka-on"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Hindi available"</item> + <item msgid="5376619709702103243">"Naka-off"</item> + <item msgid="4875147066469902392">"Naka-on"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Hindi available"</item> + <item msgid="5044688398303285224">"Naka-off"</item> + <item msgid="8527389108867454098">"Naka-on"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Hindi available"</item> + <item msgid="5776427577477729185">"Naka-off"</item> + <item msgid="7105052717007227415">"Naka-on"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Hindi available"</item> + <item msgid="5315121904534729843">"Naka-off"</item> + <item msgid="503679232285959074">"Naka-on"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Hindi available"</item> + <item msgid="4801037224991420996">"Naka-off"</item> + <item msgid="1982293347302546665">"Naka-on"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Hindi available"</item> + <item msgid="4813655083852587017">"Naka-off"</item> + <item msgid="6744077414775180687">"Naka-on"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Hindi available"</item> + <item msgid="5715725170633593906">"Naka-off"</item> + <item msgid="2075645297847971154">"Naka-on"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Hindi available"</item> + <item msgid="9103697205127645916">"Naka-off"</item> + <item msgid="8067744885820618230">"Naka-on"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Hindi available"</item> + <item msgid="6983679487661600728">"Naka-off"</item> + <item msgid="7520663805910678476">"Naka-on"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Hindi available"</item> + <item msgid="400477985171353">"Naka-off"</item> + <item msgid="630890598801118771">"Naka-on"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Hindi available"</item> + <item msgid="8045580926543311193">"Naka-off"</item> + <item msgid="4913460972266982499">"Naka-on"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Hindi available"</item> + <item msgid="1488620600954313499">"Naka-off"</item> + <item msgid="588467578853244035">"Naka-on"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Hindi available"</item> + <item msgid="2744885441164350155">"Naka-off"</item> + <item msgid="151121227514952197">"Naka-on"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Hindi available"</item> + <item msgid="8259411607272330225">"Naka-off"</item> + <item msgid="578444932039713369">"Naka-on"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Hindi available"</item> + <item msgid="8707481475312432575">"Naka-off"</item> + <item msgid="8031106212477483874">"Naka-on"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Hindi available"</item> + <item msgid="4572245614982283078">"Naka-off"</item> + <item msgid="6536448410252185664">"Naka-on"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Hindi available"</item> + <item msgid="4765607635752003190">"Naka-off"</item> + <item msgid="1697460731949649844">"Naka-on"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Hindi available"</item> + <item msgid="3296179158646568218">"Naka-off"</item> + <item msgid="8998632451221157987">"Naka-on"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Hindi available"</item> + <item msgid="4544919905196727508">"Naka-off"</item> + <item msgid="3422023746567004609">"Naka-on"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Hindi available"</item> + <item msgid="7571394439974244289">"Naka-off"</item> + <item msgid="6866424167599381915">"Naka-on"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Hindi available"</item> + <item msgid="2710157085538036590">"Naka-off"</item> + <item msgid="7809470840976856149">"Naka-on"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index fba8b30afb43..ec213e44b1c0 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Telefonunuzla daha hızlı ve güvenli satın alma işlemleri gerçekleştirmek için gerekli ayarları yapın"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Tümünü göster"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Ödeme için kilidi aç"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Ayarlanmadı"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Kullanmak için kilidi aç"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Kartlarınız alınırken bir sorun oluştu. Lütfen daha sonra tekrar deneyin"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Kilit ekranı ayarları"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Görüşmeyi aç"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Görüşme widget\'ları"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Ana ekranınıza eklemek için bir ileti dizisine dokunun"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Son görüşmeleriniz burada gösterilir"</string> <string name="priority_conversations" msgid="3967482288896653039">"Öncelikli görüşmeler"</string> <string name="recent_conversations" msgid="8531874684782574622">"Son görüşmeler"</string> <string name="okay" msgid="6490552955618608554">"Tamam"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Yeni mesajları, cevapsız aramaları ve durum güncellemelerini görün"</string> <string name="people_tile_title" msgid="6589377493334871272">"Görüşme"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Rahatsız Etmeyin özelliği tarafından duraklatıldı"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> bir mesaj gönderdi"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> bir resim gönderdi"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Pil ölçeriniz okunurken sorun oluştu"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Daha fazla bilgi için dokunun"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Alarm ayarlanmadı"</string> diff --git a/packages/SystemUI/res/values-tr/tiles_states_strings.xml b/packages/SystemUI/res/values-tr/tiles_states_strings.xml new file mode 100644 index 000000000000..c550004a0a5f --- /dev/null +++ b/packages/SystemUI/res/values-tr/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Kullanılamıyor"</item> + <item msgid="3048856902433862868">"Kapalı"</item> + <item msgid="6877982264300789870">"Açık"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Kullanılamıyor"</item> + <item msgid="4293012229142257455">"Kapalı"</item> + <item msgid="6221288736127914861">"Açık"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Kullanılamıyor"</item> + <item msgid="2074416252859094119">"Kapalı"</item> + <item msgid="287997784730044767">"Açık"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Kullanılamıyor"</item> + <item msgid="7838121007534579872">"Kapalı"</item> + <item msgid="1578872232501319194">"Açık"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Kullanılamıyor"</item> + <item msgid="5376619709702103243">"Kapalı"</item> + <item msgid="4875147066469902392">"Açık"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Kullanılamıyor"</item> + <item msgid="5044688398303285224">"Kapalı"</item> + <item msgid="8527389108867454098">"Açık"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Kullanılamıyor"</item> + <item msgid="5776427577477729185">"Kapalı"</item> + <item msgid="7105052717007227415">"Açık"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Kullanılamıyor"</item> + <item msgid="5315121904534729843">"Kapalı"</item> + <item msgid="503679232285959074">"Açık"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Kullanılamıyor"</item> + <item msgid="4801037224991420996">"Kapalı"</item> + <item msgid="1982293347302546665">"Açık"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Kullanılamıyor"</item> + <item msgid="4813655083852587017">"Kapalı"</item> + <item msgid="6744077414775180687">"Açık"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Kullanılamıyor"</item> + <item msgid="5715725170633593906">"Kapalı"</item> + <item msgid="2075645297847971154">"Açık"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Kullanılamıyor"</item> + <item msgid="9103697205127645916">"Kapalı"</item> + <item msgid="8067744885820618230">"Açık"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Kullanılamıyor"</item> + <item msgid="6983679487661600728">"Kapalı"</item> + <item msgid="7520663805910678476">"Açık"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Kullanılamıyor"</item> + <item msgid="400477985171353">"Kapalı"</item> + <item msgid="630890598801118771">"Açık"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Kullanılamıyor"</item> + <item msgid="8045580926543311193">"Kapalı"</item> + <item msgid="4913460972266982499">"Açık"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Kullanılamıyor"</item> + <item msgid="1488620600954313499">"Kapalı"</item> + <item msgid="588467578853244035">"Açık"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Kullanılamıyor"</item> + <item msgid="2744885441164350155">"Kapalı"</item> + <item msgid="151121227514952197">"Açık"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Kullanılamıyor"</item> + <item msgid="8259411607272330225">"Kapalı"</item> + <item msgid="578444932039713369">"Açık"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Kullanılamıyor"</item> + <item msgid="8707481475312432575">"Kapalı"</item> + <item msgid="8031106212477483874">"Açık"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Kullanılamıyor"</item> + <item msgid="4572245614982283078">"Kapalı"</item> + <item msgid="6536448410252185664">"Açık"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Kullanılamıyor"</item> + <item msgid="4765607635752003190">"Kapalı"</item> + <item msgid="1697460731949649844">"Açık"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Kullanılamıyor"</item> + <item msgid="3296179158646568218">"Kapalı"</item> + <item msgid="8998632451221157987">"Açık"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Kullanılamıyor"</item> + <item msgid="4544919905196727508">"Kapalı"</item> + <item msgid="3422023746567004609">"Açık"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Kullanılamıyor"</item> + <item msgid="7571394439974244289">"Kapalı"</item> + <item msgid="6866424167599381915">"Açık"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Kullanılamıyor"</item> + <item msgid="2710157085538036590">"Kapalı"</item> + <item msgid="7809470840976856149">"Açık"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index b80ed19aebdc..fe78c01d3554 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -675,7 +675,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Швидше й безпечніше сплачуйте за покупки за допомогою телефона"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Показати все"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Розблокувати, щоб сплатити"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Не налаштовано"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1127,8 +1130,7 @@ <string name="basic_status" msgid="2315371112182658176">"Відкрита розмова"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Віджети розмов"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Натисніть розмову, щоб додати її на головний екран"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Тут з’являтимуться нещодавні розмови"</string> <string name="priority_conversations" msgid="3967482288896653039">"Важливі розмови"</string> <string name="recent_conversations" msgid="8531874684782574622">"Нещодавні розмови"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1158,8 +1160,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Переглядайте останні повідомлення, пропущені виклики й оновлення статусу"</string> <string name="people_tile_title" msgid="6589377493334871272">"Розмова"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Призупинено функцією \"Не турбувати\""</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> надсилає повідомлення"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> надсилає зображення"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Не вдалось отримати дані лічильника акумулятора"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Натисніть, щоб дізнатися більше"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Немає будильників"</string> diff --git a/packages/SystemUI/res/values-uk/tiles_states_strings.xml b/packages/SystemUI/res/values-uk/tiles_states_strings.xml new file mode 100644 index 000000000000..642064748860 --- /dev/null +++ b/packages/SystemUI/res/values-uk/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Недоступно"</item> + <item msgid="3048856902433862868">"Вимкнено"</item> + <item msgid="6877982264300789870">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Недоступно"</item> + <item msgid="4293012229142257455">"Вимкнено"</item> + <item msgid="6221288736127914861">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Недоступно"</item> + <item msgid="2074416252859094119">"Вимкнено"</item> + <item msgid="287997784730044767">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Недоступно"</item> + <item msgid="7838121007534579872">"Вимкнено"</item> + <item msgid="1578872232501319194">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Недоступно"</item> + <item msgid="5376619709702103243">"Вимкнено"</item> + <item msgid="4875147066469902392">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Недоступно"</item> + <item msgid="5044688398303285224">"Вимкнено"</item> + <item msgid="8527389108867454098">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Недоступно"</item> + <item msgid="5776427577477729185">"Вимкнено"</item> + <item msgid="7105052717007227415">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Недоступно"</item> + <item msgid="5315121904534729843">"Вимкнено"</item> + <item msgid="503679232285959074">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Недоступно"</item> + <item msgid="4801037224991420996">"Вимкнено"</item> + <item msgid="1982293347302546665">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Недоступно"</item> + <item msgid="4813655083852587017">"Вимкнено"</item> + <item msgid="6744077414775180687">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Недоступно"</item> + <item msgid="5715725170633593906">"Вимкнено"</item> + <item msgid="2075645297847971154">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Недоступно"</item> + <item msgid="9103697205127645916">"Вимкнено"</item> + <item msgid="8067744885820618230">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Недоступно"</item> + <item msgid="6983679487661600728">"Вимкнено"</item> + <item msgid="7520663805910678476">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Недоступно"</item> + <item msgid="400477985171353">"Вимкнено"</item> + <item msgid="630890598801118771">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Недоступно"</item> + <item msgid="8045580926543311193">"Вимкнено"</item> + <item msgid="4913460972266982499">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Недоступно"</item> + <item msgid="1488620600954313499">"Вимкнено"</item> + <item msgid="588467578853244035">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Недоступно"</item> + <item msgid="2744885441164350155">"Вимкнено"</item> + <item msgid="151121227514952197">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Недоступно"</item> + <item msgid="8259411607272330225">"Вимкнено"</item> + <item msgid="578444932039713369">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Недоступно"</item> + <item msgid="8707481475312432575">"Вимкнено"</item> + <item msgid="8031106212477483874">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Недоступно"</item> + <item msgid="4572245614982283078">"Вимкнено"</item> + <item msgid="6536448410252185664">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Недоступно"</item> + <item msgid="4765607635752003190">"Вимкнено"</item> + <item msgid="1697460731949649844">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Недоступно"</item> + <item msgid="3296179158646568218">"Вимкнено"</item> + <item msgid="8998632451221157987">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Недоступно"</item> + <item msgid="4544919905196727508">"Вимкнено"</item> + <item msgid="3422023746567004609">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Недоступно"</item> + <item msgid="7571394439974244289">"Вимкнено"</item> + <item msgid="6866424167599381915">"Увімкнено"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Недоступно"</item> + <item msgid="2710157085538036590">"Вимкнено"</item> + <item msgid="7809470840976856149">"Увімкнено"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 22883832cabe..0e508f203da9 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"اپنے فون سے تیز تر مزید محفوظ خریداریاں کرنے کے لیے، سیٹ اپ مکمل کریں"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"سبھی دکھائیں"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"ادائیگی کرنے کے لیے غیر مقفل کریں"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"سیٹ اپ نہیں کیا گیا"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <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> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"گفتگو کھولیں"</string> <string name="select_conversation_title" msgid="6716364118095089519">"گفتگو ویجیٹس"</string> <string name="select_conversation_text" msgid="3376048251434956013">"اسے اپنے ہوم اسکرین پر شامل کرنے کے لیے گفتگو پر تھپتھپائیں"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"آپ کی حالیہ گفتگوئیں یہاں دکھائی دیں گی"</string> <string name="priority_conversations" msgid="3967482288896653039">"ترجیحی گفتگوئیں"</string> <string name="recent_conversations" msgid="8531874684782574622">"حالیہ گفتگوئیں"</string> <string name="okay" msgid="6490552955618608554">"ٹھیک ہے"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"حالیہ پیغامات، چھوٹی ہوئی کالز اور اسٹیٹس اپ ڈیٹس دیکھیں"</string> <string name="people_tile_title" msgid="6589377493334871272">"گفتگو"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"\'ڈسٹرب نہ کریں\' کے ذریعے موقوف کیا گیا"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک پیغام بھیجا"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> نے ایک تصویر بھیجی"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"مزید معلومات کے لیے تھپتھپائیں"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"کوئی الارم سیٹ نہیں ہے"</string> diff --git a/packages/SystemUI/res/values-ur/tiles_states_strings.xml b/packages/SystemUI/res/values-ur/tiles_states_strings.xml new file mode 100644 index 000000000000..b8d8cf54cf81 --- /dev/null +++ b/packages/SystemUI/res/values-ur/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"دستیاب نہیں ہے"</item> + <item msgid="3048856902433862868">"آف ہے"</item> + <item msgid="6877982264300789870">"آن ہے"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"دستیاب نہیں ہے"</item> + <item msgid="4293012229142257455">"آف ہے"</item> + <item msgid="6221288736127914861">"آن ہے"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"دستیاب نہیں ہے"</item> + <item msgid="2074416252859094119">"آف ہے"</item> + <item msgid="287997784730044767">"آن ہے"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"دستیاب نہیں ہے"</item> + <item msgid="7838121007534579872">"آف ہے"</item> + <item msgid="1578872232501319194">"آن ہے"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"دستیاب نہیں ہے"</item> + <item msgid="5376619709702103243">"آف ہے"</item> + <item msgid="4875147066469902392">"آن ہے"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"دستیاب نہیں ہے"</item> + <item msgid="5044688398303285224">"آف ہے"</item> + <item msgid="8527389108867454098">"آن ہے"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"دستیاب نہیں ہے"</item> + <item msgid="5776427577477729185">"آف ہے"</item> + <item msgid="7105052717007227415">"آن ہے"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"دستیاب نہیں ہے"</item> + <item msgid="5315121904534729843">"آف ہے"</item> + <item msgid="503679232285959074">"آن ہے"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"دستیاب نہیں ہے"</item> + <item msgid="4801037224991420996">"آف ہے"</item> + <item msgid="1982293347302546665">"آن ہے"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"دستیاب نہیں ہے"</item> + <item msgid="4813655083852587017">"آف ہے"</item> + <item msgid="6744077414775180687">"آن ہے"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"دستیاب نہیں ہے"</item> + <item msgid="5715725170633593906">"آف ہے"</item> + <item msgid="2075645297847971154">"آن ہے"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"دستیاب نہیں ہے"</item> + <item msgid="9103697205127645916">"آف ہے"</item> + <item msgid="8067744885820618230">"آن ہے"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"دستیاب نہیں ہے"</item> + <item msgid="6983679487661600728">"آف ہے"</item> + <item msgid="7520663805910678476">"آن ہے"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"دستیاب نہیں ہے"</item> + <item msgid="400477985171353">"آف ہے"</item> + <item msgid="630890598801118771">"آن ہے"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"دستیاب نہیں ہے"</item> + <item msgid="8045580926543311193">"آف ہے"</item> + <item msgid="4913460972266982499">"آن ہے"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"دستیاب نہیں ہے"</item> + <item msgid="1488620600954313499">"آف ہے"</item> + <item msgid="588467578853244035">"آن ہے"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"دستیاب نہیں ہے"</item> + <item msgid="2744885441164350155">"آف ہے"</item> + <item msgid="151121227514952197">"آن ہے"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"دستیاب نہیں ہے"</item> + <item msgid="8259411607272330225">"آف ہے"</item> + <item msgid="578444932039713369">"آن ہے"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"دستیاب نہیں ہے"</item> + <item msgid="8707481475312432575">"آف ہے"</item> + <item msgid="8031106212477483874">"آن ہے"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"دستیاب نہیں ہے"</item> + <item msgid="4572245614982283078">"آف ہے"</item> + <item msgid="6536448410252185664">"آن ہے"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"دستیاب نہیں ہے"</item> + <item msgid="4765607635752003190">"آف ہے"</item> + <item msgid="1697460731949649844">"آن ہے"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"دستیاب نہیں ہے"</item> + <item msgid="3296179158646568218">"آف ہے"</item> + <item msgid="8998632451221157987">"آن ہے"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"دستیاب نہیں ہے"</item> + <item msgid="4544919905196727508">"آف ہے"</item> + <item msgid="3422023746567004609">"آن ہے"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"دستیاب نہیں ہے"</item> + <item msgid="7571394439974244289">"آف ہے"</item> + <item msgid="6866424167599381915">"آن ہے"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"دستیاب نہیں ہے"</item> + <item msgid="2710157085538036590">"آف ہے"</item> + <item msgid="7809470840976856149">"آن ہے"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index d785bdf9b971..02a6177faf25 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Telefonda tezroq va xavfsizroq xarid qilish uchun sozlang"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Hammasi"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Toʻlov uchun qulfdan chiqarish"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Sozlanmagan"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Yangilanmoqda"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Foydalanish uchun qulfdan chiqarish"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Bildirgilarni yuklashda xatolik yuz berdi, keyinroq qaytadan urining"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Qulflangan ekran sozlamalari"</string> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"Suhbatni ochish"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Suhbat vidjetlari"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Bosh ekranga chiqariladigan suhbat ustiga bosing"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Oxirgi suhbatlaringiz shu yerda chiqadi"</string> <string name="priority_conversations" msgid="3967482288896653039">"Muhim suhbatlar"</string> <string name="recent_conversations" msgid="8531874684782574622">"Oxirgi suhbatlar"</string> <string name="okay" msgid="6490552955618608554">"OK"</string> @@ -1146,8 +1147,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Oxirgi xabarlar, javobsiz chaqiruvlar va holat yangilanishlari"</string> <string name="people_tile_title" msgid="6589377493334871272">"Suhbat"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Bezovta qilinmasin rejimi pauza qildi"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> xabar yubordi"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> rasm yubordi"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Batareya quvvati aniqlanmadi"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Batafsil axborot olish uchun bosing"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Signal sozlanmagan"</string> diff --git a/packages/SystemUI/res/values-uz/tiles_states_strings.xml b/packages/SystemUI/res/values-uz/tiles_states_strings.xml new file mode 100644 index 000000000000..dad93cbaa405 --- /dev/null +++ b/packages/SystemUI/res/values-uz/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Ishlamaydi"</item> + <item msgid="3048856902433862868">"Oʻchiq"</item> + <item msgid="6877982264300789870">"Yoniq"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Ishlamaydi"</item> + <item msgid="4293012229142257455">"Oʻchiq"</item> + <item msgid="6221288736127914861">"Yoniq"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Ishlamaydi"</item> + <item msgid="2074416252859094119">"Oʻchiq"</item> + <item msgid="287997784730044767">"Yoniq"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Ishlamaydi"</item> + <item msgid="7838121007534579872">"Oʻchiq"</item> + <item msgid="1578872232501319194">"Yoniq"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Ishlamaydi"</item> + <item msgid="5376619709702103243">"Oʻchiq"</item> + <item msgid="4875147066469902392">"Yoniq"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Ishlamaydi"</item> + <item msgid="5044688398303285224">"Oʻchiq"</item> + <item msgid="8527389108867454098">"Yoniq"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Ishlamaydi"</item> + <item msgid="5776427577477729185">"Oʻchiq"</item> + <item msgid="7105052717007227415">"Yoniq"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Ishlamaydi"</item> + <item msgid="5315121904534729843">"Oʻchiq"</item> + <item msgid="503679232285959074">"Yoniq"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Ishlamaydi"</item> + <item msgid="4801037224991420996">"Oʻchiq"</item> + <item msgid="1982293347302546665">"Yoniq"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Ishlamaydi"</item> + <item msgid="4813655083852587017">"Oʻchiq"</item> + <item msgid="6744077414775180687">"Yoniq"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Ishlamaydi"</item> + <item msgid="5715725170633593906">"Oʻchiq"</item> + <item msgid="2075645297847971154">"Yoniq"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Ishlamaydi"</item> + <item msgid="9103697205127645916">"Oʻchiq"</item> + <item msgid="8067744885820618230">"Yoniq"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Ishlamaydi"</item> + <item msgid="6983679487661600728">"Oʻchiq"</item> + <item msgid="7520663805910678476">"Yoniq"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Ishlamaydi"</item> + <item msgid="400477985171353">"Oʻchiq"</item> + <item msgid="630890598801118771">"Yoniq"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Ishlamaydi"</item> + <item msgid="8045580926543311193">"Oʻchiq"</item> + <item msgid="4913460972266982499">"Yoniq"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Ishlamaydi"</item> + <item msgid="1488620600954313499">"Oʻchiq"</item> + <item msgid="588467578853244035">"Yoniq"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Ishlamaydi"</item> + <item msgid="2744885441164350155">"Oʻchiq"</item> + <item msgid="151121227514952197">"Yoniq"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Ishlamaydi"</item> + <item msgid="8259411607272330225">"Oʻchiq"</item> + <item msgid="578444932039713369">"Yoniq"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Ishlamaydi"</item> + <item msgid="8707481475312432575">"Oʻchiq"</item> + <item msgid="8031106212477483874">"Yoniq"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Ishlamaydi"</item> + <item msgid="4572245614982283078">"Oʻchiq"</item> + <item msgid="6536448410252185664">"Yoniq"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Ishlamaydi"</item> + <item msgid="4765607635752003190">"Oʻchiq"</item> + <item msgid="1697460731949649844">"Yoniq"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Ishlamaydi"</item> + <item msgid="3296179158646568218">"Oʻchiq"</item> + <item msgid="8998632451221157987">"Yoniq"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Ishlamaydi"</item> + <item msgid="4544919905196727508">"Oʻchiq"</item> + <item msgid="3422023746567004609">"Yoniq"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Ishlamaydi"</item> + <item msgid="7571394439974244289">"Oʻchiq"</item> + <item msgid="6866424167599381915">"Yoniq"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Ishlamaydi"</item> + <item msgid="2710157085538036590">"Oʻchiq"</item> + <item msgid="7809470840976856149">"Yoniq"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 96ea6df3b5ea..6f1931fc4583 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -669,7 +669,9 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Thiết lập để mua hàng nhanh hơn và an toàn hơn bằng điện thoại"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Hiện tất cả"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Mở khóa để thanh toán"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Chưa thiết lập"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <string name="wallet_secondary_label_updating" msgid="5726130686114928551">"Đang cập nhật"</string> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Mở khóa để sử dụng"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Đã xảy ra sự cố khi tải thẻ của bạn. Vui lòng thử lại sau"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Cài đặt màn hình khóa"</string> @@ -734,7 +736,7 @@ <string name="notification_channel_summary_low" msgid="4860617986908931158">"Không phát âm thanh hoặc rung"</string> <string name="notification_conversation_summary_low" msgid="1734433426085468009">"Không phát âm thanh hoặc rung và xuất hiện phía dưới trong phần cuộc trò chuyện"</string> <string name="notification_channel_summary_default" msgid="3282930979307248890">"Có thể đổ chuông hoặc rung tùy theo chế độ cài đặt trên điện thoại"</string> - <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Có thể đổ chuông hoặc rung tùy theo chế độ cài đặt trên điện thoại. Theo mặc định, các cuộc trò chuyện từ <xliff:g id="APP_NAME">%1$s</xliff:g> được phép hiển thị dưới dạng bong bóng."</string> + <string name="notification_channel_summary_default_with_bubbles" msgid="1782419896613644568">"Có thể đổ chuông hoặc rung tùy theo chế độ cài đặt trên điện thoại. Các cuộc trò chuyện từ <xliff:g id="APP_NAME">%1$s</xliff:g> sẽ hiện ở dạng bong bóng theo mặc định."</string> <string name="notification_channel_summary_bubble" msgid="7235935211580860537">"Luôn chú ý vào nội dung này bằng phím tắt nổi."</string> <string name="notification_channel_summary_automatic" msgid="5813109268050235275">"Cho phép hệ thống quyết định xem thông báo này phát âm thanh hay rung"</string> <string name="notification_channel_summary_automatic_alerted" msgid="954166812246932240">"<b>Trạng thái:</b> Đã thay đổi thành Mặc định"</string> @@ -1115,8 +1117,7 @@ <string name="basic_status" msgid="2315371112182658176">"Mở cuộc trò chuyện"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Tiện ích trò chuyện"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Nhấn vào một cuộc trò chuyện để thêm cuộc trò chuyện đó vào Màn hình chính"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Các cuộc trò chuyện gần đây của bạn sẽ xuất hiện ở đây"</string> <string name="priority_conversations" msgid="3967482288896653039">"Cuộc trò chuyện ưu tiên"</string> <string name="recent_conversations" msgid="8531874684782574622">"Cuộc trò chuyện gần đây"</string> <string name="okay" msgid="6490552955618608554">"Ok"</string> @@ -1146,8 +1147,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Xem các tin nhắn, cuộc gọi nhỡ và thông tin cập nhật trạng thái gần đây"</string> <string name="people_tile_title" msgid="6589377493334871272">"Cuộc trò chuyện"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Đã tạm dừng do chế độ Không làm phiền"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một tin nhắn"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g> đã gửi một hình ảnh"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Đã xảy ra vấn đề khi đọc dung lượng pin của bạn"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Nhấn để biết thêm thông tin"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Chưa đặt chuông báo"</string> diff --git a/packages/SystemUI/res/values-vi/tiles_states_strings.xml b/packages/SystemUI/res/values-vi/tiles_states_strings.xml new file mode 100644 index 000000000000..df16b221224b --- /dev/null +++ b/packages/SystemUI/res/values-vi/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Không hoạt động"</item> + <item msgid="3048856902433862868">"Đang tắt"</item> + <item msgid="6877982264300789870">"Đang bật"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Không hoạt động"</item> + <item msgid="4293012229142257455">"Đang tắt"</item> + <item msgid="6221288736127914861">"Đang bật"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Không hoạt động"</item> + <item msgid="2074416252859094119">"Đang tắt"</item> + <item msgid="287997784730044767">"Đang bật"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Không hoạt động"</item> + <item msgid="7838121007534579872">"Đang tắt"</item> + <item msgid="1578872232501319194">"Đang bật"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Không hoạt động"</item> + <item msgid="5376619709702103243">"Đang tắt"</item> + <item msgid="4875147066469902392">"Đang bật"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Không hoạt động"</item> + <item msgid="5044688398303285224">"Đang tắt"</item> + <item msgid="8527389108867454098">"Đang bật"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Không hoạt động"</item> + <item msgid="5776427577477729185">"Đang tắt"</item> + <item msgid="7105052717007227415">"Đang bật"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Không hoạt động"</item> + <item msgid="5315121904534729843">"Đang tắt"</item> + <item msgid="503679232285959074">"Đang bật"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Không hoạt động"</item> + <item msgid="4801037224991420996">"Đang tắt"</item> + <item msgid="1982293347302546665">"Đang bật"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Không hoạt động"</item> + <item msgid="4813655083852587017">"Đang tắt"</item> + <item msgid="6744077414775180687">"Đang bật"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Không hoạt động"</item> + <item msgid="5715725170633593906">"Đang tắt"</item> + <item msgid="2075645297847971154">"Đang bật"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Không hoạt động"</item> + <item msgid="9103697205127645916">"Đang tắt"</item> + <item msgid="8067744885820618230">"Đang bật"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Không hoạt động"</item> + <item msgid="6983679487661600728">"Đang tắt"</item> + <item msgid="7520663805910678476">"Đang bật"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Không hoạt động"</item> + <item msgid="400477985171353">"Đang tắt"</item> + <item msgid="630890598801118771">"Đang bật"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Không hoạt động"</item> + <item msgid="8045580926543311193">"Đang tắt"</item> + <item msgid="4913460972266982499">"Đang bật"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Không hoạt động"</item> + <item msgid="1488620600954313499">"Đang tắt"</item> + <item msgid="588467578853244035">"Đang bật"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Không hoạt động"</item> + <item msgid="2744885441164350155">"Đang tắt"</item> + <item msgid="151121227514952197">"Đang bật"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Không hoạt động"</item> + <item msgid="8259411607272330225">"Đang tắt"</item> + <item msgid="578444932039713369">"Đang bật"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Không hoạt động"</item> + <item msgid="8707481475312432575">"Đang tắt"</item> + <item msgid="8031106212477483874">"Đang bật"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Không hoạt động"</item> + <item msgid="4572245614982283078">"Đang tắt"</item> + <item msgid="6536448410252185664">"Đang bật"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Không hoạt động"</item> + <item msgid="4765607635752003190">"Đang tắt"</item> + <item msgid="1697460731949649844">"Đang bật"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Không hoạt động"</item> + <item msgid="3296179158646568218">"Đang tắt"</item> + <item msgid="8998632451221157987">"Đang bật"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Không hoạt động"</item> + <item msgid="4544919905196727508">"Đang tắt"</item> + <item msgid="3422023746567004609">"Đang bật"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Không hoạt động"</item> + <item msgid="7571394439974244289">"Đang tắt"</item> + <item msgid="6866424167599381915">"Đang bật"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Không hoạt động"</item> + <item msgid="2710157085538036590">"Đang tắt"</item> + <item msgid="7809470840976856149">"Đang bật"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index ebffe95c1bef..7cb429b49906 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"开始设置，享受更加快捷安全的手机购物体验"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"全部显示"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"解锁设备才能付款"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"未设置"</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_device_locked" msgid="5175862019125370506">"解锁设备即可使用"</string> <string name="wallet_error_generic" msgid="257704570182963611">"获取您的卡片时出现问题，请稍后重试"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"锁定屏幕设置"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"开放式对话"</string> <string name="select_conversation_title" msgid="6716364118095089519">"对话微件"</string> <string name="select_conversation_text" msgid="3376048251434956013">"点按对话即可将其添加到主屏幕"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"您近期的对话将显示在此处"</string> <string name="priority_conversations" msgid="3967482288896653039">"优先对话"</string> <string name="recent_conversations" msgid="8531874684782574622">"近期对话"</string> <string name="okay" msgid="6490552955618608554">"确定"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"查看近期的消息、未接电话和状态更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"对话"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"勿扰模式已暂停通知"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>发送了一条消息"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>发送了一张图片"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"读取电池计量器时出现问题"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"点按即可了解详情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未设置闹钟"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml new file mode 100644 index 000000000000..0bf03225b2a5 --- /dev/null +++ b/packages/SystemUI/res/values-zh-rCN/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"不可用"</item> + <item msgid="3048856902433862868">"已关闭"</item> + <item msgid="6877982264300789870">"已开启"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"不可用"</item> + <item msgid="4293012229142257455">"已关闭"</item> + <item msgid="6221288736127914861">"已开启"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"不可用"</item> + <item msgid="2074416252859094119">"已关闭"</item> + <item msgid="287997784730044767">"已开启"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"不可用"</item> + <item msgid="7838121007534579872">"已关闭"</item> + <item msgid="1578872232501319194">"已开启"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"不可用"</item> + <item msgid="5376619709702103243">"已关闭"</item> + <item msgid="4875147066469902392">"已开启"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"不可用"</item> + <item msgid="5044688398303285224">"已关闭"</item> + <item msgid="8527389108867454098">"已开启"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"不可用"</item> + <item msgid="5776427577477729185">"已关闭"</item> + <item msgid="7105052717007227415">"已开启"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"不可用"</item> + <item msgid="5315121904534729843">"已关闭"</item> + <item msgid="503679232285959074">"已开启"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"不可用"</item> + <item msgid="4801037224991420996">"已关闭"</item> + <item msgid="1982293347302546665">"已开启"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"不可用"</item> + <item msgid="4813655083852587017">"已关闭"</item> + <item msgid="6744077414775180687">"已开启"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"不可用"</item> + <item msgid="5715725170633593906">"已关闭"</item> + <item msgid="2075645297847971154">"已开启"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"不可用"</item> + <item msgid="9103697205127645916">"已关闭"</item> + <item msgid="8067744885820618230">"已开启"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"不可用"</item> + <item msgid="6983679487661600728">"已关闭"</item> + <item msgid="7520663805910678476">"已开启"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"不可用"</item> + <item msgid="400477985171353">"已关闭"</item> + <item msgid="630890598801118771">"已开启"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"不可用"</item> + <item msgid="8045580926543311193">"已关闭"</item> + <item msgid="4913460972266982499">"已开启"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"不可用"</item> + <item msgid="1488620600954313499">"已关闭"</item> + <item msgid="588467578853244035">"已开启"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"不可用"</item> + <item msgid="2744885441164350155">"已关闭"</item> + <item msgid="151121227514952197">"已开启"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"不可用"</item> + <item msgid="8259411607272330225">"已关闭"</item> + <item msgid="578444932039713369">"已开启"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"不可用"</item> + <item msgid="8707481475312432575">"已关闭"</item> + <item msgid="8031106212477483874">"已开启"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"不可用"</item> + <item msgid="4572245614982283078">"已关闭"</item> + <item msgid="6536448410252185664">"已开启"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"不可用"</item> + <item msgid="4765607635752003190">"已关闭"</item> + <item msgid="1697460731949649844">"已开启"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"不可用"</item> + <item msgid="3296179158646568218">"已关闭"</item> + <item msgid="8998632451221157987">"已开启"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"不可用"</item> + <item msgid="4544919905196727508">"已关闭"</item> + <item msgid="3422023746567004609">"已开启"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"不可用"</item> + <item msgid="7571394439974244289">"已关闭"</item> + <item msgid="6866424167599381915">"已开启"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"不可用"</item> + <item msgid="2710157085538036590">"已关闭"</item> + <item msgid="7809470840976856149">"已开启"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 9cd29aeadcd6..0e773a9e0b8a 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"完成設定後即可透過手機更快速安全地購物"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"顯示全部"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"解鎖裝置才能付款"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"未設定"</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_device_locked" msgid="5175862019125370506">"解鎖即可使用"</string> <string name="wallet_error_generic" msgid="257704570182963611">"擷取資訊卡時發生問題，請稍後再試。"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"上鎖畫面設定"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"開啟對話"</string> <string name="select_conversation_title" msgid="6716364118095089519">"對話小工具"</string> <string name="select_conversation_text" msgid="3376048251434956013">"輕按對話即可新增至主畫面"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"您最近的對話會在這裡顯示"</string> <string name="priority_conversations" msgid="3967482288896653039">"優先對話"</string> <string name="recent_conversations" msgid="8531874684782574622">"最近的對話"</string> <string name="okay" msgid="6490552955618608554">"確定"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"「請勿騷擾」已暫停通知"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>傳送了訊息"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了圖片"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"讀取電池計量器時發生問題"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"輕按即可瞭解詳情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未設定鬧鐘"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml new file mode 100644 index 000000000000..7339a5231bf9 --- /dev/null +++ b/packages/SystemUI/res/values-zh-rHK/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"無法使用"</item> + <item msgid="3048856902433862868">"已關閉"</item> + <item msgid="6877982264300789870">"已開啟"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"無法使用"</item> + <item msgid="4293012229142257455">"已關閉"</item> + <item msgid="6221288736127914861">"已開啟"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"無法使用"</item> + <item msgid="2074416252859094119">"已關閉"</item> + <item msgid="287997784730044767">"已開啟"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"無法使用"</item> + <item msgid="7838121007534579872">"已關閉"</item> + <item msgid="1578872232501319194">"已開啟"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"無法使用"</item> + <item msgid="5376619709702103243">"已關閉"</item> + <item msgid="4875147066469902392">"已開啟"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"無法使用"</item> + <item msgid="5044688398303285224">"已關閉"</item> + <item msgid="8527389108867454098">"已開啟"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"無法使用"</item> + <item msgid="5776427577477729185">"已關閉"</item> + <item msgid="7105052717007227415">"已開啟"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"無法使用"</item> + <item msgid="5315121904534729843">"已關閉"</item> + <item msgid="503679232285959074">"已開啟"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"無法使用"</item> + <item msgid="4801037224991420996">"已關閉"</item> + <item msgid="1982293347302546665">"已開啟"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"無法使用"</item> + <item msgid="4813655083852587017">"已關閉"</item> + <item msgid="6744077414775180687">"已開啟"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"無法使用"</item> + <item msgid="5715725170633593906">"已關閉"</item> + <item msgid="2075645297847971154">"已開啟"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"無法使用"</item> + <item msgid="9103697205127645916">"已關閉"</item> + <item msgid="8067744885820618230">"已開啟"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"無法使用"</item> + <item msgid="6983679487661600728">"已關閉"</item> + <item msgid="7520663805910678476">"已開啟"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"無法使用"</item> + <item msgid="400477985171353">"已關閉"</item> + <item msgid="630890598801118771">"已開啟"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"無法使用"</item> + <item msgid="8045580926543311193">"已關閉"</item> + <item msgid="4913460972266982499">"已開啟"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"無法使用"</item> + <item msgid="1488620600954313499">"已關閉"</item> + <item msgid="588467578853244035">"已開啟"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"無法使用"</item> + <item msgid="2744885441164350155">"已關閉"</item> + <item msgid="151121227514952197">"已開啟"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"無法使用"</item> + <item msgid="8259411607272330225">"已關閉"</item> + <item msgid="578444932039713369">"已開啟"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"無法使用"</item> + <item msgid="8707481475312432575">"已關閉"</item> + <item msgid="8031106212477483874">"已開啟"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"無法使用"</item> + <item msgid="4572245614982283078">"已關閉"</item> + <item msgid="6536448410252185664">"已開啟"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"無法使用"</item> + <item msgid="4765607635752003190">"已關閉"</item> + <item msgid="1697460731949649844">"已開啟"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"無法使用"</item> + <item msgid="3296179158646568218">"已關閉"</item> + <item msgid="8998632451221157987">"已開啟"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"無法使用"</item> + <item msgid="4544919905196727508">"已關閉"</item> + <item msgid="3422023746567004609">"已開啟"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"無法使用"</item> + <item msgid="7571394439974244289">"已關閉"</item> + <item msgid="6866424167599381915">"已開啟"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"無法使用"</item> + <item msgid="2710157085538036590">"已關閉"</item> + <item msgid="7809470840976856149">"已開啟"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 53a281e492c4..787e7b09ebed 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -669,7 +669,8 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"完成相關設定之後，就能以更快速安全的方式透過手機消費"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"顯示全部"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"解鎖裝置才能付款"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"未設定"</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_device_locked" msgid="5175862019125370506">"解鎖即可使用"</string> <string name="wallet_error_generic" msgid="257704570182963611">"擷取卡片時發生問題，請稍後再試"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"螢幕鎖定設定"</string> @@ -1115,8 +1116,7 @@ <string name="basic_status" msgid="2315371112182658176">"開放式對話"</string> <string name="select_conversation_title" msgid="6716364118095089519">"對話小工具"</string> <string name="select_conversation_text" msgid="3376048251434956013">"輕觸對話即可新增至主畫面"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"最近的對話會顯示在這裡"</string> <string name="priority_conversations" msgid="3967482288896653039">"優先對話"</string> <string name="recent_conversations" msgid="8531874684782574622">"最近的對話"</string> <string name="okay" msgid="6490552955618608554">"確定"</string> @@ -1146,8 +1146,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"查看最近的訊息、未接來電和狀態更新"</string> <string name="people_tile_title" msgid="6589377493334871272">"對話"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"零打擾模式已將通知暫停"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一則訊息"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"<xliff:g id="NAME">%1$s</xliff:g>傳送了一張圖片"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"讀取電池計量器時發生問題"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"輕觸即可瞭解詳情"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"未設定鬧鐘"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml b/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml new file mode 100644 index 000000000000..7339a5231bf9 --- /dev/null +++ b/packages/SystemUI/res/values-zh-rTW/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"無法使用"</item> + <item msgid="3048856902433862868">"已關閉"</item> + <item msgid="6877982264300789870">"已開啟"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"無法使用"</item> + <item msgid="4293012229142257455">"已關閉"</item> + <item msgid="6221288736127914861">"已開啟"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"無法使用"</item> + <item msgid="2074416252859094119">"已關閉"</item> + <item msgid="287997784730044767">"已開啟"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"無法使用"</item> + <item msgid="7838121007534579872">"已關閉"</item> + <item msgid="1578872232501319194">"已開啟"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"無法使用"</item> + <item msgid="5376619709702103243">"已關閉"</item> + <item msgid="4875147066469902392">"已開啟"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"無法使用"</item> + <item msgid="5044688398303285224">"已關閉"</item> + <item msgid="8527389108867454098">"已開啟"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"無法使用"</item> + <item msgid="5776427577477729185">"已關閉"</item> + <item msgid="7105052717007227415">"已開啟"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"無法使用"</item> + <item msgid="5315121904534729843">"已關閉"</item> + <item msgid="503679232285959074">"已開啟"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"無法使用"</item> + <item msgid="4801037224991420996">"已關閉"</item> + <item msgid="1982293347302546665">"已開啟"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"無法使用"</item> + <item msgid="4813655083852587017">"已關閉"</item> + <item msgid="6744077414775180687">"已開啟"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"無法使用"</item> + <item msgid="5715725170633593906">"已關閉"</item> + <item msgid="2075645297847971154">"已開啟"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"無法使用"</item> + <item msgid="9103697205127645916">"已關閉"</item> + <item msgid="8067744885820618230">"已開啟"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"無法使用"</item> + <item msgid="6983679487661600728">"已關閉"</item> + <item msgid="7520663805910678476">"已開啟"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"無法使用"</item> + <item msgid="400477985171353">"已關閉"</item> + <item msgid="630890598801118771">"已開啟"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"無法使用"</item> + <item msgid="8045580926543311193">"已關閉"</item> + <item msgid="4913460972266982499">"已開啟"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"無法使用"</item> + <item msgid="1488620600954313499">"已關閉"</item> + <item msgid="588467578853244035">"已開啟"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"無法使用"</item> + <item msgid="2744885441164350155">"已關閉"</item> + <item msgid="151121227514952197">"已開啟"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"無法使用"</item> + <item msgid="8259411607272330225">"已關閉"</item> + <item msgid="578444932039713369">"已開啟"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"無法使用"</item> + <item msgid="8707481475312432575">"已關閉"</item> + <item msgid="8031106212477483874">"已開啟"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"無法使用"</item> + <item msgid="4572245614982283078">"已關閉"</item> + <item msgid="6536448410252185664">"已開啟"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"無法使用"</item> + <item msgid="4765607635752003190">"已關閉"</item> + <item msgid="1697460731949649844">"已開啟"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"無法使用"</item> + <item msgid="3296179158646568218">"已關閉"</item> + <item msgid="8998632451221157987">"已開啟"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"無法使用"</item> + <item msgid="4544919905196727508">"已關閉"</item> + <item msgid="3422023746567004609">"已開啟"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"無法使用"</item> + <item msgid="7571394439974244289">"已關閉"</item> + <item msgid="6866424167599381915">"已開啟"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"無法使用"</item> + <item msgid="2710157085538036590">"已關閉"</item> + <item msgid="7809470840976856149">"已開啟"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 76df48a93059..68799e82e87d 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -669,7 +669,10 @@ <string name="wallet_empty_state_label" msgid="7776761245237530394">"Lungela ukuthenga ngokushesha, ngokuphepha ngefoni yakho"</string> <string name="wallet_app_button_label" msgid="7123784239111190992">"Bonisa konke"</string> <string name="wallet_action_button_label_unlock" msgid="8663239748726774487">"Vula ukuze ukhokhele"</string> - <string name="wallet_secondary_label_no_card" msgid="1282609666895946317">"Akusethiwe"</string> + <!-- no translation found for wallet_secondary_label_no_card (530725155985223497) --> + <skip /> + <!-- no translation found for wallet_secondary_label_updating (5726130686114928551) --> + <skip /> <string name="wallet_secondary_label_device_locked" msgid="5175862019125370506">"Vula ukuze usebenzise"</string> <string name="wallet_error_generic" msgid="257704570182963611">"Kube khona inkinga yokuthola amakhadi akho, sicela uzame futhi ngemuva kwesikhathi"</string> <string name="wallet_lockscreen_settings_label" msgid="3539105300870383570">"Amasethingi okukhiya isikrini"</string> @@ -1115,8 +1118,7 @@ <string name="basic_status" msgid="2315371112182658176">"Vula ingxoxo"</string> <string name="select_conversation_title" msgid="6716364118095089519">"Amawijethi wengxoxo"</string> <string name="select_conversation_text" msgid="3376048251434956013">"Thepha ingxoxo ukuyengeza Kusikrini sakho sasekhaya"</string> - <!-- no translation found for no_conversations_text (5354115541282395015) --> - <skip /> + <string name="no_conversations_text" msgid="5354115541282395015">"Izingxoxo zakho zakamuva zizovela lapha"</string> <string name="priority_conversations" msgid="3967482288896653039">"Izingxoxo ezibalulekile"</string> <string name="recent_conversations" msgid="8531874684782574622">"Izingxoxo zakamuva"</string> <string name="okay" msgid="6490552955618608554">"Kulungile"</string> @@ -1146,8 +1148,11 @@ <string name="people_tile_description" msgid="8154966188085545556">"Bona imiyalezo yakamuva, amakholi akuphuthile, nezibuyekezo zesimo"</string> <string name="people_tile_title" msgid="6589377493334871272">"Ingxoxo"</string> <string name="paused_by_dnd" msgid="7856941866433556428">"Kumiswe okuthi Ungaphazamisi"</string> - <string name="new_notification_text_content_description" msgid="5574393603145263727">"U-<xliff:g id="NAME">%1$s</xliff:g> uthumele umlayezo"</string> + <!-- no translation found for new_notification_text_content_description (2915029960094389291) --> + <skip /> <string name="new_notification_image_content_description" msgid="6017506886810813123">"U-<xliff:g id="NAME">%1$s</xliff:g> uthumele isithombe"</string> + <!-- no translation found for new_status_content_description (6046637888641308327) --> + <skip /> <string name="battery_state_unknown_notification_title" msgid="8464703640483773454">"Kube khona inkinga ngokufunda imitha yakho yebhethri"</string> <string name="battery_state_unknown_notification_text" msgid="13720937839460899">"Thepha ukuze uthole olunye ulwazi"</string> <string name="qs_alarm_tile_no_alarm" msgid="4826472008616807923">"Akukho alamu esethiwe"</string> diff --git a/packages/SystemUI/res/values-zu/tiles_states_strings.xml b/packages/SystemUI/res/values-zu/tiles_states_strings.xml new file mode 100644 index 000000000000..fa2d972d3e6d --- /dev/null +++ b/packages/SystemUI/res/values-zu/tiles_states_strings.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<!-- This resources set the default subtitle for tiles. This way, each tile can be translated + separately. + The indices in the array correspond to the state values in QSTile: + * STATE_UNAVAILABLE + * STATE_INACTIVE + * STATE_ACTIVE + This subtitle is shown when the tile is in that particular state but does not set its own + subtitle, so some of these may never appear on screen. They should still be translated as if + they could appear. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- no translation found for tile_states_default:0 (4578901299524323311) --> + <!-- no translation found for tile_states_default:1 (7086813178962737808) --> + <!-- no translation found for tile_states_default:2 (9192445505551219506) --> + <string-array name="tile_states_internet"> + <item msgid="5499482407653291407">"Akutholakali"</item> + <item msgid="3048856902433862868">"Valiwe"</item> + <item msgid="6877982264300789870">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_wifi"> + <item msgid="8054147400538405410">"Akutholakali"</item> + <item msgid="4293012229142257455">"Valiwe"</item> + <item msgid="6221288736127914861">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_cell"> + <item msgid="1235899788959500719">"Akutholakali"</item> + <item msgid="2074416252859094119">"Valiwe"</item> + <item msgid="287997784730044767">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_battery"> + <item msgid="6311253873330062961">"Akutholakali"</item> + <item msgid="7838121007534579872">"Valiwe"</item> + <item msgid="1578872232501319194">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_dnd"> + <item msgid="467587075903158357">"Akutholakali"</item> + <item msgid="5376619709702103243">"Valiwe"</item> + <item msgid="4875147066469902392">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_flashlight"> + <item msgid="3465257127433353857">"Akutholakali"</item> + <item msgid="5044688398303285224">"Valiwe"</item> + <item msgid="8527389108867454098">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_rotation"> + <item msgid="4578491772376121579">"Akutholakali"</item> + <item msgid="5776427577477729185">"Valiwe"</item> + <item msgid="7105052717007227415">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_bt"> + <item msgid="5330252067413512277">"Akutholakali"</item> + <item msgid="5315121904534729843">"Valiwe"</item> + <item msgid="503679232285959074">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_airplane"> + <item msgid="1985366811411407764">"Akutholakali"</item> + <item msgid="4801037224991420996">"Valiwe"</item> + <item msgid="1982293347302546665">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_location"> + <item msgid="3316542218706374405">"Akutholakali"</item> + <item msgid="4813655083852587017">"Valiwe"</item> + <item msgid="6744077414775180687">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_hotspot"> + <item msgid="3145597331197351214">"Akutholakali"</item> + <item msgid="5715725170633593906">"Valiwe"</item> + <item msgid="2075645297847971154">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_inversion"> + <item msgid="3638187931191394628">"Akutholakali"</item> + <item msgid="9103697205127645916">"Valiwe"</item> + <item msgid="8067744885820618230">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_saver"> + <item msgid="39714521631367660">"Akutholakali"</item> + <item msgid="6983679487661600728">"Valiwe"</item> + <item msgid="7520663805910678476">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_dark"> + <item msgid="2762596907080603047">"Akutholakali"</item> + <item msgid="400477985171353">"Valiwe"</item> + <item msgid="630890598801118771">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_work"> + <item msgid="389523503690414094">"Akutholakali"</item> + <item msgid="8045580926543311193">"Valiwe"</item> + <item msgid="4913460972266982499">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_cast"> + <item msgid="6032026038702435350">"Akutholakali"</item> + <item msgid="1488620600954313499">"Valiwe"</item> + <item msgid="588467578853244035">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_night"> + <item msgid="7857498964264855466">"Akutholakali"</item> + <item msgid="2744885441164350155">"Valiwe"</item> + <item msgid="151121227514952197">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_screenrecord"> + <item msgid="1085836626613341403">"Akutholakali"</item> + <item msgid="8259411607272330225">"Valiwe"</item> + <item msgid="578444932039713369">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_reverse"> + <item msgid="3574611556622963971">"Akutholakali"</item> + <item msgid="8707481475312432575">"Valiwe"</item> + <item msgid="8031106212477483874">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_reduce_brightness"> + <item msgid="1839836132729571766">"Akutholakali"</item> + <item msgid="4572245614982283078">"Valiwe"</item> + <item msgid="6536448410252185664">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_cameratoggle"> + <item msgid="6680671247180519913">"Akutholakali"</item> + <item msgid="4765607635752003190">"Valiwe"</item> + <item msgid="1697460731949649844">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_mictoggle"> + <item msgid="6895831614067195493">"Akutholakali"</item> + <item msgid="3296179158646568218">"Valiwe"</item> + <item msgid="8998632451221157987">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_controls"> + <item msgid="8199009425335668294">"Akutholakali"</item> + <item msgid="4544919905196727508">"Valiwe"</item> + <item msgid="3422023746567004609">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_wallet"> + <item msgid="4177615438710836341">"Akutholakali"</item> + <item msgid="7571394439974244289">"Valiwe"</item> + <item msgid="6866424167599381915">"Vuliwe"</item> + </string-array> + <string-array name="tile_states_alarm"> + <item msgid="4936533380177298776">"Akutholakali"</item> + <item msgid="2710157085538036590">"Valiwe"</item> + <item msgid="7809470840976856149">"Vuliwe"</item> + </string-array> +</resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index d2ed6017b205..b5337d363e12 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -143,6 +143,8 @@ <attr name="handleThickness" format="dimension" /> <attr name="handleColor" format="color" /> <attr name="scrimColor" format="color" /> + <!-- Int [0,255] for the alpha to be applied to scrimColor --> + <attr name="scrimAlpha" format="integer" /> <attr name="containerBackgroundColor" format="color" /> <attr name="isVertical" format="boolean" /> @@ -179,6 +181,7 @@ <attr name="handleThickness" /> <attr name="handleColor" /> <attr name="scrimColor" /> + <attr name="scrimAlpha" /> <attr name="containerBackgroundColor" /> </declare-styleable> @@ -186,6 +189,7 @@ <attr name="handleThickness" /> <attr name="handleColor" /> <attr name="scrimColor" /> + <attr name="scrimAlpha" /> <attr name="borderThickness" format="dimension" /> <attr name="borderColor" format="color" /> </declare-styleable> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index e7edb0e6a57d..2260d2175268 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -199,9 +199,6 @@ <color name="global_screenshot_button_ripple">#1f000000</color> <color name="global_screenshot_background_protection_start">#40000000</color> <!-- 25% black --> - <!-- Long screenshot UI --> - <color name="screenshot_crop_scrim">#6444</color> - <!-- GM2 colors --> <color name="GM2_grey_50">#F8F9FA</color> <color name="GM2_grey_100">#F1F3F4</color> @@ -272,6 +269,7 @@ <color name="misalignment_text_color">#F28B82</color> <color name="screenrecord_status_color">#E94235</color> + <color name="screenrecord_icon_color">#D93025</color><!-- red 600 --> <color name="privacy_chip_background">#3ddc84</color> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 2a1bee5344ec..e22bca7c1283 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -659,13 +659,6 @@ <!--sensorRadius --> </integer-array> - <!-- The properties of the lock icon in pixels. --> - <integer-array name="config_lock_icon_props"> - <!-- X --> - <!-- Y --> - <!-- radius --> - </integer-array> - <!-- Overrides the behavior of the face unlock keyguard bypass setting: 0 - Don't override the setting (default) 1 - Override the setting to always bypass keyguard diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ea54bb4875b7..18388a95fac6 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -208,7 +208,7 @@ <dimen name="keyguard_indication_y_translation">24dp</dimen> <!-- The padding on the bottom of the notifications on the keyguard --> - <dimen name="keyguard_indication_bottom_padding">12sp</dimen> + <dimen name="keyguard_indication_bottom_padding">16sp</dimen> <!-- The padding at start and end of indication text shown on AOD --> <dimen name="keyguard_indication_text_padding">16dp</dimen> @@ -743,6 +743,10 @@ <dimen name="keyguard_clock_lock_margin">16dp</dimen> <!-- The amount to shift the clocks during a small/large transition --> <dimen name="keyguard_clock_switch_y_shift">10dp</dimen> + <!-- When large clock is showing, offset the smartspace by this amount --> + <dimen name="keyguard_smartspace_top_offset">12dp</dimen> + <!-- With the large clock, move up slightly from the center --> + <dimen name="keyguard_large_clock_top_margin">-52dp</dimen> <!-- Default line spacing multiplier between hours and minutes of the keyguard clock --> <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item> @@ -1398,9 +1402,11 @@ <dimen name="controls_dialog_padding">32dp</dimen> <dimen name="controls_dialog_control_width">200dp</dimen> - <!-- Screen Record --> - <dimen name="screenrecord_dialog_padding">18dp</dimen> - <dimen name="screenrecord_logo_size">24dp</dimen> + <!-- Screen record dialog --> + <dimen name="screenrecord_option_padding">18dp</dimen> + <dimen name="screenrecord_logo_size">26dp</dimen> + <dimen name="screenrecord_option_icon_size">24dp</dimen> + <!-- Screen record status bar icon --> <dimen name="screenrecord_status_text_size">14sp</dimen> <dimen name="screenrecord_status_icon_radius">7dp</dimen> <dimen name="screenrecord_status_icon_width">21dp</dimen> @@ -1451,10 +1457,12 @@ <dimen name="people_space_messages_count_radius">12dp</dimen> <dimen name="people_space_widget_background_padding">6dp</dimen> <dimen name="required_width_for_medium">136dp</dimen> + <dimen name="required_height_for_medium">80dp</dimen> <dimen name="required_width_for_large">120dp</dimen> <dimen name="required_height_for_large">168dp</dimen> <dimen name="default_width">146dp</dimen> <dimen name="default_height">92dp</dimen> + <dimen name="avatar_size_for_medium_empty">64dp</dimen> <dimen name="avatar_size_for_medium">52dp</dimen> <dimen name="max_people_avatar_size_for_large_content">64dp</dimen> <dimen name="max_people_avatar_size">108dp</dimen> @@ -1474,7 +1482,10 @@ <dimen name="largest_predefined_icon">32dp</dimen> <dimen name="availability_dot_status_padding">8dp</dimen> <dimen name="availability_dot_notification_padding">12dp</dimen> + <dimen name="availability_dot_shown_padding">4dp</dimen> + <dimen name="availability_dot_missing_padding">12dp</dimen> <dimen name="medium_content_padding_above_name">4dp</dimen> + <dimen name="padding_above_predefined_icon_for_small">4dp</dimen> <dimen name="padding_between_suppressed_layout_items">8dp</dimen> <!-- Accessibility floating menu --> @@ -1544,6 +1555,7 @@ <dimen name="wallet_screen_header_icon_size">56dp</dimen> <dimen name="wallet_screen_header_view_size">80dp</dimen> <dimen name="card_margin">16dp</dimen> + <dimen name="wallet_card_carousel_container_top_margin">48dp</dimen> <dimen name="card_carousel_dot_offset">24dp</dimen> <dimen name="card_carousel_dot_unselected_radius">2dp</dimen> <dimen name="card_carousel_dot_selected_radius">3dp</dimen> diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml index b999e51bdaa5..efa87548af32 100644 --- a/packages/SystemUI/res/values/flags.xml +++ b/packages/SystemUI/res/values/flags.xml @@ -34,7 +34,7 @@ <bool name="flag_conversations">false</bool> <!-- The new animations to/from lockscreen and AOD! --> - <bool name="flag_lockscreen_animations">false</bool> + <bool name="flag_lockscreen_animations">true</bool> <!-- The new swipe to unlock animation, which shows the app/launcher behind the keyguard during the swipe. --> @@ -52,4 +52,6 @@ <bool name="flag_smartspace">false</bool> <bool name="flag_smartspace_deduping">true</bool> + + <bool name="flag_combined_status_bar_signal_icons">false</bool> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index bc1c67c78fef..52627c267edb 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1660,7 +1660,9 @@ <!-- Label of the button underneath the card carousel prompting user unlock device. [CHAR LIMIT=NONE] --> <string name="wallet_action_button_label_unlock">Unlock to pay</string> <!-- Secondary label of the quick access wallet tile if no card. [CHAR LIMIT=NONE] --> - <string name="wallet_secondary_label_no_card">Not set up</string> + <string name="wallet_secondary_label_no_card">Add a card</string> + <!-- Secondary label of the quick access wallet tile if wallet is still updating. [CHAR LIMIT=NONE] --> + <string name="wallet_secondary_label_updating">Updating</string> <!-- Secondary label of the quick access wallet tile if device locked. [CHAR LIMIT=NONE] --> <string name="wallet_secondary_label_device_locked">Unlock to use</string> <!-- Message shown when an unknown failure occurred when fetching cards. [CHAR LIMIT=NONE] --> @@ -2949,9 +2951,11 @@ <!-- Text when the Conversation widget when Do Not Disturb is suppressing the notification. [CHAR LIMIT=50] --> <string name="paused_by_dnd">Paused by Do Not Disturb</string> <!-- Content description text on the Conversation widget when a person has sent a new text message [CHAR LIMIT=150] --> - <string name="new_notification_text_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> sent a message</string> + <string name="new_notification_text_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> sent a message: <xliff:g id="notification" example="Hey! How is your day going">%2$s</xliff:g></string> <!-- Content description text on the Conversation widget when a person has sent a new image message [CHAR LIMIT=150] --> <string name="new_notification_image_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> sent an image</string> + <!-- Content description text on the Conversation widget when a person has a new status posted [CHAR LIMIT=150] --> + <string name="new_status_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> has a status update: <xliff:g id="status" example="Listening to music">%2$s</xliff:g></string> <!-- Title to display in a notification when ACTION_BATTERY_CHANGED.EXTRA_PRESENT field is false [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6d25a5bf588f..17a984e48ff1 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -697,6 +697,15 @@ <item name="android:windowCloseOnTouchOutside">true</item> </style> + <style name="ScreenRecord.Switch"> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> + <item name="android:switchMinWidth">52dp</item> + <item name="android:minHeight">48dp</item> + <item name="android:track">@drawable/settingslib_switch_track</item> + <item name="android:thumb">@drawable/settingslib_switch_thumb</item> + </style> + <!-- Screenshots --> <style name="LongScreenshotActivity" parent="@android:style/Theme.DeviceDefault.DayNight"> <item name="android:windowNoTitle">true</item> diff --git a/packages/SystemUI/res/values/tiles_states_strings.xml b/packages/SystemUI/res/values/tiles_states_strings.xml index 5ac7c1d3c65b..a0920bb8d540 100644 --- a/packages/SystemUI/res/values/tiles_states_strings.xml +++ b/packages/SystemUI/res/values/tiles_states_strings.xml @@ -40,9 +40,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_internet"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for wifi tile: unavailable, off, on. @@ -50,9 +50,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_wifi"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for cell (data) tile: unavailable, off, on. @@ -60,9 +60,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear.[CHAR LIMIT=32] --> <string-array name="tile_states_cell"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for battery (saver) tile: unavailable, off, on. @@ -70,9 +70,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_battery"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for dnd (Do not disturb) tile: unavailable, off, on. @@ -80,9 +80,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_dnd"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for flashlight tile: unavailable, off, on. @@ -90,9 +90,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_flashlight"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for rotation (lock) tile: unavailable, off, on. @@ -100,9 +100,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_rotation"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for bt (bluetooth) tile: unavailable, off, on. @@ -110,16 +110,16 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_bt"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for airplane tile: unavailable, off, on [CHAR LIMIT=32] --> <string-array name="tile_states_airplane"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for location tile: unavailable, off, on. @@ -127,9 +127,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_location"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for hotspot tile: unavailable, off, on. @@ -137,9 +137,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_hotspot"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for (color) inversion tile: unavailable, off, on. @@ -147,9 +147,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_inversion"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for (data) saver tile: unavailable, off, on. @@ -157,9 +157,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_saver"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for dark (mode) tile: unavailable, off, on. @@ -167,9 +167,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_dark"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for work (mode) tile: unavailable, off, on. @@ -177,9 +177,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_work"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for cast tile: unavailable, off, on. @@ -187,9 +187,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_cast"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for night (light) tile: unavailable, off, on. @@ -197,9 +197,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_night"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for screenrecord tile: unavailable, off, on. @@ -207,9 +207,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_screenrecord"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for reverse (charging) tile: unavailable, off, on. @@ -217,9 +217,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_reverse"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for reduce_brightness tile: unavailable, off, on. @@ -227,9 +227,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_reduce_brightness"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for cameratoggle tile: unavailable, off, on. @@ -237,9 +237,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear.[CHAR LIMIT=32] --> <string-array name="tile_states_cameratoggle"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for mictoggle tile: unavailable, off, on. @@ -247,9 +247,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_mictoggle"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for (home) controls tile: unavailable, off, on. @@ -257,9 +257,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_controls"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for (quick access) wallet tile: unavailable, off, on. @@ -267,9 +267,9 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_wallet"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> <!-- State names for alarm tile: unavailable, off, on. @@ -277,8 +277,8 @@ subtitle, so some of these may never appear on screen. They should still be translated as if they could appear. [CHAR LIMIT=32] --> <string-array name="tile_states_alarm"> - <item>@string/tile_unavailable</item> - <item>@string/switch_bar_off</item> - <item>@string/switch_bar_on</item> + <item>Unavailable</item> + <item>Off</item> + <item>On</item> </string-array> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java index 998b318915af..42d628ae69e0 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java @@ -82,8 +82,8 @@ public class PipSurfaceTransactionHelper { final float scale = sourceBounds.width() <= sourceBounds.height() ? (float) destinationBounds.width() / sourceBounds.width() : (float) destinationBounds.height() / sourceBounds.height(); - final float left = destinationBounds.left - insets.left * scale; - final float top = destinationBounds.top - insets.top * scale; + final float left = destinationBounds.left - (insets.left + sourceBounds.left) * scale; + final float top = destinationBounds.top - (insets.top + sourceBounds.top) * scale; mTmpTransform.setScale(scale, scale); final float cornerRadius = getScaledCornerRadius(mTmpDestinationRect, destinationBounds); tx.setMatrix(leash, mTmpTransform, mTmpFloat9) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java index 7dc537c345e0..6594d5f51af3 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java @@ -62,16 +62,15 @@ public class ThumbnailData { } private static Bitmap makeThumbnail(TaskSnapshot snapshot) { - final HardwareBuffer buffer = snapshot.getHardwareBuffer(); Bitmap thumbnail = null; - try { + try (final HardwareBuffer buffer = snapshot.getHardwareBuffer()) { if (buffer != null) { thumbnail = Bitmap.wrapHardwareBuffer(buffer, snapshot.getColorSpace()); } } catch (IllegalArgumentException ex) { // TODO(b/157562905): Workaround for a crash when we get a snapshot without this state Log.e("ThumbnailData", "Unexpected snapshot without USAGE_GPU_SAMPLED_IMAGE: " - + buffer, ex); + + snapshot.getHardwareBuffer(), ex); } if (thumbnail == null) { Point taskSize = snapshot.getTaskSize(); diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java index b3a29a3fec78..b5019b426ad5 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java @@ -292,9 +292,10 @@ public class TaskStackChangeListeners { } case ON_TASK_SNAPSHOT_CHANGED: { Trace.beginSection("onTaskSnapshotChanged"); + final TaskSnapshot snapshot = (TaskSnapshot) msg.obj; + final ThumbnailData thumbnail = new ThumbnailData(snapshot); for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) { - mTaskStackListeners.get(i).onTaskSnapshotChanged(msg.arg1, - new ThumbnailData((TaskSnapshot) msg.obj)); + mTaskStackListeners.get(i).onTaskSnapshotChanged(msg.arg1, thumbnail); } Trace.endSection(); break; diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java index 08076c17dc3a..4b3af34b1df1 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java @@ -94,7 +94,9 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie @Override public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) { if (mKeyguardShowing && !mIsCharging && charging) { - mView.animateCharge(mIsDozing); + mView.animateCharge(() -> { + return mStatusBarStateController.isDozing(); + }); } mIsCharging = charging; } diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java index 63867c0f7308..58b3865facbc 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java @@ -196,20 +196,20 @@ public class AnimatableClockView extends TextView { null /* onAnimationEnd */); } - void animateCharge(boolean isDozing) { + void animateCharge(DozeStateGetter dozeStateGetter) { if (mTextAnimator == null || mTextAnimator.isRunning()) { // Skip charge animation if dozing animation is already playing. return; } Runnable startAnimPhase2 = () -> setTextStyle( - isDozing ? mDozingWeight : mLockScreenWeight/* weight */, + dozeStateGetter.isDozing() ? mDozingWeight : mLockScreenWeight/* weight */, -1, null, true /* animate */, CHARGE_ANIM_DURATION_PHASE_1, 0 /* delay */, null /* onAnimationEnd */); - setTextStyle(isDozing ? mLockScreenWeight : mDozingWeight/* weight */, + setTextStyle(dozeStateGetter.isDozing() ? mLockScreenWeight : mDozingWeight/* weight */, -1, null, true /* animate */, @@ -279,4 +279,8 @@ public class AnimatableClockView extends TextView { context.getResources().getConfiguration().locale); return dtpg.getBestPattern(skeleton); } + + interface DozeStateGetter { + boolean isDozing(); + } } diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java index 4275189cfe26..e7215b8ebe49 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButtonController.java @@ -34,6 +34,7 @@ import androidx.annotation.Nullable; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.keyguard.dagger.KeyguardBouncerScope; +import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.util.EmergencyDialerConstants; @@ -50,6 +51,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { private final TelephonyManager mTelephonyManager; private final PowerManager mPowerManager; private final ActivityTaskManager mActivityTaskManager; + private ShadeController mShadeController; private final TelecomManager mTelecomManager; private final MetricsLogger mMetricsLogger; @@ -79,6 +81,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { ConfigurationController configurationController, KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager, PowerManager powerManager, ActivityTaskManager activityTaskManager, + ShadeController shadeController, @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) { super(view); mConfigurationController = configurationController; @@ -86,6 +89,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { mTelephonyManager = telephonyManager; mPowerManager = powerManager; mActivityTaskManager = activityTaskManager; + mShadeController = shadeController; mTelecomManager = telecomManager; mMetricsLogger = metricsLogger; } @@ -129,6 +133,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { mPowerManager.userActivity(SystemClock.uptimeMillis(), true); } mActivityTaskManager.stopSystemLockTaskMode(); + mShadeController.collapsePanel(false); if (mTelecomManager != null && mTelecomManager.isInCall()) { mTelecomManager.showInCallScreen(false); if (mEmergencyButtonCallback != null) { @@ -167,6 +172,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { private final TelephonyManager mTelephonyManager; private final PowerManager mPowerManager; private final ActivityTaskManager mActivityTaskManager; + private ShadeController mShadeController; @Nullable private final TelecomManager mTelecomManager; private final MetricsLogger mMetricsLogger; @@ -175,6 +181,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { public Factory(ConfigurationController configurationController, KeyguardUpdateMonitor keyguardUpdateMonitor, TelephonyManager telephonyManager, PowerManager powerManager, ActivityTaskManager activityTaskManager, + ShadeController shadeController, @Nullable TelecomManager telecomManager, MetricsLogger metricsLogger) { mConfigurationController = configurationController; @@ -182,6 +189,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { mTelephonyManager = telephonyManager; mPowerManager = powerManager; mActivityTaskManager = activityTaskManager; + mShadeController = shadeController; mTelecomManager = telecomManager; mMetricsLogger = metricsLogger; } @@ -190,6 +198,7 @@ public class EmergencyButtonController extends ViewController<EmergencyButton> { public EmergencyButtonController create(EmergencyButton view) { return new EmergencyButtonController(view, mConfigurationController, mKeyguardUpdateMonitor, mTelephonyManager, mPowerManager, mActivityTaskManager, + mShadeController, mTelecomManager, mMetricsLogger); } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index ef052c4b81ac..a5b25097a56e 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -57,6 +57,7 @@ public class KeyguardClockSwitch extends RelativeLayout { private View mKeyguardStatusArea; /** Mutually exclusive with mKeyguardStatusArea */ private View mSmartspaceView; + private int mSmartspaceTopOffset; /** * Maintain state so that a newly connected plugin can be initialized. @@ -96,6 +97,9 @@ public class KeyguardClockSwitch extends RelativeLayout { mClockSwitchYAmount = mContext.getResources().getDimensionPixelSize( R.dimen.keyguard_clock_switch_y_shift); + + mSmartspaceTopOffset = mContext.getResources().getDimensionPixelSize( + R.dimen.keyguard_smartspace_top_offset); } /** @@ -193,7 +197,7 @@ public class KeyguardClockSwitch extends RelativeLayout { if (indexOfChild(in) == -1) addView(in); direction = -1; smartspaceYTranslation = mSmartspaceView == null ? 0 - : mClockFrame.getTop() - mSmartspaceView.getTop(); + : mClockFrame.getTop() - mSmartspaceView.getTop() + mSmartspaceTopOffset; } else { in = mClockFrame; out = mLargeClockFrame; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index a28d1747f2fe..781f34bfb195 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -189,10 +189,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS .getDimensionPixelSize(R.dimen.below_clock_padding_end); mSmartspaceView.setPaddingRelative(startPadding, 0, endPadding, 0); - // ... but above the large clock - lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT); - lp.addRule(RelativeLayout.BELOW, mSmartspaceView.getId()); - mLargeClockFrame.setLayoutParams(lp); + updateClockLayout(); View nic = mView.findViewById( R.id.left_aligned_notification_icon_container); @@ -235,6 +232,18 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS */ public void onDensityOrFontScaleChanged() { mView.onDensityOrFontScaleChanged(); + + updateClockLayout(); + } + + private void updateClockLayout() { + if (mSmartspaceController.isEnabled()) { + RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, + MATCH_PARENT); + lp.topMargin = getContext().getResources().getDimensionPixelSize( + R.dimen.keyguard_large_clock_top_margin); + mLargeClockFrame.setLayoutParams(lp); + } } /** diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java index 2325b554d507..8fc4240e1054 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java @@ -17,16 +17,20 @@ package com.android.keyguard; import android.content.Context; +import android.content.res.Configuration; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.view.animation.AnimationUtils; +import android.widget.LinearLayout; import com.android.internal.jank.InteractionJankMonitor; import com.android.settingslib.animation.AppearAnimationUtils; import com.android.settingslib.animation.DisappearAnimationUtils; import com.android.systemui.R; +import java.util.List; + /** * Displays a PIN pad for unlocking. */ @@ -64,6 +68,11 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { } @Override + protected void onConfigurationChanged(Configuration newConfig) { + updateMargins(); + } + + @Override protected void resetState() { } @@ -72,6 +81,33 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { return R.id.pinEntry; } + private void updateMargins() { + int bottomMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.num_pad_row_margin_bottom); + + for (ViewGroup vg : List.of(mRow1, mRow2, mRow3)) { + ((LinearLayout.LayoutParams) vg.getLayoutParams()).setMargins(0, 0, 0, bottomMargin); + } + + bottomMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.num_pad_entry_row_margin_bottom); + ((LinearLayout.LayoutParams) mRow0.getLayoutParams()).setMargins(0, 0, 0, bottomMargin); + + if (mEcaView != null) { + int ecaTopMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.keyguard_eca_top_margin); + int ecaBottomMargin = mContext.getResources().getDimensionPixelSize( + R.dimen.keyguard_eca_bottom_margin); + ((LinearLayout.LayoutParams) mEcaView.getLayoutParams()).setMargins(0, ecaTopMargin, + 0, ecaBottomMargin); + } + + View entryView = findViewById(R.id.pinEntry); + ViewGroup.LayoutParams lp = entryView.getLayoutParams(); + lp.height = mContext.getResources().getDimensionPixelSize(R.dimen.keyguard_password_height); + entryView.setLayoutParams(lp); + } + @Override protected void onFinishInflate() { super.onFinishInflate(); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 4827cab3b5c0..fde8213de0c6 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -173,7 +173,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard @Override public void onSwipeUp() { if (!mUpdateMonitor.isFaceDetectionRunning()) { - mUpdateMonitor.requestFaceAuth(); + mUpdateMonitor.requestFaceAuth(true); mKeyguardSecurityCallback.userActivity(); showMessage(null, null); } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index e2e221b79e88..bd000b2effa3 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -315,6 +315,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private RingerModeTracker mRingerModeTracker; private int mFingerprintRunningState = BIOMETRIC_STATE_STOPPED; private int mFaceRunningState = BIOMETRIC_STATE_STOPPED; + private boolean mIsFaceAuthUserRequested; private LockPatternUtils mLockPatternUtils; private final IDreamManager mDreamManager; private boolean mIsDreaming; @@ -1369,7 +1370,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab Trace.endSection(); // on auth success, we sometimes never received an acquired haptic - if (!mPlayedAcquiredHaptic) { + if (!mPlayedAcquiredHaptic && isUdfpsEnrolled()) { playAcquiredHaptic(); } } @@ -1387,7 +1388,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @Override public void onAuthenticationAcquired(int acquireInfo) { handleFingerprintAcquired(acquireInfo); - if (acquireInfo == FingerprintManager.FINGERPRINT_ACQUIRED_GOOD) { + if (acquireInfo == FingerprintManager.FINGERPRINT_ACQUIRED_GOOD + && isUdfpsEnrolled()) { + mPlayedAcquiredHaptic = true; playAcquiredHaptic(); } } @@ -1402,20 +1405,23 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab public void onUdfpsPointerUp(int sensorId) { Log.d(TAG, "onUdfpsPointerUp, sensorId: " + sensorId); } - - private void playAcquiredHaptic() { - if (mAcquiredHapticEnabled && mVibrator != null && isUdfpsEnrolled()) { - mPlayedAcquiredHaptic = true; - String effect = Settings.Global.getString( - mContext.getContentResolver(), - "udfps_acquired_type"); - mVibrator.vibrate(UdfpsController.getVibration(effect, - UdfpsController.EFFECT_TICK), - UdfpsController.VIBRATION_SONIFICATION_ATTRIBUTES); - } - } }; + /** + * Play haptic to signal udfps fingeprrint acquired. + */ + @VisibleForTesting + public void playAcquiredHaptic() { + if (mAcquiredHapticEnabled && mVibrator != null) { + String effect = Settings.Global.getString( + mContext.getContentResolver(), + "udfps_acquired_type"); + mVibrator.vibrate(UdfpsController.getVibration(effect, + UdfpsController.EFFECT_TICK), + UdfpsController.VIBRATION_SONIFICATION_ATTRIBUTES); + } + } + private final FaceManager.FaceDetectionCallback mFaceDetectionCallback = (sensorId, userId, isStrongBiometric) -> { // Trigger the face success path so the bouncer can be shown @@ -2106,12 +2112,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab /** * Requests face authentication if we're on a state where it's allowed. * This will re-trigger auth in case it fails. + * @param userInitiatedRequest true if the user explicitly requested face auth */ - public void requestFaceAuth() { - if (DEBUG) Log.d(TAG, "requestFaceAuth()"); + public void requestFaceAuth(boolean userInitiatedRequest) { + if (DEBUG) Log.d(TAG, "requestFaceAuth() userInitiated=" + userInitiatedRequest); + mIsFaceAuthUserRequested |= userInitiatedRequest; updateFaceListeningState(); } + public boolean isFaceAuthUserRequested() { + return mIsFaceAuthUserRequested; + } + /** * In case face auth is running, cancel it. */ @@ -2128,6 +2140,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mHandler.removeCallbacks(mRetryFaceAuthentication); boolean shouldListenForFace = shouldListenForFace(); if (mFaceRunningState == BIOMETRIC_STATE_RUNNING && !shouldListenForFace) { + mIsFaceAuthUserRequested = false; stopListeningForFace(); } else if (mFaceRunningState != BIOMETRIC_STATE_RUNNING && shouldListenForFace) { startListeningForFace(); diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconView.java b/packages/SystemUI/src/com/android/keyguard/LockIconView.java index 423bd5626da9..c425ddf7eeb1 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconView.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconView.java @@ -16,7 +16,6 @@ package com.android.keyguard; -import android.annotation.NonNull; import android.content.Context; import android.graphics.PointF; import android.graphics.RectF; @@ -24,10 +23,17 @@ import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; +import androidx.annotation.NonNull; + +import com.android.systemui.Dumpable; + +import java.io.FileDescriptor; +import java.io.PrintWriter; + /** * A view positioned under the notification shade. */ -public class LockIconView extends ImageView { +public class LockIconView extends ImageView implements Dumpable { @NonNull private final RectF mSensorRect; @NonNull private PointF mLockIconCenter = new PointF(0f, 0f); private int mRadius; @@ -63,4 +69,11 @@ public class LockIconView extends ImageView { float getLocationTop() { return mLockIconCenter.y - mRadius; } + + + @Override + public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) { + pw.println("Center in px (x, y)= (" + mLockIconCenter.x + ", " + mLockIconCenter.y + ")"); + pw.println("Radius in pixels: " + mRadius); + } } diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index ccc487925fe4..4b944339541d 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -18,17 +18,17 @@ package com.android.keyguard; import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT; -import static com.android.systemui.classifier.Classifier.DISABLED_UDFPS_AFFORDANCE; +import static com.android.systemui.classifier.Classifier.LOCK_ICON; import android.content.Context; +import android.content.res.Configuration; import android.graphics.PointF; import android.graphics.drawable.Drawable; import android.graphics.drawable.InsetDrawable; import android.hardware.biometrics.BiometricSourceType; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; -import android.util.Log; +import android.util.DisplayMetrics; import android.view.View; -import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; @@ -73,15 +73,10 @@ public class LockIconViewController extends ViewController<LockIconView> impleme @NonNull private final AccessibilityManager mAccessibilityManager; @NonNull private final ConfigurationController mConfigurationController; @NonNull private final DelayableExecutor mExecutor; - - private boolean mHasUdfpsOrFaceAuthFeatures; private boolean mUdfpsEnrolled; - private boolean mFaceAuthEnrolled; - @NonNull private final Drawable mButton; @NonNull private final Drawable mUnlockIcon; @NonNull private final Drawable mLockIcon; - @NonNull private final CharSequence mDisabledLabel; @NonNull private final CharSequence mUnlockedLabel; @NonNull private final CharSequence mLockedLabel; @@ -95,7 +90,12 @@ public class LockIconViewController extends ViewController<LockIconView> impleme private boolean mUserUnlockedWithBiometric; private Runnable mCancelDelayedUpdateVisibilityRunnable; - private boolean mShowButton; + private boolean mHasUdfps; + private float mHeightPixels; + private float mWidthPixels; + private float mDensity; + private int mIndicationBottomPadding; + private boolean mShowUnlockIcon; private boolean mShowLockIcon; @@ -125,8 +125,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mExecutor = executor; final Context context = view.getContext(); - mButton = context.getResources().getDrawable( - com.android.systemui.R.drawable.circle_white, context.getTheme()); mUnlockIcon = new InsetDrawable(context.getResources().getDrawable( com.android.internal.R.drawable.ic_lock_open, context.getTheme()), context.getResources().getDimensionPixelSize( @@ -135,8 +133,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme com.android.internal.R.drawable.ic_lock, context.getTheme()), context.getResources().getDimensionPixelSize( com.android.systemui.R.dimen.udfps_unlock_icon_inset)); - mDisabledLabel = context.getResources().getString( - R.string.accessibility_udfps_disabled_button); mUnlockedLabel = context.getResources().getString(R.string.accessibility_unlock_button); mLockedLabel = context.getResources().getString(R.string.accessibility_lock_icon); dumpManager.registerDumpable("LockIconViewController", this); @@ -149,37 +145,11 @@ public class LockIconViewController extends ViewController<LockIconView> impleme @Override protected void onViewAttached() { - // we check this here instead of onInit since the FingeprintManager + FaceManager may not + // we check this here instead of onInit since the FingerprintManager + FaceManager may not // have started up yet onInit - final boolean hasFaceAuth = mAuthController.getFaceAuthSensorLocation() != null; - final boolean hasUdfps = mAuthController.getUdfpsSensorLocation() != null; - mHasUdfpsOrFaceAuthFeatures = hasFaceAuth || hasUdfps; - if (!mHasUdfpsOrFaceAuthFeatures) { - // Posting since removing a view in the middle of onAttach can lead to a crash in the - // iteration loop when the view isn't last - mView.setVisibility(View.GONE); - mView.post(() -> { - mView.setVisibility(View.VISIBLE); - ((ViewGroup) mView.getParent()).removeView(mView); - }); - return; - } - - if (hasUdfps) { - FingerprintSensorPropertiesInternal props = mAuthController.getUdfpsProps().get(0); - mView.setLocation(new PointF(props.sensorLocationX, props.sensorLocationY), - props.sensorRadius); - } else { - int[] props = mView.getContext().getResources().getIntArray( - com.android.systemui.R.array.config_lock_icon_props); - if (props == null || props.length < 3) { - Log.e("LockIconViewController", "lock icon position should be " - + "setup in config under config_lock_icon_props"); - props = new int[]{0, 0, 0}; - } - mView.setLocation(new PointF(props[0], props[1]), props[2]); - } + mHasUdfps = mAuthController.getUdfpsSensorLocation() != null; + updateConfiguration(); updateKeyguardShowing(); mUserUnlockedWithBiometric = false; mIsBouncerShowing = mKeyguardViewController.isBouncerShowing(); @@ -220,7 +190,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme } private boolean onAffordanceClick() { - if (mFalsingManager.isFalseTouch(DISABLED_UDFPS_AFFORDANCE)) { + if (mFalsingManager.isFalseTouch(LOCK_ICON)) { return false; } @@ -245,32 +215,25 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mCancelDelayedUpdateVisibilityRunnable = null; } - if (!mIsKeyguardShowing || (!mUdfpsEnrolled && !mFaceAuthEnrolled)) { + if (!mIsKeyguardShowing) { mView.setVisibility(View.INVISIBLE); return; } - // these three states are mutually exclusive: - mShowButton = mUdfpsEnrolled && !mCanDismissLockScreen && !mRunningFPS - && !mUserUnlockedWithBiometric && isLockScreen(); - mShowUnlockIcon = mFaceAuthEnrolled & mCanDismissLockScreen && isLockScreen(); - mShowLockIcon = !mUdfpsEnrolled && !mCanDismissLockScreen && isLockScreen() - && mFaceAuthEnrolled; + mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen() + && (!mUdfpsEnrolled || !mRunningFPS); + mShowUnlockIcon = mCanDismissLockScreen && isLockScreen(); updateClickListener(); final CharSequence prevContentDescription = mView.getContentDescription(); - if (mShowButton) { - mView.setImageDrawable(mButton); + if (mShowLockIcon) { + mView.setImageDrawable(mLockIcon); mView.setVisibility(View.VISIBLE); - mView.setContentDescription(mDisabledLabel); + mView.setContentDescription(mLockedLabel); } else if (mShowUnlockIcon) { mView.setImageDrawable(mUnlockIcon); mView.setVisibility(View.VISIBLE); mView.setContentDescription(mUnlockedLabel); - } else if (mShowLockIcon) { - mView.setImageDrawable(mLockIcon); - mView.setVisibility(View.VISIBLE); - mView.setContentDescription(mLockedLabel); } else { mView.setVisibility(View.INVISIBLE); mView.setContentDescription(null); @@ -293,7 +256,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme getResources().getString(R.string.accessibility_enter_hint)); public void onInitializeAccessibilityNodeInfo(View v, AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(v, info); - if (mShowButton || mShowLockIcon) { + if (mShowLockIcon) { info.addAction(mAccessibilityAuthenticateHint); } else if (mShowUnlockIcon) { info.addAction(mAccessibilityEnterHint); @@ -310,13 +273,19 @@ public class LockIconViewController extends ViewController<LockIconView> impleme private void updateClickListener() { if (mView != null) { - mView.setOnClickListener(v -> onAffordanceClick()); - if (mAccessibilityManager.isTouchExplorationEnabled()) { - mView.setOnLongClickListener(null); - mView.setLongClickable(false); + if (mUdfpsEnrolled || mShowUnlockIcon) { + mView.setOnClickListener(v -> onAffordanceClick()); + if (mAccessibilityManager.isTouchExplorationEnabled()) { + mView.setOnLongClickListener(null); + mView.setLongClickable(false); + } else { + mView.setOnLongClickListener(v -> onAffordanceClick()); + } } else { - mView.setOnLongClickListener(v -> onAffordanceClick()); + mView.setOnClickListener(null); + mView.setOnLongClickListener(null); } + } } @@ -332,13 +301,35 @@ public class LockIconViewController extends ViewController<LockIconView> impleme mLockIcon.setTint(color); } + private void updateConfiguration() { + final DisplayMetrics metrics = mView.getContext().getResources().getDisplayMetrics(); + mWidthPixels = metrics.widthPixels; + mHeightPixels = metrics.heightPixels; + mDensity = metrics.density; + mIndicationBottomPadding = mView.getContext().getResources().getDimensionPixelSize( + R.dimen.keyguard_indication_bottom_padding); + updateLockIconLocation(); + } + + private void updateLockIconLocation() { + if (mHasUdfps) { + FingerprintSensorPropertiesInternal props = mAuthController.getUdfpsProps().get(0); + mView.setLocation(new PointF(props.sensorLocationX, props.sensorLocationY), + props.sensorRadius); + } else { + final float distAboveKgBottomArea = 12 * mDensity; + final float radius = 36 * mDensity; + mView.setLocation( + new PointF(mWidthPixels / 2, + mHeightPixels - mIndicationBottomPadding - distAboveKgBottomArea - radius), + (int) radius); + } + } + @Override public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) { - pw.println("mHasUdfpsOrFaceAuthFeatures: " + mHasUdfpsOrFaceAuthFeatures); pw.println("mUdfpsEnrolled: " + mUdfpsEnrolled); - pw.println("mFaceAuthEnrolled: " + mFaceAuthEnrolled); pw.println("mIsKeyguardShowing: " + mIsKeyguardShowing); - pw.println(" mShowBouncerButton: " + mShowButton); pw.println(" mShowUnlockIcon: " + mShowUnlockIcon); pw.println(" mShowLockIcon: " + mShowLockIcon); pw.println(" mIsDozing: " + mIsDozing); @@ -348,6 +339,10 @@ public class LockIconViewController extends ViewController<LockIconView> impleme pw.println(" mCanDismissLockScreen: " + mCanDismissLockScreen); pw.println(" mStatusBarState: " + StatusBarState.toShortString(mStatusBarState)); pw.println(" mQsExpanded: " + mQsExpanded); + + if (mView != null) { + mView.dump(fd, pw, args); + } } private StatusBarStateController.StateListener mStatusBarStateListener = @@ -420,7 +415,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme public void onKeyguardShowingChanged() { updateKeyguardShowing(); mUdfpsEnrolled = mKeyguardUpdateMonitor.isUdfpsEnrolled(); - mFaceAuthEnrolled = mKeyguardUpdateMonitor.isFaceEnrolled(); updateVisibility(); } @@ -447,6 +441,11 @@ public class LockIconViewController extends ViewController<LockIconView> impleme public void onOverlayChanged() { updateColors(); } + + @Override + public void onConfigChanged(Configuration newConfig) { + updateConfiguration(); + } }; private final AccessibilityManager.TouchExplorationStateChangeListener diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java index 0d31906d2f80..099e6f4b5341 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadButton.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadButton.java @@ -17,6 +17,7 @@ package com.android.keyguard; import android.content.Context; import android.content.res.ColorStateList; +import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.graphics.drawable.VectorDrawable; @@ -26,7 +27,6 @@ import android.view.MotionEvent; import androidx.annotation.Nullable; import com.android.settingslib.Utils; -import com.android.systemui.R; /** * Similar to the {@link NumPadKey}, but displays an image. @@ -35,6 +35,7 @@ public class NumPadButton extends AlphaOptimizedImageButton { @Nullable private NumPadAnimator mAnimator; + private int mOrientation; public NumPadButton(Context context, AttributeSet attrs) { super(context, attrs); @@ -49,13 +50,21 @@ public class NumPadButton extends AlphaOptimizedImageButton { } @Override + protected void onConfigurationChanged(Configuration newConfig) { + mOrientation = newConfig.orientation; + } + + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); // Set width/height to the same value to ensure a smooth circle for the bg, but shrink // the height to match the old pin bouncer int width = getMeasuredWidth(); - int height = mAnimator == null ? (int) (width * .75f) : width; + + boolean shortenHeight = mAnimator == null + || mOrientation == Configuration.ORIENTATION_LANDSCAPE; + int height = shortenHeight ? (int) (width * .66f) : width; setMeasuredDimension(getMeasuredWidth(), height); } diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java index cffa630c6ec8..232c6fc99068 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.android.keyguard; import android.content.Context; +import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; @@ -52,6 +52,7 @@ public class NumPadKey extends ViewGroup { @Nullable private NumPadAnimator mAnimator; + private int mOrientation; private View.OnClickListener mListener = new View.OnClickListener() { @Override @@ -139,6 +140,11 @@ public class NumPadKey extends ViewGroup { } } + @Override + protected void onConfigurationChanged(Configuration newConfig) { + mOrientation = newConfig.orientation; + } + /** * Reload colors from resources. **/ @@ -171,7 +177,10 @@ public class NumPadKey extends ViewGroup { // Set width/height to the same value to ensure a smooth circle for the bg, but shrink // the height to match the old pin bouncer int width = getMeasuredWidth(); - int height = mAnimator == null ? (int) (width * .75f) : width; + + boolean shortenHeight = mAnimator == null + || mOrientation == Configuration.ORIENTATION_LANDSCAPE; + int height = shortenHeight ? (int) (width * .66f) : width; setMeasuredDimension(getMeasuredWidth(), height); } diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 67cf4812ba6b..104d711f46fb 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -73,6 +73,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.DevicePolicyManagerWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; @@ -360,6 +361,7 @@ public class Dependency { @Inject Lazy<PrivacyDotViewController> mPrivacyDotViewControllerLazy; @Inject Lazy<EdgeBackGestureHandler> mEdgeBackGestureHandler; @Inject Lazy<UiEventLogger> mUiEventLogger; + @Inject Lazy<FeatureFlags> mFeatureFlagsLazy; @Inject public Dependency() { @@ -574,6 +576,7 @@ public class Dependency { mProviders.put(PrivacyDotViewController.class, mPrivacyDotViewControllerLazy::get); mProviders.put(EdgeBackGestureHandler.class, mEdgeBackGestureHandler::get); mProviders.put(UiEventLogger.class, mUiEventLogger::get); + mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get); Dependency.setInstance(this); } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java index e891e5b64b3d..17818cd9c7ee 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java @@ -39,7 +39,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; -import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.util.DisplayMetrics; @@ -50,8 +49,6 @@ import android.view.ViewGroup; import android.view.WindowInsets; import android.view.WindowManager; import android.view.WindowMetrics; -import android.view.accessibility.AccessibilityNodeInfo; -import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.animation.Animation; import android.view.animation.OvershootInterpolator; import android.view.animation.TranslateAnimation; @@ -59,8 +56,10 @@ import android.widget.FrameLayout; import androidx.annotation.DimenRes; import androidx.annotation.NonNull; +import androidx.core.view.AccessibilityDelegateCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate; import com.android.internal.accessibility.dialog.AccessibilityTarget; import com.android.internal.annotations.VisibleForTesting; @@ -332,54 +331,6 @@ public class AccessibilityFloatingMenuView extends FrameLayout // Do Nothing } - @Override - public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(info); - setupAccessibilityActions(info); - } - - @Override - public boolean performAccessibilityAction(int action, Bundle arguments) { - fadeIn(); - - final Rect bounds = getAvailableBounds(); - if (action == R.id.action_move_top_left) { - setShapeType(ShapeType.OVAL); - snapToLocation(bounds.left, bounds.top); - return true; - } - - if (action == R.id.action_move_top_right) { - setShapeType(ShapeType.OVAL); - snapToLocation(bounds.right, bounds.top); - return true; - } - - if (action == R.id.action_move_bottom_left) { - setShapeType(ShapeType.OVAL); - snapToLocation(bounds.left, bounds.bottom); - return true; - } - - if (action == R.id.action_move_bottom_right) { - setShapeType(ShapeType.OVAL); - snapToLocation(bounds.right, bounds.bottom); - return true; - } - - if (action == R.id.action_move_to_edge_and_hide) { - setShapeType(ShapeType.HALF_OVAL); - return true; - } - - if (action == R.id.action_move_out_edge_and_show) { - setShapeType(ShapeType.OVAL); - return true; - } - - return super.performAccessibilityAction(action, arguments); - } - void show() { if (isShowing()) { return; @@ -526,43 +477,6 @@ public class AccessibilityFloatingMenuView extends FrameLayout mUiHandler.postDelayed(() -> mFadeOutAnimator.start(), FADE_EFFECT_DURATION_MS); } - private void setupAccessibilityActions(AccessibilityNodeInfo info) { - final Resources res = mContext.getResources(); - final AccessibilityAction moveTopLeft = - new AccessibilityAction(R.id.action_move_top_left, - res.getString( - R.string.accessibility_floating_button_action_move_top_left)); - info.addAction(moveTopLeft); - - final AccessibilityAction moveTopRight = - new AccessibilityAction(R.id.action_move_top_right, - res.getString( - R.string.accessibility_floating_button_action_move_top_right)); - info.addAction(moveTopRight); - - final AccessibilityAction moveBottomLeft = - new AccessibilityAction(R.id.action_move_bottom_left, - res.getString( - R.string.accessibility_floating_button_action_move_bottom_left)); - info.addAction(moveBottomLeft); - - final AccessibilityAction moveBottomRight = - new AccessibilityAction(R.id.action_move_bottom_right, - res.getString( - R.string.accessibility_floating_button_action_move_bottom_right)); - info.addAction(moveBottomRight); - - final int moveEdgeId = mShapeType == ShapeType.OVAL - ? R.id.action_move_to_edge_and_hide - : R.id.action_move_out_edge_and_show; - final int moveEdgeTextResId = mShapeType == ShapeType.OVAL - ? R.string.accessibility_floating_button_action_move_to_edge_and_hide_to_half - : R.string.accessibility_floating_button_action_move_out_edge_and_show; - final AccessibilityAction moveToOrOutEdge = - new AccessibilityAction(moveEdgeId, res.getString(moveEdgeTextResId)); - info.addAction(moveToOrOutEdge); - } - private boolean onTouched(MotionEvent event) { final int action = event.getAction(); final int currentX = (int) event.getX(); @@ -685,6 +599,15 @@ public class AccessibilityFloatingMenuView extends FrameLayout mListView.setLayoutManager(layoutManager); mListView.addOnItemTouchListener(this); mListView.animate().setInterpolator(new OvershootInterpolator()); + mListView.setAccessibilityDelegateCompat(new RecyclerViewAccessibilityDelegate(mListView) { + @NonNull + @Override + public AccessibilityDelegateCompat getItemDelegate() { + return new ItemDelegateCompat(this, + AccessibilityFloatingMenuView.this); + } + }); + updateListViewWith(mLastConfiguration); addView(mListView); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompat.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompat.java new file mode 100644 index 000000000000..93b0676b4930 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompat.java @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.floatingmenu; + +import android.content.res.Resources; +import android.graphics.Rect; +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate; + +import com.android.systemui.R; +import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenuView.ShapeType; + +import java.lang.ref.WeakReference; + +/** + * An accessibility item delegate for the individual items of the list view + * {@link AccessibilityFloatingMenuView}. + */ +final class ItemDelegateCompat extends RecyclerViewAccessibilityDelegate.ItemDelegate { + private final WeakReference<AccessibilityFloatingMenuView> mMenuViewRef; + + ItemDelegateCompat(@NonNull RecyclerViewAccessibilityDelegate recyclerViewDelegate, + AccessibilityFloatingMenuView menuView) { + super(recyclerViewDelegate); + this.mMenuViewRef = new WeakReference<>(menuView); + } + + @Override + public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) { + super.onInitializeAccessibilityNodeInfo(host, info); + + if (mMenuViewRef.get() == null) { + return; + } + final AccessibilityFloatingMenuView menuView = mMenuViewRef.get(); + + final Resources res = menuView.getResources(); + final AccessibilityNodeInfoCompat.AccessibilityActionCompat moveTopLeft = + new AccessibilityNodeInfoCompat.AccessibilityActionCompat(R.id.action_move_top_left, + res.getString( + R.string.accessibility_floating_button_action_move_top_left)); + info.addAction(moveTopLeft); + + final AccessibilityNodeInfoCompat.AccessibilityActionCompat moveTopRight = + new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_move_top_right, + res.getString( + R.string.accessibility_floating_button_action_move_top_right)); + info.addAction(moveTopRight); + + final AccessibilityNodeInfoCompat.AccessibilityActionCompat moveBottomLeft = + new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_move_bottom_left, + res.getString( + R.string.accessibility_floating_button_action_move_bottom_left)); + info.addAction(moveBottomLeft); + + final AccessibilityNodeInfoCompat.AccessibilityActionCompat moveBottomRight = + new AccessibilityNodeInfoCompat.AccessibilityActionCompat( + R.id.action_move_bottom_right, + res.getString( + R.string.accessibility_floating_button_action_move_bottom_right)); + info.addAction(moveBottomRight); + + final int moveEdgeId = menuView.isOvalShape() + ? R.id.action_move_to_edge_and_hide + : R.id.action_move_out_edge_and_show; + final int moveEdgeTextResId = menuView.isOvalShape() + ? R.string.accessibility_floating_button_action_move_to_edge_and_hide_to_half + : R.string.accessibility_floating_button_action_move_out_edge_and_show; + final AccessibilityNodeInfoCompat.AccessibilityActionCompat moveToOrOutEdge = + new AccessibilityNodeInfoCompat.AccessibilityActionCompat(moveEdgeId, + res.getString(moveEdgeTextResId)); + info.addAction(moveToOrOutEdge); + } + + @Override + public boolean performAccessibilityAction(View host, int action, Bundle args) { + if (mMenuViewRef.get() == null) { + return super.performAccessibilityAction(host, action, args); + } + final AccessibilityFloatingMenuView menuView = mMenuViewRef.get(); + + menuView.fadeIn(); + + final Rect bounds = menuView.getAvailableBounds(); + if (action == R.id.action_move_top_left) { + menuView.setShapeType(ShapeType.OVAL); + menuView.snapToLocation(bounds.left, bounds.top); + return true; + } + + if (action == R.id.action_move_top_right) { + menuView.setShapeType(ShapeType.OVAL); + menuView.snapToLocation(bounds.right, bounds.top); + return true; + } + + if (action == R.id.action_move_bottom_left) { + menuView.setShapeType(ShapeType.OVAL); + menuView.snapToLocation(bounds.left, bounds.bottom); + return true; + } + + if (action == R.id.action_move_bottom_right) { + menuView.setShapeType(ShapeType.OVAL); + menuView.snapToLocation(bounds.right, bounds.bottom); + return true; + } + + if (action == R.id.action_move_to_edge_and_hide) { + menuView.setShapeType(ShapeType.HALF_OVAL); + return true; + } + + if (action == R.id.action_move_out_edge_and_show) { + menuView.setShapeType(ShapeType.OVAL); + return true; + } + + return super.performAccessibilityAction(host, action, args); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt b/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt index fe31a7b75c06..c9e67715decb 100644 --- a/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/backup/BackupHelper.kt @@ -29,6 +29,7 @@ import android.os.UserHandle import android.util.Log import com.android.systemui.controls.controller.AuxiliaryPersistenceWrapper import com.android.systemui.controls.controller.ControlsFavoritePersistenceWrapper +import com.android.systemui.people.widget.PeopleBackupHelper /** * Helper for backing up elements in SystemUI @@ -45,18 +46,29 @@ class BackupHelper : BackupAgentHelper() { private const val TAG = "BackupHelper" internal const val CONTROLS = ControlsFavoritePersistenceWrapper.FILE_NAME private const val NO_OVERWRITE_FILES_BACKUP_KEY = "systemui.files_no_overwrite" + private const val PEOPLE_TILES_BACKUP_KEY = "systemui.people.shared_preferences" val controlsDataLock = Any() const val ACTION_RESTORE_FINISHED = "com.android.systemui.backup.RESTORE_FINISHED" private const val PERMISSION_SELF = "com.android.systemui.permission.SELF" } - override fun onCreate() { + override fun onCreate(userHandle: UserHandle, operationType: Int) { super.onCreate() // The map in mapOf is guaranteed to be order preserving val controlsMap = mapOf(CONTROLS to getPPControlsFile(this)) NoOverwriteFileBackupHelper(controlsDataLock, this, controlsMap).also { addHelper(NO_OVERWRITE_FILES_BACKUP_KEY, it) } + + // Conversations widgets backup only works for system user, because widgets' information is + // stored in system user's SharedPreferences files and we can't open those from other users. + if (!userHandle.isSystem) { + return + } + + val keys = PeopleBackupHelper.getFilesToBackup() + addHelper(PEOPLE_TILES_BACKUP_KEY, PeopleBackupHelper( + this, userHandle, keys.toTypedArray())) } override fun onRestoreFinished() { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintView.java index 76fb49a730a3..c4f58806c26c 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintView.java @@ -19,17 +19,19 @@ package com.android.systemui.biometrics; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.hardware.biometrics.BiometricAuthenticator.Modality; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; +import android.os.Bundle; import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; @@ -87,11 +89,9 @@ public class AuthBiometricFaceToFingerprintView extends AuthBiometricFaceView { } } - @Modality - private int mActiveSensorType = TYPE_FACE; - - @Nullable - private UdfpsDialogMeasureAdapter mUdfpsMeasureAdapter; + @Modality private int mActiveSensorType = TYPE_FACE; + @Nullable private FingerprintSensorPropertiesInternal mFingerprintSensorProps; + @Nullable private UdfpsDialogMeasureAdapter mUdfpsMeasureAdapter; public AuthBiometricFaceToFingerprintView(Context context) { super(context); @@ -106,14 +106,17 @@ public class AuthBiometricFaceToFingerprintView extends AuthBiometricFaceView { super(context, attrs, injector); } - void setFingerprintSensorProps(@NonNull FingerprintSensorPropertiesInternal sensorProps) { - if (!sensorProps.isAnyUdfpsType()) { - return; - } + @Modality + int getActiveSensorType() { + return mActiveSensorType; + } - if (mUdfpsMeasureAdapter == null || mUdfpsMeasureAdapter.getSensorProps() != sensorProps) { - mUdfpsMeasureAdapter = new UdfpsDialogMeasureAdapter(this, sensorProps); - } + boolean isFingerprintUdfps() { + return mFingerprintSensorProps.isAnyUdfpsType(); + } + + void setFingerprintSensorProps(@NonNull FingerprintSensorPropertiesInternal sensorProps) { + mFingerprintSensorProps = sensorProps; } @Override @@ -193,8 +196,34 @@ public class AuthBiometricFaceToFingerprintView extends AuthBiometricFaceView { @NonNull AuthDialog.LayoutParams onMeasureInternal(int width, int height) { final AuthDialog.LayoutParams layoutParams = super.onMeasureInternal(width, height); - return mUdfpsMeasureAdapter != null - ? mUdfpsMeasureAdapter.onMeasureInternal(width, height, layoutParams) + return isFingerprintUdfps() + ? getUdfpsMeasureAdapter().onMeasureInternal(width, height, layoutParams) : layoutParams; } + + @NonNull + private UdfpsDialogMeasureAdapter getUdfpsMeasureAdapter() { + if (mUdfpsMeasureAdapter == null + || mUdfpsMeasureAdapter.getSensorProps() != mFingerprintSensorProps) { + mUdfpsMeasureAdapter = new UdfpsDialogMeasureAdapter(this, mFingerprintSensorProps); + } + return mUdfpsMeasureAdapter; + } + + @Override + public void onSaveState(@NonNull Bundle outState) { + super.onSaveState(outState); + outState.putInt(AuthDialog.KEY_BIOMETRIC_SENSOR_TYPE, mActiveSensorType); + outState.putParcelable(AuthDialog.KEY_BIOMETRIC_SENSOR_PROPS, mFingerprintSensorProps); + } + + @Override + public void restoreState(@Nullable Bundle savedState) { + super.restoreState(savedState); + if (savedState != null) { + mActiveSensorType = savedState.getInt(AuthDialog.KEY_BIOMETRIC_SENSOR_TYPE, TYPE_FACE); + mFingerprintSensorProps = + savedState.getParcelable(AuthDialog.KEY_BIOMETRIC_SENSOR_PROPS); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java index f37495ef5f48..d5f74951c6f7 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java @@ -593,11 +593,13 @@ public abstract class AuthBiometricView extends LinearLayout { } public void onSaveState(@NonNull Bundle outState) { + outState.putInt(AuthDialog.KEY_BIOMETRIC_CONFIRM_VISIBILITY, + mConfirmButton.getVisibility()); outState.putInt(AuthDialog.KEY_BIOMETRIC_TRY_AGAIN_VISIBILITY, mTryAgainButton.getVisibility()); outState.putInt(AuthDialog.KEY_BIOMETRIC_STATE, mState); outState.putString(AuthDialog.KEY_BIOMETRIC_INDICATOR_STRING, - mIndicatorView.getText().toString()); + mIndicatorView.getText() != null ? mIndicatorView.getText().toString() : ""); outState.putBoolean(AuthDialog.KEY_BIOMETRIC_INDICATOR_ERROR_SHOWING, mHandler.hasCallbacks(mResetErrorRunnable)); outState.putBoolean(AuthDialog.KEY_BIOMETRIC_INDICATOR_HELP_SHOWING, @@ -754,9 +756,12 @@ public abstract class AuthBiometricView extends LinearLayout { // Restore as much state as possible first updateState(mSavedState.getInt(AuthDialog.KEY_BIOMETRIC_STATE)); - // Restore positive button state + // Restore positive button(s) state + mConfirmButton.setVisibility( + mSavedState.getInt(AuthDialog.KEY_BIOMETRIC_CONFIRM_VISIBILITY)); mTryAgainButton.setVisibility( mSavedState.getInt(AuthDialog.KEY_BIOMETRIC_TRY_AGAIN_VISIBILITY)); + } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index c4f78e7782a2..fd1313fc9d1d 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -16,6 +16,7 @@ package com.android.systemui.biometrics; +import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static android.hardware.biometrics.BiometricManager.BiometricMultiSensorMode; import android.annotation.IntDef; @@ -23,6 +24,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.graphics.PixelFormat; +import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricAuthenticator.Modality; import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.PromptInfo; @@ -487,31 +489,8 @@ public class AuthContainerView extends LinearLayout + mConfig.mPromptInfo.getAuthenticators()); } - if (mBiometricView instanceof AuthBiometricUdfpsView) { - final int displayRotation = getDisplay().getRotation(); - switch (displayRotation) { - case Surface.ROTATION_0: - mPanelController.setPosition(AuthPanelController.POSITION_BOTTOM); - setScrollViewGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); - break; - - case Surface.ROTATION_90: - mPanelController.setPosition(AuthPanelController.POSITION_RIGHT); - setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT); - break; - - case Surface.ROTATION_270: - mPanelController.setPosition(AuthPanelController.POSITION_LEFT); - setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT); - break; - - case Surface.ROTATION_180: - default: - Log.e(TAG, "Unsupported display rotation: " + displayRotation); - mPanelController.setPosition(AuthPanelController.POSITION_BOTTOM); - setScrollViewGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); - break; - } + if (shouldUpdatePositionForUdfps()) { + updatePositionForUdfps(); } if (mConfig.mSkipIntro) { @@ -557,6 +536,48 @@ public class AuthContainerView extends LinearLayout } } + private boolean shouldUpdatePositionForUdfps() { + if (mBiometricView instanceof AuthBiometricUdfpsView) { + return true; + } + + if (mBiometricView instanceof AuthBiometricFaceToFingerprintView) { + AuthBiometricFaceToFingerprintView faceToFingerprintView = + (AuthBiometricFaceToFingerprintView) mBiometricView; + return faceToFingerprintView.getActiveSensorType() == TYPE_FINGERPRINT + && faceToFingerprintView.isFingerprintUdfps(); + } + + return false; + } + + private void updatePositionForUdfps() { + final int displayRotation = getDisplay().getRotation(); + switch (displayRotation) { + case Surface.ROTATION_0: + mPanelController.setPosition(AuthPanelController.POSITION_BOTTOM); + setScrollViewGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); + break; + + case Surface.ROTATION_90: + mPanelController.setPosition(AuthPanelController.POSITION_RIGHT); + setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.RIGHT); + break; + + case Surface.ROTATION_270: + mPanelController.setPosition(AuthPanelController.POSITION_LEFT); + setScrollViewGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT); + break; + + case Surface.ROTATION_180: + default: + Log.e(TAG, "Unsupported display rotation: " + displayRotation); + mPanelController.setPosition(AuthPanelController.POSITION_BOTTOM); + setScrollViewGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM); + break; + } + } + private void setScrollViewGravity(int gravity) { final FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mBiometricScrollView.getLayoutParams(); @@ -605,6 +626,13 @@ public class AuthContainerView extends LinearLayout @Override public void onAuthenticationFailed(@Modality int modality, String failureReason) { mBiometricView.onAuthenticationFailed(modality, failureReason); + if (mBiometricView instanceof AuthBiometricFaceToFingerprintView + && ((AuthBiometricFaceToFingerprintView) mBiometricView).isFingerprintUdfps() + && modality == BiometricAuthenticator.TYPE_FACE) { + updatePositionForUdfps(); + mPanelView.invalidateOutline(); + mBiometricView.requestLayout(); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java index cbd166e6e0b1..ff31e499f6e8 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java @@ -35,6 +35,7 @@ public interface AuthDialog { String KEY_BIOMETRIC_SHOWING = "biometric_showing"; String KEY_CREDENTIAL_SHOWING = "credential_showing"; + String KEY_BIOMETRIC_CONFIRM_VISIBILITY = "confirm_visibility"; String KEY_BIOMETRIC_TRY_AGAIN_VISIBILITY = "try_agian_visibility"; String KEY_BIOMETRIC_STATE = "state"; String KEY_BIOMETRIC_INDICATOR_STRING = "indicator_string"; // error / help / hint @@ -42,6 +43,9 @@ public interface AuthDialog { String KEY_BIOMETRIC_INDICATOR_HELP_SHOWING = "hint_is_temporary"; String KEY_BIOMETRIC_DIALOG_SIZE = "size"; + String KEY_BIOMETRIC_SENSOR_TYPE = "sensor_type"; + String KEY_BIOMETRIC_SENSOR_PROPS = "sensor_props"; + int SIZE_UNKNOWN = 0; /** * Minimal UI, showing only biometric icon. diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt index dd73c4f8d071..95ea81003ecb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleView.kt @@ -23,11 +23,7 @@ import android.content.Context import android.graphics.Canvas import android.graphics.Paint import android.graphics.PointF -import android.media.AudioAttributes -import android.os.VibrationEffect -import android.os.Vibrator import android.util.AttributeSet -import android.util.MathUtils import android.view.View import android.view.animation.PathInterpolator import com.android.internal.graphics.ColorUtils @@ -36,26 +32,25 @@ import com.android.systemui.statusbar.charging.RippleShader private const val RIPPLE_ANIMATION_DURATION: Long = 1533 private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.4f -private const val RIPPLE_VIBRATION_PRIMITIVE: Int = VibrationEffect.Composition.PRIMITIVE_LOW_TICK -private const val RIPPLE_VIBRATION_SIZE: Int = 60 -private const val RIPPLE_VIBRATION_SCALE_START: Float = 0.6f -private const val RIPPLE_VIBRATION_SCALE_DECAY: Float = -0.1f /** * Expanding ripple effect on the transition from biometric authentication success to showing * launcher. */ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, attrs) { - private val vibrator: Vibrator? = context?.getSystemService(Vibrator::class.java) private var rippleInProgress: Boolean = false private val rippleShader = RippleShader() private val ripplePaint = Paint() - private val rippleVibrationEffect = createVibrationEffect(vibrator) - private val rippleVibrationAttrs = - AudioAttributes.Builder() - .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) - .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) - .build() + private var radius: Float = 0.0f + set(value) { + rippleShader.radius = value + field = value + } + private var origin: PointF = PointF() + set(value) { + rippleShader.origin = value + field = value + } init { rippleShader.color = 0xffffffff.toInt() // default color @@ -66,8 +61,8 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at } fun setSensorLocation(location: PointF) { - rippleShader.origin = location - rippleShader.radius = maxOf(location.x, location.y, width - location.x, height - location.y) + origin = location + radius = maxOf(location.x, location.y, width - location.x, height - location.y) .toFloat() } @@ -141,8 +136,6 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at } }) } - // TODO (b/185124905): custom haptic TBD - // vibrate() animatorSet.start() } @@ -151,26 +144,11 @@ class AuthRippleView(context: Context?, attrs: AttributeSet?) : View(context, at } override fun onDraw(canvas: Canvas?) { - // draw over the entire screen - canvas?.drawRect(0f, 0f, width.toFloat(), height.toFloat(), ripplePaint) - } - - private fun vibrate() { - if (rippleVibrationEffect != null) { - vibrator?.vibrate(rippleVibrationEffect, rippleVibrationAttrs) - } - } - - private fun createVibrationEffect(vibrator: Vibrator?): VibrationEffect? { - if (vibrator?.areAllPrimitivesSupported(RIPPLE_VIBRATION_PRIMITIVE) == false) { - return null - } - val composition = VibrationEffect.startComposition() - for (i in 0 until RIPPLE_VIBRATION_SIZE) { - val scale = - RIPPLE_VIBRATION_SCALE_START * MathUtils.exp(RIPPLE_VIBRATION_SCALE_DECAY * i) - composition.addPrimitive(RIPPLE_VIBRATION_PRIMITIVE, scale, 0 /* delay */) - } - return composition.compose() + // To reduce overdraw, we mask the effect to a circle whose radius is big enough to cover + // the active effect area. Values here should be kept in sync with the + // animation implementation in the ripple shader. + val maskRadius = (1 - (1 - rippleShader.progress) * (1 - rippleShader.progress) * + (1 - rippleShader.progress)) * radius * 1.5f + canvas?.drawCircle(origin.x, origin.y, maskRadius, ripplePaint) } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java index 2d403f63c2cd..1f11894de55e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java @@ -74,7 +74,10 @@ abstract class UdfpsAnimationView extends FrameLayout { return false; } - protected void updateAlpha() { + /** + * @return current alpha + */ + protected int updateAlpha() { int alpha = calculateAlpha(); getDrawable().setAlpha(alpha); @@ -84,6 +87,8 @@ abstract class UdfpsAnimationView extends FrameLayout { } else { ((ViewGroup) getParent()).setVisibility(View.VISIBLE); } + + return alpha; } int calculateAlpha() { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index 3d2c4e1dafe8..c5a0dfb45eda 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -147,6 +147,7 @@ public class UdfpsController implements DozeReceiver { @Nullable private Runnable mCancelAodTimeoutAction; private boolean mScreenOn; private Runnable mAodInterruptRunnable; + private boolean mOnFingerDown; @VisibleForTesting public static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES = @@ -430,21 +431,7 @@ public class UdfpsController implements DozeReceiver { mTouchLogTime = SystemClock.elapsedRealtime(); mPowerManager.userActivity(SystemClock.uptimeMillis(), PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0); - - // TODO: this should eventually be removed after ux testing - if (mVibrator != null) { - final ContentResolver contentResolver = - mContext.getContentResolver(); - int startEnabled = Settings.Global.getInt(contentResolver, - "udfps_start", 1); - if (startEnabled > 0) { - String startEffectSetting = Settings.Global.getString( - contentResolver, "udfps_start_type"); - mVibrator.vibrate(getVibration(startEffectSetting, - EFFECT_CLICK), VIBRATION_SONIFICATION_ATTRIBUTES); - } - } - + playStartHaptic(); handled = true; } else if (sinceLastLog >= MIN_TOUCH_LOG_INTERVAL) { Log.v(TAG, "onTouch | finger move: " + touchInfo); @@ -498,6 +485,7 @@ public class UdfpsController implements DozeReceiver { @NonNull LockscreenShadeTransitionController lockscreenShadeTransitionController, @NonNull ScreenLifecycle screenLifecycle, @Nullable Vibrator vibrator, + @NonNull UdfpsHapticsSimulator udfpsHapticsSimulator, @NonNull Optional<UdfpsHbmProvider> hbmProvider) { mContext = context; mExecution = execution; @@ -544,6 +532,29 @@ public class UdfpsController implements DozeReceiver { final IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); context.registerReceiver(mBroadcastReceiver, filter); + + udfpsHapticsSimulator.setUdfpsController(this); + } + + /** + * Play haptic to signal udfps scanning started. + */ + @VisibleForTesting + public void playStartHaptic() { + if (mVibrator != null) { + final ContentResolver contentResolver = + mContext.getContentResolver(); + // TODO: these settings checks should eventually be removed after ux testing + // (b/185124905) + int startEnabled = Settings.Global.getInt(contentResolver, + "udfps_start", 1); + if (startEnabled > 0) { + String startEffectSetting = Settings.Global.getString( + contentResolver, "udfps_start_type"); + mVibrator.vibrate(getVibration(startEffectSetting, + EFFECT_CLICK), VIBRATION_SONIFICATION_ATTRIBUTES); + } + } } private int getCoreLayoutParamFlags() { @@ -586,8 +597,10 @@ public class UdfpsController implements DozeReceiver { } private void updateOverlay() { + mExecution.assertIsMainThread(); + if (mServerRequest != null) { - showUdfpsOverlay(mServerRequest.mRequestReason); + showUdfpsOverlay(mServerRequest); } else { hideUdfpsOverlay(); } @@ -648,36 +661,37 @@ public class UdfpsController implements DozeReceiver { updateOverlay(); } - private void showUdfpsOverlay(int reason) { - mFgExecutor.execute(() -> { - if (mView == null) { - try { - Log.v(TAG, "showUdfpsOverlay | adding window reason=" + reason); - mView = (UdfpsView) mInflater.inflate(R.layout.udfps_view, null, false); - mView.setSensorProperties(mSensorProps); - mView.setHbmProvider(mHbmProvider); - UdfpsAnimationViewController animation = inflateUdfpsAnimation(reason); - animation.init(); - mView.setAnimationViewController(animation); - - // This view overlaps the sensor area, so prevent it from being selectable - // during a11y. - if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR - || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) { - mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); - } - - mWindowManager.addView(mView, computeLayoutParams(animation)); - mAccessibilityManager.addTouchExplorationStateChangeListener( - mTouchExplorationStateChangeListener); - updateTouchListener(); - } catch (RuntimeException e) { - Log.e(TAG, "showUdfpsOverlay | failed to add window", e); + private void showUdfpsOverlay(@NonNull ServerRequest request) { + mExecution.assertIsMainThread(); + final int reason = request.mRequestReason; + if (mView == null) { + try { + Log.v(TAG, "showUdfpsOverlay | adding window reason=" + reason); + mView = (UdfpsView) mInflater.inflate(R.layout.udfps_view, null, false); + mOnFingerDown = false; + mView.setSensorProperties(mSensorProps); + mView.setHbmProvider(mHbmProvider); + UdfpsAnimationViewController animation = inflateUdfpsAnimation(reason); + animation.init(); + mView.setAnimationViewController(animation); + + // This view overlaps the sensor area, so prevent it from being selectable + // during a11y. + if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR + || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) { + mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); } - } else { - Log.v(TAG, "showUdfpsOverlay | the overlay is already showing"); + + mWindowManager.addView(mView, computeLayoutParams(animation)); + mAccessibilityManager.addTouchExplorationStateChangeListener( + mTouchExplorationStateChangeListener); + updateTouchListener(); + } catch (RuntimeException e) { + Log.e(TAG, "showUdfpsOverlay | failed to add window", e); } - }); + } else { + Log.v(TAG, "showUdfpsOverlay | the overlay is already showing"); + } } private UdfpsAnimationViewController inflateUdfpsAnimation(int reason) { @@ -813,6 +827,7 @@ public class UdfpsController implements DozeReceiver { Log.w(TAG, "Null view in onFingerDown"); return; } + mOnFingerDown = true; mFingerprintManager.onPointerDown(mSensorProps.sensorId, x, y, minor, major); Trace.endAsyncSection("UdfpsController.e2e.onPointerDown", 0); Trace.beginAsyncSection("UdfpsController.e2e.startIllumination", 0); @@ -830,13 +845,15 @@ public class UdfpsController implements DozeReceiver { Log.w(TAG, "Null view in onFingerUp"); return; } - mFingerprintManager.onPointerUp(mSensorProps.sensorId); + if (mOnFingerDown) { + mFingerprintManager.onPointerUp(mSensorProps.sensorId); + } + mOnFingerDown = false; if (mView.isIlluminationRequested()) { mView.stopIllumination(); } } - /** * get vibration to play given string * used for testing purposes (b/185124905) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java index 1ad2b9ca856c..7ccfb865cd5a 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java @@ -180,17 +180,25 @@ public class UdfpsDialogMeasureAdapter { iconFrame.measure( MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(sensorDiameter, MeasureSpec.EXACTLY)); - } else if (child.getId() == R.id.space_above_icon || child.getId() == R.id.button_bar) { - // Adjust the width of the top spacer and button bar while preserving their heights. + } 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 + - Math.min(bottomSpacerHeight, 0); + child.measure( + MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(newTopSpacerHeight, MeasureSpec.EXACTLY)); + } else if (child.getId() == R.id.button_bar) { + // Adjust the width of the button bar while preserving its height. child.measure( MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec( child.getLayoutParams().height, MeasureSpec.EXACTLY)); } else if (child.getId() == R.id.space_below_icon) { // Adjust the bottom spacer height to align the fingerprint icon with the sensor. + final int newBottomSpacerHeight = Math.max(bottomSpacerHeight, 0); child.measure( MeasureSpec.makeMeasureSpec(remeasuredWidth, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(bottomSpacerHeight, MeasureSpec.EXACTLY)); + MeasureSpec.makeMeasureSpec(newBottomSpacerHeight, MeasureSpec.EXACTLY)); } else { // Use the remeasured width for all other child views. child.measure( @@ -208,7 +216,7 @@ public class UdfpsDialogMeasureAdapter { private int getViewHeightPx(@IdRes int viewId) { final View view = mView.findViewById(viewId); - return view != null ? view.getMeasuredHeight() : 0; + return view != null && view.getVisibility() != View.GONE ? view.getMeasuredHeight() : 0; } private int getDialogMarginPx() { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java index 7f4d7fe01e90..2cdf49d6fc3c 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java @@ -43,11 +43,6 @@ public class UdfpsEnrollView extends UdfpsAnimationView { } @Override - protected void updateAlpha() { - super.updateAlpha(); - } - - @Override protected void onFinishInflate() { mFingerprintView = findViewById(R.id.udfps_enroll_animation_fp_view); mFingerprintView.setImageDrawable(mFingerprintDrawable); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHapticsSimulator.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHapticsSimulator.kt new file mode 100644 index 000000000000..ea2bbfad1b74 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHapticsSimulator.kt @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.biometrics + +import android.media.AudioAttributes +import android.os.VibrationEffect +import android.os.Vibrator + +import com.android.keyguard.KeyguardUpdateMonitor + +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.statusbar.commandline.Command +import com.android.systemui.statusbar.commandline.CommandRegistry + +import java.io.PrintWriter + +import javax.inject.Inject + +/** + * Used to simulate haptics that may be used for udfps authentication. + */ +@SysUISingleton +class UdfpsHapticsSimulator @Inject constructor( + commandRegistry: CommandRegistry, + val vibrator: Vibrator?, + val keyguardUpdateMonitor: KeyguardUpdateMonitor +) : Command { + val sonificationEffects = + AudioAttributes.Builder() + .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) + .build() + var udfpsController: UdfpsController? = null + + init { + commandRegistry.registerCommand("udfps-haptic") { this } + } + + override fun execute(pw: PrintWriter, args: List<String>) { + if (args.isEmpty()) { + invalidCommand(pw) + } else { + when (args[0]) { + "start" -> { + udfpsController?.playStartHaptic() + } + "acquired" -> { + keyguardUpdateMonitor.playAcquiredHaptic() + } + "success" -> { + // needs to be kept up to date with AcquisitionClient#SUCCESS_VIBRATION_EFFECT + vibrator?.vibrate( + VibrationEffect.get(VibrationEffect.EFFECT_CLICK), + sonificationEffects) + } + "error" -> { + // needs to be kept up to date with AcquisitionClient#ERROR_VIBRATION_EFFECT + vibrator?.vibrate( + VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK), + sonificationEffects) + } + else -> invalidCommand(pw) + } + } + } + + override fun help(pw: PrintWriter) { + pw.println("Usage: adb shell cmd statusbar udfps-haptic <haptic>") + pw.println("Available commands:") + pw.println(" start") + pw.println(" acquired") + pw.println(" success, always plays CLICK haptic") + pw.println(" error, always plays DOUBLE_CLICK haptic") + } + + fun invalidCommand(pw: PrintWriter) { + pw.println("invalid command") + help(pw) + } +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardDrawable.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardDrawable.java deleted file mode 100644 index 889409351a8c..000000000000 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardDrawable.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.biometrics; - -import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; - -import android.animation.ValueAnimator; -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.util.MathUtils; - -import androidx.annotation.NonNull; - -import com.android.internal.graphics.ColorUtils; -import com.android.settingslib.Utils; -import com.android.systemui.R; -import com.android.systemui.animation.Interpolators; -import com.android.systemui.doze.DozeReceiver; - -/** - * UDFPS animations that should be shown when authenticating on keyguard. - */ -public class UdfpsKeyguardDrawable extends UdfpsDrawable implements DozeReceiver { - - private static final String TAG = "UdfpsAnimationKeyguard"; - private final int mAmbientDisplayColor; - static final float DEFAULT_AOD_STROKE_WIDTH = 1f; - - @NonNull private final Context mContext; - private int mLockScreenColor; - - // AOD anti-burn-in offsets - private final int mMaxBurnInOffsetX; - private final int mMaxBurnInOffsetY; - private float mInterpolatedDarkAmount; - private float mBurnInOffsetX; - private float mBurnInOffsetY; - - private final ValueAnimator mHintAnimator = ValueAnimator.ofFloat( - UdfpsKeyguardDrawable.DEFAULT_STROKE_WIDTH, - .5f, - UdfpsKeyguardDrawable.DEFAULT_STROKE_WIDTH); - - UdfpsKeyguardDrawable(@NonNull Context context) { - super(context); - mContext = context; - - mMaxBurnInOffsetX = context.getResources() - .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_x); - mMaxBurnInOffsetY = context.getResources() - .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y); - - mHintAnimator.setDuration(2000); - mHintAnimator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); - mHintAnimator.addUpdateListener(anim -> setStrokeWidth((float) anim.getAnimatedValue())); - - mLockScreenColor = Utils.getColorAttrDefaultColor(mContext, - R.attr.wallpaperTextColorAccent); - mAmbientDisplayColor = Color.WHITE; - - updateIcon(); - } - - private void updateIcon() { - mBurnInOffsetX = MathUtils.lerp(0f, - getBurnInOffset(mMaxBurnInOffsetX * 2, true /* xAxis */) - - mMaxBurnInOffsetX, - mInterpolatedDarkAmount); - mBurnInOffsetY = MathUtils.lerp(0f, - getBurnInOffset(mMaxBurnInOffsetY * 2, false /* xAxis */) - - mMaxBurnInOffsetY, - mInterpolatedDarkAmount); - - mFingerprintDrawable.setTint(ColorUtils.blendARGB(mLockScreenColor, - mAmbientDisplayColor, mInterpolatedDarkAmount)); - setStrokeWidth(MathUtils.lerp(DEFAULT_STROKE_WIDTH, DEFAULT_AOD_STROKE_WIDTH, - mInterpolatedDarkAmount)); - invalidateSelf(); - } - - @Override - public void dozeTimeTick() { - updateIcon(); - } - - @Override - public void draw(@NonNull Canvas canvas) { - if (isIlluminationShowing()) { - return; - } - canvas.save(); - canvas.translate(mBurnInOffsetX, mBurnInOffsetY); - mFingerprintDrawable.draw(canvas); - canvas.restore(); - } - - void animateHint() { - mHintAnimator.start(); - } - - void onDozeAmountChanged(float linear, float eased) { - mHintAnimator.cancel(); - mInterpolatedDarkAmount = eased; - updateIcon(); - } - - void setLockScreenColor(int color) { - if (mLockScreenColor == color) return; - mLockScreenColor = color; - updateIcon(); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java index 804e2ab00bde..ec96af3ef500 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java @@ -16,6 +16,9 @@ package com.android.systemui.biometrics; +import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; +import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInProgressOffset; + import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -23,7 +26,10 @@ import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffColorFilter; import android.util.AttributeSet; +import android.util.MathUtils; import android.view.View; import android.widget.ImageView; @@ -34,12 +40,17 @@ import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.statusbar.StatusBarState; +import com.airbnb.lottie.LottieAnimationView; +import com.airbnb.lottie.LottieProperty; +import com.airbnb.lottie.model.KeyPath; /** * View corresponding with udfps_keyguard_view.xml */ public class UdfpsKeyguardView extends UdfpsAnimationView { - private final UdfpsKeyguardDrawable mFingerprintDrawable; - private ImageView mFingerprintView; + private UdfpsDrawable mFingerprintDrawable; // placeholder + private LottieAnimationView mAodFp; + private LottieAnimationView mLockScreenFp; + private int mUdfpsBouncerColor; private int mWallpaperTextColor; private int mStatusBarState; @@ -52,16 +63,31 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { private AnimatorSet mAnimatorSet; private int mAlpha; // 0-255 + // AOD anti-burn-in offsets + private final int mMaxBurnInOffsetX; + private final int mMaxBurnInOffsetY; + private float mBurnInOffsetX; + private float mBurnInOffsetY; + private float mBurnInProgress; + private float mInterpolatedDarkAmount; + + private ValueAnimator mHintAnimator; + public UdfpsKeyguardView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - mFingerprintDrawable = new UdfpsKeyguardDrawable(mContext); + mFingerprintDrawable = new UdfpsFpDrawable(context); + + mMaxBurnInOffsetX = context.getResources() + .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_x); + mMaxBurnInOffsetY = context.getResources() + .getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y); } @Override protected void onFinishInflate() { super.onFinishInflate(); - mFingerprintView = findViewById(R.id.udfps_keyguard_animation_fp_view); - mFingerprintView.setForeground(mFingerprintDrawable); + mAodFp = findViewById(R.id.udfps_aod_fp); + mLockScreenFp = findViewById(R.id.udfps_lockscreen_fp); mBgProtection = findViewById(R.id.udfps_keyguard_fp_bg); @@ -69,7 +95,16 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { R.attr.wallpaperTextColorAccent); mTextColorPrimary = Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary); + + // requires call to invalidate to update the color (see #updateColor) + mLockScreenFp.addValueCallback( + new KeyPath("**"), LottieProperty.COLOR_FILTER, + frameInfo -> new PorterDuffColorFilter(getColor(), PorterDuff.Mode.SRC_ATOP) + ); mUdfpsRequested = false; + + mHintAnimator = ObjectAnimator.ofFloat(mLockScreenFp, "progress", 1f, 0f, 1f); + mHintAnimator.setDuration(4000); } @Override @@ -89,10 +124,27 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { @Override public boolean dozeTimeTick() { - mFingerprintDrawable.dozeTimeTick(); + updateBurnInOffsets(); return true; } + private void updateBurnInOffsets() { + mBurnInOffsetX = MathUtils.lerp(0f, + getBurnInOffset(mMaxBurnInOffsetX * 2, true /* xAxis */) + - mMaxBurnInOffsetX, mInterpolatedDarkAmount); + mBurnInOffsetY = MathUtils.lerp(0f, + getBurnInOffset(mMaxBurnInOffsetY * 2, false /* xAxis */) + - mMaxBurnInOffsetY, mInterpolatedDarkAmount); + mBurnInProgress = MathUtils.lerp(0f, getBurnInProgressOffset(), mInterpolatedDarkAmount); + + mAodFp.setTranslationX(mBurnInOffsetX); + mAodFp.setTranslationY(mBurnInOffsetY); + mAodFp.setProgress(mBurnInProgress); + + mLockScreenFp.setTranslationX(mBurnInOffsetX); + mLockScreenFp.setTranslationY(mBurnInOffsetY); + } + void requestUdfps(boolean request, int color) { if (request) { mUdfpsRequestedColor = color; @@ -105,22 +157,31 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { void setStatusBarState(int statusBarState) { mStatusBarState = statusBarState; - updateColor(); } void updateColor() { - mFingerprintView.setAlpha(1f); - mFingerprintDrawable.setLockScreenColor(getColor()); + mLockScreenFp.invalidate(); + } + + private boolean showingUdfpsBouncer() { + return mBgProtection.getVisibility() == View.VISIBLE; } + private int getColor() { - if (mUdfpsRequested && mUdfpsRequestedColor != -1) { + if (isUdfpsColorRequested()) { return mUdfpsRequestedColor; + } else if (showingUdfpsBouncer()) { + return mUdfpsBouncerColor; } else { return mWallpaperTextColor; } } + private boolean isUdfpsColorRequested() { + return mUdfpsRequested && mUdfpsRequestedColor != -1; + } + /** * @param alpha between 0 and 255 */ @@ -130,6 +191,13 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { } @Override + protected int updateAlpha() { + int alpha = super.updateAlpha(); + mLockScreenFp.setImageAlpha(alpha); + return alpha; + } + + @Override int calculateAlpha() { if (mPauseAuth) { return 0; @@ -138,18 +206,31 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { } void onDozeAmountChanged(float linear, float eased) { - mFingerprintDrawable.onDozeAmountChanged(linear, eased); + mHintAnimator.cancel(); + mInterpolatedDarkAmount = eased; + updateBurnInOffsets(); + mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount); + mAodFp.setAlpha(mInterpolatedDarkAmount); + + if (linear == 1f) { + mLockScreenFp.setVisibility(View.INVISIBLE); + } else { + mLockScreenFp.setVisibility(View.VISIBLE); + } } void animateHint() { - mFingerprintDrawable.animateHint(); + if (!isShadeLocked() && !mUdfpsRequested && mAlpha == 255 + && mLockScreenFp.isVisibleToUser()) { + mHintAnimator.start(); + } } /** * Animates in the bg protection circle behind the fp icon to highlight the icon. */ void animateUdfpsBouncer(Runnable onEndAnimation) { - if (mBgProtection.getVisibility() == View.VISIBLE && mBgProtection.getAlpha() == 1f) { + if (showingUdfpsBouncer() && mBgProtection.getAlpha() == 1f) { // already fully highlighted, don't re-animate return; } @@ -157,19 +238,6 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { if (mAnimatorSet != null) { mAnimatorSet.cancel(); } - ValueAnimator fpIconAnim; - if (isShadeLocked()) { - // set color and fade in since we weren't showing before - mFingerprintDrawable.setLockScreenColor(mTextColorPrimary); - fpIconAnim = ObjectAnimator.ofFloat(mFingerprintView, View.ALPHA, 0f, 1f); - } else { - // update icon color - fpIconAnim = new ValueAnimator(); - fpIconAnim.setIntValues(getColor(), mTextColorPrimary); - fpIconAnim.setEvaluator(new ArgbEvaluator()); - fpIconAnim.addUpdateListener(valueAnimator -> mFingerprintDrawable.setLockScreenColor( - (Integer) valueAnimator.getAnimatedValue())); - } mAnimatorSet = new AnimatorSet(); mAnimatorSet.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); @@ -181,11 +249,31 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { } }); + ValueAnimator fpIconColorAnim; + if (isShadeLocked()) { + // set color and fade in since we weren't showing before + mUdfpsBouncerColor = mTextColorPrimary; + fpIconColorAnim = ValueAnimator.ofInt(0, 255); + fpIconColorAnim.addUpdateListener(valueAnimator -> + mLockScreenFp.setImageAlpha((int) valueAnimator.getAnimatedValue())); + } else { + // update icon color + fpIconColorAnim = new ValueAnimator(); + fpIconColorAnim.setIntValues( + isUdfpsColorRequested() ? mUdfpsRequestedColor : mWallpaperTextColor, + mTextColorPrimary); + fpIconColorAnim.setEvaluator(ArgbEvaluator.getInstance()); + fpIconColorAnim.addUpdateListener(valueAnimator -> { + mUdfpsBouncerColor = (int) valueAnimator.getAnimatedValue(); + updateColor(); + }); + } + mAnimatorSet.playTogether( ObjectAnimator.ofFloat(mBgProtection, View.ALPHA, 0f, 1f), ObjectAnimator.ofFloat(mBgProtection, View.SCALE_X, 0f, 1f), ObjectAnimator.ofFloat(mBgProtection, View.SCALE_Y, 0f, 1f), - fpIconAnim); + fpIconColorAnim); mAnimatorSet.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -197,15 +285,11 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { mAnimatorSet.start(); } - private boolean isShadeLocked() { - return mStatusBarState == StatusBarState.SHADE_LOCKED; - } - /** * Animates out the bg protection circle behind the fp icon to unhighlight the icon. */ void animateAwayUdfpsBouncer(@Nullable Runnable onEndAnimation) { - if (mBgProtection.getVisibility() == View.GONE) { + if (!showingUdfpsBouncer()) { // already hidden return; } @@ -213,17 +297,25 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { if (mAnimatorSet != null) { mAnimatorSet.cancel(); } - ValueAnimator fpIconAnim; + + ValueAnimator fpIconColorAnim; if (isShadeLocked()) { // fade out - fpIconAnim = ObjectAnimator.ofFloat(mFingerprintView, View.ALPHA, 1f, 0f); + mUdfpsBouncerColor = mTextColorPrimary; + fpIconColorAnim = ValueAnimator.ofInt(255, 0); + fpIconColorAnim.addUpdateListener(valueAnimator -> + mLockScreenFp.setImageAlpha((int) valueAnimator.getAnimatedValue())); } else { // update icon color - fpIconAnim = new ValueAnimator(); - fpIconAnim.setIntValues(mTextColorPrimary, getColor()); - fpIconAnim.setEvaluator(new ArgbEvaluator()); - fpIconAnim.addUpdateListener(valueAnimator -> mFingerprintDrawable.setLockScreenColor( - (Integer) valueAnimator.getAnimatedValue())); + fpIconColorAnim = new ValueAnimator(); + fpIconColorAnim.setIntValues( + mTextColorPrimary, + isUdfpsColorRequested() ? mUdfpsRequestedColor : mWallpaperTextColor); + fpIconColorAnim.setEvaluator(ArgbEvaluator.getInstance()); + fpIconColorAnim.addUpdateListener(valueAnimator -> { + mUdfpsBouncerColor = (int) valueAnimator.getAnimatedValue(); + updateColor(); + }); } mAnimatorSet = new AnimatorSet(); @@ -231,7 +323,7 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { ObjectAnimator.ofFloat(mBgProtection, View.ALPHA, 1f, 0f), ObjectAnimator.ofFloat(mBgProtection, View.SCALE_X, 1f, 0f), ObjectAnimator.ofFloat(mBgProtection, View.SCALE_Y, 1f, 0f), - fpIconAnim); + fpIconColorAnim); mAnimatorSet.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); mAnimatorSet.setDuration(500); @@ -244,10 +336,15 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { } } }); + mAnimatorSet.start(); } boolean isAnimating() { return mAnimatorSet != null && mAnimatorSet.isRunning(); } + + private boolean isShadeLocked() { + return mStatusBarState == StatusBarState.SHADE_LOCKED; + } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java index 35ca470df523..819de538c840 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java @@ -316,6 +316,14 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud } } + public void onBiometricError(int msgId, String errString, + BiometricSourceType biometricSourceType) { + if (biometricSourceType == BiometricSourceType.FACE) { + // show udfps hint when face auth fails + showHint(true); + } + } + public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType, boolean isStrongBiometric) { if (biometricSourceType == BiometricSourceType.FACE) { diff --git a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java index 020401ecd2f8..809e7a70d66c 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java @@ -25,6 +25,7 @@ import android.net.Uri; import android.os.Build; import android.util.IndentingPrintWriter; import android.util.Log; +import android.view.accessibility.AccessibilityManager; import androidx.annotation.NonNull; @@ -70,6 +71,7 @@ public class BrightLineFalsingManager implements FalsingManager { private final DoubleTapClassifier mDoubleTapClassifier; private final HistoryTracker mHistoryTracker; private final KeyguardStateController mKeyguardStateController; + private AccessibilityManager mAccessibilityManager; private final boolean mTestHarness; private final MetricsLogger mMetricsLogger; private int mIsFalseTouchCalls; @@ -175,6 +177,7 @@ public class BrightLineFalsingManager implements FalsingManager { @Named(BRIGHT_LINE_GESTURE_CLASSIFERS) Set<FalsingClassifier> classifiers, SingleTapClassifier singleTapClassifier, DoubleTapClassifier doubleTapClassifier, HistoryTracker historyTracker, KeyguardStateController keyguardStateController, + AccessibilityManager accessibilityManager, @TestHarness boolean testHarness) { mDataProvider = falsingDataProvider; mDockManager = dockManager; @@ -184,6 +187,7 @@ public class BrightLineFalsingManager implements FalsingManager { mDoubleTapClassifier = doubleTapClassifier; mHistoryTracker = historyTracker; mKeyguardStateController = keyguardStateController; + mAccessibilityManager = accessibilityManager; mTestHarness = testHarness; mDataProvider.addSessionListener(mSessionListener); @@ -328,7 +332,8 @@ public class BrightLineFalsingManager implements FalsingManager { || !mKeyguardStateController.isShowing() || mTestHarness || mDataProvider.isJustUnlockedWithFace() - || mDockManager.isDocked(); + || mDockManager.isDocked() + || mAccessibilityManager.isEnabled(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/classifier/Classifier.java b/packages/SystemUI/src/com/android/systemui/classifier/Classifier.java index ffdcff2ef2b0..f18413be0134 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/Classifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/Classifier.java @@ -41,7 +41,7 @@ public abstract class Classifier { public static final int SHADE_DRAG = 11; public static final int QS_COLLAPSE = 12; public static final int UDFPS_AUTHENTICATION = 13; - public static final int DISABLED_UDFPS_AFFORDANCE = 14; + public static final int LOCK_ICON = 14; public static final int QS_SWIPE = 15; public static final int BACK_GESTURE = 16; @@ -61,7 +61,7 @@ public abstract class Classifier { QS_COLLAPSE, BRIGHTNESS_SLIDER, UDFPS_AUTHENTICATION, - DISABLED_UDFPS_AFFORDANCE, + LOCK_ICON, QS_SWIPE, BACK_GESTURE }) diff --git a/packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java index 229801074246..d0fe1c37d4fa 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java @@ -155,7 +155,7 @@ class DistanceClassifier extends FalsingClassifier { || interactionType == SHADE_DRAG || interactionType == QS_COLLAPSE || interactionType == Classifier.UDFPS_AUTHENTICATION - || interactionType == Classifier.DISABLED_UDFPS_AFFORDANCE + || interactionType == Classifier.LOCK_ICON || interactionType == Classifier.QS_SWIPE) { return Result.passed(0); } diff --git a/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java index c2ad7e6387d6..f040712706cd 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java @@ -46,7 +46,7 @@ public class TypeClassifier extends FalsingClassifier { @Classifier.InteractionType int interactionType, double historyBelief, double historyConfidence) { if (interactionType == Classifier.UDFPS_AUTHENTICATION - || interactionType == Classifier.DISABLED_UDFPS_AFFORDANCE) { + || interactionType == Classifier.LOCK_ICON) { return Result.passed(0); } diff --git a/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt b/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt index 73abf4519f73..15e3f3a6b1e9 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/doze/util/BurnInHelper.kt @@ -22,6 +22,7 @@ private const val MILLIS_PER_MINUTES = 1000 * 60f private const val BURN_IN_PREVENTION_PERIOD_Y = 521f private const val BURN_IN_PREVENTION_PERIOD_X = 83f private const val BURN_IN_PREVENTION_PERIOD_SCALE = 180f +private const val BURN_IN_PREVENTION_PERIOD_PROGRESS = 120f /** * Returns the translation offset that should be used to avoid burn in at @@ -37,6 +38,15 @@ fun getBurnInOffset(amplitude: Int, xAxis: Boolean): Int { } /** + * Returns a progress offset (between 0f and 1.0f) that should be used to avoid burn in at + * the current time. + */ +fun getBurnInProgressOffset(): Float { + return zigzag(System.currentTimeMillis() / MILLIS_PER_MINUTES, + 1f, BURN_IN_PREVENTION_PERIOD_PROGRESS) +} + +/** * Returns a value to scale a view in order to avoid burn in. */ fun getBurnInScale(): Float { diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index e37d3d586ccc..a641ad4b338b 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -30,7 +30,6 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.R; -import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.Utils; import com.android.systemui.plugins.GlobalActions; import com.android.systemui.scrim.ScrimDrawable; @@ -51,7 +50,6 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks private final KeyguardStateController mKeyguardStateController; private final DeviceProvisionedController mDeviceProvisionedController; private final BlurUtils mBlurUtils; - private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final CommandQueue mCommandQueue; private GlobalActionsDialogLite mGlobalActionsDialog; private boolean mDisabled; @@ -60,15 +58,13 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks public GlobalActionsImpl(Context context, CommandQueue commandQueue, Lazy<GlobalActionsDialogLite> globalActionsDialogLazy, BlurUtils blurUtils, KeyguardStateController keyguardStateController, - DeviceProvisionedController deviceProvisionedController, - KeyguardUpdateMonitor keyguardUpdateMonitor) { + DeviceProvisionedController deviceProvisionedController) { mContext = context; mGlobalActionsDialogLazy = globalActionsDialogLazy; mKeyguardStateController = keyguardStateController; mDeviceProvisionedController = deviceProvisionedController; mCommandQueue = commandQueue; mBlurUtils = blurUtils; - mKeyguardUpdateMonitor = keyguardUpdateMonitor; mCommandQueue.addCallback(this); } @@ -87,7 +83,6 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks mGlobalActionsDialog = mGlobalActionsDialogLazy.get(); mGlobalActionsDialog.showOrHideDialog(mKeyguardStateController.isShowing(), mDeviceProvisionedController.isDeviceProvisioned()); - mKeyguardUpdateMonitor.requestFaceAuth(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java index ac4fc62bf1c9..d1a103e3a8fa 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPopupMenu.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.util.LayoutDirection; import android.view.View; import android.view.View.MeasureSpec; -import android.view.WindowManager; import android.widget.AdapterView; import android.widget.ListAdapter; import android.widget.ListPopupWindow; @@ -49,11 +48,9 @@ public class GlobalActionsPopupMenu extends ListPopupWindow { mContext = context; Resources res = mContext.getResources(); setBackgroundDrawable( - res.getDrawable(R.drawable.rounded_bg_full, context.getTheme())); + res.getDrawable(R.drawable.global_actions_popup_bg, context.getTheme())); mIsDropDownMode = isDropDownMode; - // required to show above the global actions dialog - setWindowLayoutType(WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY); setInputMethodMode(INPUT_METHOD_NOT_NEEDED); setModal(true); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndication.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndication.java index 2873cd36409d..9b83b75cec22 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndication.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndication.java @@ -40,18 +40,22 @@ public class KeyguardIndication { private final View.OnClickListener mOnClickListener; @Nullable private final Drawable mBackground; + @Nullable + private final Long mMinVisibilityMillis; // in milliseconds private KeyguardIndication( CharSequence message, ColorStateList textColor, Drawable icon, View.OnClickListener onClickListener, - Drawable background) { + Drawable background, + Long minVisibilityMillis) { mMessage = message; mTextColor = textColor; mIcon = icon; mOnClickListener = onClickListener; mBackground = background; + mMinVisibilityMillis = minVisibilityMillis; } /** @@ -89,6 +93,14 @@ public class KeyguardIndication { return mBackground; } + /** + * Minimum time to show text in milliseconds. + * @return null if unspecified + */ + public @Nullable Long getMinVisibilityMillis() { + return mMinVisibilityMillis; + } + @Override public String toString() { String str = "KeyguardIndication{"; @@ -96,6 +108,7 @@ public class KeyguardIndication { if (mIcon != null) str += " mIcon=" + mIcon; if (mOnClickListener != null) str += " mOnClickListener=" + mOnClickListener; if (mBackground != null) str += " mBackground=" + mBackground; + if (mMinVisibilityMillis != null) str += " mMinVisibilityMillis=" + mMinVisibilityMillis; str += "}"; return str; } @@ -109,6 +122,7 @@ public class KeyguardIndication { private View.OnClickListener mOnClickListener; private ColorStateList mTextColor; private Drawable mBackground; + private Long mMinVisibilityMillis; public Builder() { } @@ -155,6 +169,15 @@ public class KeyguardIndication { } /** + * Optional. Set a required minimum visibility time in milliseconds for the text + * to show. + */ + public Builder setMinVisibilityMillis(Long minVisibilityMillis) { + this.mMinVisibilityMillis = minVisibilityMillis; + return this; + } + + /** * Build the KeyguardIndication. */ public KeyguardIndication build() { @@ -166,7 +189,8 @@ public class KeyguardIndication { } return new KeyguardIndication( - mMessage, mTextColor, mIcon, mOnClickListener, mBackground); + mMessage, mTextColor, mIcon, mOnClickListener, mBackground, + mMinVisibilityMillis); } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java index fc5f3b8ae994..2d215e0f1f62 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java @@ -23,7 +23,6 @@ import android.text.TextUtils; import androidx.annotation.IntDef; -import com.android.settingslib.Utils; import com.android.systemui.Dumpable; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -164,15 +163,14 @@ public class KeyguardIndicationRotateTextViewController extends * Transient messages: * - show immediately * - will continue to be in the rotation of messages shown until hideTransient is called. - * - can be presented with an "error" color if isError is true */ - public void showTransient(CharSequence newIndication, boolean isError) { + public void showTransient(CharSequence newIndication) { + final long inAnimationDuration = 600L; // see KeyguardIndicationTextView.getYInDuration updateIndication(INDICATION_TYPE_TRANSIENT, new KeyguardIndication.Builder() .setMessage(newIndication) - .setTextColor(isError - ? Utils.getColorError(getContext()) - : mInitialTextColorState) + .setMinVisibilityMillis(2000L + inAnimationDuration) + .setTextColor(mInitialTextColorState) .build(), /* showImmediately */true); } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index c6fd20ebda6e..15f7a1219f3f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -975,12 +975,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, mPowerGestureIntercepted = false; mGoingToSleep = true; - // Reset keyguard going away state so we can start listening for fingerprint. We - // explicitly DO NOT want to call - // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false) - // here, since that will mess with the device lock state. - mUpdateMonitor.dispatchKeyguardGoingAway(false); - // Lock immediately based on setting if secure (user has a pin/pattern/password). // This also "locks" the device when not secure to provide easy access to the // camera while preventing unwanted input. @@ -1018,7 +1012,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, playSounds(true); } } + mUpdateMonitor.dispatchStartedGoingToSleep(offReason); + + // Reset keyguard going away state so we can start listening for fingerprint. We + // explicitly DO NOT want to call + // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false) + // here, since that will mess with the device lock state. + mUpdateMonitor.dispatchKeyguardGoingAway(false); + notifyStartedGoingToSleep(); } @@ -2161,6 +2163,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, if (!mHiding && !mSurfaceBehindRemoteAnimationRequested && !mKeyguardStateController.isFlingingToDismissKeyguardDuringSwipeGesture()) { + if (finishedCallback != null) { + // There will not execute animation, send a finish callback to ensure the remote + // animation won't hanging there. + try { + finishedCallback.onAnimationFinished(); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to call onAnimationFinished", e); + } + } setShowingLocked(mShowing, true /* force */); return; } @@ -2178,12 +2189,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, mDrawnCallback = null; } - // only play "unlock" noises if not on a call (since the incall UI - // disables the keyguard) - if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) { - playSounds(false); - } - LatencyTracker.getInstance(mContext) .onActionEnd(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK); @@ -2301,6 +2306,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } private void onKeyguardExitFinished() { + // only play "unlock" noises if not on a call (since the incall UI + // disables the keyguard) + if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) { + Log.i("TEST", "playSounds: false"); + playSounds(false); + } + setShowingLocked(false); mWakeAndUnlocking = false; mDismissCallbackRegistry.notifyDismissSucceeded(); diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index 8c6a3cad8b9f..cc9414cbdf50 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -26,6 +26,7 @@ import com.android.systemui.util.Utils import com.android.systemui.util.animation.UniqueObjectHostView import com.android.systemui.util.animation.requiresRemeasuring import com.android.systemui.util.concurrency.DelayableExecutor +import com.android.systemui.util.time.SystemClock import java.util.TreeMap import javax.inject.Inject import javax.inject.Provider @@ -45,6 +46,7 @@ class MediaCarouselController @Inject constructor( private val visualStabilityManager: VisualStabilityManager, private val mediaHostStatesManager: MediaHostStatesManager, private val activityStarter: ActivityStarter, + private val systemClock: SystemClock, @Main executor: DelayableExecutor, private val mediaManager: MediaDataManager, configurationController: ConfigurationController, @@ -358,12 +360,12 @@ class MediaCarouselController @Inject constructor( newPlayer.playerViewHolder?.player?.setLayoutParams(lp) newPlayer.bindPlayer(dataCopy, key) newPlayer.setListening(currentlyExpanded) - MediaPlayerData.addMediaPlayer(key, dataCopy, newPlayer) + MediaPlayerData.addMediaPlayer(key, dataCopy, newPlayer, systemClock) updatePlayerToState(newPlayer, noAnimation = true) reorderAllPlayers(curVisibleMediaKey) } else { existingPlayer.bindPlayer(dataCopy, key) - MediaPlayerData.addMediaPlayer(key, dataCopy, existingPlayer) + MediaPlayerData.addMediaPlayer(key, dataCopy, existingPlayer, systemClock) if (visualStabilityManager.isReorderingAllowed || shouldScrollToActivePlayer) { reorderAllPlayers(curVisibleMediaKey) } else { @@ -407,7 +409,7 @@ class MediaCarouselController @Inject constructor( newRecs.bindRecommendation(data.copy(backgroundColor = bgColor)) val curVisibleMediaKey = MediaPlayerData.playerKeys() .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex) - MediaPlayerData.addMediaRecommendation(key, data, newRecs, shouldPrioritize) + MediaPlayerData.addMediaRecommendation(key, data, newRecs, shouldPrioritize, systemClock) updatePlayerToState(newRecs, noAnimation = true) reorderAllPlayers(curVisibleMediaKey) updatePageIndicator() @@ -775,9 +777,9 @@ internal object MediaPlayerData { private val mediaPlayers = TreeMap<MediaSortKey, MediaControlPanel>(comparator) private val mediaData: MutableMap<String, MediaSortKey> = mutableMapOf() - fun addMediaPlayer(key: String, data: MediaData, player: MediaControlPanel) { + fun addMediaPlayer(key: String, data: MediaData, player: MediaControlPanel, clock: SystemClock) { removeMediaPlayer(key) - val sortKey = MediaSortKey(isSsMediaRec = false, data, System.currentTimeMillis()) + val sortKey = MediaSortKey(isSsMediaRec = false, data, clock.currentTimeMillis()) mediaData.put(key, sortKey) mediaPlayers.put(sortKey, player) } @@ -786,11 +788,12 @@ internal object MediaPlayerData { key: String, data: SmartspaceMediaData, player: MediaControlPanel, - shouldPrioritize: Boolean + shouldPrioritize: Boolean, + clock: SystemClock ) { shouldPrioritizeSs = shouldPrioritize removeMediaPlayer(key) - val sortKey = MediaSortKey(isSsMediaRec = true, EMPTY, System.currentTimeMillis()) + val sortKey = MediaSortKey(isSsMediaRec = true, EMPTY, clock.currentTimeMillis()) mediaData.put(key, sortKey) mediaPlayers.put(sortKey, player) smartspaceMediaData = data diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index 19a67e95a496..a3d7a811cab1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -347,10 +347,11 @@ public class MediaControlPanel { artistText.setText(data.getArtist()); // Transfer chip - mPlayerViewHolder.getSeamless().setVisibility(View.VISIBLE); + ViewGroup seamlessView = mPlayerViewHolder.getSeamless(); + seamlessView.setVisibility(View.VISIBLE); setVisibleAndAlpha(collapsedSet, R.id.media_seamless, true /*visible */); setVisibleAndAlpha(expandedSet, R.id.media_seamless, true /*visible */); - mPlayerViewHolder.getSeamless().setOnClickListener(v -> { + seamlessView.setOnClickListener(v -> { mMediaOutputDialogFactory.create(data.getPackageName(), true); }); @@ -374,9 +375,9 @@ public class MediaControlPanel { collapsedSet.setAlpha(seamlessId, seamlessAlpha); // Disable clicking on output switcher for resumption controls. mPlayerViewHolder.getSeamless().setEnabled(!data.getResumption()); + String deviceString = null; if (showFallback) { iconView.setImageDrawable(null); - deviceName.setText(null); } else if (device != null) { Drawable icon = device.getIcon(); iconView.setVisibility(View.VISIBLE); @@ -387,13 +388,16 @@ public class MediaControlPanel { } else { iconView.setImageDrawable(icon); } - deviceName.setText(device.getName()); + deviceString = device.getName(); } else { // Reset to default Log.w(TAG, "device is null. Not binding output chip."); iconView.setVisibility(View.GONE); - deviceName.setText(com.android.internal.R.string.ext_media_seamless_action); + deviceString = mContext.getString( + com.android.internal.R.string.ext_media_seamless_action); } + deviceName.setText(deviceString); + seamlessView.setContentDescription(deviceString); List<Integer> actionsWhenCollapsed = data.getActionsToShowInCompact(); // Media controls diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index 186f961ff1b6..fb601e310702 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -537,8 +537,19 @@ class MediaHierarchyManager @Inject constructor( ) { val desiredLocation = calculateLocation() if (desiredLocation != this.desiredLocation || forceStateUpdate) { - if (this.desiredLocation >= 0) { + if (this.desiredLocation >= 0 && desiredLocation != this.desiredLocation) { + // Only update previous location when it actually changes previousLocation = this.desiredLocation + } else if (forceStateUpdate) { + val onLockscreen = (!bypassController.bypassEnabled && + (statusbarState == StatusBarState.KEYGUARD || + statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) + if (desiredLocation == LOCATION_QS && previousLocation == LOCATION_LOCKSCREEN && + !onLockscreen) { + // If media active state changed and the device is now unlocked, update the + // previous location so we animate between the correct hosts + previousLocation = LOCATION_QQS + } } val isNewView = this.desiredLocation == -1 this.desiredLocation = desiredLocation diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleBackupFollowUpJob.java b/packages/SystemUI/src/com/android/systemui/people/PeopleBackupFollowUpJob.java new file mode 100644 index 000000000000..3bc1f30ea321 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/people/PeopleBackupFollowUpJob.java @@ -0,0 +1,229 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people; + +import static com.android.systemui.people.PeopleSpaceUtils.DEBUG; +import static com.android.systemui.people.PeopleSpaceUtils.EMPTY_STRING; +import static com.android.systemui.people.PeopleSpaceUtils.removeSharedPreferencesStorageForTile; +import static com.android.systemui.people.widget.PeopleBackupHelper.isReadyForRestore; + +import android.app.job.JobInfo; +import android.app.job.JobParameters; +import android.app.job.JobScheduler; +import android.app.job.JobService; +import android.app.people.IPeopleManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.os.PersistableBundle; +import android.os.ServiceManager; +import android.preference.PreferenceManager; +import android.util.Log; + +import androidx.annotation.VisibleForTesting; + +import com.android.systemui.people.widget.PeopleBackupHelper; +import com.android.systemui.people.widget.PeopleTileKey; + +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Follow-up job that runs after a Conversations widgets restore operation. Check if shortcuts that + * were not available before are now available. If any shortcut doesn't become available after + * 1 day, we clean up its storage. + */ +public class PeopleBackupFollowUpJob extends JobService { + private static final String TAG = "PeopleBackupFollowUpJob"; + private static final String START_DATE = "start_date"; + + /** Follow-up job id. */ + public static final int JOB_ID = 74823873; + + private static final long JOB_PERIODIC_DURATION = Duration.ofHours(6).toMillis(); + private static final long CLEAN_UP_STORAGE_AFTER_DURATION = Duration.ofHours(48).toMillis(); + + /** SharedPreferences file name for follow-up specific storage.*/ + public static final String SHARED_FOLLOW_UP = "shared_follow_up"; + + private final Object mLock = new Object(); + private Context mContext; + private PackageManager mPackageManager; + private IPeopleManager mIPeopleManager; + private JobScheduler mJobScheduler; + + /** Schedules a PeopleBackupFollowUpJob every 2 hours. */ + public static void scheduleJob(Context context) { + JobScheduler jobScheduler = context.getSystemService(JobScheduler.class); + PersistableBundle bundle = new PersistableBundle(); + bundle.putLong(START_DATE, System.currentTimeMillis()); + JobInfo jobInfo = new JobInfo + .Builder(JOB_ID, new ComponentName(context, PeopleBackupFollowUpJob.class)) + .setPeriodic(JOB_PERIODIC_DURATION) + .setExtras(bundle) + .build(); + jobScheduler.schedule(jobInfo); + } + + @Override + public void onCreate() { + super.onCreate(); + mContext = getApplicationContext(); + mPackageManager = getApplicationContext().getPackageManager(); + mIPeopleManager = IPeopleManager.Stub.asInterface( + ServiceManager.getService(Context.PEOPLE_SERVICE)); + mJobScheduler = mContext.getSystemService(JobScheduler.class); + + } + + /** Sets necessary managers for testing. */ + @VisibleForTesting + public void setManagers(Context context, PackageManager packageManager, + IPeopleManager iPeopleManager, JobScheduler jobScheduler) { + mContext = context; + mPackageManager = packageManager; + mIPeopleManager = iPeopleManager; + mJobScheduler = jobScheduler; + } + + @Override + public boolean onStartJob(JobParameters params) { + if (DEBUG) Log.d(TAG, "Starting job."); + synchronized (mLock) { + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences.Editor editor = sp.edit(); + SharedPreferences followUp = this.getSharedPreferences( + SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + SharedPreferences.Editor followUpEditor = followUp.edit(); + + // Remove from SHARED_FOLLOW_UP storage all widgets that are now ready to be updated. + Map<String, Set<String>> remainingWidgets = + processFollowUpFile(followUp, followUpEditor); + + // Check if all widgets were restored or if enough time elapsed to cancel the job. + long start = params.getExtras().getLong(START_DATE); + long now = System.currentTimeMillis(); + if (shouldCancelJob(remainingWidgets, start, now)) { + cancelJobAndClearRemainingWidgets(remainingWidgets, followUpEditor, sp); + } + + editor.apply(); + followUpEditor.apply(); + } + + // Ensure all widgets modified from SHARED_FOLLOW_UP storage are now updated. + PeopleBackupHelper.updateWidgets(mContext); + return false; + } + + /** + * Iterates through follow-up file entries and checks which shortcuts are now available. + * Returns a map of shortcuts that should be checked at a later time. + */ + public Map<String, Set<String>> processFollowUpFile(SharedPreferences followUp, + SharedPreferences.Editor followUpEditor) { + Map<String, Set<String>> remainingWidgets = new HashMap<>(); + Map<String, ?> all = followUp.getAll(); + for (Map.Entry<String, ?> entry : all.entrySet()) { + String key = entry.getKey(); + + PeopleTileKey peopleTileKey = PeopleTileKey.fromString(key); + boolean restored = isReadyForRestore(mIPeopleManager, mPackageManager, peopleTileKey); + if (restored) { + if (DEBUG) Log.d(TAG, "Removing key from follow-up: " + key); + followUpEditor.remove(key); + continue; + } + + if (DEBUG) Log.d(TAG, "Key should not be restored yet, try later: " + key); + try { + remainingWidgets.put(entry.getKey(), (Set<String>) entry.getValue()); + } catch (Exception e) { + Log.e(TAG, "Malformed entry value: " + entry.getValue()); + } + } + return remainingWidgets; + } + + /** Returns whether all shortcuts were restored or if enough time elapsed to cancel the job. */ + public boolean shouldCancelJob(Map<String, Set<String>> remainingWidgets, + long start, long now) { + if (remainingWidgets.isEmpty()) { + if (DEBUG) Log.d(TAG, "All widget storage was successfully restored."); + return true; + } + + boolean oneDayHasPassed = (now - start) > CLEAN_UP_STORAGE_AFTER_DURATION; + if (oneDayHasPassed) { + if (DEBUG) { + Log.w(TAG, "One or more widgets were not properly restored, " + + "but cancelling job because it has been a day."); + } + return true; + } + if (DEBUG) Log.d(TAG, "There are still non-restored widgets, run job again."); + return false; + } + + /** Cancels job and removes storage of any shortcut that was not restored. */ + public void cancelJobAndClearRemainingWidgets(Map<String, Set<String>> remainingWidgets, + SharedPreferences.Editor followUpEditor, SharedPreferences sp) { + if (DEBUG) Log.d(TAG, "Cancelling follow up job."); + removeUnavailableShortcutsFromSharedStorage(remainingWidgets, sp); + followUpEditor.clear(); + mJobScheduler.cancel(JOB_ID); + } + + private void removeUnavailableShortcutsFromSharedStorage(Map<String, + Set<String>> remainingWidgets, SharedPreferences sp) { + for (Map.Entry<String, Set<String>> entry : remainingWidgets.entrySet()) { + PeopleTileKey peopleTileKey = PeopleTileKey.fromString(entry.getKey()); + if (!PeopleTileKey.isValid(peopleTileKey)) { + Log.e(TAG, "Malformed peopleTileKey in follow-up file: " + entry.getKey()); + continue; + } + Set<String> widgetIds; + try { + widgetIds = (Set<String>) entry.getValue(); + } catch (Exception e) { + Log.e(TAG, "Malformed widget ids in follow-up file: " + e); + continue; + } + for (String id : widgetIds) { + int widgetId; + try { + widgetId = Integer.parseInt(id); + } catch (NumberFormatException ex) { + Log.e(TAG, "Malformed widget id in follow-up file: " + ex); + continue; + } + + String contactUriString = sp.getString(String.valueOf(widgetId), EMPTY_STRING); + removeSharedPreferencesStorageForTile( + mContext, peopleTileKey, widgetId, contactUriString); + } + } + } + + @Override + public boolean onStopJob(JobParameters params) { + return false; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java index 917a060f1f1d..c01d6dcd7d64 100644 --- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java +++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java @@ -25,6 +25,7 @@ import static com.android.systemui.people.NotificationHelper.shouldMatchNotifica import android.annotation.Nullable; import android.app.Notification; +import android.app.backup.BackupManager; import android.app.people.ConversationChannel; import android.app.people.IPeopleManager; import android.app.people.PeopleSpaceTile; @@ -74,7 +75,8 @@ import java.util.stream.Stream; /** Utils class for People Space. */ public class PeopleSpaceUtils { /** Turns on debugging information about People Space. */ - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; + public static final String PACKAGE_NAME = "package_name"; public static final String USER_ID = "user_id"; public static final String SHORTCUT_ID = "shortcut_id"; @@ -89,7 +91,7 @@ public class PeopleSpaceUtils { /** Returns stored widgets for the conversation specified. */ public static Set<String> getStoredWidgetIds(SharedPreferences sp, PeopleTileKey key) { - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { return new HashSet<>(); } return new HashSet<>(sp.getStringSet(key.toString(), new HashSet<>())); @@ -97,19 +99,16 @@ public class PeopleSpaceUtils { /** Sets all relevant storage for {@code appWidgetId} association to {@code tile}. */ public static void setSharedPreferencesStorageForTile(Context context, PeopleTileKey key, - int appWidgetId, Uri contactUri) { - if (!key.isValid()) { + int appWidgetId, Uri contactUri, BackupManager backupManager) { + if (!PeopleTileKey.isValid(key)) { Log.e(TAG, "Not storing for invalid key"); return; } // Write relevant persisted storage. SharedPreferences widgetSp = context.getSharedPreferences(String.valueOf(appWidgetId), Context.MODE_PRIVATE); - SharedPreferences.Editor widgetEditor = widgetSp.edit(); - widgetEditor.putString(PeopleSpaceUtils.PACKAGE_NAME, key.getPackageName()); - widgetEditor.putString(PeopleSpaceUtils.SHORTCUT_ID, key.getShortcutId()); - widgetEditor.putInt(PeopleSpaceUtils.USER_ID, key.getUserId()); - widgetEditor.apply(); + SharedPreferencesHelper.setPeopleTileKey(widgetSp, key); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences.Editor editor = sp.edit(); String contactUriString = contactUri == null ? EMPTY_STRING : contactUri.toString(); @@ -117,14 +116,18 @@ public class PeopleSpaceUtils { // Don't overwrite existing widgets with the same key. addAppWidgetIdForKey(sp, editor, appWidgetId, key.toString()); - addAppWidgetIdForKey(sp, editor, appWidgetId, contactUriString); + if (!TextUtils.isEmpty(contactUriString)) { + addAppWidgetIdForKey(sp, editor, appWidgetId, contactUriString); + } editor.apply(); + backupManager.dataChanged(); } /** Removes stored data when tile is deleted. */ public static void removeSharedPreferencesStorageForTile(Context context, PeopleTileKey key, int widgetId, String contactUriString) { // Delete widgetId mapping to key. + if (DEBUG) Log.d(TAG, "Removing widget info from sharedPrefs"); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences.Editor editor = sp.edit(); editor.remove(String.valueOf(widgetId)); @@ -230,7 +233,7 @@ public class PeopleSpaceUtils { */ public static PeopleSpaceTile augmentTileFromNotification(Context context, PeopleSpaceTile tile, PeopleTileKey key, NotificationEntry notificationEntry, int messagesCount, - Optional<Integer> appWidgetId) { + Optional<Integer> appWidgetId, BackupManager backupManager) { if (notificationEntry == null || notificationEntry.getSbn().getNotification() == null) { if (DEBUG) Log.d(TAG, "Tile key: " + key.toString() + ". Notification is null"); return removeNotificationFields(tile); @@ -246,7 +249,7 @@ public class PeopleSpaceUtils { Uri contactUri = Uri.parse(uriFromNotification); // Update storage. setSharedPreferencesStorageForTile(context, new PeopleTileKey(tile), appWidgetId.get(), - contactUri); + contactUri, backupManager); // Update cached tile in-memory. updatedTile.setContactUri(contactUri); } diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java index 844a8c6b6583..7ab4b6f200ed 100644 --- a/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java +++ b/packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java @@ -97,7 +97,7 @@ import java.util.stream.Collectors; /** Functions that help creating the People tile layouts. */ public class PeopleTileViewHelper { /** Turns on debugging information about People Space. */ - public static final boolean DEBUG = true; + private static final boolean DEBUG = PeopleSpaceUtils.DEBUG; private static final String TAG = "PeopleTileView"; private static final int DAYS_IN_A_WEEK = 7; @@ -116,8 +116,10 @@ public class PeopleTileViewHelper { private static final int MIN_MEDIUM_VERTICAL_PADDING = 4; private static final int MAX_MEDIUM_PADDING = 16; private static final int FIXED_HEIGHT_DIMENS_FOR_MEDIUM_CONTENT_BEFORE_PADDING = 8 + 4; - private static final int FIXED_HEIGHT_DIMENS_FOR_SMALL = 6 + 4 + 8; - private static final int FIXED_WIDTH_DIMENS_FOR_SMALL = 4 + 4; + private static final int FIXED_HEIGHT_DIMENS_FOR_SMALL_VERTICAL = 6 + 4 + 8; + private static final int FIXED_WIDTH_DIMENS_FOR_SMALL_VERTICAL = 4 + 4; + private static final int FIXED_HEIGHT_DIMENS_FOR_SMALL_HORIZONTAL = 6 + 4; + private static final int FIXED_WIDTH_DIMENS_FOR_SMALL_HORIZONTAL = 8 + 8; private static final int MESSAGES_COUNT_OVERFLOW = 6; @@ -128,6 +130,8 @@ public class PeopleTileViewHelper { private static final Pattern ANY_DOUBLE_MARK_PATTERN = Pattern.compile("[!?][!?]+"); private static final Pattern MIXED_MARK_PATTERN = Pattern.compile("![?].*|.*[?]!"); + static final String BRIEF_PAUSE_ON_TALKBACK = "\n\n"; + // This regex can be used to match Unicode emoji characters and character sequences. It's from // the official Unicode site (https://unicode.org/reports/tr51/#EBNF_and_Regex) with minor // changes to fit our needs. It should be updated once new emoji categories are added. @@ -220,7 +224,7 @@ public class PeopleTileViewHelper { // Otherwise, create a list using the portrait/landscape sizes. int defaultWidth = getSizeInDp(context, R.dimen.default_width, density); - int defaultHeight = getSizeInDp(context, R.dimen.default_height, density); + int defaultHeight = getSizeInDp(context, R.dimen.default_height, density); widgetSizes = new ArrayList<>(2); int portraitWidth = options.getInt(OPTION_APPWIDGET_MIN_WIDTH, defaultWidth); @@ -330,11 +334,8 @@ public class PeopleTileViewHelper { R.layout.people_tile_suppressed_layout); } Drawable appIcon = mContext.getDrawable(R.drawable.ic_conversation_icon); - Bitmap appIconAsBitmap = convertDrawableToBitmap(appIcon); - FastBitmapDrawable drawable = new FastBitmapDrawable(appIconAsBitmap); - drawable.setIsDisabled(true); - Bitmap convertedBitmap = convertDrawableToBitmap(drawable); - views.setImageViewBitmap(R.id.icon, convertedBitmap); + Bitmap disabledBitmap = convertDrawableToDisabledBitmap(appIcon); + views.setImageViewBitmap(R.id.icon, disabledBitmap); return views; } @@ -407,7 +408,8 @@ public class PeopleTileViewHelper { return LAYOUT_LARGE; } // Small layout used below a certain minimum mWidth with any mHeight. - if (mWidth >= getSizeInDp(R.dimen.required_width_for_medium)) { + if (mHeight >= getSizeInDp(R.dimen.required_height_for_medium) + && mWidth >= getSizeInDp(R.dimen.required_width_for_medium)) { int spaceAvailableForPadding = mHeight - (getSizeInDp(R.dimen.avatar_size_for_medium) + 4 + getLineHeightFromResource( @@ -440,10 +442,15 @@ public class PeopleTileViewHelper { // Calculate adaptive avatar size for remaining layouts. if (layoutId == R.layout.people_tile_small) { - int avatarHeightSpace = mHeight - (FIXED_HEIGHT_DIMENS_FOR_SMALL + Math.max(18, + int avatarHeightSpace = mHeight - (FIXED_HEIGHT_DIMENS_FOR_SMALL_VERTICAL + Math.max(18, getLineHeightFromResource( R.dimen.name_text_size_for_small))); - int avatarWidthSpace = mWidth - FIXED_WIDTH_DIMENS_FOR_SMALL; + int avatarWidthSpace = mWidth - FIXED_WIDTH_DIMENS_FOR_SMALL_VERTICAL; + avatarSize = Math.min(avatarHeightSpace, avatarWidthSpace); + } + if (layoutId == R.layout.people_tile_small_horizontal) { + int avatarHeightSpace = mHeight - FIXED_HEIGHT_DIMENS_FOR_SMALL_HORIZONTAL; + int avatarWidthSpace = mWidth - FIXED_WIDTH_DIMENS_FOR_SMALL_HORIZONTAL; avatarSize = Math.min(avatarHeightSpace, avatarWidthSpace); } @@ -471,7 +478,7 @@ public class PeopleTileViewHelper { avatarSize = Math.min(avatarHeightSpace, avatarWidthSpace); } - if (isDndBlockingTileData(mTile)) { + if (isDndBlockingTileData(mTile) && mLayoutSize != LAYOUT_SMALL) { avatarSize = createDndRemoteViews().mAvatarSize; } @@ -488,14 +495,33 @@ public class PeopleTileViewHelper { boolean isAvailable = mTile.getStatuses() != null && mTile.getStatuses().stream().anyMatch( c -> c.getAvailability() == AVAILABILITY_AVAILABLE); + + int startPadding; if (isAvailable) { views.setViewVisibility(R.id.availability, View.VISIBLE); + startPadding = mContext.getResources().getDimensionPixelSize( + R.dimen.availability_dot_shown_padding); } else { views.setViewVisibility(R.id.availability, View.GONE); + startPadding = mContext.getResources().getDimensionPixelSize( + R.dimen.availability_dot_missing_padding); } + boolean isLeftToRight = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()) + == View.LAYOUT_DIRECTION_LTR; + views.setViewPadding(R.id.padding_before_availability, + isLeftToRight ? startPadding : 0, 0, isLeftToRight ? 0 : startPadding, + 0); + boolean hasNewStory = getHasNewStory(mTile); views.setImageViewBitmap(R.id.person_icon, - getPersonIconBitmap(mContext, mTile, maxAvatarSize)); + getPersonIconBitmap(mContext, mTile, maxAvatarSize, hasNewStory)); + if (hasNewStory) { + views.setContentDescription(R.id.person_icon, + mContext.getString(R.string.new_story_status_content_description, + mTile.getUserName())); + } else { + views.setContentDescription(R.id.person_icon, null); + } return views; } catch (Exception e) { Log.e(TAG, "Failed to set common fields: " + e); @@ -503,7 +529,17 @@ public class PeopleTileViewHelper { return views; } + private static boolean getHasNewStory(PeopleSpaceTile tile) { + return tile.getStatuses() != null && tile.getStatuses().stream().anyMatch( + c -> c.getActivity() == ACTIVITY_NEW_STORY); + } + private RemoteViews setLaunchIntents(RemoteViews views) { + if (!PeopleTileKey.isValid(mKey) || mTile == null) { + if (DEBUG) Log.d(TAG, "Skipping launch intent, Null tile or invalid key: " + mKey); + return views; + } + try { Intent activityIntent = new Intent(mContext, LaunchConversationActivity.class); activityIntent.addFlags( @@ -535,22 +571,9 @@ public class PeopleTileViewHelper { } private RemoteViewsAndSizes createDndRemoteViews() { - boolean isHorizontal = mLayoutSize == LAYOUT_MEDIUM; - int layoutId = isHorizontal - ? R.layout.people_tile_with_suppression_detail_content_horizontal - : R.layout.people_tile_with_suppression_detail_content_vertical; - RemoteViews views = new RemoteViews(mContext.getPackageName(), layoutId); - - int outerPadding = mLayoutSize == LAYOUT_LARGE ? 16 : 8; - int outerPaddingPx = dpToPx(outerPadding); - views.setViewPadding( - android.R.id.background, - outerPaddingPx, - outerPaddingPx, - outerPaddingPx, - outerPaddingPx); - - int mediumAvatarSize = getSizeInDp(R.dimen.avatar_size_for_medium); + RemoteViews views = new RemoteViews(mContext.getPackageName(), getViewForDndRemoteViews()); + + int mediumAvatarSize = getSizeInDp(R.dimen.avatar_size_for_medium_empty); int maxAvatarSize = getSizeInDp(R.dimen.max_people_avatar_size); String text = mContext.getString(R.string.paused_by_dnd); @@ -565,11 +588,15 @@ public class PeopleTileViewHelper { int lineHeight = getLineHeightFromResource(textSizeResId); int avatarSize; - if (isHorizontal) { - int maxTextHeight = mHeight - outerPadding; + if (mLayoutSize == LAYOUT_MEDIUM) { + int maxTextHeight = mHeight - 16; views.setInt(R.id.text_content, "setMaxLines", maxTextHeight / lineHeight); avatarSize = mediumAvatarSize; } else { + int outerPadding = 16; + int outerPaddingTop = outerPadding - 2; + int outerPaddingPx = dpToPx(outerPadding); + int outerPaddingTopPx = dpToPx(outerPaddingTop); int iconSize = getSizeInDp( mLayoutSize == LAYOUT_SMALL @@ -583,38 +610,47 @@ public class PeopleTileViewHelper { int availableAvatarHeight; int textHeight = estimateTextHeight(text, textSizeResId, maxTextWidth); - if (textHeight <= maxTextHeight) { + if (textHeight <= maxTextHeight && mLayoutSize == LAYOUT_LARGE) { // If the text will fit, then display it and deduct its height from the space we // have for the avatar. availableAvatarHeight = heightWithoutIcon - textHeight - paddingBetweenElements * 2; views.setViewVisibility(R.id.text_content, View.VISIBLE); views.setInt(R.id.text_content, "setMaxLines", maxTextHeight / lineHeight); views.setContentDescription(R.id.predefined_icon, null); + int availableAvatarWidth = mWidth - outerPadding * 2; + avatarSize = + MathUtils.clamp( + /* value= */ Math.min(availableAvatarWidth, availableAvatarHeight), + /* min= */ dpToPx(10), + /* max= */ maxAvatarSize); + views.setViewPadding( + android.R.id.background, + outerPaddingPx, + outerPaddingTopPx, + outerPaddingPx, + outerPaddingPx); + views.setViewLayoutWidth(R.id.predefined_icon, iconSize, COMPLEX_UNIT_DIP); + views.setViewLayoutHeight(R.id.predefined_icon, iconSize, COMPLEX_UNIT_DIP); } else { - // If the height doesn't fit, then hide it. The dnd icon will still show. - availableAvatarHeight = heightWithoutIcon - paddingBetweenElements; - views.setViewVisibility(R.id.text_content, View.GONE); + // If expected to use LAYOUT_LARGE, but we found we do not have space for the + // text as calculated above, re-assign the view to the small layout. + if (mLayoutSize != LAYOUT_SMALL) { + views = new RemoteViews(mContext.getPackageName(), R.layout.people_tile_small); + } + avatarSize = getMaxAvatarSize(views); + views.setViewVisibility(R.id.messages_count, View.GONE); + views.setViewVisibility(R.id.name, View.GONE); // If we don't show the dnd text, set it as the content description on the icon // for a11y. views.setContentDescription(R.id.predefined_icon, text); } - - int availableAvatarWidth = mWidth - outerPadding * 2; - avatarSize = - MathUtils.clamp( - /* value= */ Math.min(availableAvatarWidth, availableAvatarHeight), - /* min= */ dpToPx(10), - /* max= */ maxAvatarSize); - - views.setViewLayoutWidth(R.id.predefined_icon, iconSize, COMPLEX_UNIT_DIP); - views.setViewLayoutHeight(R.id.predefined_icon, iconSize, COMPLEX_UNIT_DIP); + views.setViewVisibility(R.id.predefined_icon, View.VISIBLE); views.setImageViewResource(R.id.predefined_icon, R.drawable.ic_qs_dnd_on); } return new RemoteViewsAndSizes(views, avatarSize); } - private RemoteViews createMissedCallRemoteViews() { RemoteViews views = setViewForContentLayout(new RemoteViews(mContext.getPackageName(), getLayoutForContent())); @@ -622,7 +658,9 @@ public class PeopleTileViewHelper { views.setViewVisibility(R.id.text_content, View.VISIBLE); views.setViewVisibility(R.id.messages_count, View.GONE); setMaxLines(views, false); - views.setTextViewText(R.id.text_content, mTile.getNotificationContent()); + CharSequence content = mTile.getNotificationContent(); + views.setTextViewText(R.id.text_content, content); + setContentDescriptionForNotificationTextContent(views, content, mTile.getUserName()); views.setColorAttr(R.id.text_content, "setTextColor", android.R.attr.colorError); views.setColorAttr(R.id.predefined_icon, "setColorFilter", android.R.attr.colorError); views.setImageViewResource(R.id.predefined_icon, R.drawable.ic_phone_missed); @@ -643,12 +681,16 @@ public class PeopleTileViewHelper { if (image != null) { // TODO: Use NotificationInlineImageCache views.setImageViewUri(R.id.image, image); + String newImageDescription = mContext.getString( + R.string.new_notification_image_content_description, mTile.getUserName()); + views.setContentDescription(R.id.image, newImageDescription); views.setViewVisibility(R.id.image, View.VISIBLE); views.setViewVisibility(R.id.text_content, View.GONE); - views.setImageViewResource(R.id.predefined_icon, R.drawable.ic_photo_camera); } else { setMaxLines(views, !TextUtils.isEmpty(sender)); CharSequence content = mTile.getNotificationContent(); + setContentDescriptionForNotificationTextContent(views, content, + sender != null ? sender : mTile.getUserName()); views = decorateBackground(views, content); views.setColorAttr(R.id.text_content, "setTextColor", android.R.attr.textColorPrimary); views.setTextViewText(R.id.text_content, mTile.getNotificationContent()); @@ -678,6 +720,16 @@ public class PeopleTileViewHelper { return views; } + private void setContentDescriptionForNotificationTextContent(RemoteViews views, + CharSequence content, CharSequence sender) { + String newTextDescriptionWithNotificationContent = mContext.getString( + R.string.new_notification_text_content_description, sender, content); + int idForContentDescription = + mLayoutSize == LAYOUT_SMALL ? R.id.predefined_icon : R.id.text_content; + views.setContentDescription(idForContentDescription, + newTextDescriptionWithNotificationContent); + } + // Some messaging apps only include up to 6 messages in their notifications. private String getMessagesCountText(int count) { if (count >= MESSAGES_COUNT_OVERFLOW) { @@ -706,7 +758,8 @@ public class PeopleTileViewHelper { views.setViewVisibility(R.id.predefined_icon, View.VISIBLE); views.setTextViewText(R.id.text_content, statusText); - if (status.getActivity() == ACTIVITY_BIRTHDAY) { + if (status.getActivity() == ACTIVITY_BIRTHDAY + || status.getActivity() == ACTIVITY_UPCOMING_BIRTHDAY) { setEmojiBackground(views, EMOJI_CAKE); } @@ -734,9 +787,56 @@ public class PeopleTileViewHelper { } setAvailabilityDotPadding(views, R.dimen.availability_dot_status_padding); views.setImageViewResource(R.id.predefined_icon, getDrawableForStatus(status)); + CharSequence descriptionForStatus = + getContentDescriptionForStatus(status); + CharSequence customContentDescriptionForStatus = mContext.getString( + R.string.new_status_content_description, mTile.getUserName(), descriptionForStatus); + switch (mLayoutSize) { + case LAYOUT_LARGE: + views.setContentDescription(R.id.text_content, + customContentDescriptionForStatus); + break; + case LAYOUT_MEDIUM: + views.setContentDescription(statusIcon == null ? R.id.text_content : R.id.name, + customContentDescriptionForStatus); + break; + case LAYOUT_SMALL: + views.setContentDescription(R.id.predefined_icon, + customContentDescriptionForStatus); + break; + } return views; } + private CharSequence getContentDescriptionForStatus(ConversationStatus status) { + CharSequence name = mTile.getUserName(); + if (!TextUtils.isEmpty(status.getDescription())) { + return status.getDescription(); + } + switch (status.getActivity()) { + case ACTIVITY_NEW_STORY: + return mContext.getString(R.string.new_story_status_content_description, + name); + case ACTIVITY_ANNIVERSARY: + return mContext.getString(R.string.anniversary_status_content_description, name); + case ACTIVITY_UPCOMING_BIRTHDAY: + return mContext.getString(R.string.upcoming_birthday_status_content_description, + name); + case ACTIVITY_BIRTHDAY: + return mContext.getString(R.string.birthday_status_content_description, name); + case ACTIVITY_LOCATION: + return mContext.getString(R.string.location_status_content_description, name); + case ACTIVITY_GAME: + return mContext.getString(R.string.game_status); + case ACTIVITY_VIDEO: + return mContext.getString(R.string.video_status); + case ACTIVITY_AUDIO: + return mContext.getString(R.string.audio_status); + default: + return EMPTY_STRING; + } + } + private int getDrawableForStatus(ConversationStatus status) { switch (status.getActivity()) { case ACTIVITY_NEW_STORY: @@ -944,6 +1044,11 @@ public class PeopleTileViewHelper { private RemoteViews setViewForContentLayout(RemoteViews views) { views = decorateBackground(views, ""); + views.setContentDescription(R.id.predefined_icon, null); + views.setContentDescription(R.id.text_content, null); + views.setContentDescription(R.id.name, null); + views.setContentDescription(R.id.image, null); + views.setAccessibilityTraversalAfter(R.id.text_content, R.id.name); if (mLayoutSize == LAYOUT_SMALL) { views.setViewVisibility(R.id.predefined_icon, View.VISIBLE); views.setViewVisibility(R.id.name, View.GONE); @@ -1030,7 +1135,7 @@ public class PeopleTileViewHelper { return R.layout.people_tile_large_empty; case LAYOUT_SMALL: default: - return R.layout.people_tile_small; + return getLayoutSmallByHeight(); } } @@ -1042,7 +1147,7 @@ public class PeopleTileViewHelper { return R.layout.people_tile_large_with_notification_content; case LAYOUT_SMALL: default: - return R.layout.people_tile_small; + return getLayoutSmallByHeight(); } } @@ -1054,20 +1159,43 @@ public class PeopleTileViewHelper { return R.layout.people_tile_large_with_status_content; case LAYOUT_SMALL: default: - return R.layout.people_tile_small; + return getLayoutSmallByHeight(); } } + private int getViewForDndRemoteViews() { + switch (mLayoutSize) { + case LAYOUT_MEDIUM: + return R.layout.people_tile_with_suppression_detail_content_horizontal; + case LAYOUT_LARGE: + return R.layout.people_tile_with_suppression_detail_content_vertical; + case LAYOUT_SMALL: + default: + return getLayoutSmallByHeight(); + } + } + + private int getLayoutSmallByHeight() { + if (mHeight >= getSizeInDp(R.dimen.required_height_for_medium)) { + return R.layout.people_tile_small; + } + return R.layout.people_tile_small_horizontal; + } + /** Returns a bitmap with the user icon and package icon. */ - public static Bitmap getPersonIconBitmap( - Context context, PeopleSpaceTile tile, int maxAvatarSize) { - boolean hasNewStory = - tile.getStatuses() != null && tile.getStatuses().stream().anyMatch( - c -> c.getActivity() == ACTIVITY_NEW_STORY); + public static Bitmap getPersonIconBitmap(Context context, PeopleSpaceTile tile, + int maxAvatarSize) { + boolean hasNewStory = getHasNewStory(tile); + return getPersonIconBitmap(context, tile, maxAvatarSize, hasNewStory); + } + /** Returns a bitmap with the user icon and package icon. */ + private static Bitmap getPersonIconBitmap( + Context context, PeopleSpaceTile tile, int maxAvatarSize, boolean hasNewStory) { Icon icon = tile.getUserIcon(); if (icon == null) { - return null; + Drawable placeholder = context.getDrawable(R.drawable.ic_avatar_with_badge); + return convertDrawableToDisabledBitmap(placeholder); } PeopleStoryIconFactory storyIcon = new PeopleStoryIconFactory(context, context.getPackageManager(), @@ -1179,4 +1307,11 @@ public class PeopleTileViewHelper { mAvatarSize = avatarSize; } } + + private static Bitmap convertDrawableToDisabledBitmap(Drawable icon) { + Bitmap appIconAsBitmap = convertDrawableToBitmap(icon); + FastBitmapDrawable drawable = new FastBitmapDrawable(appIconAsBitmap); + drawable.setIsDisabled(true); + return convertDrawableToBitmap(drawable); + } } diff --git a/packages/SystemUI/src/com/android/systemui/people/SharedPreferencesHelper.java b/packages/SystemUI/src/com/android/systemui/people/SharedPreferencesHelper.java new file mode 100644 index 000000000000..aef08fb421d8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/people/SharedPreferencesHelper.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people; + +import static com.android.systemui.people.PeopleSpaceUtils.INVALID_USER_ID; +import static com.android.systemui.people.PeopleSpaceUtils.PACKAGE_NAME; +import static com.android.systemui.people.PeopleSpaceUtils.SHORTCUT_ID; +import static com.android.systemui.people.PeopleSpaceUtils.USER_ID; + +import android.content.SharedPreferences; + +import com.android.systemui.people.widget.PeopleTileKey; + +/** Helper class for Conversations widgets SharedPreferences storage. */ +public class SharedPreferencesHelper { + /** Clears all storage from {@code sp}. */ + public static void clear(SharedPreferences sp) { + SharedPreferences.Editor editor = sp.edit(); + editor.clear(); + editor.apply(); + } + + /** Sets {@code sp}'s storage to identify a {@link PeopleTileKey}. */ + public static void setPeopleTileKey(SharedPreferences sp, PeopleTileKey key) { + setPeopleTileKey(sp, key.getShortcutId(), key.getUserId(), key.getPackageName()); + } + + /** Sets {@code sp}'s storage to identify a {@link PeopleTileKey}. */ + public static void setPeopleTileKey(SharedPreferences sp, String shortcutId, int userId, + String packageName) { + SharedPreferences.Editor editor = sp.edit(); + editor.putString(SHORTCUT_ID, shortcutId); + editor.putInt(USER_ID, userId); + editor.putString(PACKAGE_NAME, packageName); + editor.apply(); + } + + /** Returns a {@link PeopleTileKey} based on storage from {@code sp}. */ + public static PeopleTileKey getPeopleTileKey(SharedPreferences sp) { + String shortcutId = sp.getString(SHORTCUT_ID, null); + String packageName = sp.getString(PACKAGE_NAME, null); + int userId = sp.getInt(USER_ID, INVALID_USER_ID); + return new PeopleTileKey(shortcutId, userId, packageName); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/LaunchConversationActivity.java b/packages/SystemUI/src/com/android/systemui/people/widget/LaunchConversationActivity.java index b031637e4016..79318d69837d 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/LaunchConversationActivity.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/LaunchConversationActivity.java @@ -152,7 +152,7 @@ public class LaunchConversationActivity extends Activity { launcherApps.startShortcut( packageName, tileId, null, null, userHandle); } catch (Exception e) { - Log.e(TAG, "Exception:" + e); + Log.e(TAG, "Exception launching shortcut:" + e); } } else { if (DEBUG) Log.d(TAG, "Trying to launch conversation with null shortcutInfo."); diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleBackupHelper.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleBackupHelper.java new file mode 100644 index 000000000000..d8c96dd182b4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleBackupHelper.java @@ -0,0 +1,508 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people.widget; + +import static com.android.systemui.people.PeopleBackupFollowUpJob.SHARED_FOLLOW_UP; +import static com.android.systemui.people.PeopleSpaceUtils.DEBUG; +import static com.android.systemui.people.PeopleSpaceUtils.INVALID_USER_ID; +import static com.android.systemui.people.PeopleSpaceUtils.USER_ID; + +import android.app.backup.BackupDataInputStream; +import android.app.backup.BackupDataOutput; +import android.app.backup.SharedPreferencesBackupHelper; +import android.app.people.IPeopleManager; +import android.appwidget.AppWidgetManager; +import android.content.ComponentName; +import android.content.ContentProvider; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.ParcelFileDescriptor; +import android.os.ServiceManager; +import android.os.UserHandle; +import android.preference.PreferenceManager; +import android.text.TextUtils; +import android.util.Log; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.people.PeopleBackupFollowUpJob; +import com.android.systemui.people.SharedPreferencesHelper; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Helper class to backup and restore Conversations widgets storage. + * It is used by SystemUI's BackupHelper agent. + * TODO(b/192334798): Lock access to storage using PeopleSpaceWidgetManager's lock. + */ +public class PeopleBackupHelper extends SharedPreferencesBackupHelper { + private static final String TAG = "PeopleBackupHelper"; + + public static final String ADD_USER_ID_TO_URI = "add_user_id_to_uri_"; + public static final String SHARED_BACKUP = "shared_backup"; + + private final Context mContext; + private final UserHandle mUserHandle; + private final PackageManager mPackageManager; + private final IPeopleManager mIPeopleManager; + private final AppWidgetManager mAppWidgetManager; + + /** + * Types of entries stored in the default SharedPreferences file for Conversation widgets. + * Widget ID corresponds to a pair [widgetId, contactURI]. + * PeopleTileKey corresponds to a pair [PeopleTileKey, {widgetIds}]. + * Contact URI corresponds to a pair [Contact URI, {widgetIds}]. + */ + enum SharedFileEntryType { + UNKNOWN, + WIDGET_ID, + PEOPLE_TILE_KEY, + CONTACT_URI + } + + /** + * Returns the file names that should be backed up and restored by SharedPreferencesBackupHelper + * infrastructure. + */ + public static List<String> getFilesToBackup() { + return Collections.singletonList(SHARED_BACKUP); + } + + public PeopleBackupHelper(Context context, UserHandle userHandle, + String[] sharedPreferencesKey) { + super(context, sharedPreferencesKey); + mContext = context; + mUserHandle = userHandle; + mPackageManager = context.getPackageManager(); + mIPeopleManager = IPeopleManager.Stub.asInterface( + ServiceManager.getService(Context.PEOPLE_SERVICE)); + mAppWidgetManager = AppWidgetManager.getInstance(context); + } + + @VisibleForTesting + public PeopleBackupHelper(Context context, UserHandle userHandle, + String[] sharedPreferencesKey, PackageManager packageManager, + IPeopleManager peopleManager) { + super(context, sharedPreferencesKey); + mContext = context; + mUserHandle = userHandle; + mPackageManager = packageManager; + mIPeopleManager = peopleManager; + mAppWidgetManager = AppWidgetManager.getInstance(context); + } + + /** + * Reads values from default storage, backs them up appropriately to a specified backup file, + * and calls super's performBackup, which backs up the values of the backup file. + */ + @Override + public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data, + ParcelFileDescriptor newState) { + if (DEBUG) Log.d(TAG, "Backing up conversation widgets, writing to: " + SHARED_BACKUP); + // Open default value for readings values. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext); + if (sp.getAll().isEmpty()) { + if (DEBUG) Log.d(TAG, "No information to be backed up, finishing."); + return; + } + + // Open backup file for writing. + SharedPreferences backupSp = mContext.getSharedPreferences( + SHARED_BACKUP, Context.MODE_PRIVATE); + SharedPreferences.Editor backupEditor = backupSp.edit(); + backupEditor.clear(); + + // Fetch Conversations widgets corresponding to this user. + List<String> existingWidgets = getExistingWidgetsForUser(mUserHandle.getIdentifier()); + if (existingWidgets.isEmpty()) { + if (DEBUG) Log.d(TAG, "No existing Conversations widgets, returning."); + return; + } + + // Writes each entry to backup file. + sp.getAll().entrySet().forEach(entry -> backupKey(entry, backupEditor, existingWidgets)); + backupEditor.apply(); + + super.performBackup(oldState, data, newState); + } + + /** + * Restores backed up values to backup file via super's restoreEntity, then transfers them + * back to regular storage. Restore operations for each users are done in sequence, so we can + * safely use the same backup file names. + */ + @Override + public void restoreEntity(BackupDataInputStream data) { + if (DEBUG) Log.d(TAG, "Restoring Conversation widgets."); + super.restoreEntity(data); + + // Open backup file for reading values. + SharedPreferences backupSp = mContext.getSharedPreferences( + SHARED_BACKUP, Context.MODE_PRIVATE); + + // Open default file and follow-up file for writing. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext); + SharedPreferences.Editor editor = sp.edit(); + SharedPreferences followUp = mContext.getSharedPreferences( + SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + SharedPreferences.Editor followUpEditor = followUp.edit(); + + // Writes each entry back to default value. + boolean shouldScheduleJob = false; + for (Map.Entry<String, ?> entry : backupSp.getAll().entrySet()) { + boolean restored = restoreKey(entry, editor, followUpEditor, backupSp); + if (!restored) { + shouldScheduleJob = true; + } + } + + editor.apply(); + followUpEditor.apply(); + SharedPreferencesHelper.clear(backupSp); + + // If any of the widgets is not yet available, schedule a follow-up job to check later. + if (shouldScheduleJob) { + if (DEBUG) Log.d(TAG, "At least one shortcut is not available, scheduling follow-up."); + PeopleBackupFollowUpJob.scheduleJob(mContext); + } + + updateWidgets(mContext); + } + + /** Backs up an entry from default file to backup file. */ + public void backupKey(Map.Entry<String, ?> entry, SharedPreferences.Editor backupEditor, + List<String> existingWidgets) { + String key = entry.getKey(); + if (TextUtils.isEmpty(key)) { + return; + } + + SharedFileEntryType entryType = getEntryType(entry); + switch(entryType) { + case WIDGET_ID: + backupWidgetIdKey(key, String.valueOf(entry.getValue()), backupEditor, + existingWidgets); + break; + case PEOPLE_TILE_KEY: + backupPeopleTileKey(key, (Set<String>) entry.getValue(), backupEditor, + existingWidgets); + break; + case CONTACT_URI: + backupContactUriKey(key, (Set<String>) entry.getValue(), backupEditor); + break; + case UNKNOWN: + default: + Log.w(TAG, "Key not identified, skipping: " + key); + } + } + + /** + * Tries to restore an entry from backup file to default file. + * Returns true if restore is finished, false if it needs to be checked later. + */ + boolean restoreKey(Map.Entry<String, ?> entry, SharedPreferences.Editor editor, + SharedPreferences.Editor followUpEditor, SharedPreferences backupSp) { + String key = entry.getKey(); + SharedFileEntryType keyType = getEntryType(entry); + int storedUserId = backupSp.getInt(ADD_USER_ID_TO_URI + key, INVALID_USER_ID); + switch (keyType) { + case WIDGET_ID: + restoreWidgetIdKey(key, String.valueOf(entry.getValue()), editor, storedUserId); + return true; + case PEOPLE_TILE_KEY: + return restorePeopleTileKeyAndCorrespondingWidgetFile( + key, (Set<String>) entry.getValue(), editor, followUpEditor); + case CONTACT_URI: + restoreContactUriKey(key, (Set<String>) entry.getValue(), editor, storedUserId); + return true; + case UNKNOWN: + default: + Log.e(TAG, "Key not identified, skipping:" + key); + return true; + } + } + + /** + * Backs up a [widgetId, contactURI] pair, if widget id corresponds to current user. + * If contact URI has a user id, stores it so it can be re-added on restore. + */ + private void backupWidgetIdKey(String key, String uriString, SharedPreferences.Editor editor, + List<String> existingWidgets) { + if (!existingWidgets.contains(key)) { + if (DEBUG) Log.d(TAG, "Widget: " + key + " does't correspond to this user, skipping."); + return; + } + Uri uri = Uri.parse(uriString); + if (ContentProvider.uriHasUserId(uri)) { + if (DEBUG) Log.d(TAG, "Contact URI value has user ID, removing from: " + uri); + int userId = ContentProvider.getUserIdFromUri(uri); + editor.putInt(ADD_USER_ID_TO_URI + key, userId); + uri = ContentProvider.getUriWithoutUserId(uri); + } + if (DEBUG) Log.d(TAG, "Backing up widgetId key: " + key + " . Value: " + uri.toString()); + editor.putString(key, uri.toString()); + } + + /** Restores a [widgetId, contactURI] pair, and a potential {@code storedUserId}. */ + private void restoreWidgetIdKey(String key, String uriString, SharedPreferences.Editor editor, + int storedUserId) { + Uri uri = Uri.parse(uriString); + if (storedUserId != INVALID_USER_ID) { + uri = ContentProvider.createContentUriForUser(uri, UserHandle.of(storedUserId)); + if (DEBUG) Log.d(TAG, "UserId was removed from URI on back up, re-adding as:" + uri); + + } + if (DEBUG) Log.d(TAG, "Restoring widgetId key: " + key + " . Value: " + uri.toString()); + editor.putString(key, uri.toString()); + } + + /** + * Backs up a [PeopleTileKey, {widgetIds}] pair, if PeopleTileKey's user is the same as current + * user, stripping out the user id. + */ + private void backupPeopleTileKey(String key, Set<String> widgetIds, + SharedPreferences.Editor editor, List<String> existingWidgets) { + PeopleTileKey peopleTileKey = PeopleTileKey.fromString(key); + if (peopleTileKey.getUserId() != mUserHandle.getIdentifier()) { + if (DEBUG) Log.d(TAG, "PeopleTileKey corresponds to different user, skipping backup."); + return; + } + + Set<String> filteredWidgets = widgetIds.stream() + .filter(id -> existingWidgets.contains(id)) + .collect(Collectors.toSet()); + if (filteredWidgets.isEmpty()) { + return; + } + + peopleTileKey.setUserId(INVALID_USER_ID); + if (DEBUG) { + Log.d(TAG, "Backing up PeopleTileKey key: " + peopleTileKey.toString() + ". Value: " + + filteredWidgets); + } + editor.putStringSet(peopleTileKey.toString(), filteredWidgets); + } + + /** + * Restores a [PeopleTileKey, {widgetIds}] pair, restoring the user id. Checks if the + * corresponding shortcut exists, and if not, we should schedule a follow up to check later. + * Also restores corresponding [widgetId, PeopleTileKey], which is not backed up since the + * information can be inferred from this. + * Returns true if restore is finished, false if we should check if shortcut is available later. + */ + private boolean restorePeopleTileKeyAndCorrespondingWidgetFile(String key, + Set<String> widgetIds, SharedPreferences.Editor editor, + SharedPreferences.Editor followUpEditor) { + PeopleTileKey peopleTileKey = PeopleTileKey.fromString(key); + // Should never happen, as type of key has been checked. + if (peopleTileKey == null) { + if (DEBUG) Log.d(TAG, "PeopleTileKey key to be restored is null, skipping."); + return true; + } + + peopleTileKey.setUserId(mUserHandle.getIdentifier()); + if (!PeopleTileKey.isValid(peopleTileKey)) { + if (DEBUG) Log.d(TAG, "PeopleTileKey key to be restored is not valid, skipping."); + return true; + } + + boolean restored = isReadyForRestore( + mIPeopleManager, mPackageManager, peopleTileKey); + if (!restored) { + if (DEBUG) Log.d(TAG, "Adding key to follow-up storage: " + peopleTileKey.toString()); + // Follow-up file stores shortcuts that need to be checked later, and possibly wiped + // from our storage. + followUpEditor.putStringSet(peopleTileKey.toString(), widgetIds); + } + + if (DEBUG) { + Log.d(TAG, "Restoring PeopleTileKey key: " + peopleTileKey.toString() + " . Value: " + + widgetIds); + } + editor.putStringSet(peopleTileKey.toString(), widgetIds); + restoreWidgetIdFiles(mContext, widgetIds, peopleTileKey); + return restored; + } + + /** + * Backs up a [contactURI, {widgetIds}] pair. If contactURI contains a userId, we back up + * this entry in the corresponding user. If it doesn't, we back it up as user 0. + * If contact URI has a user id, stores it so it can be re-added on restore. + * We do not take existing widgets for this user into consideration. + */ + private void backupContactUriKey(String key, Set<String> widgetIds, + SharedPreferences.Editor editor) { + Uri uri = Uri.parse(String.valueOf(key)); + if (ContentProvider.uriHasUserId(uri)) { + int userId = ContentProvider.getUserIdFromUri(uri); + if (DEBUG) Log.d(TAG, "Contact URI has user Id: " + userId); + if (userId == mUserHandle.getIdentifier()) { + uri = ContentProvider.getUriWithoutUserId(uri); + if (DEBUG) { + Log.d(TAG, "Backing up contactURI key: " + uri.toString() + " . Value: " + + widgetIds); + } + editor.putInt(ADD_USER_ID_TO_URI + uri.toString(), userId); + editor.putStringSet(uri.toString(), widgetIds); + } else { + if (DEBUG) Log.d(TAG, "ContactURI corresponds to different user, skipping."); + } + } else if (mUserHandle.isSystem()) { + if (DEBUG) { + Log.d(TAG, "Backing up contactURI key: " + uri.toString() + " . Value: " + + widgetIds); + } + editor.putStringSet(uri.toString(), widgetIds); + } + } + + /** Restores a [contactURI, {widgetIds}] pair, and a potential {@code storedUserId}. */ + private void restoreContactUriKey(String key, Set<String> widgetIds, + SharedPreferences.Editor editor, int storedUserId) { + Uri uri = Uri.parse(key); + if (storedUserId != INVALID_USER_ID) { + uri = ContentProvider.createContentUriForUser(uri, UserHandle.of(storedUserId)); + if (DEBUG) Log.d(TAG, "UserId was removed from URI on back up, re-adding as:" + uri); + } + if (DEBUG) { + Log.d(TAG, "Restoring contactURI key: " + uri.toString() + " . Value: " + widgetIds); + } + editor.putStringSet(uri.toString(), widgetIds); + } + + /** Restores the widget-specific files that contain PeopleTileKey information. */ + public static void restoreWidgetIdFiles(Context context, Set<String> widgetIds, + PeopleTileKey key) { + for (String id : widgetIds) { + if (DEBUG) Log.d(TAG, "Restoring widget Id file: " + id + " . Value: " + key); + SharedPreferences dest = context.getSharedPreferences(id, Context.MODE_PRIVATE); + SharedPreferencesHelper.setPeopleTileKey(dest, key); + } + } + + private List<String> getExistingWidgetsForUser(int userId) { + List<String> existingWidgets = new ArrayList<>(); + int[] ids = mAppWidgetManager.getAppWidgetIds( + new ComponentName(mContext, PeopleSpaceWidgetProvider.class)); + for (int id : ids) { + String idString = String.valueOf(id); + SharedPreferences sp = mContext.getSharedPreferences(idString, Context.MODE_PRIVATE); + if (sp.getInt(USER_ID, INVALID_USER_ID) == userId) { + existingWidgets.add(idString); + } + } + if (DEBUG) Log.d(TAG, "Existing widgets: " + existingWidgets); + return existingWidgets; + } + + /** + * Returns whether {@code key} corresponds to a shortcut that is ready for restore, either + * because it is available or because it never will be. If not ready, we schedule a job to check + * again later. + */ + public static boolean isReadyForRestore(IPeopleManager peopleManager, + PackageManager packageManager, PeopleTileKey key) { + if (DEBUG) Log.d(TAG, "Checking if we should schedule a follow up job : " + key); + if (!PeopleTileKey.isValid(key)) { + if (DEBUG) Log.d(TAG, "Key is invalid, should not follow up."); + return true; + } + + try { + PackageInfo info = packageManager.getPackageInfoAsUser( + key.getPackageName(), 0, key.getUserId()); + } catch (PackageManager.NameNotFoundException e) { + if (DEBUG) Log.d(TAG, "Package is not installed, should follow up."); + return false; + } + + try { + boolean isConversation = peopleManager.isConversation( + key.getPackageName(), key.getUserId(), key.getShortcutId()); + if (DEBUG) { + Log.d(TAG, "Checked if shortcut exists, should follow up: " + !isConversation); + } + return isConversation; + } catch (Exception e) { + if (DEBUG) Log.d(TAG, "Error checking if backed up info is a shortcut."); + return false; + } + } + + /** Parses default file {@code entry} to determine the entry's type.*/ + public static SharedFileEntryType getEntryType(Map.Entry<String, ?> entry) { + String key = entry.getKey(); + if (key == null) { + return SharedFileEntryType.UNKNOWN; + } + + try { + int id = Integer.parseInt(key); + try { + String contactUri = (String) entry.getValue(); + } catch (Exception e) { + Log.w(TAG, "Malformed value, skipping:" + entry.getValue()); + return SharedFileEntryType.UNKNOWN; + } + return SharedFileEntryType.WIDGET_ID; + } catch (NumberFormatException ignored) { } + + try { + Set<String> widgetIds = (Set<String>) entry.getValue(); + } catch (Exception e) { + Log.w(TAG, "Malformed value, skipping:" + entry.getValue()); + return SharedFileEntryType.UNKNOWN; + } + + PeopleTileKey peopleTileKey = PeopleTileKey.fromString(key); + if (peopleTileKey != null) { + return SharedFileEntryType.PEOPLE_TILE_KEY; + } + + try { + Uri uri = Uri.parse(key); + return SharedFileEntryType.CONTACT_URI; + } catch (Exception e) { + return SharedFileEntryType.UNKNOWN; + } + } + + /** Sends a broadcast to update the existing Conversation widgets. */ + public static void updateWidgets(Context context) { + int[] widgetIds = AppWidgetManager.getInstance(context) + .getAppWidgetIds(new ComponentName(context, PeopleSpaceWidgetProvider.class)); + if (DEBUG) { + for (int id : widgetIds) { + Log.d(TAG, "Calling update to widget: " + id); + } + } + if (widgetIds != null && widgetIds.length != 0) { + Intent intent = new Intent(context, PeopleSpaceWidgetProvider.class); + intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds); + context.sendBroadcast(intent); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java index 62a0df270698..3320fbda6fe5 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java @@ -22,6 +22,7 @@ import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL; import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE; import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY; import static android.content.Intent.ACTION_BOOT_COMPLETED; +import static android.content.Intent.ACTION_PACKAGE_ADDED; import static android.content.Intent.ACTION_PACKAGE_REMOVED; import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE; @@ -29,6 +30,7 @@ import static com.android.systemui.people.NotificationHelper.getContactUri; import static com.android.systemui.people.NotificationHelper.getHighestPriorityNotification; import static com.android.systemui.people.NotificationHelper.shouldFilterOut; import static com.android.systemui.people.NotificationHelper.shouldMatchNotificationByUri; +import static com.android.systemui.people.PeopleBackupFollowUpJob.SHARED_FOLLOW_UP; import static com.android.systemui.people.PeopleSpaceUtils.EMPTY_STRING; import static com.android.systemui.people.PeopleSpaceUtils.INVALID_USER_ID; import static com.android.systemui.people.PeopleSpaceUtils.PACKAGE_NAME; @@ -38,6 +40,7 @@ import static com.android.systemui.people.PeopleSpaceUtils.augmentTileFromNotifi import static com.android.systemui.people.PeopleSpaceUtils.getMessagesCount; import static com.android.systemui.people.PeopleSpaceUtils.getNotificationsByUri; import static com.android.systemui.people.PeopleSpaceUtils.removeNotificationFields; +import static com.android.systemui.people.widget.PeopleBackupHelper.getEntryType; import android.annotation.NonNull; import android.annotation.Nullable; @@ -46,6 +49,8 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Person; +import android.app.backup.BackupManager; +import android.app.job.JobScheduler; import android.app.people.ConversationChannel; import android.app.people.IPeopleManager; import android.app.people.PeopleManager; @@ -84,8 +89,10 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.people.NotificationHelper; +import com.android.systemui.people.PeopleBackupFollowUpJob; import com.android.systemui.people.PeopleSpaceUtils; import com.android.systemui.people.PeopleTileViewHelper; +import com.android.systemui.people.SharedPreferencesHelper; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; import com.android.systemui.statusbar.notification.NotificationEntryManager; @@ -93,11 +100,13 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.wm.shell.bubbles.Bubbles; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.Executor; @@ -126,6 +135,7 @@ public class PeopleSpaceWidgetManager { private Optional<Bubbles> mBubblesOptional; private UserManager mUserManager; private PeopleSpaceWidgetManager mManager; + private BackupManager mBackupManager; public UiEventLogger mUiEventLogger = new UiEventLoggerImpl(); private NotificationManager mNotificationManager; private BroadcastDispatcher mBroadcastDispatcher; @@ -164,6 +174,7 @@ public class PeopleSpaceWidgetManager { ServiceManager.getService(Context.NOTIFICATION_SERVICE)); mBubblesOptional = bubblesOptional; mUserManager = userManager; + mBackupManager = new BackupManager(context); mNotificationManager = notificationManager; mManager = this; mBroadcastDispatcher = broadcastDispatcher; @@ -189,6 +200,7 @@ public class PeopleSpaceWidgetManager { null /* executor */, UserHandle.ALL); IntentFilter perAppFilter = new IntentFilter(ACTION_PACKAGE_REMOVED); + perAppFilter.addAction(ACTION_PACKAGE_ADDED); perAppFilter.addDataScheme("package"); // BroadcastDispatcher doesn't allow data schemes. mContext.registerReceiver(mBaseBroadcastReceiver, perAppFilter); @@ -224,7 +236,7 @@ public class PeopleSpaceWidgetManager { AppWidgetManager appWidgetManager, IPeopleManager iPeopleManager, PeopleManager peopleManager, LauncherApps launcherApps, NotificationEntryManager notificationEntryManager, PackageManager packageManager, - Optional<Bubbles> bubblesOptional, UserManager userManager, + Optional<Bubbles> bubblesOptional, UserManager userManager, BackupManager backupManager, INotificationManager iNotificationManager, NotificationManager notificationManager, @Background Executor executor) { mContext = context; @@ -236,6 +248,7 @@ public class PeopleSpaceWidgetManager { mPackageManager = packageManager; mBubblesOptional = bubblesOptional; mUserManager = userManager; + mBackupManager = backupManager; mINotificationManager = iNotificationManager; mNotificationManager = notificationManager; mManager = this; @@ -257,8 +270,6 @@ public class PeopleSpaceWidgetManager { if (DEBUG) Log.d(TAG, "no widgets to update"); return; } - - if (DEBUG) Log.d(TAG, "updating " + widgetIds.length + " widgets: " + widgetIds); synchronized (mLock) { updateSingleConversationWidgets(widgetIds); } @@ -274,6 +285,7 @@ public class PeopleSpaceWidgetManager { public void updateSingleConversationWidgets(int[] appWidgetIds) { Map<Integer, PeopleSpaceTile> widgetIdToTile = new HashMap<>(); for (int appWidgetId : appWidgetIds) { + if (DEBUG) Log.d(TAG, "Updating widget: " + appWidgetId); PeopleSpaceTile tile = getTileForExistingWidget(appWidgetId); if (tile == null) { Log.e(TAG, "Matching conversation not found for shortcut ID"); @@ -293,7 +305,8 @@ public class PeopleSpaceWidgetManager { private void updateAppWidgetViews(int appWidgetId, PeopleSpaceTile tile, Bundle options) { PeopleTileKey key = getKeyFromStorageByWidgetId(appWidgetId); if (DEBUG) Log.d(TAG, "Widget: " + appWidgetId + " for: " + key.toString()); - if (!key.isValid()) { + + if (!PeopleTileKey.isValid(key)) { Log.e(TAG, "Cannot update invalid widget"); return; } @@ -301,6 +314,7 @@ public class PeopleSpaceWidgetManager { options, key); // Tell the AppWidgetManager to perform an update on the current app widget. + if (DEBUG) Log.d(TAG, "Calling update widget for widgetId: " + appWidgetId); mAppWidgetManager.updateAppWidget(appWidgetId, views); } @@ -314,6 +328,9 @@ public class PeopleSpaceWidgetManager { /** Updates tile in app widget options and the current view. */ public void updateAppWidgetOptionsAndView(int appWidgetId, PeopleSpaceTile tile) { + if (tile == null) { + if (DEBUG) Log.w(TAG, "Storing null tile"); + } synchronized (mTiles) { mTiles.put(appWidgetId, tile); } @@ -368,7 +385,7 @@ public class PeopleSpaceWidgetManager { @Nullable public PeopleSpaceTile getTileFromPersistentStorage(PeopleTileKey key, int appWidgetId) throws PackageManager.NameNotFoundException { - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { Log.e(TAG, "PeopleTileKey invalid: " + key.toString()); return null; } @@ -382,7 +399,7 @@ public class PeopleSpaceWidgetManager { ConversationChannel channel = mIPeopleManager.getConversation( key.getPackageName(), key.getUserId(), key.getShortcutId()); if (channel == null) { - Log.d(TAG, "Could not retrieve conversation from storage"); + if (DEBUG) Log.d(TAG, "Could not retrieve conversation from storage"); return null; } @@ -430,7 +447,8 @@ public class PeopleSpaceWidgetManager { try { PeopleTileKey key = new PeopleTileKey( sbn.getShortcutId(), sbn.getUser().getIdentifier(), sbn.getPackageName()); - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { + Log.d(TAG, "Sbn doesn't contain valid PeopleTileKey: " + key.toString()); return; } int[] widgetIds = mAppWidgetManager.getAppWidgetIds( @@ -561,14 +579,14 @@ public class PeopleSpaceWidgetManager { if (DEBUG) Log.d(TAG, "Augmenting tile from notification, key: " + key.toString()); return augmentTileFromNotification(mContext, tile, key, highestPriority, messagesCount, - appWidgetId); + appWidgetId, mBackupManager); } /** Returns an augmented tile for an existing widget. */ @Nullable public Optional<PeopleSpaceTile> getAugmentedTileForExistingWidget(int widgetId, Map<PeopleTileKey, Set<NotificationEntry>> notifications) { - Log.d(TAG, "Augmenting tile for existing widget: " + widgetId); + if (DEBUG) Log.d(TAG, "Augmenting tile for existing widget: " + widgetId); PeopleSpaceTile tile = getTileForExistingWidget(widgetId); if (tile == null) { if (DEBUG) { @@ -588,7 +606,7 @@ public class PeopleSpaceWidgetManager { /** Returns stored widgets for the conversation specified. */ public Set<String> getMatchingKeyWidgetIds(PeopleTileKey key) { - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { return new HashSet<>(); } return new HashSet<>(mSharedPrefs.getStringSet(key.toString(), new HashSet<>())); @@ -776,7 +794,7 @@ public class PeopleSpaceWidgetManager { // PeopleTileKey arguments. if (DEBUG) Log.d(TAG, "onAppWidgetOptionsChanged called for widget: " + appWidgetId); PeopleTileKey optionsKey = AppWidgetOptionsHelper.getPeopleTileKeyFromBundle(newOptions); - if (optionsKey.isValid()) { + if (PeopleTileKey.isValid(optionsKey)) { if (DEBUG) { Log.d(TAG, "PeopleTileKey was present in Options, shortcutId: " + optionsKey.getShortcutId()); @@ -808,7 +826,7 @@ public class PeopleSpaceWidgetManager { existingKeyIfStored = getKeyFromStorageByWidgetId(appWidgetId); } // Delete previous storage if the widget already existed and is just reconfigured. - if (existingKeyIfStored.isValid()) { + if (PeopleTileKey.isValid(existingKeyIfStored)) { if (DEBUG) Log.d(TAG, "Remove previous storage for widget: " + appWidgetId); deleteWidgets(new int[]{appWidgetId}); } else { @@ -820,7 +838,7 @@ public class PeopleSpaceWidgetManager { synchronized (mLock) { if (DEBUG) Log.d(TAG, "Add storage for : " + key.toString()); PeopleSpaceUtils.setSharedPreferencesStorageForTile(mContext, key, appWidgetId, - tile.getContactUri()); + tile.getContactUri(), mBackupManager); } if (DEBUG) Log.d(TAG, "Ensure listener is registered for widget: " + appWidgetId); registerConversationListenerIfNeeded(appWidgetId, key); @@ -838,7 +856,7 @@ public class PeopleSpaceWidgetManager { /** Registers a conversation listener for {@code appWidgetId} if not already registered. */ public void registerConversationListenerIfNeeded(int widgetId, PeopleTileKey key) { // Retrieve storage needed for registration. - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { if (DEBUG) Log.w(TAG, "Could not register listener for widget: " + widgetId); return; } @@ -887,7 +905,7 @@ public class PeopleSpaceWidgetManager { widgetSp.getString(SHORTCUT_ID, null), widgetSp.getInt(USER_ID, INVALID_USER_ID), widgetSp.getString(PACKAGE_NAME, null)); - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { if (DEBUG) Log.e(TAG, "Could not delete " + widgetId); return; } @@ -1053,6 +1071,7 @@ public class PeopleSpaceWidgetManager { return; } for (int appWidgetId : appWidgetIds) { + if (DEBUG) Log.d(TAG, "Updating widget from broadcast, widget id: " + appWidgetId); PeopleSpaceTile existingTile = null; PeopleSpaceTile updatedTile = null; try { @@ -1060,7 +1079,7 @@ public class PeopleSpaceWidgetManager { existingTile = getTileForExistingWidgetThrowing(appWidgetId); if (existingTile == null) { Log.e(TAG, "Matching conversation not found for shortcut ID"); - return; + continue; } updatedTile = getTileWithCurrentState(existingTile, entryPoint); updateAppWidgetOptionsAndView(appWidgetId, updatedTile); @@ -1068,6 +1087,14 @@ public class PeopleSpaceWidgetManager { } catch (PackageManager.NameNotFoundException e) { // Delete data for uninstalled widgets. Log.e(TAG, "Package no longer found for tile: " + e); + JobScheduler jobScheduler = mContext.getSystemService(JobScheduler.class); + if (jobScheduler != null + && jobScheduler.getPendingJob(PeopleBackupFollowUpJob.JOB_ID) != null) { + if (DEBUG) { + Log.d(TAG, "Device was recently restored, wait before deleting storage."); + } + continue; + } synchronized (mLock) { updateAppWidgetOptionsAndView(appWidgetId, updatedTile); } @@ -1185,4 +1212,149 @@ public class PeopleSpaceWidgetManager { return PeopleSpaceTile.BLOCK_CONVERSATIONS; } } + + /** + * Modifies widgets storage after a restore operation, since widget ids get remapped on restore. + * This is guaranteed to run after the PeopleBackupHelper restore operation. + */ + public void remapWidgets(int[] oldWidgetIds, int[] newWidgetIds) { + if (DEBUG) { + Log.d(TAG, "Remapping widgets, old: " + Arrays.toString(oldWidgetIds) + ". new: " + + Arrays.toString(newWidgetIds)); + } + + Map<String, String> widgets = new HashMap<>(); + for (int i = 0; i < oldWidgetIds.length; i++) { + widgets.put(String.valueOf(oldWidgetIds[i]), String.valueOf(newWidgetIds[i])); + } + + remapWidgetFiles(widgets); + remapSharedFile(widgets); + remapFollowupFile(widgets); + + int[] widgetIds = mAppWidgetManager.getAppWidgetIds( + new ComponentName(mContext, PeopleSpaceWidgetProvider.class)); + Bundle b = new Bundle(); + b.putBoolean(AppWidgetManager.OPTION_APPWIDGET_RESTORE_COMPLETED, true); + for (int id : widgetIds) { + if (DEBUG) Log.d(TAG, "Setting widget as restored, widget id:" + id); + mAppWidgetManager.updateAppWidgetOptions(id, b); + } + + updateWidgets(widgetIds); + } + + /** Remaps widget ids in widget specific files. */ + public void remapWidgetFiles(Map<String, String> widgets) { + if (DEBUG) Log.d(TAG, "Remapping widget files"); + Map<String, PeopleTileKey> remapped = new HashMap<>(); + for (Map.Entry<String, String> entry : widgets.entrySet()) { + String from = String.valueOf(entry.getKey()); + String to = String.valueOf(entry.getValue()); + if (Objects.equals(from, to)) { + continue; + } + + SharedPreferences src = mContext.getSharedPreferences(from, Context.MODE_PRIVATE); + PeopleTileKey key = SharedPreferencesHelper.getPeopleTileKey(src); + if (PeopleTileKey.isValid(key)) { + if (DEBUG) { + Log.d(TAG, "Moving PeopleTileKey: " + key.toString() + " from file: " + + from + ", to file: " + to); + } + remapped.put(to, key); + SharedPreferencesHelper.clear(src); + } else { + if (DEBUG) Log.d(TAG, "Widget file has invalid key: " + key); + } + } + for (Map.Entry<String, PeopleTileKey> entry : remapped.entrySet()) { + SharedPreferences dest = mContext.getSharedPreferences( + entry.getKey(), Context.MODE_PRIVATE); + SharedPreferencesHelper.setPeopleTileKey(dest, entry.getValue()); + } + } + + /** Remaps widget ids in default shared storage. */ + public void remapSharedFile(Map<String, String> widgets) { + if (DEBUG) Log.d(TAG, "Remapping shared file"); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext); + SharedPreferences.Editor editor = sp.edit(); + Map<String, ?> all = sp.getAll(); + for (Map.Entry<String, ?> entry : all.entrySet()) { + String key = entry.getKey(); + PeopleBackupHelper.SharedFileEntryType keyType = getEntryType(entry); + if (DEBUG) Log.d(TAG, "Remapping key:" + key); + switch (keyType) { + case WIDGET_ID: + String newId = widgets.get(key); + if (TextUtils.isEmpty(newId)) { + Log.w(TAG, "Key is widget id without matching new id, skipping: " + key); + break; + } + if (DEBUG) Log.d(TAG, "Key is widget id: " + key + ", replace with: " + newId); + try { + editor.putString(newId, (String) entry.getValue()); + } catch (Exception e) { + Log.e(TAG, "Malformed entry value: " + entry.getValue()); + } + editor.remove(key); + break; + case PEOPLE_TILE_KEY: + case CONTACT_URI: + Set<String> oldWidgetIds; + try { + oldWidgetIds = (Set<String>) entry.getValue(); + } catch (Exception e) { + Log.e(TAG, "Malformed entry value: " + entry.getValue()); + editor.remove(key); + break; + } + Set<String> newWidgets = getNewWidgets(oldWidgetIds, widgets); + if (DEBUG) { + Log.d(TAG, "Key is PeopleTileKey or contact URI: " + key + + ", replace values with new ids: " + newWidgets); + } + editor.putStringSet(key, newWidgets); + break; + case UNKNOWN: + Log.e(TAG, "Key not identified:" + key); + } + } + editor.apply(); + } + + /** Remaps widget ids in follow-up job file. */ + public void remapFollowupFile(Map<String, String> widgets) { + if (DEBUG) Log.d(TAG, "Remapping follow up file"); + SharedPreferences followUp = mContext.getSharedPreferences( + SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + SharedPreferences.Editor followUpEditor = followUp.edit(); + Map<String, ?> followUpAll = followUp.getAll(); + for (Map.Entry<String, ?> entry : followUpAll.entrySet()) { + String key = entry.getKey(); + Set<String> oldWidgetIds; + try { + oldWidgetIds = (Set<String>) entry.getValue(); + } catch (Exception e) { + Log.e(TAG, "Malformed entry value: " + entry.getValue()); + followUpEditor.remove(key); + continue; + } + Set<String> newWidgets = getNewWidgets(oldWidgetIds, widgets); + if (DEBUG) { + Log.d(TAG, "Follow up key: " + key + ", replace with new ids: " + newWidgets); + } + followUpEditor.putStringSet(key, newWidgets); + } + followUpEditor.apply(); + } + + private Set<String> getNewWidgets(Set<String> oldWidgets, Map<String, String> widgetsMapping) { + return oldWidgets + .stream() + .map(widgetsMapping::get) + .filter(id -> !TextUtils.isEmpty(id)) + .collect(Collectors.toSet()); + } } diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetPinnedReceiver.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetPinnedReceiver.java index a28da43a80b6..c4be197504be 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetPinnedReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetPinnedReceiver.java @@ -75,7 +75,7 @@ public class PeopleSpaceWidgetPinnedReceiver extends BroadcastReceiver { String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME); int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, INVALID_USER_ID); PeopleTileKey key = new PeopleTileKey(shortcutId, userId, packageName); - if (!key.isValid()) { + if (!PeopleTileKey.isValid(key)) { if (DEBUG) Log.w(TAG, "Skipping: key is not valid: " + key.toString()); return; } diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetProvider.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetProvider.java index 3522b76e6460..36939b735a07 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetProvider.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetProvider.java @@ -70,6 +70,13 @@ public class PeopleSpaceWidgetProvider extends AppWidgetProvider { mPeopleSpaceWidgetManager.deleteWidgets(appWidgetIds); } + @Override + public void onRestored(Context context, int[] oldWidgetIds, int[] newWidgetIds) { + super.onRestored(context, oldWidgetIds, newWidgetIds); + ensurePeopleSpaceWidgetManagerInitialized(); + mPeopleSpaceWidgetManager.remapWidgets(oldWidgetIds, newWidgetIds); + } + private void ensurePeopleSpaceWidgetManagerInitialized() { mPeopleSpaceWidgetManager.init(); } diff --git a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleTileKey.java b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleTileKey.java index 319df85b4872..6e6ca254dee0 100644 --- a/packages/SystemUI/src/com/android/systemui/people/widget/PeopleTileKey.java +++ b/packages/SystemUI/src/com/android/systemui/people/widget/PeopleTileKey.java @@ -25,6 +25,8 @@ import android.text.TextUtils; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** Class that encapsulates fields identifying a Conversation. */ public class PeopleTileKey { @@ -32,6 +34,8 @@ public class PeopleTileKey { private int mUserId; private String mPackageName; + private static final Pattern KEY_PATTERN = Pattern.compile("(.+)/(-?\\d+)/(\\p{L}.*)"); + public PeopleTileKey(String shortcutId, int userId, String packageName) { mShortcutId = shortcutId; mUserId = userId; @@ -66,8 +70,12 @@ public class PeopleTileKey { return mPackageName; } + public void setUserId(int userId) { + mUserId = userId; + } + /** Returns whether PeopleTileKey is valid/well-formed. */ - public boolean isValid() { + private boolean validate() { return !TextUtils.isEmpty(mShortcutId) && !TextUtils.isEmpty(mPackageName) && mUserId >= 0; } @@ -88,10 +96,31 @@ public class PeopleTileKey { */ @Override public String toString() { - if (!isValid()) return EMPTY_STRING; return mShortcutId + "/" + mUserId + "/" + mPackageName; } + /** Parses {@code key} into a {@link PeopleTileKey}. */ + public static PeopleTileKey fromString(String key) { + if (key == null) { + return null; + } + Matcher m = KEY_PATTERN.matcher(key); + if (m.find()) { + try { + int userId = Integer.parseInt(m.group(2)); + return new PeopleTileKey(m.group(1), userId, m.group(3)); + } catch (NumberFormatException e) { + return null; + } + } + return null; + } + + /** Returns whether {@code key} is a valid {@link PeopleTileKey}. */ + public static boolean isValid(PeopleTileKey key) { + return key != null && key.validate(); + } + @Override public boolean equals(Object other) { if (this == other) { diff --git a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java index 1ed98c0a8f90..03d1f15bf379 100644 --- a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java +++ b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningView.java @@ -93,6 +93,8 @@ public class InattentiveSleepWarningView extends FrameLayout { setAlpha(1f); setVisibility(View.VISIBLE); mWindowManager.addView(this, getLayoutParams(mWindowToken)); + announceForAccessibility( + getContext().getString(R.string.inattentive_sleep_warning_message)); } /** diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index 14bf8ab78e2c..8c2c373fae64 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -81,6 +81,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha private QSExpansionPathInterpolator mQSExpansionPathInterpolator; private TouchAnimator mFirstPageAnimator; private TouchAnimator mFirstPageDelayedAnimator; + private TouchAnimator mTranslationXAnimator; private TouchAnimator mTranslationYAnimator; private TouchAnimator mNonfirstPageAnimator; private TouchAnimator mNonfirstPageDelayedAnimator; @@ -223,18 +224,25 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha View qqsView, View qsView, View commonParent, + int xOffset, int yOffset, int[] temp, - TouchAnimator.Builder animatorBuilder + TouchAnimator.Builder animatorBuilderX, + TouchAnimator.Builder animatorBuilderY ) { getRelativePosition(temp, qqsView, commonParent); - int qqsPos = temp[1]; + int qqsPosX = temp[0]; + int qqsPosY = temp[1]; getRelativePosition(temp, qsView, commonParent); - int qsPos = temp[1]; - - int diff = qsPos - qqsPos - yOffset; - animatorBuilder.addFloat(qqsView, "translationY", 0, diff); - animatorBuilder.addFloat(qsView, "translationY", -diff, 0); + int qsPosX = temp[0]; + int qsPosY = temp[1]; + + int xDiff = qsPosX - qqsPosX - xOffset; + animatorBuilderX.addFloat(qqsView, "translationX", 0, xDiff); + animatorBuilderX.addFloat(qsView, "translationX", -xDiff, 0); + int yDiff = qsPosY - qqsPosY - yOffset; + animatorBuilderY.addFloat(qqsView, "translationY", 0, yDiff); + animatorBuilderY.addFloat(qsView, "translationY", -yDiff, 0); mAllViews.add(qqsView); mAllViews.add(qsView); } @@ -243,6 +251,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha mNeedsAnimatorUpdate = false; TouchAnimator.Builder firstPageBuilder = new Builder(); TouchAnimator.Builder translationYBuilder = new Builder(); + TouchAnimator.Builder translationXBuilder = new Builder(); Collection<QSTile> tiles = mHost.getTiles(); int count = 0; @@ -289,6 +298,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha getRelativePosition(loc1, quickTileView, view); getRelativePosition(loc2, tileView, view); int yOffset = loc2[1] - loc1[1]; + int xOffset = loc2[0] - loc1[0]; // Offset the translation animation on the views // (that goes from 0 to getOffsetTranslation) @@ -299,6 +309,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha translationYBuilder.addFloat(tileView, "translationY", -offsetWithQSBHTranslation, 0); + translationXBuilder.addFloat(quickTileView, "translationX", 0, xOffset); + translationXBuilder.addFloat(tileView, "translationX", -xOffset, 0); + if (mQQSTileHeightAnimator == null) { mQQSTileHeightAnimator = new HeightExpansionAnimator(this, quickTileView.getHeight(), tileView.getHeight()); @@ -312,8 +325,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha quickTileView.getIcon(), tileView.getIcon(), view, + xOffset, yOffset, loc1, + translationXBuilder, translationYBuilder ); @@ -322,8 +337,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha quickTileView.getLabelContainer(), tileView.getLabelContainer(), view, + xOffset, yOffset, loc1, + translationXBuilder, translationYBuilder ); @@ -332,8 +349,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha quickTileView.getSecondaryIcon(), tileView.getSecondaryIcon(), view, + xOffset, yOffset, loc1, + translationXBuilder, translationYBuilder ); @@ -364,6 +383,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha mOtherTilesExpandAnimator.addView(tileView); tileView.setClipChildren(true); tileView.setClipToPadding(true); + firstPageBuilder.addFloat(tileView.getSecondaryLabel(), "alpha", 0, 1); } mAllViews.add(tileView); @@ -398,10 +418,16 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha // Fade in the security footer and the divider as we reach the final position builder = new Builder().setStartDelay(EXPANDED_TILE_DELAY); builder.addFloat(mSecurityFooter.getView(), "alpha", 0, 1); + if (mQsPanelController.shouldUseHorizontalLayout() + && mQsPanelController.mMediaHost.hostView != null) { + builder.addFloat(mQsPanelController.mMediaHost.hostView, "alpha", 0, 1); + } mAllPagesDelayedAnimator = builder.build(); mAllViews.add(mSecurityFooter.getView()); translationYBuilder.setInterpolator(mQSExpansionPathInterpolator.getYInterpolator()); + translationXBuilder.setInterpolator(mQSExpansionPathInterpolator.getXInterpolator()); mTranslationYAnimator = translationYBuilder.build(); + mTranslationXAnimator = translationXBuilder.build(); if (mQQSTileHeightAnimator != null) { mQQSTileHeightAnimator.setInterpolator( mQSExpansionPathInterpolator.getYInterpolator()); @@ -474,6 +500,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha mFirstPageAnimator.setPosition(position); mFirstPageDelayedAnimator.setPosition(position); mTranslationYAnimator.setPosition(position); + mTranslationXAnimator.setPosition(position); if (mQQSTileHeightAnimator != null) { mQQSTileHeightAnimator.setPosition(position); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java index 6660081006cd..e9b19e5cfa6f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java @@ -28,12 +28,8 @@ import android.view.View; import android.view.WindowInsets; import android.widget.FrameLayout; -import androidx.dynamicanimation.animation.FloatPropertyCompat; -import androidx.dynamicanimation.animation.SpringForce; - import com.android.systemui.R; import com.android.systemui.qs.customize.QSCustomizer; -import com.android.wm.shell.animation.PhysicsAnimator; /** * Wrapper view with background which contains {@link QSPanel} and {@link QuickStatusBarHeader} @@ -41,26 +37,10 @@ import com.android.wm.shell.animation.PhysicsAnimator; public class QSContainerImpl extends FrameLayout { private final Point mSizePoint = new Point(); - private static final FloatPropertyCompat<QSContainerImpl> BACKGROUND_BOTTOM = - new FloatPropertyCompat<QSContainerImpl>("backgroundBottom") { - @Override - public float getValue(QSContainerImpl qsImpl) { - return qsImpl.getBackgroundBottom(); - } - - @Override - public void setValue(QSContainerImpl background, float value) { - background.setBackgroundBottom((int) value); - } - }; - private static final PhysicsAnimator.SpringConfig BACKGROUND_SPRING - = new PhysicsAnimator.SpringConfig(SpringForce.STIFFNESS_MEDIUM, - SpringForce.DAMPING_RATIO_LOW_BOUNCY); private int mFancyClippingTop; private int mFancyClippingBottom; private final float[] mFancyClippingRadii = new float[] {0, 0, 0, 0, 0, 0, 0, 0}; private final Path mFancyClippingPath = new Path(); - private int mBackgroundBottom = 0; private int mHeightOverride = -1; private View mQSDetail; private QuickStatusBarHeader mHeader; @@ -71,7 +51,6 @@ public class QSContainerImpl extends FrameLayout { private int mSideMargins; private boolean mQsDisabled; private int mContentPadding = -1; - private boolean mAnimateBottomOnNextLayout; private int mNavBarInset = 0; private boolean mClippingEnabled; @@ -86,11 +65,6 @@ public class QSContainerImpl extends FrameLayout { mQSDetail = findViewById(R.id.qs_detail); mHeader = findViewById(R.id.header); mQSCustomizer = findViewById(R.id.qs_customize); - mHeader.getHeaderQsPanel().setMediaVisibilityChangedListener((visible) -> { - if (mHeader.getHeaderQsPanel().isShown()) { - mAnimateBottomOnNextLayout = true; - } - }); setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); } @@ -99,20 +73,6 @@ public class QSContainerImpl extends FrameLayout { return false; } - void onMediaVisibilityChanged(boolean qsVisible) { - mAnimateBottomOnNextLayout = qsVisible; - } - - private void setBackgroundBottom(int value) { - // We're saving the bottom separately since otherwise the bottom would be overridden in - // the layout and the animation wouldn't properly start at the old position. - mBackgroundBottom = value; - } - - private float getBackgroundBottom() { - return mBackgroundBottom; - } - @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); @@ -186,8 +146,7 @@ public class QSContainerImpl extends FrameLayout { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); - updateExpansion(mAnimateBottomOnNextLayout /* animate */); - mAnimateBottomOnNextLayout = false; + updateExpansion(); updateClippingPath(); } @@ -230,31 +189,12 @@ public class QSContainerImpl extends FrameLayout { } public void updateExpansion() { - updateExpansion(false /* animate */); - } - - public void updateExpansion(boolean animate) { int height = calculateContainerHeight(); int scrollBottom = calculateContainerBottom(); setBottom(getTop() + height); mQSDetail.setBottom(getTop() + scrollBottom); int qsDetailBottomMargin = ((MarginLayoutParams) mQSDetail.getLayoutParams()).bottomMargin; mQSDetail.setBottom(getTop() + scrollBottom - qsDetailBottomMargin); - updateBackgroundBottom(scrollBottom, animate); - } - - private void updateBackgroundBottom(int height, boolean animated) { - PhysicsAnimator<QSContainerImpl> physicsAnimator = PhysicsAnimator.getInstance(this); - if (physicsAnimator.isPropertyAnimating(BACKGROUND_BOTTOM) || animated) { - // An animation is running or we want to animate - // Let's make sure to set the currentValue again, since the call below might only - // start in the next frame and otherwise we'd flicker - BACKGROUND_BOTTOM.setValue(this, BACKGROUND_BOTTOM.getValue(this)); - physicsAnimator.spring(BACKGROUND_BOTTOM, height, BACKGROUND_SPRING).start(); - } else { - BACKGROUND_BOTTOM.setValue(this, height); - } - } protected int calculateContainerHeight() { @@ -275,7 +215,7 @@ public class QSContainerImpl extends FrameLayout { public void setExpansion(float expansion) { mQsExpansion = expansion; - mQSPanelContainer.setScrollingEnabled(expansion > 0.0f); + mQSPanelContainer.setScrollingEnabled(expansion > 0f); updateExpansion(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java index 3638395be29e..7d61991c910a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImplController.java @@ -61,12 +61,6 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> { @Override protected void onViewAttached() { mView.updateResources(mQsPanelController, mQuickStatusBarHeaderController); - mQsPanelController.setMediaVisibilityChangedListener((visible) -> { - if (mQsPanelController.isShown()) { - mView.onMediaVisibilityChanged(true); - } - }); - mConfigurationController.addCallback(mConfigurationListener); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index c28c649b0306..0d91f29b5b2e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -53,6 +53,8 @@ import com.android.systemui.util.InjectionInflationController; import com.android.systemui.util.LifecycleFragment; import com.android.systemui.util.Utils; +import java.util.function.Consumer; + import javax.inject.Inject; import javax.inject.Named; @@ -106,6 +108,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca private QSPanelController mQSPanelController; private QuickQSPanelController mQuickQSPanelController; private QSCustomizerController mQSCustomizerController; + private ScrollListener mScrollListener; private FeatureFlags mFeatureFlags; /** * When true, QS will translate from outside the screen. It will be clipped with parallax @@ -169,9 +172,12 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca }); mQSPanelScrollView.setOnScrollChangeListener( (v, scrollX, scrollY, oldScrollX, oldScrollY) -> { - // Lazily update animators whenever the scrolling changes - mQSAnimator.onQsScrollingChanged(); - mHeader.setExpandedScrollAmount(scrollY); + // Lazily update animators whenever the scrolling changes + mQSAnimator.onQsScrollingChanged(); + mHeader.setExpandedScrollAmount(scrollY); + if (mScrollListener != null) { + mScrollListener.onQsPanelScrollChanged(scrollY); + } }); mQSDetail = view.findViewById(R.id.qs_detail); mHeader = view.findViewById(R.id.header); @@ -212,6 +218,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca } @Override + public void setScrollListener(ScrollListener listener) { + mScrollListener = listener; + } + + @Override public void onDestroy() { super.onDestroy(); mStatusBarStateController.removeCallback(this); @@ -220,6 +231,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca } mQSCustomizerController.setQs(null); mQsDetailDisplayer.setQsPanelController(null); + mScrollListener = null; } @Override @@ -281,6 +293,11 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca return mLastQSExpansion == 0.0f || mLastQSExpansion == -1; } + @Override + public void setCollapsedMediaVisibilityChangedListener(Consumer<Boolean> listener) { + mQuickQSPanelController.setMediaVisibilityChangedListener(listener); + } + private void setEditLocation(View view) { View edit = view.findViewById(android.R.id.edit); int[] loc = edit.getLocationOnScreen(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index c70eaffcaeb6..7c7f56658919 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -46,7 +46,6 @@ import com.android.systemui.util.animation.UniqueObjectHostView; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; /** View that represents the quick settings tile panel (when expanded/pulled down). **/ public class QSPanel extends LinearLayout implements Tunable { @@ -99,13 +98,8 @@ public class QSPanel extends LinearLayout implements Tunable { private LinearLayout mHorizontalLinearLayout; protected LinearLayout mHorizontalContentContainer; - // Only used with media - private QSTileLayout mHorizontalTileLayout; - protected QSTileLayout mRegularTileLayout; protected QSTileLayout mTileLayout; - private int mLastOrientation = -1; private int mMediaTotalBottomMargin; - private Consumer<Boolean> mMediaVisibilityChangedListener; public QSPanel(Context context, AttributeSet attrs) { super(context, attrs); @@ -121,8 +115,7 @@ public class QSPanel extends LinearLayout implements Tunable { } void initialize() { - mRegularTileLayout = createRegularTileLayout(); - mTileLayout = mRegularTileLayout; + mTileLayout = getOrCreateTileLayout(); if (mUsingMediaPlayer) { mHorizontalLinearLayout = new RemeasuringLinearLayout(mContext); @@ -135,7 +128,6 @@ public class QSPanel extends LinearLayout implements Tunable { mHorizontalContentContainer.setClipChildren(true); mHorizontalContentContainer.setClipToPadding(false); - mHorizontalTileLayout = createHorizontalTileLayout(); LayoutParams lp = new LayoutParams(0, LayoutParams.WRAP_CONTENT, 1); int marginSize = (int) mContext.getResources().getDimension(R.dimen.qs_media_padding); lp.setMarginStart(0); @@ -148,12 +140,6 @@ public class QSPanel extends LinearLayout implements Tunable { } } - protected void onMediaVisibilityChanged(Boolean visible) { - if (mMediaVisibilityChangedListener != null) { - mMediaVisibilityChangedListener.accept(visible); - } - } - /** * Add brightness view above the tile layout. * @@ -184,17 +170,12 @@ public class QSPanel extends LinearLayout implements Tunable { } /** */ - public QSTileLayout createRegularTileLayout() { - if (mRegularTileLayout == null) { - mRegularTileLayout = (QSTileLayout) LayoutInflater.from(mContext) + public QSTileLayout getOrCreateTileLayout() { + if (mTileLayout == null) { + mTileLayout = (QSTileLayout) LayoutInflater.from(mContext) .inflate(R.layout.qs_paged_tile_layout, this, false); } - return mRegularTileLayout; - } - - - protected QSTileLayout createHorizontalTileLayout() { - return createRegularTileLayout(); + return mTileLayout; } @Override @@ -281,18 +262,18 @@ public class QSPanel extends LinearLayout implements Tunable { * @param pageIndicator indicator to use for page scrolling */ public void setFooterPageIndicator(PageIndicator pageIndicator) { - if (mRegularTileLayout instanceof PagedTileLayout) { + if (mTileLayout instanceof PagedTileLayout) { mFooterPageIndicator = pageIndicator; updatePageIndicator(); } } private void updatePageIndicator() { - if (mRegularTileLayout instanceof PagedTileLayout) { + if (mTileLayout instanceof PagedTileLayout) { if (mFooterPageIndicator != null) { mFooterPageIndicator.setVisibility(View.GONE); - ((PagedTileLayout) mRegularTileLayout).setPageIndicator(mFooterPageIndicator); + ((PagedTileLayout) mTileLayout).setPageIndicator(mFooterPageIndicator); } } } @@ -362,7 +343,7 @@ public class QSPanel extends LinearLayout implements Tunable { return true; } - protected boolean needsDynamicRowsAndColumns() { + private boolean needsDynamicRowsAndColumns() { return true; } @@ -667,10 +648,6 @@ public class QSPanel extends LinearLayout implements Tunable { mHeaderContainer = headerContainer; } - public void setMediaVisibilityChangedListener(Consumer<Boolean> visibilityChangedListener) { - mMediaVisibilityChangedListener = visibilityChangedListener; - } - public boolean isListening() { return mListening; } @@ -681,39 +658,20 @@ public class QSPanel extends LinearLayout implements Tunable { } protected void setPageMargin(int pageMargin) { - if (mRegularTileLayout instanceof PagedTileLayout) { - ((PagedTileLayout) mRegularTileLayout).setPageMargin(pageMargin); - } - if (mHorizontalTileLayout != mRegularTileLayout - && mHorizontalTileLayout instanceof PagedTileLayout) { - ((PagedTileLayout) mHorizontalTileLayout).setPageMargin(pageMargin); + if (mTileLayout instanceof PagedTileLayout) { + ((PagedTileLayout) mTileLayout).setPageMargin(pageMargin); } } - void setUsingHorizontalLayout(boolean horizontal, ViewGroup mediaHostView, boolean force, - UiEventLogger uiEventLogger) { + void setUsingHorizontalLayout(boolean horizontal, ViewGroup mediaHostView, boolean force) { if (horizontal != mUsingHorizontalLayout || force) { mUsingHorizontalLayout = horizontal; - View visibleView = horizontal ? mHorizontalLinearLayout : (View) mRegularTileLayout; - View hiddenView = horizontal ? (View) mRegularTileLayout : mHorizontalLinearLayout; ViewGroup newParent = horizontal ? mHorizontalContentContainer : this; - QSPanel.QSTileLayout newLayout = horizontal - ? mHorizontalTileLayout : mRegularTileLayout; - if (hiddenView != null - && (mRegularTileLayout != mHorizontalTileLayout - || hiddenView != mRegularTileLayout)) { - // Only hide the view if the horizontal and the regular view are different, - // otherwise its reattached. - hiddenView.setVisibility(View.GONE); - } - visibleView.setVisibility(View.VISIBLE); - switchAllContentToParent(newParent, newLayout); + switchAllContentToParent(newParent, mTileLayout); reAttachMediaHost(mediaHostView, horizontal); - mTileLayout = newLayout; - newLayout.setListening(mListening, uiEventLogger); if (needsDynamicRowsAndColumns()) { - newLayout.setMinRows(horizontal ? 2 : 1); - newLayout.setMaxColumns(horizontal ? 2 : 4); + mTileLayout.setMinRows(horizontal ? 2 : 1); + mTileLayout.setMaxColumns(horizontal ? 2 : 4); } updateMargins(mediaHostView); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java index ac92d4fe44e2..ae0f5104d20f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java @@ -45,8 +45,6 @@ import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.BrightnessMirrorController; import com.android.systemui.tuner.TunerService; -import java.util.function.Consumer; - import javax.inject.Inject; import javax.inject.Named; @@ -149,14 +147,14 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { mBrightnessMirrorController.addCallback(mBrightnessMirrorListener); } - ((PagedTileLayout) mView.createRegularTileLayout()) + ((PagedTileLayout) mView.getOrCreateTileLayout()) .setOnTouchListener(mTileLayoutTouchListener); } @Override protected QSTileRevealController createTileRevealController() { return mQsTileRevealControllerFactory.create( - this, (PagedTileLayout) mView.createRegularTileLayout()); + this, (PagedTileLayout) mView.getOrCreateTileLayout()); } @Override @@ -289,11 +287,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { mView.setPageListener(listener); } - /** */ - public void setMediaVisibilityChangedListener(Consumer<Boolean> visibilityChangedListener) { - mView.setMediaVisibilityChangedListener(visibilityChangedListener); - } - public boolean isShown() { return mView.isShown(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java index 170785ca7aab..7a0982688b49 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java @@ -19,6 +19,8 @@ package com.android.systemui.qs; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent; import static com.android.systemui.qs.dagger.QSFragmentModule.QS_USING_MEDIA_PLAYER; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.res.Configuration; import android.metrics.LogMaker; @@ -42,6 +44,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; +import java.util.function.Consumer; import java.util.stream.Collectors; import javax.inject.Named; @@ -68,6 +71,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr protected final ArrayList<TileRecord> mRecords = new ArrayList<>(); private boolean mShouldUseSplitNotificationShade; + @Nullable + private Consumer<Boolean> mMediaVisibilityChangedListener; private int mLastOrientation; private String mCachedSpecs = ""; private QSTileRevealController mQsTileRevealController; @@ -89,7 +94,9 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr }; private final Function1<Boolean, Unit> mMediaHostVisibilityListener = (visible) -> { - mView.onMediaVisibilityChanged(visible); + if (mMediaVisibilityChangedListener != null) { + mMediaVisibilityChangedListener.accept(visible); + } switchTileLayout(false); return null; }; @@ -136,7 +143,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr } mMediaHost.addVisibilityChangeListener(mMediaHostVisibilityListener); - mView.onMediaVisibilityChanged(mMediaHost.getVisible()); mView.addOnConfigurationChangedListener(mOnConfigurationChangedListener); mHost.addCallback(mQSHostCallback); setTiles(); @@ -291,20 +297,12 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr } boolean switchTileLayout(boolean force) { - /** Whether or not the QuickQSPanel currently contains a media player. */ + /* Whether or not the panel currently contains a media player. */ boolean horizontal = shouldUseHorizontalLayout(); if (horizontal != mUsingHorizontalLayout || force) { mUsingHorizontalLayout = horizontal; - for (QSPanelControllerBase.TileRecord record : mRecords) { - mView.removeTile(record); - record.tile.removeCallback(record.callback); - } - mView.setUsingHorizontalLayout(mUsingHorizontalLayout, mMediaHost.getHostView(), force, - mUiEventLogger); + mView.setUsingHorizontalLayout(mUsingHorizontalLayout, mMediaHost.getHostView(), force); updateMediaDisappearParameters(); - - setTiles(); - return true; } return false; @@ -381,6 +379,13 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr return mView.getTileLayout(); } + /** + * Add a listener for when the media visibility changes. + */ + public void setMediaVisibilityChangedListener(@NonNull Consumer<Boolean> listener) { + mMediaVisibilityChangedListener = listener; + } + /** */ public static final class TileRecord extends QSPanel.Record { public QSTile tile; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 3a6f1d5a02ae..7f19d0e6c25c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -185,15 +185,22 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen final boolean isProfileOwnerOfOrganizationOwnedDevice = mSecurityController.isProfileOwnerOfOrganizationOwnedDevice(); final boolean isParentalControlsEnabled = mSecurityController.isParentalControlsEnabled(); + final boolean isWorkProfileOn = mSecurityController.isWorkProfileOn(); + final boolean hasDisclosableWorkProfilePolicy = hasCACertsInWorkProfile + || vpnNameWorkProfile != null || (hasWorkProfile && isNetworkLoggingEnabled); // Update visibility of footer - mIsVisible = (isDeviceManaged && !isDemoDevice) || hasCACerts || hasCACertsInWorkProfile - || vpnName != null || vpnNameWorkProfile != null - || isProfileOwnerOfOrganizationOwnedDevice || isParentalControlsEnabled - || (hasWorkProfile && isNetworkLoggingEnabled); + mIsVisible = (isDeviceManaged && !isDemoDevice) + || hasCACerts + || vpnName != null + || isProfileOwnerOfOrganizationOwnedDevice + || isParentalControlsEnabled + || (hasDisclosableWorkProfilePolicy && isWorkProfileOn); // Update the view to be untappable if the device is an organization-owned device with a - // managed profile and there is no policy set which requires a privacy disclosure. - if (mIsVisible && isProfileOwnerOfOrganizationOwnedDevice && !isNetworkLoggingEnabled - && !hasCACertsInWorkProfile && vpnNameWorkProfile == null) { + // managed profile and there is either: + // a) no policy set which requires a privacy disclosure. + // b) a specific work policy set but the work profile is turned off. + if (mIsVisible && isProfileOwnerOfOrganizationOwnedDevice + && (!hasDisclosableWorkProfilePolicy || !isWorkProfileOn)) { mRootView.setClickable(false); mRootView.findViewById(R.id.footer_icon).setVisibility(View.GONE); } else { @@ -204,7 +211,8 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen mFooterTextContent = getFooterText(isDeviceManaged, hasWorkProfile, hasCACerts, hasCACertsInWorkProfile, isNetworkLoggingEnabled, vpnName, vpnNameWorkProfile, organizationName, workProfileOrganizationName, - isProfileOwnerOfOrganizationOwnedDevice, isParentalControlsEnabled); + isProfileOwnerOfOrganizationOwnedDevice, isParentalControlsEnabled, + isWorkProfileOn); // Update the icon int footerIconId = R.drawable.ic_info_outline; if (vpnName != null || vpnNameWorkProfile != null) { @@ -236,7 +244,8 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen boolean hasCACerts, boolean hasCACertsInWorkProfile, boolean isNetworkLoggingEnabled, String vpnName, String vpnNameWorkProfile, CharSequence organizationName, CharSequence workProfileOrganizationName, - boolean isProfileOwnerOfOrganizationOwnedDevice, boolean isParentalControlsEnabled) { + boolean isProfileOwnerOfOrganizationOwnedDevice, boolean isParentalControlsEnabled, + boolean isWorkProfileOn) { if (isParentalControlsEnabled) { return mContext.getString(R.string.quick_settings_disclosure_parental_controls); } @@ -280,7 +289,7 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen organizationName); } } // end if(isDeviceManaged) - if (hasCACertsInWorkProfile) { + if (hasCACertsInWorkProfile && isWorkProfileOn) { if (workProfileOrganizationName == null) { return mContext.getString( R.string.quick_settings_disclosure_managed_profile_monitoring); @@ -295,7 +304,7 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen if (vpnName != null && vpnNameWorkProfile != null) { return mContext.getString(R.string.quick_settings_disclosure_vpns); } - if (vpnNameWorkProfile != null) { + if (vpnNameWorkProfile != null && isWorkProfileOn) { return mContext.getString(R.string.quick_settings_disclosure_managed_profile_named_vpn, vpnNameWorkProfile); } @@ -308,7 +317,7 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen return mContext.getString(R.string.quick_settings_disclosure_named_vpn, vpnName); } - if (hasWorkProfile && isNetworkLoggingEnabled) { + if (hasWorkProfile && isNetworkLoggingEnabled && isWorkProfileOn) { return mContext.getString( R.string.quick_settings_disclosure_managed_profile_network_activity); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java index 6ddf2a75f491..756ad9939886 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java @@ -27,7 +27,6 @@ import android.provider.Settings.Secure; import android.service.quicksettings.Tile; import android.text.TextUtils; import android.util.ArraySet; -import android.util.FeatureFlagUtils; import android.util.Log; import com.android.internal.logging.InstanceId; @@ -52,6 +51,7 @@ import com.android.systemui.qs.external.TileServices; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.phone.AutoTileManager; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; @@ -123,7 +123,8 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D UiEventLogger uiEventLogger, UserTracker userTracker, SecureSettings secureSettings, - CustomTileStatePersister customTileStatePersister) { + CustomTileStatePersister customTileStatePersister + ) { mIconController = iconController; mContext = context; mUserContext = context; @@ -517,7 +518,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D // --WiFiTile // --CellularTIle if (tiles.contains("internet") || tiles.contains("wifi") || tiles.contains("cell")) { - if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + if (FeatureFlags.isProviderModelSettingEnabled(context)) { if (!tiles.contains("internet")) { if (tiles.contains("wifi")) { // Replace the WiFi with Internet, and remove the Cell @@ -559,7 +560,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D } // TODO(b/174753536): Change the config file directly. // Filter out unused tiles from the default QS config. - if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + if (FeatureFlags.isProviderModelSettingEnabled(context)) { tiles.remove("cell"); tiles.remove("wifi"); } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index 659475d19277..68962b0cd17a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -61,21 +61,10 @@ public class QuickQSPanel extends QSPanel { } @Override - public TileLayout createRegularTileLayout() { + public TileLayout getOrCreateTileLayout() { return new QQSSideLabelTileLayout(mContext); } - @Override - protected QSTileLayout createHorizontalTileLayout() { - TileLayout t = createRegularTileLayout(); - t.setMaxColumns(2); - return t; - } - - @Override - protected boolean needsDynamicRowsAndColumns() { - return false; // QQS always have the same layout - } @Override protected boolean displayMediaMarginsOnMedia() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 997b96626747..c58173b817fa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -23,7 +23,6 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.FeatureFlagUtils; import android.util.Pair; import android.view.DisplayCutout; import android.view.View; @@ -88,11 +87,11 @@ public class QuickStatusBarHeader extends FrameLayout { private float mKeyguardExpansionFraction; private int mTextColorPrimary = Color.TRANSPARENT; private int mTopViewMeasureHeight; + private boolean mProviderModel; private final String mMobileSlotName; private final String mNoCallingSlotName; private final String mCallStrengthSlotName; - private final boolean mProviderModel; public QuickStatusBarHeader(Context context, AttributeSet attrs) { super(context, attrs); @@ -100,11 +99,6 @@ public class QuickStatusBarHeader extends FrameLayout { mNoCallingSlotName = context.getString(com.android.internal.R.string.status_bar_no_calling); mCallStrengthSlotName = context.getString(com.android.internal.R.string.status_bar_call_strength); - if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { - mProviderModel = true; - } else { - mProviderModel = false; - } } /** @@ -154,7 +148,9 @@ public class QuickStatusBarHeader extends FrameLayout { } void onAttach(TintedIconManager iconManager, - QSExpansionPathInterpolator qsExpansionPathInterpolator) { + QSExpansionPathInterpolator qsExpansionPathInterpolator, + boolean providerModel) { + mProviderModel = providerModel; mTintedIconManager = iconManager; int fillColor = Utils.getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java index 76076f6c2761..fcf1302b8fb4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java @@ -37,6 +37,7 @@ import com.android.systemui.privacy.PrivacyItemController; import com.android.systemui.privacy.logging.PrivacyLogger; import com.android.systemui.qs.carrier.QSCarrierGroupController; import com.android.systemui.qs.dagger.QSScope; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusIconContainer; import com.android.systemui.statusbar.policy.Clock; @@ -69,6 +70,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader private final PrivacyLogger mPrivacyLogger; private final PrivacyDialogController mPrivacyDialogController; private final QSExpansionPathInterpolator mQSExpansionPathInterpolator; + private final FeatureFlags mFeatureFlags; private boolean mListening; private boolean mMicCameraIndicatorsEnabled; @@ -130,7 +132,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader PrivacyLogger privacyLogger, SysuiColorExtractor colorExtractor, PrivacyDialogController privacyDialogController, - QSExpansionPathInterpolator qsExpansionPathInterpolator) { + QSExpansionPathInterpolator qsExpansionPathInterpolator, + FeatureFlags featureFlags) { super(view); mPrivacyItemController = privacyItemController; mActivityStarter = activityStarter; @@ -141,6 +144,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader mPrivacyLogger = privacyLogger; mPrivacyDialogController = privacyDialogController; mQSExpansionPathInterpolator = qsExpansionPathInterpolator; + mFeatureFlags = featureFlags; mQSCarrierGroupController = qsCarrierGroupControllerBuilder .setQSCarrierGroup(mView.findViewById(R.id.carrier_group)) @@ -150,7 +154,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader mClockView = mView.findViewById(R.id.clock); mIconContainer = mView.findViewById(R.id.statusIcons); - mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer); + mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, mFeatureFlags); mDemoModeReceiver = new ClockDemoModeReceiver(mClockView); mColorExtractor = colorExtractor; mOnColorsChangedListener = (extractor, which) -> { @@ -174,7 +178,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader setChipVisibility(mPrivacyChip.getVisibility() == View.VISIBLE); - mView.onAttach(mIconManager, mQSExpansionPathInterpolator); + mView.onAttach(mIconManager, mQSExpansionPathInterpolator, + mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()); mDemoModeController.addCallback(mDemoModeReceiver); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt b/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt index 663f3f0e9ddb..2dac63905524 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/carrier/CellSignalState.kt @@ -26,7 +26,8 @@ data class CellSignalState( @JvmField val mobileSignalIconId: Int = 0, @JvmField val contentDescription: String? = null, @JvmField val typeContentDescription: String? = null, - @JvmField val roaming: Boolean = false + @JvmField val roaming: Boolean = false, + @JvmField val providerModelBehavior: Boolean = false ) { /** * Changes the visibility of this state by returning a copy with the visibility changed. diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java index ae0b5d11db13..d6fa21646402 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java +++ b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.ColorStateList; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.FeatureFlagUtils; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -39,7 +38,7 @@ public class QSCarrier extends LinearLayout { private ImageView mMobileSignal; private ImageView mMobileRoaming; private CellSignalState mLastSignalState; - private boolean mProviderModel; + private boolean mProviderModelInitialized = false; public QSCarrier(Context context) { super(context); @@ -60,20 +59,10 @@ public class QSCarrier extends LinearLayout { @Override protected void onFinishInflate() { super.onFinishInflate(); - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { - mProviderModel = true; - } else { - mProviderModel = false; - } mMobileGroup = findViewById(R.id.mobile_combo); mMobileRoaming = findViewById(R.id.mobile_roaming); mMobileSignal = findViewById(R.id.mobile_signal); mCarrierText = findViewById(R.id.qs_carrier_text); - if (mProviderModel) { - mMobileSignal.setImageDrawable(mContext.getDrawable(R.drawable.ic_qs_no_calling_sms)); - } else { - mMobileSignal.setImageDrawable(new SignalDrawable(mContext)); - } } /** @@ -92,10 +81,19 @@ public class QSCarrier extends LinearLayout { mMobileRoaming.setImageTintList(colorStateList); mMobileSignal.setImageTintList(colorStateList); - if (mProviderModel) { + if (state.providerModelBehavior) { + if (!mProviderModelInitialized) { + mProviderModelInitialized = true; + mMobileSignal.setImageDrawable( + mContext.getDrawable(R.drawable.ic_qs_no_calling_sms)); + } mMobileSignal.setImageDrawable(mContext.getDrawable(state.mobileSignalIconId)); mMobileSignal.setContentDescription(state.contentDescription); } else { + if (!mProviderModelInitialized) { + mProviderModelInitialized = true; + mMobileSignal.setImageDrawable(new SignalDrawable(mContext)); + } mMobileSignal.setImageLevel(state.mobileSignalIconId); StringBuilder contentDescription = new StringBuilder(); if (state.contentDescription != null) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java index c49e0547e433..f23c0580c409 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java @@ -27,7 +27,6 @@ import android.os.Message; import android.provider.Settings; import android.telephony.SubscriptionManager; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import android.util.Log; import android.view.View; import android.widget.TextView; @@ -41,6 +40,7 @@ import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; import com.android.systemui.util.CarrierConfigTracker; @@ -95,7 +95,8 @@ public class QSCarrierGroupController { indicators.statusIcon.icon, indicators.statusIcon.contentDescription, indicators.typeContentDescription.toString(), - indicators.roaming + indicators.roaming, + mProviderModel ); mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); } @@ -120,18 +121,32 @@ public class QSCarrierGroupController { if (statusIcon.icon == R.drawable.ic_qs_no_calling_sms) { if (statusIcon.visible) { - mInfos[slotIndex] = new CellSignalState(true, - statusIcon.icon, statusIcon.contentDescription, "", false); + mInfos[slotIndex] = new CellSignalState( + true, + statusIcon.icon, + statusIcon.contentDescription, + "", + false, + mProviderModel); } else { // Whenever the no Calling & SMS state is cleared, switched to the last // known call strength icon. if (displayCallStrengthIcon) { mInfos[slotIndex] = new CellSignalState( - true, mLastSignalLevel[slotIndex], - mLastSignalLevelDescription[slotIndex], "", false); + true, + mLastSignalLevel[slotIndex], + mLastSignalLevelDescription[slotIndex], + "", + false, + mProviderModel); } else { mInfos[slotIndex] = new CellSignalState( - true, R.drawable.ic_qs_sim_card, "", "", false); + true, + R.drawable.ic_qs_sim_card, + "", + "", + false, + mProviderModel); } } mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); @@ -143,11 +158,21 @@ public class QSCarrierGroupController { if (mInfos[slotIndex].mobileSignalIconId != R.drawable.ic_qs_no_calling_sms) { if (displayCallStrengthIcon) { - mInfos[slotIndex] = new CellSignalState(true, statusIcon.icon, - statusIcon.contentDescription, "", false); + mInfos[slotIndex] = new CellSignalState( + true, + statusIcon.icon, + statusIcon.contentDescription, + "", + false, + mProviderModel); } else { mInfos[slotIndex] = new CellSignalState( - true, R.drawable.ic_qs_sim_card, "", "", false); + true, + R.drawable.ic_qs_sim_card, + "", + "", + false, + mProviderModel); } mMainHandler.obtainMessage(H.MSG_UPDATE_STATE).sendToTarget(); } @@ -182,8 +207,9 @@ public class QSCarrierGroupController { @Background Handler bgHandler, @Main Looper mainLooper, NetworkController networkController, CarrierTextManager.Builder carrierTextManagerBuilder, Context context, - CarrierConfigTracker carrierConfigTracker) { - if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + CarrierConfigTracker carrierConfigTracker, FeatureFlags featureFlags) { + + if (featureFlags.isCombinedStatusBarSignalIconsEnabled()) { mProviderModel = true; } else { mProviderModel = false; @@ -217,9 +243,13 @@ public class QSCarrierGroupController { mCarrierDividers[1] = view.getCarrierDivider2(); for (int i = 0; i < SIM_SLOTS; i++) { - mInfos[i] = new CellSignalState(true, R.drawable.ic_qs_no_calling_sms, + mInfos[i] = new CellSignalState( + true, + R.drawable.ic_qs_no_calling_sms, context.getText(AccessibilityContentDescriptions.NO_CALLING).toString(), - "", false); + "", + false, + mProviderModel); mLastSignalLevel[i] = TelephonyIcons.MOBILE_CALL_STRENGTH_ICONS[0]; mLastSignalLevelDescription[i] = context.getText(AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0]) @@ -289,7 +319,8 @@ public class QSCarrierGroupController { for (int i = 0; i < SIM_SLOTS; i++) { if (mInfos[i].visible && mInfos[i].mobileSignalIconId == R.drawable.ic_qs_sim_card) { - mInfos[i] = new CellSignalState(true, R.drawable.ic_blank, "", "", false); + mInfos[i] = new CellSignalState(true, R.drawable.ic_blank, "", "", false, + mProviderModel); } } } @@ -401,12 +432,13 @@ public class QSCarrierGroupController { private final CarrierTextManager.Builder mCarrierTextControllerBuilder; private final Context mContext; private final CarrierConfigTracker mCarrierConfigTracker; + private final FeatureFlags mFeatureFlags; @Inject public Builder(ActivityStarter activityStarter, @Background Handler handler, @Main Looper looper, NetworkController networkController, CarrierTextManager.Builder carrierTextControllerBuilder, Context context, - CarrierConfigTracker carrierConfigTracker) { + CarrierConfigTracker carrierConfigTracker, FeatureFlags featureFlags) { mActivityStarter = activityStarter; mHandler = handler; mLooper = looper; @@ -414,6 +446,7 @@ public class QSCarrierGroupController { mCarrierTextControllerBuilder = carrierTextControllerBuilder; mContext = context; mCarrierConfigTracker = carrierConfigTracker; + mFeatureFlags = featureFlags; } public Builder setQSCarrierGroup(QSCarrierGroup view) { @@ -424,7 +457,7 @@ public class QSCarrierGroupController { public QSCarrierGroupController build() { return new QSCarrierGroupController(mView, mActivityStarter, mHandler, mLooper, mNetworkController, mCarrierTextControllerBuilder, mContext, - mCarrierConfigTracker); + mCarrierConfigTracker, mFeatureFlags); } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index d017c74b4306..b904505b6469 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -567,6 +567,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta public void clearDrag() { itemView.clearAnimation(); + itemView.setScaleX(1); + itemView.setScaleY(1); } public void startDrag() { @@ -812,5 +814,12 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta @Override public void onSwiped(ViewHolder viewHolder, int direction) { } + + // Just in case, make sure to animate to base state. + @Override + public void clearView(@NonNull RecyclerView recyclerView, @NonNull ViewHolder viewHolder) { + ((Holder) viewHolder).stopDrag(); + super.clearView(recyclerView, viewHolder); + } }; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java index d72f8e9ca1c0..3cb715cee8e9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -29,7 +29,6 @@ import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; import android.text.TextUtils; import android.util.ArraySet; -import android.util.FeatureFlagUtils; import android.widget.Button; import com.android.systemui.R; @@ -42,6 +41,7 @@ import com.android.systemui.qs.dagger.QSScope; import com.android.systemui.qs.external.CustomTile; import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon; import com.android.systemui.settings.UserTracker; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.util.leak.GarbageMonitor; import java.util.ArrayList; @@ -63,17 +63,24 @@ public class TileQueryHelper { private final Executor mBgExecutor; private final Context mContext; private final UserTracker mUserTracker; + private final FeatureFlags mFeatureFlags; private TileStateListener mListener; private boolean mFinished; @Inject - public TileQueryHelper(Context context, UserTracker userTracker, - @Main Executor mainExecutor, @Background Executor bgExecutor) { + public TileQueryHelper( + Context context, + UserTracker userTracker, + @Main Executor mainExecutor, + @Background Executor bgExecutor, + FeatureFlags featureFlags + ) { mContext = context; mMainExecutor = mainExecutor; mBgExecutor = bgExecutor; mUserTracker = userTracker; + mFeatureFlags = featureFlags; } public void setListener(TileStateListener listener) { @@ -115,7 +122,7 @@ public class TileQueryHelper { final ArrayList<QSTile> tilesToAdd = new ArrayList<>(); // TODO(b/174753536): Move it into the config file. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + if (mFeatureFlags.isProviderModelSettingEnabled()) { possibleTiles.remove("cell"); possibleTiles.remove("wifi"); } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt index 2bac29846893..56bf3d59f648 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt @@ -23,7 +23,7 @@ import android.widget.LinearLayout /** * [LinearLayout] that can ignore the last child for measuring. * - * The view is measured as regularlt, then if [ignoreLastView] is true: + * The view is measured as regularly, then if [ignoreLastView] is true: * * In [LinearLayout.VERTICAL] orientation, the height of the last view is subtracted from the * final measured height. * * In [LinearLayout.HORIZONTAL] orientation, the width of the last view is subtracted from the @@ -41,8 +41,21 @@ class IgnorableChildLinearLayout @JvmOverloads constructor( var ignoreLastView = false + /** + * Forces [MeasureSpec.UNSPECIFIED] in the direction of layout + */ + var forceUnspecifiedMeasure = false + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec) + val actualWidthSpec = if (forceUnspecifiedMeasure && orientation == HORIZONTAL) { + MeasureSpec.makeMeasureSpec(widthMeasureSpec, MeasureSpec.UNSPECIFIED) + } else widthMeasureSpec + + val actualHeightSpec = if (forceUnspecifiedMeasure && orientation == VERTICAL) { + MeasureSpec.makeMeasureSpec(heightMeasureSpec, MeasureSpec.UNSPECIFIED) + } else heightMeasureSpec + + super.onMeasure(actualWidthSpec, actualHeightSpec) if (ignoreLastView && childCount > 0) { val lastView = getChildAt(childCount - 1) if (lastView.visibility != GONE) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt index d31e67c55777..70685a68e182 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt @@ -189,6 +189,11 @@ open class QSTileViewImpl @JvmOverloads constructor( secondaryLabel = labelContainer.requireViewById(R.id.app_label) if (collapsed) { labelContainer.ignoreLastView = true + // Ideally, it'd be great if the parent could set this up when measuring just this child + // instead of the View class having to support this. However, due to the mysteries of + // LinearLayout's double measure pass, we cannot overwrite `measureChild` or any of its + // sibling methods to have special behavior for labelContainer. + labelContainer.forceUnspecifiedMeasure = true secondaryLabel.alpha = 0f // Do not marque in QQS label.ellipsize = TextUtils.TruncateAt.END diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java index 98cd88af232f..82b6c0c1805d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -73,6 +73,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { private final QuickAccessWalletController mController; private WalletCard mSelectedCard; + private boolean mIsWalletUpdating = true; @VisibleForTesting Drawable mCardViewDrawable; @Inject @@ -110,7 +111,8 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { super.handleSetListening(listening); if (listening) { mController.setupWalletChangeObservers(mCardRetriever, DEFAULT_PAYMENT_APP_CHANGE); - if (!mController.getWalletClient().isWalletServiceAvailable()) { + if (!mController.getWalletClient().isWalletServiceAvailable() + || !mController.getWalletClient().isWalletFeatureAvailable()) { Log.i(TAG, "QAW service is unavailable, recreating the wallet client."); mController.reCreateWalletClient(); } @@ -156,9 +158,14 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { CharSequence label = mController.getWalletClient().getServiceLabel(); state.label = label == null ? mLabel : label; state.contentDescription = state.label; - state.icon = ResourceIcon.get(R.drawable.ic_wallet_lockscreen); + Drawable tileIcon = mController.getWalletClient().getTileIcon(); + state.icon = + tileIcon == null + ? ResourceIcon.get(R.drawable.ic_wallet_lockscreen) + : new DrawableIcon(tileIcon); boolean isDeviceLocked = !mKeyguardStateController.isUnlocked(); - if (mController.getWalletClient().isWalletServiceAvailable()) { + if (mController.getWalletClient().isWalletServiceAvailable() + && mController.getWalletClient().isWalletFeatureAvailable()) { if (mSelectedCard != null) { if (isDeviceLocked) { state.state = Tile.STATE_INACTIVE; @@ -172,7 +179,11 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { } } else { state.state = Tile.STATE_INACTIVE; - state.secondaryLabel = mContext.getString(R.string.wallet_secondary_label_no_card); + state.secondaryLabel = + mContext.getString( + mIsWalletUpdating + ? R.string.wallet_secondary_label_updating + : R.string.wallet_secondary_label_no_card); state.sideViewCustomDrawable = null; } state.stateDescription = state.secondaryLabel; @@ -218,6 +229,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { @Override public void onWalletCardsRetrieved(@NonNull GetWalletCardsResponse response) { Log.i(TAG, "Successfully retrieved wallet cards."); + mIsWalletUpdating = false; List<WalletCard> cards = response.getWalletCards(); if (cards.isEmpty()) { Log.d(TAG, "No wallet cards exist."); @@ -240,7 +252,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { @Override public void onWalletCardRetrievalError(@NonNull GetWalletCardsError error) { - Log.w(TAG, "Error retrieve wallet cards"); + mIsWalletUpdating = false; mCardViewDrawable = null; mSelectedCard = null; refreshState(); diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java index 57125f34731c..df766f3625e4 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java @@ -30,9 +30,9 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.Spinner; import android.widget.Switch; +import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.settings.UserContextProvider; @@ -78,12 +78,12 @@ public class ScreenRecordDialog extends Activity { setContentView(R.layout.screen_record_dialog); - Button cancelBtn = findViewById(R.id.button_cancel); + TextView cancelBtn = findViewById(R.id.button_cancel); cancelBtn.setOnClickListener(v -> { finish(); }); - Button startBtn = findViewById(R.id.button_start); + TextView startBtn = findViewById(R.id.button_start); startBtn.setOnClickListener(v -> { requestScreenCapture(); finish(); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/CropView.java b/packages/SystemUI/src/com/android/systemui/screenshot/CropView.java index 0a60f6da159e..a9cecaaf1f76 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/CropView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/CropView.java @@ -44,6 +44,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.customview.widget.ExploreByTouchHelper; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import com.android.internal.graphics.ColorUtils; import com.android.systemui.R; import java.util.List; @@ -95,7 +96,9 @@ public class CropView extends View { TypedArray t = context.getTheme().obtainStyledAttributes( attrs, R.styleable.CropView, 0, 0); mShadePaint = new Paint(); - mShadePaint.setColor(t.getColor(R.styleable.CropView_scrimColor, Color.TRANSPARENT)); + int alpha = t.getInteger(R.styleable.CropView_scrimAlpha, 255); + int scrimColor = t.getColor(R.styleable.CropView_scrimColor, Color.TRANSPARENT); + mShadePaint.setColor(ColorUtils.setAlphaComponent(scrimColor, alpha)); mContainerBackgroundPaint = new Paint(); mContainerBackgroundPaint.setColor(t.getColor(R.styleable.CropView_containerBackgroundColor, Color.TRANSPARENT)); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java index 741dddc49378..35637f66d0df 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java @@ -126,6 +126,8 @@ public class LongScreenshotActivity extends Activity { mTransitionView = requireViewById(R.id.transition); mEnterTransitionView = requireViewById(R.id.enter_transition); + requireViewById(R.id.cancel).setOnClickListener(v -> finishAndRemoveTask()); + mSave.setOnClickListener(this::onClicked); mEdit.setOnClickListener(this::onClicked); mShare.setOnClickListener(this::onClicked); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java b/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java index 34b40f79836b..78737329750a 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java @@ -33,6 +33,7 @@ import android.view.ViewPropertyAnimator; import androidx.annotation.Nullable; +import com.android.internal.graphics.ColorUtils; import com.android.systemui.R; /** @@ -83,7 +84,9 @@ public class MagnifierView extends View implements CropView.CropInteractionListe TypedArray t = context.getTheme().obtainStyledAttributes( attrs, R.styleable.MagnifierView, 0, 0); mShadePaint = new Paint(); - mShadePaint.setColor(t.getColor(R.styleable.MagnifierView_scrimColor, Color.TRANSPARENT)); + int alpha = t.getInteger(R.styleable.MagnifierView_scrimAlpha, 255); + int scrimColor = t.getColor(R.styleable.MagnifierView_scrimColor, Color.TRANSPARENT); + mShadePaint.setColor(ColorUtils.setAlphaComponent(scrimColor, alpha)); mHandlePaint = new Paint(); mHandlePaint.setColor(t.getColor(R.styleable.MagnifierView_handleColor, Color.BLACK)); mHandlePaint.setStrokeWidth( diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 63ecc0b89783..ee9000fc9723 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -16,6 +16,7 @@ package com.android.systemui.screenshot; +import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; @@ -259,6 +260,7 @@ public class ScreenshotController { private ScreenshotView mScreenshotView; private Bitmap mScreenBitmap; private SaveImageInBackgroundTask mSaveInBgTask; + private boolean mScreenshotTakenInPortrait; private Animator mScreenshotAnimation; private RequestCallback mCurrentRequestCallback; @@ -488,6 +490,9 @@ public class ScreenshotController { * Takes a screenshot of the current display and shows an animation. */ private void takeScreenshotInternal(Consumer<Uri> finisher, Rect crop) { + mScreenshotTakenInPortrait = + mContext.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT; + // copy the input Rect, since SurfaceControl.screenshot can mutate it Rect screenRect = new Rect(crop); Bitmap screenshot = captureScreenshot(crop); @@ -661,7 +666,8 @@ public class ScreenshotController { Bitmap newScreenshot = captureScreenshot( new Rect(0, 0, displayMetrics.widthPixels, displayMetrics.heightPixels)); - mScreenshotView.prepareScrollingTransition(response, mScreenBitmap, newScreenshot); + mScreenshotView.prepareScrollingTransition(response, mScreenBitmap, newScreenshot, + mScreenshotTakenInPortrait); // delay starting scroll capture to make sure the scrim is up before the app moves mScreenshotView.post(() -> { // Clear the reference to prevent close() in dismissScreenshot @@ -670,12 +676,19 @@ public class ScreenshotController { mScrollCaptureController.run(response); future.addListener(() -> { ScrollCaptureController.LongScreenshot longScreenshot; + try { longScreenshot = future.get(); } catch (CancellationException | InterruptedException | ExecutionException e) { Log.e(TAG, "Exception", e); + mScreenshotView.restoreNonScrollingUi(); + return; + } + + if (longScreenshot.getHeight() == 0) { + mScreenshotView.restoreNonScrollingUi(); return; } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index 9fe8c84bc13d..05e1bc082c51 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -162,6 +162,7 @@ public class ScreenshotView extends FrameLayout implements private GestureDetector mSwipeDetector; private SwipeDismissHandler mSwipeDismissHandler; private InputMonitorCompat mInputMonitor; + private boolean mShowScrollablePreview; private final ArrayList<ScreenshotActionChip> mSmartChips = new ArrayList<>(); private PendingInteraction mPendingInteraction; @@ -772,70 +773,99 @@ public class ScreenshotView extends FrameLayout implements void startLongScreenshotTransition(Rect destination, Runnable onTransitionEnd, ScrollCaptureController.LongScreenshot longScreenshot) { - mScrollablePreview.setImageBitmap(longScreenshot.toBitmap()); - ValueAnimator anim = ValueAnimator.ofFloat(0, 1); - float startX = mScrollablePreview.getX(); - float startY = mScrollablePreview.getY(); - int[] locInScreen = mScrollablePreview.getLocationOnScreen(); - destination.offset((int) startX - locInScreen[0], (int) startY - locInScreen[1]); - mScrollablePreview.setPivotX(0); - mScrollablePreview.setPivotY(0); - mScrollablePreview.setAlpha(1f); - float currentScale = mScrollablePreview.getWidth() / (float) longScreenshot.getWidth(); - Matrix matrix = new Matrix(); - matrix.setScale(currentScale, currentScale); - matrix.postTranslate( - longScreenshot.getLeft() * currentScale, longScreenshot.getTop() * currentScale); - mScrollablePreview.setImageMatrix(matrix); - float destinationScale = destination.width() / (float) mScrollablePreview.getWidth(); - anim.addUpdateListener(animation -> { - float t = animation.getAnimatedFraction(); - mScrollingScrim.setAlpha(1 - t); - float currScale = MathUtils.lerp(1, destinationScale, t); - mScrollablePreview.setScaleX(currScale); - mScrollablePreview.setScaleY(currScale); - mScrollablePreview.setX(MathUtils.lerp(startX, destination.left, t)); - mScrollablePreview.setY(MathUtils.lerp(startY, destination.top, t)); - }); - anim.addListener(new AnimatorListenerAdapter() { + AnimatorSet animSet = new AnimatorSet(); + + ValueAnimator scrimAnim = ValueAnimator.ofFloat(0, 1); + scrimAnim.addUpdateListener(animation -> + mScrollingScrim.setAlpha(1 - animation.getAnimatedFraction())); + + if (mShowScrollablePreview) { + mScrollablePreview.setImageBitmap(longScreenshot.toBitmap()); + float startX = mScrollablePreview.getX(); + float startY = mScrollablePreview.getY(); + int[] locInScreen = mScrollablePreview.getLocationOnScreen(); + destination.offset((int) startX - locInScreen[0], (int) startY - locInScreen[1]); + mScrollablePreview.setPivotX(0); + mScrollablePreview.setPivotY(0); + mScrollablePreview.setAlpha(1f); + float currentScale = mScrollablePreview.getWidth() / (float) longScreenshot.getWidth(); + Matrix matrix = new Matrix(); + matrix.setScale(currentScale, currentScale); + matrix.postTranslate( + longScreenshot.getLeft() * currentScale, + longScreenshot.getTop() * currentScale); + mScrollablePreview.setImageMatrix(matrix); + float destinationScale = destination.width() / (float) mScrollablePreview.getWidth(); + + ValueAnimator previewAnim = ValueAnimator.ofFloat(0, 1); + previewAnim.addUpdateListener(animation -> { + float t = animation.getAnimatedFraction(); + float currScale = MathUtils.lerp(1, destinationScale, t); + mScrollablePreview.setScaleX(currScale); + mScrollablePreview.setScaleY(currScale); + mScrollablePreview.setX(MathUtils.lerp(startX, destination.left, t)); + mScrollablePreview.setY(MathUtils.lerp(startY, destination.top, t)); + }); + ValueAnimator previewFadeAnim = ValueAnimator.ofFloat(1, 0); + previewFadeAnim.addUpdateListener(animation -> + mScrollablePreview.setAlpha(1 - animation.getAnimatedFraction())); + animSet.play(previewAnim).with(scrimAnim).before(previewFadeAnim); + previewAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + onTransitionEnd.run(); + } + }); + } else { + // if we switched orientations between the original screenshot and the long screenshot + // capture, just fade out the scrim instead of running the preview animation + animSet.play(scrimAnim); + animSet.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + onTransitionEnd.run(); + } + }); + } + animSet.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { super.onAnimationEnd(animation); - onTransitionEnd.run(); - mScrollablePreview.animate().alpha(0).setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - super.onAnimationEnd(animation); mCallbacks.onDismiss(); } - }); - } }); - anim.start(); + animSet.start(); } void prepareScrollingTransition(ScrollCaptureResponse response, Bitmap screenBitmap, - Bitmap newBitmap) { + Bitmap newBitmap, boolean screenshotTakenInPortrait) { + mShowScrollablePreview = (screenshotTakenInPortrait == mOrientationPortrait); + mScrollingScrim.setImageBitmap(newBitmap); mScrollingScrim.setVisibility(View.VISIBLE); - Rect scrollableArea = scrollableAreaOnScreen(response); - float scale = mCornerSizeX - / (mOrientationPortrait ? screenBitmap.getWidth() : screenBitmap.getHeight()); - ConstraintLayout.LayoutParams params = - (ConstraintLayout.LayoutParams) mScrollablePreview.getLayoutParams(); - - params.width = (int) (scale * scrollableArea.width()); - params.height = (int) (scale * scrollableArea.height()); - Matrix matrix = new Matrix(); - matrix.setScale(scale, scale); - matrix.postTranslate(-scrollableArea.left * scale, -scrollableArea.top * scale); - - mScrollablePreview.setTranslationX(scale * scrollableArea.left); - mScrollablePreview.setTranslationY(scale * scrollableArea.top); - mScrollablePreview.setImageMatrix(matrix); - - mScrollablePreview.setImageBitmap(screenBitmap); - mScrollablePreview.setVisibility(View.VISIBLE); + + if (mShowScrollablePreview) { + Rect scrollableArea = scrollableAreaOnScreen(response); + + float scale = mCornerSizeX + / (mOrientationPortrait ? screenBitmap.getWidth() : screenBitmap.getHeight()); + ConstraintLayout.LayoutParams params = + (ConstraintLayout.LayoutParams) mScrollablePreview.getLayoutParams(); + + params.width = (int) (scale * scrollableArea.width()); + params.height = (int) (scale * scrollableArea.height()); + Matrix matrix = new Matrix(); + matrix.setScale(scale, scale); + matrix.postTranslate(-scrollableArea.left * scale, -scrollableArea.top * scale); + + mScrollablePreview.setTranslationX(scale * scrollableArea.left); + mScrollablePreview.setTranslationY(scale * scrollableArea.top); + mScrollablePreview.setImageMatrix(matrix); + mScrollablePreview.setImageBitmap(screenBitmap); + mScrollablePreview.setVisibility(View.VISIBLE); + } mDismissButton.setVisibility(View.GONE); mActionsContainer.setVisibility(View.GONE); mBackgroundProtection.setVisibility(View.GONE); @@ -851,6 +881,23 @@ public class ScreenshotView extends FrameLayout implements anim.start(); } + void restoreNonScrollingUi() { + mScrollChip.setVisibility(View.GONE); + mScrollablePreview.setVisibility(View.GONE); + mScrollingScrim.setVisibility(View.GONE); + + if (mAccessibilityManager.isEnabled()) { + mDismissButton.setVisibility(View.VISIBLE); + } + mActionsContainer.setVisibility(View.VISIBLE); + mBackgroundProtection.setVisibility(View.VISIBLE); + mActionsContainerBackground.setVisibility(View.VISIBLE); + mScreenshotPreviewBorder.setVisibility(View.VISIBLE); + mScreenshotPreview.setVisibility(View.VISIBLE); + // reset the timeout + mCallbacks.onUserInteraction(); + } + boolean isDismissing() { return (mDismissAnimation != null && mDismissAnimation.isRunning()); } @@ -919,6 +966,8 @@ public class ScreenshotView extends FrameLayout implements mActionsContainer.setVisibility(View.GONE); mBackgroundProtection.setAlpha(0f); mDismissButton.setVisibility(View.GONE); + mScrollingScrim.setVisibility(View.GONE); + mScrollablePreview.setVisibility(View.GONE); mScreenshotStatic.setTranslationX(0); mScreenshotPreview.setTranslationY(0); mScreenshotPreview.setContentDescription( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java index 8e5d47f19acd..5a4245853a6f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java @@ -16,6 +16,9 @@ package com.android.systemui.statusbar; +import android.content.Context; +import android.util.FeatureFlagUtils; + import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.flags.FeatureFlagReader; @@ -30,10 +33,12 @@ import javax.inject.Inject; @SysUISingleton public class FeatureFlags { private final FeatureFlagReader mFlagReader; + private final Context mContext; @Inject - public FeatureFlags(FeatureFlagReader flagReader) { + public FeatureFlags(FeatureFlagReader flagReader, Context context) { mFlagReader = flagReader; + mContext = context; } public boolean isNewNotifPipelineEnabled() { @@ -92,4 +97,19 @@ public class FeatureFlags { public boolean isSmartSpaceSharedElementTransitionEnabled() { return mFlagReader.isEnabled(R.bool.flag_smartspace_shared_element_transition); } + + /** Whether or not to use the provider model behavior for the status bar icons */ + public boolean isCombinedStatusBarSignalIconsEnabled() { + return mFlagReader.isEnabled(R.bool.flag_combined_status_bar_signal_icons); + } + + /** System setting for provider model behavior */ + public boolean isProviderModelSettingEnabled() { + return FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); + } + + /** static method for the system setting */ + public static boolean isProviderModelSettingEnabled(Context context) { + return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 0bb702f6c9e4..5afdc38d739a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -66,7 +66,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.ViewClippingUtil; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.settingslib.Utils; import com.android.settingslib.fuelgauge.BatteryStatus; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; @@ -130,7 +129,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal private String mRestingIndication; private String mAlignmentIndication; private CharSequence mTransientIndication; - private boolean mTransientTextIsError; protected ColorStateList mInitialTextColorState; private boolean mVisible; private boolean mHideTransientMessageOnScreenOff; @@ -382,8 +380,7 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal private void updateTransient() { if (!TextUtils.isEmpty(mTransientIndication)) { - mRotateTextViewController.showTransient(mTransientIndication, - mTransientTextIsError); + mRotateTextViewController.showTransient(mTransientIndication); } else { mRotateTextViewController.hideTransient(); } @@ -421,7 +418,8 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal INDICATION_TYPE_ALIGNMENT, new KeyguardIndication.Builder() .setMessage(mAlignmentIndication) - .setTextColor(Utils.getColorError(mContext)) + .setTextColor(ColorStateList.valueOf( + mContext.getColor(R.color.misalignment_text_color))) .build(), true); } else { @@ -594,7 +592,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal boolean isError, boolean hideOnScreenOff) { mTransientIndication = transientIndication; mHideTransientMessageOnScreenOff = hideOnScreenOff && transientIndication != null; - mTransientTextIsError = isError; mHandler.removeMessages(MSG_HIDE_TRANSIENT); mHandler.removeMessages(MSG_SWIPE_UP_TO_UNLOCK); if (mDozing && !TextUtils.isEmpty(mTransientIndication)) { @@ -811,7 +808,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("KeyguardIndicationController:"); - pw.println(" mTransientTextIsError: " + mTransientTextIsError); pw.println(" mInitialTextColorState: " + mInitialTextColorState); pw.println(" mPowerPluggedInWired: " + mPowerPluggedInWired); pw.println(" mPowerPluggedIn: " + mPowerPluggedIn); @@ -885,6 +881,14 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal .isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)) { return; } + + if (biometricSourceType == BiometricSourceType.FACE + && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) { + // suggest trying fingerprint + showTransientIndication(R.string.keyguard_try_fingerprint); + return; + } + boolean showSwipeToUnlock = msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED; if (mStatusBarKeyguardViewManager.isBouncerShowing()) { @@ -908,11 +912,18 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal if (shouldSuppressBiometricError(msgId, biometricSourceType, mKeyguardUpdateMonitor)) { return; } + if (biometricSourceType == BiometricSourceType.FACE + && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) { + // suggest trying fingerprint + showTransientIndication(R.string.keyguard_try_fingerprint); + return; + } if (msgId == FaceManager.FACE_ERROR_TIMEOUT) { // The face timeout message is not very actionable, let's ask the user to // manually retry. if (!mStatusBarKeyguardViewManager.isBouncerShowing() - && mKeyguardUpdateMonitor.isUdfpsEnrolled()) { + && mKeyguardUpdateMonitor.isUdfpsEnrolled() + && mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) { // suggest trying fingerprint showTransientIndication(R.string.keyguard_try_fingerprint); } else { @@ -952,6 +963,15 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED); } + private boolean shouldSuppressFaceMsgAndShowTryFingerprintMsg() { + // For dual biometric, don't show face auth messages unless face auth was explicitly + // requested by the user. + return mKeyguardUpdateMonitor.isFingerprintDetectionRunning() + && !mKeyguardUpdateMonitor.isFaceAuthUserRequested() + && mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed( + true /* isStrongBiometric */); + } + private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) { // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt index 5d8bed57563b..538db6168408 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt @@ -14,6 +14,7 @@ import android.graphics.Shader import android.util.AttributeSet import android.view.View import com.android.systemui.animation.Interpolators +import java.util.function.Consumer /** * Provides methods to modify the various properties of a [LightRevealScrim] to reveal between 0% to @@ -148,6 +149,8 @@ class PowerButtonReveal( */ class LightRevealScrim(context: Context?, attrs: AttributeSet?) : View(context, attrs) { + lateinit var revealAmountListener: Consumer<Float> + /** * How much of the underlying views are revealed, in percent. 0 means they will be completely * obscured and 1 means they'll be fully visible. @@ -158,6 +161,7 @@ class LightRevealScrim(context: Context?, attrs: AttributeSet?) : View(context, field = value revealEffect.setRevealAmountOnScrim(value, this) + revealAmountListener.accept(value) invalidate() } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java index 0b67e7eeb132..4552138761c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java @@ -369,7 +369,7 @@ public class NotificationRemoteInputManager implements Dumpable { }); mSmartReplyController.setCallback((entry, reply) -> { StatusBarNotification newSbn = - rebuildNotificationWithRemoteInput(entry, reply, true /* showSpinner */, + rebuildNotificationWithRemoteInputInserted(entry, reply, true /* showSpinner */, null /* mimeType */, null /* uri */); mEntryManager.updateNotification(newSbn, null /* ranking */); }); @@ -638,12 +638,12 @@ public class NotificationRemoteInputManager implements Dumpable { @VisibleForTesting StatusBarNotification rebuildNotificationForCanceledSmartReplies( NotificationEntry entry) { - return rebuildNotificationWithRemoteInput(entry, null /* remoteInputTest */, + return rebuildNotificationWithRemoteInputInserted(entry, null /* remoteInputTest */, false /* showSpinner */, null /* mimeType */, null /* uri */); } @VisibleForTesting - StatusBarNotification rebuildNotificationWithRemoteInput(NotificationEntry entry, + StatusBarNotification rebuildNotificationWithRemoteInputInserted(NotificationEntry entry, CharSequence remoteInputText, boolean showSpinner, String mimeType, Uri uri) { StatusBarNotification sbn = entry.getSbn(); @@ -746,7 +746,7 @@ public class NotificationRemoteInputManager implements Dumpable { } String remoteInputMimeType = entry.remoteInputMimeType; Uri remoteInputUri = entry.remoteInputUri; - StatusBarNotification newSbn = rebuildNotificationWithRemoteInput(entry, + StatusBarNotification newSbn = rebuildNotificationWithRemoteInputInserted(entry, remoteInputText, false /* showSpinner */, remoteInputMimeType, remoteInputUri); entry.onRemoteInputInserted(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt index a2048e21199e..f6b16b065b6f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter import android.animation.ValueAnimator import android.app.WallpaperManager import android.os.SystemClock +import android.os.Trace import android.util.IndentingPrintWriter import android.util.Log import android.util.MathUtils @@ -198,6 +199,7 @@ class NotificationShadeDepthController @Inject constructor( blur = (blur * (1f - brightnessMirrorSpring.ratio)).toInt() val opaque = scrimsVisible && !blursDisabledForAppLaunch + Trace.traceCounter(Trace.TRACE_TAG_APP, "shade_blur_radius", blur) blurUtils.applyBlur(blurRoot?.viewRootImpl ?: root.viewRootImpl, blur, opaque) try { if (root.isAttachedToWindow && root.windowToken != null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java index 045a1976d502..f0d779ce1e0f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeWindowController.java @@ -182,6 +182,12 @@ public interface NotificationShadeWindowController extends RemoteInputController default void setFaceAuthDisplayBrightness(float brightness) {} /** + * How much {@link LightRevealScrim} obscures the UI. + * @param amount 0 when opaque, 1 when not transparent + */ + default void setLightRevealScrimAmount(float amount) {} + + /** * Custom listener to pipe data back to plugins about whether or not the status bar would be * collapsed if not for the plugin. * TODO: Find cleaner way to do this. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt index 9765ace7179f..b34bfad499f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt @@ -179,7 +179,10 @@ constructor( } override fun onTouchEvent(event: MotionEvent): Boolean { - if (!canHandleMotionEvent()) { + val finishExpanding = (event.action == MotionEvent.ACTION_CANCEL || + event.action == MotionEvent.ACTION_UP) && isExpanding + if (!canHandleMotionEvent() && !finishExpanding) { + // We allow cancellations/finishing to still go through here to clean up the state return false } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java index ab17ee0b7261..68dcdd9ff49f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java @@ -26,7 +26,6 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.FeatureFlagUtils; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -60,13 +59,21 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, private int mVisibleState = -1; private DualToneHandler mDualToneHandler; private boolean mForceHidden; + private boolean mProviderModel; - public static StatusBarMobileView fromContext(Context context, String slot) { + /** + * Designated constructor + */ + public static StatusBarMobileView fromContext( + Context context, + String slot, + boolean providerModel + ) { LayoutInflater inflater = LayoutInflater.from(context); StatusBarMobileView v = (StatusBarMobileView) inflater.inflate(R.layout.status_bar_mobile_signal_group, null); v.setSlot(slot); - v.init(); + v.init(providerModel); v.setVisibleState(STATE_ICON); return v; } @@ -99,12 +106,13 @@ public class StatusBarMobileView extends FrameLayout implements DarkReceiver, outRect.bottom += translationY; } - private void init() { + private void init(boolean providerModel) { + mProviderModel = providerModel; mDualToneHandler = new DualToneHandler(getContext()); mMobileGroup = findViewById(R.id.mobile_group); mMobile = findViewById(R.id.mobile_signal); mMobileType = findViewById(R.id.mobile_type); - if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + if (mProviderModel) { mMobileRoaming = findViewById(R.id.mobile_roaming_large); } else { mMobileRoaming = findViewById(R.id.mobile_roaming); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt index 3196eba7d33a..4a467ce3c987 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/charging/ChargingRippleView.kt @@ -39,9 +39,15 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context var rippleInProgress: Boolean = false var radius: Float = 0.0f - set(value) { rippleShader.radius = value } + set(value) { + rippleShader.radius = value + field = value + } var origin: PointF = PointF() - set(value) { rippleShader.origin = value } + set(value) { + rippleShader.origin = value + field = value + } var duration: Long = 1750 init { @@ -94,6 +100,11 @@ class ChargingRippleView(context: Context?, attrs: AttributeSet?) : View(context } override fun onDraw(canvas: Canvas?) { - canvas?.drawRect(0f, 0f, width.toFloat(), height.toFloat(), ripplePaint) + // To reduce overdraw, we mask the effect to a circle whose radius is big enough to cover + // the active effect area. Values here should be kept in sync with the + // animation implementation in the ripple shader. + val maskRadius = (1 - (1 - rippleShader.progress) * (1 - rippleShader.progress) * + (1 - rippleShader.progress)) * radius * 1.5f + canvas?.drawCircle(origin.x, origin.y, maskRadius, ripplePaint) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index 9f82152eb5ed..96b0e7819c7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -51,6 +51,7 @@ import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.SnoozeCriterion; import android.service.notification.StatusBarNotification; import android.util.ArraySet; +import android.view.ContentInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -126,8 +127,12 @@ public final class NotificationEntry extends ListEntry { public int targetSdk; private long lastFullScreenIntentLaunchTime = NOT_LAUNCHED_YET; public CharSequence remoteInputText; + // Mimetype and Uri used to display the image in the notification *after* it has been sent. public String remoteInputMimeType; public Uri remoteInputUri; + // ContentInfo used to keep the attachment permission alive until RemoteInput is sent or + // cancelled. + public ContentInfo remoteInputAttachment; private Notification.BubbleMetadata mBubbleMetadata; private ShortcutInfo mShortcutInfo; 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 5ccb06433418..ba2f555f7929 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 @@ -77,7 +77,6 @@ import com.android.settingslib.Utils; import com.android.systemui.Dumpable; import com.android.systemui.ExpandHelper; import com.android.systemui.R; -import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.Interpolators; import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; import com.android.systemui.statusbar.CommandQueue; @@ -201,6 +200,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable private int mPaddingBetweenElements; private int mMaxTopPadding; private int mTopPadding; + private boolean mAnimateNextTopPaddingChange; private int mBottomMargin; private int mBottomInset = 0; private float mQsExpansionFraction; @@ -1212,16 +1212,18 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) private void setTopPadding(int topPadding, boolean animate) { if (mTopPadding != topPadding) { + boolean shouldAnimate = animate || mAnimateNextTopPaddingChange; mTopPadding = topPadding; updateAlgorithmHeightAndPadding(); updateContentHeight(); - if (animate && mAnimationsEnabled && mIsExpanded) { + if (shouldAnimate && mAnimationsEnabled && mIsExpanded) { mTopPaddingNeedsAnimation = true; mNeedsAnimation = true; } updateStackPosition(); requestChildrenUpdate(); - notifyHeightChangeListener(null, animate); + notifyHeightChangeListener(null, shouldAnimate); + mAnimateNextTopPaddingChange = false; } } @@ -2071,6 +2073,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable int scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight); int imeInset = getImeInset(); scrollRange += Math.min(imeInset, Math.max(0, contentHeight - (getHeight() - imeInset))); + if (scrollRange > 0) { + scrollRange = Math.max(getScrollAmountToScrollBoundary(), scrollRange); + } return scrollRange; } @@ -5552,6 +5557,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable } /** + * Request an animation whenever the toppadding changes next + */ + public void animateNextTopPaddingChange() { + mAnimateNextTopPaddingChange = true; + } + + /** * A listener that is notified when the empty space below the notifications is clicked on */ @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) 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 e71f7dbb008b..09afedb6de59 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 @@ -1459,6 +1459,13 @@ public class NotificationStackScrollLayoutController { } /** + * Request an animation whenever the toppadding changes next + */ + public void animateNextTopPaddingChange() { + mView.animateNextTopPaddingChange(); + } + + /** * Enum for UiEvent logged from this class */ enum NotificationPanelEvent implements UiEventLogger.UiEventEnum { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index 8f4a71cf2563..add6fda4f8b9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -27,7 +27,6 @@ import android.view.ViewGroup; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.statusbar.NotificationShelf; -import com.android.systemui.statusbar.notification.dagger.SilentHeader; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableView; @@ -37,9 +36,9 @@ import java.util.ArrayList; import java.util.List; /** - * The Algorithm of the {@link com.android.systemui.statusbar.notification.stack - * .NotificationStackScrollLayout} which can be queried for {@link com.android.systemui.statusbar - * .stack.StackScrollState} + * The Algorithm of the + * {@link com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout} which can + * be queried for {@link StackScrollAlgorithmState} */ public class StackScrollAlgorithm { @@ -96,7 +95,7 @@ public class StackScrollAlgorithm { // First we reset the view states to their default values. resetChildViewStates(); - initAlgorithmState(mHostView, algorithmState, ambientState); + initAlgorithmState(algorithmState, ambientState); updatePositionsForState(algorithmState, ambientState); updateZValuesForState(algorithmState, ambientState); updateHeadsUpStates(algorithmState, ambientState); @@ -216,19 +215,18 @@ public class StackScrollAlgorithm { /** * Initialize the algorithm state like updating the visible children. */ - private void initAlgorithmState(ViewGroup hostView, StackScrollAlgorithmState state, - AmbientState ambientState) { + private void initAlgorithmState(StackScrollAlgorithmState state, AmbientState ambientState) { state.scrollY = ambientState.getScrollY(); state.mCurrentYPosition = -state.scrollY; state.mCurrentExpandedYPosition = -state.scrollY; //now init the visible children and update paddings - int childCount = hostView.getChildCount(); + int childCount = mHostView.getChildCount(); state.visibleChildren.clear(); state.visibleChildren.ensureCapacity(childCount); int notGoneIndex = 0; for (int i = 0; i < childCount; i++) { - ExpandableView v = (ExpandableView) hostView.getChildAt(i); + ExpandableView v = (ExpandableView) mHostView.getChildAt(i); if (v.getVisibility() != View.GONE) { if (v == ambientState.getShelf()) { continue; @@ -237,7 +235,7 @@ public class StackScrollAlgorithm { if (v instanceof ExpandableNotificationRow) { ExpandableNotificationRow row = (ExpandableNotificationRow) v; - // handle the notgoneIndex for the children as well + // handle the notGoneIndex for the children as well List<ExpandableNotificationRow> children = row.getAttachedChildren(); if (row.isSummaryWithChildren() && children != null) { for (ExpandableNotificationRow childRow : children) { @@ -407,28 +405,33 @@ public class StackScrollAlgorithm { final boolean noSpaceForFooter = footerEnd > ambientState.getStackEndHeight(); ((FooterView.FooterViewState) viewState).hideContent = shadeClosed || isShelfShowing || noSpaceForFooter; - - } else if (view != ambientState.getTrackedHeadsUpRow()) { - if (ambientState.isExpansionChanging()) { - // Show all views. Views below the shelf will later be clipped (essentially hidden) - // in NotificationShelf. - viewState.hidden = false; - viewState.inShelf = algorithmState.firstViewInShelf != null - && i >= algorithmState.visibleChildren.indexOf( - algorithmState.firstViewInShelf); - } else if (ambientState.getShelf() != null) { - // When pulsing (incoming notification on AOD), innerHeight is 0; clamp all - // to shelf start, thereby hiding all notifications (except the first one, which we - // later unhide in updatePulsingState) - final int shelfStart = ambientState.getInnerHeight() - - ambientState.getShelf().getIntrinsicHeight(); - viewState.yTranslation = Math.min(viewState.yTranslation, shelfStart); - if (viewState.yTranslation >= shelfStart) { - viewState.hidden = !view.isExpandAnimationRunning() - && !view.hasExpandingChild(); - viewState.inShelf = true; - // Notifications in the shelf cannot be visible HUNs. - viewState.headsUpIsVisible = false; + } else { + if (view != ambientState.getTrackedHeadsUpRow()) { + if (ambientState.isExpansionChanging()) { + // Show all views. Views below the shelf will later be clipped (essentially + // hidden) in NotificationShelf. + viewState.hidden = false; + viewState.inShelf = algorithmState.firstViewInShelf != null + && i >= algorithmState.visibleChildren.indexOf( + algorithmState.firstViewInShelf); + } else if (ambientState.getShelf() != null) { + // When pulsing (incoming notification on AOD), innerHeight is 0; clamp all + // to shelf start, thereby hiding all notifications (except the first one, which + // we later unhide in updatePulsingState) + final int stackBottom = + !ambientState.isShadeExpanded() || ambientState.isDozing() + ? ambientState.getInnerHeight() + : (int) ambientState.getStackHeight(); + final int shelfStart = + stackBottom - ambientState.getShelf().getIntrinsicHeight(); + viewState.yTranslation = Math.min(viewState.yTranslation, shelfStart); + if (viewState.yTranslation >= shelfStart) { + viewState.hidden = !view.isExpandAnimationRunning() + && !view.hasExpandingChild(); + viewState.inShelf = true; + // Notifications in the shelf cannot be visible HUNs. + viewState.headsUpIsVisible = false; + } } } @@ -484,7 +487,7 @@ public class StackScrollAlgorithm { View previousChild) { return sectionProvider.beginsSection(child, previousChild) && visibleIndex > 0 - && !(previousChild instanceof SilentHeader) + && !(previousChild instanceof SectionHeaderView) && !(child instanceof FooterView); } @@ -695,7 +698,7 @@ public class StackScrollAlgorithm { this.mIsExpanded = isExpanded; } - public class StackScrollAlgorithmState { + public static class StackScrollAlgorithmState { /** * The scroll position of the algorithm (absolute scrolling). diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index 69360b290118..1361acb1e156 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -42,6 +42,7 @@ import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.events.SystemStatusAnimationCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; @@ -93,6 +94,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private final SystemStatusAnimationScheduler mAnimationScheduler; private final StatusBarLocationPublisher mLocationPublisher; private NotificationIconAreaController mNotificationIconAreaController; + private final FeatureFlags mFeatureFlags; private List<String> mBlockedIcons = new ArrayList<>(); @@ -115,12 +117,14 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue OngoingCallController ongoingCallController, SystemStatusAnimationScheduler animationScheduler, StatusBarLocationPublisher locationPublisher, - NotificationIconAreaController notificationIconAreaController + NotificationIconAreaController notificationIconAreaController, + FeatureFlags featureFlags ) { mOngoingCallController = ongoingCallController; mAnimationScheduler = animationScheduler; mLocationPublisher = locationPublisher; mNotificationIconAreaController = notificationIconAreaController; + mFeatureFlags = featureFlags; } @Override @@ -150,7 +154,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mStatusBar.restoreHierarchyState( savedInstanceState.getSparseParcelableArray(EXTRA_PANEL_STATE)); } - mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons)); + mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons), mFeatureFlags); mDarkIconManager.setShouldLog(true); mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_volume)); mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_alarm_clock)); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java index 31965d4fc4cd..b4f8126042ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java @@ -31,6 +31,7 @@ import com.android.systemui.R; import com.android.systemui.demomode.DemoMode; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.StatusBarMobileView; import com.android.systemui.statusbar.StatusBarWifiView; @@ -48,16 +49,22 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da private final LinearLayout mStatusIcons; private final ArrayList<StatusBarMobileView> mMobileViews = new ArrayList<>(); private final int mIconSize; + private final FeatureFlags mFeatureFlags; private StatusBarWifiView mWifiView; private boolean mDemoMode; private int mColor; - public DemoStatusIcons(LinearLayout statusIcons, int iconSize) { + public DemoStatusIcons( + LinearLayout statusIcons, + int iconSize, + FeatureFlags featureFlags + ) { super(statusIcons.getContext()); mStatusIcons = statusIcons; mIconSize = iconSize; mColor = DarkIconDispatcher.DEFAULT_ICON_TINT; + mFeatureFlags = featureFlags; if (statusIcons instanceof StatusIconContainer) { setShouldRestrictIcons(((StatusIconContainer) statusIcons).isRestrictingIcons()); @@ -247,7 +254,8 @@ public class DemoStatusIcons extends StatusIconContainer implements DemoMode, Da public void addMobileView(MobileIconState state) { Log.d(TAG, "addMobileView: "); - StatusBarMobileView view = StatusBarMobileView.fromContext(mContext, state.slot); + StatusBarMobileView view = StatusBarMobileView.fromContext( + mContext, state.slot, mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()); view.applyMobileState(state); view.setStaticDrawableColor(mColor); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java index c4d1abc1b74c..68024726c5de 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java @@ -223,8 +223,15 @@ public class DozeParameters implements TunerService.Tunable, * then abruptly showing AOD. */ public boolean shouldControlUnlockedScreenOff() { - return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations() - && mUnlockedScreenOffAnimationController.shouldPlayUnlockedScreenOffAnimation(); + return mUnlockedScreenOffAnimationController.shouldPlayUnlockedScreenOffAnimation(); + } + + /** + * Whether we're capable of controlling the screen off animation if we want to. This isn't + * possible if AOD isn't even enabled or if the flag is disabled. + */ + public boolean canControlUnlockedScreenOff() { + return getAlwaysOn() && mFeatureFlags.useNewLockscreenAnimations(); } private boolean getBoolean(String propName, int resId) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 8e3aed43d1af..16f8319928bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -455,6 +455,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mWalletButton.setVisibility(GONE); mIndicationArea.setPadding(0, 0, 0, 0); } else { + Drawable tileIcon = mQuickAccessWalletController.getWalletClient().getTileIcon(); + if (tileIcon != null) { + mWalletButton.setImageDrawable(tileIcon); + } mWalletButton.setVisibility(VISIBLE); mWalletButton.setOnClickListener(this::onWalletClick); mIndicationArea.setPadding(mIndicationPadding, 0, mIndicationPadding, 0); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index b5e550a47022..d6ea4a828395 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -367,6 +367,10 @@ public class KeyguardBouncer { return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE; } + public boolean getShowingSoon() { + return mShowingSoon; + } + /** * @return {@code true} when bouncer's pre-hide animation already started but isn't completely * hidden yet, {@code false} otherwise. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java index fa5011e8802f..ad4213d212a0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java @@ -234,7 +234,9 @@ public class KeyguardClockPositionAlgorithm { private int getClockY(float panelExpansion, float darkAmount) { float clockYRegular = getExpandedPreferredClockY(); - float clockYBouncer = -mKeyguardStatusHeight; + + // Dividing the height creates a smoother transition when the user swipes up to unlock + float clockYBouncer = -mKeyguardStatusHeight / 3.0f; // Move clock up while collapsing the shade float shadeExpansion = Interpolators.FAST_OUT_LINEAR_IN.getInterpolation(panelExpansion); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java index 96276f46d23d..178974327a75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java @@ -38,7 +38,7 @@ import java.util.LinkedList; * A view to show hints on Keyguard ("Swipe up to unlock", "Tap again to open"). */ public class KeyguardIndicationTextView extends TextView { - private static final long MSG_DURATION_MILLIS = 1500; + private static final long MSG_MIN_DURATION_MILLIS_DEFAULT = 1500; private long mNextAnimationTime = 0; private boolean mAnimationsEnabled = true; private LinkedList<CharSequence> mMessages = new LinkedList<>(); @@ -104,8 +104,13 @@ public class KeyguardIndicationTextView extends TextView { long delay = Math.max(0, mNextAnimationTime - timeInMillis); setNextAnimationTime(timeInMillis + delay + getFadeOutDuration()); + final long minDurationMillis = + (indication != null && indication.getMinVisibilityMillis() != null) + ? indication.getMinVisibilityMillis() + : MSG_MIN_DURATION_MILLIS_DEFAULT; + if (!text.equals("") || hasIcon) { - setNextAnimationTime(mNextAnimationTime + MSG_DURATION_MILLIS); + setNextAnimationTime(mNextAnimationTime + minDurationMillis); animSetBuilder.before(getInAnimator()); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt index bfe0684b5411..ec2d0364a3a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt @@ -53,7 +53,7 @@ class KeyguardLiftController constructor( // Not listening anymore since trigger events unregister themselves isListening = false updateListeningState() - keyguardUpdateMonitor.requestFaceAuth() + keyguardUpdateMonitor.requestFaceAuth(true) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index eef24200a882..e272d2713e2a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -50,6 +50,7 @@ import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.events.SystemStatusAnimationCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager; @@ -105,6 +106,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements private int mLayoutState = LAYOUT_NONE; private SystemStatusAnimationScheduler mAnimationScheduler; + private FeatureFlags mFeatureFlags; /** * Draw this many pixels into the left/right side of the cutout to optimally use the space @@ -142,6 +144,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements loadBlockList(); mBatteryController = Dependency.get(BatteryController.class); mAnimationScheduler = Dependency.get(SystemStatusAnimationScheduler.class); + mFeatureFlags = Dependency.get(FeatureFlags.class); } @Override @@ -364,7 +367,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements userInfoController.addCallback(this); userInfoController.reloadUserInfo(); Dependency.get(ConfigurationController.class).addCallback(this); - mIconManager = new TintedIconManager(findViewById(R.id.statusIcons)); + mIconManager = new TintedIconManager(findViewById(R.id.statusIcons), mFeatureFlags); mIconManager.setBlockList(mBlockedIcons); Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager); mAnimationScheduler.addCallback(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 5d31786dd638..e36c38edaa88 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -121,6 +121,7 @@ import com.android.systemui.statusbar.KeyguardAffordanceView; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationLockscreenUserManager; +import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationShadeDepthController; import com.android.systemui.statusbar.NotificationShelfController; import com.android.systemui.statusbar.PulseExpansionHandler; @@ -314,6 +315,7 @@ public class NotificationPanelViewController extends PanelViewController { private final ScrimController mScrimController; private final PrivacyDotViewController mPrivacyDotViewController; private final QuickAccessWalletController mQuickAccessWalletController; + private final NotificationRemoteInputManager mRemoteInputManager; // Maximum # notifications to show on Keyguard; extras will be collapsed in an overflow card. // If there are exactly 1 + mMaxKeyguardNotifications, then still shows all notifications @@ -372,7 +374,6 @@ public class NotificationPanelViewController extends PanelViewController { private float mLastOverscroll; private boolean mQsExpansionEnabledPolicy = true; private boolean mQsExpansionEnabledAmbient = true; - private boolean mQsExpansionEnabled = mQsExpansionEnabledPolicy && mQsExpansionEnabledAmbient; private ValueAnimator mQsExpansionAnimator; private FlingAnimationUtils mFlingAnimationUtils; private int mStatusBarMinHeight; @@ -557,6 +558,11 @@ public class NotificationPanelViewController extends PanelViewController { private long mNotificationBoundsAnimationDelay; /** + * The duration of the notification bounds animation + */ + private long mNotificationBoundsAnimationDuration; + + /** * Is this a collapse that started on the panel where we should allow the panel to intercept */ private boolean mIsPanelCollapseOnQQS; @@ -584,6 +590,7 @@ public class NotificationPanelViewController extends PanelViewController { */ private ValueAnimator mQsClippingAnimation = null; private final Rect mKeyguardStatusAreaClipBounds = new Rect(); + private final Region mQsInterceptRegion = new Region(); /** * The alpha of the views which only show on the keyguard but not in shade / shade locked @@ -691,7 +698,8 @@ public class NotificationPanelViewController extends PanelViewController { QuickAccessWalletController quickAccessWalletController, @Main Executor uiExecutor, SecureSettings secureSettings, - UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) { + UnlockedScreenOffAnimationController unlockedScreenOffAnimationController, + NotificationRemoteInputManager remoteInputManager) { super(view, falsingManager, dozeLog, keyguardStateController, (SysuiStatusBarStateController) statusBarStateController, vibratorHelper, statusBarKeyguardViewManager, latencyTracker, flingAnimationUtilsBuilder.get(), @@ -784,6 +792,8 @@ public class NotificationPanelViewController extends PanelViewController { mAuthController = authController; mLockIconViewController = lockIconViewController; mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController; + mRemoteInputManager = remoteInputManager; + int currentMode = navigationModeController.addListener( mode -> mIsGestureNavigation = QuickStepContract.isGesturalMode(mode)); mIsGestureNavigation = QuickStepContract.isGesturalMode(currentMode); @@ -1324,8 +1334,7 @@ public class NotificationPanelViewController extends PanelViewController { : mNotificationShelfController.getIntrinsicHeight() + notificationPadding; float lockIconPadding = 0; - if (mLockIconViewController.getTop() != 0 - && (mUpdateMonitor.isUdfpsEnrolled() || mUpdateMonitor.isFaceEnrolled())) { + if (mLockIconViewController.getTop() != 0) { lockIconPadding = mStatusBar.getDisplayHeight() - mLockIconViewController.getTop(); } @@ -1455,9 +1464,8 @@ public class NotificationPanelViewController extends PanelViewController { } private void setQsExpansionEnabled() { - mQsExpansionEnabled = mQsExpansionEnabledPolicy && mQsExpansionEnabledAmbient; if (mQs == null) return; - mQs.setHeaderClickable(mQsExpansionEnabled); + mQs.setHeaderClickable(isQsExpansionEnabled()); } public void setQsExpansionEnabledPolicy(boolean qsExpansionEnabledPolicy) { @@ -1526,8 +1534,13 @@ public class NotificationPanelViewController extends PanelViewController { flingSettings(0 /* vel */, animateAway ? FLING_HIDE : FLING_COLLAPSE); } + private boolean isQsExpansionEnabled() { + return mQsExpansionEnabledPolicy && mQsExpansionEnabledAmbient + && !mRemoteInputManager.getController().isRemoteInputActive(); + } + public void expandWithQs() { - if (mQsExpansionEnabled) { + if (isQsExpansionEnabled()) { mQsExpandImmediate = true; mNotificationStackScrollLayoutController.setShouldShowShelfOnly(true); } @@ -1792,7 +1805,7 @@ public class NotificationPanelViewController extends PanelViewController { private boolean handleQsTouch(MotionEvent event) { final int action = event.getActionMasked(); if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f - && mBarState != KEYGUARD && !mQsExpanded && mQsExpansionEnabled) { + && mBarState != KEYGUARD && !mQsExpanded && isQsExpansionEnabled()) { // Down in the empty area while fully expanded - go to QS. mQsTracking = true; traceQsJank(true /* startTracing */, false /* wasCancelled */); @@ -1814,7 +1827,7 @@ public class NotificationPanelViewController extends PanelViewController { if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) { mConflictingQsExpansionGesture = false; } - if (action == MotionEvent.ACTION_DOWN && isFullyCollapsed() && mQsExpansionEnabled) { + if (action == MotionEvent.ACTION_DOWN && isFullyCollapsed() && isQsExpansionEnabled()) { mTwoFingerQsExpandPossible = true; } if (mTwoFingerQsExpandPossible && isOpenQsEvent(event) && event.getY(event.getActionIndex()) @@ -2038,7 +2051,7 @@ public class NotificationPanelViewController extends PanelViewController { // When expanding QS, let's authenticate the user if possible, // this will speed up notification actions. if (height == 0) { - mStatusBar.requestFaceAuth(); + mStatusBar.requestFaceAuth(false); } } @@ -2214,7 +2227,8 @@ public class NotificationPanelViewController extends PanelViewController { private void onStackYChanged(boolean shouldAnimate) { if (mQs != null) { if (shouldAnimate) { - mAnimateNextNotificationBounds = true; + animateNextNotificationBounds(StackStateAnimator.ANIMATION_DURATION_STANDARD, + 0 /* delay */); mNotificationBoundsAnimationDelay = 0; } setQSClippingBounds(); @@ -2293,8 +2307,7 @@ public class NotificationPanelViewController extends PanelViewController { final int startBottom = mKeyguardStatusAreaClipBounds.bottom; mQsClippingAnimation = ValueAnimator.ofFloat(0.0f, 1.0f); mQsClippingAnimation.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); - mQsClippingAnimation.setDuration( - StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE); + mQsClippingAnimation.setDuration(mNotificationBoundsAnimationDuration); mQsClippingAnimation.setStartDelay(mNotificationBoundsAnimationDelay); mQsClippingAnimation.addUpdateListener(animation -> { float fraction = animation.getAnimatedFraction(); @@ -2470,8 +2483,10 @@ public class NotificationPanelViewController extends PanelViewController { * shade. 0.0f means we're not transitioning yet. */ public void setTransitionToFullShadeAmount(float pxAmount, boolean animate, long delay) { - mAnimateNextNotificationBounds = animate && !mShouldUseSplitNotificationShade; - mNotificationBoundsAnimationDelay = delay; + if (animate && !mShouldUseSplitNotificationShade) { + animateNextNotificationBounds(StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE, + delay); + } float endPosition = 0; if (pxAmount > 0.0f) { @@ -2650,15 +2665,21 @@ public class NotificationPanelViewController extends PanelViewController { * @return Whether we should intercept a gesture to open Quick Settings. */ private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) { - if (!mQsExpansionEnabled || mCollapsedOnDown || (mKeyguardShowing + if (!isQsExpansionEnabled() || mCollapsedOnDown || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled())) { return false; } View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader(); - final boolean - onHeader = - x >= mQsFrame.getX() && x <= mQsFrame.getX() + mQsFrame.getWidth() - && y >= header.getTop() && y <= header.getBottom(); + + mQsInterceptRegion.set( + /* left= */ (int) mQsFrame.getX(), + /* top= */ header.getTop(), + /* right= */ (int) mQsFrame.getX() + mQsFrame.getWidth(), + /* bottom= */ header.getBottom()); + // Also allow QS to intercept if the touch is near the notch. + mStatusBarTouchableRegionManager.updateRegionForNotch(mQsInterceptRegion); + final boolean onHeader = mQsInterceptRegion.contains((int) x, (int) y); + if (mQsExpanded) { return onHeader || (yDiff < 0 && isInQsArea(x, y)); } else { @@ -2773,7 +2794,6 @@ public class NotificationPanelViewController extends PanelViewController { private int calculatePanelHeightShade() { int emptyBottomMargin = mNotificationStackScrollLayoutController.getEmptyBottomMargin(); int maxHeight = mNotificationStackScrollLayoutController.getHeight() - emptyBottomMargin; - maxHeight += mNotificationStackScrollLayoutController.getTopPaddingOverflow(); if (mBarState == KEYGUARD) { int minKeyguardPanelBottom = mClockPositionAlgorithm.getLockscreenStatusViewHeight() @@ -3176,7 +3196,7 @@ public class NotificationPanelViewController extends PanelViewController { case KEYGUARD: if (!mDozingOnDown) { if (mKeyguardBypassController.getBypassEnabled()) { - mUpdateMonitor.requestFaceAuth(); + mUpdateMonitor.requestFaceAuth(true); } else { mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_HINT, 0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */); @@ -3463,14 +3483,21 @@ public class NotificationPanelViewController extends PanelViewController { return !isFullWidth() || !mShowIconsWhenExpanded; } + public final QS.ScrollListener mScrollListener = scrollY -> { + if (scrollY > 0 && !mQsFullyExpanded) { + if (DEBUG) Log.d(TAG, "Scrolling while not expanded. Forcing expand"); + // If we are scrolling QS, we should be fully expanded. + expandWithQs(); + } + }; + private final FragmentListener mFragmentListener = new FragmentListener() { @Override public void onFragmentViewCreated(String tag, Fragment fragment) { mQs = (QS) fragment; mQs.setPanelView(mHeightListener); mQs.setExpandClickListener(mOnClickListener); - mQs.setHeaderClickable(mQsExpansionEnabled); - mQs.setTranslateWhileExpanding(mShouldUseSplitNotificationShade); + mQs.setHeaderClickable(isQsExpansionEnabled()); updateQSPulseExpansion(); mQs.setOverscrolling(mStackScrollerOverscrolling); mQs.setTranslateWhileExpanding(mShouldUseSplitNotificationShade); @@ -3484,8 +3511,16 @@ public class NotificationPanelViewController extends PanelViewController { mHeightListener.onQsHeightChanged(); } }); + mQs.setCollapsedMediaVisibilityChangedListener((visible) -> { + if (mQs.getHeader().isShown()) { + animateNextNotificationBounds(StackStateAnimator.ANIMATION_DURATION_STANDARD, + 0 /* delay */); + mNotificationStackScrollLayoutController.animateNextTopPaddingChange(); + } + }); mLockscreenShadeTransitionController.setQS(mQs); mNotificationStackScrollLayoutController.setQsContainer((ViewGroup) mQs.getView()); + mQs.setScrollListener(mScrollListener); updateQsExpansion(); } @@ -3500,6 +3535,12 @@ public class NotificationPanelViewController extends PanelViewController { } }; + private void animateNextNotificationBounds(long duration, long delay) { + mAnimateNextNotificationBounds = true; + mNotificationBoundsAnimationDuration = duration; + mNotificationBoundsAnimationDelay = delay; + } + @Override public void setTouchAndAnimationDisabled(boolean disabled) { super.setTouchAndAnimationDisabled(disabled); @@ -3821,8 +3862,13 @@ public class NotificationPanelViewController extends PanelViewController { expand(true /* animate */); } initDownStates(event); - if (!mIsExpanding && !shouldQuickSettingsIntercept(mDownX, mDownY, 0) - && mPulseExpansionHandler.onTouchEvent(event)) { + + // If pulse is expanding already, let's give it the touch. There are situations + // where the panel starts expanding even though we're also pulsing + boolean pulseShouldGetTouch = (!mIsExpanding + && !shouldQuickSettingsIntercept(mDownX, mDownY, 0)) + || mPulseExpansionHandler.isExpanding(); + if (pulseShouldGetTouch && mPulseExpansionHandler.onTouchEvent(event)) { // We're expanding all the other ones shouldn't get this anymore return true; } @@ -3943,7 +3989,7 @@ public class NotificationPanelViewController extends PanelViewController { if (mQsExpanded) { flingSettings(0 /* vel */, FLING_COLLAPSE, null /* onFinishRunnable */, true /* isClick */); - } else if (mQsExpansionEnabled) { + } else if (isQsExpansionEnabled()) { mLockscreenGestureLogger.write(MetricsEvent.ACTION_SHADE_QS_TAP, 0, 0); flingSettings(0 /* vel */, FLING_EXPAND, null /* onFinishRunnable */, true /* isClick */); @@ -3960,7 +4006,7 @@ public class NotificationPanelViewController extends PanelViewController { return; } cancelQsAnimation(); - if (!mQsExpansionEnabled) { + if (!isQsExpansionEnabled()) { amount = 0f; } float rounded = amount >= 1f ? amount : 0f; @@ -3988,8 +4034,9 @@ public class NotificationPanelViewController extends PanelViewController { setOverScrolling(false); } setQsExpansion(mQsExpansionHeight); - flingSettings(!mQsExpansionEnabled && open ? 0f : velocity, - open && mQsExpansionEnabled ? FLING_EXPAND : FLING_COLLAPSE, () -> { + boolean canExpand = isQsExpansionEnabled(); + flingSettings(!canExpand && open ? 0f : velocity, + open && canExpand ? FLING_EXPAND : FLING_COLLAPSE, () -> { setOverScrolling(false); updateQsState(); }, false /* isClick */); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java index 98fb6f32f0bc..15b2da02382c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java @@ -254,7 +254,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW private void applyKeyguardFlags(State state) { final boolean scrimsOccludingWallpaper = - state.mScrimsVisibility == ScrimController.OPAQUE; + state.mScrimsVisibility == ScrimController.OPAQUE || state.mLightRevealScrimOpaque; final boolean keyguardOrAod = state.mKeyguardShowing || (state.mDozing && mDozeParameters.getAlwaysOn()); if ((keyguardOrAod && !state.mBackdropShowing && !scrimsOccludingWallpaper) @@ -570,6 +570,16 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } @Override + public void setLightRevealScrimAmount(float amount) { + boolean lightRevealScrimOpaque = amount == 0; + if (mCurrentState.mLightRevealScrimOpaque == lightRevealScrimOpaque) { + return; + } + mCurrentState.mLightRevealScrimOpaque = lightRevealScrimOpaque; + apply(mCurrentState); + } + + @Override public void setWallpaperSupportsAmbientMode(boolean supportsAmbientMode) { mCurrentState.mWallpaperSupportsAmbientMode = supportsAmbientMode; apply(mCurrentState); @@ -734,6 +744,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW boolean mKeyguardGoingAway; boolean mQsExpanded; boolean mHeadsUpShowing; + boolean mLightRevealScrimOpaque; boolean mForceCollapsed; boolean mForceDozeBrightness; int mFaceAuthDisplayBrightness; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 53394c31940e..89711fa6b11e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1185,7 +1185,8 @@ public class StatusBar extends SystemUI implements DemoMode, mOngoingCallController, mAnimationScheduler, mStatusBarLocationPublisher, - mNotificationIconAreaController), + mNotificationIconAreaController, + mFeatureFlags), CollapsedStatusBarFragment.TAG) .commit(); @@ -1243,6 +1244,8 @@ public class StatusBar extends SystemUI implements DemoMode, mScrimController.attachViews(scrimBehind, notificationsScrim, scrimInFront, scrimForBubble); mLightRevealScrim = mNotificationShadeWindowView.findViewById(R.id.light_reveal_scrim); + mLightRevealScrim.setRevealAmountListener( + mNotificationShadeWindowController::setLightRevealScrimAmount); mUnlockedScreenOffAnimationController.initialize(this, mLightRevealScrim); updateLightRevealScrimVisibility(); @@ -1723,9 +1726,9 @@ public class StatusBar extends SystemUI implements DemoMode, /** * Asks {@link KeyguardUpdateMonitor} to run face auth. */ - public void requestFaceAuth() { + public void requestFaceAuth(boolean userInitiatedRequest) { if (!mKeyguardStateController.canDismissLockScreen()) { - mKeyguardUpdateMonitor.requestFaceAuth(); + mKeyguardUpdateMonitor.requestFaceAuth(userInitiatedRequest); } } @@ -3894,15 +3897,6 @@ public class StatusBar extends SystemUI implements DemoMode, updateQsExpansionEnabled(); mKeyguardViewMediator.setDozing(mDozing); - if ((isDozing && mWakefulnessLifecycle.getLastSleepReason() - == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) - || (!isDozing && mWakefulnessLifecycle.getLastWakeReason() - == PowerManager.WAKE_REASON_POWER_BUTTON)) { - mLightRevealScrim.setRevealEffect(mPowerButtonReveal); - } else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) { - mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE); - } - mNotificationsController.requestNotificationUpdate("onDozingChanged"); updateDozingState(); mDozeServiceHost.updateDozing(); @@ -3911,6 +3905,27 @@ public class StatusBar extends SystemUI implements DemoMode, Trace.endSection(); } + /** + * Updates the light reveal effect to reflect the reason we're waking or sleeping (for example, + * from the power button). + * @param wakingUp Whether we're updating because we're waking up (true) or going to sleep + * (false). + */ + private void updateRevealEffect(boolean wakingUp) { + if (mLightRevealScrim == null) { + return; + } + + if (wakingUp && mWakefulnessLifecycle.getLastWakeReason() + == PowerManager.WAKE_REASON_POWER_BUTTON + || !wakingUp && mWakefulnessLifecycle.getLastSleepReason() + == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) { + mLightRevealScrim.setRevealEffect(mPowerButtonReveal); + } else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) { + mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE); + } + } + public LightRevealScrim getLightRevealScrim() { return mLightRevealScrim; } @@ -4043,6 +4058,7 @@ public class StatusBar extends SystemUI implements DemoMode, public void onStartedGoingToSleep() { String tag = "StatusBar#onStartedGoingToSleep"; DejankUtils.startDetectingBlockingIpcs(tag); + updateRevealEffect(false /* wakingUp */); updateNotificationPanelTouchState(); notifyHeadsUpGoingToSleep(); dismissVolumeDialog(); @@ -4074,6 +4090,7 @@ public class StatusBar extends SystemUI implements DemoMode, // This is intentionally below the stopDozing call above, since it avoids that we're // unnecessarily animating the wakeUp transition. Animations should only be enabled // once we fully woke up. + updateRevealEffect(true /* wakingUp */); updateNotificationPanelTouchState(); mPulseExpansionHandler.onStartedWakingUp(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 93b83d3cbcbd..2c7553487067 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -38,6 +38,7 @@ import com.android.systemui.R; import com.android.systemui.demomode.DemoModeCommandReceiver; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.StatusBarMobileView; import com.android.systemui.statusbar.StatusBarWifiView; @@ -121,8 +122,8 @@ public interface StatusBarIconController { private final DarkIconDispatcher mDarkIconDispatcher; private int mIconHPadding; - public DarkIconManager(LinearLayout linearLayout) { - super(linearLayout); + public DarkIconManager(LinearLayout linearLayout, FeatureFlags featureFlags) { + super(linearLayout, featureFlags); mIconHPadding = mContext.getResources().getDimensionPixelSize( R.dimen.status_bar_icon_padding); mDarkIconDispatcher = Dependency.get(DarkIconDispatcher.class); @@ -182,8 +183,8 @@ public interface StatusBarIconController { class TintedIconManager extends IconManager { private int mColor; - public TintedIconManager(ViewGroup group) { - super(group); + public TintedIconManager(ViewGroup group, FeatureFlags featureFlags) { + super(group, featureFlags); } @Override @@ -218,6 +219,7 @@ public interface StatusBarIconController { * Turns info from StatusBarIconController into ImageViews in a ViewGroup. */ class IconManager implements DemoModeCommandReceiver { + private final FeatureFlags mFeatureFlags; protected final ViewGroup mGroup; protected final Context mContext; protected final int mIconSize; @@ -231,7 +233,8 @@ public interface StatusBarIconController { protected ArrayList<String> mBlockList = new ArrayList<>(); - public IconManager(ViewGroup group) { + public IconManager(ViewGroup group, FeatureFlags featureFlags) { + mFeatureFlags = featureFlags; mGroup = group; mContext = group.getContext(); mIconSize = mContext.getResources().getDimensionPixelSize( @@ -332,7 +335,8 @@ public interface StatusBarIconController { } private StatusBarMobileView onCreateStatusBarMobileView(String slot) { - StatusBarMobileView view = StatusBarMobileView.fromContext(mContext, slot); + StatusBarMobileView view = StatusBarMobileView.fromContext( + mContext, slot, mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()); return view; } @@ -452,7 +456,7 @@ public interface StatusBarIconController { } protected DemoStatusIcons createDemoStatusIcons() { - return new DemoStatusIcons((LinearLayout) mGroup, mIconSize); + return new DemoStatusIcons((LinearLayout) mGroup, mIconSize, mFeatureFlags); } } } 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 e8463992ed13..0b6884bcdfa4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -857,7 +857,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public boolean bouncerIsOrWillBeShowing() { - return mBouncer.isShowing() || mBouncer.inTransit(); + return mBouncer.isShowing() || mBouncer.getShowingSoon(); } public boolean isFullscreenBouncer() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java index 983b296e006b..95712cd303f5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java @@ -27,7 +27,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentSender; -import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; import android.view.View; @@ -35,6 +34,7 @@ import android.view.ViewParent; import com.android.systemui.ActivityIntentHelper; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.ActionClickLogger; @@ -50,6 +50,8 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.policy.KeyguardStateController; +import java.util.concurrent.Executor; + import javax.inject.Inject; /** @@ -65,6 +67,7 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, private final Context mContext; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final ShadeController mShadeController; + private Executor mExecutor; private final ActivityIntentHelper mActivityIntentHelper; private final GroupExpansionManager mGroupExpansionManager; private View mPendingWorkRemoteInputView; @@ -74,7 +77,6 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, private final ActionClickLogger mActionClickLogger; private int mDisabled2; protected BroadcastReceiver mChallengeReceiver = new ChallengeReceiver(); - private Handler mMainHandler = new Handler(); /** */ @@ -89,10 +91,12 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, ActivityStarter activityStarter, ShadeController shadeController, CommandQueue commandQueue, - ActionClickLogger clickLogger) { + ActionClickLogger clickLogger, + @Main Executor executor) { mContext = context; mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; mShadeController = shadeController; + mExecutor = executor; mContext.registerReceiverAsUser(mChallengeReceiver, UserHandle.ALL, new IntentFilter(ACTION_DEVICE_LOCKED_CHANGED), null, null); mLockscreenUserManager = notificationLockscreenUserManager; @@ -113,9 +117,10 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, boolean hasPendingRemoteInput = mPendingRemoteInputView != null; if (state == StatusBarState.SHADE && (mStatusBarStateController.leaveOpenOnKeyguardHide() || hasPendingRemoteInput)) { - if (!mStatusBarStateController.isKeyguardRequested()) { + if (!mStatusBarStateController.isKeyguardRequested() + && mKeyguardStateController.isUnlocked()) { if (hasPendingRemoteInput) { - mMainHandler.post(mPendingRemoteInputView::callOnClick); + mExecutor.execute(mPendingRemoteInputView::callOnClick); } mPendingRemoteInputView = null; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java index d3953df8c8c0..fe52281652a9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarSignalPolicy.java @@ -25,6 +25,7 @@ import android.util.Log; import com.android.settingslib.mobile.TelephonyIcons; import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; @@ -63,6 +64,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba private final Handler mHandler = Handler.getMain(); private final CarrierConfigTracker mCarrierConfigTracker; private final TunerService mTunerService; + private final FeatureFlags mFeatureFlags; private boolean mHideAirplane; private boolean mHideMobile; @@ -82,9 +84,15 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba private WifiIconState mWifiIconState = new WifiIconState(); @Inject - public StatusBarSignalPolicy(Context context, StatusBarIconController iconController, - CarrierConfigTracker carrierConfigTracker, NetworkController networkController, - SecurityController securityController, TunerService tunerService) { + public StatusBarSignalPolicy( + Context context, + StatusBarIconController iconController, + CarrierConfigTracker carrierConfigTracker, + NetworkController networkController, + SecurityController securityController, + TunerService tunerService, + FeatureFlags featureFlags + ) { mContext = context; mIconController = iconController; @@ -92,6 +100,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba mNetworkController = networkController; mSecurityController = securityController; mTunerService = tunerService; + mFeatureFlags = featureFlags; mSlotAirplane = mContext.getString(com.android.internal.R.string.status_bar_airplane); mSlotMobile = mContext.getString(com.android.internal.R.string.status_bar_mobile); @@ -365,6 +374,9 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba @Override public void setConnectivityStatus(boolean noDefaultNetwork, boolean noValidatedNetwork, boolean noNetworksAvailable) { + if (!mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()) { + return; + } if (DEBUG) { Log.d(TAG, "setConnectivityStatus: " + "noDefaultNetwork = " + noDefaultNetwork + "," diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java index b859250a2442..d3d90639546a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java @@ -223,7 +223,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { } } - private void updateRegionForNotch(Region touchableRegion) { + void updateRegionForNotch(Region touchableRegion) { WindowInsets windowInsets = mNotificationShadeWindowView.getRootWindowInsets(); if (windowInsets == null) { Log.w(TAG, "StatusBarWindowView is not attached."); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt index 9a04d39c4e9e..4167287a504e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt @@ -45,7 +45,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( private val wakefulnessLifecycle: WakefulnessLifecycle, private val statusBarStateControllerImpl: StatusBarStateControllerImpl, private val keyguardViewMediatorLazy: dagger.Lazy<KeyguardViewMediator>, - private val keyguardStateController: KeyguardStateController + private val keyguardStateController: KeyguardStateController, + private val dozeParameters: dagger.Lazy<DozeParameters> ) : WakefulnessLifecycle.Observer { private val handler = Handler() @@ -55,9 +56,16 @@ class UnlockedScreenOffAnimationController @Inject constructor( private var lightRevealAnimationPlaying = false private var aodUiAnimationPlaying = false + /** + * The result of our decision whether to play the screen off animation in + * [onStartedGoingToSleep], or null if we haven't made that decision yet or aren't going to + * sleep. + */ + private var decidedToAnimateGoingToSleep: Boolean? = null + private val lightRevealAnimator = ValueAnimator.ofFloat(1f, 0f).apply { duration = LIGHT_REVEAL_ANIMATION_DURATION - interpolator = Interpolators.FAST_OUT_SLOW_IN_REVERSE + interpolator = Interpolators.LINEAR addUpdateListener { lightRevealScrim.revealAmount = it.animatedValue as Float } addListener(object : AnimatorListenerAdapter() { override fun onAnimationCancel(animation: Animator?) { @@ -119,11 +127,17 @@ class UnlockedScreenOffAnimationController @Inject constructor( // Run the callback given to us by the KeyguardVisibilityHelper. after.run() + + // Done going to sleep, reset this flag. + decidedToAnimateGoingToSleep = null } .start() } override fun onStartedWakingUp() { + // Waking up, so reset this flag. + decidedToAnimateGoingToSleep = null + lightRevealAnimator.cancel() handler.removeCallbacksAndMessages(null) } @@ -146,7 +160,9 @@ class UnlockedScreenOffAnimationController @Inject constructor( } override fun onStartedGoingToSleep() { - if (shouldPlayUnlockedScreenOffAnimation()) { + if (dozeParameters.get().shouldControlUnlockedScreenOff()) { + decidedToAnimateGoingToSleep = true + lightRevealAnimationPlaying = true lightRevealAnimator.start() @@ -156,6 +172,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( // Show AOD. That'll cause the KeyguardVisibilityHelper to call #animateInKeyguard. statusBar.notificationPanelViewController.showAodUi() }, ANIMATE_IN_KEYGUARD_DELAY) + } else { + decidedToAnimateGoingToSleep = false } } @@ -164,6 +182,16 @@ class UnlockedScreenOffAnimationController @Inject constructor( * on the current state of the device. */ fun shouldPlayUnlockedScreenOffAnimation(): Boolean { + // If we explicitly already decided not to play the screen off animation, then never change + // our mind. + if (decidedToAnimateGoingToSleep == false) { + return false + } + + if (!dozeParameters.get().canControlUnlockedScreenOff()) { + return false + } + // We only play the unlocked screen off animation if we are... unlocked. if (statusBarStateControllerImpl.state != StatusBarState.SHADE) { return false @@ -173,7 +201,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( // already expanded and showing notifications/QS, the animation looks really messy. For now, // disable it if the notification panel is expanded. if (!this::statusBar.isInitialized || - statusBar.notificationPanelViewController.isFullyExpanded) { + statusBar.notificationPanelViewController.isFullyExpanded || + statusBar.notificationPanelViewController.isExpanding) { return false } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt index d5965ec8fbfc..c20730e1b4a4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt @@ -25,6 +25,7 @@ import android.content.Intent import android.util.Log import android.view.View import android.widget.Chronometer +import androidx.annotation.VisibleForTesting import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.R import com.android.systemui.animation.ActivityLaunchAnimator @@ -122,6 +123,7 @@ class OngoingCallController @Inject constructor( * Should only be called from [CollapsedStatusBarFragment]. */ fun setChipView(chipView: View) { + tearDownChipView() this.chipView = chipView if (hasOngoingCall()) { updateChip() @@ -165,8 +167,7 @@ class OngoingCallController @Inject constructor( val currentCallNotificationInfo = callNotificationInfo ?: return val currentChipView = chipView - val timeView = - currentChipView?.findViewById<Chronometer>(R.id.ongoing_call_chip_time) + val timeView = currentChipView?.getTimeView() val backgroundView = currentChipView?.findViewById<View>(R.id.ongoing_call_chip_background) @@ -248,12 +249,19 @@ class OngoingCallController @Inject constructor( private fun removeChip() { callNotificationInfo = null + tearDownChipView() mListeners.forEach { l -> l.onOngoingCallStateChanged(animate = true) } if (uidObserver != null) { iActivityManager.unregisterUidObserver(uidObserver) } } + /** Tear down anything related to the chip view to prevent leaks. */ + @VisibleForTesting + fun tearDownChipView() = chipView?.getTimeView()?.stop() + + private fun View.getTimeView(): Chronometer? = this.findViewById(R.id.ongoing_call_chip_time) + private data class CallNotificationInfo( val key: String, val callStartTime: Long, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java index 724a851107d5..081fe5a47626 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java @@ -33,6 +33,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.systemui.Dependency; +import com.android.systemui.EventLogTags; import com.android.systemui.R; import com.android.systemui.statusbar.AlertingNotificationManager; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -175,6 +176,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { NotificationEntry entry = alertEntry.mEntry; entry.setHeadsUp(true); setEntryPinned((HeadsUpEntry) alertEntry, shouldHeadsUpBecomePinned(entry)); + EventLogTags.writeSysuiHeadsUpStatus(entry.getKey(), 1 /* visible */); for (OnHeadsUpChangedListener listener : mListeners) { listener.onHeadsUpStateChanged(entry, true); } @@ -185,6 +187,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { NotificationEntry entry = alertEntry.mEntry; entry.setHeadsUp(false); setEntryPinned((HeadsUpEntry) alertEntry, false /* isPinned */); + EventLogTags.writeSysuiHeadsUpStatus(entry.getKey(), 0 /* visible */); for (OnHeadsUpChangedListener listener : mListeners) { listener.onHeadsUpStateChanged(entry, false); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 2ac5c1eeae8e..43781f3941ba 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -42,7 +42,6 @@ import android.telephony.ims.ImsRegistrationAttributes; import android.telephony.ims.RegistrationManager.RegistrationCallback; import android.text.Html; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -58,6 +57,7 @@ import com.android.settingslib.mobile.MobileStatusTracker.SubscriptionDefaults; import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.net.SignalStrengthUtil; import com.android.systemui.R; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; @@ -85,7 +85,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile private final String mNetworkNameDefault; private final String mNetworkNameSeparator; private final ContentObserver mObserver; - private final boolean mProviderModel; + private final boolean mProviderModelBehavior; + private final boolean mProviderModelSetting; private final Handler mReceiverHandler; private int mImsType = IMS_TYPE_WWAN; // Save entire info for logging, we only use the id. @@ -122,11 +123,19 @@ public class MobileSignalController extends SignalController<MobileState, Mobile // TODO: Reduce number of vars passed in, if we have the NetworkController, probably don't // need listener lists anymore. - public MobileSignalController(Context context, Config config, boolean hasMobileData, - TelephonyManager phone, CallbackHandler callbackHandler, - NetworkControllerImpl networkController, SubscriptionInfo info, - SubscriptionDefaults defaults, Looper receiverLooper, - CarrierConfigTracker carrierConfigTracker) { + public MobileSignalController( + Context context, + Config config, + boolean hasMobileData, + TelephonyManager phone, + CallbackHandler callbackHandler, + NetworkControllerImpl networkController, + SubscriptionInfo info, + SubscriptionDefaults defaults, + Looper receiverLooper, + CarrierConfigTracker carrierConfigTracker, + FeatureFlags featureFlags + ) { super("MobileSignalController(" + info.getSubscriptionId() + ")", context, NetworkCapabilities.TRANSPORT_CELLULAR, callbackHandler, networkController); @@ -233,8 +242,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile mImsMmTelManager = ImsMmTelManager.createForSubscriptionId(info.getSubscriptionId()); mMobileStatusTracker = new MobileStatusTracker(mPhone, receiverLooper, info, mDefaults, mCallback); - mProviderModel = FeatureFlagUtils.isEnabled( - mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); + mProviderModelBehavior = featureFlags.isCombinedStatusBarSignalIconsEnabled(); + mProviderModelSetting = featureFlags.isProviderModelSettingEnabled(); } public void setConfiguration(Config config) { @@ -279,7 +288,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile mContext.getContentResolver().registerContentObserver(Global.getUriFor( Global.MOBILE_DATA + mSubscriptionInfo.getSubscriptionId()), true, mObserver); - if (mProviderModel) { + if (mProviderModelBehavior) { mReceiverHandler.post(mTryRegisterIms); } } @@ -380,7 +389,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile || (mCurrentState.iconGroup == TelephonyIcons.NOT_DEFAULT_DATA)) && mCurrentState.userSetup; - if (mProviderModel) { + if (mProviderModelBehavior) { // Show icon in QS when we are connected or data is disabled. boolean showDataIcon = mCurrentState.dataConnected || dataDisabled; @@ -423,13 +432,26 @@ public class MobileSignalController extends SignalController<MobileState, Mobile IconState qsIcon = null; CharSequence description = null; // Only send data sim callbacks to QS. - if (mCurrentState.dataSim) { - qsTypeIcon = - (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; - qsIcon = new IconState(mCurrentState.enabled - && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription); - description = mCurrentState.isEmergency ? null : mCurrentState.networkName; + if (mProviderModelSetting) { + if (mCurrentState.dataSim && mCurrentState.isDefault) { + qsTypeIcon = + (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; + qsIcon = new IconState( + mCurrentState.enabled && !mCurrentState.isEmergency, + getQsCurrentIconId(), contentDescription); + description = mCurrentState.isEmergency ? null : mCurrentState.networkName; + } + } else { + if (mCurrentState.dataSim) { + qsTypeIcon = + (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0; + qsIcon = new IconState( + mCurrentState.enabled && !mCurrentState.isEmergency, + getQsCurrentIconId(), contentDescription); + description = mCurrentState.isEmergency ? null : mCurrentState.networkName; + } } + boolean activityIn = mCurrentState.dataConnected && !mCurrentState.carrierNetworkChangeMode && mCurrentState.activityIn; @@ -585,7 +607,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile // 1. The first valid voice state has been received // 2. The voice state has been changed and either the last or current state is // ServiceState.STATE_IN_SERVICE - if (mProviderModel + if (mProviderModelBehavior && lastVoiceState != currentVoiceState && (lastVoiceState == -1 || (lastVoiceState == ServiceState.STATE_IN_SERVICE @@ -659,7 +681,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile } void notifyWifiLevelChange(int level) { - if (!mProviderModel) { + if (!mProviderModelBehavior) { return; } mLastWlanLevel = level; @@ -674,7 +696,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile } void notifyDefaultMobileLevelChange(int level) { - if (!mProviderModel) { + if (!mProviderModelBehavior) { return; } mLastWlanCrossSimLevel = level; @@ -689,7 +711,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile } void notifyMobileLevelChangeIfNecessary(SignalStrength signalStrength) { - if (!mProviderModel) { + if (!mProviderModelBehavior) { return; } int newLevel = getSignalLevel(signalStrength); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 24604849a776..d9a5269439e6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -50,7 +50,6 @@ import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import android.util.Log; import android.util.MathUtils; import android.util.SparseArray; @@ -72,6 +71,7 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoModeController; import com.android.systemui.settings.CurrentUserTracker; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; import com.android.systemui.telephony.TelephonyListenerManager; import com.android.systemui.util.CarrierConfigTracker; @@ -121,9 +121,11 @@ public class NetworkControllerImpl extends BroadcastReceiver private final BroadcastDispatcher mBroadcastDispatcher; private final DemoModeController mDemoModeController; private final Object mLock = new Object(); - private final boolean mProviderModel; + private final boolean mProviderModelBehavior; + private final boolean mProviderModelSetting; private Config mConfig; private final CarrierConfigTracker mCarrierConfigTracker; + private final FeatureFlags mFeatureFlags; private TelephonyCallback.ActiveDataSubscriptionIdListener mPhoneStateListener; private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID; @@ -215,7 +217,8 @@ public class NetworkControllerImpl extends BroadcastReceiver NetworkScoreManager networkScoreManager, AccessPointControllerImpl accessPointController, DemoModeController demoModeController, - CarrierConfigTracker carrierConfigTracker) { + CarrierConfigTracker carrierConfigTracker, + FeatureFlags featureFlags) { this(context, connectivityManager, telephonyManager, telephonyListenerManager, @@ -232,7 +235,8 @@ public class NetworkControllerImpl extends BroadcastReceiver deviceProvisionedController, broadcastDispatcher, demoModeController, - carrierConfigTracker); + carrierConfigTracker, + featureFlags); mReceiverHandler.post(mRegisterListeners); } @@ -251,7 +255,9 @@ public class NetworkControllerImpl extends BroadcastReceiver DeviceProvisionedController deviceProvisionedController, BroadcastDispatcher broadcastDispatcher, DemoModeController demoModeController, - CarrierConfigTracker carrierConfigTracker) { + CarrierConfigTracker carrierConfigTracker, + FeatureFlags featureFlags + ) { mContext = context; mTelephonyListenerManager = telephonyListenerManager; mConfig = config; @@ -268,6 +274,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mHasMobileDataFeature = telephonyManager.isDataCapable(); mDemoModeController = demoModeController; mCarrierConfigTracker = carrierConfigTracker; + mFeatureFlags = featureFlags; // telephony mPhone = telephonyManager; @@ -288,7 +295,8 @@ public class NetworkControllerImpl extends BroadcastReceiver } }); mWifiSignalController = new WifiSignalController(mContext, mHasMobileDataFeature, - mCallbackHandler, this, mWifiManager, mConnectivityManager, networkScoreManager); + mCallbackHandler, this, mWifiManager, mConnectivityManager, networkScoreManager, + mFeatureFlags); mEthernetSignalController = new EthernetSignalController(mContext, mCallbackHandler, this); @@ -415,8 +423,8 @@ public class NetworkControllerImpl extends BroadcastReceiver }; mDemoModeController.addCallback(this); - mProviderModel = FeatureFlagUtils.isEnabled( - mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); + mProviderModelBehavior = mFeatureFlags.isCombinedStatusBarSignalIconsEnabled(); + mProviderModelSetting = mFeatureFlags.isProviderModelSettingEnabled(); } private final Runnable mClearForceValidated = () -> { @@ -687,7 +695,7 @@ public class NetworkControllerImpl extends BroadcastReceiver cb.setIsAirplaneMode(new IconState(mAirplaneMode, TelephonyIcons.FLIGHT_MODE_ICON, R.string.accessibility_airplane_mode, mContext)); cb.setNoSims(mHasNoSubs, mSimDetected); - if (mProviderModel) { + if (mProviderModelBehavior) { cb.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition, mNoNetworksAvailable); } mWifiSignalController.notifyListeners(cb); @@ -695,7 +703,7 @@ public class NetworkControllerImpl extends BroadcastReceiver for (int i = 0; i < mMobileSignalControllers.size(); i++) { MobileSignalController mobileSignalController = mMobileSignalControllers.valueAt(i); mobileSignalController.notifyListeners(cb); - if (mProviderModel) { + if (mProviderModelBehavior) { mobileSignalController.refreshCallIndicator(cb); } } @@ -796,7 +804,7 @@ public class NetworkControllerImpl extends BroadcastReceiver for (int i = 0; i < mMobileSignalControllers.size(); i++) { MobileSignalController controller = mMobileSignalControllers.valueAt(i); controller.setConfiguration(mConfig); - if (mProviderModel) { + if (mProviderModelBehavior) { controller.refreshCallIndicator(mCallbackHandler); } } @@ -912,7 +920,8 @@ public class NetworkControllerImpl extends BroadcastReceiver MobileSignalController controller = new MobileSignalController(mContext, mConfig, mHasMobileDataFeature, mPhone.createForSubscriptionId(subId), mCallbackHandler, this, subscriptions.get(i), - mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker); + mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker, + mFeatureFlags); controller.setUserSetupComplete(mUserSetup); mMobileSignalControllers.put(subId, controller); if (subscriptions.get(i).getSimSlotIndex() == 0) { @@ -1058,10 +1067,10 @@ public class NetworkControllerImpl extends BroadcastReceiver || mValidatedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET); pushConnectivityToSignals(); - if (mProviderModel) { + if (mProviderModelBehavior) { mNoDefaultNetwork = !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_CELLULAR) - && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_WIFI) - && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET); + && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_WIFI) + && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET); mCallbackHandler.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition, mNoNetworksAvailable); for (int i = 0; i < mMobileSignalControllers.size(); i++) { @@ -1069,6 +1078,13 @@ public class NetworkControllerImpl extends BroadcastReceiver mobileSignalController.updateNoCallingState(); } notifyAllListeners(); + } else if (mProviderModelSetting) { + // TODO(b/191903788): Replace the flag name once the new flag is added. + mNoDefaultNetwork = !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_CELLULAR) + && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_WIFI) + && !mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET); + mCallbackHandler.setConnectivityStatus(mNoDefaultNetwork, !mInetCondition, + mNoNetworksAvailable); } } @@ -1376,7 +1392,8 @@ public class NetworkControllerImpl extends BroadcastReceiver MobileSignalController controller = new MobileSignalController(mContext, mConfig, mHasMobileDataFeature, mPhone.createForSubscriptionId(info.getSubscriptionId()), mCallbackHandler, this, - info, mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker); + info, mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker, + mFeatureFlags); mMobileSignalControllers.put(id, controller); controller.getState().userSetup = true; return info; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index e6c4e82cec7b..b18dfd2866c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -20,7 +20,6 @@ import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.annotation.Nullable; import android.app.ActivityManager; import android.app.Notification; import android.app.PendingIntent; @@ -38,7 +37,6 @@ import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; import android.net.Uri; import android.os.Bundle; -import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; import android.text.Editable; @@ -72,13 +70,13 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.internal.graphics.ColorUtils; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.statusbar.IStatusBarService; import com.android.internal.util.ContrastColorUtil; import com.android.systemui.Dependency; import com.android.systemui.R; @@ -111,8 +109,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private final SendButtonTextWatcher mTextWatcher; private final TextView.OnEditorActionListener mEditorActionHandler; - private final NotificationRemoteInputManager mRemoteInputManager; private final UiEventLogger mUiEventLogger; + private final RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler; private final List<OnFocusChangeListener> mEditTextFocusChangeListeners = new ArrayList<>(); private final List<OnSendRemoteInputListener> mOnSendListeners = new ArrayList<>(); private RemoteEditText mEditText; @@ -123,9 +121,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private RemoteInput[] mRemoteInputs; private RemoteInput mRemoteInput; private RemoteInputController mController; - private RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler; - - private IStatusBarService mStatusBarManagerService; private NotificationEntry mEntry; @@ -134,7 +129,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private int mRevealCx; private int mRevealCy; private int mRevealR; - private ContentInfo mAttachment; private boolean mColorized; private int mTint; @@ -143,7 +137,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private NotificationViewWrapper mWrapper; private Consumer<Boolean> mOnVisibilityChangedListener; private NotificationRemoteInputManager.BouncerChecker mBouncerChecker; - private LinearLayout mContentView; private ImageView mDelete; private ImageView mDeleteBg; @@ -174,10 +167,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mTextWatcher = new SendButtonTextWatcher(); mEditorActionHandler = new EditorActionHandler(); mRemoteInputQuickSettingsDisabler = Dependency.get(RemoteInputQuickSettingsDisabler.class); - mRemoteInputManager = Dependency.get(NotificationRemoteInputManager.class); mUiEventLogger = Dependency.get(UiEventLogger.class); - mStatusBarManagerService = IStatusBarService.Stub.asInterface( - ServiceManager.getService(Context.STATUS_BAR_SERVICE)); TypedArray ta = getContext().getTheme().obtainStyledAttributes(new int[]{ com.android.internal.R.attr.colorAccent, com.android.internal.R.attr.colorSurface, @@ -266,8 +256,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mDeleteBg.setImageTintBlendMode(BlendMode.SRC_IN); mDelete.setImageTintBlendMode(BlendMode.SRC_IN); mDelete.setOnClickListener(v -> setAttachment(null)); - mContentView = findViewById(R.id.remote_input_content); - mContentView.setBackground(mContentBackground); + LinearLayout contentView = findViewById(R.id.remote_input_content); + contentView.setBackground(mContentBackground); mEditText = findViewById(R.id.remote_input_text); mEditText.setInnerFocusable(false); mEditText.setWindowInsetsAnimationCallback( @@ -293,15 +283,19 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene } private void setAttachment(ContentInfo item) { - if (mAttachment != null) { + if (mEntry.remoteInputAttachment != null && mEntry.remoteInputAttachment != item) { // We need to release permissions when sending the attachment to the target // app or if it is deleted by the user. When sending to the target app, we // can safely release permissions as soon as the call to // `mController.grantInlineReplyUriPermission` is made (ie, after the grant // to the target app has been created). - mAttachment.releasePermissions(); + mEntry.remoteInputAttachment.releasePermissions(); + } + mEntry.remoteInputAttachment = item; + if (item != null) { + mEntry.remoteInputUri = item.getClip().getItemAt(0).getUri(); + mEntry.remoteInputMimeType = item.getClip().getDescription().getMimeType(0); } - mAttachment = item; View attachment = findViewById(R.id.remote_input_content_container); ImageView iconView = findViewById(R.id.remote_input_attachment_image); iconView.setImageDrawable(null); @@ -323,10 +317,9 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene * @return returns intent with granted URI permissions that should be used immediately */ private Intent prepareRemoteInput() { - if (mAttachment == null) return prepareRemoteInputFromText(); - return prepareRemoteInputFromData( - mAttachment.getClip().getDescription().getMimeType(0), - mAttachment.getClip().getItemAt(0).getUri()); + return mEntry.remoteInputAttachment == null + ? prepareRemoteInputFromText() + : prepareRemoteInputFromData(mEntry.remoteInputMimeType, mEntry.remoteInputUri); } private Intent prepareRemoteInputFromText() { @@ -337,7 +330,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene results); mEntry.remoteInputText = mEditText.getText().toString(); - // TODO(b/188646667): store attachment to entry + setAttachment(null); mEntry.remoteInputUri = null; mEntry.remoteInputMimeType = null; @@ -363,7 +356,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene RemoteInput.addResultsToIntent(mRemoteInputs, fillInIntent, bundle); - CharSequence attachmentText = mAttachment.getClip().getDescription().getLabel(); + CharSequence attachmentText = + mEntry.remoteInputAttachment.getClip().getDescription().getLabel(); CharSequence attachmentLabel = TextUtils.isEmpty(attachmentText) ? mContext.getString(R.string.remote_input_image_insertion_text) @@ -374,14 +368,11 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene : "\"" + attachmentLabel + "\" " + mEditText.getText(); mEntry.remoteInputText = fullText; - // TODO(b/188646667): store attachment to entry - mEntry.remoteInputMimeType = contentType; - mEntry.remoteInputUri = data; // mirror prepareRemoteInputFromText for text input if (mEntry.editedSuggestionInfo == null) { RemoteInput.setResultsSource(fillInIntent, RemoteInput.SOURCE_FREE_FORM_INPUT); - } else if (mAttachment == null) { + } else if (mEntry.remoteInputAttachment == null) { RemoteInput.setResultsSource(fillInIntent, RemoteInput.SOURCE_CHOICE); } @@ -437,6 +428,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mEntry.getSbn().getUid(), mEntry.getSbn().getPackageName(), mEntry.getSbn().getInstanceId()); } + setAttachment(null); } @@ -477,7 +469,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private void onDefocus(boolean animate, boolean logClose) { mController.removeRemoteInput(mEntry, mToken); mEntry.remoteInputText = mEditText.getText(); - // TODO(b/188646667): store attachment to entry // During removal, we get reattached and lose focus. Not hiding in that // case to prevent flicker. @@ -565,7 +556,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mEntry.editedSuggestionInfo = editedSuggestionInfo; if (editedSuggestionInfo != null) { mEntry.remoteInputText = editedSuggestionInfo.originalText; - // TODO(b/188646667): store attachment to entry + mEntry.remoteInputAttachment = null; } } @@ -608,7 +599,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mEditText.setSelection(mEditText.length()); mEditText.requestFocus(); mController.addRemoteInput(mEntry, mToken); - // TODO(b/188646667): restore attachment from entry + setAttachment(mEntry.remoteInputAttachment); mRemoteInputQuickSettingsDisabler.setRemoteInputActive(true); @@ -631,7 +622,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private void reset() { mResetting = true; mEntry.remoteInputTextWhenReset = SpannedString.valueOf(mEditText.getText()); - // TODO(b/188646667): store attachment at time of reset to entry mEditText.getText().clear(); mEditText.setEnabled(true); @@ -640,7 +630,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene mController.removeSpinning(mEntry.getKey(), mToken); updateSendButton(); onDefocus(false /* animate */, false /* logClose */); - // TODO(b/188646667): clear attachment + setAttachment(null); mResetting = false; } @@ -657,7 +647,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene } private void updateSendButton() { - mSendButton.setEnabled(mEditText.length() != 0 || mAttachment != null); + mSendButton.setEnabled(mEditText.length() != 0 || mEntry.remoteInputAttachment != null); } public void close() { @@ -857,7 +847,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene && event.getAction() == KeyEvent.ACTION_DOWN; if (isSoftImeEvent || isKeyboardEnterKey) { - if (mEditText.length() > 0 || mAttachment != null) { + if (mEditText.length() > 0 || mEntry.remoteInputAttachment != null) { sendRemoteInput(prepareRemoteInput()); } // Consume action to prevent IME from closing. @@ -928,7 +918,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene // our focus, so we'll need to save our text here. if (mRemoteInputView != null) { mRemoteInputView.mEntry.remoteInputText = getText(); - // TODO(b/188646667): store attachment to entry } } return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java index e76b8035cd59..2a93844acd5b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityController.java @@ -28,6 +28,8 @@ public interface SecurityController extends CallbackController<SecurityControlle boolean isDeviceManaged(); boolean hasProfileOwner(); boolean hasWorkProfile(); + /** Whether the work profile is turned on. */ + boolean isWorkProfileOn(); /** Whether this device is organization-owned with a work profile **/ boolean isProfileOwnerOfOrganizationOwnedDevice(); String getDeviceOwnerName(); @@ -57,7 +59,6 @@ public interface SecurityController extends CallbackController<SecurityControlle /** Label for admin */ CharSequence getLabel(DeviceAdminInfo info); - public interface SecurityControllerCallback { void onStateChanged(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index 4afb86b1a810..3e661df802a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -211,6 +211,12 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi } @Override + public boolean isWorkProfileOn() { + final UserHandle userHandle = UserHandle.of(getWorkProfileUserId(mCurrentUserId)); + return userHandle != null && !mUserManager.isQuietModeEnabled(userHandle); + } + + @Override public boolean isProfileOwnerOfOrganizationOwnedDevice() { return mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile(); } 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 14190d86cea5..e2b6895e7039 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -671,6 +671,7 @@ public class UserSwitcherController implements Dumpable { scheduleGuestCreation(); } switchToUserId(targetUserId); + mUserManager.removeUser(currentUser.id); } } catch (RemoteException e) { Log.e(TAG, "Couldn't remove guest because ActivityManager or WindowManager is dead"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java index 2406db3ee58f..f8e36476c4a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java @@ -27,7 +27,6 @@ import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.text.Html; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.SignalIcon.IconGroup; @@ -37,6 +36,7 @@ import com.android.settingslib.graph.SignalDrawable; import com.android.settingslib.mobile.TelephonyIcons; import com.android.settingslib.wifi.WifiStatusTracker; import com.android.systemui.R; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; @@ -52,12 +52,17 @@ public class WifiSignalController extends private final IconGroup mUnmergedWifiIconGroup = WifiIcons.UNMERGED_WIFI; private final MobileIconGroup mCarrierMergedWifiIconGroup = TelephonyIcons.CARRIER_MERGED_WIFI; private final WifiManager mWifiManager; - private final boolean mProviderModel; + private final boolean mProviderModelSetting; - public WifiSignalController(Context context, boolean hasMobileDataFeature, - CallbackHandler callbackHandler, NetworkControllerImpl networkController, - WifiManager wifiManager, ConnectivityManager connectivityManager, - NetworkScoreManager networkScoreManager) { + public WifiSignalController( + Context context, + boolean hasMobileDataFeature, + CallbackHandler callbackHandler, + NetworkControllerImpl networkController, + WifiManager wifiManager, + ConnectivityManager connectivityManager, + NetworkScoreManager networkScoreManager, + FeatureFlags featureFlags) { super("WifiSignalController", context, NetworkCapabilities.TRANSPORT_WIFI, callbackHandler, networkController); mWifiManager = wifiManager; @@ -70,8 +75,7 @@ public class WifiSignalController extends new WifiTrafficStateCallback()); } mCurrentState.iconGroup = mLastState.iconGroup = mUnmergedWifiIconGroup; - mProviderModel = FeatureFlagUtils.isEnabled( - mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL); + mProviderModelSetting = featureFlags.isProviderModelSettingEnabled(); } @Override @@ -108,7 +112,7 @@ public class WifiSignalController extends if (mCurrentState.inetCondition == 0) { contentDescription += ("," + mContext.getString(R.string.data_connection_no_internet)); } - if (mProviderModel) { + if (mProviderModelSetting) { IconState statusIcon = new IconState( wifiVisible, getCurrentIconId(), contentDescription); IconState qsIcon = null; diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java index e0ff88bdbfce..843630b35e17 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayApplier.java @@ -239,6 +239,14 @@ public class ThemeOverlayApplier implements Dumpable { + category + ": " + enabled); } + OverlayInfo overlayInfo = mOverlayManager.getOverlayInfo(identifier, + UserHandle.of(currentUser)); + if (overlayInfo == null) { + Log.i(TAG, "Won't enable " + identifier + ", it doesn't exist for user" + + currentUser); + return; + } + transaction.setEnabled(identifier, enabled, currentUser); if (currentUser != UserHandle.SYSTEM.getIdentifier() && SYSTEM_USER_CATEGORIES.contains(category)) { @@ -247,7 +255,7 @@ public class ThemeOverlayApplier implements Dumpable { // Do not apply Launcher or Theme picker overlays to managed users. Apps are not // installed in there. - OverlayInfo overlayInfo = mOverlayManager.getOverlayInfo(identifier, UserHandle.SYSTEM); + overlayInfo = mOverlayManager.getOverlayInfo(identifier, UserHandle.SYSTEM); if (overlayInfo == null || overlayInfo.targetPackageName.equals(mLauncherPackage) || overlayInfo.targetPackageName.equals(mThemePickerPackage)) { return; diff --git a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java index 65f236b77a64..0ecc4e25047f 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java @@ -25,6 +25,7 @@ import android.provider.Settings; import android.service.quickaccesswallet.GetWalletCardsRequest; import android.service.quickaccesswallet.QuickAccessWalletClient; import android.service.quickaccesswallet.QuickAccessWalletClientImpl; +import android.util.Log; import com.android.systemui.R; import com.android.systemui.dagger.SysUISingleton; @@ -142,6 +143,10 @@ public class QuickAccessWalletController { */ public void queryWalletCards( QuickAccessWalletClient.OnWalletCardsRetrievedCallback cardsRetriever) { + if (!mQuickAccessWalletClient.isWalletFeatureAvailable()) { + Log.d(TAG, "QuickAccessWallet feature is not available."); + return; + } int cardWidth = mContext.getResources().getDimensionPixelSize(R.dimen.wallet_tile_card_view_width); int cardHeight = diff --git a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java index 2dcc43cf60dc..aa899840330f 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java @@ -38,6 +38,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.settingslib.Utils; import com.android.systemui.R; +import com.android.systemui.classifier.FalsingCollector; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; @@ -65,6 +66,7 @@ public class WalletActivity extends LifecycleActivity implements private final Executor mExecutor; private final Handler mHandler; private final FalsingManager mFalsingManager; + private FalsingCollector mFalsingCollector; private final UserTracker mUserTracker; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; private final StatusBarKeyguardViewManager mKeyguardViewManager; @@ -82,6 +84,7 @@ public class WalletActivity extends LifecycleActivity implements @Background Executor executor, @Main Handler handler, FalsingManager falsingManager, + FalsingCollector falsingCollector, UserTracker userTracker, KeyguardUpdateMonitor keyguardUpdateMonitor, StatusBarKeyguardViewManager keyguardViewManager) { @@ -91,6 +94,7 @@ public class WalletActivity extends LifecycleActivity implements mExecutor = executor; mHandler = handler; mFalsingManager = falsingManager; + mFalsingCollector = falsingCollector; mUserTracker = userTracker; mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardViewManager = keyguardViewManager; @@ -136,7 +140,8 @@ public class WalletActivity extends LifecycleActivity implements } }; - walletView.getAppButton().setOnClickListener( + walletView.setFalsingCollector(mFalsingCollector); + walletView.setShowWalletAppOnClickListener( v -> { if (mWalletClient.createWalletIntent() == null) { Log.w(TAG, "Unable to create wallet app intent."); diff --git a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java index 0c5347724035..420f84abe0dd 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java @@ -22,6 +22,7 @@ import static com.android.systemui.wallet.ui.WalletCardCarousel.CARD_ANIM_ALPHA_ import android.annotation.Nullable; import android.app.PendingIntent; import android.content.Context; +import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.AttributeSet; @@ -39,6 +40,7 @@ import android.widget.TextView; import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.Utils; import com.android.systemui.R; +import com.android.systemui.classifier.FalsingCollector; import java.util.List; @@ -54,6 +56,8 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard private final TextView mCardLabel; // Displays at the bottom of the screen, allow user to enter the default wallet app. private final Button mAppButton; + // Displays on the top right of the screen, allow user to enter the default wallet app. + private final Button mToolbarAppButton; // Displays underneath the carousel, allow user to unlock device, verify card, etc. private final Button mActionButton; private final Interpolator mOutInterpolator; @@ -61,10 +65,11 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard private final ViewGroup mCardCarouselContainer; private final TextView mErrorView; private final ViewGroup mEmptyStateView; - private CharSequence mCenterCardText; private boolean mIsDeviceLocked = false; private boolean mIsUdfpsEnabled = false; private OnClickListener mDeviceLockedActionOnClickListener; + private OnClickListener mShowWalletAppOnClickListener; + private FalsingCollector mFalsingCollector; public WalletView(Context context) { this(context, null); @@ -79,6 +84,7 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard mIcon = requireViewById(R.id.icon); mCardLabel = requireViewById(R.id.label); mAppButton = requireViewById(R.id.wallet_app_button); + mToolbarAppButton = requireViewById(R.id.wallet_toolbar_app_button); mActionButton = requireViewById(R.id.wallet_action_button); mErrorView = requireViewById(R.id.error_view); mEmptyStateView = requireViewById(R.id.wallet_empty_state); @@ -94,6 +100,43 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard } @Override + protected void onConfigurationChanged(Configuration newConfig) { + updateViewForOrientation(newConfig.orientation); + } + + private void updateViewForOrientation(@Configuration.Orientation int orientation) { + if (orientation == Configuration.ORIENTATION_PORTRAIT) { + renderViewPortrait(); + } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) { + renderViewLandscape(); + } + ViewGroup.LayoutParams params = mCardCarouselContainer.getLayoutParams(); + if (params instanceof MarginLayoutParams) { + ((MarginLayoutParams) params).topMargin = + getResources().getDimensionPixelSize( + R.dimen.wallet_card_carousel_container_top_margin); + } + } + + private void renderViewPortrait() { + mAppButton.setVisibility(VISIBLE); + mToolbarAppButton.setVisibility(GONE); + mCardLabel.setVisibility(VISIBLE); + requireViewById(R.id.dynamic_placeholder).setVisibility(VISIBLE); + + mAppButton.setOnClickListener(mShowWalletAppOnClickListener); + } + + private void renderViewLandscape() { + mToolbarAppButton.setVisibility(VISIBLE); + mAppButton.setVisibility(GONE); + mCardLabel.setVisibility(GONE); + requireViewById(R.id.dynamic_placeholder).setVisibility(GONE); + + mToolbarAppButton.setOnClickListener(mShowWalletAppOnClickListener); + } + + @Override public boolean onTouchEvent(MotionEvent event) { // Forward touch events to card carousel to allow for swiping outside carousel bounds. return mCardCarousel.onTouchEvent(event) || super.onTouchEvent(event); @@ -137,10 +180,12 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard mIsDeviceLocked = isDeviceLocked; mIsUdfpsEnabled = isUdfpsEnabled; mCardCarouselContainer.setVisibility(VISIBLE); + mCardCarousel.setVisibility(VISIBLE); mErrorView.setVisibility(GONE); mEmptyStateView.setVisibility(GONE); mIcon.setImageDrawable(getHeaderIcon(mContext, data.get(selectedIndex))); mCardLabel.setText(getLabelText(data.get(selectedIndex))); + updateViewForOrientation(getResources().getConfiguration().orientation); renderActionButton(data.get(selectedIndex), isDeviceLocked, mIsUdfpsEnabled); if (shouldAnimate) { animateViewsShown(mIcon, mCardLabel, mActionButton); @@ -190,6 +235,10 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard mDeviceLockedActionOnClickListener = onClickListener; } + void setShowWalletAppOnClickListener(OnClickListener onClickListener) { + mShowWalletAppOnClickListener = onClickListener; + } + void hide() { setVisibility(GONE); } @@ -206,10 +255,6 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard return mCardCarousel; } - Button getAppButton() { - return mAppButton; - } - Button getActionButton() { return mActionButton; } @@ -286,4 +331,23 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard String[] rawLabel = card.getLabel().toString().split("\\n"); return rawLabel.length == 2 ? rawLabel[1] : null; } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mFalsingCollector != null) { + mFalsingCollector.onTouchEvent(ev); + } + + boolean result = super.dispatchTouchEvent(ev); + + if (mFalsingCollector != null) { + mFalsingCollector.onMotionEventComplete(); + } + + return result; + } + + public void setFalsingCollector(FalsingCollector falsingCollector) { + mFalsingCollector = falsingCollector; + } } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 657553fc2bb3..fc0214a565f2 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -573,7 +573,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { // Stop scanning when bouncer becomes visible setKeyguardBouncerVisibility(true); clearInvocations(mFaceManager); - mKeyguardUpdateMonitor.requestFaceAuth(); + mKeyguardUpdateMonitor.requestFaceAuth(true); verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java index 09e6940acd43..06e27b5dbf48 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java @@ -38,7 +38,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.graphics.Insets; -import android.graphics.Rect; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; import android.testing.AndroidTestingRunner; @@ -49,7 +48,6 @@ import android.view.ViewPropertyAnimator; import android.view.WindowInsets; import android.view.WindowManager; import android.view.WindowMetrics; -import android.view.accessibility.AccessibilityNodeInfo; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -87,7 +85,6 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase { private final List<AccessibilityTarget> mTargets = new ArrayList<>( Collections.singletonList(mock(AccessibilityTarget.class))); - private final Rect mAvailableBounds = new Rect(100, 200, 300, 400); private final Position mPlaceholderPosition = new Position(0.0f, 0.0f); @Mock @@ -144,6 +141,7 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase { @Test public void initListView_success() { + assertThat(mListView.getCompatAccessibilityDelegate()).isNotNull(); assertThat(mMenuView.getChildCount()).isEqualTo(1); } @@ -370,90 +368,6 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase { } @Test - public void getAccessibilityActionList_matchResult() { - final AccessibilityNodeInfo info = new AccessibilityNodeInfo(); - - mMenuView.onInitializeAccessibilityNodeInfo(info); - - assertThat(info.getActionList().size()).isEqualTo(5); - } - - @Test - public void accessibilityActionMove_halfOval_moveTopLeft_success() { - doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); - mMenuView.setShapeType(/* halfOvalShape */ 1); - - final boolean moveTopLeftAction = - mMenuView.performAccessibilityAction(R.id.action_move_top_left, null); - - assertThat(moveTopLeftAction).isTrue(); - assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); - verify(mMenuView).snapToLocation(mAvailableBounds.left, mAvailableBounds.top); - } - - @Test - public void accessibilityActionMove_halfOval_moveTopRight_success() { - doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); - mMenuView.setShapeType(/* halfOvalShape */ 1); - - final boolean moveTopRightAction = - mMenuView.performAccessibilityAction(R.id.action_move_top_right, null); - - assertThat(moveTopRightAction).isTrue(); - assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); - verify(mMenuView).snapToLocation(mAvailableBounds.right, mAvailableBounds.top); - } - - @Test - public void accessibilityActionMove_halfOval_moveBottomLeft_success() { - doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); - mMenuView.setShapeType(/* halfOvalShape */ 1); - - final boolean moveBottomLeftAction = - mMenuView.performAccessibilityAction(R.id.action_move_bottom_left, null); - - assertThat(moveBottomLeftAction).isTrue(); - assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); - verify(mMenuView).snapToLocation(mAvailableBounds.left, mAvailableBounds.bottom); - } - - @Test - public void accessibilityActionMove_halfOval_moveBottomRight_success() { - doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); - mMenuView.setShapeType(/* halfOvalShape */ 1); - - final boolean moveBottomRightAction = - mMenuView.performAccessibilityAction(R.id.action_move_bottom_right, null); - - assertThat(moveBottomRightAction).isTrue(); - assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); - verify(mMenuView).snapToLocation(mAvailableBounds.right, mAvailableBounds.bottom); - } - - @Test - public void accessibilityActionMove_halfOval_moveOutEdgeAndShow_success() { - doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); - mMenuView.setShapeType(/* halfOvalShape */ 1); - - final boolean moveOutEdgeAndShowAction = - mMenuView.performAccessibilityAction(R.id.action_move_out_edge_and_show, null); - - assertThat(moveOutEdgeAndShowAction).isTrue(); - assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); - } - - @Test - public void setupAccessibilityActions_oval_hasActionMoveToEdgeAndHide() { - final AccessibilityNodeInfo info = new AccessibilityNodeInfo(); - mMenuView.setShapeType(/* ovalShape */ 0); - - mMenuView.onInitializeAccessibilityNodeInfo(info); - - assertThat(info.getActionList().stream().anyMatch( - action -> action.getId() == R.id.action_move_to_edge_and_hide)).isTrue(); - } - - @Test public void onTargetsChanged_exceedAvailableHeight_overScrollAlways() { doReturn(true).when(mMenuView).hasExceededMaxLayoutHeight(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompatTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompatTest.java new file mode 100644 index 000000000000..dae436427319 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/ItemDelegateCompatTest.java @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.floatingmenu; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + +import android.content.Context; +import android.graphics.Rect; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.view.WindowManager; +import android.view.accessibility.AccessibilityNodeInfo; + +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate; +import androidx.test.filters.SmallTest; + +import com.android.systemui.R; +import com.android.systemui.SysuiTestCase; + +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; + +/** Tests for {@link ItemDelegateCompat}. */ +@SmallTest +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper +public class ItemDelegateCompatTest extends SysuiTestCase { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + + @Mock + private WindowManager mWindowManager; + + private RecyclerView mListView; + private AccessibilityFloatingMenuView mMenuView; + private ItemDelegateCompat mItemDelegateCompat; + private final Rect mAvailableBounds = new Rect(100, 200, 300, 400); + private final Position mPlaceholderPosition = new Position(0.0f, 0.0f); + + @Before + public void setUp() { + final WindowManager wm = mContext.getSystemService(WindowManager.class); + doAnswer(invocation -> wm.getMaximumWindowMetrics()).when( + mWindowManager).getMaximumWindowMetrics(); + mContext.addMockSystemService(Context.WINDOW_SERVICE, mWindowManager); + + mListView = new RecyclerView(mContext); + mMenuView = + spy(new AccessibilityFloatingMenuView(mContext, mPlaceholderPosition, mListView)); + mItemDelegateCompat = + new ItemDelegateCompat(new RecyclerViewAccessibilityDelegate(mListView), mMenuView); + } + + @Test + public void getAccessibilityActionList_matchResult() { + final AccessibilityNodeInfoCompat info = + new AccessibilityNodeInfoCompat(new AccessibilityNodeInfo()); + + mItemDelegateCompat.onInitializeAccessibilityNodeInfo(mListView, info); + + assertThat(info.getActionList().size()).isEqualTo(5); + } + + @Test + public void performAccessibilityMoveTopLeftAction_halfOval_success() { + doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); + mMenuView.setShapeType(/* halfOvalShape */ 1); + + final boolean moveTopLeftAction = + mItemDelegateCompat.performAccessibilityAction(mListView, R.id.action_move_top_left, + null); + + assertThat(moveTopLeftAction).isTrue(); + assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); + verify(mMenuView).snapToLocation(mAvailableBounds.left, mAvailableBounds.top); + } + + @Test + public void performAccessibilityMoveTopRightAction_halfOval_success() { + doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); + mMenuView.setShapeType(/* halfOvalShape */ 1); + + final boolean moveTopRightAction = + mItemDelegateCompat.performAccessibilityAction(mListView, + R.id.action_move_top_right, null); + + assertThat(moveTopRightAction).isTrue(); + assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); + verify(mMenuView).snapToLocation(mAvailableBounds.right, mAvailableBounds.top); + } + + @Test + public void performAccessibilityMoveBottomLeftAction_halfOval_success() { + doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); + mMenuView.setShapeType(/* halfOvalShape */ 1); + + final boolean moveBottomLeftAction = + mItemDelegateCompat.performAccessibilityAction(mListView, + R.id.action_move_bottom_left, null); + + assertThat(moveBottomLeftAction).isTrue(); + assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); + verify(mMenuView).snapToLocation(mAvailableBounds.left, mAvailableBounds.bottom); + } + + @Test + public void performAccessibilityMoveBottomRightAction_halfOval_success() { + doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); + mMenuView.setShapeType(/* halfOvalShape */ 1); + + final boolean moveBottomRightAction = + mItemDelegateCompat.performAccessibilityAction(mListView, + R.id.action_move_bottom_right, null); + + assertThat(moveBottomRightAction).isTrue(); + assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); + verify(mMenuView).snapToLocation(mAvailableBounds.right, mAvailableBounds.bottom); + } + + @Test + public void performAccessibilityMoveOutEdgeAction_halfOval_success() { + doReturn(mAvailableBounds).when(mMenuView).getAvailableBounds(); + mMenuView.setShapeType(/* halfOvalShape */ 1); + + final boolean moveOutEdgeAndShowAction = + mItemDelegateCompat.performAccessibilityAction(mListView, + R.id.action_move_out_edge_and_show, null); + + assertThat(moveOutEdgeAndShowAction).isTrue(); + assertThat(mMenuView.mShapeType).isEqualTo(/* ovalShape */ 0); + } + + @Test + public void setupAccessibilityActions_oval_hasActionMoveToEdgeAndHide() { + final AccessibilityNodeInfoCompat info = + new AccessibilityNodeInfoCompat(new AccessibilityNodeInfo()); + mMenuView.setShapeType(/* ovalShape */ 0); + + mItemDelegateCompat.onInitializeAccessibilityNodeInfo(mListView, info); + + assertThat(info.getActionList().stream().anyMatch( + action -> action.getId() == R.id.action_move_to_edge_and_hide)).isTrue(); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintViewTest.java index 82bf041e4272..fcdf702495d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceToFingerprintViewTest.java @@ -17,8 +17,10 @@ package com.android.systemui.biometrics; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; +import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; @@ -27,6 +29,11 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import android.content.Context; +import android.hardware.biometrics.ComponentInfoInternal; +import android.hardware.biometrics.SensorProperties; +import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; +import android.os.Bundle; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -35,6 +42,8 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; + import com.android.systemui.R; import com.android.systemui.SysuiTestCase; @@ -45,6 +54,9 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.List; + @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper @SmallTest @@ -170,6 +182,50 @@ public class AuthBiometricFaceToFingerprintViewTest extends SysuiTestCase { eq(AuthBiometricView.Callback.ACTION_START_DELAYED_FINGERPRINT_SENSOR)); } + @Test + public void testOnSaveState() { + final FingerprintSensorPropertiesInternal sensorProps = createFingerprintSensorProps(); + mFaceToFpView.setFingerprintSensorProps(sensorProps); + + final Bundle savedState = new Bundle(); + mFaceToFpView.onSaveState(savedState); + + assertEquals(savedState.getInt(AuthDialog.KEY_BIOMETRIC_SENSOR_TYPE), + mFaceToFpView.getActiveSensorType()); + assertEquals(savedState.getParcelable(AuthDialog.KEY_BIOMETRIC_SENSOR_PROPS), sensorProps); + } + + @Test + public void testRestoreState() { + final Bundle savedState = new Bundle(); + savedState.putInt(AuthDialog.KEY_BIOMETRIC_SENSOR_TYPE, TYPE_FINGERPRINT); + savedState.putParcelable(AuthDialog.KEY_BIOMETRIC_SENSOR_PROPS, + createFingerprintSensorProps()); + + mFaceToFpView.restoreState(savedState); + + assertEquals(mFaceToFpView.getActiveSensorType(), TYPE_FINGERPRINT); + assertTrue(mFaceToFpView.isFingerprintUdfps()); + } + + @NonNull + private static FingerprintSensorPropertiesInternal createFingerprintSensorProps() { + final List<ComponentInfoInternal> componentInfo = new ArrayList<>(); + componentInfo.add(new ComponentInfoInternal("componentId", "hardwareVersion", + "firmwareVersion", "serialNumber", "softwareVersion")); + + return new FingerprintSensorPropertiesInternal( + 0 /* sensorId */, + SensorProperties.STRENGTH_STRONG, + 5 /* maxEnrollmentsPerUser */, + componentInfo, + FingerprintSensorProperties.TYPE_UDFPS_OPTICAL, + true /* resetLockoutRequiresHardwareAuthToken */, + 540 /* sensorLocationX */, + 1600 /* sensorLocationY */, + 100 /* sensorRadius */); + } + public class TestableView extends AuthBiometricFaceToFingerprintView { public TestableView(Context context) { super(context, null, new MockInjector()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java index 8ab32bb40105..25722e1c956b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -126,6 +126,8 @@ public class UdfpsControllerTest extends SysuiTestCase { private ScreenLifecycle mScreenLifecycle; @Mock private Vibrator mVibrator; + @Mock + private UdfpsHapticsSimulator mUdfpsHapticsSimulator; private FakeExecutor mFgExecutor; @@ -188,6 +190,7 @@ public class UdfpsControllerTest extends SysuiTestCase { mLockscreenShadeTransitionController, mScreenLifecycle, mVibrator, + mUdfpsHapticsSimulator, Optional.of(mHbmProvider)); verify(mFingerprintManager).setUdfpsOverlayController(mOverlayCaptor.capture()); mOverlayController = mOverlayCaptor.getValue(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapterTest.java index ee13d2366285..88b4039fd2cd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapterTest.java @@ -72,7 +72,7 @@ public class UdfpsDialogMeasureAdapterTest extends SysuiTestCase { } @Test - public void testUdfpsBottomSpacerHeightForLandscape() { + public void testUdfpsBottomSpacerHeightForLandscape_whenMoreSpaceAboveIcon() { final int titleHeightPx = 320; final int subtitleHeightPx = 240; final int descriptionHeightPx = 200; @@ -88,6 +88,22 @@ public class UdfpsDialogMeasureAdapterTest extends SysuiTestCase { } @Test + public void testUdfpsBottomSpacerHeightForLandscape_whenMoreSpaceBelowIcon() { + final int titleHeightPx = 315; + final int subtitleHeightPx = 160; + final int descriptionHeightPx = 75; + final int topSpacerHeightPx = 220; + final int textIndicatorHeightPx = 290; + final int buttonBarHeightPx = 360; + final int navbarBottomInsetPx = 205; + + assertEquals(-85, + UdfpsDialogMeasureAdapter.calculateBottomSpacerHeightForLandscape( + titleHeightPx, subtitleHeightPx, descriptionHeightPx, topSpacerHeightPx, + textIndicatorHeightPx, buttonBarHeightPx, navbarBottomInsetPx)); + } + + @Test public void testUdfpsHorizontalSpacerWidthForLandscape() { final int displayWidthPx = 3000; final int dialogMarginPx = 20; diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java index 3eb1a9e624c8..546038ec3030 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; import android.testing.AndroidTestingRunner; import android.view.MotionEvent; +import android.view.accessibility.AccessibilityManager; import androidx.test.filters.SmallTest; @@ -77,6 +78,8 @@ public class BrightLineClassifierTest extends SysuiTestCase { private HistoryTracker mHistoryTracker; @Mock private KeyguardStateController mKeyguardStateController; + @Mock + private AccessibilityManager mAccessibilityManager; private final FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); @@ -101,7 +104,8 @@ public class BrightLineClassifierTest extends SysuiTestCase { when(mKeyguardStateController.isShowing()).thenReturn(true); mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider, mDockManager, mMetricsLogger, mClassifiers, mSingleTapClassfier, mDoubleTapClassifier, - mHistoryTracker, mKeyguardStateController, false); + mHistoryTracker, mKeyguardStateController, mAccessibilityManager, + false); ArgumentCaptor<GestureFinalizedListener> gestureCompleteListenerCaptor = diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java new file mode 100644 index 000000000000..86243b53804e --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.classifier; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyDouble; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.when; + +import android.testing.AndroidTestingRunner; +import android.view.MotionEvent; +import android.view.accessibility.AccessibilityManager; + +import androidx.test.filters.SmallTest; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.testing.FakeMetricsLogger; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.dock.DockManagerFake; +import com.android.systemui.statusbar.policy.KeyguardStateController; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class BrightLineFalsingManagerTest extends SysuiTestCase { + private BrightLineFalsingManager mBrightLineFalsingManager; + @Mock + private FalsingDataProvider mFalsingDataProvider; + private final DockManagerFake mDockManager = new DockManagerFake(); + private final MetricsLogger mMetricsLogger = new FakeMetricsLogger(); + private final Set<FalsingClassifier> mClassifiers = new HashSet<>(); + @Mock + private SingleTapClassifier mSingleTapClassifier; + @Mock + private DoubleTapClassifier mDoubleTapClassifier; + @Mock + private FalsingClassifier mClassifierA; + private final List<MotionEvent> mMotionEventList = new ArrayList<>(); + @Mock + private HistoryTracker mHistoryTracker; + @Mock + private KeyguardStateController mKeyguardStateController; + @Mock + private AccessibilityManager mAccessibilityManager; + + private final FalsingClassifier.Result mPassedResult = FalsingClassifier.Result.passed(1); + private final FalsingClassifier.Result mFalsedResult = + FalsingClassifier.Result.falsed(1, getClass().getSimpleName(), ""); + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mClassifierA.classifyGesture(anyInt(), anyDouble(), anyDouble())) + .thenReturn(mFalsedResult); + when(mSingleTapClassifier.isTap(any(List.class), anyDouble())).thenReturn(mFalsedResult); + when(mDoubleTapClassifier.classifyGesture(anyInt(), anyDouble(), anyDouble())) + .thenReturn(mFalsedResult); + mClassifiers.add(mClassifierA); + when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(mMotionEventList); + when(mKeyguardStateController.isShowing()).thenReturn(true); + mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider, mDockManager, + mMetricsLogger, mClassifiers, mSingleTapClassifier, mDoubleTapClassifier, + mHistoryTracker, mKeyguardStateController, mAccessibilityManager, + false); + } + + @Test + public void testA11yDisablesGesture() { + assertThat(mBrightLineFalsingManager.isFalseTap(1)).isTrue(); + when(mAccessibilityManager.isEnabled()).thenReturn(true); + assertThat(mBrightLineFalsingManager.isFalseTap(1)).isFalse(); + } + + + @Test + public void testA11yDisablesTap() { + assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue(); + when(mAccessibilityManager.isEnabled()).thenReturn(true); + assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse(); + } + + + @Test + public void testA11yDisablesDoubleTap() { + assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isTrue(); + when(mAccessibilityManager.isEnabled()).thenReturn(true); + assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isFalse(); + } + + +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewControllerTest.java index 51576687880c..61b404107519 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewControllerTest.java @@ -211,7 +211,7 @@ public class KeyguardIndicationRotateTextViewControllerTest extends SysuiTestCas reset(mExecutor); // WHEN we have a transient message - mController.showTransient(TEST_MESSAGE_2, false); + mController.showTransient(TEST_MESSAGE_2); // THEN // - we immediately update 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 2d19f7dd4706..c9d41900b996 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt @@ -232,6 +232,7 @@ public class MediaControlPanelTest : SysuiTestCase() { emptyList(), PACKAGE, session.getSessionToken(), null, device, true, null) player.bindPlayer(state, PACKAGE) assertThat(seamlessText.getText()).isEqualTo(DEVICE_NAME) + assertThat(seamless.contentDescription).isEqualTo(DEVICE_NAME) assertThat(seamless.isEnabled()).isTrue() } @@ -251,13 +252,15 @@ public class MediaControlPanelTest : SysuiTestCase() { @Test fun bindNullDevice() { + val fallbackString = context.getResources().getString( + com.android.internal.R.string.ext_media_seamless_action) player.attachPlayer(holder) val state = MediaData(USER_ID, true, BG_COLOR, APP, null, ARTIST, TITLE, null, emptyList(), emptyList(), PACKAGE, session.getSessionToken(), null, null, true, null) player.bindPlayer(state, PACKAGE) assertThat(seamless.isEnabled()).isTrue() - assertThat(seamlessText.getText()).isEqualTo(context.getResources().getString( - com.android.internal.R.string.ext_media_seamless_action)) + assertThat(seamlessText.getText()).isEqualTo(fallbackString) + assertThat(seamless.contentDescription).isEqualTo(fallbackString) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaPlayerDataTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaPlayerDataTest.kt index ba4fc0aba81d..e9e965e92303 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaPlayerDataTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaPlayerDataTest.kt @@ -19,9 +19,9 @@ package com.android.systemui.media import android.testing.AndroidTestingRunner import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -35,6 +35,7 @@ public class MediaPlayerDataTest : SysuiTestCase() { @Mock private lateinit var playerIsPlaying: MediaControlPanel + private var systemClock: FakeSystemClock = FakeSystemClock() @JvmField @Rule @@ -59,8 +60,8 @@ public class MediaPlayerDataTest : SysuiTestCase() { val playerIsRemote = mock(MediaControlPanel::class.java) val dataIsRemote = createMediaData("app2", PLAYING, !LOCAL, !RESUMPTION) - MediaPlayerData.addMediaPlayer("2", dataIsRemote, playerIsRemote) - MediaPlayerData.addMediaPlayer("1", dataIsPlaying, playerIsPlaying) + MediaPlayerData.addMediaPlayer("2", dataIsRemote, playerIsRemote, systemClock) + MediaPlayerData.addMediaPlayer("1", dataIsPlaying, playerIsPlaying, systemClock) val players = MediaPlayerData.players() assertThat(players).hasSize(2) @@ -68,7 +69,6 @@ public class MediaPlayerDataTest : SysuiTestCase() { } @Test - @Ignore("Flaky") fun switchPlayersPlaying() { val playerIsPlaying1 = mock(MediaControlPanel::class.java) var dataIsPlaying1 = createMediaData("app1", PLAYING, LOCAL, !RESUMPTION) @@ -76,14 +76,19 @@ public class MediaPlayerDataTest : SysuiTestCase() { val playerIsPlaying2 = mock(MediaControlPanel::class.java) var dataIsPlaying2 = createMediaData("app2", !PLAYING, LOCAL, !RESUMPTION) - MediaPlayerData.addMediaPlayer("1", dataIsPlaying1, playerIsPlaying1) - MediaPlayerData.addMediaPlayer("2", dataIsPlaying2, playerIsPlaying2) + MediaPlayerData.addMediaPlayer("1", dataIsPlaying1, playerIsPlaying1, systemClock) + systemClock.advanceTime(1) + MediaPlayerData.addMediaPlayer("2", dataIsPlaying2, playerIsPlaying2, systemClock) + systemClock.advanceTime(1) dataIsPlaying1 = createMediaData("app1", !PLAYING, LOCAL, !RESUMPTION) dataIsPlaying2 = createMediaData("app2", PLAYING, LOCAL, !RESUMPTION) - MediaPlayerData.addMediaPlayer("1", dataIsPlaying1, playerIsPlaying1) - MediaPlayerData.addMediaPlayer("2", dataIsPlaying2, playerIsPlaying2) + MediaPlayerData.addMediaPlayer("1", dataIsPlaying1, playerIsPlaying1, systemClock) + systemClock.advanceTime(1) + + MediaPlayerData.addMediaPlayer("2", dataIsPlaying2, playerIsPlaying2, systemClock) + systemClock.advanceTime(1) val players = MediaPlayerData.players() assertThat(players).hasSize(2) @@ -109,12 +114,15 @@ public class MediaPlayerDataTest : SysuiTestCase() { val playerUndetermined = mock(MediaControlPanel::class.java) val dataUndetermined = createMediaData("app6", UNDETERMINED, LOCAL, RESUMPTION) - MediaPlayerData.addMediaPlayer("3", dataIsStoppedAndLocal, playerIsStoppedAndLocal) - MediaPlayerData.addMediaPlayer("5", dataIsStoppedAndRemote, playerIsStoppedAndRemote) - MediaPlayerData.addMediaPlayer("4", dataCanResume, playerCanResume) - MediaPlayerData.addMediaPlayer("1", dataIsPlaying, playerIsPlaying) - MediaPlayerData.addMediaPlayer("2", dataIsPlayingAndRemote, playerIsPlayingAndRemote) - MediaPlayerData.addMediaPlayer("6", dataUndetermined, playerUndetermined) + MediaPlayerData.addMediaPlayer( + "3", dataIsStoppedAndLocal, playerIsStoppedAndLocal, systemClock) + MediaPlayerData.addMediaPlayer( + "5", dataIsStoppedAndRemote, playerIsStoppedAndRemote, systemClock) + MediaPlayerData.addMediaPlayer("4", dataCanResume, playerCanResume, systemClock) + MediaPlayerData.addMediaPlayer("1", dataIsPlaying, playerIsPlaying, systemClock) + MediaPlayerData.addMediaPlayer( + "2", dataIsPlayingAndRemote, playerIsPlayingAndRemote, systemClock) + MediaPlayerData.addMediaPlayer("6", dataUndetermined, playerUndetermined, systemClock) val players = MediaPlayerData.players() assertThat(players).hasSize(6) @@ -130,8 +138,14 @@ public class MediaPlayerDataTest : SysuiTestCase() { val data = createMediaData("app1", PLAYING, LOCAL, !RESUMPTION) - MediaPlayerData.addMediaPlayer(keyA, data, playerIsPlaying) - MediaPlayerData.addMediaPlayer(keyB, data, playerIsPlaying) + assertThat(MediaPlayerData.players()).hasSize(0) + + MediaPlayerData.addMediaPlayer(keyA, data, playerIsPlaying, systemClock) + systemClock.advanceTime(1) + + assertThat(MediaPlayerData.players()).hasSize(1) + MediaPlayerData.addMediaPlayer(keyB, data, playerIsPlaying, systemClock) + systemClock.advanceTime(1) assertThat(MediaPlayerData.players()).hasSize(2) diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/PeopleBackupFollowUpJobTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleBackupFollowUpJobTest.java new file mode 100644 index 000000000000..0d1749c51994 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleBackupFollowUpJobTest.java @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.people; + +import static com.android.systemui.people.PeopleBackupFollowUpJob.SHARED_FOLLOW_UP; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.job.JobScheduler; +import android.app.people.IPeopleManager; +import android.content.Context; +import android.content.SharedPreferences; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.RemoteException; +import android.preference.PreferenceManager; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.people.widget.PeopleTileKey; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.time.Duration; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class PeopleBackupFollowUpJobTest extends SysuiTestCase { + private static final String SHORTCUT_ID_1 = "101"; + private static final String PACKAGE_NAME_1 = "package_name"; + private static final int USER_ID_1 = 0; + + private static final PeopleTileKey PEOPLE_TILE_KEY = + new PeopleTileKey(SHORTCUT_ID_1, USER_ID_1, PACKAGE_NAME_1); + + private static final String WIDGET_ID_STRING = "3"; + private static final String SECOND_WIDGET_ID_STRING = "12"; + private static final Set<String> WIDGET_IDS = new HashSet<>( + Arrays.asList(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING)); + + private static final Uri URI = Uri.parse("fake_uri"); + + @Mock + private PackageManager mPackageManager; + @Mock + private PackageInfo mPackageInfo; + @Mock + private IPeopleManager mIPeopleManager; + @Mock + private JobScheduler mJobScheduler; + + private final SharedPreferences mSp = PreferenceManager.getDefaultSharedPreferences(mContext); + private final SharedPreferences.Editor mEditor = mSp.edit(); + private final SharedPreferences mFollowUpSp = mContext.getSharedPreferences( + SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + private final SharedPreferences.Editor mFollowUpEditor = mFollowUpSp.edit(); + private final SharedPreferences mWidgetIdSp = mContext.getSharedPreferences( + WIDGET_ID_STRING, Context.MODE_PRIVATE); + private final SharedPreferences mSecondWidgetIdSp = mContext.getSharedPreferences( + SECOND_WIDGET_ID_STRING, Context.MODE_PRIVATE); + + private PeopleBackupFollowUpJob mPeopleBackupFollowUpJob; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + + when(mPackageManager.getPackageInfoAsUser(any(), anyInt(), anyInt())) + .thenReturn(mPackageInfo); + when(mIPeopleManager.isConversation(any(), anyInt(), any())).thenReturn(true); + + mPeopleBackupFollowUpJob = new PeopleBackupFollowUpJob(); + mPeopleBackupFollowUpJob.setManagers( + mContext, mPackageManager, mIPeopleManager, mJobScheduler); + } + + @After + public void tearDown() { + mEditor.clear().commit(); + mFollowUpEditor.clear().commit(); + mWidgetIdSp.edit().clear().commit(); + mSecondWidgetIdSp.edit().clear().commit(); + } + + @Test + public void testProcessFollowUpFile_shouldFollowUp() throws RemoteException { + when(mIPeopleManager.isConversation(any(), anyInt(), any())).thenReturn(false); + mFollowUpEditor.putStringSet(PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + mFollowUpEditor.apply(); + + Map<String, Set<String>> remainingWidgets = + mPeopleBackupFollowUpJob.processFollowUpFile(mFollowUpSp, mFollowUpEditor); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(remainingWidgets.size()).isEqualTo(1); + assertThat(remainingWidgets.get(PEOPLE_TILE_KEY.toString())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mFollowUpSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + } + + @Test + public void testProcessFollowUpFile_shouldRestore() { + mFollowUpEditor.putStringSet(PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + mFollowUpEditor.apply(); + + Map<String, Set<String>> remainingWidgets = + mPeopleBackupFollowUpJob.processFollowUpFile(mFollowUpSp, mFollowUpEditor); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(remainingWidgets).isEmpty(); + assertThat(mFollowUpSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())).isEmpty(); + } + + @Test + public void testShouldCancelJob_noRemainingWidgets_shouldCancel() { + assertThat(mPeopleBackupFollowUpJob.shouldCancelJob( + new HashMap<>(), 10, Duration.ofMinutes(1).toMillis())).isTrue(); + } + + @Test + public void testShouldCancelJob_noRemainingWidgets_longTimeElapsed_shouldCancel() { + assertThat(mPeopleBackupFollowUpJob.shouldCancelJob( + new HashMap<>(), 10, Duration.ofHours(50).toMillis())).isTrue(); + } + + @Test + public void testShouldCancelJob_remainingWidgets_shortTimeElapsed_shouldNotCancel() { + Map<String, Set<String>> remainingWidgets = new HashMap<>(); + remainingWidgets.put(PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + assertThat(mPeopleBackupFollowUpJob.shouldCancelJob(remainingWidgets, 10, 1000)).isFalse(); + } + + @Test + public void testShouldCancelJob_remainingWidgets_longTimeElapsed_shouldCancel() { + Map<String, Set<String>> remainingWidgets = new HashMap<>(); + remainingWidgets.put(PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + assertThat(mPeopleBackupFollowUpJob.shouldCancelJob( + remainingWidgets, 10, Duration.ofHours(50).toMillis())).isTrue(); + } + + @Test + public void testCancelJobAndClearRemainingWidgets() { + SharedPreferencesHelper.setPeopleTileKey(mWidgetIdSp, PEOPLE_TILE_KEY); + SharedPreferencesHelper.setPeopleTileKey(mSecondWidgetIdSp, PEOPLE_TILE_KEY); + mEditor.putStringSet(URI.toString(), WIDGET_IDS); + mEditor.putString(WIDGET_ID_STRING, URI.toString()); + mEditor.putString(SECOND_WIDGET_ID_STRING, URI.toString()); + mEditor.apply(); + Map<String, Set<String>> remainingWidgets = new HashMap<>(); + remainingWidgets.put(PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + mPeopleBackupFollowUpJob.cancelJobAndClearRemainingWidgets( + remainingWidgets, mFollowUpEditor, mSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + verify(mJobScheduler, times(1)).cancel(anyInt()); + assertThat(mFollowUpSp.getAll()).isEmpty(); + assertThat(mWidgetIdSp.getAll()).isEmpty(); + assertThat(mSecondWidgetIdSp.getAll()).isEmpty(); + assertThat(mSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())).isEmpty(); + assertThat(mSp.getStringSet(URI.toString(), new HashSet<>())).isEmpty(); + assertThat(mSp.getString(WIDGET_ID_STRING, null)).isNull(); + assertThat(mSp.getString(SECOND_WIDGET_ID_STRING, null)).isNull(); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceUtilsTest.java index 33c7a571ce27..fba19861b006 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceUtilsTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.when; import android.app.INotificationManager; import android.app.Notification; import android.app.Person; +import android.app.backup.BackupManager; import android.app.people.IPeopleManager; import android.app.people.PeopleSpaceTile; import android.appwidget.AppWidgetManager; @@ -198,6 +199,8 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { private NotificationEntryManager mNotificationEntryManager; @Mock private PeopleSpaceWidgetManager mPeopleSpaceWidgetManager; + @Mock + private BackupManager mBackupManager; private Bundle mOptions; @@ -252,7 +255,7 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { PeopleTileKey key = new PeopleTileKey(tile); PeopleSpaceTile actual = PeopleSpaceUtils .augmentTileFromNotification(mContext, tile, key, mNotificationEntry1, 0, - Optional.empty()); + Optional.empty(), mBackupManager); assertThat(actual.getNotificationContent().toString()).isEqualTo(NOTIFICATION_TEXT_2); assertThat(actual.getNotificationSender()).isEqualTo(null); @@ -292,7 +295,7 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { PeopleTileKey key = new PeopleTileKey(tile); PeopleSpaceTile actual = PeopleSpaceUtils .augmentTileFromNotification(mContext, tile, key, notificationEntry, 0, - Optional.empty()); + Optional.empty(), mBackupManager); assertThat(actual.getNotificationContent().toString()).isEqualTo(NOTIFICATION_TEXT_2); assertThat(actual.getNotificationSender().toString()).isEqualTo("name"); @@ -325,7 +328,7 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { PeopleTileKey key = new PeopleTileKey(tile); PeopleSpaceTile actual = PeopleSpaceUtils .augmentTileFromNotification(mContext, tile, key, notificationEntry, 0, - Optional.empty()); + Optional.empty(), mBackupManager); assertThat(actual.getNotificationContent().toString()).isEqualTo(NOTIFICATION_TEXT_1); assertThat(actual.getNotificationDataUri()).isEqualTo(URI); @@ -358,7 +361,7 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { PeopleTileKey key = new PeopleTileKey(tile); PeopleSpaceTile actual = PeopleSpaceUtils .augmentTileFromNotification(mContext, tile, key, notificationEntry, 0, - Optional.empty()); + Optional.empty(), mBackupManager); assertThat(actual.getNotificationContent().toString()).isEqualTo(NOTIFICATION_TEXT_1); assertThat(actual.getNotificationDataUri()).isNull(); @@ -376,7 +379,7 @@ public class PeopleSpaceUtilsTest extends SysuiTestCase { PeopleTileKey key = new PeopleTileKey(tile); PeopleSpaceTile actual = PeopleSpaceUtils .augmentTileFromNotification(mContext, tile, key, mNotificationEntry3, 0, - Optional.empty()); + Optional.empty(), mBackupManager); assertThat(actual.getNotificationContent()).isEqualTo(null); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/PeopleTileViewHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleTileViewHelperTest.java index e4e8cf0b0802..c818da8d029f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/people/PeopleTileViewHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/people/PeopleTileViewHelperTest.java @@ -236,6 +236,21 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { // No messages count. assertEquals(View.GONE, smallResult.findViewById(R.id.messages_count).getVisibility()); + mHeight = getSizeInDp(R.dimen.required_height_for_medium) - 1; + RemoteViews smallViewHorizontal = getPeopleTileViewHelper( + tileWithLastInteraction).getViews(); + View smallResultHorizontal = smallViewHorizontal.apply(mContext, null); + + // Show name over predefined icon. + assertEquals(View.VISIBLE, smallResultHorizontal.findViewById(R.id.name).getVisibility()); + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.predefined_icon).getVisibility()); + // Shows person icon. + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.person_icon).getVisibility()); + // No messages count. + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.messages_count).getVisibility()); mWidth = getSizeInDp(R.dimen.required_width_for_large); mHeight = getSizeInDp(R.dimen.required_height_for_large); @@ -292,6 +307,22 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { // No messages count. assertEquals(View.GONE, smallResult.findViewById(R.id.messages_count).getVisibility()); + mHeight = getSizeInDp(R.dimen.required_height_for_medium) - 1; + RemoteViews smallViewHorizontal = getPeopleTileViewHelper( + tileWithAvailabilityAndNewStory).getViews(); + View smallResultHorizontal = smallViewHorizontal.apply(mContext, null); + + // Show name over predefined icon. + assertEquals(View.VISIBLE, smallResultHorizontal.findViewById(R.id.name).getVisibility()); + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.predefined_icon).getVisibility()); + // Shows person icon. + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.person_icon).getVisibility()); + // No messages count. + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.messages_count).getVisibility()); + mWidth = getSizeInDp(R.dimen.required_width_for_large); mHeight = getSizeInDp(R.dimen.required_height_for_large); RemoteViews largeView = getPeopleTileViewHelper(tileWithAvailabilityAndNewStory).getViews(); @@ -333,6 +364,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), mContext.getString(R.string.birthday_status)); assertThat(statusContent.getMaxLines()).isEqualTo(2); + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + mContext.getString(R.string.birthday_status_content_description, NAME))); mWidth = getSizeInDp(R.dimen.required_width_for_medium) - 1; RemoteViews smallView = getPeopleTileViewHelper(tileWithStatusTemplate).getViews(); @@ -342,12 +376,32 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.GONE, smallResult.findViewById(R.id.name).getVisibility()); assertEquals(View.VISIBLE, smallResult.findViewById(R.id.predefined_icon).getVisibility()); + assertThat(smallResult.findViewById( + R.id.predefined_icon).getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + mContext.getString(R.string.birthday_status_content_description, NAME))); // Has person icon. assertEquals(View.VISIBLE, smallResult.findViewById(R.id.person_icon).getVisibility()); // No messages count. assertEquals(View.GONE, smallResult.findViewById(R.id.messages_count).getVisibility()); + mHeight = getSizeInDp(R.dimen.required_height_for_medium) - 1; + RemoteViews smallViewHorizontal = getPeopleTileViewHelper( + tileWithStatusTemplate).getViews(); + View smallResultHorizontal = smallViewHorizontal.apply(mContext, null); + + // Show name over predefined icon. + assertEquals(View.GONE, smallResultHorizontal.findViewById(R.id.name).getVisibility()); + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.predefined_icon).getVisibility()); + // Shows person icon. + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.person_icon).getVisibility()); + // No messages count. + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.messages_count).getVisibility()); + mWidth = getSizeInDp(R.dimen.required_width_for_large); mHeight = getSizeInDp(R.dimen.required_height_for_large); RemoteViews largeView = getPeopleTileViewHelper(tileWithStatusTemplate).getViews(); @@ -367,6 +421,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), mContext.getString(R.string.birthday_status)); assertThat(statusContent.getMaxLines()).isEqualTo(2); + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + mContext.getString(R.string.birthday_status_content_description, NAME))); } @Test @@ -392,6 +449,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { TextView statusContent = (TextView) result.findViewById(R.id.text_content); assertEquals(statusContent.getText(), GAME_DESCRIPTION); assertThat(statusContent.getMaxLines()).isEqualTo(2); + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + GAME_DESCRIPTION)); mWidth = getSizeInDp(R.dimen.required_width_for_medium) - 1; RemoteViews smallView = getPeopleTileViewHelper(tileWithStatusTemplate).getViews(); @@ -401,12 +461,32 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.GONE, smallResult.findViewById(R.id.name).getVisibility()); assertEquals(View.VISIBLE, smallResult.findViewById(R.id.predefined_icon).getVisibility()); + assertThat(smallResult.findViewById( + R.id.predefined_icon).getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + GAME_DESCRIPTION)); // Has person icon. assertEquals(View.VISIBLE, smallResult.findViewById(R.id.person_icon).getVisibility()); // No messages count. assertEquals(View.GONE, smallResult.findViewById(R.id.messages_count).getVisibility()); + mHeight = getSizeInDp(R.dimen.required_height_for_medium) - 1; + RemoteViews smallViewHorizontal = getPeopleTileViewHelper( + tileWithStatusTemplate).getViews(); + View smallResultHorizontal = smallViewHorizontal.apply(mContext, null); + + // Show name over predefined icon. + assertEquals(View.GONE, smallResultHorizontal.findViewById(R.id.name).getVisibility()); + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.predefined_icon).getVisibility()); + // Shows person icon. + assertEquals(View.VISIBLE, + smallResultHorizontal.findViewById(R.id.person_icon).getVisibility()); + // No messages count. + assertEquals(View.GONE, + smallResultHorizontal.findViewById(R.id.messages_count).getVisibility()); + mWidth = getSizeInDp(R.dimen.required_width_for_large); mHeight = getSizeInDp(R.dimen.required_height_for_large); RemoteViews largeView = getPeopleTileViewHelper(tileWithStatusTemplate).getViews(); @@ -428,6 +508,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), GAME_DESCRIPTION); assertThat(statusContent.getMaxLines()).isEqualTo(2); + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, + GAME_DESCRIPTION)); } @Test @@ -452,6 +535,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { // Has status. TextView statusContent = (TextView) result.findViewById(R.id.name); assertEquals(statusContent.getText(), "Anniversary"); + // Since the image is showing which removes name, we need to manually include the name. + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, "Anniversary")); assertThat(statusContent.getMaxLines()).isEqualTo(1); mWidth = getSizeInDp(R.dimen.required_width_for_large); @@ -473,6 +559,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { statusContent = (TextView) largeResult.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), "Anniversary"); + // Since the image is showing which removes name, we need to manually include the name. + assertThat(statusContent.getContentDescription().toString()).isEqualTo( + mContext.getString(R.string.new_status_content_description, NAME, "Anniversary")); assertThat(statusContent.getMaxLines()).isEqualTo(2); } @@ -621,6 +710,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { TextView statusContent = (TextView) result.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), MISSED_CALL); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, NAME, MISSED_CALL)); assertThat(statusContent.getMaxLines()).isEqualTo(2); mWidth = getSizeInDp(R.dimen.required_width_for_medium) - 1; @@ -632,6 +723,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.GONE, smallResult.findViewById(R.id.name).getVisibility()); assertEquals(View.VISIBLE, smallResult.findViewById(R.id.predefined_icon).getVisibility()); + assertEquals(smallResult.findViewById(R.id.predefined_icon).getContentDescription(), + mContext.getString( + R.string.new_notification_text_content_description, NAME, MISSED_CALL)); // Has person icon. assertEquals(View.VISIBLE, smallResult.findViewById(R.id.person_icon).getVisibility()); // No messages count. @@ -655,6 +749,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { statusContent = (TextView) largeResult.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), MISSED_CALL); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, NAME, MISSED_CALL)); assertThat(statusContent.getMaxLines()).isEqualTo(2); } @@ -681,6 +777,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { TextView statusContent = (TextView) result.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), NOTIFICATION_CONTENT); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, NAME, NOTIFICATION_CONTENT)); assertThat(statusContent.getMaxLines()).isEqualTo(2); // Has a single message, no count shown. @@ -695,6 +793,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.GONE, smallResult.findViewById(R.id.name).getVisibility()); assertEquals(View.VISIBLE, smallResult.findViewById(R.id.predefined_icon).getVisibility()); + assertEquals(smallResult.findViewById(R.id.predefined_icon).getContentDescription(), + mContext.getString(R.string.new_notification_text_content_description, NAME, + NOTIFICATION_CONTENT)); // Has person icon. assertEquals(View.VISIBLE, smallResult.findViewById(R.id.person_icon).getVisibility()); @@ -722,8 +823,9 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { statusContent = (TextView) largeResult.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), NOTIFICATION_CONTENT); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, NAME, NOTIFICATION_CONTENT)); assertThat(statusContent.getMaxLines()).isEqualTo(2); - // Has a single message, no count shown. assertEquals(View.GONE, largeResult.findViewById(R.id.messages_count).getVisibility()); @@ -753,6 +855,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { TextView statusContent = (TextView) result.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), NOTIFICATION_CONTENT); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, SENDER, NOTIFICATION_CONTENT)); // Subtract one from lines because sender is included. assertThat(statusContent.getMaxLines()).isEqualTo(1); @@ -769,6 +873,10 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { assertEquals(View.GONE, smallResult.findViewById(R.id.name).getVisibility()); assertEquals(View.VISIBLE, smallResult.findViewById(R.id.predefined_icon).getVisibility()); + assertEquals(smallResult.findViewById(R.id.predefined_icon).getContentDescription(), + mContext.getString( + R.string.new_notification_text_content_description, SENDER, + NOTIFICATION_CONTENT)); // Has person icon. assertEquals(View.VISIBLE, smallResult.findViewById(R.id.person_icon).getVisibility()); @@ -797,6 +905,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase { statusContent = (TextView) largeResult.findViewById(R.id.text_content); assertEquals(View.VISIBLE, statusContent.getVisibility()); assertEquals(statusContent.getText(), NOTIFICATION_CONTENT); + assertEquals(statusContent.getContentDescription(), mContext.getString( + R.string.new_notification_text_content_description, SENDER, NOTIFICATION_CONTENT)); // Subtract one from lines because sender is included. assertThat(statusContent.getMaxLines()).isEqualTo(1); diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/SharedPreferencesHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/SharedPreferencesHelperTest.java new file mode 100644 index 000000000000..7cd5e22a9b97 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/people/SharedPreferencesHelperTest.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.people; + +import static com.android.systemui.people.PeopleSpaceUtils.INVALID_USER_ID; +import static com.android.systemui.people.PeopleSpaceUtils.PACKAGE_NAME; +import static com.android.systemui.people.PeopleSpaceUtils.SHORTCUT_ID; +import static com.android.systemui.people.PeopleSpaceUtils.USER_ID; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.content.SharedPreferences; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.people.widget.PeopleTileKey; + +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class SharedPreferencesHelperTest extends SysuiTestCase { + private static final String SHORTCUT_ID_1 = "101"; + private static final String PACKAGE_NAME_1 = "package_name"; + private static final int USER_ID_1 = 0; + + private static final PeopleTileKey PEOPLE_TILE_KEY = + new PeopleTileKey(SHORTCUT_ID_1, USER_ID_1, PACKAGE_NAME_1); + + private static final int WIDGET_ID = 1; + + private void setStorageForTile(PeopleTileKey peopleTileKey, int widgetId) { + SharedPreferences widgetSp = mContext.getSharedPreferences( + String.valueOf(widgetId), + Context.MODE_PRIVATE); + SharedPreferences.Editor widgetEditor = widgetSp.edit(); + widgetEditor.putString(PeopleSpaceUtils.PACKAGE_NAME, peopleTileKey.getPackageName()); + widgetEditor.putString(PeopleSpaceUtils.SHORTCUT_ID, peopleTileKey.getShortcutId()); + widgetEditor.putInt(PeopleSpaceUtils.USER_ID, peopleTileKey.getUserId()); + widgetEditor.apply(); + } + + @Test + public void testGetPeopleTileKey() { + setStorageForTile(PEOPLE_TILE_KEY, WIDGET_ID); + + SharedPreferences sp = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID), + Context.MODE_PRIVATE); + PeopleTileKey actual = SharedPreferencesHelper.getPeopleTileKey(sp); + + assertThat(actual.getPackageName()).isEqualTo(PACKAGE_NAME_1); + assertThat(actual.getShortcutId()).isEqualTo(SHORTCUT_ID_1); + assertThat(actual.getUserId()).isEqualTo(USER_ID_1); + } + + @Test + public void testSetPeopleTileKey() { + SharedPreferences sp = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID), + Context.MODE_PRIVATE); + SharedPreferencesHelper.setPeopleTileKey(sp, PEOPLE_TILE_KEY); + + assertThat(sp.getString(SHORTCUT_ID, null)).isEqualTo(SHORTCUT_ID_1); + assertThat(sp.getString(PACKAGE_NAME, null)).isEqualTo(PACKAGE_NAME_1); + assertThat(sp.getInt(USER_ID, INVALID_USER_ID)).isEqualTo(USER_ID_1); + } + + @Test + public void testClear() { + setStorageForTile(PEOPLE_TILE_KEY, WIDGET_ID); + + SharedPreferences sp = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID), + Context.MODE_PRIVATE); + SharedPreferencesHelper.clear(sp); + + assertThat(sp.getString(SHORTCUT_ID, null)).isEqualTo(null); + assertThat(sp.getString(PACKAGE_NAME, null)).isEqualTo(null); + assertThat(sp.getInt(USER_ID, INVALID_USER_ID)).isEqualTo(INVALID_USER_ID); + + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java index f6264ffc6a70..d8ba164851ed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java @@ -49,7 +49,6 @@ import com.android.systemui.wmshell.BubblesManager; import com.android.wm.shell.bubbles.Bubble; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -92,20 +91,23 @@ public class LaunchConversationActivityTest extends SysuiTestCase { private NotificationListenerService.Ranking mRanking; @Mock private UserManager mUserManager; - + @Mock private CommandQueue mCommandQueue; @Captor private ArgumentCaptor<NotificationVisibility> mNotificationVisibilityCaptor; + @Captor + private ArgumentCaptor<CommandQueue.Callbacks> mCallbacksCaptor; private Intent mIntent; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mCommandQueue = new CommandQueue(mContext); mActivity = new LaunchConversationActivity(mNotificationEntryManager, Optional.of(mBubblesManager), mUserManager, mCommandQueue); + verify(mCommandQueue, times(1)).addCallback(mCallbacksCaptor.capture()); + mActivity.setIsForTesting(true, mIStatusBarService); mIntent = new Intent(); mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_TILE_ID, "tile ID"); @@ -169,7 +171,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase { mActivity.onCreate(new Bundle()); assertThat(mActivity.isFinishing()).isTrue(); - mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); + mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY); verify(mIStatusBarService, times(1)).onNotificationClear(any(), anyInt(), any(), anyInt(), anyInt(), mNotificationVisibilityCaptor.capture()); @@ -183,17 +185,20 @@ public class LaunchConversationActivityTest extends SysuiTestCase { @Test public void testBubbleEntryOpensBubbleAndDoesNotClearNotification() throws Exception { + when(mBubblesManager.getBubbleWithShortcutId(any())).thenReturn(null); mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_NOTIFICATION_KEY, NOTIF_KEY_CAN_BUBBLE); mActivity.setIntent(mIntent); mActivity.onCreate(new Bundle()); assertThat(mActivity.isFinishing()).isTrue(); - mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); + mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY); // Don't clear the notification for bubbles. verify(mIStatusBarService, never()).onNotificationClear(any(), anyInt(), any(), anyInt(), anyInt(), any()); + // Select the bubble. + verify(mBubblesManager, times(1)).getBubbleWithShortcutId(any()); verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(mNotifEntryCanBubble)); } @@ -214,7 +219,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase { verify(mBubblesManager, never()).expandStackAndSelectBubble(any(NotificationEntry.class)); } - @Ignore + @Test public void testBubbleWithNoNotifOpensBubble() throws Exception { Bubble bubble = mock(Bubble.class); @@ -226,7 +231,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase { mActivity.onCreate(new Bundle()); assertThat(mActivity.isFinishing()).isTrue(); - mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); + mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY); verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(bubble)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleBackupHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleBackupHelperTest.java new file mode 100644 index 000000000000..5d526e102b91 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleBackupHelperTest.java @@ -0,0 +1,537 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.people.widget; + +import static com.android.systemui.people.PeopleBackupFollowUpJob.SHARED_FOLLOW_UP; +import static com.android.systemui.people.PeopleSpaceUtils.INVALID_USER_ID; +import static com.android.systemui.people.widget.PeopleBackupHelper.ADD_USER_ID_TO_URI; +import static com.android.systemui.people.widget.PeopleBackupHelper.SHARED_BACKUP; +import static com.android.systemui.people.widget.PeopleBackupHelper.SharedFileEntryType; +import static com.android.systemui.people.widget.PeopleBackupHelper.getEntryType; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.when; + +import android.app.people.IPeopleManager; +import android.content.Context; +import android.content.SharedPreferences; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.RemoteException; +import android.os.UserHandle; +import android.preference.PreferenceManager; +import android.testing.AndroidTestingRunner; + +import androidx.test.filters.SmallTest; + +import com.android.systemui.SysuiTestCase; +import com.android.systemui.people.SharedPreferencesHelper; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class PeopleBackupHelperTest extends SysuiTestCase { + private static final String SHORTCUT_ID_1 = "101"; + private static final String PACKAGE_NAME_1 = "package_name"; + private static final int USER_ID_0 = 0; + private static final int USER_ID_10 = 10; + + private static final PeopleTileKey PEOPLE_TILE_KEY = + new PeopleTileKey(SHORTCUT_ID_1, USER_ID_0, PACKAGE_NAME_1); + private static final PeopleTileKey OTHER_PEOPLE_TILE_KEY = + new PeopleTileKey(SHORTCUT_ID_1, USER_ID_10, PACKAGE_NAME_1); + private static final PeopleTileKey INVALID_USER_ID_PEOPLE_TILE_KEY = + new PeopleTileKey(SHORTCUT_ID_1, INVALID_USER_ID, PACKAGE_NAME_1); + + private static final String WIDGET_ID_STRING = "3"; + private static final String SECOND_WIDGET_ID_STRING = "12"; + private static final String OTHER_WIDGET_ID_STRING = "7"; + private static final Set<String> WIDGET_IDS = new HashSet<>( + Arrays.asList(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING)); + + private static final String URI_STRING = "content://mms"; + private static final String URI_WITH_USER_ID_0 = "content://0@mms"; + private static final String URI_WITH_USER_ID_10 = "content://10@mms"; + + private final SharedPreferences mBackupSp = mContext.getSharedPreferences( + SHARED_BACKUP, Context.MODE_PRIVATE); + private final SharedPreferences.Editor mBackupEditor = mBackupSp.edit(); + private final SharedPreferences mSp = PreferenceManager.getDefaultSharedPreferences(mContext); + private final SharedPreferences.Editor mEditor = mSp.edit(); + private final SharedPreferences mFollowUpSp = mContext.getSharedPreferences( + SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + private final SharedPreferences.Editor mFollowUpEditor = mFollowUpSp.edit(); + private final SharedPreferences mWidgetIdSp = mContext.getSharedPreferences( + WIDGET_ID_STRING, Context.MODE_PRIVATE); + private final SharedPreferences mSecondWidgetIdSp = mContext.getSharedPreferences( + SECOND_WIDGET_ID_STRING, Context.MODE_PRIVATE); + + @Mock + private PackageManager mPackageManager; + @Mock + private PackageInfo mPackageInfo; + @Mock + private IPeopleManager mIPeopleManager; + + private PeopleBackupHelper mHelper; + private PeopleBackupHelper mOtherHelper; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + mHelper = new PeopleBackupHelper(mContext, + UserHandle.of(0), new String[]{SHARED_BACKUP}, mPackageManager, mIPeopleManager); + mOtherHelper = new PeopleBackupHelper(mContext, + UserHandle.of(10), new String[]{SHARED_BACKUP}, mPackageManager, mIPeopleManager); + + when(mPackageManager.getPackageInfoAsUser(any(), anyInt(), anyInt())) + .thenReturn(mPackageInfo); + when(mIPeopleManager.isConversation(any(), anyInt(), any())).thenReturn(true); + } + + @After + public void tearDown() { + mBackupEditor.clear().commit(); + mEditor.clear().commit(); + mFollowUpEditor.clear().commit(); + mWidgetIdSp.edit().clear().commit(); + mSecondWidgetIdSp.edit().clear().commit(); + } + + @Test + public void testGetKeyType_widgetId() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, "contact"); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.WIDGET_ID); + } + + @Test + public void testGetKeyType_widgetId_twoDigits() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + SECOND_WIDGET_ID_STRING, URI_STRING); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.WIDGET_ID); + } + + @Test + public void testGetKeyType_peopleTileKey_valid() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/12/com.android.systemui", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.PEOPLE_TILE_KEY); + } + + @Test + public void testGetKeyType_peopleTileKey_validWithSlashes() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/with/slashes/12/com.android.systemui2", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.PEOPLE_TILE_KEY); + } + + @Test + public void testGetKeyType_peopleTileKey_negativeNumber() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/with/slashes/-1/com.android.systemui2", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.PEOPLE_TILE_KEY); + } + + @Test + public void testGetKeyType_contactUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/1f/com.android.systemui2", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.CONTACT_URI); + } + + @Test + public void testGetKeyType_contactUri_valid() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "http://content.fake", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.CONTACT_URI); + } + + @Test + public void testGetKeyType_contactUri_invalidPackageName() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/with/slashes/12/2r/com.android.systemui2", WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.CONTACT_URI); + } + + @Test + public void testGetKeyType_unknown_unexpectedValueForPeopleTileKey() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + "shortcut_id/12/com.android.systemui", URI_STRING); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.UNKNOWN); + } + + @Test + public void testGetKeyType_unknown_unexpectedValueForContactUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + URI_STRING, "12"); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.UNKNOWN); + } + + @Test + public void testGetKeyType_unknown() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + null, WIDGET_IDS); + assertThat(getEntryType(entry)).isEqualTo(SharedFileEntryType.UNKNOWN); + } + + @Test + public void testBackupKey_widgetIdKey_containsWidget_noUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_STRING); + } + + @Test + public void testBackupKey_widgetIdKey_doesNotContainWidget_noUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(OTHER_WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getString(WIDGET_ID_STRING, null)).isNull(); + } + + @Test + public void testBackupKey_widgetIdKey_containsOneWidget_differentUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, + URI_WITH_USER_ID_10); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_STRING); + assertThat(mBackupSp.getInt(ADD_USER_ID_TO_URI + WIDGET_ID_STRING, INVALID_USER_ID)) + .isEqualTo(USER_ID_10); + } + + @Test + public void testBackupKey_widgetIdKey_containsWidget_SameUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + WIDGET_ID_STRING, URI_WITH_USER_ID_10); + + mOtherHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_STRING); + assertThat(mBackupSp.getInt(ADD_USER_ID_TO_URI + WIDGET_ID_STRING, INVALID_USER_ID)) + .isEqualTo(USER_ID_10); + } + + @Test + public void testBackupKey_contactUriKey_ignoresExistingWidgets() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + } + + @Test + public void testBackupKey_contactUriKey_ignoresExistingWidgets_otherWidget() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + } + + @Test + public void testBackupKey_contactUriKey_noUserId_otherUser_doesntBackup() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + + mOtherHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + } + + @Test + public void testBackupKey_contactUriKey_sameUserId() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_WITH_USER_ID_10, WIDGET_IDS); + + mOtherHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mBackupSp.getInt(ADD_USER_ID_TO_URI + URI_STRING, INVALID_USER_ID)) + .isEqualTo(USER_ID_10); + } + + @Test + public void testBackupKey_contactUriKey_differentUserId_runningAsUser0() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_WITH_USER_ID_10, WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + assertThat(mBackupSp.getInt(ADD_USER_ID_TO_URI + URI_STRING, INVALID_USER_ID)) + .isEqualTo(INVALID_USER_ID); + } + + @Test + public void testBackupKey_contactUriKey_differentUserId_runningAsUser10() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_WITH_USER_ID_0, WIDGET_IDS); + + mOtherHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + assertThat(mBackupSp.getInt(ADD_USER_ID_TO_URI + URI_STRING, INVALID_USER_ID)) + .isEqualTo(INVALID_USER_ID); + } + + @Test + public void testBackupKey_peopleTileKey_containsWidget() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet( + INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING); + } + + @Test + public void testBackupKey_peopleTileKey_containsBothWidgets() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, + Arrays.asList(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat( + mBackupSp.getStringSet(INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + } + + @Test + public void testBackupKey_peopleTileKey_doesNotContainWidget() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(OTHER_WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet( + INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), new HashSet<>())).isEmpty(); + } + + @Test + public void testBackupKey_peopleTileKey_differentUserId() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + OTHER_PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + mHelper.backupKey(entry, mBackupEditor, Collections.singletonList(WIDGET_ID_STRING)); + mBackupEditor.apply(); + + assertThat(mBackupSp.getStringSet( + INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), new HashSet<>())).isEmpty(); + } + + @Test + public void testRestoreKey_widgetIdKey_noUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_STRING); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_widgetIdKey_sameUserInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + WIDGET_ID_STRING, USER_ID_0); + mBackupEditor.apply(); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_WITH_USER_ID_0); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_widgetIdKey_differentUserInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + WIDGET_ID_STRING, USER_ID_10); + mBackupEditor.apply(); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_WITH_USER_ID_10); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_widgetIdKey_nonSystemUser_differentUser() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(WIDGET_ID_STRING, URI_STRING); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + WIDGET_ID_STRING, USER_ID_0); + mBackupEditor.apply(); + + boolean restored = mOtherHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getString(WIDGET_ID_STRING, null)).isEqualTo(URI_WITH_USER_ID_0); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_contactUriKey_noUserIdInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getStringSet(URI_STRING, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_contactUriKey_sameUserInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + URI_STRING, USER_ID_0); + mBackupEditor.apply(); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getStringSet(URI_WITH_USER_ID_0, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_contactUriKey_differentUserInUri() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + URI_STRING, USER_ID_10); + mBackupEditor.apply(); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getStringSet(URI_WITH_USER_ID_10, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_contactUriKey_nonSystemUser_differentUser() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>(URI_STRING, WIDGET_IDS); + mBackupEditor.putInt(ADD_USER_ID_TO_URI + URI_STRING, USER_ID_0); + mBackupEditor.apply(); + + boolean restored = mOtherHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getStringSet(URI_WITH_USER_ID_0, new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(mSp.getStringSet(URI_STRING, new HashSet<>())).isEmpty(); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_peopleTileKey_shouldNotFollowUp() { + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isTrue(); + assertThat(mSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(SharedPreferencesHelper.getPeopleTileKey(mWidgetIdSp)) + .isEqualTo(PEOPLE_TILE_KEY); + assertThat(SharedPreferencesHelper.getPeopleTileKey(mSecondWidgetIdSp)) + .isEqualTo(PEOPLE_TILE_KEY); + assertThat(mFollowUpSp.getAll()).isEmpty(); + } + + @Test + public void testRestoreKey_peopleTileKey_shortcutNotYetRestored_shouldFollowUpBoth() + throws RemoteException { + when(mIPeopleManager.isConversation(any(), anyInt(), any())).thenReturn(false); + + Map.Entry<String, ?> entry = new AbstractMap.SimpleEntry<>( + INVALID_USER_ID_PEOPLE_TILE_KEY.toString(), WIDGET_IDS); + + boolean restored = mHelper.restoreKey(entry, mEditor, mFollowUpEditor, mBackupSp); + mEditor.apply(); + mFollowUpEditor.apply(); + + assertThat(restored).isFalse(); + assertThat(mSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + assertThat(SharedPreferencesHelper.getPeopleTileKey(mWidgetIdSp)) + .isEqualTo(PEOPLE_TILE_KEY); + assertThat(SharedPreferencesHelper.getPeopleTileKey(mSecondWidgetIdSp)) + .isEqualTo(PEOPLE_TILE_KEY); + + assertThat(mFollowUpSp.getStringSet(PEOPLE_TILE_KEY.toString(), new HashSet<>())) + .containsExactly(WIDGET_ID_STRING, SECOND_WIDGET_ID_STRING); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java index c48f26b8c853..05bef4c2aeb7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java @@ -73,6 +73,7 @@ import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.Person; +import android.app.backup.BackupManager; import android.app.people.ConversationChannel; import android.app.people.ConversationStatus; import android.app.people.IPeopleManager; @@ -102,7 +103,9 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; +import com.android.systemui.people.PeopleBackupFollowUpJob; import com.android.systemui.people.PeopleSpaceUtils; +import com.android.systemui.people.SharedPreferencesHelper; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; import com.android.systemui.statusbar.SbnBuilder; @@ -141,6 +144,7 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { private static final String TEST_PACKAGE_A = "com.android.systemui.tests"; private static final String TEST_PACKAGE_B = "com.test.package_b"; + private static final String TEST_PACKAGE_C = "com.test.package_c"; private static final String TEST_CHANNEL_ID = "channel_id"; private static final String TEST_CHANNEL_NAME = "channel_name"; private static final String TEST_PARENT_CHANNEL_ID = "parent_channel_id"; @@ -151,8 +155,14 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { private static final int WIDGET_ID_WITH_KEY_IN_OPTIONS = 4; private static final int WIDGET_ID_WITH_SAME_URI = 5; private static final int WIDGET_ID_WITH_DIFFERENT_URI = 6; + private static final int WIDGET_ID_8 = 8; + private static final int WIDGET_ID_9 = 9; + private static final int WIDGET_ID_11 = 11; + private static final int WIDGET_ID_14 = 14; + private static final int WIDGET_ID_15 = 15; private static final String SHORTCUT_ID = "101"; private static final String OTHER_SHORTCUT_ID = "102"; + private static final String THIRD_SHORTCUT_ID = "103"; private static final String NOTIFICATION_KEY = "0|com.android.systemui.tests|0|null|0"; private static final String NOTIFICATION_CONTENT_1 = "message text 1"; private static final Uri URI = Uri.parse("fake_uri"); @@ -195,6 +205,20 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { | SUPPRESSED_EFFECT_NOTIFICATION_LIST; private static final long SBN_POST_TIME = 567L; + private static final Map<String, String> WIDGETS_MAPPING = Map.of( + String.valueOf(WIDGET_ID_8), String.valueOf(WIDGET_ID_WITH_SHORTCUT), + String.valueOf(WIDGET_ID_9), String.valueOf(WIDGET_ID_WITHOUT_SHORTCUT), + String.valueOf(WIDGET_ID_11), String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), + String.valueOf(WIDGET_ID_14), String.valueOf(WIDGET_ID_WITH_SAME_URI), + String.valueOf(WIDGET_ID_15), String.valueOf(WIDGET_ID_WITH_DIFFERENT_URI) + ); + + private static final Map<String, String> WIDGETS_MAPPING_CROSS_MAPPING = Map.of( + String.valueOf(WIDGET_ID_WITH_SHORTCUT), String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), + String.valueOf(WIDGET_ID_WITHOUT_SHORTCUT), String.valueOf(WIDGET_ID_WITHOUT_SHORTCUT), + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), String.valueOf(WIDGET_ID_WITH_SHORTCUT) + ); + private ShortcutInfo mShortcutInfo; private NotificationEntry mNotificationEntry; @@ -228,6 +252,8 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { private NotificationManager.Policy mNotificationPolicy; @Mock private Bubbles mBubbles; + @Mock + private BackupManager mBackupManager; @Captor private ArgumentCaptor<NotificationHandler> mListenerCaptor; @@ -246,8 +272,8 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { mDependency.injectTestDependency(NotificationEntryManager.class, mNotificationEntryManager); mManager = new PeopleSpaceWidgetManager(mContext, mAppWidgetManager, mIPeopleManager, mPeopleManager, mLauncherApps, mNotificationEntryManager, mPackageManager, - Optional.of(mBubbles), mUserManager, mINotificationManager, mNotificationManager, - mFakeExecutor); + Optional.of(mBubbles), mUserManager, mBackupManager, mINotificationManager, + mNotificationManager, mFakeExecutor); mManager.attach(mListenerService); verify(mListenerService).addNotificationHandler(mListenerCaptor.capture()); @@ -1410,6 +1436,116 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase { assertThat(tile.getNotificationPolicyState()).isEqualTo(expected | SHOW_CONVERSATIONS); } + @Test + public void testRemapWidgetFiles() { + setStorageForTile(SHORTCUT_ID, TEST_PACKAGE_A, WIDGET_ID_8, URI); + setStorageForTile(OTHER_SHORTCUT_ID, TEST_PACKAGE_B, WIDGET_ID_11, URI); + + mManager.remapWidgetFiles(WIDGETS_MAPPING); + + SharedPreferences sp1 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_WITH_SHORTCUT), Context.MODE_PRIVATE); + PeopleTileKey key1 = SharedPreferencesHelper.getPeopleTileKey(sp1); + assertThat(key1.getShortcutId()).isEqualTo(SHORTCUT_ID); + assertThat(key1.getPackageName()).isEqualTo(TEST_PACKAGE_A); + + SharedPreferences sp4 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), Context.MODE_PRIVATE); + PeopleTileKey key4 = SharedPreferencesHelper.getPeopleTileKey(sp4); + assertThat(key4.getShortcutId()).isEqualTo(OTHER_SHORTCUT_ID); + assertThat(key4.getPackageName()).isEqualTo(TEST_PACKAGE_B); + + SharedPreferences sp8 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_8), Context.MODE_PRIVATE); + PeopleTileKey key8 = SharedPreferencesHelper.getPeopleTileKey(sp8); + assertThat(key8.getShortcutId()).isNull(); + assertThat(key8.getPackageName()).isNull(); + + SharedPreferences sp11 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_11), Context.MODE_PRIVATE); + PeopleTileKey key11 = SharedPreferencesHelper.getPeopleTileKey(sp11); + assertThat(key11.getShortcutId()).isNull(); + assertThat(key11.getPackageName()).isNull(); + } + + @Test + public void testRemapWidgetFiles_crossMapping() { + setStorageForTile(SHORTCUT_ID, TEST_PACKAGE_A, WIDGET_ID_WITH_SHORTCUT, URI); + setStorageForTile(OTHER_SHORTCUT_ID, TEST_PACKAGE_B, WIDGET_ID_WITHOUT_SHORTCUT, URI); + setStorageForTile(THIRD_SHORTCUT_ID, TEST_PACKAGE_C, WIDGET_ID_WITH_KEY_IN_OPTIONS, URI); + + mManager.remapWidgetFiles(WIDGETS_MAPPING_CROSS_MAPPING); + + SharedPreferences sp1 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_WITH_SHORTCUT), Context.MODE_PRIVATE); + PeopleTileKey key1 = SharedPreferencesHelper.getPeopleTileKey(sp1); + assertThat(key1.getShortcutId()).isEqualTo(THIRD_SHORTCUT_ID); + assertThat(key1.getPackageName()).isEqualTo(TEST_PACKAGE_C); + + SharedPreferences sp2 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_WITHOUT_SHORTCUT), Context.MODE_PRIVATE); + PeopleTileKey key2 = SharedPreferencesHelper.getPeopleTileKey(sp2); + assertThat(key2.getShortcutId()).isEqualTo(OTHER_SHORTCUT_ID); + assertThat(key2.getPackageName()).isEqualTo(TEST_PACKAGE_B); + + SharedPreferences sp4 = mContext.getSharedPreferences( + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), Context.MODE_PRIVATE); + PeopleTileKey key4 = SharedPreferencesHelper.getPeopleTileKey(sp4); + assertThat(key4.getShortcutId()).isEqualTo(SHORTCUT_ID); + assertThat(key4.getPackageName()).isEqualTo(TEST_PACKAGE_A); + } + + @Test + public void testRemapSharedFile() { + setStorageForTile(SHORTCUT_ID, TEST_PACKAGE_A, WIDGET_ID_8, URI); + setStorageForTile(OTHER_SHORTCUT_ID, TEST_PACKAGE_B, WIDGET_ID_11, URI); + + mManager.remapSharedFile(WIDGETS_MAPPING); + + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext); + + assertThat(sp.getString(String.valueOf(WIDGET_ID_8), null)).isNull(); + assertThat(sp.getString(String.valueOf(WIDGET_ID_11), null)).isNull(); + assertThat(sp.getString(String.valueOf(WIDGET_ID_WITH_SHORTCUT), null)) + .isEqualTo(URI.toString()); + assertThat(sp.getString(String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS), null)) + .isEqualTo(URI.toString()); + + assertThat(sp.getStringSet(URI.toString(), new HashSet<>())).containsExactly( + String.valueOf(WIDGET_ID_WITH_SHORTCUT), + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS)); + + PeopleTileKey key8 = new PeopleTileKey(SHORTCUT_ID, 0, TEST_PACKAGE_A); + assertThat(sp.getStringSet(key8.toString(), new HashSet<>())).containsExactly( + String.valueOf(WIDGET_ID_WITH_SHORTCUT)); + + PeopleTileKey key11 = new PeopleTileKey(OTHER_SHORTCUT_ID, 0, TEST_PACKAGE_B); + assertThat(sp.getStringSet(key11.toString(), new HashSet<>())).containsExactly( + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS)); + } + + @Test + public void testRemapFollowupFile() { + PeopleTileKey key8 = new PeopleTileKey(SHORTCUT_ID, 0, TEST_PACKAGE_A); + PeopleTileKey key11 = new PeopleTileKey(OTHER_SHORTCUT_ID, 0, TEST_PACKAGE_B); + Set<String> set8 = new HashSet<>(Collections.singleton(String.valueOf(WIDGET_ID_8))); + Set<String> set11 = new HashSet<>(Collections.singleton(String.valueOf(WIDGET_ID_11))); + + SharedPreferences followUp = mContext.getSharedPreferences( + PeopleBackupFollowUpJob.SHARED_FOLLOW_UP, Context.MODE_PRIVATE); + SharedPreferences.Editor followUpEditor = followUp.edit(); + followUpEditor.putStringSet(key8.toString(), set8); + followUpEditor.putStringSet(key11.toString(), set11); + followUpEditor.apply(); + + mManager.remapFollowupFile(WIDGETS_MAPPING); + + assertThat(followUp.getStringSet(key8.toString(), new HashSet<>())).containsExactly( + String.valueOf(WIDGET_ID_WITH_SHORTCUT)); + assertThat(followUp.getStringSet(key11.toString(), new HashSet<>())).containsExactly( + String.valueOf(WIDGET_ID_WITH_KEY_IN_OPTIONS)); + } + private void setFinalField(String fieldName, int value) { try { Field field = NotificationManager.Policy.class.getDeclaredField(fieldName); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java index 1f066d81793a..65e5f9703d84 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java @@ -127,7 +127,7 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { when(mQSPanel.getDumpableTag()).thenReturn("QSPanel"); when(mQSPanel.openPanelEvent()).thenReturn(QSEvent.QS_PANEL_EXPANDED); when(mQSPanel.closePanelEvent()).thenReturn(QSEvent.QS_PANEL_COLLAPSED); - when(mQSPanel.createRegularTileLayout()).thenReturn(mPagedTileLayout); + when(mQSPanel.getOrCreateTileLayout()).thenReturn(mPagedTileLayout); when(mQSPanel.getTileLayout()).thenReturn(mPagedTileLayout); when(mQSTile.getTileSpec()).thenReturn("dnd"); when(mQSTileHost.getTiles()).thenReturn(Collections.singleton(mQSTile)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.java index 53eae8c46d2f..bf6c981bf05c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.java @@ -107,7 +107,7 @@ public class QSPanelControllerTest extends SysuiTestCase { when(mQSPanel.isAttachedToWindow()).thenReturn(true); when(mQSPanel.getDumpableTag()).thenReturn("QSPanel"); - when(mQSPanel.createRegularTileLayout()).thenReturn(mPagedTileLayout); + when(mQSPanel.getOrCreateTileLayout()).thenReturn(mPagedTileLayout); when(mQSPanel.getTileLayout()).thenReturn(mPagedTileLayout); when(mQSTileHost.getTiles()).thenReturn(Collections.singleton(mQSTile)); when(mQSTileHost.createTileView(any(), eq(mQSTile), anyBoolean())).thenReturn(mQSTileView); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java index 7caf0ddf6bea..770cf2ca0331 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java @@ -204,6 +204,8 @@ public class QSSecurityFooterTest extends SysuiTestCase { public void testTappableView_profileOwnerOfOrgOwnedDevice_networkLoggingEnabled() { when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(true); when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(true); + when(mSecurityController.hasWorkProfile()).thenReturn(true); mFooter.refreshState(); @@ -213,6 +215,19 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testUntappableView_profileOwnerOfOrgOwnedDevice_workProfileOff() { + when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(true); + when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(false); + + mFooter.refreshState(); + + TestableLooper.get(this).processAllMessages(); + assertFalse(mRootView.isClickable()); + assertEquals(View.GONE, mRootView.findViewById(R.id.footer_icon).getVisibility()); + } + + @Test public void testNetworkLoggingEnabled_deviceOwner() { when(mSecurityController.isDeviceManaged()).thenReturn(true); when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); @@ -237,9 +252,10 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test - public void testNetworkLoggingEnabled_managedProfileOwner() { + public void testNetworkLoggingEnabled_managedProfileOwner_workProfileOn() { when(mSecurityController.hasWorkProfile()).thenReturn(true); when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(true); mFooter.refreshState(); TestableLooper.get(this).processAllMessages(); @@ -249,6 +265,17 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testNetworkLoggingEnabled_managedProfileOwner_workProfileOff() { + when(mSecurityController.hasWorkProfile()).thenReturn(true); + when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(false); + mFooter.refreshState(); + + TestableLooper.get(this).processAllMessages(); + assertEquals("", mFooterText.getText()); + } + + @Test public void testManagedCACertsInstalled() { when(mSecurityController.isDeviceManaged()).thenReturn(true); when(mSecurityController.hasCACertInCurrentUser()).thenReturn(true); @@ -326,9 +353,10 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test - public void testWorkProfileCACertsInstalled() { + public void testWorkProfileCACertsInstalled_workProfileOn() { when(mSecurityController.isDeviceManaged()).thenReturn(false); when(mSecurityController.hasCACertInWorkProfile()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(true); mFooter.refreshState(); TestableLooper.get(this).processAllMessages(); @@ -350,6 +378,17 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testWorkProfileCACertsInstalled_workProfileOff() { + when(mSecurityController.isDeviceManaged()).thenReturn(false); + when(mSecurityController.hasCACertInWorkProfile()).thenReturn(true); + when(mSecurityController.isWorkProfileOn()).thenReturn(false); + mFooter.refreshState(); + + TestableLooper.get(this).processAllMessages(); + assertEquals("", mFooterText.getText()); + } + + @Test public void testCACertsInstalled() { when(mSecurityController.isDeviceManaged()).thenReturn(false); when(mSecurityController.hasCACertInCurrentUser()).thenReturn(true); @@ -375,9 +414,10 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test - public void testWorkProfileVpnEnabled() { + public void testWorkProfileVpnEnabled_workProfileOn() { when(mSecurityController.isVpnEnabled()).thenReturn(true); when(mSecurityController.getWorkProfileVpnName()).thenReturn(VPN_PACKAGE_2); + when(mSecurityController.isWorkProfileOn()).thenReturn(true); mFooter.refreshState(); TestableLooper.get(this).processAllMessages(); @@ -389,6 +429,17 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testWorkProfileVpnEnabled_workProfileOff() { + when(mSecurityController.isVpnEnabled()).thenReturn(true); + when(mSecurityController.getWorkProfileVpnName()).thenReturn(VPN_PACKAGE_2); + when(mSecurityController.isWorkProfileOn()).thenReturn(false); + mFooter.refreshState(); + + TestableLooper.get(this).processAllMessages(); + assertEquals("", mFooterText.getText()); + } + + @Test public void testProfileOwnerOfOrganizationOwnedDeviceNoName() { when(mSecurityController.isProfileOwnerOfOrganizationOwnedDevice()).thenReturn(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java index 69bdcbcff270..f208b807f747 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java @@ -39,7 +39,6 @@ import android.os.Looper; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; -import android.util.FeatureFlagUtils; import android.view.View; import androidx.annotation.Nullable; @@ -65,6 +64,7 @@ import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.settings.UserTracker; import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.phone.AutoTileManager; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; @@ -140,9 +140,9 @@ public class QSTileHostTest extends SysuiTestCase { // TODO(b/174753536): Remove the mMockingSession when // FeatureFlagUtils.SETTINGS_PROVIDER_MODEL is removed. mMockingSession = ExtendedMockito.mockitoSession().strictness(Strictness.LENIENT) - .mockStatic(FeatureFlagUtils.class).startMocking(); - ExtendedMockito.doReturn(false).when(() -> FeatureFlagUtils.isEnabled(mContext, - FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)); + .mockStatic(FeatureFlags.class).startMocking(); + ExtendedMockito.doReturn(false) + .when(() -> FeatureFlags.isProviderModelSettingEnabled(mContext)); MockitoAnnotations.initMocks(this); mLooper = TestableLooper.get(this); mHandler = new Handler(mLooper.getLooper()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickStatusBarHeaderControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickStatusBarHeaderControllerTest.kt index 7ac6f8212a61..f140eb85e76d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QuickStatusBarHeaderControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QuickStatusBarHeaderControllerTest.kt @@ -32,6 +32,7 @@ import com.android.systemui.privacy.PrivacyItemController import com.android.systemui.privacy.logging.PrivacyLogger import com.android.systemui.qs.carrier.QSCarrierGroup import com.android.systemui.qs.carrier.QSCarrierGroupController +import com.android.systemui.statusbar.FeatureFlags import com.android.systemui.statusbar.phone.StatusBarIconController import com.android.systemui.statusbar.phone.StatusIconContainer import com.android.systemui.statusbar.policy.Clock @@ -90,6 +91,8 @@ class QuickStatusBarHeaderControllerTest : SysuiTestCase() { private lateinit var mockView: View @Mock(answer = Answers.RETURNS_DEEP_STUBS) private lateinit var context: Context + @Mock + private lateinit var featureFlags: FeatureFlags private val qsExpansionPathInterpolator = QSExpansionPathInterpolator() @@ -117,7 +120,8 @@ class QuickStatusBarHeaderControllerTest : SysuiTestCase() { privacyLogger, colorExtractor, privacyDialogController, - qsExpansionPathInterpolator + qsExpansionPathInterpolator, + featureFlags ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java index 876acc12f7db..9ae606901a91 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java @@ -35,6 +35,7 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.CarrierTextManager; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; import com.android.systemui.util.CarrierConfigTracker; @@ -70,6 +71,7 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { @Mock private CarrierConfigTracker mCarrierConfigTracker; private TestableLooper mTestableLooper; + @Mock private FeatureFlags mFeatureFlags; @Before public void setup() throws Exception { @@ -102,7 +104,8 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { mQSCarrierGroupController = new QSCarrierGroupController.Builder( mActivityStarter, handler, TestableLooper.get(this).getLooper(), - mNetworkController, mCarrierTextControllerBuilder, mContext, mCarrierConfigTracker) + mNetworkController, mCarrierTextControllerBuilder, mContext, mCarrierConfigTracker, + mFeatureFlags) .setQSCarrierGroup(mQSCarrierGroup) .build(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java index 104b6250b62f..9bee47db3e87 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierTest.java @@ -62,14 +62,14 @@ public class QSCarrierTest extends SysuiTestCase { @Test public void testUpdateState_first() { - CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); + CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false, false); assertTrue(mQSCarrier.updateState(c)); } @Test public void testUpdateState_same() { - CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); + CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false, false); assertTrue(mQSCarrier.updateState(c)); assertFalse(mQSCarrier.updateState(c)); @@ -77,7 +77,7 @@ public class QSCarrierTest extends SysuiTestCase { @Test public void testUpdateState_changed() { - CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false); + CellSignalState c = new CellSignalState(true, mSignalIconId, "", "", false, false); assertTrue(mQSCarrier.updateState(c)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java index f2f4f07725c9..4a1411a329be 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java @@ -60,6 +60,7 @@ import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.qs.QSTileHost; import com.android.systemui.settings.UserTracker; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -113,6 +114,7 @@ public class TileQueryHelperTest extends SysuiTestCase { private PackageManager mPackageManager; @Mock private UserTracker mUserTracker; + @Mock private FeatureFlags mFeatureFlags; @Captor private ArgumentCaptor<List<TileQueryHelper.TileInfo>> mCaptor; @@ -150,7 +152,8 @@ public class TileQueryHelperTest extends SysuiTestCase { FakeSystemClock clock = new FakeSystemClock(); mMainExecutor = new FakeExecutor(clock); mBgExecutor = new FakeExecutor(clock); - mTileQueryHelper = new TileQueryHelper(mContext, mUserTracker, mMainExecutor, mBgExecutor); + mTileQueryHelper = new TileQueryHelper( + mContext, mUserTracker, mMainExecutor, mBgExecutor, mFeatureFlags); mTileQueryHelper.setListener(mListener); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java index a50cbe5adc48..a70c2be4954e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java @@ -43,6 +43,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Handler; import android.service.quickaccesswallet.GetWalletCardsError; @@ -93,6 +94,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { private static final Icon CARD_IMAGE = Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)); + private final Drawable mTileIcon = mContext.getDrawable(R.drawable.ic_qs_wallet); private final Intent mWalletIntent = new Intent(QuickAccessWalletService.ACTION_VIEW_WALLET) .setComponent(new ComponentName(mContext.getPackageName(), "WalletActivity")); @@ -137,6 +139,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { when(mHost.getContext()).thenReturn(mSpiedContext); when(mHost.getUiEventLogger()).thenReturn(mUiEventLogger); when(mQuickAccessWalletClient.getServiceLabel()).thenReturn(LABEL); + when(mQuickAccessWalletClient.getTileIcon()).thenReturn(mTileIcon); when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(true); when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(true); when(mQuickAccessWalletClient.isWalletFeatureAvailableWhenDeviceLocked()).thenReturn(true); @@ -175,6 +178,15 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + public void testWalletFeatureUnavailable_recreateWalletClient() { + when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(false); + + mTile.handleSetListening(true); + + verify(mController, times(1)).reCreateWalletClient(); + } + + @Test public void testIsAvailable_qawFeatureAvailable() { when(mPackageManager.hasSystemFeature(FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(true); when(mPackageManager.hasSystemFeature("org.chromium.arc")).thenReturn(false); @@ -246,6 +258,18 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { @Test public void testHandleUpdateState_updateLabelAndIcon() { QSTile.State state = new QSTile.State(); + + mTile.handleUpdateState(state, null); + + assertEquals(LABEL, state.label.toString()); + assertTrue(state.label.toString().contentEquals(state.contentDescription)); + assertEquals(mTileIcon, state.icon.getDrawable(mContext)); + } + + @Test + public void testHandleUpdateState_updateLabelAndIcon_noIconFromApi() { + when(mQuickAccessWalletClient.getTileIcon()).thenReturn(null); + QSTile.State state = new QSTile.State(); QSTile.Icon icon = QSTileImpl.ResourceIcon.get(R.drawable.ic_wallet_lockscreen); mTile.handleUpdateState(state, null); @@ -267,6 +291,41 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + public void testHandleUpdateState_walletIsUpdating() { + when(mKeyguardStateController.isUnlocked()).thenReturn(true); + QSTile.State state = new QSTile.State(); + GetWalletCardsResponse response = + new GetWalletCardsResponse( + Collections.singletonList(createWalletCard(mContext)), 0); + + mTile.handleSetListening(true); + + verify(mController).queryWalletCards(mCallbackCaptor.capture()); + + // Wallet cards fetching on its way; wallet updating. + mTile.handleUpdateState(state, null); + + assertEquals(Tile.STATE_INACTIVE, state.state); + assertEquals( + mContext.getString(R.string.wallet_secondary_label_updating), state.secondaryLabel); + assertNotNull(state.stateDescription); + assertNull(state.sideViewCustomDrawable); + + // Wallet cards fetching completed. + mCallbackCaptor.getValue().onWalletCardsRetrieved(response); + mTestableLooper.processAllMessages(); + + mTile.handleUpdateState(state, null); + + assertEquals(Tile.STATE_ACTIVE, state.state); + assertEquals( + "•••• 1234", + state.secondaryLabel); + assertNotNull(state.stateDescription); + assertNotNull(state.sideViewCustomDrawable); + } + + @Test public void testHandleUpdateState_hasCard_deviceLocked_tileInactive() { when(mKeyguardStateController.isUnlocked()).thenReturn(false); QSTile.State state = new QSTile.State(); @@ -315,7 +374,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test - public void testHandleUpdateState_qawFeatureUnavailable_tileUnavailable() { + public void testHandleUpdateState_qawServiceUnavailable_tileUnavailable() { when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false); QSTile.State state = new QSTile.State(); @@ -327,6 +386,18 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + public void testHandleUpdateState_qawFeatureUnavailable_tileUnavailable() { + when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(false); + QSTile.State state = new QSTile.State(); + + mTile.handleUpdateState(state, null); + + assertEquals(Tile.STATE_UNAVAILABLE, state.state); + assertNull(state.stateDescription); + assertNull(state.sideViewCustomDrawable); + } + + @Test public void testHandleSetListening_queryCards() { mTile.handleSetListening(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index b8db1156b85d..1ba3831277cd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -72,7 +72,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IBatteryStats; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.settingslib.Utils; import com.android.settingslib.fuelgauge.BatteryStatus; import com.android.systemui.R; import com.android.systemui.SysuiTestCase; @@ -248,8 +247,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { verifyIndicationMessage(INDICATION_TYPE_ALIGNMENT, mContext.getResources().getString(R.string.dock_alignment_slow_charging)); - assertThat(mKeyguardIndicationCaptor.getValue().getTextColor()) - .isEqualTo(Utils.getColorError(mContext)); + assertThat(mKeyguardIndicationCaptor.getValue().getTextColor().getDefaultColor()) + .isEqualTo(mContext.getColor(R.color.misalignment_text_color)); } @Test @@ -265,8 +264,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { verifyIndicationMessage(INDICATION_TYPE_ALIGNMENT, mContext.getResources().getString(R.string.dock_alignment_not_charging)); - assertThat(mKeyguardIndicationCaptor.getValue().getTextColor()) - .isEqualTo(Utils.getColorError(mContext)); + assertThat(mKeyguardIndicationCaptor.getValue().getTextColor().getDefaultColor()) + .isEqualTo(mContext.getColor(R.color.misalignment_text_color)); } @Test @@ -680,7 +679,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { private void verifyHideIndication(int type) { if (type == INDICATION_TYPE_TRANSIENT) { verify(mRotateTextViewController).hideTransient(); - verify(mRotateTextViewController, never()).showTransient(anyString(), anyBoolean()); + verify(mRotateTextViewController, never()).showTransient(anyString()); } else { verify(mRotateTextViewController).hideIndication(type); verify(mRotateTextViewController, never()).updateIndication(eq(type), @@ -689,10 +688,10 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { } private void verifyTransientMessage(String message) { - verify(mRotateTextViewController).showTransient(eq(message), anyBoolean()); + verify(mRotateTextViewController).showTransient(eq(message)); } private void verifyNoTransientMessage() { - verify(mRotateTextViewController, never()).showTransient(any(), anyBoolean()); + verify(mRotateTextViewController, never()).showTransient(any()); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java index 35c92b6e4941..8e949e7d1e37 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java @@ -161,7 +161,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { String mimeType = "image/jpeg"; String text = "image inserted"; StatusBarNotification newSbn = - mRemoteInputManager.rebuildNotificationWithRemoteInput( + mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( mEntry, text, false, mimeType, uri); RemoteInputHistoryItem[] messages = (RemoteInputHistoryItem[]) newSbn.getNotification() .extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); @@ -174,7 +174,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { @Test public void testRebuildWithRemoteInput_noExistingInputNoSpinner() { StatusBarNotification newSbn = - mRemoteInputManager.rebuildNotificationWithRemoteInput( + mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( mEntry, "A Reply", false, null, null); RemoteInputHistoryItem[] messages = (RemoteInputHistoryItem[]) newSbn.getNotification() .extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); @@ -189,7 +189,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { @Test public void testRebuildWithRemoteInput_noExistingInputWithSpinner() { StatusBarNotification newSbn = - mRemoteInputManager.rebuildNotificationWithRemoteInput( + mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( mEntry, "A Reply", true, null, null); RemoteInputHistoryItem[] messages = (RemoteInputHistoryItem[]) newSbn.getNotification() .extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); @@ -205,14 +205,14 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { public void testRebuildWithRemoteInput_withExistingInput() { // Setup a notification entry with 1 remote input. StatusBarNotification newSbn = - mRemoteInputManager.rebuildNotificationWithRemoteInput( + mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( mEntry, "A Reply", false, null, null); NotificationEntry entry = new NotificationEntryBuilder() .setSbn(newSbn) .build(); // Try rebuilding to add another reply. - newSbn = mRemoteInputManager.rebuildNotificationWithRemoteInput( + newSbn = mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( entry, "Reply 2", true, null, null); RemoteInputHistoryItem[] messages = (RemoteInputHistoryItem[]) newSbn.getNotification() .extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); @@ -228,14 +228,14 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { String mimeType = "image/jpeg"; String text = "image inserted"; StatusBarNotification newSbn = - mRemoteInputManager.rebuildNotificationWithRemoteInput( + mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( mEntry, text, false, mimeType, uri); NotificationEntry entry = new NotificationEntryBuilder() .setSbn(newSbn) .build(); // Try rebuilding to add another reply. - newSbn = mRemoteInputManager.rebuildNotificationWithRemoteInput( + newSbn = mRemoteInputManager.rebuildNotificationWithRemoteInputInserted( entry, "Reply 2", true, null, null); RemoteInputHistoryItem[] messages = (RemoteInputHistoryItem[]) newSbn.getNotification() .extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt index 3a948f18ad82..540d2918319f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt @@ -44,15 +44,16 @@ class NotificationSectionsFeatureManagerTest : SysuiTestCase() { public fun setup() { manager = NotificationSectionsFeatureManager(proxyFake, mContext) manager!!.clearCache() - originalQsMediaPlayer = Settings.System.getInt(context.getContentResolver(), - "qs_media_player", 1) - Settings.Global.putInt(context.getContentResolver(), "qs_media_player", 0) + originalQsMediaPlayer = Settings.Global.getInt(context.getContentResolver(), + Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1) + Settings.Global.putInt(context.getContentResolver(), + Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 0) } @After public fun teardown() { - Settings.Global.putInt(context.getContentResolver(), "qs_media_player", - originalQsMediaPlayer) + Settings.Global.putInt(context.getContentResolver(), + Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, originalQsMediaPlayer) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java index f485b465e486..9640423425f5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java @@ -38,6 +38,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.R; import com.android.systemui.SysuiBaseFragmentTest; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; @@ -229,7 +230,8 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { mOngoingCallController, mAnimationScheduler, mLocationPublisher, - mMockNotificationAreaController); + mMockNotificationAreaController, + mock(FeatureFlags.class)); } private void setUpNotificationIconAreaController() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java index 226c4668ba55..690b8415762d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java @@ -323,7 +323,8 @@ public class KeyguardClockPositionAlgorithmTest extends SysuiTestCase { // WHEN the clock position algorithm is run positionClock(); // THEN the notif padding is zero. - assertThat(mClockPosition.stackScrollerPadding).isEqualTo(0); + assertThat(mClockPosition.stackScrollerPadding).isEqualTo( + (int) (mKeyguardStatusHeight * .667f)); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java index 2693b949f6ff..a6fc02d7dafc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java @@ -100,9 +100,11 @@ import com.android.systemui.statusbar.KeyguardAffordanceView; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.LockscreenShadeTransitionController; import com.android.systemui.statusbar.NotificationLockscreenUserManager; +import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationShadeDepthController; import com.android.systemui.statusbar.NotificationShelfController; import com.android.systemui.statusbar.PulseExpansionHandler; +import com.android.systemui.statusbar.RemoteInputController; import com.android.systemui.statusbar.StatusBarStateControllerImpl; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.VibratorHelper; @@ -289,6 +291,10 @@ public class NotificationPanelViewTest extends SysuiTestCase { private FragmentHostManager mFragmentHostManager; @Mock private QuickAccessWalletController mQuickAccessWalletController; + @Mock + private NotificationRemoteInputManager mNotificationRemoteInputManager; + @Mock + private RemoteInputController mRemoteInputController; private SysuiStatusBarStateController mStatusBarStateController; private NotificationPanelViewController mNotificationPanelViewController; @@ -384,6 +390,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { .thenReturn(mKeyguardStatusView); when(mLayoutInflater.inflate(eq(R.layout.keyguard_bottom_area), any(), anyBoolean())) .thenReturn(mKeyguardBottomArea); + when(mNotificationRemoteInputManager.getController()).thenReturn(mRemoteInputController); + when(mRemoteInputController.isRemoteInputActive()).thenReturn(false); reset(mView); @@ -427,7 +435,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { mQuickAccessWalletController, new FakeExecutor(new FakeSystemClock()), mSecureSettings, - mUnlockedScreenOffAnimationController); + mUnlockedScreenOffAnimationController, + mNotificationRemoteInputManager); mNotificationPanelViewController.initDependencies( mStatusBar, mNotificationShelfController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java index b03712c2d997..038645637f21 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java @@ -88,6 +88,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController, mColorExtractor, mDumpManager, mKeyguardStateController, mUnlockedScreenOffAnimationController); + mNotificationShadeWindowController.setScrimsVisibilityListener((visibility) -> {}); mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView); mNotificationShadeWindowController.attach(); @@ -138,6 +139,28 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { } @Test + public void attach_lightScrimHidesWallpaper() { + when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true); + mNotificationShadeWindowController.attach(); + + clearInvocations(mWindowManager); + mNotificationShadeWindowController.setLightRevealScrimAmount(0f); + verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture()); + assertThat((mLayoutParameters.getValue().flags & FLAG_SHOW_WALLPAPER) == 0).isTrue(); + } + + @Test + public void attach_scrimHidesWallpaper() { + when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true); + mNotificationShadeWindowController.attach(); + + clearInvocations(mWindowManager); + mNotificationShadeWindowController.setScrimsVisibility(ScrimController.OPAQUE); + verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture()); + assertThat((mLayoutParameters.getValue().flags & FLAG_SHOW_WALLPAPER) == 0).isTrue(); + } + + @Test public void attach_animatingKeyguardAndSurface_wallpaperVisible() { clearInvocations(mWindowManager); when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java index f147f1cec9ed..e3263d4ca6b3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java @@ -31,6 +31,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.plugins.DarkIconDispatcher; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.StatusBarMobileView; import com.android.systemui.statusbar.StatusBarWifiView; @@ -66,7 +67,7 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { @Test public void testSetCalledOnAdd_DarkIconManager() { LinearLayout layout = new LinearLayout(mContext); - TestDarkIconManager manager = new TestDarkIconManager(layout); + TestDarkIconManager manager = new TestDarkIconManager(layout, mock(FeatureFlags.class)); testCallOnAdd_forManager(manager); } @@ -103,8 +104,8 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { private static class TestDarkIconManager extends DarkIconManager implements TestableIconManager { - TestDarkIconManager(LinearLayout group) { - super(group); + TestDarkIconManager(LinearLayout group, FeatureFlags featureFlags) { + super(group, featureFlags); } @Override @@ -139,7 +140,7 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { private static class TestIconManager extends IconManager implements TestableIconManager { TestIconManager(ViewGroup group) { - super(group); + super(group, mock(FeatureFlags.class)); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java index 6fbbee22a73c..9a5e948b762d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java @@ -39,6 +39,8 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardStateController; +import com.android.systemui.util.concurrency.FakeExecutor; +import com.android.systemui.util.time.FakeSystemClock; import org.junit.Before; import org.junit.Test; @@ -58,6 +60,7 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { @Mock private SysuiStatusBarStateController mStatusBarStateController; @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; @Mock private ActivityStarter mActivityStarter; + private final FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); private int mCurrentUserId = 0; private StatusBarRemoteInputCallback mRemoteInputCallback; @@ -76,7 +79,7 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { mock(NotificationGroupManagerLegacy.class), mNotificationLockscreenUserManager, mKeyguardStateController, mStatusBarStateController, mStatusBarKeyguardViewManager, mActivityStarter, mShadeController, new CommandQueue(mContext), - mock(ActionClickLogger.class))); + mock(ActionClickLogger.class), mFakeExecutor)); mRemoteInputCallback.mChallengeReceiver = mRemoteInputCallback.new ChallengeReceiver(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt index 94c9de0d2035..c81d46898ff9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt @@ -43,6 +43,7 @@ import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat +import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -117,6 +118,11 @@ class OngoingCallControllerTest : SysuiTestCase() { .thenReturn(PROC_STATE_INVISIBLE) } + @After + fun tearDown() { + controller.tearDownChipView() + } + @Test fun onEntryUpdated_isOngoingCallNotif_listenerNotified() { notifCollectionListener.onEntryUpdated(createOngoingCallNotifEntry()) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index abc66dbca2a2..f2de26c29805 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -56,7 +56,6 @@ import android.telephony.TelephonyDisplayInfo; import android.telephony.TelephonyManager; import android.testing.TestableLooper; import android.testing.TestableResources; -import android.util.FeatureFlagUtils; import android.util.Log; import androidx.test.InstrumentationRegistry; @@ -71,6 +70,7 @@ import com.android.settingslib.net.DataUsageController; import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.demomode.DemoModeController; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.MobileDataIndicators; @@ -127,6 +127,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { protected DemoModeController mDemoModeController; protected CarrierConfigTracker mCarrierConfigTracker; protected FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock()); + protected FeatureFlags mFeatureFlags; protected int mSubId; @@ -157,9 +158,13 @@ public class NetworkControllerBaseTest extends SysuiTestCase { @Before public void setUp() throws Exception { mMockingSession = ExtendedMockito.mockitoSession().strictness(Strictness.LENIENT) - .mockStatic(FeatureFlagUtils.class).startMocking(); - ExtendedMockito.doReturn(true).when(() -> FeatureFlagUtils.isEnabled(mContext, - FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)); + .mockStatic(FeatureFlags.class).startMocking(); + ExtendedMockito.doReturn(true).when(() -> + FeatureFlags.isProviderModelSettingEnabled(mContext)); + mFeatureFlags = mock(FeatureFlags.class); + when(mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()).thenReturn(false); + when(mFeatureFlags.isProviderModelSettingEnabled()).thenReturn(true); + mInstrumentation = InstrumentationRegistry.getInstrumentation(); Settings.Global.putInt(mContext.getContentResolver(), Global.AIRPLANE_MODE_ON, 0); @@ -235,7 +240,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase { mMockProvisionController, mMockBd, mDemoModeController, - mCarrierConfigTracker); + mCarrierConfigTracker, + mFeatureFlags); setupNetworkController(); // Trigger blank callbacks to always get the current state (some tests don't trigger @@ -303,7 +309,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { mock(AccessPointControllerImpl.class), mock(DataUsageController.class), mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd, mDemoModeController, - mCarrierConfigTracker); + mCarrierConfigTracker, mFeatureFlags); setupNetworkController(); @@ -571,13 +577,13 @@ public class NetworkControllerBaseTest extends SysuiTestCase { boolean cutOut) { verifyLastMobileDataIndicators( visible, icon, typeIcon, qsVisible, qsIcon, qsTypeIcon, dataIn, dataOut, cutOut, - null, null); + null, null, visible); } protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon, boolean qsVisible, int qsIcon, int qsTypeIcon, boolean dataIn, boolean dataOut, boolean cutOut, CharSequence typeContentDescription, - CharSequence typeContentDescriptionHtml) { + CharSequence typeContentDescriptionHtml, boolean showQs) { ArgumentCaptor<MobileDataIndicators> indicatorsArg = ArgumentCaptor.forClass(MobileDataIndicators.class); ArgumentCaptor<IconState> iconArg = ArgumentCaptor.forClass(IconState.class); @@ -606,7 +612,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { assertEquals("Signal icon in status bar", state, expected.statusIcon.icon); assertEquals("Visibility in status bar", visible, expected.statusIcon.visible); - if (visible) { + if (showQs) { assertEquals("Visibility in quick settings", qsVisible, expected.qsIcon.visible); assertEquals("Signal icon in quick settings", state, expected.qsIcon.icon); } else { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index 09554e717d3d..bc4c2b69e3f0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -113,7 +113,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { mock(AccessPointControllerImpl.class), mock(DataUsageController.class), mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd, mDemoModeController, - mock(CarrierConfigTracker.class)); + mock(CarrierConfigTracker.class), mFeatureFlags); setupNetworkController(); setupDefaultSignal(); @@ -133,9 +133,9 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, true, NO_DATA_STRING, NO_DATA_STRING); + false, true, NO_DATA_STRING, NO_DATA_STRING, false); } @Test @@ -148,9 +148,9 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, true, NO_DATA_STRING, NO_DATA_STRING); + false, true, NO_DATA_STRING, NO_DATA_STRING, false); } @Test @@ -164,9 +164,9 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING); + false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING, false); } @Test @@ -180,9 +180,9 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); // Verify that a SignalDrawable with a cut out is used to display data disabled. - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, - false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING); + false, false, NOT_DEFAULT_DATA_STRING, NOT_DEFAULT_DATA_STRING, false); } @Test @@ -198,8 +198,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TestableLooper.get(this).processAllMessages(); // Don't show the X until the device is setup. - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, 0, - true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, false); + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0, + true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, false, false, null, null, false); } @Test @@ -216,8 +216,8 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { setConnectivityViaCallbackInNetworkController( NetworkCapabilities.TRANSPORT_CELLULAR, false, false, null); - verifyLastMobileDataIndicators(false, DEFAULT_SIGNAL_STRENGTH, TelephonyIcons.ICON_G, - true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, false); + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, TelephonyIcons.ICON_G, + true, DEFAULT_QS_SIGNAL_STRENGTH, 0, false, false, false, null, null, false); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index 1e7801d63f75..5090b0dbc2a6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -67,7 +67,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { Looper.getMainLooper(), mFakeExecutor, mCallbackHandler, mock(AccessPointControllerImpl.class), mock(DataUsageController.class), mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd, - mDemoModeController, mock(CarrierConfigTracker.class)); + mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags); setupNetworkController(); verifyLastMobileDataIndicators(false, -1, 0); @@ -87,7 +87,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { Looper.getMainLooper(), mFakeExecutor, mCallbackHandler, mock(AccessPointControllerImpl.class), mock(DataUsageController.class), mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd, - mDemoModeController, mock(CarrierConfigTracker.class)); + mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags); mNetworkController.registerListeners(); // Wait for the main looper to execute the previous command @@ -155,7 +155,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { Looper.getMainLooper(), mFakeExecutor, mCallbackHandler, mock(AccessPointControllerImpl.class), mock(DataUsageController.class), mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd, - mDemoModeController, mock(CarrierConfigTracker.class)); + mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags); setupNetworkController(); // No Subscriptions. @@ -269,7 +269,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { setConnectivityViaCallbackInNetworkController( NetworkCapabilities.TRANSPORT_WIFI, true, true, mock(WifiInfo.class)); - verifyLastMobileDataIndicators(false, DEFAULT_LEVEL, 0); + verifyLastMobileDataIndicators(true, DEFAULT_LEVEL, 0); } // Some tests of actual NetworkController code, just internals not display stuff diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java index bd9d1a7fd657..4a5770d12239 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java @@ -256,6 +256,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { @Test public void testCallStrengh() { + if (true) return; String testSsid = "Test SSID"; setWifiEnabled(true); setWifiState(true, testSsid); @@ -278,6 +279,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { @Test public void testNonPrimaryWiFi() { + if (true) return; String testSsid = "Test SSID"; setWifiEnabled(true); setWifiState(true, testSsid); diff --git a/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayApplierTest.java b/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayApplierTest.java index eb6fc2e950c9..9c47f19b20c8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayApplierTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayApplierTest.java @@ -98,6 +98,7 @@ public class ThemeOverlayApplierTest extends SysuiTestCase { OverlayManagerTransaction.Builder mTransactionBuilder; private ThemeOverlayApplier mManager; + private boolean mGetOverlayInfoEnabled = true; @Before public void setup() throws Exception { @@ -159,7 +160,12 @@ public class ThemeOverlayApplierTest extends SysuiTestCase { OverlayInfo launcherTargetInfo = new OverlayInfo("packageName", LAUNCHER_PACKAGE, null, null, "/", 0, 0, 0, false); when(mOverlayManager.getOverlayInfo(any(OverlayIdentifier.class), any())) - .thenReturn(launcherTargetInfo); + .thenAnswer(answer -> { + if (mGetOverlayInfoEnabled) { + return launcherTargetInfo; + } + return null; + }); clearInvocations(mOverlayManager); verify(mDumpManager).registerDumpable(any(), any()); } @@ -208,6 +214,20 @@ public class ThemeOverlayApplierTest extends SysuiTestCase { } @Test + public void enablesOverlays_onlyIfItExistsForUser() { + mGetOverlayInfoEnabled = false; + + Set<UserHandle> userHandles = Sets.newHashSet(TEST_USER_HANDLES); + mManager.applyCurrentUserOverlays(ALL_CATEGORIES_MAP, null, TEST_USER.getIdentifier(), + userHandles); + + for (OverlayIdentifier overlayPackage : ALL_CATEGORIES_MAP.values()) { + verify(mTransactionBuilder, never()).setEnabled(eq(overlayPackage), eq(true), + eq(TEST_USER.getIdentifier())); + } + } + + @Test public void applyCurrentUserOverlays_createsPendingOverlays() { FabricatedOverlay[] pendingCreation = new FabricatedOverlay[]{ mock(FabricatedOverlay.class) diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java index 3640bcd64c14..d5348dc39832 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeSecurityController.java @@ -44,6 +44,11 @@ public class FakeSecurityController extends BaseLeakChecker<SecurityControllerCa } @Override + public boolean isWorkProfileOn() { + return false; + } + + @Override public boolean isProfileOwnerOfOrganizationOwnedDevice() { return false; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java index 23abce086728..ce0098e7672c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallet/controller/QuickAccessWalletControllerTest.java @@ -21,7 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -61,12 +63,10 @@ public class QuickAccessWalletControllerTest extends SysuiTestCase { private ArgumentCaptor<GetWalletCardsRequest> mRequestCaptor; private QuickAccessWalletController mController; - private TestableLooper mTestableLooper; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mTestableLooper = TestableLooper.get(this); when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(true); when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(true); when(mQuickAccessWalletClient.isWalletFeatureAvailableWhenDeviceLocked()).thenReturn(true); @@ -143,4 +143,13 @@ public class QuickAccessWalletControllerTest extends SysuiTestCase { mContext.getResources().getDimensionPixelSize(R.dimen.wallet_tile_card_view_height), request.getCardHeightPx()); } + + @Test + public void queryWalletCards_walletFeatureNotAvailable_noQuery() { + when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(false); + + mController.queryWalletCards(mCardsRetriever); + + verify(mQuickAccessWalletClient, never()).getWalletCards(any(), any(), any()); + } } diff --git a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java index ea2c7d2a41e9..2673cd1ac3b8 100644 --- a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java +++ b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java @@ -30,6 +30,7 @@ import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; import android.view.InputDevice; +import android.view.KeyCharacterMap; import android.view.MotionEvent; import android.view.WindowManagerPolicyConstants; @@ -55,7 +56,6 @@ public class MotionEventInjector extends BaseEventStreamTransformation implement */ private static final int EVENT_META_STATE = 0; private static final int EVENT_BUTTON_STATE = 0; - private static final int EVENT_DEVICE_ID = 0; private static final int EVENT_EDGE_FLAGS = 0; private static final int EVENT_SOURCE = InputDevice.SOURCE_TOUCHSCREEN; private static final int EVENT_FLAGS = 0; @@ -122,9 +122,6 @@ public class MotionEventInjector extends BaseEventStreamTransformation implement return; } cancelAnyPendingInjectedEvents(); - // The events injected from outside of system_server are not trusted. Remove the flag to - // prevent accessibility service from impersonating a real input device. - policyFlags &= ~WindowManagerPolicyConstants.FLAG_INPUTFILTER_TRUSTED; // Indicate that the input event is injected from accessibility, to let applications // distinguish it from events injected by other means. policyFlags |= WindowManagerPolicyConstants.FLAG_INJECTED_FROM_ACCESSIBILITY; @@ -483,8 +480,8 @@ public class MotionEventInjector extends BaseEventStreamTransformation implement } return MotionEvent.obtain(downTime, eventTime, action, touchPointsSize, sPointerProps, sPointerCoords, EVENT_META_STATE, EVENT_BUTTON_STATE, - EVENT_X_PRECISION, EVENT_Y_PRECISION, EVENT_DEVICE_ID, EVENT_EDGE_FLAGS, - EVENT_SOURCE, EVENT_FLAGS); + EVENT_X_PRECISION, EVENT_Y_PRECISION, KeyCharacterMap.VIRTUAL_KEYBOARD, + EVENT_EDGE_FLAGS, EVENT_SOURCE, EVENT_FLAGS); } private static int findPointByStrokeId(TouchPoint[] touchPoints, int touchPointsSize, diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 5f2d4e82883c..aa42e8deb581 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -1515,16 +1515,10 @@ final class AutofillManagerServiceImpl final int intDuration = duration > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) duration; - // NOTE: not using Helper.newLogMaker() because we're setting the componentName instead - // of package name - final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_SERVICE_DISABLED_ACTIVITY) - .setComponentName(componentName) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, getServicePackageName()) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, intDuration) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, sessionId); - if (compatMode) { - log.addTaggedData(MetricsEvent.FIELD_AUTOFILL_COMPAT_MODE, 1); - } + + final LogMaker log = Helper.newLogMaker(MetricsEvent.AUTOFILL_SERVICE_DISABLED_ACTIVITY, + componentName, getServicePackageName(), sessionId, compatMode) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, intDuration); mMetricsLogger.write(log); } } diff --git a/services/autofill/java/com/android/server/autofill/Helper.java b/services/autofill/java/com/android/server/autofill/Helper.java index e35c0ee4e59b..bc5d6457c945 100644 --- a/services/autofill/java/com/android/server/autofill/Helper.java +++ b/services/autofill/java/com/android/server/autofill/Helper.java @@ -127,8 +127,11 @@ public final class Helper { @NonNull public static LogMaker newLogMaker(int category, @NonNull ComponentName componentName, @NonNull String servicePackageName, int sessionId, boolean compatMode) { + // Remove activity name from logging + final ComponentName sanitizedComponentName = + new ComponentName(componentName.getPackageName(), ""); return newLogMaker(category, servicePackageName, sessionId, compatMode) - .setComponentName(componentName); + .setComponentName(sanitizedComponentName); } public static void printlnRedactedText(@NonNull PrintWriter pw, @Nullable CharSequence text) { diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 906edb30ff12..9ff1b10c09ed 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -455,7 +455,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind }, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> { if (err == null) { - addAssociation(association); + addAssociation(association, userId); } else { Slog.e(LOG_TAG, "Failed to discover device(s)", err); callback.onFailure("No devices found: " + err.getMessage()); @@ -646,7 +646,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } else { return association; } - })); + }), userId); restartBleScan(); } @@ -664,7 +664,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind android.Manifest.permission.ASSOCIATE_COMPANION_DEVICES, "createAssociation"); addAssociation(new Association( - userId, macAddress, packageName, null, false, System.currentTimeMillis())); + userId, macAddress, packageName, null, false, + System.currentTimeMillis()), userId); } private void checkCanCallNotificationApi(String callingPackage) throws RemoteException { @@ -738,9 +739,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind return Binder.getCallingUid() == Process.SYSTEM_UID; } - void addAssociation(Association association) { + void addAssociation(Association association, int userId) { updateSpecialAccessPermissionForAssociatedPackage(association); - recordAssociation(association); + recordAssociation(association, userId); } void removeAssociation(int userId, String pkg, String deviceMacAddress) { @@ -752,7 +753,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind onAssociationPreRemove(association); } return notMatch; - })); + }), userId); restartBleScan(); } @@ -944,13 +945,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind }, getContext(), packageName, userId).recycleOnUse()); } - private void recordAssociation(Association association) { + private void recordAssociation(Association association, int userId) { Slog.i(LOG_TAG, "recordAssociation(" + association + ")"); - updateAssociations(associations -> CollectionUtils.add(associations, association)); - } - - private void updateAssociations(Function<Set<Association>, Set<Association>> update) { - updateAssociations(update, getCallingUserId()); + updateAssociations(associations -> CollectionUtils.add(associations, association), userId); } private void updateAssociations(Function<Set<Association>, Set<Association>> update, @@ -1515,7 +1512,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind String pkg = getNextArgRequired(); String address = getNextArgRequired(); addAssociation(new Association(userId, address, pkg, null, false, - System.currentTimeMillis())); + System.currentTimeMillis()), userId); } break; diff --git a/services/core/java/com/android/server/NsdService.java b/services/core/java/com/android/server/NsdService.java index a481a6a5d339..f440ee8c4ea2 100644 --- a/services/core/java/com/android/server/NsdService.java +++ b/services/core/java/com/android/server/NsdService.java @@ -61,7 +61,7 @@ public class NsdService extends INsdManager.Stub { private static final String MDNS_TAG = "mDnsConnector"; private static final boolean DBG = true; - private static final long CLEANUP_DELAY_MS = 3000; + private static final long CLEANUP_DELAY_MS = 10000; private final Context mContext; private final NsdSettings mNsdSettings; @@ -94,19 +94,25 @@ public class NsdService extends INsdManager.Stub { return NsdManager.nameOf(what); } - void maybeStartDaemon() { + private void maybeStartDaemon() { mDaemon.maybeStart(); maybeScheduleStop(); } - void maybeScheduleStop() { + private boolean isAnyRequestActive() { + return mIdToClientInfoMap.size() != 0; + } + + private void scheduleStop() { + sendMessageDelayed(NsdManager.DAEMON_CLEANUP, mCleanupDelayMs); + } + private void maybeScheduleStop() { if (!isAnyRequestActive()) { - cancelStop(); - sendMessageDelayed(NsdManager.DAEMON_CLEANUP, mCleanupDelayMs); + scheduleStop(); } } - void cancelStop() { + private void cancelStop() { this.removeMessages(NsdManager.DAEMON_CLEANUP); } @@ -164,11 +170,16 @@ public class NsdService extends INsdManager.Stub { if (DBG) Slog.d(TAG, "Client connection lost with reason: " + msg.arg1); break; } + cInfo = mClients.get(msg.replyTo); if (cInfo != null) { cInfo.expungeAllRequests(); mClients.remove(msg.replyTo); } + //Last client + if (mClients.size() == 0) { + scheduleStop(); + } break; case AsyncChannel.CMD_CHANNEL_FULL_CONNECTION: AsyncChannel ac = new AsyncChannel(); @@ -235,7 +246,7 @@ public class NsdService extends INsdManager.Stub { public void exit() { // TODO: it is incorrect to stop the daemon without expunging all requests // and sending error callbacks to clients. - maybeScheduleStop(); + scheduleStop(); } private boolean requestLimitReached(ClientInfo clientInfo) { @@ -271,9 +282,6 @@ public class NsdService extends INsdManager.Stub { return NOT_HANDLED; case AsyncChannel.CMD_CHANNEL_DISCONNECTED: return NOT_HANDLED; - } - - switch (msg.what) { case NsdManager.DISABLE: //TODO: cleanup clients transitionTo(mDisabledState); @@ -531,10 +539,6 @@ public class NsdService extends INsdManager.Stub { } } - private boolean isAnyRequestActive() { - return mIdToClientInfoMap.size() != 0; - } - private String unescape(String s) { StringBuilder sb = new StringBuilder(s.length()); for (int i = 0; i < s.length(); ++i) { @@ -907,7 +911,6 @@ public class NsdService extends INsdManager.Stub { } mClientIds.clear(); mClientRequests.clear(); - mNsdStateMachine.maybeScheduleStop(); } // mClientIds is a sparse array of listener id -> mDnsClient id. For a given mDnsClient id, diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java index 8561042a5056..8e53101b0eab 100644 --- a/services/core/java/com/android/server/PinnerService.java +++ b/services/core/java/com/android/server/PinnerService.java @@ -517,7 +517,7 @@ public final class PinnerService extends SystemService { boolean shouldPinCamera = mConfiguredToPinCamera && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, "pin_camera", - SystemProperties.getBoolean("pinner.pin_camera", false)); + SystemProperties.getBoolean("pinner.pin_camera", true)); if (shouldPinCamera) { pinKeys.add(KEY_CAMERA); } else if (DEBUG) { diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java index e75322652386..51ad23c103dc 100644 --- a/services/core/java/com/android/server/SensorPrivacyService.java +++ b/services/core/java/com/android/server/SensorPrivacyService.java @@ -28,9 +28,9 @@ import static android.app.AppOpsManager.OP_CAMERA; import static android.app.AppOpsManager.OP_PHONE_CALL_CAMERA; import static android.app.AppOpsManager.OP_PHONE_CALL_MICROPHONE; import static android.app.AppOpsManager.OP_RECORD_AUDIO; -import static android.app.AppOpsManager.OP_RECORD_AUDIO_HOTWORD; import static android.content.Intent.EXTRA_PACKAGE_NAME; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; +import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.hardware.SensorPrivacyManager.EXTRA_ALL_SENSORS; import static android.hardware.SensorPrivacyManager.EXTRA_SENSOR; @@ -47,6 +47,7 @@ import android.app.ActivityManagerInternal; import android.app.ActivityOptions; import android.app.ActivityTaskManager; import android.app.AppOpsManager; +import android.app.AppOpsManagerInternal; import android.app.KeyguardManager; import android.app.Notification; import android.app.NotificationChannel; @@ -58,6 +59,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.graphics.drawable.Icon; import android.hardware.ISensorPrivacyListener; import android.hardware.ISensorPrivacyManager; @@ -163,6 +165,7 @@ public final class SensorPrivacyService extends SystemService { private final ActivityManagerInternal mActivityManagerInternal; private final ActivityTaskManager mActivityTaskManager; private final AppOpsManager mAppOpsManager; + private final AppOpsManagerInternal mAppOpsManagerInternal; private final TelephonyManager mTelephonyManager; private final IBinder mAppOpsRestrictionToken = new Binder(); @@ -172,16 +175,18 @@ public final class SensorPrivacyService extends SystemService { private EmergencyCallHelper mEmergencyCallHelper; private KeyguardManager mKeyguardManager; + private int mCurrentUser = -1; + public SensorPrivacyService(Context context) { super(context); mContext = context; mAppOpsManager = context.getSystemService(AppOpsManager.class); + mAppOpsManagerInternal = getLocalService(AppOpsManagerInternal.class); mUserManagerInternal = getLocalService(UserManagerInternal.class); mActivityManager = context.getSystemService(ActivityManager.class); mActivityManagerInternal = getLocalService(ActivityManagerInternal.class); mActivityTaskManager = context.getSystemService(ActivityTaskManager.class); mTelephonyManager = context.getSystemService(TelephonyManager.class); - mSensorPrivacyServiceImpl = new SensorPrivacyServiceImpl(); } @@ -201,6 +206,20 @@ public final class SensorPrivacyService extends SystemService { } } + @Override + public void onUserStarting(TargetUser user) { + if (mCurrentUser == -1) { + mCurrentUser = user.getUserIdentifier(); + setGlobalRestriction(); + } + } + + @Override + public void onUserSwitching(TargetUser from, TargetUser to) { + mCurrentUser = to.getUserIdentifier(); + setGlobalRestriction(); + } + class SensorPrivacyServiceImpl extends ISensorPrivacyManager.Stub implements AppOpsManager.OnOpNotedListener, AppOpsManager.OnOpStartedListener, IBinder.DeathRecipient, UserManagerInternal.UserRestrictionsListener { @@ -262,17 +281,6 @@ public final class SensorPrivacyService extends SystemService { if (readPersistedSensorPrivacyStateLocked()) { persistSensorPrivacyStateLocked(); } - - for (int i = 0; i < mIndividualEnabled.size(); i++) { - int userId = mIndividualEnabled.keyAt(i); - SparseBooleanArray userIndividualEnabled = - mIndividualEnabled.valueAt(i); - for (int j = 0; j < userIndividualEnabled.size(); j++) { - int sensor = userIndividualEnabled.keyAt(j); - boolean enabled = userIndividualEnabled.valueAt(j); - setUserRestriction(userId, sensor, enabled); - } - } } int[] micAndCameraOps = new int[]{OP_RECORD_AUDIO, OP_PHONE_CALL_MICROPHONE, @@ -434,7 +442,14 @@ public final class SensorPrivacyService extends SystemService { inputMethodPackageName = ComponentName.unflattenFromString( inputMethodComponent).getPackageName(); } - int capability = mActivityManagerInternal.getUidCapability(uid); + + int capability; + try { + capability = mActivityManagerInternal.getUidCapability(uid); + } catch (IllegalArgumentException e) { + Log.w(TAG, e); + return; + } if (sensor == MICROPHONE) { VoiceInteractionManagerInternal voiceInteractionManagerInternal = @@ -513,7 +528,8 @@ public final class SensorPrivacyService extends SystemService { options.setLaunchTaskId(info.mTaskId); options.setTaskOverlay(true, true); - dialogIntent.addFlags(FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + dialogIntent.addFlags( + FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | FLAG_ACTIVITY_NO_USER_ACTION); dialogIntent.putExtra(EXTRA_PACKAGE_NAME, info.mPackageName); if (sensors.size() == 1) { @@ -596,9 +612,19 @@ public final class SensorPrivacyService extends SystemService { new Intent(Settings.ACTION_PRIVACY_SETTINGS), PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT)) + .extend(new Notification.TvExtender()) + .setTimeoutAfter(isTelevision(mContext) + ? /* dismiss immediately */ 1 + : /* no timeout */ 0) .build()); } + private boolean isTelevision(Context context) { + int uiMode = context.getResources().getConfiguration().uiMode; + return (uiMode & Configuration.UI_MODE_TYPE_MASK) + == Configuration.UI_MODE_TYPE_TELEVISION; + } + /** * Sets the sensor privacy to the provided state and notifies all listeners of the new * state. @@ -1379,7 +1405,10 @@ public final class SensorPrivacyService extends SystemService { SparseArray<RemoteCallbackList<ISensorPrivacyListener>> listenersForUser = mIndividualSensorListeners.get(userId); - setUserRestriction(userId, sensor, enabled); + setGlobalRestriction(); + if (userId == mCurrentUser) { + setGlobalRestriction(); + } if (listenersForUser == null) { return; @@ -1408,16 +1437,18 @@ public final class SensorPrivacyService extends SystemService { } } - private void setUserRestriction(int userId, int sensor, boolean enabled) { - if (sensor == CAMERA) { - mAppOpsManager.setUserRestrictionForUser(OP_CAMERA, enabled, - mAppOpsRestrictionToken, null, userId); - } else if (sensor == MICROPHONE) { - mAppOpsManager.setUserRestrictionForUser(OP_RECORD_AUDIO, enabled, - mAppOpsRestrictionToken, null, userId); - mAppOpsManager.setUserRestrictionForUser(OP_RECORD_AUDIO_HOTWORD, enabled, - mAppOpsRestrictionToken, null, userId); - } + private void setGlobalRestriction() { + boolean camState = + mSensorPrivacyServiceImpl + .isIndividualSensorPrivacyEnabled(mCurrentUser, CAMERA); + boolean micState = + mSensorPrivacyServiceImpl + .isIndividualSensorPrivacyEnabled(mCurrentUser, MICROPHONE); + + mAppOpsManagerInternal + .setGlobalRestriction(OP_CAMERA, camState, mAppOpsRestrictionToken); + mAppOpsManagerInternal + .setGlobalRestriction(OP_RECORD_AUDIO, micState, mAppOpsRestrictionToken); } private final class DeathRecipient implements IBinder.DeathRecipient { @@ -1535,7 +1566,7 @@ public final class SensorPrivacyService extends SystemService { } private class EmergencyCallHelper { - private OutogingEmergencyStateCallback mEmergencyStateCallback; + private OutgoingEmergencyStateCallback mEmergencyStateCallback; private CallStateCallback mCallStateCallback; private boolean mIsInEmergencyCall; @@ -1544,7 +1575,7 @@ public final class SensorPrivacyService extends SystemService { private Object mEmergencyStateLock = new Object(); EmergencyCallHelper() { - mEmergencyStateCallback = new OutogingEmergencyStateCallback(); + mEmergencyStateCallback = new OutgoingEmergencyStateCallback(); mCallStateCallback = new CallStateCallback(); mTelephonyManager.registerTelephonyCallback(FgThread.getExecutor(), @@ -1559,7 +1590,7 @@ public final class SensorPrivacyService extends SystemService { } } - private class OutogingEmergencyStateCallback extends TelephonyCallback implements + private class OutgoingEmergencyStateCallback extends TelephonyCallback implements TelephonyCallback.OutgoingEmergencyCallListener { @Override public void onOutgoingEmergencyCall(EmergencyNumber placedEmergencyNumber, diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java index 70176a0fefeb..d483f1863258 100644 --- a/services/core/java/com/android/server/VpnManagerService.java +++ b/services/core/java/com/android/server/VpnManagerService.java @@ -357,7 +357,8 @@ public class VpnManagerService extends IVpnManager.Stub { @SuppressWarnings("AndroidFrameworkCompatChange") // This is not an app-visible API. @Override public void startLegacyVpn(VpnProfile profile) { - if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.S) { + if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.S + && VpnProfile.isLegacyType(profile.type)) { throw new UnsupportedOperationException("Legacy VPN is deprecated"); } int user = UserHandle.getUserId(mDeps.getCallingUid()); diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 2a634ebdd555..a6a8cf018eef 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -453,7 +453,7 @@ public class AccountManagerService if (!checkAccess || hasAccountAccess(account, packageName, UserHandle.getUserHandleForUid(uid))) { cancelNotification(getCredentialPermissionNotificationId(account, - AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), packageName, + AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), UserHandle.getUserHandleForUid(uid)); } } @@ -3136,8 +3136,8 @@ public class AccountManagerService String authTokenType = intent.getStringExtra( GrantCredentialsPermissionActivity.EXTRAS_AUTH_TOKEN_TYPE); final String titleAndSubtitle = - mContext.getString(R.string.permission_request_notification_with_subtitle, - account.name); + mContext.getString(R.string.permission_request_notification_for_app_with_subtitle, + getApplicationLabel(packageName), account.name); final int index = titleAndSubtitle.indexOf('\n'); String title = titleAndSubtitle; String subtitle = ""; @@ -3160,7 +3160,16 @@ public class AccountManagerService null, user)) .build(); installNotification(getCredentialPermissionNotificationId( - account, authTokenType, uid), n, packageName, user.getIdentifier()); + account, authTokenType, uid), n, "android", user.getIdentifier()); + } + + private String getApplicationLabel(String packageName) { + try { + return mPackageManager.getApplicationLabel( + mPackageManager.getApplicationInfo(packageName, 0)).toString(); + } catch (PackageManager.NameNotFoundException e) { + return packageName; + } } private Intent newGrantCredentialsPermissionIntent(Account account, String packageName, @@ -3196,7 +3205,7 @@ public class AccountManagerService nId = accounts.credentialsPermissionNotificationIds.get(key); if (nId == null) { String tag = TAG + ":" + SystemMessage.NOTE_ACCOUNT_CREDENTIAL_PERMISSION - + ":" + account.hashCode() + ":" + authTokenType.hashCode(); + + ":" + account.hashCode() + ":" + authTokenType.hashCode() + ":" + uid; int id = SystemMessage.NOTE_ACCOUNT_CREDENTIAL_PERMISSION; nId = new NotificationId(tag, id); accounts.credentialsPermissionNotificationIds.put(key, nId); @@ -4147,7 +4156,7 @@ public class AccountManagerService private void handleAuthenticatorResponse(boolean accessGranted) throws RemoteException { cancelNotification(getCredentialPermissionNotificationId(account, - AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), packageName, + AccountManager.ACCOUNT_ACCESS_TOKEN_TYPE, uid), UserHandle.getUserHandleForUid(uid)); if (callback != null) { Bundle result = new Bundle(); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 89781d3fbb0a..875ef377f442 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -36,6 +36,7 @@ import static android.os.PowerExemptionManager.REASON_DENIED; import static android.os.PowerExemptionManager.REASON_DEVICE_DEMO_MODE; import static android.os.PowerExemptionManager.REASON_DEVICE_OWNER; import static android.os.PowerExemptionManager.REASON_FGS_BINDING; +import static android.os.PowerExemptionManager.REASON_CURRENT_INPUT_METHOD; import static android.os.PowerExemptionManager.REASON_INSTR_BACKGROUND_ACTIVITY_PERMISSION; import static android.os.PowerExemptionManager.REASON_INSTR_BACKGROUND_FGS_PERMISSION; import static android.os.PowerExemptionManager.REASON_OPT_OUT_REQUESTED; @@ -328,23 +329,11 @@ public final class ActiveServices { * Watch for apps being put into forced app standby, so we can step their fg * services down. */ - class ForcedStandbyListener implements AppStateTracker.ForcedAppStandbyListener { + class ForcedStandbyListener implements AppStateTracker.ServiceStateListener { @Override - public void updateForceAppStandbyForUidPackage(int uid, String packageName, - boolean standby) { + public void stopForegroundServicesForUidPackage(final int uid, final String packageName) { synchronized (mAm) { - if (standby) { - stopAllForegroundServicesLocked(uid, packageName); - } - mAm.mProcessList.updateForceAppStandbyForUidPackageLocked( - uid, packageName, standby); - } - } - - @Override - public void updateForcedAppStandbyForAllApps() { - synchronized (mAm) { - mAm.mProcessList.updateForcedAppStandbyForAllAppsLocked(); + stopAllForegroundServicesLocked(uid, packageName); } } } @@ -530,7 +519,7 @@ public final class ActiveServices { void systemServicesReady() { AppStateTracker ast = LocalServices.getService(AppStateTracker.class); - ast.addForcedAppStandbyListener(new ForcedStandbyListener()); + ast.addServiceStateListener(new ForcedStandbyListener()); mAppWidgetManagerInternal = LocalServices.getService(AppWidgetManagerInternal.class); setAllowListWhileInUsePermissionInFgs(); } @@ -6174,6 +6163,20 @@ public final class ActiveServices { ret = REASON_OP_ACTIVATE_PLATFORM_VPN; } } + + if (ret == REASON_DENIED) { + final String inputMethod = + Settings.Secure.getStringForUser(mAm.mContext.getContentResolver(), + Settings.Secure.DEFAULT_INPUT_METHOD, + UserHandle.getUserId(callingUid)); + if (inputMethod != null) { + final ComponentName cn = ComponentName.unflattenFromString(inputMethod); + if (cn != null && cn.getPackageName().equals(callingPackage)) { + ret = REASON_CURRENT_INPUT_METHOD; + } + } + } + if (ret == REASON_DENIED) { if (mAm.mConstants.mFgsAllowOptOut && targetService != null diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index 445d0ba2ee6d..530f918833ad 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -52,8 +52,7 @@ final class ActivityManagerConstants extends ContentObserver { private static final String TAG = "ActivityManagerConstants"; // Key names stored in the settings value. - static final String KEY_BACKGROUND_SETTLE_TIME = "background_settle_time"; - + private static final String KEY_BACKGROUND_SETTLE_TIME = "background_settle_time"; private static final String KEY_FGSERVICE_MIN_SHOWN_TIME = "fgservice_min_shown_time"; private static final String KEY_FGSERVICE_MIN_REPORT_TIME @@ -109,10 +108,10 @@ final class ActivityManagerConstants extends ContentObserver { static final String KEY_FG_TO_BG_FGS_GRACE_DURATION = "fg_to_bg_fgs_grace_duration"; static final String KEY_FGS_START_FOREGROUND_TIMEOUT = "fgs_start_foreground_timeout"; static final String KEY_FGS_ATOM_SAMPLE_RATE = "fgs_atom_sample_rate"; - static final String KEY_KILL_FAS_CACHED_IDLE = "kill_fas_cached_idle"; static final String KEY_FGS_ALLOW_OPT_OUT = "fgs_allow_opt_out"; private static final int DEFAULT_MAX_CACHED_PROCESSES = 32; + private static final long DEFAULT_BACKGROUND_SETTLE_TIME = 60*1000; private static final long DEFAULT_FGSERVICE_MIN_SHOWN_TIME = 2*1000; private static final long DEFAULT_FGSERVICE_MIN_REPORT_TIME = 3*1000; private static final long DEFAULT_FGSERVICE_SCREEN_ON_BEFORE_TIME = 1*1000; @@ -153,10 +152,6 @@ final class ActivityManagerConstants extends ContentObserver { private static final long DEFAULT_FG_TO_BG_FGS_GRACE_DURATION = 5 * 1000; private static final int DEFAULT_FGS_START_FOREGROUND_TIMEOUT_MS = 10 * 1000; private static final float DEFAULT_FGS_ATOM_SAMPLE_RATE = 1; // 100 % - - static final long DEFAULT_BACKGROUND_SETTLE_TIME = 60 * 1000; - static final boolean DEFAULT_KILL_FAS_CACHED_IDLE = true; - /** * Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED} */ @@ -501,12 +496,6 @@ final class ActivityManagerConstants extends ContentObserver { volatile float mFgsAtomSampleRate = DEFAULT_FGS_ATOM_SAMPLE_RATE; /** - * Whether or not to kill apps in force-app-standby state and it's cached, its UID state is - * idle. - */ - volatile boolean mKillForceAppStandByAndCachedIdle = DEFAULT_KILL_FAS_CACHED_IDLE; - - /** * Whether to allow "opt-out" from the foreground service restrictions. * (https://developer.android.com/about/versions/12/foreground-services) */ @@ -720,9 +709,6 @@ final class ActivityManagerConstants extends ContentObserver { case KEY_FGS_ATOM_SAMPLE_RATE: updateFgsAtomSamplePercent(); break; - case KEY_KILL_FAS_CACHED_IDLE: - updateKillFasCachedIdle(); - break; case KEY_FGS_ALLOW_OPT_OUT: updateFgsAllowOptOut(); break; @@ -1065,13 +1051,6 @@ final class ActivityManagerConstants extends ContentObserver { DEFAULT_FGS_ATOM_SAMPLE_RATE); } - private void updateKillFasCachedIdle() { - mKillForceAppStandByAndCachedIdle = DeviceConfig.getBoolean( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, - KEY_KILL_FAS_CACHED_IDLE, - DEFAULT_KILL_FAS_CACHED_IDLE); - } - private void updateFgsAllowOptOut() { mFgsAllowOptOut = DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a04edc760dfb..0d35bb180514 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5684,16 +5684,6 @@ public class ActivityManagerService extends IActivityManager.Stub if (pid == MY_PID) { return PackageManager.PERMISSION_GRANTED; } - try { - if (uid != 0) { // bypass the root - final String[] packageNames = getPackageManager().getPackagesForUid(uid); - if (ArrayUtils.isEmpty(packageNames)) { - // The uid is not existed or not visible to the caller. - return PackageManager.PERMISSION_DENIED; - } - } - } catch (RemoteException e) { - } return mUgmInternal.checkUriPermission(new GrantUri(userId, uri, modeFlags), uid, modeFlags) ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED; } @@ -7629,6 +7619,7 @@ public class ActivityManagerService extends IActivityManager.Stub t.traceEnd(); t.traceBegin("ActivityManagerStartApps"); + mBatteryStatsService.onSystemReady(); mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_RUNNING_START, Integer.toString(currentUserId), currentUserId); mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START, @@ -14382,10 +14373,6 @@ public class ActivityManagerService extends IActivityManager.Stub final int capability = uidRec != null ? uidRec.getSetCapability() : 0; final boolean ephemeral = uidRec != null ? uidRec.isEphemeral() : isEphemeralLocked(uid); - if (uidRec != null && uidRec.isIdle() && (change & UidRecord.CHANGE_IDLE) != 0) { - mProcessList.killAppIfForceStandbyAndCachedIdleLocked(uidRec); - } - if (uidRec != null && !uidRec.isIdle() && (change & UidRecord.CHANGE_GONE) != 0) { // If this uid is going away, and we haven't yet reported it is gone, // then do so now. @@ -15561,13 +15548,11 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public List<ProcessMemoryState> getMemoryStateForProcesses() { List<ProcessMemoryState> processMemoryStates = new ArrayList<>(); - synchronized (mProcLock) { - synchronized (mPidsSelfLocked) { - for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) { - final ProcessRecord r = mPidsSelfLocked.valueAt(i); - processMemoryStates.add(new ProcessMemoryState( - r.uid, r.getPid(), r.processName, r.mState.getCurAdj())); - } + synchronized (mPidsSelfLocked) { + for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) { + final ProcessRecord r = mPidsSelfLocked.valueAt(i); + processMemoryStates.add(new ProcessMemoryState( + r.uid, r.getPid(), r.processName, r.mState.getCurAdj())); } } return processMemoryStates; @@ -16344,6 +16329,16 @@ public class ActivityManagerService extends IActivityManager.Stub return uidRecord.getCurCapability(); } } + + /** + * @return The PID list of the isolated process with packages matching the given uid. + */ + @Nullable + public List<Integer> getIsolatedProcesses(int uid) { + synchronized (ActivityManagerService.this) { + return mProcessList.getIsolatedProcessesLocked(uid); + } + } } long inputDispatchingTimedOut(int pid, final boolean aboveSystem, String reason) { diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index d71919e1274c..685d606f8d41 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -321,6 +321,8 @@ final class ActivityManagerShellCommand extends ShellCommand { return runMemoryFactor(pw); case "service-restart-backoff": return runServiceRestartBackoff(pw); + case "get-isolated-pids": + return runGetIsolatedProcesses(pw); default: return handleDefaultCommands(cmd); } @@ -3137,6 +3139,24 @@ final class ActivityManagerShellCommand extends ShellCommand { } } + private int runGetIsolatedProcesses(PrintWriter pw) throws RemoteException { + mInternal.enforceCallingPermission(android.Manifest.permission.DUMP, + "getIsolatedProcesses()"); + final List<Integer> result = mInternal.mInternal.getIsolatedProcesses( + Integer.parseInt(getNextArgRequired())); + pw.print("["); + if (result != null) { + for (int i = 0, size = result.size(); i < size; i++) { + if (i > 0) { + pw.print(", "); + } + pw.print(result.get(i)); + } + } + pw.println("]"); + return 0; + } + private Resources getResources(PrintWriter pw) throws RemoteException { // system resources does not contain all the device configuration, construct it manually. Configuration config = mInterface.getConfiguration(); @@ -3467,6 +3487,8 @@ final class ActivityManagerShellCommand extends ShellCommand { pw.println(" Toggles the restart backoff policy on/off for <PACKAGE_NAME>."); pw.println(" show <PACKAGE_NAME>"); pw.println(" Shows the restart backoff policy state for <PACKAGE_NAME>."); + pw.println(" get-isolated-pids <UID>"); + pw.println(" Get the PIDs of isolated processes with packages in this <UID>"); pw.println(); Intent.printIntentArgsHelp(pw, ""); } diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 7d9d78969ca9..9f41c8ba9626 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -126,7 +126,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub Watchdog.Monitor { static final String TAG = "BatteryStatsService"; static final boolean DBG = false; - private static final boolean BATTERY_USAGE_STORE_ENABLED = false; + private static final boolean BATTERY_USAGE_STORE_ENABLED = true; private static IBatteryStats sService; @@ -398,6 +398,16 @@ public final class BatteryStatsService extends IBatteryStats.Stub registerStatsCallbacks(); } + /** + * Notifies BatteryStatsService that the system server is ready. + */ + public void onSystemReady() { + mStats.onSystemReady(); + if (BATTERY_USAGE_STORE_ENABLED) { + mBatteryUsageStatsStore.onSystemReady(); + } + } + private final class LocalService extends BatteryStatsInternal { @Override public String[] getWifiIfaces() { diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java index 317b7757c239..8db7eeaaa89a 100644 --- a/services/core/java/com/android/server/am/CachedAppOptimizer.java +++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java @@ -212,6 +212,23 @@ public final class CachedAppOptimizer { } }; + private final OnPropertiesChangedListener mOnNativeBootFlagsChangedListener = + new OnPropertiesChangedListener() { + @Override + public void onPropertiesChanged(Properties properties) { + synchronized (mPhenotypeFlagLock) { + for (String name : properties.getKeyset()) { + if (KEY_FREEZER_DEBOUNCE_TIMEOUT.equals(name)) { + updateFreezerDebounceTimeout(); + } + } + } + if (mTestCallback != null) { + mTestCallback.onPropertyChanged(); + } + } + }; + private final class SettingsContentObserver extends ContentObserver { SettingsContentObserver() { super(mAm.mHandler); @@ -328,6 +345,10 @@ public final class CachedAppOptimizer { // TODO: initialize flags to default and only update them if values are set in DeviceConfig DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, ActivityThread.currentApplication().getMainExecutor(), mOnFlagsChangedListener); + DeviceConfig.addOnPropertiesChangedListener( + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT, + ActivityThread.currentApplication().getMainExecutor(), + mOnNativeBootFlagsChangedListener); mAm.mContext.getContentResolver().registerContentObserver( CACHED_APP_FREEZER_ENABLED_URI, false, mSettingsObserver); synchronized (mPhenotypeFlagLock) { diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index b325ea3b21b3..5c9d38515e49 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -27,6 +27,7 @@ import android.provider.DeviceConfig; import android.provider.Settings; import android.widget.WidgetFlags; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import java.util.ArrayList; @@ -159,12 +160,9 @@ final class CoreSettingsObserver extends ContentObserver { DeviceConfig.NAMESPACE_WIDGET, WidgetFlags.MAGNIFIER_ASPECT_RATIO, WidgetFlags.KEY_MAGNIFIER_ASPECT_RATIO, float.class, WidgetFlags.MAGNIFIER_ASPECT_RATIO_DEFAULT)); - sDeviceConfigEntries.add(new DeviceConfigEntry<>( - DeviceConfig.NAMESPACE_WIDGET, WidgetFlags.ANALOG_CLOCK_SECONDS_HAND_FPS, - WidgetFlags.KEY_ANALOG_CLOCK_SECONDS_HAND_FPS, int.class, - WidgetFlags.ANALOG_CLOCK_SECONDS_HAND_FPS_DEFAULT)); // add other device configs here... } + private static volatile boolean sDeviceConfigContextEntriesLoaded = false; private final Bundle mCoreSettings = new Bundle(); @@ -172,11 +170,29 @@ final class CoreSettingsObserver extends ContentObserver { public CoreSettingsObserver(ActivityManagerService activityManagerService) { super(activityManagerService.mHandler); + + if (!sDeviceConfigContextEntriesLoaded) { + synchronized (sDeviceConfigEntries) { + if (!sDeviceConfigContextEntriesLoaded) { + loadDeviceConfigContextEntries(activityManagerService.mContext); + sDeviceConfigContextEntriesLoaded = true; + } + } + } + mActivityManagerService = activityManagerService; beginObserveCoreSettings(); sendCoreSettings(); } + private static void loadDeviceConfigContextEntries(Context context) { + sDeviceConfigEntries.add(new DeviceConfigEntry<>( + DeviceConfig.NAMESPACE_WIDGET, WidgetFlags.ANALOG_CLOCK_SECONDS_HAND_FPS, + WidgetFlags.KEY_ANALOG_CLOCK_SECONDS_HAND_FPS, int.class, + context.getResources() + .getInteger(R.integer.config_defaultAnalogClockSecondsHandFps))); + } + public Bundle getCoreSettingsLocked() { return (Bundle) mCoreSettings.clone(); } diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index aef402ac3213..5cb6fd9a5279 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -1530,9 +1530,11 @@ public class OomAdjuster { state.setAdjTarget(null); state.setEmpty(false); state.setCached(false); - state.setNoKillOnForcedAppStandbyAndIdle(false); state.resetAllowStartFgsState(); - app.mOptRecord.setShouldNotFreeze(false); + if (!cycleReEval) { + // Don't reset this flag when doing cycles re-evaluation. + app.mOptRecord.setShouldNotFreeze(false); + } final int appUid = app.info.uid; final int logUid = mService.mCurOomAdjUid; @@ -1983,6 +1985,11 @@ public class OomAdjuster { final boolean clientIsSystem = clientProcState < PROCESS_STATE_TOP; + if (client.mOptRecord.shouldNotFreeze()) { + // Propagate the shouldNotFreeze flag down the bindings. + app.mOptRecord.setShouldNotFreeze(true); + } + if ((cr.flags & Context.BIND_WAIVE_PRIORITY) == 0) { if (shouldSkipDueToCycle(app, cstate, procState, adj, cycleReEval)) { continue; @@ -2019,9 +2026,6 @@ public class OomAdjuster { // Similar to BIND_WAIVE_PRIORITY, keep it unfrozen. if (clientAdj < ProcessList.CACHED_APP_MIN_ADJ) { app.mOptRecord.setShouldNotFreeze(true); - // Similarly, we shouldn't kill it when it's in forced-app-standby - // mode and cached & idle state. - app.mState.setNoKillOnForcedAppStandbyAndIdle(true); } // Not doing bind OOM management, so treat // this guy more like a started service. @@ -2226,9 +2230,6 @@ public class OomAdjuster { // unfrozen. if (clientAdj < ProcessList.CACHED_APP_MIN_ADJ) { app.mOptRecord.setShouldNotFreeze(true); - // Similarly, we shouldn't kill it when it's in forced-app-standby - // mode and cached & idle state. - app.mState.setNoKillOnForcedAppStandbyAndIdle(true); } } if ((cr.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) { @@ -2302,6 +2303,10 @@ public class OomAdjuster { // we are going to consider it empty. clientProcState = PROCESS_STATE_CACHED_EMPTY; } + if (client.mOptRecord.shouldNotFreeze()) { + // Propagate the shouldNotFreeze flag down the bindings. + app.mOptRecord.setShouldNotFreeze(true); + } String adjType = null; if (adj > clientAdj) { if (state.hasShownUi() && !state.getCachedIsHomeProcess() @@ -2835,8 +2840,6 @@ public class OomAdjuster { + " target=" + state.getAdjTarget() + " capability=" + item.capability); } - mProcessList.killAppIfForceStandbyAndCachedIdleLocked(app); - return success; } diff --git a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java index 4455fd06e88a..7e79ef5a5e69 100644 --- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java @@ -333,6 +333,7 @@ class ProcessErrorStateRecord { if (errorId != null) { info.append("ErrorId: ").append(errorId.toString()).append("\n"); } + info.append("Frozen: ").append(mApp.mOptRecord.isFrozen()).append("\n"); // Retrieve controller with max ANR delay from AnrControllers // Note that we retrieve the controller before dumping stacks because dumping stacks can diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 1b67679b56d6..b77270f5963b 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -56,6 +56,7 @@ import static com.android.server.am.ActivityManagerService.TAG_UID_OBSERVERS; import android.Manifest; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManager.ProcessCapability; import android.app.ActivityThread; @@ -125,7 +126,6 @@ import com.android.internal.os.Zygote; import com.android.internal.util.ArrayUtils; import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.MemInfoReader; -import com.android.server.AppStateTracker; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.SystemConfig; @@ -2370,12 +2370,6 @@ public final class ProcessList { allowlistedAppDataInfoMap = null; } - AppStateTracker ast = LocalServices.getService(AppStateTracker.class); - if (ast != null) { - app.mState.setForcedAppStandby(ast.isAppInForcedAppStandby( - app.info.uid, app.info.packageName)); - } - final Process.ProcessStartResult startResult; boolean regularZygote = false; if (hostingRecord.usesWebviewZygote()) { @@ -2995,6 +2989,22 @@ public final class ProcessList { } } + @Nullable + @GuardedBy("mService") + List<Integer> getIsolatedProcessesLocked(int uid) { + List<Integer> ret = null; + for (int i = 0, size = mIsolatedProcesses.size(); i < size; i++) { + final ProcessRecord app = mIsolatedProcesses.valueAt(i); + if (app.info.uid == uid) { + if (ret == null) { + ret = new ArrayList<>(); + } + ret.add(app.getPid()); + } + } + return ret; + } + @GuardedBy("mService") ProcessRecord newProcessRecordLocked(ApplicationInfo info, String customProcess, boolean isolated, int isolatedUid, HostingRecord hostingRecord) { @@ -5007,55 +5017,6 @@ public final class ProcessList { return true; } - @GuardedBy("mService") - void updateForceAppStandbyForUidPackageLocked(int uid, String packageName, boolean standby) { - final UidRecord uidRec = getUidRecordLOSP(uid); - if (uidRec != null) { - uidRec.forEachProcess(app -> { - if (TextUtils.equals(app.info.packageName, packageName)) { - app.mState.setForcedAppStandby(standby); - killAppIfForceStandbyAndCachedIdleLocked(app); - } - }); - } - } - - @GuardedBy("mService") - void updateForcedAppStandbyForAllAppsLocked() { - if (!mService.mConstants.mKillForceAppStandByAndCachedIdle) { - return; - } - final AppStateTracker ast = LocalServices.getService(AppStateTracker.class); - for (int i = mLruProcesses.size() - 1; i >= 0; i--) { - final ProcessRecord app = mLruProcesses.get(i); - final boolean standby = ast.isAppInForcedAppStandby( - app.info.uid, app.info.packageName); - app.mState.setForcedAppStandby(standby); - if (standby) { - killAppIfForceStandbyAndCachedIdleLocked(app); - } - } - } - - @GuardedBy("mService") - void killAppIfForceStandbyAndCachedIdleLocked(ProcessRecord app) { - final UidRecord uidRec = app.getUidRecord(); - if (mService.mConstants.mKillForceAppStandByAndCachedIdle - && uidRec != null && uidRec.isIdle() - && !app.mState.shouldNotKillOnForcedAppStandbyAndIdle() - && app.isCached() && app.mState.isForcedAppStandby()) { - app.killLocked("cached idle & forced-app-standby", - ApplicationExitInfo.REASON_OTHER, - ApplicationExitInfo.SUBREASON_CACHED_IDLE_FORCED_APP_STANDBY, - true); - } - } - - @GuardedBy("mService") - void killAppIfForceStandbyAndCachedIdleLocked(UidRecord uidRec) { - uidRec.forEachProcess(app -> killAppIfForceStandbyAndCachedIdleLocked(app)); - } - /** * Called by ActivityManagerService when a process died. */ diff --git a/services/core/java/com/android/server/am/ProcessStateRecord.java b/services/core/java/com/android/server/am/ProcessStateRecord.java index 5dbd71a48623..7520d88fcd16 100644 --- a/services/core/java/com/android/server/am/ProcessStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessStateRecord.java @@ -302,12 +302,6 @@ final class ProcessStateRecord { private int mAllowStartFgsState = PROCESS_STATE_NONEXISTENT; /** - * Whether or not this process has been in forced-app-standby state. - */ - @GuardedBy("mService") - private boolean mForcedAppStandby; - - /** * Debugging: primary thing impacting oom_adj. */ @GuardedBy("mService") @@ -363,13 +357,6 @@ final class ProcessStateRecord { @ElapsedRealtimeLong private long mLastInvisibleTime; - /** - * Whether or not this process could be killed when it's in forced-app-standby mode - * and cached & idle state. - */ - @GuardedBy("mService") - private boolean mNoKillOnForcedAppStandbyAndIdle; - // Below are the cached task info for OomAdjuster only private static final int VALUE_INVALID = -1; private static final int VALUE_FALSE = 0; @@ -1126,16 +1113,6 @@ final class ProcessStateRecord { } @GuardedBy("mService") - void setForcedAppStandby(boolean standby) { - mForcedAppStandby = standby; - } - - @GuardedBy("mService") - boolean isForcedAppStandby() { - return mForcedAppStandby; - } - - @GuardedBy("mService") void updateLastInvisibleTime(boolean hasVisibleActivities) { if (hasVisibleActivities) { mLastInvisibleTime = Long.MAX_VALUE; @@ -1150,16 +1127,6 @@ final class ProcessStateRecord { return mLastInvisibleTime; } - @GuardedBy("mService") - void setNoKillOnForcedAppStandbyAndIdle(boolean shouldNotKill) { - mNoKillOnForcedAppStandbyAndIdle = shouldNotKill; - } - - @GuardedBy("mService") - boolean shouldNotKillOnForcedAppStandbyAndIdle() { - return mNoKillOnForcedAppStandbyAndIdle; - } - @GuardedBy({"mService", "mProcLock"}) void dump(PrintWriter pw, String prefix, long nowUptime) { if (mReportedInteraction || mFgInteractionTime != 0) { @@ -1203,8 +1170,7 @@ final class ProcessStateRecord { pw.print(" pendingUiClean="); pw.println(mApp.mProfile.hasPendingUiClean()); } pw.print(prefix); pw.print("cached="); pw.print(mCached); - pw.print(" empty="); pw.print(mEmpty); - pw.print(" forcedAppStandby="); pw.println(mForcedAppStandby); + pw.print(" empty="); pw.println(mEmpty); if (mServiceB) { pw.print(prefix); pw.print("serviceb="); pw.print(mServiceB); pw.print(" serviceHighRam="); pw.println(mServiceHighRam); diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 0a5e2b6e8531..e001b059b85e 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -338,7 +338,14 @@ public class AppOpsService extends IAppOpsService.Stub { /* * These are app op restrictions imposed per user from various parties. */ - private final ArrayMap<IBinder, ClientRestrictionState> mOpUserRestrictions = new ArrayMap<>(); + private final ArrayMap<IBinder, ClientUserRestrictionState> mOpUserRestrictions = + new ArrayMap<>(); + + /* + * These are app op restrictions imposed globally from various parties within the system. + */ + private final ArrayMap<IBinder, ClientGlobalRestrictionState> mOpGlobalRestrictions = + new ArrayMap<>(); SparseIntArray mProfileOwners; @@ -2341,8 +2348,9 @@ public class AppOpsService extends IAppOpsService.Stub { boolean isCallerSystem = Binder.getCallingPid() == Process.myPid(); boolean isCallerPermissionController; try { - isCallerPermissionController = pm.getPackageUid( - mContext.getPackageManager().getPermissionControllerPackageName(), 0) + isCallerPermissionController = pm.getPackageUidAsUser( + mContext.getPackageManager().getPermissionControllerPackageName(), 0, + UserHandle.getUserId(Binder.getCallingUid())) == Binder.getCallingUid(); } catch (PackageManager.NameNotFoundException doesNotHappen) { return; @@ -4515,10 +4523,15 @@ public class AppOpsService extends IAppOpsService.Stub { int callingUid = Binder.getCallingUid(); // Allow any attribution tag for resolvable uids - int pkgUid = resolveUid(packageName); - if (pkgUid != Process.INVALID_UID) { + int pkgUid; + if (Objects.equals(packageName, "com.android.shell")) { // Special case for the shell which is a package but should be able // to bypass app attribution tag restrictions. + pkgUid = Process.SHELL_UID; + } else { + pkgUid = resolveUid(packageName); + } + if (pkgUid != Process.INVALID_UID) { if (pkgUid != UserHandle.getAppId(uid)) { String otherUidMessage = DEBUG ? " but it is really " + pkgUid : " but it is not"; throw new SecurityException("Specified package " + packageName + " under uid " @@ -4721,13 +4734,22 @@ public class AppOpsService extends IAppOpsService.Stub { private boolean isOpRestrictedLocked(int uid, int code, String packageName, String attributionTag, @Nullable RestrictionBypass appBypass) { + int restrictionSetCount = mOpGlobalRestrictions.size(); + + for (int i = 0; i < restrictionSetCount; i++) { + ClientGlobalRestrictionState restrictionState = mOpGlobalRestrictions.valueAt(i); + if (restrictionState.hasRestriction(code)) { + return true; + } + } + int userHandle = UserHandle.getUserId(uid); - final int restrictionSetCount = mOpUserRestrictions.size(); + restrictionSetCount = mOpUserRestrictions.size(); for (int i = 0; i < restrictionSetCount; i++) { // For each client, check that the given op is not restricted, or that the given // package is exempt from the restriction. - ClientRestrictionState restrictionState = mOpUserRestrictions.valueAt(i); + ClientUserRestrictionState restrictionState = mOpUserRestrictions.valueAt(i); if (restrictionState.hasRestriction(code, packageName, attributionTag, userHandle)) { RestrictionBypass opBypass = opAllowSystemBypassRestriction(code); if (opBypass != null) { @@ -6294,10 +6316,31 @@ public class AppOpsService extends IAppOpsService.Stub { pw.println(); } + final int globalRestrictionCount = mOpGlobalRestrictions.size(); + for (int i = 0; i < globalRestrictionCount; i++) { + IBinder token = mOpGlobalRestrictions.keyAt(i); + ClientGlobalRestrictionState restrictionState = mOpGlobalRestrictions.valueAt(i); + ArraySet<Integer> restrictedOps = restrictionState.mRestrictedOps; + + pw.println(" Global restrictions for token " + token + ":"); + StringBuilder restrictedOpsValue = new StringBuilder(); + restrictedOpsValue.append("["); + final int restrictedOpCount = restrictedOps.size(); + for (int j = 0; j < restrictedOpCount; j++) { + if (restrictedOpsValue.length() > 1) { + restrictedOpsValue.append(", "); + } + restrictedOpsValue.append(AppOpsManager.opToName(restrictedOps.valueAt(j))); + } + restrictedOpsValue.append("]"); + pw.println(" Restricted ops: " + restrictedOpsValue); + + } + final int userRestrictionCount = mOpUserRestrictions.size(); for (int i = 0; i < userRestrictionCount; i++) { IBinder token = mOpUserRestrictions.keyAt(i); - ClientRestrictionState restrictionState = mOpUserRestrictions.valueAt(i); + ClientUserRestrictionState restrictionState = mOpUserRestrictions.valueAt(i); boolean printedTokenHeader = false; if (dumpMode >= 0 || dumpWatchers || dumpHistory) { @@ -6443,11 +6486,11 @@ public class AppOpsService extends IAppOpsService.Stub { private void setUserRestrictionNoCheck(int code, boolean restricted, IBinder token, int userHandle, PackageTagsList excludedPackageTags) { synchronized (AppOpsService.this) { - ClientRestrictionState restrictionState = mOpUserRestrictions.get(token); + ClientUserRestrictionState restrictionState = mOpUserRestrictions.get(token); if (restrictionState == null) { try { - restrictionState = new ClientRestrictionState(token); + restrictionState = new ClientUserRestrictionState(token); } catch (RemoteException e) { return; } @@ -6527,7 +6570,7 @@ public class AppOpsService extends IAppOpsService.Stub { synchronized (AppOpsService.this) { final int tokenCount = mOpUserRestrictions.size(); for (int i = tokenCount - 1; i >= 0; i--) { - ClientRestrictionState opRestrictions = mOpUserRestrictions.valueAt(i); + ClientUserRestrictionState opRestrictions = mOpUserRestrictions.valueAt(i); opRestrictions.removeUser(userHandle); } removeUidsForUserLocked(userHandle); @@ -6955,7 +6998,6 @@ public class AppOpsService extends IAppOpsService.Stub { return Process.ROOT_UID; case "shell": case "dumpstate": - case "com.android.shell": return Process.SHELL_UID; case "media": return Process.MEDIA_UID; @@ -6985,12 +7027,12 @@ public class AppOpsService extends IAppOpsService.Stub { return packageNames; } - private final class ClientRestrictionState implements DeathRecipient { + private final class ClientUserRestrictionState implements DeathRecipient { private final IBinder token; SparseArray<boolean[]> perUserRestrictions; SparseArray<PackageTagsList> perUserExcludedPackageTags; - public ClientRestrictionState(IBinder token) + ClientUserRestrictionState(IBinder token) throws RemoteException { token.linkToDeath(this, 0); this.token = token; @@ -7081,6 +7123,7 @@ public class AppOpsService extends IAppOpsService.Stub { if (perUserExclusions == null) { return true; } + return !perUserExclusions.contains(packageName, attributionTag); } @@ -7142,6 +7185,42 @@ public class AppOpsService extends IAppOpsService.Stub { } } + private final class ClientGlobalRestrictionState implements DeathRecipient { + final IBinder mToken; + final ArraySet<Integer> mRestrictedOps = new ArraySet<>(); + + ClientGlobalRestrictionState(IBinder token) + throws RemoteException { + token.linkToDeath(this, 0); + this.mToken = token; + } + + boolean setRestriction(int code, boolean restricted) { + if (restricted) { + return mRestrictedOps.add(code); + } else { + return mRestrictedOps.remove(code); + } + } + + boolean hasRestriction(int code) { + return mRestrictedOps.contains(code); + } + + boolean isDefault() { + return mRestrictedOps.isEmpty(); + } + + @Override + public void binderDied() { + destroy(); + } + + void destroy() { + mToken.unlinkToDeath(this, 0); + } + } + private final class AppOpsManagerInternalImpl extends AppOpsManagerInternal { @Override public void setDeviceAndProfileOwners(SparseIntArray owners) { synchronized (AppOpsService.this) { @@ -7166,6 +7245,42 @@ public class AppOpsService extends IAppOpsService.Stub { int mode, @Nullable IAppOpsCallback callback) { setMode(code, uid, packageName, mode, callback); } + + + @Override + public void setGlobalRestriction(int code, boolean restricted, IBinder token) { + if (Binder.getCallingPid() != Process.myPid()) { + // TODO instead of this enforcement put in AppOpsManagerInternal + throw new SecurityException("Only the system can set global restrictions"); + } + + synchronized (AppOpsService.this) { + ClientGlobalRestrictionState restrictionState = mOpGlobalRestrictions.get(token); + + if (restrictionState == null) { + try { + restrictionState = new ClientGlobalRestrictionState(token); + } catch (RemoteException e) { + return; + } + mOpGlobalRestrictions.put(token, restrictionState); + } + + if (restrictionState.setRestriction(code, restricted)) { + mHandler.sendMessage(PooledLambda.obtainMessage( + AppOpsService::notifyWatchersOfChange, AppOpsService.this, code, + UID_ANY)); + mHandler.sendMessage(PooledLambda.obtainMessage( + AppOpsService::updateStartedOpModeForUser, AppOpsService.this, + code, restricted, UserHandle.USER_ALL)); + } + + if (restrictionState.isDefault()) { + mOpGlobalRestrictions.remove(token); + restrictionState.destroy(); + } + } + } } /** diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index af9a14ec80cd..a13b2eb344d9 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -380,10 +380,12 @@ public final class PlaybackActivityMonitor } /** - * Return all cached capture policies. + * Return a copy of all cached capture policies. */ public HashMap<Integer, Integer> getAllAllowedCapturePolicies() { - return mAllowedCapturePolicies; + synchronized (mAllowedCapturePolicies) { + return (HashMap<Integer, Integer>) mAllowedCapturePolicies.clone(); + } } private void updateAllowedCapturePolicy(AudioPlaybackConfiguration apc, int capturePolicy) { diff --git a/services/core/java/com/android/server/biometrics/AuthService.java b/services/core/java/com/android/server/biometrics/AuthService.java index 5cd330a5753c..0cd2e3d0ff59 100644 --- a/services/core/java/com/android/server/biometrics/AuthService.java +++ b/services/core/java/com/android/server/biometrics/AuthService.java @@ -261,7 +261,7 @@ public class AuthService extends SystemService { private void authenticateFastFail(String message, IBiometricServiceReceiver receiver) { // notify caller in cases where authentication is aborted before calling into // IBiometricService without raising an exception - Slog.e(TAG, message); + Slog.e(TAG, "authenticateFastFail: " + message); try { receiver.onError(TYPE_NONE, BIOMETRIC_ERROR_CANCELED, 0 /*vendorCode */); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java index 8f364890aa06..bdde980f5cae 100644 --- a/services/core/java/com/android/server/biometrics/AuthSession.java +++ b/services/core/java/com/android/server/biometrics/AuthSession.java @@ -366,10 +366,9 @@ public final class AuthSession implements IBinder.DeathRecipient { // sending the final error callback to the application. for (BiometricSensor sensor : mPreAuthInfo.eligibleSensors) { try { - if (filter.apply(sensor)) { - if (DEBUG) { - Slog.v(TAG, "Canceling sensor: " + sensor.id); - } + final boolean shouldCancel = filter.apply(sensor); + Slog.d(TAG, "sensorId: " + sensor.id + ", shouldCancel: " + shouldCancel); + if (shouldCancel) { sensor.goToStateCancelling(mToken, mOpPackageName); } } catch (RemoteException e) { @@ -383,9 +382,7 @@ public final class AuthSession implements IBinder.DeathRecipient { */ boolean onErrorReceived(int sensorId, int cookie, @BiometricConstants.Errors int error, int vendorCode) throws RemoteException { - if (DEBUG) { - Slog.v(TAG, "onErrorReceived sensor: " + sensorId + " error: " + error); - } + Slog.d(TAG, "onErrorReceived sensor: " + sensorId + " error: " + error); if (!containsCookie(cookie)) { Slog.e(TAG, "Unknown/expired cookie: " + cookie); @@ -542,9 +539,9 @@ public final class AuthSession implements IBinder.DeathRecipient { if (mState != STATE_AUTH_STARTED && mState != STATE_AUTH_STARTED_UI_SHOWING - && mState != STATE_AUTH_PAUSED) { - Slog.e(TAG, "onStartFingerprint, unexpected state: " + mState); - return; + && mState != STATE_AUTH_PAUSED + && mState != STATE_ERROR_PENDING_SYSUI) { + Slog.w(TAG, "onStartFingerprint, started from unexpected state: " + mState); } mMultiSensorState = MULTI_SENSOR_STATE_FP_SCANNING; diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index e8e25f16d5af..fed320d3cf23 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -1369,11 +1369,11 @@ public class BiometricService extends SystemService { /** * handleAuthenticate() (above) which is called from BiometricPrompt determines which * modality/modalities to start authenticating with. authenticateInternal() should only be - * used for: - * 1) Preparing <Biometric>Services for authentication when BiometricPrompt#authenticate is, - * invoked, shortly after which BiometricPrompt is shown and authentication starts - * 2) Preparing <Biometric>Services for authentication when BiometricPrompt is already shown - * and the user has pressed "try again" + * used for preparing <Biometric>Services for authentication when BiometricPrompt#authenticate + * is invoked, shortly after which BiometricPrompt is shown and authentication starts. + * + * Note that this path is NOT invoked when the BiometricPrompt "Try again" button is pressed. + * In that case, see {@link #handleOnTryAgainPressed()}. */ private void authenticateInternal(IBinder token, long operationId, int userId, IBiometricServiceReceiver receiver, String opPackageName, PromptInfo promptInfo, diff --git a/services/core/java/com/android/server/biometrics/PreAuthInfo.java b/services/core/java/com/android/server/biometrics/PreAuthInfo.java index c4bd18b59745..cd0ff10168bb 100644 --- a/services/core/java/com/android/server/biometrics/PreAuthInfo.java +++ b/services/core/java/com/android/server/biometrics/PreAuthInfo.java @@ -408,22 +408,22 @@ class PreAuthInfo { public String toString() { StringBuilder string = new StringBuilder( "BiometricRequested: " + mBiometricRequested - + "\nStrengthRequested: " + mBiometricStrengthRequested - + "\nCredentialRequested: " + credentialRequested); - string.append("\nEligible:{"); + + ", StrengthRequested: " + mBiometricStrengthRequested + + ", CredentialRequested: " + credentialRequested); + string.append(", Eligible:{"); for (BiometricSensor sensor: eligibleSensors) { string.append(sensor.id).append(" "); } string.append("}"); - string.append("\nIneligible:{"); + string.append(", Ineligible:{"); for (Pair<BiometricSensor, Integer> ineligible : ineligibleSensors) { string.append(ineligible.first).append(":").append(ineligible.second).append(" "); } string.append("}"); - string.append("\nCredentialAvailable: ").append(credentialAvailable); - string.append("\n"); + string.append(", CredentialAvailable: ").append(credentialAvailable); + string.append(", "); return string.toString(); } } diff --git a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java index 28e23e32c8db..ca357b4c2cec 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java @@ -17,7 +17,6 @@ package com.android.server.biometrics.sensors; import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.hardware.biometrics.BiometricConstants; import android.media.AudioAttributes; @@ -27,7 +26,6 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.VibrationEffect; import android.os.Vibrator; -import android.text.TextUtils; import android.util.Slog; /** @@ -39,24 +37,18 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement private static final String TAG = "Biometrics/AcquisitionClient"; - private static final AudioAttributes VIBRATION_SONFICATION_ATTRIBUTES = + private static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .build(); - private final VibrationEffect mEffectTick = VibrationEffect.get(VibrationEffect.EFFECT_TICK); - private final VibrationEffect mEffectTextureTick = - VibrationEffect.get(VibrationEffect.EFFECT_TEXTURE_TICK); - private final VibrationEffect mEffectClick = VibrationEffect.get(VibrationEffect.EFFECT_CLICK); - private final VibrationEffect mEffectHeavy = - VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK); - private final VibrationEffect mDoubleClick = + private static final VibrationEffect SUCCESS_VIBRATION_EFFECT = + VibrationEffect.get(VibrationEffect.EFFECT_CLICK); + private static final VibrationEffect ERROR_VIBRATION_EFFECT = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK); private final PowerManager mPowerManager; - private final VibrationEffect mSuccessVibrationEffect; - private final VibrationEffect mErrorVibrationEffect; private boolean mShouldSendErrorToClient = true; private boolean mAlreadyCancelled; @@ -72,8 +64,6 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement super(context, lazyDaemon, token, listener, userId, owner, cookie, sensorId, statsModality, statsAction, statsClient); mPowerManager = context.getSystemService(PowerManager.class); - mSuccessVibrationEffect = mEffectClick; - mErrorVibrationEffect = mDoubleClick; } @Override @@ -97,6 +87,8 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement * operation still needs to wait for the HAL to send ERROR_CANCELED. */ public void onUserCanceled() { + Slog.d(TAG, "onUserCanceled"); + // Send USER_CANCELED, but do not finish. Wait for the HAL to respond with ERROR_CANCELED, // which then finishes the AcquisitionClient's lifecycle. onErrorInternal(BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED, 0 /* vendorCode */, @@ -105,6 +97,8 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement } protected void onErrorInternal(int errorCode, int vendorCode, boolean finish) { + Slog.d(TAG, "onErrorInternal code: " + errorCode + ", finish: " + finish); + // In some cases, the framework will send an error to the caller before a true terminal // case (success, failure, or error) is received from the HAL (e.g. versions of fingerprint // that do not handle lockout under the HAL. In these cases, ensure that the framework only @@ -143,6 +137,8 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement @Override public void cancelWithoutStarting(@NonNull Callback callback) { + Slog.d(TAG, "cancelWithoutStarting: " + this); + final int errorCode = BiometricConstants.BIOMETRIC_ERROR_CANCELED; try { if (getListener() != null) { @@ -192,49 +188,31 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement mPowerManager.userActivity(now, PowerManager.USER_ACTIVITY_EVENT_TOUCH, 0); } - protected @Nullable VibrationEffect getSuccessVibrationEffect() { - return mSuccessVibrationEffect; + protected boolean successHapticsEnabled() { + return true; } - protected @Nullable VibrationEffect getErrorVibrationEffect() { - return mErrorVibrationEffect; + protected boolean errorHapticsEnabled() { + return true; } protected final void vibrateSuccess() { - Vibrator vibrator = getContext().getSystemService(Vibrator.class); - VibrationEffect effect = getSuccessVibrationEffect(); - if (vibrator != null && effect != null) { - vibrator.vibrate(effect, VIBRATION_SONFICATION_ATTRIBUTES); + if (!successHapticsEnabled()) { + return; } - } - - protected final void vibrateError() { Vibrator vibrator = getContext().getSystemService(Vibrator.class); - VibrationEffect effect = getErrorVibrationEffect(); - if (vibrator != null && effect != null) { - vibrator.vibrate(effect, VIBRATION_SONFICATION_ATTRIBUTES); + if (vibrator != null) { + vibrator.vibrate(SUCCESS_VIBRATION_EFFECT, VIBRATION_SONIFICATION_ATTRIBUTES); } } - protected final @NonNull VibrationEffect getVibration(@Nullable String effect, - @NonNull VibrationEffect defaultEffect) { - if (TextUtils.isEmpty(effect)) { - return defaultEffect; + protected final void vibrateError() { + if (!errorHapticsEnabled()) { + return; } - - switch (effect.toLowerCase()) { - case "click": - return mEffectClick; - case "heavy": - return mEffectHeavy; - case "texture_tick": - return mEffectTextureTick; - case "tick": - return mEffectTick; - case "double_click": - return mDoubleClick; - default: - return defaultEffect; + Vibrator vibrator = getContext().getSystemService(Vibrator.class); + if (vibrator != null) { + vibrator.vibrate(ERROR_VIBRATION_EFFECT, VIBRATION_SONIFICATION_ATTRIBUTES); } } } diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java index 6b9ff6f35128..80e60e67f05a 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -22,7 +22,6 @@ import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.app.TaskStackListener; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.pm.ApplicationInfo; import android.hardware.biometrics.BiometricAuthenticator; @@ -31,8 +30,6 @@ import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricsProtoEnums; import android.os.IBinder; import android.os.RemoteException; -import android.os.VibrationEffect; -import android.provider.Settings; import android.security.KeyStore; import android.util.EventLog; import android.util.Slog; @@ -59,14 +56,12 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> private final LockoutTracker mLockoutTracker; private final boolean mIsRestricted; private final boolean mAllowBackgroundAuthentication; - @NonNull private final ContentResolver mContentResolver; protected final long mOperationId; private long mStartTimeMs; protected boolean mAuthAttempted; - private final boolean mCustomHaptics; public AuthenticationClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon, @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, @@ -85,10 +80,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> mLockoutTracker = lockoutTracker; mIsRestricted = restricted; mAllowBackgroundAuthentication = allowBackgroundAuthentication; - - mContentResolver = context.getContentResolver(); - mCustomHaptics = Settings.Global.getInt(mContentResolver, - "fp_custom_success_error", 0) == 1; } public @LockoutTracker.LockoutMode int handleFailedAttempt(int userId) { @@ -317,7 +308,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> mActivityTaskManager.registerTaskStackListener(mTaskStackListener); } - if (DEBUG) Slog.w(TAG, "Requesting auth for " + getOwnerString()); + Slog.d(TAG, "Requesting auth for " + getOwnerString()); mStartTimeMs = System.currentTimeMillis(); mAuthAttempted = true; @@ -342,33 +333,4 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> public boolean interruptsPrecedingClients() { return true; } - - @Override - protected @Nullable VibrationEffect getSuccessVibrationEffect() { - if (!mCustomHaptics) { - return super.getSuccessVibrationEffect(); - } - - if (Settings.Global.getInt(mContentResolver, "fp_success_enabled", 1) == 0) { - return null; - } - - return getVibration(Settings.Global.getString(mContentResolver, - "fp_success_type"), super.getSuccessVibrationEffect()); - } - - @Override - protected @Nullable VibrationEffect getErrorVibrationEffect() { - if (!mCustomHaptics) { - return super.getErrorVibrationEffect(); - } - - if (Settings.Global.getInt(mContentResolver, "fp_error_enabled", 1) == 0) { - return null; - } - - return getVibration(Settings.Global.getString(mContentResolver, - "fp_error_type"), super.getErrorVibrationEffect()); - - } } diff --git a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java index f51b1c2a4f0c..e5e1385fa605 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java +++ b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java @@ -268,9 +268,9 @@ public abstract class BaseClientMonitor extends LoggableMonitor public String toString() { return "{[" + mSequentialId + "] " + this.getClass().getSimpleName() - + ", " + getProtoEnum() - + ", " + getOwnerString() - + ", " + getCookie() - + ", " + getTargetUserId() + "}"; + + ", proto=" + getProtoEnum() + + ", owner=" + getOwnerString() + + ", cookie=" + getCookie() + + ", userId=" + getTargetUserId() + "}"; } } diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java b/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java index 1f1309d4c48c..7b8f82441fd6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java +++ b/services/core/java/com/android/server/biometrics/sensors/BiometricNotificationUtils.java @@ -23,7 +23,9 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.os.SystemClock; import android.os.UserHandle; +import android.util.Slog; import com.android.internal.R; @@ -32,9 +34,12 @@ import com.android.internal.R; */ public class BiometricNotificationUtils { + private static final String TAG = "BiometricNotificationUtils"; private static final String RE_ENROLL_NOTIFICATION_TAG = "FaceService"; private static final String BAD_CALIBRATION_NOTIFICATION_TAG = "FingerprintService"; private static final int NOTIFICATION_ID = 1; + private static final long NOTIFICATION_INTERVAL_MS = 24 * 60 * 60 * 1000; + private static long sLastAlertTime = 0; /** * Shows a face re-enrollment notification. @@ -67,8 +72,17 @@ public class BiometricNotificationUtils { * Shows a fingerprint bad calibration notification. */ public static void showBadCalibrationNotification(@NonNull Context context) { - final NotificationManager notificationManager = - context.getSystemService(NotificationManager.class); + final long currentTime = SystemClock.elapsedRealtime(); + final long timeSinceLastAlert = currentTime - sLastAlertTime; + + // Only show the notification if not previously shown or a day has + // passed since the last notification. + if (sLastAlertTime != 0 && (timeSinceLastAlert < NOTIFICATION_INTERVAL_MS)) { + Slog.v(TAG, "Skipping calibration notification : " + timeSinceLastAlert); + return; + } + + sLastAlertTime = currentTime; final String name = context.getString(R.string.fingerprint_recalibrate_notification_name); diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java index b52cb70d90e3..adda10eb109f 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java +++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java @@ -579,6 +579,9 @@ public class BiometricScheduler { final boolean isCorrectClient = isAuthenticationOrDetectionOperation(mCurrentOperation); final boolean tokenMatches = mCurrentOperation.mClientMonitor.getToken() == token; + Slog.d(getTag(), "cancelAuthenticationOrDetection, isCorrectClient: " + isCorrectClient + + ", tokenMatches: " + tokenMatches); + if (isCorrectClient && tokenMatches) { Slog.d(getTag(), "Cancelling: " + mCurrentOperation); cancelInternal(mCurrentOperation); diff --git a/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java index c4c98e362a43..e6e293eb9b4c 100644 --- a/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java +++ b/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java @@ -62,16 +62,22 @@ public class UserAwareBiometricScheduler extends BiometricScheduler { @Override public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) { mHandler.post(() -> { - if (mOwner == clientMonitor && mOwner == mCurrentOperation.mClientMonitor) { - Slog.d(getTag(), "[Client finished] " - + clientMonitor + ", success: " + success); + if (mOwner != clientMonitor) { + Slog.e(getTag(), "[Wrong client finished], actual: " + + clientMonitor + ", expected: " + mOwner); + return; + } + + Slog.d(getTag(), "[Client finished] " + + clientMonitor + ", success: " + success); + if (mCurrentOperation != null && mCurrentOperation.mClientMonitor == mOwner) { mCurrentOperation = null; + startNextOperationIfIdle(); } else { - Slog.e(getTag(), "[Client finished, but not current operation], actual: " - + mCurrentOperation + ", expected: " + mOwner); + // can usually be ignored (hal died, etc.) + Slog.d(getTag(), "operation is already null or different (reset?): " + + mCurrentOperation); } - - startNextOperationIfIdle(); }); } } @@ -125,9 +131,9 @@ public class UserAwareBiometricScheduler extends BiometricScheduler { new ClientFinishedCallback(startClient); Slog.d(getTag(), "[Starting User] " + startClient); - startClient.start(finishedCallback); mCurrentOperation = new Operation( startClient, finishedCallback, Operation.STATE_STARTED); + startClient.start(finishedCallback); } else { if (mStopUserClient != null) { Slog.d(getTag(), "[Waiting for StopUser] " + mStopUserClient); @@ -139,9 +145,9 @@ public class UserAwareBiometricScheduler extends BiometricScheduler { Slog.d(getTag(), "[Stopping User] current: " + currentUserId + ", next: " + nextUserId + ". " + mStopUserClient); - mStopUserClient.start(finishedCallback); mCurrentOperation = new Operation( mStopUserClient, finishedCallback, Operation.STATE_STARTED); + mStopUserClient.start(finishedCallback); } } } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java index 98f9fe178b9b..db927b227d9a 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java @@ -33,7 +33,6 @@ import android.hardware.face.FaceAuthenticationFrame; import android.hardware.face.FaceManager; import android.os.IBinder; import android.os.RemoteException; -import android.os.VibrationEffect; import android.provider.Settings; import android.util.Slog; @@ -264,22 +263,16 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements } @Override - protected @Nullable VibrationEffect getSuccessVibrationEffect() { - if (!mCustomHaptics) { - return super.getSuccessVibrationEffect(); - } - - return getVibration(Settings.Global.getString(mContentResolver, - "face_success_type"), super.getSuccessVibrationEffect()); + protected boolean successHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "face_success_enabled", 1) == 0 + : super.successHapticsEnabled(); } @Override - protected @Nullable VibrationEffect getErrorVibrationEffect() { - if (!mCustomHaptics) { - return super.getErrorVibrationEffect(); - } - - return getVibration(Settings.Global.getString(mContentResolver, - "face_error_type"), super.getErrorVibrationEffect()); + protected boolean errorHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "face_error_enabled", 1) == 0 + : super.errorHapticsEnabled(); } } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java index 38e6f083da51..6c0adafcf2ee 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java @@ -28,7 +28,6 @@ import android.hardware.biometrics.face.V1_0.IBiometricsFace; import android.hardware.face.FaceManager; import android.os.IBinder; import android.os.RemoteException; -import android.os.VibrationEffect; import android.provider.Settings; import android.util.Slog; @@ -203,22 +202,16 @@ class FaceAuthenticationClient extends AuthenticationClient<IBiometricsFace> { } @Override - protected @NonNull VibrationEffect getSuccessVibrationEffect() { - if (!mCustomHaptics) { - return super.getSuccessVibrationEffect(); - } - - return getVibration(Settings.Global.getString(mContentResolver, - "face_success_type"), super.getSuccessVibrationEffect()); + protected boolean successHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "face_success_enabled", 1) == 0 + : super.successHapticsEnabled(); } @Override - protected @NonNull VibrationEffect getErrorVibrationEffect() { - if (!mCustomHaptics) { - return super.getErrorVibrationEffect(); - } - - return getVibration(Settings.Global.getString(mContentResolver, - "face_error_type"), super.getErrorVibrationEffect()); + protected boolean errorHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "face_error_enabled", 1) == 0 + : super.errorHapticsEnabled(); } } 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 54abc639ad55..012e47e425f6 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 @@ -498,6 +498,8 @@ public class FingerprintService extends SystemService { Utils.checkPermission(getContext(), MANAGE_BIOMETRIC); + Slog.d(TAG, "cancelAuthenticationFromService, sensorId: " + sensorId); + final ServiceProvider provider = getProviderForSensor(sensorId); if (provider == null) { Slog.w(TAG, "Null provider for cancelAuthenticationFromService"); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java index d69151da55f6..0062d31962a9 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java @@ -18,9 +18,11 @@ package com.android.server.biometrics.sensors.fingerprint; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_GOOD; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMAGER_DIRTY; +import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_INSUFFICIENT; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_PARTIAL; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_START; +import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_BRIGHT; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_FAST; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_SLOW; import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR; @@ -188,6 +190,8 @@ public class FingerprintUtils implements BiometricUtils<Fingerprint> { case FINGERPRINT_ACQUIRED_TOO_FAST: case FINGERPRINT_ACQUIRED_VENDOR: case FINGERPRINT_ACQUIRED_START: + case FINGERPRINT_ACQUIRED_TOO_BRIGHT: + case FINGERPRINT_ACQUIRED_IMMOBILE: return true; default: diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java index 0ae2e381cf14..1630be77ee7b 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java @@ -47,7 +47,7 @@ final class AidlConversionUtils { } else if (aidlError == Error.VENDOR) { return BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR; } else if (aidlError == Error.BAD_CALIBRATION) { - return BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBARTION; + return BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBRATION; } else { return BiometricFingerprintConstants.FINGERPRINT_ERROR_UNKNOWN; } @@ -78,7 +78,7 @@ final class AidlConversionUtils { return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN; } else if (aidlAcquiredInfo == AcquiredInfo.TOO_BRIGHT) { // No framework constant available - return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN; + return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_TOO_BRIGHT; } else if (aidlAcquiredInfo == AcquiredInfo.IMMOBILE) { return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE; } else if (aidlAcquiredInfo == AcquiredInfo.RETRYING_CAPTURE) { diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index ba6ef2955461..6a05ed470123 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -19,6 +19,7 @@ package com.android.server.biometrics.sensors.fingerprint.aidl; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.TaskStackListener; +import android.content.ContentResolver; import android.content.Context; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricFingerprintConstants; @@ -29,6 +30,7 @@ import android.hardware.biometrics.fingerprint.ISession; import android.hardware.fingerprint.IUdfpsOverlayController; import android.os.IBinder; import android.os.RemoteException; +import android.provider.Settings; import android.util.Slog; import com.android.server.biometrics.Utils; @@ -55,6 +57,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp @Nullable private final IUdfpsOverlayController mUdfpsOverlayController; @Nullable private ICancellationSignal mCancellationSignal; + @NonNull private final ContentResolver mContentResolver; + private final boolean mCustomHaptics; + FingerprintAuthenticationClient(@NonNull Context context, @NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int targetUserId, long operationId, @@ -69,6 +74,10 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp lockoutCache, allowBackgroundAuthentication); mLockoutCache = lockoutCache; mUdfpsOverlayController = udfpsOverlayController; + + mContentResolver = context.getContentResolver(); + mCustomHaptics = Settings.Global.getInt(mContentResolver, + "fp_custom_success_error", 0) == 1; } @NonNull @@ -103,7 +112,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp public void onError(int errorCode, int vendorCode) { super.onError(errorCode, vendorCode); - if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBARTION) { + if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBRATION) { BiometricNotificationUtils.showBadCalibrationNotification(getContext()); } @@ -204,4 +213,18 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController); mCallback.onClientFinished(this, false /* success */); } + + @Override + protected boolean successHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "fp_success_enabled", 1) == 0 + : super.successHapticsEnabled(); + } + + @Override + protected boolean errorHapticsEnabled() { + return mCustomHaptics + ? Settings.Global.getInt(mContentResolver, "fp_error_enabled", 1) == 0 + : super.errorHapticsEnabled(); + } } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java index 102aeccc6bbe..7daea88f0f22 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java @@ -632,6 +632,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider @Override public void cancelAuthentication(int sensorId, @NonNull IBinder token) { + Slog.d(TAG, "cancelAuthentication, sensorId: " + sensorId); mHandler.post(() -> mScheduler.cancelAuthenticationOrDetection(token)); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java index 01136d619a26..bf7775730a2c 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java @@ -112,7 +112,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi public void onError(int errorCode, int vendorCode) { super.onError(errorCode, vendorCode); - if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBARTION) { + if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBRATION) { BiometricNotificationUtils.showBadCalibrationNotification(getContext()); } diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 182a038d10f7..79ea108a75d5 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1506,8 +1506,9 @@ public final class DisplayManagerService extends SystemService { } private void setDisplayPropertiesInternal(int displayId, boolean hasContent, - float requestedRefreshRate, int requestedModeId, float requestedMaxRefreshRate, - boolean preferMinimalPostProcessing, boolean inTraversal) { + float requestedRefreshRate, int requestedModeId, float requestedMinRefreshRate, + float requestedMaxRefreshRate, boolean preferMinimalPostProcessing, + boolean inTraversal) { synchronized (mSyncRoot) { final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId); if (display == null) { @@ -1528,11 +1529,17 @@ public final class DisplayManagerService extends SystemService { if (requestedModeId == 0 && requestedRefreshRate != 0) { // Scan supported modes returned by display.getInfo() to find a mode with the same // size as the default display mode but with the specified refresh rate instead. - requestedModeId = display.getDisplayInfoLocked().findDefaultModeByRefreshRate( - requestedRefreshRate).getModeId(); + Display.Mode mode = display.getDisplayInfoLocked().findDefaultModeByRefreshRate( + requestedRefreshRate); + if (mode != null) { + requestedModeId = mode.getModeId(); + } else { + Slog.e(TAG, "Couldn't find a mode for the requestedRefreshRate: " + + requestedRefreshRate + " on Display: " + displayId); + } } mDisplayModeDirector.getAppRequestObserver().setAppRequest( - displayId, requestedModeId, requestedMaxRefreshRate); + displayId, requestedModeId, requestedMinRefreshRate, requestedMaxRefreshRate); if (display.getDisplayInfoLocked().minimalPostProcessingSupported) { boolean mppRequest = mMinimalPostProcessingAllowed && preferMinimalPostProcessing; @@ -3202,11 +3209,12 @@ public final class DisplayManagerService extends SystemService { @Override public void setDisplayProperties(int displayId, boolean hasContent, - float requestedRefreshRate, int requestedMode, float requestedMaxRefreshRate, - boolean requestedMinimalPostProcessing, boolean inTraversal) { + float requestedRefreshRate, int requestedMode, float requestedMinRefreshRate, + float requestedMaxRefreshRate, boolean requestedMinimalPostProcessing, + boolean inTraversal) { setDisplayPropertiesInternal(displayId, hasContent, requestedRefreshRate, - requestedMode, requestedMaxRefreshRate, requestedMinimalPostProcessing, - inTraversal); + requestedMode, requestedMinRefreshRate, requestedMaxRefreshRate, + requestedMinimalPostProcessing, inTraversal); } @Override diff --git a/services/core/java/com/android/server/display/DisplayModeDirector.java b/services/core/java/com/android/server/display/DisplayModeDirector.java index 83fc9665f192..f23ae6e2340c 100644 --- a/services/core/java/com/android/server/display/DisplayModeDirector.java +++ b/services/core/java/com/android/server/display/DisplayModeDirector.java @@ -913,10 +913,12 @@ public class DisplayModeDirector { // It votes [MIN_REFRESH_RATE, Float.POSITIVE_INFINITY] public static final int PRIORITY_USER_SETTING_MIN_REFRESH_RATE = 2; - // APP_REQUEST_MAX_REFRESH_RATE is used to for internal apps to limit the refresh + // APP_REQUEST_REFRESH_RATE_RANGE is used to for internal apps to limit the refresh // rate in certain cases, mostly to preserve power. - // It votes to [0, APP_REQUEST_MAX_REFRESH_RATE]. - public static final int PRIORITY_APP_REQUEST_MAX_REFRESH_RATE = 3; + // @see android.view.WindowManager.LayoutParams#preferredMinRefreshRate + // @see android.view.WindowManager.LayoutParams#preferredMaxRefreshRate + // It votes to [preferredMinRefreshRate, preferredMaxRefreshRate]. + public static final int PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE = 3; // We split the app request into different priorities in case we can satisfy one desire // without the other. @@ -967,7 +969,7 @@ public class DisplayModeDirector { // The cutoff for the app request refresh rate range. Votes with priorities lower than this // value will not be considered when constructing the app request refresh rate range. public static final int APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF = - PRIORITY_APP_REQUEST_MAX_REFRESH_RATE; + PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE; /** * A value signifying an invalid width or height in a vote. @@ -1035,8 +1037,8 @@ public class DisplayModeDirector { switch (priority) { case PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE: return "PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE"; - case PRIORITY_APP_REQUEST_MAX_REFRESH_RATE: - return "PRIORITY_APP_REQUEST_MAX_REFRESH_RATE"; + case PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE: + return "PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE"; case PRIORITY_APP_REQUEST_SIZE: return "PRIORITY_APP_REQUEST_SIZE"; case PRIORITY_DEFAULT_REFRESH_RATE: @@ -1233,17 +1235,19 @@ public class DisplayModeDirector { final class AppRequestObserver { private final SparseArray<Display.Mode> mAppRequestedModeByDisplay; - private final SparseArray<Float> mAppPreferredMaxRefreshRateByDisplay; + private final SparseArray<RefreshRateRange> mAppPreferredRefreshRateRangeByDisplay; AppRequestObserver() { mAppRequestedModeByDisplay = new SparseArray<>(); - mAppPreferredMaxRefreshRateByDisplay = new SparseArray<>(); + mAppPreferredRefreshRateRangeByDisplay = new SparseArray<>(); } - public void setAppRequest(int displayId, int modeId, float requestedMaxRefreshRate) { + public void setAppRequest(int displayId, int modeId, float requestedMinRefreshRateRange, + float requestedMaxRefreshRateRange) { synchronized (mLock) { setAppRequestedModeLocked(displayId, modeId); - setAppPreferredMaxRefreshRateLocked(displayId, requestedMaxRefreshRate); + setAppPreferredRefreshRateRangeLocked(displayId, requestedMinRefreshRateRange, + requestedMaxRefreshRateRange); } } @@ -1272,26 +1276,36 @@ public class DisplayModeDirector { updateVoteLocked(displayId, Vote.PRIORITY_APP_REQUEST_SIZE, sizeVote); } - private void setAppPreferredMaxRefreshRateLocked(int displayId, - float requestedMaxRefreshRate) { + private void setAppPreferredRefreshRateRangeLocked(int displayId, + float requestedMinRefreshRateRange, float requestedMaxRefreshRateRange) { final Vote vote; - final Float requestedMaxRefreshRateVote = - requestedMaxRefreshRate > 0 - ? new Float(requestedMaxRefreshRate) : null; - if (Objects.equals(requestedMaxRefreshRateVote, - mAppPreferredMaxRefreshRateByDisplay.get(displayId))) { + + RefreshRateRange refreshRateRange = null; + if (requestedMinRefreshRateRange > 0 || requestedMaxRefreshRateRange > 0) { + float min = requestedMinRefreshRateRange; + float max = requestedMaxRefreshRateRange > 0 + ? requestedMaxRefreshRateRange : Float.POSITIVE_INFINITY; + refreshRateRange = new RefreshRateRange(min, max); + if (refreshRateRange.min == 0 && refreshRateRange.max == 0) { + // requestedMinRefreshRateRange/requestedMaxRefreshRateRange were invalid + refreshRateRange = null; + } + } + + if (Objects.equals(refreshRateRange, + mAppPreferredRefreshRateRangeByDisplay.get(displayId))) { return; } - if (requestedMaxRefreshRate > 0) { - mAppPreferredMaxRefreshRateByDisplay.put(displayId, requestedMaxRefreshRateVote); - vote = Vote.forRefreshRates(0, requestedMaxRefreshRate); + if (refreshRateRange != null) { + mAppPreferredRefreshRateRangeByDisplay.put(displayId, refreshRateRange); + vote = Vote.forRefreshRates(refreshRateRange.min, refreshRateRange.max); } else { - mAppPreferredMaxRefreshRateByDisplay.remove(displayId); + mAppPreferredRefreshRateRangeByDisplay.remove(displayId); vote = null; } synchronized (mLock) { - updateVoteLocked(displayId, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE, vote); + updateVoteLocked(displayId, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE, vote); } } @@ -1316,11 +1330,12 @@ public class DisplayModeDirector { final Display.Mode mode = mAppRequestedModeByDisplay.valueAt(i); pw.println(" " + id + " -> " + mode); } - pw.println(" mAppPreferredMaxRefreshRateByDisplay:"); - for (int i = 0; i < mAppPreferredMaxRefreshRateByDisplay.size(); i++) { - final int id = mAppPreferredMaxRefreshRateByDisplay.keyAt(i); - final Float refreshRate = mAppPreferredMaxRefreshRateByDisplay.valueAt(i); - pw.println(" " + id + " -> " + refreshRate); + pw.println(" mAppPreferredRefreshRateRangeByDisplay:"); + for (int i = 0; i < mAppPreferredRefreshRateRangeByDisplay.size(); i++) { + final int id = mAppPreferredRefreshRateRangeByDisplay.keyAt(i); + final RefreshRateRange refreshRateRange = + mAppPreferredRefreshRateRangeByDisplay.valueAt(i); + pw.println(" " + id + " -> " + refreshRateRange); } } } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java index 505e743ed9a1..a2cb78d27a57 100755 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java @@ -23,6 +23,7 @@ import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.IHdmiControlCallback; import android.hardware.input.InputManager; import android.hardware.tv.cec.V1_0.SendMessageResult; +import android.media.AudioManager; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -685,6 +686,9 @@ abstract class HdmiCecLocalDevice { Message.obtain(mHandler, MSG_USER_CONTROL_RELEASE_TIMEOUT), FOLLOWER_SAFETY_TIMEOUT); return Constants.HANDLED; + } else if (params.length > 0) { + // Handle CEC UI commands that are not mapped to an Android keycode + return handleUnmappedCecKeycode(params[0]); } return Constants.ABORT_INVALID_OPERAND; @@ -692,6 +696,21 @@ abstract class HdmiCecLocalDevice { @ServiceThreadOnly @Constants.HandleMessageResult + protected int handleUnmappedCecKeycode(int cecKeycode) { + if (cecKeycode == HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION) { + mService.getAudioManager().adjustStreamVolume(AudioManager.STREAM_MUSIC, + AudioManager.ADJUST_MUTE, AudioManager.FLAG_SHOW_UI); + return Constants.HANDLED; + } else if (cecKeycode == HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION) { + mService.getAudioManager().adjustStreamVolume(AudioManager.STREAM_MUSIC, + AudioManager.ADJUST_UNMUTE, AudioManager.FLAG_SHOW_UI); + return Constants.HANDLED; + } + return Constants.ABORT_INVALID_OPERAND; + } + + @ServiceThreadOnly + @Constants.HandleMessageResult protected int handleUserControlReleased() { assertRunOnServiceThread(); mHandler.removeMessages(MSG_USER_CONTROL_RELEASE_TIMEOUT); diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java index 43886f7cb87b..5c1ce6488444 100644 --- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java +++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java @@ -538,7 +538,7 @@ public class LocationProviderManager extends mPermitted = permitted; - if (mForeground) { + if (mPermitted) { EVENT_LOG.logProviderClientPermitted(mName, getIdentity()); } else { EVENT_LOG.logProviderClientUnpermitted(mName, getIdentity()); diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java index 168ca551317a..7d08ad0a47d1 100644 --- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java +++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java @@ -903,9 +903,9 @@ class MediaRouter2ServiceImpl { userRecord.mManagerRecords.add(managerRecord); mAllManagerRecords.put(binder, managerRecord); - userRecord.mHandler.sendMessage(obtainMessage(UserHandler::notifyRoutesToManager, - userRecord.mHandler, manager)); - + // Note: Features should be sent first before the routes. If not, the + // RouteCallback#onRoutesAdded() for system MR2 will never be called with initial routes + // due to the lack of features. for (RouterRecord routerRecord : userRecord.mRouterRecords) { // TODO: UserRecord <-> routerRecord, why do they reference each other? // How about removing mUserRecord from routerRecord? @@ -913,6 +913,9 @@ class MediaRouter2ServiceImpl { obtainMessage(UserHandler::notifyPreferredFeaturesChangedToManager, routerRecord.mUserRecord.mHandler, routerRecord, manager)); } + + userRecord.mHandler.sendMessage(obtainMessage(UserHandler::notifyRoutesToManager, + userRecord.mHandler, manager)); } private void unregisterManagerLocked(@NonNull IMediaRouter2Manager manager, boolean died) { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index d78fbdb53d8d..addcd0f1c837 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -773,12 +773,13 @@ public class NotificationManagerService extends SystemService { mAssistants.resetDefaultFromConfig(); continue; } + // TODO(b/192450820): re-enable when "user set" isn't over triggering //User selected different NAS, need onboarding - enqueueNotificationInternal(getContext().getPackageName(), + /*enqueueNotificationInternal(getContext().getPackageName(), getContext().getOpPackageName(), Binder.getCallingUid(), Binder.getCallingPid(), TAG, SystemMessageProto.SystemMessage.NOTE_NAS_UPGRADE, - createNASUpgradeNotification(userId), userId); + createNASUpgradeNotification(userId), userId);*/ } } } diff --git a/services/core/java/com/android/server/notification/VibratorHelper.java b/services/core/java/com/android/server/notification/VibratorHelper.java index f25b0470cc8a..f47aa487744a 100644 --- a/services/core/java/com/android/server/notification/VibratorHelper.java +++ b/services/core/java/com/android/server/notification/VibratorHelper.java @@ -102,9 +102,6 @@ public final class VibratorHelper { * @param insistent {@code true} if the vibration should loop until it is cancelled. */ public VibrationEffect createFallbackVibration(boolean insistent) { - if (mVibrator.hasFrequencyControl()) { - return createChirpVibration(insistent); - } return createWaveformVibration(mFallbackPattern, insistent); } @@ -114,30 +111,9 @@ public final class VibratorHelper { * @param insistent {@code true} if the vibration should loop until it is cancelled. */ public VibrationEffect createDefaultVibration(boolean insistent) { - if (mVibrator.hasFrequencyControl()) { - return createChirpVibration(insistent); - } return createWaveformVibration(mDefaultPattern, insistent); } - private static VibrationEffect createChirpVibration(boolean insistent) { - VibrationEffect.WaveformBuilder waveformBuilder = VibrationEffect.startWaveform() - .addStep(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 0) - .addRamp(/* amplitude= */ 1, /* frequency= */ -0.25f, /* duration= */ 100) - .addStep(/* amplitude= */ 1, /* duration= */ 150) - .addRamp(/* amplitude= */ 0, /* frequency= */ -0.85f, /* duration= */ 250); - - if (insistent) { - return waveformBuilder.build(/* repeat= */ 0); - } - - VibrationEffect singleBeat = waveformBuilder.build(); - return VibrationEffect.startComposition() - .addEffect(singleBeat) - .addEffect(singleBeat) - .compose(); - } - private static long[] getLongArray(Resources resources, int resId, int maxLength, long[] def) { int[] ar = resources.getIntArray(resId); if (ar == null) { diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 3369dcd67b4d..73dc8dc78fbf 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -67,6 +67,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutorService; @@ -306,17 +307,19 @@ public abstract class ApexManager { /** * Reports error raised during installation of apk-in-apex. * - * @param scanDir the directory of the apex inside which apk-in-apex resides. + * @param scanDirPath the directory of the apex inside which apk-in-apex resides. + * @param errorMsg the actual error that occurred when scanning the path */ - abstract void reportErrorWithApkInApex(String scanDirPath); + abstract void reportErrorWithApkInApex(String scanDirPath, String errorMsg); /** - * Returns true if there were no errors when installing apk-in-apex inside - * {@param apexPackageName}, otherwise false. + * Returns null if there were no errors when installing apk-in-apex inside + * {@param apexPackageName}, otherwise returns the error as string * * @param apexPackageName Package name of the apk container of apex */ - abstract boolean isApkInApexInstallSuccess(String apexPackageName); + @Nullable + abstract String getApkInApexInstallError(String apexPackageName); /** * Returns list of {@code packageName} of apks inside the given apex. @@ -438,7 +441,7 @@ public abstract class ApexManager { * inside {@code apexModuleName}. */ @GuardedBy("mLock") - private Set<String> mErrorWithApkInApex = new ArraySet<>(); + private Map<String, String> mErrorWithApkInApex = new ArrayMap<>(); @GuardedBy("mLock") private List<PackageInfo> mAllPackagesCache; @@ -841,26 +844,27 @@ public abstract class ApexManager { } @Override - void reportErrorWithApkInApex(String scanDirPath) { + void reportErrorWithApkInApex(String scanDirPath, String errorMsg) { synchronized (mLock) { for (ActiveApexInfo aai : mActiveApexInfosCache) { if (scanDirPath.startsWith(aai.apexDirectory.getAbsolutePath())) { - mErrorWithApkInApex.add(aai.apexModuleName); + mErrorWithApkInApex.put(aai.apexModuleName, errorMsg); } } } } @Override - boolean isApkInApexInstallSuccess(String apexPackageName) { + @Nullable + String getApkInApexInstallError(String apexPackageName) { synchronized (mLock) { Preconditions.checkState(mPackageNameToApexModuleName != null, "APEX packages have not been scanned"); String moduleName = mPackageNameToApexModuleName.get(apexPackageName); if (moduleName == null) { - return false; + return null; } - return !mErrorWithApkInApex.contains(moduleName); + return mErrorWithApkInApex.get(moduleName); } } @@ -1273,13 +1277,14 @@ public abstract class ApexManager { } @Override - void reportErrorWithApkInApex(String scanDirPath) { + void reportErrorWithApkInApex(String scanDirPath, String errorMsg) { // No-op } @Override - boolean isApkInApexInstallSuccess(String apexPackageName) { - return true; + @Nullable + String getApkInApexInstallError(String apexPackageName) { + return null; } @Override diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 1401fa9b5e58..06ff69176bb7 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -17,8 +17,6 @@ package com.android.server.pm; import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; -import static android.os.UserHandle.USER_ALL; -import static android.os.UserHandle.USER_NULL; import static android.provider.DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE; import static com.android.internal.annotations.VisibleForTesting.Visibility.PRIVATE; @@ -687,7 +685,7 @@ public class AppsFilter implements Watchable, Snappable { synchronized (mCacheLock) { if (mShouldFilterCache != null) { updateShouldFilterCacheForPackage(mShouldFilterCache, null, newPkgSetting, - settings, users, USER_ALL, settings.size()); + settings, users, settings.size()); if (additionalChangedPackages != null) { for (int index = 0; index < additionalChangedPackages.size(); index++) { String changedPackage = additionalChangedPackages.valueAt(index); @@ -700,8 +698,7 @@ public class AppsFilter implements Watchable, Snappable { } updateShouldFilterCacheForPackage(mShouldFilterCache, null, - changedPkgSetting, settings, users, USER_ALL, - settings.size()); + changedPkgSetting, settings, users, settings.size()); } } } // else, rebuild entire cache when system is ready @@ -833,57 +830,24 @@ public class AppsFilter implements Watchable, Snappable { } } } - private void updateEntireShouldFilterCache() { - updateEntireShouldFilterCache(USER_ALL); - } - private void updateEntireShouldFilterCache(int subjectUserId) { + private void updateEntireShouldFilterCache() { mStateProvider.runWithState((settings, 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; - } WatchedSparseBooleanMatrix cache = - updateEntireShouldFilterCacheInner(settings, users, userId); + updateEntireShouldFilterCacheInner(settings, users); synchronized (mCacheLock) { - if (userId != USER_ALL) { - // if we're only updating a single user id, we need to copy over the prior - // cached values for the other users. - int[] uids = mShouldFilterCache.keys(); - for (int i = 0; i < uids.length; i++) { - int uid1 = uids[i]; - if (UserHandle.getUserId(uid1) == userId) { - continue; - } - for (int j = 0; j < uids.length; j++) { - int uid2 = uids[j]; - if (UserHandle.getUserId(uid2) == userId) { - continue; - } - cache.put(uid1, uid2, mShouldFilterCache.get(uid1, uid2)); - } - } - } mShouldFilterCache = cache; } }); } private WatchedSparseBooleanMatrix updateEntireShouldFilterCacheInner( - ArrayMap<String, PackageSetting> settings, UserInfo[] users, int subjectUserId) { + ArrayMap<String, PackageSetting> settings, UserInfo[] users) { WatchedSparseBooleanMatrix cache = new WatchedSparseBooleanMatrix(users.length * settings.size()); for (int i = settings.size() - 1; i >= 0; i--) { updateShouldFilterCacheForPackage(cache, - null /*skipPackage*/, settings.valueAt(i), settings, users, subjectUserId, i); + null /*skipPackage*/, settings.valueAt(i), settings, users, i); } return cache; } @@ -904,8 +868,8 @@ public class AppsFilter implements Watchable, Snappable { packagesCache.put(settings.keyAt(i), pkg); } }); - WatchedSparseBooleanMatrix cache = updateEntireShouldFilterCacheInner( - settingsCopy, usersRef[0], USER_ALL); + WatchedSparseBooleanMatrix cache = + updateEntireShouldFilterCacheInner(settingsCopy, usersRef[0]); 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, users) -> { @@ -935,10 +899,10 @@ public class AppsFilter implements Watchable, Snappable { }); } - public void onUserCreated(int newUserId) { + public void onUsersChanged() { synchronized (mCacheLock) { if (mShouldFilterCache != null) { - updateEntireShouldFilterCache(newUserId); + updateEntireShouldFilterCache(); onChanged(); } } @@ -949,7 +913,7 @@ public class AppsFilter implements Watchable, Snappable { if (mShouldFilterCache != null) { mStateProvider.runWithState((settings, users) -> { updateShouldFilterCacheForPackage(mShouldFilterCache, null /* skipPackage */, - settings.get(packageName), settings, users, USER_ALL, + settings.get(packageName), settings, users, settings.size() /*maxIndex*/); }); } @@ -958,7 +922,7 @@ public class AppsFilter implements Watchable, Snappable { private void updateShouldFilterCacheForPackage(WatchedSparseBooleanMatrix cache, @Nullable String skipPackageName, PackageSetting subjectSetting, ArrayMap<String, - PackageSetting> allSettings, UserInfo[] allUsers, int subjectUserId, int maxIndex) { + PackageSetting> allSettings, UserInfo[] allUsers, int maxIndex) { for (int i = Math.min(maxIndex, allSettings.size() - 1); i >= 0; i--) { PackageSetting otherSetting = allSettings.valueAt(i); if (subjectSetting.appId == otherSetting.appId) { @@ -968,34 +932,25 @@ public class AppsFilter implements Watchable, Snappable { if (subjectSetting.name == skipPackageName || otherSetting.name == skipPackageName) { continue; } - if (subjectUserId == USER_ALL) { - for (int su = 0; su < allUsers.length; su++) { - updateShouldFilterCacheForUser(cache, subjectSetting, allUsers, otherSetting, - allUsers[su].id); + final int userCount = allUsers.length; + final int appxUidCount = userCount * allSettings.size(); + for (int su = 0; su < userCount; su++) { + int subjectUser = allUsers[su].id; + for (int ou = 0; ou < userCount; ou++) { + int otherUser = allUsers[ou].id; + int subjectUid = UserHandle.getUid(subjectUser, subjectSetting.appId); + int otherUid = UserHandle.getUid(otherUser, otherSetting.appId); + cache.put(subjectUid, otherUid, + shouldFilterApplicationInternal( + subjectUid, subjectSetting, otherSetting, otherUser)); + cache.put(otherUid, subjectUid, + shouldFilterApplicationInternal( + otherUid, otherSetting, subjectSetting, subjectUser)); } - } else { - updateShouldFilterCacheForUser(cache, subjectSetting, allUsers, otherSetting, - subjectUserId); } } } - private void updateShouldFilterCacheForUser(WatchedSparseBooleanMatrix cache, - PackageSetting subjectSetting, UserInfo[] allUsers, PackageSetting otherSetting, - int subjectUserId) { - for (int ou = 0; ou < allUsers.length; ou++) { - int otherUser = allUsers[ou].id; - int subjectUid = UserHandle.getUid(subjectUserId, subjectSetting.appId); - int otherUid = UserHandle.getUid(otherUser, otherSetting.appId); - cache.put(subjectUid, otherUid, - shouldFilterApplicationInternal( - subjectUid, subjectSetting, otherSetting, otherUser)); - cache.put(otherUid, subjectUid, - shouldFilterApplicationInternal( - otherUid, otherSetting, subjectSetting, subjectUserId)); - } - } - private static boolean isSystemSigned(@NonNull PackageParser.SigningDetails sysSigningDetails, PackageSetting pkgSetting) { return pkgSetting.isSystem() @@ -1190,7 +1145,7 @@ public class AppsFilter implements Watchable, Snappable { continue; } updateShouldFilterCacheForPackage(mShouldFilterCache, setting.name, - siblingSetting, settings, users, USER_ALL, settings.size()); + siblingSetting, settings, users, settings.size()); } } @@ -1207,7 +1162,7 @@ public class AppsFilter implements Watchable, Snappable { } updateShouldFilterCacheForPackage(mShouldFilterCache, null, - changedPkgSetting, settings, users, USER_ALL, settings.size()); + changedPkgSetting, settings, users, settings.size()); } } } diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index d2ed08f66944..d7b244980cfc 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -989,7 +989,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements SessionInfo info = session.generateInfoForCaller(false /*withIcon*/, Process.SYSTEM_UID); if (Objects.equals(info.getInstallerPackageName(), installerPackageName) - && session.userId == userId && !session.hasParentSessionId()) { + && session.userId == userId && !session.hasParentSessionId() + && isCallingUidOwner(session)) { result.add(info); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index f44241ddc3fe..faa37a03c971 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -11824,6 +11824,7 @@ public class PackageManagerService extends IPackageManager.Stub ParallelPackageParser.ParseResult parseResult = parallelPackageParser.take(); Throwable throwable = parseResult.throwable; int errorCode = PackageManager.INSTALL_SUCCEEDED; + String errorMsg = null; if (throwable == null) { // TODO(toddke): move lower in the scan chain @@ -11836,20 +11837,22 @@ public class PackageManagerService extends IPackageManager.Stub currentTime, null); } catch (PackageManagerException e) { errorCode = e.error; - Slog.w(TAG, "Failed to scan " + parseResult.scanFile + ": " + e.getMessage()); + errorMsg = "Failed to scan " + parseResult.scanFile + ": " + e.getMessage(); + Slog.w(TAG, errorMsg); } } else if (throwable instanceof PackageParserException) { PackageParserException e = (PackageParserException) throwable; errorCode = e.error; - Slog.w(TAG, "Failed to parse " + parseResult.scanFile + ": " + e.getMessage()); + errorMsg = "Failed to parse " + parseResult.scanFile + ": " + e.getMessage(); + Slog.w(TAG, errorMsg); } else { throw new IllegalStateException("Unexpected exception occurred while parsing " + parseResult.scanFile, throwable); } if ((scanFlags & SCAN_AS_APK_IN_APEX) != 0 && errorCode != INSTALL_SUCCEEDED) { - mApexManager.reportErrorWithApkInApex(scanDir.getAbsolutePath()); + mApexManager.reportErrorWithApkInApex(scanDir.getAbsolutePath(), errorMsg); } // Delete invalid userdata apps @@ -20111,7 +20114,28 @@ public class PackageManagerService extends IPackageManager.Stub notifyPackageChangeObserversOnUpdate(reconciledPkg); } - NativeLibraryHelper.waitForNativeBinariesExtraction(incrementalStorages); + waitForNativeBinariesExtraction(incrementalStorages); + } + + static void waitForNativeBinariesExtraction( + ArraySet<IncrementalStorage> incrementalStorages) { + if (incrementalStorages.isEmpty()) { + return; + } + try { + // Native library extraction may take very long time: each page could potentially + // wait for either 10s or 100ms (adb vs non-adb data loader), and that easily adds + // up to a full watchdog timeout of 1 min, killing the system after that. It doesn't + // make much sense as blocking here doesn't lock up the framework, but only blocks + // the installation session and the following ones. + Watchdog.getInstance().pauseWatchingCurrentThread("native_lib_extract"); + for (int i = 0; i < incrementalStorages.size(); ++i) { + IncrementalStorage storage = incrementalStorages.valueAtUnchecked(i); + storage.waitForNativeBinariesExtraction(); + } + } finally { + Watchdog.getInstance().resumeWatchingCurrentThread("native_lib_extract"); + } } private int[] getInstalledUsers(PackageSetting ps, int userId) { @@ -21486,7 +21510,7 @@ public class PackageManagerService extends IPackageManager.Stub // user handle installed state int[] allUsers; final int freezeUser; - final SparseArray<Pair<Integer, String>> enabledStateAndCallerPerUser; + final SparseArray<TempUserState> priorUserStates; /** enabled state of the uninstalled application */ synchronized (mLock) { uninstalledPs = mSettings.getPackageLPr(packageName); @@ -21537,16 +21561,16 @@ public class PackageManagerService extends IPackageManager.Stub // We're downgrading a system app, which will apply to all users, so // freeze them all during the downgrade freezeUser = UserHandle.USER_ALL; - enabledStateAndCallerPerUser = new SparseArray<>(); + priorUserStates = new SparseArray<>(); for (int i = 0; i < allUsers.length; i++) { PackageUserState userState = uninstalledPs.readUserState(allUsers[i]); - Pair<Integer, String> enabledStateAndCaller = - new Pair<>(userState.enabled, userState.lastDisableAppCaller); - enabledStateAndCallerPerUser.put(allUsers[i], enabledStateAndCaller); + priorUserStates.put(allUsers[i], + new TempUserState(userState.enabled, userState.lastDisableAppCaller, + userState.installed)); } } else { freezeUser = removeUser; - enabledStateAndCallerPerUser = null; + priorUserStates = null; } } @@ -21583,6 +21607,30 @@ public class PackageManagerService extends IPackageManager.Stub if (info.args != null) { info.args.doPostDeleteLI(true); } + + boolean reEnableStub = false; + + if (priorUserStates != null) { + synchronized (mLock) { + for (int i = 0; i < allUsers.length; i++) { + TempUserState priorUserState = priorUserStates.get(allUsers[i]); + int enabledState = priorUserState.enabledState; + PackageSetting pkgSetting = getPackageSetting(packageName); + pkgSetting.setEnabled(enabledState, allUsers[i], + priorUserState.lastDisableAppCaller); + + AndroidPackage aPkg = pkgSetting.getPkg(); + boolean pkgEnabled = aPkg != null && aPkg.isEnabled(); + if (!reEnableStub && priorUserState.installed + && ((enabledState == COMPONENT_ENABLED_STATE_DEFAULT && pkgEnabled) + || enabledState == COMPONENT_ENABLED_STATE_ENABLED)) { + reEnableStub = true; + } + } + mSettings.writeAllUsersPackageRestrictionsLPr(); + } + } + final AndroidPackage stubPkg = (disabledSystemPs == null) ? null : disabledSystemPs.pkg; if (stubPkg != null && stubPkg.isStub()) { @@ -21592,19 +21640,7 @@ public class PackageManagerService extends IPackageManager.Stub } if (stubPs != null) { - boolean enable = false; - for (int aUserId : allUsers) { - if (stubPs.getInstalled(aUserId)) { - int enabled = stubPs.getEnabled(aUserId); - if (enabled == COMPONENT_ENABLED_STATE_DEFAULT - || enabled == COMPONENT_ENABLED_STATE_ENABLED) { - enable = true; - break; - } - } - } - - if (enable) { + if (reEnableStub) { if (DEBUG_COMPRESSION) { Slog.i(TAG, "Enabling system stub after removal; pkg: " + stubPkg.getPackageName()); @@ -21616,19 +21652,6 @@ public class PackageManagerService extends IPackageManager.Stub } } } - if (enabledStateAndCallerPerUser != null) { - synchronized (mLock) { - for (int i = 0; i < allUsers.length; i++) { - Pair<Integer, String> enabledStateAndCaller = - enabledStateAndCallerPerUser.get(allUsers[i]); - getPackageSetting(packageName) - .setEnabled(enabledStateAndCaller.first, - allUsers[i], - enabledStateAndCaller.second); - } - mSettings.writeAllUsersPackageRestrictionsLPr(); - } - } } return res ? PackageManager.DELETE_SUCCEEDED : PackageManager.DELETE_FAILED_INTERNAL_ERROR; @@ -26505,7 +26528,7 @@ public class PackageManagerService extends IPackageManager.Stub synchronized (mLock) { scheduleWritePackageRestrictionsLocked(userId); scheduleWritePackageListLocked(userId); - mAppsFilter.onUserCreated(userId); + mAppsFilter.onUsersChanged(); } } @@ -28933,6 +28956,20 @@ public class PackageManagerService extends IPackageManager.Stub } } } + + private static class TempUserState { + public final int enabledState; + @Nullable + public final String lastDisableAppCaller; + public final boolean installed; + + private TempUserState(int enabledState, @Nullable String lastDisableAppCaller, + boolean installed) { + this.enabledState = enabledState; + this.lastDisableAppCaller = lastDisableAppCaller; + this.installed = installed; + } + } } interface PackageSender { diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index c842ff1b11a5..4ac5be2ec7c7 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -425,9 +425,10 @@ public class StagingManager { for (StagedSession apexSession : apexSessions) { String packageName = apexSession.getPackageName(); - if (!mApexManager.isApkInApexInstallSuccess(packageName)) { + String errorMsg = mApexManager.getApkInApexInstallError(packageName); + if (errorMsg != null) { throw new PackageManagerException(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED, - "Failed to install apk-in-apex of " + packageName); + "Failed to install apk-in-apex of " + packageName + " : " + errorMsg); } } } @@ -737,31 +738,31 @@ public class StagingManager { continue; } - // New session cannot have same package name as one of the active sessions - if (stagedSession.sessionContains(s -> s.getPackageName().equals(packageName))) { - if (isRollback) { - // If the new session is a rollback, then it gets priority. The existing - // session is failed to unblock rollback. - final StagedSession root = stagedSession; - if (!ensureActiveApexSessionIsAborted(root)) { - Slog.e(TAG, "Failed to abort apex session " + root.sessionId()); - // Safe to ignore active apex session abort failure since session - // will be marked failed on next step and staging directory for session - // will be deleted. - } - root.setSessionFailed( - SessionInfo.STAGED_SESSION_CONFLICT, - "Session was blocking rollback session: " + session.sessionId()); - Slog.i(TAG, "Session " + root.sessionId() + " is marked failed due to " - + "blocking rollback session: " + session.sessionId()); - } else { - throw new PackageManagerException( - SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, - "Package: " + session.getPackageName() + " in session: " - + session.sessionId() - + " has been staged already by session: " - + stagedSession.sessionId(), null); + if (isRollback && !isRollback(stagedSession)) { + // If the new session is a rollback, then it gets priority. The existing + // session is failed to reduce risk and avoid an SDK extension dependency + // violation. + final StagedSession root = stagedSession; + if (!ensureActiveApexSessionIsAborted(root)) { + Slog.e(TAG, "Failed to abort apex session " + root.sessionId()); + // Safe to ignore active apex session abort failure since session + // will be marked failed on next step and staging directory for session + // will be deleted. } + root.setSessionFailed( + SessionInfo.STAGED_SESSION_CONFLICT, + "Session was failed by rollback session: " + session.sessionId()); + Slog.i(TAG, "Session " + root.sessionId() + " is marked failed due to " + + "rollback session: " + session.sessionId()); + } else if (stagedSession.sessionContains( + s -> s.getPackageName().equals(packageName))) { + // New session cannot have same package name as one of the active sessions + throw new PackageManagerException( + SessionInfo.STAGED_SESSION_VERIFICATION_FAILED, + "Package: " + session.getPackageName() + " in session: " + + session.sessionId() + + " has been staged already by session: " + + stagedSession.sessionId(), null); } // Staging multiple root sessions is not allowed if device doesn't support @@ -955,12 +956,17 @@ public class StagingManager { continue; } else if (isApexSessionFailed(apexSession)) { hasFailedApexSession = true; - String errorMsg = "APEX activation failed. " + apexSession.errorMessage; if (!TextUtils.isEmpty(apexSession.crashingNativeProcess)) { prepareForLoggingApexdRevert(session, apexSession.crashingNativeProcess); - errorMsg = "Session reverted due to crashing native process: " - + apexSession.crashingNativeProcess; } + String errorMsg = "APEX activation failed."; + final String reasonForRevert = getReasonForRevert(); + if (!TextUtils.isEmpty(reasonForRevert)) { + errorMsg += " Reason: " + reasonForRevert; + } else if (!TextUtils.isEmpty(apexSession.errorMessage)) { + errorMsg += " Error: " + apexSession.errorMessage; + } + Slog.d(TAG, errorMsg); session.setSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED, errorMsg); continue; } else if (apexSession.isActivated || apexSession.isSuccess) { diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index 878eb920717e..9182d811d56d 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -162,9 +162,6 @@ "include-filter": "com.android.server.pm.parsing.SystemPartitionParseTest" } ] - }, - { - "name": "CtsPackageManagerBootTestCases" } ], "imports": [ diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 38e9d3ec34e3..30eccca48ee9 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -2557,16 +2557,17 @@ public class PermissionManagerService extends IPermissionManager.Stub { * <li>During app update the state gets restored from the last version of the app</li> * </ul> * - * <p>This restores the permission state for all users. - * * @param pkg the package the permissions belong to * @param replace if the package is getting replaced (this might change the requested * permissions of this package) * @param packageOfInterest If this is the name of {@code pkg} add extra logging * @param callback Result call back + * @param filterUserId If not {@link UserHandle.USER_ALL}, only restore the permission state for + * this particular user */ private void restorePermissionState(@NonNull AndroidPackage pkg, boolean replace, - @Nullable String packageOfInterest, @Nullable PermissionCallback callback) { + @Nullable String packageOfInterest, @Nullable PermissionCallback callback, + @UserIdInt int filterUserId) { // IMPORTANT: There are two types of permissions: install and runtime. // Install time permissions are granted when the app is installed to // all device users and users added in the future. Runtime permissions @@ -2584,7 +2585,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { return; } - final int[] userIds = getAllUserIds(); + final int[] userIds = filterUserId == UserHandle.USER_ALL ? getAllUserIds() + : new int[] { filterUserId }; boolean runtimePermissionsRevoked = false; int[] updatedUserIds = EMPTY_INT_ARRAY; @@ -3874,7 +3876,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { if (updatePermissions) { // Update permission of this app to take into account the new allowlist state. - restorePermissionState(pkg, false, pkg.getPackageName(), mDefaultPermissionCallback); + restorePermissionState(pkg, false, pkg.getPackageName(), mDefaultPermissionCallback, + userId); // If this resulted in losing a permission we need to kill the app. if (oldGrantedRestrictedPermissions == null) { @@ -4028,14 +4031,17 @@ public class PermissionManagerService extends IPermissionManager.Stub { * * @param packageName The package that is updated * @param pkg The package that is updated, or {@code null} if package is deleted + * @param filterUserId If not {@link UserHandle.USER_ALL}, only restore the permission state for + * this particular user */ - private void updatePermissions(@NonNull String packageName, @Nullable AndroidPackage pkg) { + private void updatePermissions(@NonNull String packageName, @Nullable AndroidPackage pkg, + @UserIdInt int filterUserId) { // If the package is being deleted, update the permissions of all the apps final int flags = (pkg == null ? UPDATE_PERMISSIONS_ALL | UPDATE_PERMISSIONS_REPLACE_PKG : UPDATE_PERMISSIONS_REPLACE_PKG); - updatePermissions( - packageName, pkg, getVolumeUuidForPackage(pkg), flags, mDefaultPermissionCallback); + updatePermissions(packageName, pkg, getVolumeUuidForPackage(pkg), flags, + mDefaultPermissionCallback, filterUserId); } /** @@ -4057,7 +4063,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { (fingerprintChanged ? UPDATE_PERMISSIONS_REPLACE_PKG | UPDATE_PERMISSIONS_REPLACE_ALL : 0); - updatePermissions(null, null, volumeUuid, flags, mDefaultPermissionCallback); + updatePermissions(null, null, volumeUuid, flags, mDefaultPermissionCallback, + UserHandle.USER_ALL); } finally { PackageManager.uncorkPackageInfoCache(); } @@ -4106,12 +4113,14 @@ public class PermissionManagerService extends IPermissionManager.Stub { * all volumes * @param flags Control permission for which apps should be updated * @param callback Callback to call after permission changes + * @param filterUserId If not {@link UserHandle.USER_ALL}, only restore the permission state for + * this particular user */ private void updatePermissions(final @Nullable String changingPkgName, final @Nullable AndroidPackage changingPkg, final @Nullable String replaceVolumeUuid, @UpdatePermissionFlags int flags, - final @Nullable PermissionCallback callback) { + final @Nullable PermissionCallback callback, @UserIdInt int filterUserId) { // TODO: Most of the methods exposing BasePermission internals [source package name, // etc..] shouldn't be needed. Instead, when we've parsed a permission that doesn't // have package settings, we should make note of it elsewhere [map between @@ -4147,7 +4156,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { // Only replace for packages on requested volume final String volumeUuid = getVolumeUuidForPackage(pkg); final boolean replace = replaceAll && Objects.equals(replaceVolumeUuid, volumeUuid); - restorePermissionState(pkg, replace, changingPkgName, callback); + restorePermissionState(pkg, replace, changingPkgName, callback, filterUserId); }); } @@ -4156,7 +4165,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { final String volumeUuid = getVolumeUuidForPackage(changingPkg); final boolean replace = ((flags & UPDATE_PERMISSIONS_REPLACE_PKG) != 0) && Objects.equals(replaceVolumeUuid, volumeUuid); - restorePermissionState(changingPkg, replace, changingPkgName, callback); + restorePermissionState(changingPkg, replace, changingPkgName, callback, filterUserId); } Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); } @@ -4824,7 +4833,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { private void onPackageInstalledInternal(@NonNull AndroidPackage pkg, @NonNull PermissionManagerServiceInternal.PackageInstalledParams params, @UserIdInt int userId) { - updatePermissions(pkg.getPackageName(), pkg); + updatePermissions(pkg.getPackageName(), pkg, userId); addAllowlistedRestrictedPermissionsInternal(pkg, params.getAllowlistedRestrictedPermissions(), FLAG_PERMISSION_WHITELIST_INSTALLER, userId); @@ -4871,7 +4880,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { resetRuntimePermissionsInternal(pkg, userId); return; } - updatePermissions(packageName, null); + updatePermissions(packageName, null, userId); if (sharedUserPkgs.isEmpty()) { removeUidStateAndResetPackageInstallPermissionsFixed(appId, packageName, userId); } else { diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java index a389f40e772b..18c45e494c9b 100644 --- a/services/core/java/com/android/server/policy/AppOpsPolicy.java +++ b/services/core/java/com/android/server/policy/AppOpsPolicy.java @@ -32,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.location.LocationManagerInternal; import android.net.Uri; +import android.os.Binder; import android.os.IBinder; import android.os.PackageTagsList; import android.os.Process; @@ -72,6 +73,9 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat private final Object mLock = new Object(); @NonNull + private final IBinder mToken = new Binder(); + + @NonNull private final Context mContext; @NonNull @@ -81,6 +85,12 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat private final VoiceInteractionManagerInternal mVoiceInteractionManagerInternal; /** + * Whether this device allows only the HotwordDetectionService to use OP_RECORD_AUDIO_HOTWORD + * which doesn't incur the privacy indicator. + */ + private final boolean mIsHotwordDetectionServiceRequired; + + /** * The locking policy around the location tags is a bit special. Since we want to * avoid grabbing the lock on every op note we are taking the approach where the * read and write are being done via a thread-safe data structure such that the @@ -114,6 +124,8 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat mRoleManager = mContext.getSystemService(RoleManager.class); mVoiceInteractionManagerInternal = LocalServices.getService( VoiceInteractionManagerInternal.class); + mIsHotwordDetectionServiceRequired = isHotwordDetectionServiceRequired( + mContext.getPackageManager()); final LocationManagerInternal locationManagerInternal = LocalServices.getService( LocationManagerInternal.class); @@ -172,6 +184,21 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat }, UserHandle.SYSTEM); initializeActivityRecognizersTags(); + + // If this device does not have telephony, restrict the phone call ops + if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class); + appOps.setUserRestrictionForUser(AppOpsManager.OP_PHONE_CALL_MICROPHONE, true, mToken, + null, UserHandle.USER_ALL); + appOps.setUserRestrictionForUser(AppOpsManager.OP_PHONE_CALL_CAMERA, true, mToken, + null, UserHandle.USER_ALL); + } + } + + private static boolean isHotwordDetectionServiceRequired(PackageManager pm) { + // The HotwordDetectionService APIs aren't ready yet for Auto or TV. + return !(pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) + || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)); } @Override @@ -257,6 +284,7 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat private int resolveDatasourceOp(int code, int uid, @NonNull String packageName, @Nullable String attributionTag) { + code = resolveRecordAudioOp(code, uid); if (attributionTag == null) { return code; } @@ -359,6 +387,24 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat return code; } + private int resolveRecordAudioOp(int code, int uid) { + if (code == AppOpsManager.OP_RECORD_AUDIO_HOTWORD) { + if (!mIsHotwordDetectionServiceRequired) { + return code; + } + // Only the HotwordDetectionService can use the HOTWORD op which doesn't incur the + // privacy indicator. Downgrade to standard RECORD_AUDIO for other processes. + final HotwordDetectionServiceIdentity hotwordDetectionServiceIdentity = + mVoiceInteractionManagerInternal.getHotwordDetectionServiceIdentity(); + if (hotwordDetectionServiceIdentity != null + && uid == hotwordDetectionServiceIdentity.getIsolatedUid()) { + return code; + } + return AppOpsManager.OP_RECORD_AUDIO; + } + return code; + } + private int resolveUid(int code, int uid) { // The HotwordDetectionService is an isolated service, which ordinarily cannot hold // permissions. So we allow it to assume the owning package identity for certain diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index b5f3253eea0e..9638255dfc79 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -1344,7 +1344,8 @@ public final class PowerManagerService extends SystemService mDirty |= DIRTY_SETTINGS; } - private void handleSettingsChangedLocked() { + @VisibleForTesting + void handleSettingsChangedLocked() { updateSettingsLocked(); updatePowerStateLocked(); } @@ -2651,9 +2652,6 @@ public final class PowerManagerService extends SystemService private void updateAttentiveStateLocked(long now, int dirty) { long attentiveTimeout = getAttentiveTimeoutLocked(); - if (attentiveTimeout < 0) { - return; - } // Attentive state only applies to the default display group. long goToSleepTime = mDisplayGroupPowerStateMapper.getLastUserActivityTimeLocked( Display.DEFAULT_DISPLAY_GROUP) + attentiveTimeout; @@ -2661,10 +2659,10 @@ public final class PowerManagerService extends SystemService boolean warningDismissed = maybeHideInattentiveSleepWarningLocked(now, showWarningTime); - if (warningDismissed || - (dirty & (DIRTY_ATTENTIVE | DIRTY_STAY_ON | DIRTY_SCREEN_BRIGHTNESS_BOOST - | DIRTY_PROXIMITY_POSITIVE | DIRTY_WAKEFULNESS | DIRTY_BOOT_COMPLETED - | DIRTY_SETTINGS)) != 0) { + if (attentiveTimeout >= 0 && (warningDismissed + || (dirty & (DIRTY_ATTENTIVE | DIRTY_STAY_ON | DIRTY_SCREEN_BRIGHTNESS_BOOST + | DIRTY_PROXIMITY_POSITIVE | DIRTY_WAKEFULNESS | DIRTY_BOOT_COMPLETED + | DIRTY_SETTINGS)) != 0)) { if (DEBUG_SPEW) { Slog.d(TAG, "Updating attentive state"); } diff --git a/services/core/java/com/android/server/recoverysystem/OWNERS b/services/core/java/com/android/server/recoverysystem/OWNERS index 79ded0dfba77..e3e7fdfd8f20 100644 --- a/services/core/java/com/android/server/recoverysystem/OWNERS +++ b/services/core/java/com/android/server/recoverysystem/OWNERS @@ -1,2 +1,3 @@ +ejyzhang@google.com rvrolyk@google.com -zhaojiac@google.com +xunchang@google.com diff --git a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java index ccf096ee5529..165a1d617429 100644 --- a/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java +++ b/services/core/java/com/android/server/rotationresolver/RotationResolverManagerPerUserService.java @@ -109,7 +109,7 @@ final class RotationResolverManagerPerUserService extends ensureRemoteServiceInitiated(); // Cancel the previous on-going request. - if (mCurrentRequest != null) { + if (mCurrentRequest != null && !mCurrentRequest.mIsFulfilled) { cancelLocked(); } diff --git a/services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java b/services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java index eee08c221bfa..264ef87c97bf 100644 --- a/services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java +++ b/services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java @@ -24,6 +24,7 @@ import android.content.AttributionSource; import android.content.ComponentName; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.Binder; import android.os.IBinder; @@ -31,6 +32,7 @@ import android.os.RemoteException; import android.speech.IRecognitionListener; import android.speech.IRecognitionService; import android.speech.IRecognitionServiceManagerCallback; +import android.speech.RecognitionService; import android.speech.SpeechRecognizer; import android.util.Slog; @@ -39,6 +41,7 @@ import com.android.server.infra.AbstractPerUserSystemService; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -225,6 +228,10 @@ final class SpeechRecognitionManagerServiceImpl extends } } + if (serviceComponent != null && !componentMapsToRecognitionService(serviceComponent)) { + return null; + } + RemoteSpeechRecognitionService service = new RemoteSpeechRecognitionService( getContext(), serviceComponent, getUserId(), callingUid); @@ -241,6 +248,25 @@ final class SpeechRecognitionManagerServiceImpl extends } } + private boolean componentMapsToRecognitionService(@NonNull ComponentName serviceComponent) { + List<ResolveInfo> resolveInfos = + getContext().getPackageManager().queryIntentServices( + new Intent(RecognitionService.SERVICE_INTERFACE), 0); + if (resolveInfos == null) { + return false; + } + + for (ResolveInfo ri : resolveInfos) { + if (ri.serviceInfo != null + && serviceComponent.equals(ri.serviceInfo.getComponentName())) { + return true; + } + } + + Slog.w(TAG, "serviceComponent is not RecognitionService: " + serviceComponent); + return false; + } + private void removeService(int callingUid, RemoteSpeechRecognitionService service) { synchronized (mLock) { Set<RemoteSpeechRecognitionService> valuesByCaller = diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index cd0ce2bd46a7..8c8920d4ce4e 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -117,6 +117,7 @@ import android.os.Parcelable; import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.ServiceSpecificException; import android.os.StatFs; import android.os.SynchronousResultReceiver; import android.os.SystemClock; @@ -132,6 +133,18 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.DeviceConfig; import android.provider.Settings; +import android.security.metrics.IKeystoreMetrics; +import android.security.metrics.KeyCreationWithAuthInfo; +import android.security.metrics.KeyCreationWithGeneralInfo; +import android.security.metrics.KeyCreationWithPurposeAndModesInfo; +import android.security.metrics.KeyOperationWithGeneralInfo; +import android.security.metrics.KeyOperationWithPurposeAndModesInfo; +import android.security.metrics.Keystore2AtomWithOverflow; +import android.security.metrics.KeystoreAtom; +import android.security.metrics.KeystoreAtomPayload; +import android.security.metrics.RkpErrorStats; +import android.security.metrics.RkpPoolStats; +import android.security.metrics.StorageStats; import android.stats.storage.StorageEnums; import android.telephony.ModemActivityInfo; import android.telephony.SubscriptionInfo; @@ -373,6 +386,10 @@ public class StatsPullAtomService extends SystemService { private SelectedProcessCpuThreadReader mSurfaceFlingerProcessCpuThreadReader; + // Only access via getIKeystoreMetricsService + @GuardedBy("mKeystoreLock") + private IKeystoreMetrics mIKeystoreMetrics; + // Puller locks private final Object mDataBytesTransferLock = new Object(); private final Object mBluetoothBytesTransferLock = new Object(); @@ -428,6 +445,7 @@ public class StatsPullAtomService extends SystemService { private final Object mAttributedAppOpsLock = new Object(); private final Object mSettingsStatsLock = new Object(); private final Object mInstalledIncrementalPackagesLock = new Object(); + private final Object mKeystoreLock = new Object(); public StatsPullAtomService(Context context) { super(context); @@ -435,6 +453,7 @@ public class StatsPullAtomService extends SystemService { } private native void initializeNativePullers(); + /** * Use of this StatsPullAtomCallbackImpl means we avoid one class per tagId, which we would * get if we used lambdas. @@ -703,6 +722,16 @@ public class StatsPullAtomService extends SystemService { synchronized (mInstalledIncrementalPackagesLock) { return pullInstalledIncrementalPackagesLocked(atomTag, data); } + case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: + case FrameworkStatsLog.RKP_POOL_STATS: + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO: + case FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW: + case FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO: + case FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO: + case FrameworkStatsLog.RKP_ERROR_STATS: + return pullKeystoreAtoms(atomTag, data); default: throw new UnsupportedOperationException("Unknown tagId=" + atomTag); } @@ -795,6 +824,8 @@ public class StatsPullAtomService extends SystemService { mSurfaceFlingerProcessCpuThreadReader = new SelectedProcessCpuThreadReader("/system/bin/surfaceflinger"); + + getIKeystoreMetricsService(); } void registerEventListeners() { @@ -887,6 +918,15 @@ public class StatsPullAtomService extends SystemService { registerBatteryCycleCount(); registerSettingsStats(); registerInstalledIncrementalPackages(); + registerKeystoreStorageStats(); + registerRkpPoolStats(); + registerKeystoreKeyCreationWithGeneralInfo(); + registerKeystoreKeyCreationWithAuthInfo(); + registerKeystoreKeyCreationWithPurposeModesInfo(); + registerKeystoreAtomWithOverflow(); + registerKeystoreKeyOperationWithPurposeAndModesInfo(); + registerKeystoreKeyOperationWithGeneralInfo(); + registerRkpErrorStats(); } private void initAndRegisterNetworkStatsPullers() { @@ -971,6 +1011,28 @@ public class StatsPullAtomService extends SystemService { } } + private IKeystoreMetrics getIKeystoreMetricsService() { + synchronized (mKeystoreLock) { + if (mIKeystoreMetrics == null) { + mIKeystoreMetrics = IKeystoreMetrics.Stub.asInterface( + ServiceManager.getService("android.security.metrics")); + if (mIKeystoreMetrics != null) { + try { + mIKeystoreMetrics.asBinder().linkToDeath(() -> { + synchronized (mKeystoreLock) { + mIKeystoreMetrics = null; + } + }, /* flags */ 0); + } catch (RemoteException e) { + Slog.e(TAG, "linkToDeath with IKeystoreMetrics failed", e); + mIKeystoreMetrics = null; + } + } + } + return mIKeystoreMetrics; + } + } + private IStoraged getIStoragedService() { synchronized (mStoragedLock) { if (mStorageService == null) { @@ -4005,6 +4067,254 @@ public class StatsPullAtomService extends SystemService { return StatsManager.PULL_SUCCESS; } + private void registerKeystoreStorageStats() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_STORAGE_STATS, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerRkpPoolStats() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.RKP_POOL_STATS, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreKeyCreationWithGeneralInfo() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreKeyCreationWithAuthInfo() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreKeyCreationWithPurposeModesInfo() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreAtomWithOverflow() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreKeyOperationWithPurposeAndModesInfo() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerKeystoreKeyOperationWithGeneralInfo() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + private void registerRkpErrorStats() { + mStatsManager.setPullAtomCallback( + FrameworkStatsLog.RKP_ERROR_STATS, + null, // use default PullAtomMetadata values, + DIRECT_EXECUTOR, + mStatsCallbackImpl); + } + + int parseKeystoreStorageStats(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() != KeystoreAtomPayload.storageStats) { + return StatsManager.PULL_SKIP; + } + StorageStats atom = atomWrapper.payload.getStorageStats(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_STORAGE_STATS, atom.storage_type, + atom.size, atom.unused_size)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseRkpPoolStats(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() != KeystoreAtomPayload.rkpPoolStats) { + return StatsManager.PULL_SKIP; + } + RkpPoolStats atom = atomWrapper.payload.getRkpPoolStats(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.RKP_POOL_STATS, atom.security_level, atom.expiring, + atom.unassigned, atom.attested, atom.total)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseKeystoreKeyCreationWithGeneralInfo(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() + != KeystoreAtomPayload.keyCreationWithGeneralInfo) { + return StatsManager.PULL_SKIP; + } + KeyCreationWithGeneralInfo atom = atomWrapper.payload.getKeyCreationWithGeneralInfo(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO, atom.algorithm, + atom.key_size, atom.ec_curve, atom.key_origin, atom.error_code, + atom.attestation_requested, atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseKeystoreKeyCreationWithAuthInfo(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() != KeystoreAtomPayload.keyCreationWithAuthInfo) { + return StatsManager.PULL_SKIP; + } + KeyCreationWithAuthInfo atom = atomWrapper.payload.getKeyCreationWithAuthInfo(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO, atom.user_auth_type, + atom.log10_auth_key_timeout_seconds, atom.security_level, atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + + int parseKeystoreKeyCreationWithPurposeModesInfo(KeystoreAtom[] atoms, + List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() + != KeystoreAtomPayload.keyCreationWithPurposeAndModesInfo) { + return StatsManager.PULL_SKIP; + } + KeyCreationWithPurposeAndModesInfo atom = + atomWrapper.payload.getKeyCreationWithPurposeAndModesInfo(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO, + atom.algorithm, atom.purpose_bitmap, + atom.padding_mode_bitmap, atom.digest_bitmap, atom.block_mode_bitmap, + atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseKeystoreAtomWithOverflow(KeystoreAtom[] atoms, List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() + != KeystoreAtomPayload.keystore2AtomWithOverflow) { + return StatsManager.PULL_SKIP; + } + Keystore2AtomWithOverflow atom = atomWrapper.payload.getKeystore2AtomWithOverflow(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW, atom.atom_id, + atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseKeystoreKeyOperationWithPurposeModesInfo(KeystoreAtom[] atoms, + List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() + != KeystoreAtomPayload.keyOperationWithPurposeAndModesInfo) { + return StatsManager.PULL_SKIP; + } + KeyOperationWithPurposeAndModesInfo atom = + atomWrapper.payload.getKeyOperationWithPurposeAndModesInfo(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO, + atom.purpose, atom.padding_mode_bitmap, atom.digest_bitmap, + atom.block_mode_bitmap, atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseKeystoreKeyOperationWithGeneralInfo(KeystoreAtom[] atoms, + List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() + != KeystoreAtomPayload.keyOperationWithGeneralInfo) { + return StatsManager.PULL_SKIP; + } + KeyOperationWithGeneralInfo atom = atomWrapper.payload.getKeyOperationWithGeneralInfo(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO, atom.outcome, + atom.error_code, atom.key_upgraded, atom.security_level, atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int parseRkpErrorStats(KeystoreAtom[] atoms, + List<StatsEvent> pulledData) { + for (KeystoreAtom atomWrapper : atoms) { + if (atomWrapper.payload.getTag() != KeystoreAtomPayload.rkpErrorStats) { + return StatsManager.PULL_SKIP; + } + RkpErrorStats atom = atomWrapper.payload.getRkpErrorStats(); + pulledData.add(FrameworkStatsLog.buildStatsEvent( + FrameworkStatsLog.RKP_ERROR_STATS, atom.rkpError, atomWrapper.count)); + } + return StatsManager.PULL_SUCCESS; + } + + int pullKeystoreAtoms(int atomTag, List<StatsEvent> pulledData) { + IKeystoreMetrics keystoreMetricsService = getIKeystoreMetricsService(); + if (keystoreMetricsService == null) { + Slog.w(TAG, "Keystore service is null"); + return StatsManager.PULL_SKIP; + } + final long callingToken = Binder.clearCallingIdentity(); + try { + KeystoreAtom[] atoms = keystoreMetricsService.pullMetrics(atomTag); + switch (atomTag) { + case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: + return parseKeystoreStorageStats(atoms, pulledData); + case FrameworkStatsLog.RKP_POOL_STATS: + return parseRkpPoolStats(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: + return parseKeystoreKeyCreationWithGeneralInfo(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: + return parseKeystoreKeyCreationWithAuthInfo(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO: + return parseKeystoreKeyCreationWithPurposeModesInfo(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW: + return parseKeystoreAtomWithOverflow(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO: + return parseKeystoreKeyOperationWithPurposeModesInfo(atoms, pulledData); + case FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO: + return parseKeystoreKeyOperationWithGeneralInfo(atoms, pulledData); + case FrameworkStatsLog.RKP_ERROR_STATS: + return parseRkpErrorStats(atoms, pulledData); + default: + Slog.w(TAG, "Unsupported keystore atom: " + atomTag); + return StatsManager.PULL_SKIP; + } + } catch (RemoteException e) { + // Should not happen. + Slog.e(TAG, "Disconnected from keystore service. Cannot pull.", e); + return StatsManager.PULL_SKIP; + } catch (ServiceSpecificException e) { + Slog.e(TAG, "pulling keystore metrics failed", e); + return StatsManager.PULL_SKIP; + } finally { + Binder.restoreCallingIdentity(callingToken); + } + } + // Thermal event received from vendor thermal management subsystem private static final class ThermalEventListener extends IThermalEventListener.Stub { @Override diff --git a/services/core/java/com/android/server/timedetector/ServerFlags.java b/services/core/java/com/android/server/timedetector/ServerFlags.java index 7145f5ea4a64..fe977f8b3921 100644 --- a/services/core/java/com/android/server/timedetector/ServerFlags.java +++ b/services/core/java/com/android/server/timedetector/ServerFlags.java @@ -50,10 +50,6 @@ public final class ServerFlags { /** * An annotation used to indicate when a {@link DeviceConfig#NAMESPACE_SYSTEM_TIME} key is * required. - * - * <p>Note that the com.android.geotz module deployment of the Offline LocationTimeZoneProvider - * also shares the {@link DeviceConfig#NAMESPACE_SYSTEM_TIME}, and uses the - * prefix "geotz_" on all of its key strings. */ @StringDef(prefix = "KEY_", value = { KEY_LOCATION_TIME_ZONE_DETECTION_FEATURE_SUPPORTED, diff --git a/services/core/java/com/android/server/vibrator/DeviceVibrationEffectAdapter.java b/services/core/java/com/android/server/vibrator/DeviceVibrationEffectAdapter.java index e8ce4f336caa..24da261483db 100644 --- a/services/core/java/com/android/server/vibrator/DeviceVibrationEffectAdapter.java +++ b/services/core/java/com/android/server/vibrator/DeviceVibrationEffectAdapter.java @@ -16,7 +16,6 @@ package com.android.server.vibrator; -import android.content.Context; import android.os.VibrationEffect; import android.os.VibratorInfo; @@ -29,14 +28,13 @@ final class DeviceVibrationEffectAdapter private final List<VibrationEffectAdapters.SegmentsAdapter<VibratorInfo>> mSegmentAdapters; - DeviceVibrationEffectAdapter(Context context) { + DeviceVibrationEffectAdapter(VibrationSettings settings) { mSegmentAdapters = Arrays.asList( // TODO(b/167947076): add filter that removes unsupported primitives // TODO(b/167947076): add filter that replaces unsupported prebaked with fallback - new RampToStepAdapter(context.getResources().getInteger( - com.android.internal.R.integer.config_vibrationWaveformRampStepDuration)), - new StepToRampAdapter(context.getResources().getInteger( - com.android.internal.R.integer.config_vibrationWaveformRampDownDuration)), + new RampToStepAdapter(settings.getRampStepDuration()), + new StepToRampAdapter(), + new RampDownAdapter(settings.getRampDownDuration(), settings.getRampStepDuration()), new ClippingAmplitudeAndFrequencyAdapter() ); } diff --git a/services/core/java/com/android/server/vibrator/RampDownAdapter.java b/services/core/java/com/android/server/vibrator/RampDownAdapter.java new file mode 100644 index 000000000000..d5cd344d93ce --- /dev/null +++ b/services/core/java/com/android/server/vibrator/RampDownAdapter.java @@ -0,0 +1,240 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.vibrator; + +import android.os.VibratorInfo; +import android.os.vibrator.RampSegment; +import android.os.vibrator.StepSegment; +import android.os.vibrator.VibrationEffectSegment; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Adapter that applies the ramp down duration config to bring down the vibrator amplitude smoothly. + * + * <p>This prevents the device from ringing when it cannot handle abrupt changes between ON and OFF + * states. This will not change other types of abrupt amplitude changes in the original effect. The + * effect overall duration is preserved by this transformation. + * + * <p>Waveforms with ON/OFF segments are handled gracefully by the ramp down changes. Each OFF + * segment preceded by an ON segment will be shortened, and a ramp or step down will be added to the + * transition between ON and OFF. The ramps/steps can be shorter than the configured duration in + * order to preserve the waveform timings, but they will still soften the ringing effect. + * + * <p>If the segment preceding an OFF segment a {@link RampSegment} then a new ramp segment will be + * added to bring the amplitude down. If it is a {@link StepSegment} then a sequence of steps will + * be used to bring the amplitude down to zero. This ensures that the transition from the last + * amplitude to zero will be handled by the same vibrate method. + */ +final class RampDownAdapter implements VibrationEffectAdapters.SegmentsAdapter<VibratorInfo> { + private final int mRampDownDuration; + private final int mStepDuration; + + RampDownAdapter(int rampDownDuration, int stepDuration) { + mRampDownDuration = rampDownDuration; + mStepDuration = stepDuration; + } + + @Override + public int apply(List<VibrationEffectSegment> segments, int repeatIndex, + VibratorInfo info) { + if (mRampDownDuration <= 0) { + // Nothing to do, no ramp down duration configured. + return repeatIndex; + } + repeatIndex = addRampDownToZeroAmplitudeSegments(segments, repeatIndex); + repeatIndex = addRampDownToLoop(segments, repeatIndex); + return repeatIndex; + } + + /** + * This will add ramp or steps down to zero as follows: + * + * <ol> + * <li>Remove the OFF segment that follows a segment of non-zero amplitude; + * <li>Add a single {@link RampSegment} or a list of {@link StepSegment} starting at the + * previous segment's amplitude and frequency, with min between the configured ramp down + * duration or the removed segment's duration; + * <li>Add a zero amplitude segment following the steps, if necessary, to fill the remaining + * duration; + * </ol> + */ + private int addRampDownToZeroAmplitudeSegments(List<VibrationEffectSegment> segments, + int repeatIndex) { + int newRepeatIndex = repeatIndex; + int newSegmentCount = segments.size(); + for (int i = 1; i < newSegmentCount; i++) { + VibrationEffectSegment previousSegment = segments.get(i - 1); + if (!isOffSegment(segments.get(i)) + || !endsWithNonZeroAmplitude(previousSegment)) { + continue; + } + + List<VibrationEffectSegment> replacementSegments = null; + long offDuration = segments.get(i).getDuration(); + + if (previousSegment instanceof StepSegment) { + float previousAmplitude = ((StepSegment) previousSegment).getAmplitude(); + float previousFrequency = ((StepSegment) previousSegment).getFrequency(); + + replacementSegments = + createStepsDown(previousAmplitude, previousFrequency, offDuration); + } else if (previousSegment instanceof RampSegment) { + float previousAmplitude = ((RampSegment) previousSegment).getEndAmplitude(); + float previousFrequency = ((RampSegment) previousSegment).getEndFrequency(); + + if (offDuration <= mRampDownDuration) { + // Replace the zero amplitude segment with a ramp down of same duration, to + // preserve waveform timings and still soften the transition to zero. + replacementSegments = Arrays.asList( + createRampDown(previousAmplitude, previousFrequency, offDuration)); + } else { + // Replace the zero amplitude segment with a ramp down of configured duration + // followed by a shorter off segment. + replacementSegments = Arrays.asList( + createRampDown(previousAmplitude, previousFrequency, mRampDownDuration), + createRampDown(0, previousFrequency, offDuration - mRampDownDuration)); + } + } + + if (replacementSegments != null) { + int segmentsAdded = replacementSegments.size() - 1; + + segments.remove(i); + segments.addAll(i, replacementSegments); + if (repeatIndex > i) { + newRepeatIndex += segmentsAdded; + } + i += segmentsAdded; + newSegmentCount += segmentsAdded; + } + } + return newRepeatIndex; + } + + /** + * This will ramps down to zero at the repeating index of the given effect, if set, only if + * the last segment ends at a non-zero amplitude and the repeating segment has zero amplitude. + * The update is described as: + * + * <ol> + * <li>Add a ramp or sequence of steps down to zero following the last segment, with the min + * between the removed segment duration and the configured ramp down duration; + * <li>Skip the zero-amplitude segment by incrementing the repeat index, splitting it if + * necessary to skip the correct amount; + * </ol> + */ + private int addRampDownToLoop(List<VibrationEffectSegment> segments, int repeatIndex) { + if (repeatIndex < 0) { + // Nothing to do, no ramp down duration configured or effect is not repeating. + return repeatIndex; + } + + int segmentCount = segments.size(); + if (!endsWithNonZeroAmplitude(segments.get(segmentCount - 1)) + || !isOffSegment(segments.get(repeatIndex))) { + // Nothing to do, not going back from a positive amplitude to a off segment. + return repeatIndex; + } + + VibrationEffectSegment lastSegment = segments.get(segmentCount - 1); + VibrationEffectSegment offSegment = segments.get(repeatIndex); + long offDuration = offSegment.getDuration(); + + if (offDuration > mRampDownDuration) { + // Split the zero amplitude segment and start repeating from the second half, to + // preserve waveform timings. This will update the waveform as follows: + // R R+1 + // | ____ | ____ + // _|__/ => __|_/ \ + segments.set(repeatIndex, updateDuration(offSegment, offDuration - mRampDownDuration)); + segments.add(repeatIndex, updateDuration(offSegment, mRampDownDuration)); + } + + // Skip the zero amplitude segment and append ramp/steps down at the end. + repeatIndex++; + if (lastSegment instanceof StepSegment) { + float previousAmplitude = ((StepSegment) lastSegment).getAmplitude(); + float previousFrequency = ((StepSegment) lastSegment).getFrequency(); + segments.addAll(createStepsDown(previousAmplitude, previousFrequency, + Math.min(offDuration, mRampDownDuration))); + } else if (lastSegment instanceof RampSegment) { + float previousAmplitude = ((RampSegment) lastSegment).getEndAmplitude(); + float previousFrequency = ((RampSegment) lastSegment).getEndFrequency(); + segments.add(createRampDown(previousAmplitude, previousFrequency, + Math.min(offDuration, mRampDownDuration))); + } + + return repeatIndex; + } + + private List<VibrationEffectSegment> createStepsDown(float amplitude, float frequency, + long duration) { + // Step down for at most the configured ramp duration. + int stepCount = (int) Math.min(duration, mRampDownDuration) / mStepDuration; + float amplitudeStep = amplitude / stepCount; + List<VibrationEffectSegment> steps = new ArrayList<>(); + for (int i = 1; i < stepCount; i++) { + steps.add(new StepSegment(amplitude - i * amplitudeStep, frequency, mStepDuration)); + } + int remainingDuration = (int) duration - mStepDuration * (stepCount - 1); + steps.add(new StepSegment(0, frequency, remainingDuration)); + return steps; + } + + private static RampSegment createRampDown(float amplitude, float frequency, long duration) { + return new RampSegment(amplitude, /* endAmplitude= */ 0, frequency, frequency, + (int) duration); + } + + private static VibrationEffectSegment updateDuration(VibrationEffectSegment segment, + long newDuration) { + if (segment instanceof RampSegment) { + RampSegment ramp = (RampSegment) segment; + return new RampSegment(ramp.getStartAmplitude(), ramp.getEndAmplitude(), + ramp.getStartFrequency(), ramp.getEndFrequency(), (int) newDuration); + } else if (segment instanceof StepSegment) { + StepSegment step = (StepSegment) segment; + return new StepSegment(step.getAmplitude(), step.getFrequency(), (int) newDuration); + } + return segment; + } + + /** Returns true if the segment is a ramp or a step that starts and ends at zero amplitude. */ + private static boolean isOffSegment(VibrationEffectSegment segment) { + if (segment instanceof StepSegment) { + StepSegment ramp = (StepSegment) segment; + return ramp.getAmplitude() == 0; + } else if (segment instanceof RampSegment) { + RampSegment ramp = (RampSegment) segment; + return ramp.getStartAmplitude() == 0 && ramp.getEndAmplitude() == 0; + } + return false; + } + + /** Returns true if the segment is a ramp or a step that ends at a non-zero amplitude. */ + private static boolean endsWithNonZeroAmplitude(VibrationEffectSegment segment) { + if (segment instanceof StepSegment) { + return ((StepSegment) segment).getAmplitude() != 0; + } else if (segment instanceof RampSegment) { + return ((RampSegment) segment).getEndAmplitude() != 0; + } + return false; + } +} diff --git a/services/core/java/com/android/server/vibrator/StepToRampAdapter.java b/services/core/java/com/android/server/vibrator/StepToRampAdapter.java index 1d8c64bddd49..6f5adac33ae6 100644 --- a/services/core/java/com/android/server/vibrator/StepToRampAdapter.java +++ b/services/core/java/com/android/server/vibrator/StepToRampAdapter.java @@ -31,25 +31,9 @@ import java.util.List; * <p>Each replaced {@link StepSegment} will be represented by a {@link RampSegment} with same * start and end amplitudes/frequencies, which can then be converted to PWLE compositions. This * adapter leaves the segments unchanged if the device doesn't have the PWLE composition capability. - * - * <p>This adapter also applies the ramp down duration config on devices with PWLE support. This - * prevents the device from ringing when it cannot handle abrupt changes between ON and OFF states. - * This will not change other types of abrupt amplitude changes in the original effect. - * - * <p>The effect overall duration is preserved by this transformation. Waveforms with ON/OFF - * segments are handled gracefully by the ramp down changes. Each OFF segment preceded by an ON - * segment will be shortened, and a ramp down will be added to the transition between ON and OFF. - * The ramps can be shorter than the configured duration in order to preserve the waveform timings, - * but they will still soften the ringing effect. */ final class StepToRampAdapter implements VibrationEffectAdapters.SegmentsAdapter<VibratorInfo> { - private final int mRampDownDuration; - - StepToRampAdapter(int rampDownDuration) { - mRampDownDuration = rampDownDuration; - } - @Override public int apply(List<VibrationEffectSegment> segments, int repeatIndex, VibratorInfo info) { @@ -58,28 +42,17 @@ final class StepToRampAdapter implements VibrationEffectAdapters.SegmentsAdapter return repeatIndex; } convertStepsToRamps(segments); - int newRepeatIndex = addRampDownToZeroAmplitudeSegments(segments, repeatIndex); - newRepeatIndex = addRampDownToLoop(segments, newRepeatIndex); - newRepeatIndex = splitLongRampSegments(info, segments, newRepeatIndex); - return newRepeatIndex; + repeatIndex = splitLongRampSegments(info, segments, repeatIndex); + return repeatIndex; } private void convertStepsToRamps(List<VibrationEffectSegment> segments) { int segmentCount = segments.size(); - if (mRampDownDuration > 0) { - // Convert all steps to ramps if the device requires ramp down. - for (int i = 0; i < segmentCount; i++) { - if (isStep(segments.get(i))) { - segments.set(i, apply((StepSegment) segments.get(i))); - } - } - return; - } // Convert steps that require frequency control to ramps. for (int i = 0; i < segmentCount; i++) { VibrationEffectSegment segment = segments.get(i); if (isStep(segment) && ((StepSegment) segment).getFrequency() != 0) { - segments.set(i, apply((StepSegment) segment)); + segments.set(i, convertStepToRamp((StepSegment) segment)); } } // Convert steps that are next to ramps to also become ramps, so they can be composed @@ -87,129 +60,13 @@ final class StepToRampAdapter implements VibrationEffectAdapters.SegmentsAdapter for (int i = 0; i < segmentCount; i++) { if (segments.get(i) instanceof RampSegment) { for (int j = i - 1; j >= 0 && isStep(segments.get(j)); j--) { - segments.set(j, apply((StepSegment) segments.get(j))); + segments.set(j, convertStepToRamp((StepSegment) segments.get(j))); } for (int j = i + 1; j < segmentCount && isStep(segments.get(j)); j++) { - segments.set(j, apply((StepSegment) segments.get(j))); - } - } - } - } - - /** - * This will add a ramp to zero as follows: - * - * <ol> - * <li>Remove the {@link VibrationEffectSegment} that starts and ends at zero amplitude - * and follows a segment that ends at non-zero amplitude; - * <li>Add a ramp down to zero starting at the previous segment end amplitude and frequency, - * with min between the removed segment duration and the configured ramp down duration; - * <li>Add a zero amplitude segment following the ramp with the remaining duration, if - * necessary; - * </ol> - */ - private int addRampDownToZeroAmplitudeSegments(List<VibrationEffectSegment> segments, - int repeatIndex) { - if (mRampDownDuration <= 0) { - // Nothing to do, no ramp down duration configured. - return repeatIndex; - } - int newRepeatIndex = repeatIndex; - int newSegmentCount = segments.size(); - for (int i = 1; i < newSegmentCount; i++) { - if (!isOffRampSegment(segments.get(i)) - || !endsWithNonZeroAmplitude(segments.get(i - 1))) { - continue; - } - - // We know the previous segment is a ramp that ends at non-zero amplitude. - float previousAmplitude = ((RampSegment) segments.get(i - 1)).getEndAmplitude(); - float previousFrequency = ((RampSegment) segments.get(i - 1)).getEndFrequency(); - RampSegment ramp = (RampSegment) segments.get(i); - - if (ramp.getDuration() <= mRampDownDuration) { - // Replace the zero amplitude segment with a ramp down of same duration, to - // preserve waveform timings and still soften the transition to zero. - segments.set(i, createRampDown(previousAmplitude, previousFrequency, - ramp.getDuration())); - } else { - // Make the zero amplitude segment shorter, to preserve waveform timings, and add a - // ramp down to zero segment right before it. - segments.set(i, updateDuration(ramp, ramp.getDuration() - mRampDownDuration)); - segments.add(i, createRampDown(previousAmplitude, previousFrequency, - mRampDownDuration)); - if (repeatIndex > i) { - newRepeatIndex++; + segments.set(j, convertStepToRamp((StepSegment) segments.get(j))); } - i++; - newSegmentCount++; } } - return newRepeatIndex; - } - - /** - * This will add a ramp to zero at the repeating index of the given effect, if set, only if - * the last segment ends at a non-zero amplitude and the repeating segment starts and ends at - * zero amplitude. The update is described as: - * - * <ol> - * <li>Add a ramp down to zero following the last segment, with the min between the - * removed segment duration and the configured ramp down duration; - * <li>Skip the zero-amplitude segment by incrementing the repeat index, splitting it if - * necessary to skip the correct amount; - * </ol> - */ - private int addRampDownToLoop(List<VibrationEffectSegment> segments, int repeatIndex) { - if (repeatIndex < 0) { - // Non-repeating compositions should remain unchanged so duration will be preserved. - return repeatIndex; - } - - int segmentCount = segments.size(); - if (mRampDownDuration <= 0 || !endsWithNonZeroAmplitude(segments.get(segmentCount - 1))) { - // Nothing to do, no ramp down duration configured or composition already ends at zero. - return repeatIndex; - } - - // We know the last segment is a ramp that ends at non-zero amplitude. - RampSegment lastRamp = (RampSegment) segments.get(segmentCount - 1); - float previousAmplitude = lastRamp.getEndAmplitude(); - float previousFrequency = lastRamp.getEndFrequency(); - - if (isOffRampSegment(segments.get(repeatIndex))) { - // Repeating from a non-zero to a zero amplitude segment, we know the next segment is a - // ramp with zero amplitudes. - RampSegment nextRamp = (RampSegment) segments.get(repeatIndex); - - if (nextRamp.getDuration() <= mRampDownDuration) { - // Skip the zero amplitude segment and append a ramp down of same duration to the - // end of the composition, to preserve waveform timings and still soften the - // transition to zero. - // This will update the waveform as follows: - // R R+1 - // | ____ | ____ - // _|_/ => __|/ \ - segments.add(createRampDown(previousAmplitude, previousFrequency, - nextRamp.getDuration())); - repeatIndex++; - } else { - // Append a ramp down to the end of the composition, split the zero amplitude - // segment and start repeating from the second half, to preserve waveform timings. - // This will update the waveform as follows: - // R R+1 - // | ____ | ____ - // _|__/ => __|_/ \ - segments.add(createRampDown(previousAmplitude, previousFrequency, - mRampDownDuration)); - segments.set(repeatIndex, updateDuration(nextRamp, - nextRamp.getDuration() - mRampDownDuration)); - segments.add(repeatIndex, updateDuration(nextRamp, mRampDownDuration)); - repeatIndex++; - } - } - - return repeatIndex; } /** @@ -247,7 +104,7 @@ final class StepToRampAdapter implements VibrationEffectAdapters.SegmentsAdapter return repeatIndex; } - private static RampSegment apply(StepSegment segment) { + private static RampSegment convertStepToRamp(StepSegment segment) { return new RampSegment(segment.getAmplitude(), segment.getAmplitude(), segment.getFrequency(), segment.getFrequency(), (int) segment.getDuration()); } @@ -276,36 +133,10 @@ final class StepToRampAdapter implements VibrationEffectAdapters.SegmentsAdapter return ramps; } - private static RampSegment createRampDown(float amplitude, float frequency, long duration) { - return new RampSegment(amplitude, /* endAmplitude= */ 0, frequency, frequency, - (int) duration); - } - - private static RampSegment updateDuration(RampSegment ramp, long newDuration) { - return new RampSegment(ramp.getStartAmplitude(), ramp.getEndAmplitude(), - ramp.getStartFrequency(), ramp.getEndFrequency(), (int) newDuration); - } - private static boolean isStep(VibrationEffectSegment segment) { return segment instanceof StepSegment; } - /** Returns true if the segment is a ramp that starts and ends at zero amplitude. */ - private static boolean isOffRampSegment(VibrationEffectSegment segment) { - if (segment instanceof RampSegment) { - RampSegment ramp = (RampSegment) segment; - return ramp.getStartAmplitude() == 0 && ramp.getEndAmplitude() == 0; - } - return false; - } - - private static boolean endsWithNonZeroAmplitude(VibrationEffectSegment segment) { - if (segment instanceof RampSegment) { - return ((RampSegment) segment).getEndAmplitude() != 0; - } - return false; - } - private static float interpolateAmplitude(RampSegment ramp, long duration) { return interpolate(ramp.getStartAmplitude(), ramp.getEndAmplitude(), duration, ramp.getDuration()); diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java index 885f0e4c78ab..c0a1d92104c5 100644 --- a/services/core/java/com/android/server/vibrator/VibrationSettings.java +++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java @@ -67,11 +67,13 @@ final class VibrationSettings { @VisibleForTesting final UserObserver mUserReceiver; - @GuardedBy("mLock") private final List<OnVibratorSettingsChanged> mListeners = new ArrayList<>(); private final SparseArray<VibrationEffect> mFallbackEffects; + private final int mRampStepDuration; + private final int mRampDownDuration; + @GuardedBy("mLock") @Nullable private Vibrator mVibrator; @@ -102,6 +104,12 @@ final class VibrationSettings { mUidObserver = new UidObserver(); mUserReceiver = new UserObserver(); + // TODO(b/191150049): move these to vibrator static config file + mRampStepDuration = context.getResources().getInteger( + com.android.internal.R.integer.config_vibrationWaveformRampStepDuration); + mRampDownDuration = context.getResources().getInteger( + com.android.internal.R.integer.config_vibrationWaveformRampDownDuration); + VibrationEffect clickEffect = createEffectFromResource( com.android.internal.R.array.config_virtualKeyVibePattern); VibrationEffect doubleClickEffect = VibrationEffect.createWaveform( @@ -193,6 +201,23 @@ final class VibrationSettings { } /** + * The duration, in milliseconds, that should be applied to convert vibration effect's + * {@link android.os.vibrator.RampSegment} to a {@link android.os.vibrator.StepSegment} on + * devices without PWLE support. + */ + public int getRampStepDuration() { + return mRampStepDuration; + } + + /** + * The duration, in milliseconds, that should be applied to the ramp to turn off the vibrator + * when a vibration is cancelled or finished at non-zero amplitude. + */ + public int getRampDownDuration() { + return mRampDownDuration; + } + + /** * Return default vibration intensity for given usage. * * @param usageHint one of VibrationAttributes.USAGE_* @@ -354,6 +379,8 @@ final class VibrationSettings { + ", mZenMode=" + Settings.Global.zenModeToString(mZenMode) + ", mProcStatesCache=" + mUidObserver.mProcStatesCache + ", mHapticChannelMaxVibrationAmplitude=" + getHapticChannelMaxVibrationAmplitude() + + ", mRampStepDuration=" + mRampStepDuration + + ", mRampDownDuration=" + mRampDownDuration + ", mHapticFeedbackIntensity=" + intensityToString(getCurrentIntensity(VibrationAttributes.USAGE_TOUCH)) + ", mHapticFeedbackDefaultIntensity=" diff --git a/services/core/java/com/android/server/vibrator/VibratorManagerService.java b/services/core/java/com/android/server/vibrator/VibratorManagerService.java index 79706ead555c..644e451ce0e8 100644 --- a/services/core/java/com/android/server/vibrator/VibratorManagerService.java +++ b/services/core/java/com/android/server/vibrator/VibratorManagerService.java @@ -176,7 +176,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { mVibrationSettings = new VibrationSettings(mContext, mHandler); mVibrationScaler = new VibrationScaler(mContext, mVibrationSettings); mInputDeviceDelegate = new InputDeviceDelegate(mContext, mHandler); - mDeviceVibrationEffectAdapter = new DeviceVibrationEffectAdapter(mContext); + mDeviceVibrationEffectAdapter = new DeviceVibrationEffectAdapter(mVibrationSettings); VibrationCompleteListener listener = new VibrationCompleteListener(this); mNativeWrapper = injector.getNativeWrapper(); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 0ad8782cea4f..d551f66c7387 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2252,6 +2252,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } final WindowManagerPolicy.StartingSurface surface; + final StartingData startingData = mStartingData; if (mStartingData != null) { surface = mStartingSurface; mStartingData = null; @@ -2278,7 +2279,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A final Runnable removeSurface = () -> { ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Removing startingView=%s", surface); try { - surface.remove(prepareAnimation); + surface.remove(prepareAnimation && startingData.needRevealAnimation()); } catch (Exception e) { Slog.w(TAG_WM, "Exception when removing starting window", e); } @@ -5015,6 +5016,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mAppStopped = true; // Reset the last saved PiP snap fraction on app stop. mDisplayContent.mPinnedTaskController.onActivityHidden(mActivityComponent); + mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); destroySurfaces(); // Remove any starting window that was added for this app if they are still around. removeStartingWindow(); diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java index 72574786c46b..b6f2f243040e 100644 --- a/services/core/java/com/android/server/wm/ActivityStartController.java +++ b/services/core/java/com/android/server/wm/ActivityStartController.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.app.ActivityManager.START_CANCELED; import static android.app.ActivityManager.START_SUCCESS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; @@ -390,15 +391,18 @@ public class ActivityStartController { 0 /* startFlags */, null /* profilerInfo */, userId, filterCallingUid); aInfo = mService.mAmInternal.getActivityInfoForUser(aInfo, userId); - // Carefully collect grants without holding lock if (aInfo != null) { - intentGrants = mSupervisor.mService.mUgmInternal - .checkGrantUriPermissionFromIntent(intent, filterCallingUid, - aInfo.applicationInfo.packageName, - UserHandle.getUserId(aInfo.applicationInfo.uid)); - } + try { + // Carefully collect grants without holding lock + intentGrants = mSupervisor.mService.mUgmInternal + .checkGrantUriPermissionFromIntent(intent, filterCallingUid, + aInfo.applicationInfo.packageName, + UserHandle.getUserId(aInfo.applicationInfo.uid)); + } catch (SecurityException e) { + Slog.d(TAG, "Not allowed to start activity since no uri permission."); + return START_CANCELED; + } - if (aInfo != null) { if ((aInfo.applicationInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) { throw new IllegalArgumentException( diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 569c11be01e7..680937b37eac 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -2633,10 +2633,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } final ActivityInfo ainfo = AppGlobals.getPackageManager().getActivityInfo(comp, STOCK_PM_FLAGS, UserHandle.getUserId(callingUid)); - if (ainfo.applicationInfo.uid != callingUid) { - throw new SecurityException( - "Can't add task for another application: target uid=" - + ainfo.applicationInfo.uid + ", calling uid=" + callingUid); + if (ainfo == null || ainfo.applicationInfo.uid != callingUid) { + Slog.e(TAG, "Can't add task for another application: target uid=" + + (ainfo == null ? Process.INVALID_UID : ainfo.applicationInfo.uid) + + ", calling uid=" + callingUid); + return INVALID_TASK_ID; } final Task rootTask = r.getRootTask(); diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 4acadb21b5e3..3dea68625e8d 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -412,7 +412,13 @@ public class AppTransitionController { return TRANSIT_OLD_TASK_CLOSE; } if (isActivityClosing) { - return TRANSIT_OLD_ACTIVITY_CLOSE; + for (int i = closingApps.size() - 1; i >= 0; i--) { + if (closingApps.valueAt(i).visibleIgnoringKeyguard) { + return TRANSIT_OLD_ACTIVITY_CLOSE; + } + } + // Skip close activity transition since no closing app can be visible + return WindowManager.TRANSIT_OLD_UNSET; } } if (appTransition.containsTransitRequest(TRANSIT_RELAUNCH) diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java index b24ab93145b1..baa27e34d625 100644 --- a/services/core/java/com/android/server/wm/DisplayArea.java +++ b/services/core/java/com/android/server/wm/DisplayArea.java @@ -551,7 +551,13 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { } final WindowManagerPolicy policy = mWmService.mPolicy; if (policy.isKeyguardHostWindow(w.mAttrs)) { - if (mWmService.mKeyguardGoingAway) { + // Ignore the orientation of keyguard if it is going away or is not showing while + // the device is fully awake. In other words, use the orientation of keyguard if + // its window is visible while the device is going to sleep or is sleeping. + if (!mWmService.mAtmService.isKeyguardLocked() + && mDisplayContent.getDisplayPolicy().isAwake() + // Device is not going to sleep. + && policy.okToAnimate(true /* ignoreScreenOn */)) { return false; } // Consider unoccluding only when all unknown visibilities have been diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 3dbc517af45c..7d9971cc8013 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -914,6 +914,14 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mTmpApplySurfaceChangesTransactionState.preferredModeId = preferredModeId; } + final float preferredMinRefreshRate = getDisplayPolicy().getRefreshRatePolicy() + .getPreferredMinRefreshRate(w); + if (mTmpApplySurfaceChangesTransactionState.preferredMinRefreshRate == 0 + && preferredMinRefreshRate != 0) { + mTmpApplySurfaceChangesTransactionState.preferredMinRefreshRate = + preferredMinRefreshRate; + } + final float preferredMaxRefreshRate = getDisplayPolicy().getRefreshRatePolicy() .getPreferredMaxRefreshRate(w); if (mTmpApplySurfaceChangesTransactionState.preferredMaxRefreshRate == 0 @@ -1564,12 +1572,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp // window was transferred ({@link #mSkipAppTransitionAnimation}). return false; } - if ((mAppTransition.getTransitFlags() - & WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION) != 0) { - // The transition may be finished before keyguard hidden. In order to avoid the - // intermediate orientation change, it is more stable to freeze the display. - return false; - } if (r.isState(RESUMED) && !r.getRootTask().mInResumeTopActivity) { // If the activity is executing or has done the lifecycle callback, use normal // rotation animation so the display info can be updated immediately (see @@ -4327,6 +4329,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mLastHasContent, mTmpApplySurfaceChangesTransactionState.preferredRefreshRate, mTmpApplySurfaceChangesTransactionState.preferredModeId, + mTmpApplySurfaceChangesTransactionState.preferredMinRefreshRate, mTmpApplySurfaceChangesTransactionState.preferredMaxRefreshRate, mTmpApplySurfaceChangesTransactionState.preferMinimalPostProcessing, true /* inTraversal, must call performTraversalInTrans... below */); @@ -4617,6 +4620,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp public boolean preferMinimalPostProcessing; public float preferredRefreshRate; public int preferredModeId; + public float preferredMinRefreshRate; public float preferredMaxRefreshRate; void reset() { @@ -4626,6 +4630,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp preferMinimalPostProcessing = false; preferredRefreshRate = 0; preferredModeId = 0; + preferredMinRefreshRate = 0; preferredMaxRefreshRate = 0; } } diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index c674cb85a79e..18ea738b08ce 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -316,7 +316,7 @@ class DragState { final int myPid = Process.myPid(); final IBinder clientToken = touchedWin.mClient.asBinder(); final DragEvent event = obtainDragEvent(DragEvent.ACTION_DROP, x, y, - true /* includeData */, targetInterceptsGlobalDrag(touchedWin), + mData, targetInterceptsGlobalDrag(touchedWin), dragAndDropPermissions); try { touchedWin.mClient.dispatchDragEvent(event); @@ -462,8 +462,10 @@ class DragState { boolean containsAppExtras) { final boolean interceptsGlobalDrag = targetInterceptsGlobalDrag(newWin); if (mDragInProgress && isValidDropTarget(newWin, containsAppExtras, interceptsGlobalDrag)) { + // Only allow the extras to be dispatched to a global-intercepting drag target + ClipData data = interceptsGlobalDrag ? mData.copyForTransferWithActivityInfo() : null; DragEvent event = obtainDragEvent(DragEvent.ACTION_DRAG_STARTED, touchX, touchY, - interceptsGlobalDrag, false /* includeDragSurface */, + data, false /* includeDragSurface */, null /* dragAndDropPermission */); try { newWin.mClient.dispatchDragEvent(event); @@ -614,11 +616,11 @@ class DragState { return mDragInProgress; } - private DragEvent obtainDragEvent(int action, float x, float y, boolean includeData, + private DragEvent obtainDragEvent(int action, float x, float y, ClipData data, boolean includeDragSurface, IDragAndDropPermissions dragAndDropPermissions) { return DragEvent.obtain(action, x, y, mThumbOffsetX, mThumbOffsetY, - null /* localState */, mDataDescription, - includeData ? mData : null, includeDragSurface ? mSurfaceControl : null, + null /* localState */, mDataDescription, data, + includeDragSurface ? mSurfaceControl : null, dragAndDropPermissions, false /* result */); } diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index f8238c1d154a..3208ae3aa97d 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -72,7 +72,6 @@ class KeyguardController { private boolean mAodShowing; private boolean mKeyguardGoingAway; private boolean mDismissalRequested; - private int mBeforeUnoccludeTransit; private final SparseArray<KeyguardDisplayState> mDisplayStates = new SparseArray<>(); private final ActivityTaskManagerService mService; private RootWindowContainer mRootWindowContainer; @@ -191,14 +190,11 @@ class KeyguardController { // Irrelevant to AOD. dismissMultiWindowModeForTaskIfNeeded(null /* currentTaskControllsingOcclusion */, false /* turningScreenOn */); - setKeyguardGoingAway(false); + mKeyguardGoingAway = false; if (keyguardShowing) { mDismissalRequested = false; } } - // TODO(b/113840485): Check usage for non-default display - mWindowManager.setKeyguardOrAodShowingOnDefaultDisplay( - isKeyguardOrAodShowing(DEFAULT_DISPLAY)); // Update the sleep token first such that ensureActivitiesVisible has correct sleep token // state when evaluating visibilities. @@ -219,8 +215,8 @@ class KeyguardController { } Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "keyguardGoingAway"); mService.deferWindowLayout(); + mKeyguardGoingAway = true; try { - setKeyguardGoingAway(true); EventLogTags.writeWmSetKeyguardShown( 1 /* keyguardShowing */, mAodShowing ? 1 : 0, @@ -258,11 +254,6 @@ class KeyguardController { mWindowManager.dismissKeyguard(callback, message); } - private void setKeyguardGoingAway(boolean keyguardGoingAway) { - mKeyguardGoingAway = keyguardGoingAway; - mWindowManager.setKeyguardGoingAway(keyguardGoingAway); - } - private void failCallback(IKeyguardDismissCallback callback) { try { callback.onDismissError(); diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java index 710dd552f72d..737ef338f9b2 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; @@ -823,8 +824,10 @@ public class RecentsAnimationController implements DeathRecipient { if (mCanceled) { return; } - cancelAnimation(mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_KEEP_IN_PLACE, - true /* screenshot */, "cancelAnimationForHomeStart"); + final int reorderMode = mTargetActivityType == ACTIVITY_TYPE_HOME && mWillFinishToHome + ? REORDER_MOVE_TO_TOP + : REORDER_KEEP_IN_PLACE; + cancelAnimation(reorderMode, true /* screenshot */, "cancelAnimationForHomeStart"); } /** diff --git a/services/core/java/com/android/server/wm/RefreshRatePolicy.java b/services/core/java/com/android/server/wm/RefreshRatePolicy.java index deaf611446bc..6bc42af2bb68 100644 --- a/services/core/java/com/android/server/wm/RefreshRatePolicy.java +++ b/services/core/java/com/android/server/wm/RefreshRatePolicy.java @@ -154,6 +154,21 @@ class RefreshRatePolicy { return 0; } + float getPreferredMinRefreshRate(WindowState w) { + // If app is animating, it's not able to control refresh rate because we want the animation + // to run in default refresh rate. + if (w.isAnimating(TRANSITION | PARENTS)) { + return 0; + } + + // If app requests a certain refresh rate or mode, don't override it. + if (w.mAttrs.preferredDisplayModeId != 0) { + return 0; + } + + return w.mAttrs.preferredMinDisplayRefreshRate; + } + float getPreferredMaxRefreshRate(WindowState w) { // If app is animating, it's not able to control refresh rate because we want the animation // to run in default refresh rate. diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java index 9d8b8f76ad40..58363f2316ea 100644 --- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java +++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java @@ -212,6 +212,7 @@ class ScreenRotationAnimation { String name = "RotationLayer"; mScreenshotLayer = displayContent.makeOverlay() .setName(name) + .setOpaque(true) .setSecure(isSecure) .setCallsite("ScreenRotationAnimation") .setBLASTLayer() diff --git a/services/core/java/com/android/server/wm/SnapshotStartingData.java b/services/core/java/com/android/server/wm/SnapshotStartingData.java index 66ae0eb9b48f..b6cf91a584a9 100644 --- a/services/core/java/com/android/server/wm/SnapshotStartingData.java +++ b/services/core/java/com/android/server/wm/SnapshotStartingData.java @@ -41,6 +41,11 @@ class SnapshotStartingData extends StartingData { } @Override + boolean needRevealAnimation() { + return false; + } + + @Override boolean hasImeSurface() { return mSnapshot.hasImeSurface(); } diff --git a/services/core/java/com/android/server/wm/SplashScreenExceptionList.java b/services/core/java/com/android/server/wm/SplashScreenExceptionList.java new file mode 100644 index 000000000000..e815a0e2682a --- /dev/null +++ b/services/core/java/com/android/server/wm/SplashScreenExceptionList.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import static android.provider.DeviceConfig.NAMESPACE_WINDOW_MANAGER; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.provider.DeviceConfig; +import android.util.Slog; + +import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; + +import java.util.HashSet; +import java.util.Locale; +import java.util.concurrent.Executor; +import java.util.function.Supplier; + +/** + * Handles filtering the list of package that don't use the system splash screen. + * The list is backed by a {@link DeviceConfig} property. + * <p> + * An application can manually opt-out of the exception list by setting the <meta-data + * {@value OPT_OUT_METADATA_FLAG}="true"/> in the <code><application></code> section of the + * manifest. + */ +class SplashScreenExceptionList { + + private static final boolean DEBUG = Build.isDebuggable(); + private static final String LOG_TAG = "SplashScreenExceptionList"; + private static final String KEY_SPLASH_SCREEN_EXCEPTION_LIST = "splash_screen_exception_list"; + private static final String NAMESPACE = NAMESPACE_WINDOW_MANAGER; + private static final String OPT_OUT_METADATA_FLAG = "android.splashscreen.exception_opt_out"; + + @GuardedBy("mLock") + private final HashSet<String> mDeviceConfigExcludedPackages = new HashSet<>(); + private final Object mLock = new Object(); + + @VisibleForTesting + final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener; + + SplashScreenExceptionList(@NonNull Executor executor) { + updateDeviceConfig(DeviceConfig.getString(NAMESPACE, KEY_SPLASH_SCREEN_EXCEPTION_LIST, "")); + mOnPropertiesChangedListener = properties -> updateDeviceConfig( + properties.getString(KEY_SPLASH_SCREEN_EXCEPTION_LIST, "")); + DeviceConfig.addOnPropertiesChangedListener(NAMESPACE, executor, + mOnPropertiesChangedListener); + } + + private void updateDeviceConfig(String values) { + parseDeviceConfigPackageList(values); + } + + /** + * Returns true if the packageName is in the list and the target sdk is before S. + * + * @param packageName The package name of the application to check + * @param targetSdk The target sdk of the application + * @param infoSupplier A {@link Supplier} that returns an {@link ApplicationInfo} used to + * check if the application wants to opt-out of the exception list in the + * manifest metadata. Evaluated only if the application is in the exception + * list. + */ + @SuppressWarnings("AndroidFrameworkCompatChange") // Target sdk check + public boolean isException(@NonNull String packageName, int targetSdk, + @Nullable Supplier<ApplicationInfo> infoSupplier) { + if (targetSdk >= Build.VERSION_CODES.S) { + return false; + } + + synchronized (mLock) { + if (DEBUG) { + Slog.v(LOG_TAG, String.format(Locale.US, + "SplashScreen checking exception for package %s (target sdk:%d) -> %s", + packageName, targetSdk, + mDeviceConfigExcludedPackages.contains(packageName))); + } + if (!mDeviceConfigExcludedPackages.contains(packageName)) { + return false; + } + } + return !isOptedOut(infoSupplier); + } + + /** + * An application can manually opt-out of the exception list by setting the meta-data + * {@value OPT_OUT_METADATA_FLAG} = true in the <code>application</code> section of the manifest + */ + private static boolean isOptedOut(@Nullable Supplier<ApplicationInfo> infoProvider) { + if (infoProvider == null) { + return false; + } + ApplicationInfo info = infoProvider.get(); + return info != null && info.metaData != null && info.metaData.getBoolean( + OPT_OUT_METADATA_FLAG, false); + } + + private void parseDeviceConfigPackageList(String rawList) { + synchronized (mLock) { + mDeviceConfigExcludedPackages.clear(); + String[] packages = rawList.split(","); + for (String packageName : packages) { + String packageNameTrimmed = packageName.trim(); + if (!packageNameTrimmed.isEmpty()) { + mDeviceConfigExcludedPackages.add(packageNameTrimmed); + } + } + } + } +} diff --git a/services/core/java/com/android/server/wm/SplashScreenStartingData.java b/services/core/java/com/android/server/wm/SplashScreenStartingData.java index 185a317271ff..c659c05dceda 100644 --- a/services/core/java/com/android/server/wm/SplashScreenStartingData.java +++ b/services/core/java/com/android/server/wm/SplashScreenStartingData.java @@ -58,4 +58,9 @@ class SplashScreenStartingData extends StartingData { mLogo, mWindowFlags, mMergedOverrideConfiguration, activity.getDisplayContent().getDisplayId()); } + + @Override + boolean needRevealAnimation() { + return true; + } } diff --git a/services/core/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java index 3f9c93bbcfbe..c671e3835abc 100644 --- a/services/core/java/com/android/server/wm/StartingData.java +++ b/services/core/java/com/android/server/wm/StartingData.java @@ -47,6 +47,11 @@ public abstract class StartingData { */ abstract StartingSurface createStartingSurface(ActivityRecord activity); + /** + * @return Whether to apply reveal animation when exiting the starting window. + */ + abstract boolean needRevealAnimation(); + /** @see android.window.TaskSnapshot#hasImeSurface() */ boolean hasImeSurface() { return false; diff --git a/services/core/java/com/android/server/wm/StartingSurfaceController.java b/services/core/java/com/android/server/wm/StartingSurfaceController.java index 39ff94038024..da257477b1d8 100644 --- a/services/core/java/com/android/server/wm/StartingSurfaceController.java +++ b/services/core/java/com/android/server/wm/StartingSurfaceController.java @@ -26,6 +26,9 @@ import static android.window.StartingWindowInfo.TYPE_PARAMETER_USE_EMPTY_SPLASH_ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.os.SystemProperties; @@ -34,6 +37,8 @@ import android.window.TaskSnapshot; import com.android.server.policy.WindowManagerPolicy.StartingSurface; +import java.util.function.Supplier; + /** * Managing to create and release a starting window surface. */ @@ -44,9 +49,11 @@ public class StartingSurfaceController { static final boolean DEBUG_ENABLE_SHELL_DRAWER = SystemProperties.getBoolean("persist.debug.shell_starting_surface", true); private final WindowManagerService mService; + private final SplashScreenExceptionList mSplashScreenExceptionsList; public StartingSurfaceController(WindowManagerService wm) { mService = wm; + mSplashScreenExceptionsList = new SplashScreenExceptionList(wm.mContext.getMainExecutor()); } StartingSurface createSplashScreenStartingSurface(ActivityRecord activity, String packageName, @@ -68,6 +75,14 @@ public class StartingSurfaceController { return null; } + /** + * @see SplashScreenExceptionList#isException(String, int, Supplier) + */ + boolean isExceptionApp(@NonNull String packageName, int targetSdk, + @Nullable Supplier<ApplicationInfo> infoProvider) { + return mSplashScreenExceptionsList.isException(packageName, targetSdk, infoProvider); + } + int makeStartingWindowTypeParameter(boolean newTask, boolean taskSwitch, boolean processRunning, boolean allowTaskSnapshot, boolean activityCreated, boolean useEmpty) { diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 325f10f65af2..136a5a16fa7d 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -7653,9 +7653,9 @@ class Task extends WindowContainer<WindowContainer> { mLastRecentsAnimationTransaction = null; mLastRecentsAnimationOverlay = null; // reset also the crop and transform introduced by mLastRecentsAnimationTransaction - Rect bounds = getBounds(); getPendingTransaction().setMatrix(mSurfaceControl, Matrix.IDENTITY_MATRIX, new float[9]) - .setWindowCrop(mSurfaceControl, bounds.width(), bounds.height()); + .setWindowCrop(mSurfaceControl, null) + .setCornerRadius(mSurfaceControl, 0); } void maybeApplyLastRecentsAnimationTransaction() { diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 3a2ca80f2e12..abcb34c2e8d9 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -197,6 +197,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { ANIMATION_TYPE_STARTING_REVEAL); windowAnimationLeash = adaptor.mAnimationLeash; mainFrame = mainWindow.getRelativeFrame(); + t.setPosition(windowAnimationLeash, mainFrame.left, mainFrame.top); } } } diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index 0000f95e7849..e74371036619 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -644,7 +644,7 @@ class TaskSnapshotController { /** Called when the device is going to sleep (e.g. screen off, AOD without screen off). */ void snapshotForSleeping(int displayId) { - if (shouldDisableSnapshots()) { + if (shouldDisableSnapshots() || !mService.mDisplayEnabled) { return; } final DisplayContent displayContent = mService.mRoot.getDisplayContent(displayId); diff --git a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java index 5e81e4008680..4007661cf1a0 100644 --- a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java +++ b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java @@ -133,7 +133,7 @@ class UnknownAppVisibilityController { Slog.d(TAG, "App relayouted appWindow=" + activity); } int state = mUnknownApps.get(activity); - if (state == UNKNOWN_STATE_WAITING_RELAYOUT) { + if (state == UNKNOWN_STATE_WAITING_RELAYOUT || activity.mStartingWindow != null) { mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE); mService.notifyKeyguardFlagsChanged(this::notifyVisibilitiesUpdated, activity.getDisplayContent().getDisplayId()); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 147260b9e912..107580686b81 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -483,10 +483,7 @@ public class WindowManagerService extends IWindowManager.Stub private final DisplayAreaPolicy.Provider mDisplayAreaPolicyProvider; final private KeyguardDisableHandler mKeyguardDisableHandler; - // TODO: eventually unify all keyguard state in a common place instead of having it spread over - // AM's KeyguardController and the policy's KeyguardServiceDelegate. - boolean mKeyguardGoingAway; - boolean mKeyguardOrAodShowingOnDefaultDisplay; + // VR Vr2d Display Id. int mVr2dDisplayId = INVALID_DISPLAY; boolean mVrModeEnabled = false; @@ -3072,17 +3069,6 @@ public class WindowManagerService extends IWindowManager.Stub mAtmInternal.notifyKeyguardFlagsChanged(callback, displayId); } - public void setKeyguardGoingAway(boolean keyguardGoingAway) { - synchronized (mGlobalLock) { - mKeyguardGoingAway = keyguardGoingAway; - } - } - - public void setKeyguardOrAodShowingOnDefaultDisplay(boolean showing) { - synchronized (mGlobalLock) { - mKeyguardOrAodShowingOnDefaultDisplay = showing; - } - } // ------------------------------------------------------------- // Misc IWindowSession methods diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java index ce8f6df9ce3d..37a84f3698c1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java @@ -104,8 +104,6 @@ class ActiveAdmin { private static final String TAG_PASSWORD_HISTORY_LENGTH = "password-history-length"; private static final String TAG_MIN_PASSWORD_LENGTH = "min-password-length"; private static final String TAG_PASSWORD_QUALITY = "password-quality"; - private static final String TAG_PASSWORD_QUALITY_APPLIES_TO_PARENT = - "password-quality-applies-parent"; private static final String TAG_POLICIES = "policies"; private static final String TAG_CROSS_PROFILE_WIDGET_PROVIDERS = "cross-profile-widget-providers"; @@ -158,7 +156,6 @@ class ActiveAdmin { @NonNull PasswordPolicy mPasswordPolicy = new PasswordPolicy(); - boolean mPasswordPolicyAppliesToParent = true; @DevicePolicyManager.PasswordComplexity int mPasswordComplexity = PASSWORD_COMPLEXITY_NONE; @@ -363,9 +360,6 @@ class ActiveAdmin { writeAttributeValueToXml( out, TAG_MIN_PASSWORD_NONLETTER, mPasswordPolicy.nonLetter); } - - writeAttributeValueToXml(out, TAG_PASSWORD_QUALITY_APPLIES_TO_PARENT, - mPasswordPolicyAppliesToParent); } if (passwordHistoryLength != DEF_PASSWORD_HISTORY_LENGTH) { writeAttributeValueToXml( @@ -669,8 +663,6 @@ class ActiveAdmin { mPasswordPolicy.symbols = parser.getAttributeInt(null, ATTR_VALUE); } else if (TAG_MIN_PASSWORD_NONLETTER.equals(tag)) { mPasswordPolicy.nonLetter = parser.getAttributeInt(null, ATTR_VALUE); - } else if (TAG_PASSWORD_QUALITY_APPLIES_TO_PARENT.equals(tag)) { - mPasswordPolicyAppliesToParent = parser.getAttributeBoolean(null, ATTR_VALUE); } else if (TAG_MAX_TIME_TO_UNLOCK.equals(tag)) { maximumTimeToUnlock = parser.getAttributeLong(null, ATTR_VALUE); } else if (TAG_STRONG_AUTH_UNLOCK_TIMEOUT.equals(tag)) { @@ -1036,9 +1028,6 @@ class ActiveAdmin { pw.print("minimumPasswordNonLetter="); pw.println(mPasswordPolicy.nonLetter); - pw.print("passwordPolicyAppliesToParent="); - pw.println(mPasswordPolicyAppliesToParent); - pw.print("maximumTimeToUnlock="); pw.println(maximumTimeToUnlock); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 78ad59f8c01b..2bacc443c387 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3827,10 +3827,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { isProfileOwner(caller) || isDeviceOwner(caller) || isSystemUid(caller) || isPasswordLimitingAdminTargetingP(caller)); - final boolean qualityMayApplyToParent = - canSetPasswordQualityOnParent(who.getPackageName(), caller); - if (!qualityMayApplyToParent) { - Preconditions.checkCallAuthorization(!parent, + if (parent) { + Preconditions.checkCallAuthorization( + canSetPasswordQualityOnParent(who.getPackageName(), caller), "Profile Owner may not apply password quality requirements device-wide"); } @@ -3856,7 +3855,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (passwordPolicy.quality != quality) { passwordPolicy.quality = quality; ap.mPasswordComplexity = PASSWORD_COMPLEXITY_NONE; - ap.mPasswordPolicyAppliesToParent = qualityMayApplyToParent; resetInactivePasswordRequirementsIfRPlus(userId, ap); updatePasswordValidityCheckpointLocked(userId, parent); updatePasswordQualityCacheForUserGroup(userId); @@ -4588,8 +4586,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } ArrayList<PasswordMetrics> adminMetrics = new ArrayList<>(); + final List<ActiveAdmin> admins; synchronized (getLockObject()) { - final List<ActiveAdmin> admins; if (deviceWideOnly) { admins = getActiveAdminsForUserAndItsManagedProfilesLocked(userId, /* shouldIncludeProfileAdmins */ (user) -> false); @@ -4597,16 +4595,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { admins = getActiveAdminsForLockscreenPoliciesLocked(userId); } for (ActiveAdmin admin : admins) { - final boolean isAdminOfUser = userId == admin.getUserHandle().getIdentifier(); - // Use the password metrics from the admin in one of three cases: - // (1) The admin is of the user we're getting the minimum metrics for. The admin - // always affects the user it's managing. This applies also to the parent - // ActiveAdmin instance: It'd have the same user handle. - // (2) The mPasswordPolicyAppliesToParent field is true: That indicates the - // call to setPasswordQuality was made by an admin that may affect the parent. - if (isAdminOfUser || admin.mPasswordPolicyAppliesToParent) { - adminMetrics.add(admin.mPasswordPolicy.getMinMetrics()); - } + adminMetrics.add(admin.mPasswordPolicy.getMinMetrics()); } } return PasswordMetrics.merge(adminMetrics); @@ -4821,7 +4810,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { admin.mPasswordComplexity = passwordComplexity; // Reset the password policy. admin.mPasswordPolicy = new PasswordPolicy(); - admin.mPasswordPolicyAppliesToParent = true; updatePasswordValidityCheckpointLocked(caller.getUserId(), calledOnParent); updatePasswordQualityCacheForUserGroup(caller.getUserId()); saveSettingsLocked(caller.getUserId()); diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index 757c9dec06ed..0e96567dbfad 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -91,7 +91,7 @@ struct Constants { static constexpr auto readLogsMaxInterval = 2h; // How long should we wait till dataLoader reports destroyed. - static constexpr auto destroyTimeout = 60s; + static constexpr auto destroyTimeout = 10s; static constexpr auto anyStatus = INT_MIN; }; diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/BootTest.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/BootTest.kt new file mode 100644 index 000000000000..7fb49078b2af --- /dev/null +++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/BootTest.kt @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm.test + +import com.android.tradefed.testtype.DeviceJUnit4ClassRunner +import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test +import com.google.common.truth.Truth +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith + +@RunWith(DeviceJUnit4ClassRunner::class) +class BootTest : BaseHostJUnit4Test() { + companion object { + private const val TEST_PKG_NAME = "com.android.server.pm.test.test_app" + private const val TEST_APK_NAME = "PackageManagerTestAppStub.apk" + } + + @Rule + @JvmField + val tempFolder = TemporaryFolder() + + @Before + fun installApk() { + val testApkFile = HostUtils.copyResourceToHostFile(TEST_APK_NAME, tempFolder.newFile()) + device.installPackage(testApkFile, true) + } + + @After + fun removeApk() { + device.uninstallPackage(TEST_PKG_NAME) + } + + @Test + fun testUninstallPackageWithKeepDataAndReboot() { + Truth.assertThat(isPackageInstalled(TEST_PKG_NAME)).isTrue() + uninstallPackageWithKeepData(TEST_PKG_NAME) + Truth.assertThat(isPackageInstalled(TEST_PKG_NAME)).isFalse() + device.rebootUntilOnline() + waitForBootCompleted() + } + + private fun uninstallPackageWithKeepData(packageName: String) { + device.executeShellCommand("pm uninstall -k $packageName") + } + + private fun waitForBootCompleted() { + for (i in 0 until 45) { + if (isBootCompleted()) { + return + } + Thread.sleep(1000) + } + throw AssertionError("System failed to become ready!") + } + + private fun isBootCompleted(): Boolean { + return "1" == device.executeShellCommand("getprop sys.boot_completed").trim() + } +}
\ No newline at end of file diff --git a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt index 46120af06550..45e0d09a1753 100644 --- a/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt +++ b/services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SystemStubMultiUserDisableUninstallTest.kt @@ -281,7 +281,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { assertState( primaryInstalled = false, primaryEnabled = true, secondaryInstalled = true, secondaryEnabled = true, - codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) + codePaths = listOf(CodePath.SAME, CodePath.SYSTEM) ) uninstall(User.SECONDARY) @@ -289,7 +289,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { assertState( primaryInstalled = false, primaryEnabled = true, secondaryInstalled = false, secondaryEnabled = true, - codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) + codePaths = listOf(CodePath.SAME, CodePath.SYSTEM) ) installExisting(User.PRIMARY) @@ -311,20 +311,20 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { @Test fun uninstallSecondaryFirstByUserAndInstallExistingSecondaryFirst() { - uninstall(User.PRIMARY) + uninstall(User.SECONDARY) assertState( - primaryInstalled = false, primaryEnabled = true, - secondaryInstalled = true, secondaryEnabled = true, - codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) + primaryInstalled = true, primaryEnabled = true, + secondaryInstalled = false, secondaryEnabled = true, + codePaths = listOf(CodePath.SAME, CodePath.SYSTEM) ) - uninstall(User.SECONDARY) + uninstall(User.PRIMARY) assertState( primaryInstalled = false, primaryEnabled = true, secondaryInstalled = false, secondaryEnabled = true, - codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) + codePaths = listOf(CodePath.SAME, CodePath.SYSTEM) ) installExisting(User.SECONDARY) @@ -348,15 +348,14 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { fun uninstallUpdatesAndEnablePrimaryFirst() { device.executeShellCommand("pm uninstall-system-updates $TEST_PKG_NAME") - // Uninstall-system-updates always disables system user 0 - // TODO: Is this intentional? There is no user argument for this command. assertState( - primaryInstalled = true, primaryEnabled = false, + primaryInstalled = true, primaryEnabled = true, secondaryInstalled = true, secondaryEnabled = true, // If any user is enabled when uninstalling updates, /data is re-uncompressed codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) ) + toggleEnabled(false, User.PRIMARY) toggleEnabled(true, User.PRIMARY) assertState( @@ -379,14 +378,15 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { fun uninstallUpdatesAndEnableSecondaryFirst() { device.executeShellCommand("pm uninstall-system-updates $TEST_PKG_NAME") - // Uninstall-system-updates always disables system user 0 assertState( - primaryInstalled = true, primaryEnabled = false, + primaryInstalled = true, primaryEnabled = true, secondaryInstalled = true, secondaryEnabled = true, // If any user is enabled when uninstalling updates, /data is re-uncompressed codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) ) + toggleEnabled(false, User.PRIMARY) + toggleEnabled(true, User.SECONDARY) assertState( @@ -417,6 +417,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { codePaths = listOf(CodePath.SYSTEM) ) + toggleEnabled(false, User.PRIMARY) toggleEnabled(true, User.PRIMARY) assertState( @@ -447,6 +448,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { codePaths = listOf(CodePath.SYSTEM) ) + toggleEnabled(false, User.PRIMARY) toggleEnabled(true, User.SECONDARY) assertState( @@ -471,13 +473,13 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { device.executeShellCommand("pm uninstall-system-updates $TEST_PKG_NAME") - // Uninstall-system-updates always disables system user 0 assertState( - primaryInstalled = false, primaryEnabled = false, + primaryInstalled = false, primaryEnabled = true, secondaryInstalled = false, secondaryEnabled = true, codePaths = listOf(CodePath.SYSTEM) ) + toggleEnabled(false, User.PRIMARY) toggleEnabled(true, User.PRIMARY) assertState( @@ -502,9 +504,8 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { device.executeShellCommand("pm uninstall-system-updates $TEST_PKG_NAME") - // Uninstall-system-updates always disables system user 0 assertState( - primaryInstalled = false, primaryEnabled = false, + primaryInstalled = false, primaryEnabled = true, secondaryInstalled = false, secondaryEnabled = true, codePaths = listOf(CodePath.SYSTEM) ) @@ -512,7 +513,7 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { toggleEnabled(true, User.SECONDARY) assertState( - primaryInstalled = false, primaryEnabled = false, + primaryInstalled = false, primaryEnabled = true, secondaryInstalled = false, secondaryEnabled = true, codePaths = listOf(CodePath.DIFFERENT, CodePath.SYSTEM) ) @@ -582,22 +583,24 @@ class SystemStubMultiUserDisableUninstallTest : BaseHostJUnit4Test() { codePaths: List<CodePath> ) { HostUtils.getUserIdToPkgInstalledState(device, TEST_PKG_NAME) - .forEach { (userId, installed) -> - if (userId == 0) { - assertThat(installed).isEqualTo(primaryInstalled) - } else { - assertThat(installed).isEqualTo(secondaryInstalled) - } + .also { assertThat(it.size).isAtLeast(USER_COUNT) } + .forEach { (userId, installed) -> + if (userId == 0) { + assertThat(installed).isEqualTo(primaryInstalled) + } else { + assertThat(installed).isEqualTo(secondaryInstalled) } + } HostUtils.getUserIdToPkgEnabledState(device, TEST_PKG_NAME) - .forEach { (userId, enabled) -> - if (userId == 0) { - assertThat(enabled).isEqualTo(primaryEnabled) - } else { - assertThat(enabled).isEqualTo(secondaryEnabled) - } + .also { assertThat(it.size).isAtLeast(USER_COUNT) } + .forEach { (userId, enabled) -> + if (userId == 0) { + assertThat(enabled).isEqualTo(primaryEnabled) + } else { + assertThat(enabled).isEqualTo(secondaryEnabled) } + } assertCodePaths(codePaths.first(), codePaths.getOrNull(1)) } diff --git a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java index 624e7dd3be4f..607fb4760236 100644 --- a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java @@ -1003,8 +1003,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(1)).updateJobsForUidPackage(eq(UID_10_2), eq(PACKAGE_2), anyBoolean()); - verify(l, times(1)).updateForceAppStandbyForUidPackage(eq(UID_10_2), eq(PACKAGE_2), - eq(true)); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1019,8 +1017,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(1)).updateJobsForUidPackage(eq(UID_10_2), eq(PACKAGE_2), anyBoolean()); - verify(l, times(1)).updateForceAppStandbyForUidPackage(eq(UID_10_2), eq(PACKAGE_2), - eq(false)); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1034,7 +1030,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1052,8 +1047,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(1)).updateJobsForUidPackage(eq(UID_10_2), eq(PACKAGE_2), anyBoolean()); - verify(l, times(1)).updateForceAppStandbyForUidPackage(eq(UID_10_2), eq(PACKAGE_2), - eq(true)); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1070,7 +1063,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1089,7 +1081,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1104,7 +1095,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1121,7 +1111,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1137,7 +1126,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1154,7 +1142,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1171,7 +1158,6 @@ public class AppStateTrackerTest { verify(l, times(2)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1186,7 +1172,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1203,7 +1188,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1219,7 +1203,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(anyInt(), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(anyInt()); @@ -1242,7 +1225,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1258,7 +1240,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1274,7 +1255,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1290,7 +1270,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1307,7 +1286,6 @@ public class AppStateTrackerTest { verify(l, times(1)).updateAllJobs(); verify(l, times(0)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(1)).updateAllAlarms(); verify(l, times(0)).updateAlarmsForUid(eq(UID_10_1)); @@ -1323,7 +1301,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1339,7 +1316,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1355,7 +1331,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); @@ -1371,7 +1346,6 @@ public class AppStateTrackerTest { verify(l, times(0)).updateAllJobs(); verify(l, times(1)).updateJobsForUid(eq(UID_10_1), anyBoolean()); verify(l, times(0)).updateJobsForUidPackage(anyInt(), anyString(), anyBoolean()); - verify(l, times(0)).updateForceAppStandbyForUidPackage(anyInt(), anyString(), anyBoolean()); verify(l, times(0)).updateAllAlarms(); verify(l, times(1)).updateAlarmsForUid(eq(UID_10_1)); diff --git a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java index eab1afbd931e..583797e69995 100644 --- a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java @@ -1910,17 +1910,6 @@ public class AlarmManagerServiceTest { assertTrue(mBinder.hasScheduleExactAlarm(TEST_CALLING_PACKAGE, TEST_CALLING_USER)); } - @Test - public void hasScheduleExactAlarmBinderCallChangeDisabled() throws RemoteException { - mockChangeEnabled(AlarmManager.REQUIRE_EXACT_ALARM_PERMISSION, false); - - mockExactAlarmPermissionGrant(false, true, MODE_DEFAULT); - assertTrue(mBinder.hasScheduleExactAlarm(TEST_CALLING_PACKAGE, TEST_CALLING_USER)); - - mockExactAlarmPermissionGrant(true, false, MODE_ERRORED); - assertTrue(mBinder.hasScheduleExactAlarm(TEST_CALLING_PACKAGE, TEST_CALLING_USER)); - } - private void mockChangeEnabled(long changeId, boolean enabled) { doReturn(enabled).when(() -> CompatChanges.isChangeEnabled(eq(changeId), anyString(), any(UserHandle.class))); @@ -1941,6 +1930,53 @@ public class AlarmManagerServiceTest { } @Test + public void canScheduleExactAlarmsBinderCallChangeDisabled() throws RemoteException { + mockChangeEnabled(AlarmManager.REQUIRE_EXACT_ALARM_PERMISSION, false); + + mockExactAlarmPermissionGrant(false, true, MODE_DEFAULT); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + mockExactAlarmPermissionGrant(true, false, MODE_ERRORED); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + } + + @Test + public void canScheduleExactAlarmsBinderCall() throws RemoteException { + mockChangeEnabled(AlarmManager.REQUIRE_EXACT_ALARM_PERMISSION, true); + + // No permission, no exemption. + mockExactAlarmPermissionGrant(true, true, MODE_DEFAULT); + assertFalse(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // No permission, no exemption. + mockExactAlarmPermissionGrant(true, false, MODE_ERRORED); + assertFalse(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // Permission, no exemption. + mockExactAlarmPermissionGrant(true, false, MODE_DEFAULT); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // Permission, no exemption. + mockExactAlarmPermissionGrant(true, true, MODE_ALLOWED); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // No permission, exemption. + mockExactAlarmPermissionGrant(true, false, MODE_ERRORED); + when(mDeviceIdleInternal.isAppOnWhitelist(TEST_CALLING_UID)).thenReturn(true); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // No permission, exemption. + mockExactAlarmPermissionGrant(true, false, MODE_ERRORED); + when(mDeviceIdleInternal.isAppOnWhitelist(TEST_CALLING_UID)).thenReturn(false); + doReturn(true).when(() -> UserHandle.isCore(TEST_CALLING_UID)); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + + // Both permission and exemption. + mockExactAlarmPermissionGrant(true, false, MODE_ALLOWED); + assertTrue(mBinder.canScheduleExactAlarms(TEST_CALLING_PACKAGE)); + } + + @Test public void noPermissionCheckWhenChangeDisabled() throws RemoteException { mockChangeEnabled(AlarmManager.REQUIRE_EXACT_ALARM_PERMISSION, false); @@ -2086,14 +2122,17 @@ public class AlarmManagerServiceTest { final PendingIntent alarmPi = getNewMockPendingIntent(); final AlarmManager.AlarmClockInfo alarmClock = mock(AlarmManager.AlarmClockInfo.class); - try { - mBinder.set(TEST_CALLING_PACKAGE, RTC_WAKEUP, 1234, WINDOW_EXACT, 0, 0, + mBinder.set(TEST_CALLING_PACKAGE, RTC_WAKEUP, 1234, WINDOW_EXACT, 0, 0, alarmPi, null, null, null, alarmClock); - fail("alarm clock binder call succeeded without permission"); - } catch (SecurityException se) { - // Expected. - } - verify(mDeviceIdleInternal, never()).isAppOnWhitelist(anyInt()); + + // Correct permission checks are invoked. + verify(mService).hasScheduleExactAlarmInternal(TEST_CALLING_PACKAGE, TEST_CALLING_UID); + verify(mDeviceIdleInternal).isAppOnWhitelist(UserHandle.getAppId(TEST_CALLING_UID)); + + verify(mService).setImpl(eq(RTC_WAKEUP), eq(1234L), eq(WINDOW_EXACT), eq(0L), + eq(alarmPi), isNull(), isNull(), eq(FLAG_STANDALONE | FLAG_WAKE_FROM_IDLE), + isNull(), eq(alarmClock), eq(TEST_CALLING_UID), eq(TEST_CALLING_PACKAGE), + isNull(), eq(EXACT_ALLOW_REASON_ALLOW_LIST)); } @Test diff --git a/services/tests/mockingservicestests/src/com/android/server/appsearch/AppSearchConfigTest.java b/services/tests/mockingservicestests/src/com/android/server/appsearch/AppSearchConfigTest.java index c4860287c567..ffb1dd9c7e78 100644 --- a/services/tests/mockingservicestests/src/com/android/server/appsearch/AppSearchConfigTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/appsearch/AppSearchConfigTest.java @@ -50,6 +50,10 @@ public class AppSearchConfigTest { AppSearchConfig.DEFAULT_SAMPLING_INTERVAL); assertThat(appSearchConfig.getCachedSamplingIntervalForPutDocumentStats()).isEqualTo( AppSearchConfig.DEFAULT_SAMPLING_INTERVAL); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentSizeBytes()).isEqualTo( + AppSearchConfig.DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentCount()).isEqualTo( + AppSearchConfig.DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT); } @Test @@ -265,6 +269,22 @@ public class AppSearchConfigTest { } @Test + public void testCustomizedValue() { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_APPSEARCH, + AppSearchConfig.KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES, + Integer.toString(2001), + /*makeDefault=*/ false); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_APPSEARCH, + AppSearchConfig.KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT, + Integer.toString(2002), + /*makeDefault=*/ false); + + AppSearchConfig appSearchConfig = AppSearchConfig.create(DIRECT_EXECUTOR); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentSizeBytes()).isEqualTo(2001); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentCount()).isEqualTo(2002); + } + + @Test public void testNotUsable_afterClose() { AppSearchConfig appSearchConfig = AppSearchConfig.create(DIRECT_EXECUTOR); diff --git a/services/tests/mockingservicestests/src/com/android/server/appsearch/FrameworkLimitConfigTest.java b/services/tests/mockingservicestests/src/com/android/server/appsearch/FrameworkLimitConfigTest.java new file mode 100644 index 000000000000..088ed277aa80 --- /dev/null +++ b/services/tests/mockingservicestests/src/com/android/server/appsearch/FrameworkLimitConfigTest.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.appsearch; + +import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR; + +import static com.google.common.truth.Truth.assertThat; + +import android.provider.DeviceConfig; + +import com.android.server.testables.TestableDeviceConfig; + +import org.junit.Rule; +import org.junit.Test; + +/** + * Tests for {@link FrameworkLimitConfig}. + * + * <p>Build/Install/Run: atest FrameworksMockingServicesTests:AppSearchConfigTest + */ +public class FrameworkLimitConfigTest { + @Rule + public final TestableDeviceConfig.TestableDeviceConfigRule + mDeviceConfigRule = new TestableDeviceConfig.TestableDeviceConfigRule(); + + @Test + public void testDefaultValues() { + AppSearchConfig appSearchConfig = AppSearchConfig.create(DIRECT_EXECUTOR); + FrameworkLimitConfig config = new FrameworkLimitConfig(appSearchConfig); + assertThat(config.getMaxDocumentSizeBytes()).isEqualTo( + AppSearchConfig.DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentCount()).isEqualTo( + AppSearchConfig.DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT); + } + + @Test + public void testCustomizedValues() { + AppSearchConfig appSearchConfig = AppSearchConfig.create(DIRECT_EXECUTOR); + FrameworkLimitConfig config = new FrameworkLimitConfig(appSearchConfig); + DeviceConfig.setProperty( + DeviceConfig.NAMESPACE_APPSEARCH, + AppSearchConfig.KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES, + "2001", + /*makeDefault=*/ false); + DeviceConfig.setProperty( + DeviceConfig.NAMESPACE_APPSEARCH, + AppSearchConfig.KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT, + "2002", + /*makeDefault=*/ false); + + assertThat(config.getMaxDocumentSizeBytes()).isEqualTo(2001); + assertThat(appSearchConfig.getCachedLimitConfigMaxDocumentCount()).isEqualTo(2002); + } +} diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/StagingManagerTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/StagingManagerTest.java index 68570ffc6fce..f91cb2801bc1 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/StagingManagerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/StagingManagerTest.java @@ -311,7 +311,7 @@ public class StagingManagerTest { assertThat(apexSession1.getErrorCode()) .isEqualTo(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED); assertThat(apexSession1.getErrorMessage()).isEqualTo("APEX activation failed. " - + "Failed for test"); + + "Error: Failed for test"); assertThat(apexSession2.getErrorCode()) .isEqualTo(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java index a71b481372d8..d4908ee78a1d 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java @@ -16,6 +16,7 @@ package com.android.server.accessibility; +import static android.view.KeyCharacterMap.VIRTUAL_KEYBOARD; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_HOVER_MOVE; import static android.view.MotionEvent.ACTION_UP; @@ -112,6 +113,13 @@ public class MotionEventInjectorTest { private static final int CONTINUED_LINE_SEQUENCE_1 = 52; private static final int CONTINUED_LINE_SEQUENCE_2 = 53; + private static final float PRESSURE = 1; + private static final float X_PRECISION = 1; + private static final float Y_PRECISION = 1; + private static final int EDGEFLAGS = 0; + private static final float POINTER_SIZE = 1; + private static final int METASTATE = 0; + MotionEventInjector mMotionEventInjector; IAccessibilityServiceClient mServiceInterface; List<GestureStep> mLineList = new ArrayList<>(); @@ -152,14 +160,18 @@ public class MotionEventInjectorTest { CONTINUED_LINE_STROKE_ID_1, false, CONTINUED_LINE_INTERVAL, CONTINUED_LINE_MID1, CONTINUED_LINE_MID2, CONTINUED_LINE_END); - mClickDownEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, CLICK_POINT.x, CLICK_POINT.y, 0); + mClickDownEvent = MotionEvent.obtain(0, 0, ACTION_DOWN, CLICK_POINT.x, CLICK_POINT.y, + PRESSURE, POINTER_SIZE, METASTATE, X_PRECISION, Y_PRECISION, VIRTUAL_KEYBOARD, + EDGEFLAGS); mClickDownEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN); mClickUpEvent = MotionEvent.obtain(0, CLICK_DURATION, ACTION_UP, CLICK_POINT.x, - CLICK_POINT.y, 0); + CLICK_POINT.y, PRESSURE, POINTER_SIZE, METASTATE, X_PRECISION, Y_PRECISION, + VIRTUAL_KEYBOARD, EDGEFLAGS); mClickUpEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN); mHoverMoveEvent = MotionEvent.obtain(0, 0, ACTION_HOVER_MOVE, CLICK_POINT.x, CLICK_POINT.y, - 0); + PRESSURE, POINTER_SIZE, METASTATE, X_PRECISION, Y_PRECISION, VIRTUAL_KEYBOARD, + EDGEFLAGS); mHoverMoveEvent.setSource(InputDevice.SOURCE_MOUSE); mIsLineStart = allOf(IS_ACTION_DOWN, isAtPoint(LINE_START), hasStandardInitialization(), @@ -874,12 +886,14 @@ public class MotionEventInjectorTest { return new TypeSafeMatcher<MotionEvent>() { @Override protected boolean matchesSafely(MotionEvent event) { - return (0 == event.getActionIndex()) && (0 == event.getDeviceId()) - && (0 == event.getEdgeFlags()) && (0 == event.getFlags()) - && (0 == event.getMetaState()) && (0F == event.getOrientation()) + return (0 == event.getActionIndex()) && (VIRTUAL_KEYBOARD == event.getDeviceId()) + && (EDGEFLAGS == event.getEdgeFlags()) && (0 == event.getFlags()) + && (METASTATE == event.getMetaState()) && (0F == event.getOrientation()) && (0F == event.getTouchMajor()) && (0F == event.getTouchMinor()) - && (1F == event.getXPrecision()) && (1F == event.getYPrecision()) - && (1 == event.getPointerCount()) && (1F == event.getPressure()) + && (X_PRECISION == event.getXPrecision()) + && (Y_PRECISION == event.getYPrecision()) + && (POINTER_SIZE == event.getSize()) + && (1 == event.getPointerCount()) && (PRESSURE == event.getPressure()) && (InputDevice.SOURCE_TOUCHSCREEN == event.getSource()); } diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java index e19aa727b735..b580eae75144 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java @@ -35,6 +35,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.pm.PackageManager; +import android.os.Binder; import android.os.Bundle; import android.os.DropBoxManager; import android.os.Handler; @@ -43,7 +44,9 @@ import android.os.IRemoteCallback; import android.os.Looper; import android.os.Message; import android.os.Messenger; +import android.os.Parcel; import android.os.RemoteException; +import android.os.SystemClock; import android.os.UserHandle; import android.platform.test.annotations.Presubmit; import android.provider.DeviceConfig; @@ -52,8 +55,8 @@ import android.server.wm.settings.SettingsSession; import android.support.test.uiautomator.UiDevice; import android.test.suitebuilder.annotation.LargeTest; import android.text.TextUtils; -import android.util.KeyValueListParser; import android.util.Log; +import android.util.Pair; import androidx.test.InstrumentationRegistry; import androidx.test.filters.FlakyTest; @@ -63,11 +66,13 @@ import org.junit.Ignore; import org.junit.Test; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * Tests for {@link ActivityManager}. @@ -95,6 +100,20 @@ public class ActivityManagerTest { "com.android.servicestests.apps.simpleservicetestapp.ACTION_FGS_STATS_TEST"; private static final String EXTRA_MESSENGER = "extra_messenger"; + private static final String EXTRA_CALLBACK = "callback"; + private static final String EXTRA_COMMAND = "command"; + private static final String EXTRA_FLAGS = "flags"; + private static final String EXTRA_TARGET_PACKAGE = "target_package"; + + private static final int COMMAND_INVALID = 0; + private static final int COMMAND_EMPTY = 1; + private static final int COMMAND_BIND_SERVICE = 2; + private static final int COMMAND_UNBIND_SERVICE = 3; + private static final int COMMAND_STOP_SELF = 4; + + private static final String TEST_ISOLATED_CLASS = + "com.android.servicestests.apps.simpleservicetestapp.SimpleIsolatedService"; + private IActivityManager mService; private IRemoteCallback mCallback; private Context mContext; @@ -334,6 +353,12 @@ public class ActivityManagerTest { SettingsSession<String> amConstantsSettings = null; DeviceConfigSession<Long> freezerDebounceTimeout = null; MyServiceConnection autoConnection = null; + final ActivityManager am = mContext.getSystemService(ActivityManager.class); + final PackageManager pm = mContext.getPackageManager(); + final int uid1 = pm.getPackageUid(TEST_APP1, 0); + final int uid2 = pm.getPackageUid(TEST_APP2, 0); + final MyUidImportanceListener uid1Listener = new MyUidImportanceListener(uid1); + final MyUidImportanceListener uid2Listener = new MyUidImportanceListener(uid2); try { if (!freezerWasEnabled) { freezerEnabled = new SettingsSession<>( @@ -347,7 +372,7 @@ public class ActivityManagerTest { } } freezerDebounceTimeout = new DeviceConfigSession<>( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + DeviceConfig.NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT, CachedAppOptimizer.KEY_FREEZER_DEBOUNCE_TIMEOUT, DeviceConfig::getLong, CachedAppOptimizer.DEFAULT_FREEZER_DEBOUNCE_TIMEOUT); freezerDebounceTimeout.set(waitFor); @@ -360,13 +385,20 @@ public class ActivityManagerTest { amConstantsSettings.set( ActivityManagerConstants.KEY_MAX_SERVICE_INACTIVITY + "=" + waitFor); + runShellCommand("cmd deviceidle whitelist +" + TEST_APP1); + runShellCommand("cmd deviceidle whitelist +" + TEST_APP2); + + am.addOnUidImportanceListener(uid1Listener, + RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE); + am.addOnUidImportanceListener(uid2Listener, RunningAppProcessInfo.IMPORTANCE_CACHED); + final Intent intent = new Intent(); intent.setClassName(TEST_APP1, TEST_CLASS); - final CountDownLatch latch = new CountDownLatch(1); + CountDownLatch latch = new CountDownLatch(1); autoConnection = new MyServiceConnection(latch); mContext.bindService(intent, autoConnection, - Context.BIND_AUTO_CREATE | Context.BIND_ALLOW_OOM_MANAGEMENT); + Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY); try { assertTrue("Timeout to bind to service " + intent.getComponent(), latch.await(AWAIT_TIMEOUT, TimeUnit.MILLISECONDS)); @@ -384,6 +416,37 @@ public class ActivityManagerTest { // It still shouldn't be frozen, although it's been in cached state. assertFalse(TEST_APP1 + " shouldn't be frozen now.", isAppFrozen(TEST_APP1)); + + final CountDownLatch[] latchHolder = new CountDownLatch[1]; + final IRemoteCallback callback = new IRemoteCallback.Stub() { + @Override + public void sendResult(Bundle bundle) { + if (bundle != null) { + latchHolder[0].countDown(); + } + } + }; + + // Bind from app1 to app2 without BIND_WAIVE_PRIORITY. + final Bundle extras = new Bundle(); + extras.putBinder(EXTRA_CALLBACK, callback.asBinder()); + latchHolder[0] = new CountDownLatch(1); + sendCommand(COMMAND_BIND_SERVICE, TEST_APP1, TEST_APP2, extras); + assertTrue("Timed out to bind to " + TEST_APP2, latchHolder[0].await( + waitFor, TimeUnit.MILLISECONDS)); + + // Stop service in app1 + extras.clear(); + sendCommand(COMMAND_STOP_SELF, TEST_APP1, TEST_APP1, extras); + + assertTrue(TEST_APP2 + " should be in cached", uid2Listener.waitFor( + RunningAppProcessInfo.IMPORTANCE_CACHED, waitFor)); + + // Wait for the freezer kick in if there is any. + Thread.sleep(waitFor * 4); + + // It still shouldn't be frozen, although it's been in cached state. + assertFalse(TEST_APP2 + " shouldn't be frozen now.", isAppFrozen(TEST_APP2)); } finally { toggleScreenOn(true); if (amConstantsSettings != null) { @@ -398,7 +461,24 @@ public class ActivityManagerTest { if (autoConnection != null) { mContext.unbindService(autoConnection); } + am.removeOnUidImportanceListener(uid1Listener); + am.removeOnUidImportanceListener(uid2Listener); + sendCommand(COMMAND_UNBIND_SERVICE, TEST_APP1, TEST_APP2, null); + sendCommand(COMMAND_UNBIND_SERVICE, TEST_APP2, TEST_APP1, null); + runShellCommand("cmd deviceidle whitelist -" + TEST_APP1); + runShellCommand("cmd deviceidle whitelist -" + TEST_APP2); + } + } + + private void sendCommand(int command, String sourcePkg, String targetPkg, Bundle extras) { + final Intent intent = new Intent(); + intent.setClassName(sourcePkg, TEST_CLASS); + intent.putExtra(EXTRA_COMMAND, command); + intent.putExtra(EXTRA_TARGET_PACKAGE, targetPkg); + if (extras != null) { + intent.putExtras(extras); } + mContext.startService(intent); } private boolean isFreezerEnabled() throws Exception { @@ -421,142 +501,6 @@ public class ActivityManagerTest { return false; } - @LargeTest - @Test - public void testKillAppIfFasCachedIdle() throws Exception { - final long shortTimeoutMs = 5_000; - final long backgroundSettleMs = 10_000; - final PackageManager pm = mContext.getPackageManager(); - final int uid = pm.getPackageUid(TEST_APP1, 0); - final MyUidImportanceListener uidListener1 = new MyUidImportanceListener(uid); - final MyUidImportanceListener uidListener2 = new MyUidImportanceListener(uid); - SettingsSession<String> amConstantsSettings = null; - DeviceConfigSession<Boolean> killForceAppStandByAndCachedIdle = null; - final ActivityManager am = mContext.getSystemService(ActivityManager.class); - final CountDownLatch[] latchHolder = new CountDownLatch[1]; - final H handler = new H(Looper.getMainLooper(), latchHolder); - final Messenger messenger = new Messenger(handler); - try { - am.addOnUidImportanceListener(uidListener1, - RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE); - am.addOnUidImportanceListener(uidListener2, RunningAppProcessInfo.IMPORTANCE_GONE); - toggleScreenOn(true); - - killForceAppStandByAndCachedIdle = new DeviceConfigSession<>( - DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, - ActivityManagerConstants.KEY_KILL_FAS_CACHED_IDLE, - DeviceConfig::getBoolean, - ActivityManagerConstants.DEFAULT_KILL_FAS_CACHED_IDLE); - killForceAppStandByAndCachedIdle.set(true); - amConstantsSettings = new SettingsSession<>( - Settings.Global.getUriFor(Settings.Global.ACTIVITY_MANAGER_CONSTANTS), - Settings.Global::getString, Settings.Global::putString); - final KeyValueListParser parser = new KeyValueListParser(','); - long currentBackgroundSettleMs = - ActivityManagerConstants.DEFAULT_BACKGROUND_SETTLE_TIME; - try { - parser.setString(amConstantsSettings.get()); - currentBackgroundSettleMs = parser.getLong( - ActivityManagerConstants.KEY_BACKGROUND_SETTLE_TIME, - ActivityManagerConstants.DEFAULT_BACKGROUND_SETTLE_TIME); - } catch (IllegalArgumentException e) { - } - // Drain queue to make sure the existing UID_IDLE_MSG has been processed. - Thread.sleep(currentBackgroundSettleMs); - amConstantsSettings.set( - ActivityManagerConstants.KEY_BACKGROUND_SETTLE_TIME + "=" + backgroundSettleMs); - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND allow"); - - final Intent intent = new Intent(ACTION_FGS_STATS_TEST); - final ComponentName cn = ComponentName.unflattenFromString( - TEST_APP1 + "/" + TEST_FGS_CLASS); - final Bundle bundle = new Bundle(); - intent.setComponent(cn); - bundle.putBinder(EXTRA_MESSENGER, messenger.getBinder()); - intent.putExtras(bundle); - - // Start the FGS. - latchHolder[0] = new CountDownLatch(1); - mContext.startForegroundService(intent); - assertTrue("Timed out to start fg service", uidListener1.waitFor( - RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE, shortTimeoutMs)); - assertTrue("Timed out to get the remote messenger", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - assertFalse("FGS shouldn't be killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Stop the FGS, it shouldn't be killed because it's not in FAS state. - latchHolder[0] = new CountDownLatch(1); - handler.sendRemoteMessage(H.MSG_STOP_FOREGROUND, 0, 0, null); - assertTrue("Timed out to wait for stop fg", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - assertFalse("FGS shouldn't be killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Set the FAS state. - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND deny"); - // Now it should've been killed. - assertTrue("Should have been killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Start the FGS. - // Temporarily allow RUN_ANY_IN_BACKGROUND to start FGS. - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND allow"); - latchHolder[0] = new CountDownLatch(1); - mContext.startForegroundService(intent); - assertTrue("Timed out to start fg service", uidListener1.waitFor( - RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE, shortTimeoutMs)); - assertTrue("Timed out to get the remote messenger", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND deny"); - // It shouldn't be killed since it's not cached. - assertFalse("FGS shouldn't be killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Stop the FGS, it should get killed because it's cached & uid idle & in FAS state. - latchHolder[0] = new CountDownLatch(1); - handler.sendRemoteMessage(H.MSG_STOP_FOREGROUND, 0, 0, null); - assertTrue("Timed out to wait for stop fg", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - assertTrue("Should have been killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Disable this FAS cached idle kill feature. - killForceAppStandByAndCachedIdle.set(false); - - // Start the FGS. - // Temporarily allow RUN_ANY_IN_BACKGROUND to start FGS. - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND allow"); - latchHolder[0] = new CountDownLatch(1); - mContext.startForegroundService(intent); - assertTrue("Timed out to start fg service", uidListener1.waitFor( - RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE, shortTimeoutMs)); - assertTrue("Timed out to get the remote messenger", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND deny"); - assertFalse("FGS shouldn't be killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - - // Stop the FGS, it shouldn't be killed because the feature has been turned off. - latchHolder[0] = new CountDownLatch(1); - handler.sendRemoteMessage(H.MSG_STOP_FOREGROUND, 0, 0, null); - assertTrue("Timed out to wait for stop fg", latchHolder[0].await( - shortTimeoutMs, TimeUnit.MILLISECONDS)); - assertFalse("FGS shouldn't be killed", uidListener2.waitFor( - RunningAppProcessInfo.IMPORTANCE_GONE, backgroundSettleMs + shortTimeoutMs)); - } finally { - runShellCommand("cmd appops set " + TEST_APP1 + " RUN_ANY_IN_BACKGROUND default"); - if (amConstantsSettings != null) { - amConstantsSettings.close(); - } - if (killForceAppStandByAndCachedIdle != null) { - killForceAppStandByAndCachedIdle.close(); - } - am.removeOnUidImportanceListener(uidListener1); - am.removeOnUidImportanceListener(uidListener2); - } - } - @Ignore("Need to disable calling uid check in ActivityManagerService.killPids before this test") @Test public void testKillPids() throws Exception { @@ -633,6 +577,127 @@ public class ActivityManagerTest { return -1; } + @Test + public void testGetIsolatedProcesses() throws Exception { + final ActivityManager am = mContext.getSystemService(ActivityManager.class); + final PackageManager pm = mContext.getPackageManager(); + final int uid1 = pm.getPackageUid(TEST_APP1, 0); + final int uid2 = pm.getPackageUid(TEST_APP2, 0); + final int uid3 = pm.getPackageUid(TEST_APP3, 0); + final List<Pair<Integer, ServiceConnection>> uid1Processes = new ArrayList<>(); + final List<Pair<Integer, ServiceConnection>> uid2Processes = new ArrayList<>(); + try { + assertTrue("There shouldn't be any isolated process for " + TEST_APP1, + getIsolatedProcesses(uid1).isEmpty()); + assertTrue("There shouldn't be any isolated process for " + TEST_APP2, + getIsolatedProcesses(uid2).isEmpty()); + assertTrue("There shouldn't be any isolated process for " + TEST_APP3, + getIsolatedProcesses(uid3).isEmpty()); + + // Verify uid1 + uid1Processes.add(createIsolatedProcessAndVerify(TEST_APP1, uid1)); + uid1Processes.add(createIsolatedProcessAndVerify(TEST_APP1, uid1)); + uid1Processes.add(createIsolatedProcessAndVerify(TEST_APP1, uid1)); + verifyIsolatedProcesses(uid1Processes, getIsolatedProcesses(uid1)); + + // Let one of the processes go + final Pair<Integer, ServiceConnection> uid1P2 = uid1Processes.remove(2); + mContext.unbindService(uid1P2.second); + Thread.sleep(5_000); // Wait for the process gone. + verifyIsolatedProcesses(uid1Processes, getIsolatedProcesses(uid1)); + + // Verify uid2 + uid2Processes.add(createIsolatedProcessAndVerify(TEST_APP2, uid2)); + verifyIsolatedProcesses(uid2Processes, getIsolatedProcesses(uid2)); + + // Verify uid1 again + verifyIsolatedProcesses(uid1Processes, getIsolatedProcesses(uid1)); + + // Verify uid3 + assertTrue("There shouldn't be any isolated process for " + TEST_APP3, + getIsolatedProcesses(uid3).isEmpty()); + } finally { + for (Pair<Integer, ServiceConnection> p: uid1Processes) { + mContext.unbindService(p.second); + } + for (Pair<Integer, ServiceConnection> p: uid2Processes) { + mContext.unbindService(p.second); + } + am.forceStopPackage(TEST_APP1); + am.forceStopPackage(TEST_APP2); + am.forceStopPackage(TEST_APP3); + } + } + + private static List<Integer> getIsolatedProcesses(int uid) throws Exception { + final String output = runShellCommand("am get-isolated-pids " + uid); + final Matcher matcher = Pattern.compile("(\\d+)").matcher(output); + final List<Integer> pids = new ArrayList<>(); + while (matcher.find()) { + pids.add(Integer.parseInt(output.substring(matcher.start(), matcher.end()))); + } + return pids; + } + + private void verifyIsolatedProcesses(List<Pair<Integer, ServiceConnection>> processes, + List<Integer> pids) { + final List<Integer> l = processes.stream().map(p -> p.first).collect(Collectors.toList()); + assertTrue("Isolated processes don't match", l.containsAll(pids)); + assertTrue("Isolated processes don't match", pids.containsAll(l)); + } + + private Pair<Integer, ServiceConnection> createIsolatedProcessAndVerify(String pkgName, int uid) + throws Exception { + final Pair<Integer, ServiceConnection> p = createIsolatedProcess(pkgName); + final List<Integer> pids = getIsolatedProcesses(uid); + assertTrue("Can't find the isolated pid " + p.first + " for " + pkgName, + pids.contains(p.first)); + return p; + } + + private Pair<Integer, ServiceConnection> createIsolatedProcess(String pkgName) + throws Exception { + final int[] pid = new int[1]; + final CountDownLatch[] latch = new CountDownLatch[1]; + final ServiceConnection conn = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + final IRemoteCallback s = IRemoteCallback.Stub.asInterface(service); + final IBinder callback = new Binder() { + @Override + protected boolean onTransact(int code, Parcel data, Parcel reply, int flags) + throws RemoteException { + if (code == Binder.FIRST_CALL_TRANSACTION) { + pid[0] = data.readInt(); + latch[0].countDown(); + return true; + } + return super.onTransact(code, data, reply, flags); + } + }; + try { + final Bundle extra = new Bundle(); + extra.putBinder(EXTRA_CALLBACK, callback); + s.sendResult(extra); + } catch (RemoteException e) { + fail("Unable to call into isolated process"); + } + } + @Override + public void onServiceDisconnected(ComponentName name) { + } + }; + final Intent intent = new Intent(); + intent.setClassName(pkgName, TEST_ISOLATED_CLASS); + latch[0] = new CountDownLatch(1); + assertTrue("Unable to create isolated process in " + pkgName, + mContext.bindIsolatedService(intent, Context.BIND_AUTO_CREATE, + Long.toString(SystemClock.uptimeMillis()), mContext.getMainExecutor(), conn)); + assertTrue("Timeout to bind to service " + intent.getComponent(), + latch[0].await(AWAIT_TIMEOUT, TimeUnit.MILLISECONDS)); + return Pair.create(pid[0], conn); + } + /** * Make sure the screen state. */ diff --git a/services/tests/servicestests/src/com/android/server/appsearch/AppSearchImplPlatformTest.java b/services/tests/servicestests/src/com/android/server/appsearch/AppSearchImplPlatformTest.java index 3c10789bc792..0d475c00569e 100644 --- a/services/tests/servicestests/src/com/android/server/appsearch/AppSearchImplPlatformTest.java +++ b/services/tests/servicestests/src/com/android/server/appsearch/AppSearchImplPlatformTest.java @@ -92,7 +92,10 @@ public class AppSearchImplPlatformTest { // Give ourselves global query permissions mAppSearchImpl = AppSearchImpl.create( - mTemporaryFolder.newFolder(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); mVisibilityStore = VisibilityStoreImpl.create(mAppSearchImpl, mContext); mGlobalQuerierUid = mContext.getPackageManager().getPackageUid(mContext.getPackageName(), /*flags=*/ 0); diff --git a/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java b/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java index 330b1a74d879..91f49224fde8 100644 --- a/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java +++ b/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java @@ -54,6 +54,7 @@ import com.android.server.appsearch.icing.proto.SchemaTypeConfigProto; import com.android.server.appsearch.icing.proto.SearchResultProto; import com.android.server.appsearch.icing.proto.SearchSpecProto; import com.android.server.appsearch.icing.proto.StatusProto; +import com.android.server.appsearch.icing.proto.StorageInfoProto; import com.android.server.appsearch.icing.proto.StringIndexingConfig; import com.android.server.appsearch.icing.proto.TermMatchType; @@ -85,7 +86,10 @@ public class AppSearchImplTest { public void setUp() throws Exception { mAppSearchImpl = AppSearchImpl.create( - mTemporaryFolder.newFolder(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); } /** @@ -468,7 +472,11 @@ public class AppSearchImplTest { Context context = ApplicationProvider.getApplicationContext(); File appsearchDir = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); // Insert schema List<AppSearchSchema> schemas = @@ -529,7 +537,12 @@ public class AppSearchImplTest { // Initialize AppSearchImpl. This should cause a reset. InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder(); appSearchImpl.close(); - appSearchImpl = AppSearchImpl.create(appsearchDir, initStatsBuilder, ALWAYS_OPTIMIZE); + appSearchImpl = + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + initStatsBuilder, + ALWAYS_OPTIMIZE); // Check recovery state InitializeStats initStats = initStatsBuilder.build(); @@ -1688,7 +1701,10 @@ public class AppSearchImplTest { public void testThrowsExceptionIfClosed() throws Exception { AppSearchImpl appSearchImpl = AppSearchImpl.create( - mTemporaryFolder.newFolder(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); // Initial check that we could do something at first. List<AppSearchSchema> schemas = @@ -1816,7 +1832,11 @@ public class AppSearchImplTest { // Setup the index File appsearchDir = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); List<AppSearchSchema> schemas = Collections.singletonList(new AppSearchSchema.Builder("type").build()); @@ -1843,7 +1863,11 @@ public class AppSearchImplTest { // That document should be visible even from another instance. AppSearchImpl appSearchImpl2 = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); getResult = appSearchImpl2.getDocument( "package", "database", "namespace1", "id1", Collections.emptyMap()); @@ -1855,7 +1879,11 @@ public class AppSearchImplTest { // Setup the index File appsearchDir = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); List<AppSearchSchema> schemas = Collections.singletonList(new AppSearchSchema.Builder("type").build()); @@ -1906,7 +1934,11 @@ public class AppSearchImplTest { // Only the second document should be retrievable from another instance. AppSearchImpl appSearchImpl2 = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); assertThrows( AppSearchException.class, () -> @@ -1927,7 +1959,11 @@ public class AppSearchImplTest { // Setup the index File appsearchDir = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); List<AppSearchSchema> schemas = Collections.singletonList(new AppSearchSchema.Builder("type").build()); @@ -1986,7 +2022,11 @@ public class AppSearchImplTest { // Only the second document should be retrievable from another instance. AppSearchImpl appSearchImpl2 = - AppSearchImpl.create(appsearchDir, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); assertThrows( AppSearchException.class, () -> @@ -2001,4 +2041,784 @@ public class AppSearchImplTest { "package", "database", "namespace2", "id2", Collections.emptyMap()); assertThat(getResult).isEqualTo(document2); } + + @Test + public void testGetIcingSearchEngineStorageInfo() throws Exception { + // Setup the index + File appsearchDir = mTemporaryFolder.newFolder(); + AppSearchImpl appSearchImpl = + AppSearchImpl.create( + appsearchDir, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + List<AppSearchSchema> schemas = + Collections.singletonList(new AppSearchSchema.Builder("type").build()); + appSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Add two documents + GenericDocument document1 = + new GenericDocument.Builder<>("namespace1", "id1", "type").build(); + appSearchImpl.putDocument("package", "database", document1, /*logger=*/ null); + GenericDocument document2 = + new GenericDocument.Builder<>("namespace1", "id2", "type").build(); + appSearchImpl.putDocument("package", "database", document2, /*logger=*/ null); + + StorageInfoProto storageInfo = appSearchImpl.getRawStorageInfoProto(); + + // Simple checks to verify if we can get correct StorageInfoProto from IcingSearchEngine + // No need to cover all the fields + assertThat(storageInfo.getTotalStorageSize()).isGreaterThan(0); + assertThat(storageInfo.getDocumentStorageInfo().getNumAliveDocuments()).isEqualTo(2); + assertThat(storageInfo.getSchemaStoreStorageInfo().getNumSchemaTypes()).isEqualTo(1); + } + + @Test + public void testLimitConfig_DocumentSize() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + mTemporaryFolder.newFolder(), + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return 80; + } + + @Override + public int getMaxDocumentCount() { + return 1; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList(new AppSearchSchema.Builder("type").build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Insert a document which is too large + GenericDocument document = + new GenericDocument.Builder<>( + "this_namespace_is_long_to_make_the_doc_big", "id", "type") + .build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains( + "Document \"id\" for package \"package\" serialized to 99 bytes, which" + + " exceeds limit of 80 bytes"); + + // Make sure this failure didn't increase our document count. We should still be able to + // index 1 document. + GenericDocument document2 = + new GenericDocument.Builder<>("namespace", "id2", "type").build(); + mAppSearchImpl.putDocument("package", "database", document2, /*logger=*/ null); + + // Now we should get a failure + GenericDocument document3 = + new GenericDocument.Builder<>("namespace", "id3", "type").build(); + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document3, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 1 documents"); + } + + @Test + public void testLimitConfig_Init() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + File tempFolder = mTemporaryFolder.newFolder(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return 80; + } + + @Override + public int getMaxDocumentCount() { + return 1; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList(new AppSearchSchema.Builder("type").build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index a document + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type").build(), + /*logger=*/ null); + + // Now we should get a failure + GenericDocument document2 = + new GenericDocument.Builder<>("namespace", "id2", "type").build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document2, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 1 documents"); + + // Close and reinitialize AppSearchImpl + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return 80; + } + + @Override + public int getMaxDocumentCount() { + return 1; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Make sure the limit is maintained + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document2, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 1 documents"); + } + + @Test + public void testLimitConfig_Remove() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + mTemporaryFolder.newFolder(), + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 3; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList(new AppSearchSchema.Builder("type").build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index 3 documents + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type").build(), + /*logger=*/ null); + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id2", "type").build(), + /*logger=*/ null); + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id3", "type").build(), + /*logger=*/ null); + + // Now we should get a failure + GenericDocument document4 = + new GenericDocument.Builder<>("namespace", "id4", "type").build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document4, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + + // Remove a document that doesn't exist + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.remove( + "package", + "database", + "namespace", + "id4", + /*removeStatsBuilder=*/ null)); + + // Should still fail + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document4, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + + // Remove a document that does exist + mAppSearchImpl.remove( + "package", "database", "namespace", "id2", /*removeStatsBuilder=*/ null); + + // Now doc4 should work + mAppSearchImpl.putDocument("package", "database", document4, /*logger=*/ null); + + // The next one should fail again + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id5", "type") + .build(), + /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + } + + @Test + public void testLimitConfig_DifferentPackages() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + File tempFolder = mTemporaryFolder.newFolder(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 2; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList(new AppSearchSchema.Builder("type").build()); + mAppSearchImpl.setSchema( + "package1", + "database1", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + mAppSearchImpl.setSchema( + "package1", + "database2", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + mAppSearchImpl.setSchema( + "package2", + "database1", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + mAppSearchImpl.setSchema( + "package2", + "database2", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index documents in package1/database1 + mAppSearchImpl.putDocument( + "package1", + "database1", + new GenericDocument.Builder<>("namespace", "id1", "type").build(), + /*logger=*/ null); + mAppSearchImpl.putDocument( + "package1", + "database2", + new GenericDocument.Builder<>("namespace", "id2", "type").build(), + /*logger=*/ null); + + // Indexing a third doc into package1 should fail (here we use database3) + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package1", + "database3", + new GenericDocument.Builder<>("namespace", "id3", "type") + .build(), + /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package1\" exceeded limit of 2 documents"); + + // Indexing a doc into package2 should succeed + mAppSearchImpl.putDocument( + "package2", + "database1", + new GenericDocument.Builder<>("namespace", "id1", "type").build(), + /*logger=*/ null); + + // Reinitialize to make sure packages are parsed correctly on init + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 2; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // package1 should still be out of space + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package1", + "database4", + new GenericDocument.Builder<>("namespace", "id4", "type") + .build(), + /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package1\" exceeded limit of 2 documents"); + + // package2 has room for one more + mAppSearchImpl.putDocument( + "package2", + "database2", + new GenericDocument.Builder<>("namespace", "id2", "type").build(), + /*logger=*/ null); + + // now package2 really is out of space + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package2", + "database3", + new GenericDocument.Builder<>("namespace", "id3", "type") + .build(), + /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package2\" exceeded limit of 2 documents"); + } + + @Test + public void testLimitConfig_RemoveByQyery() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + mTemporaryFolder.newFolder(), + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 3; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList( + new AppSearchSchema.Builder("type") + .addProperty( + new AppSearchSchema.StringPropertyConfig.Builder("body") + .setIndexingType( + AppSearchSchema.StringPropertyConfig + .INDEXING_TYPE_PREFIXES) + .setTokenizerType( + AppSearchSchema.StringPropertyConfig + .TOKENIZER_TYPE_PLAIN) + .build()) + .build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index 3 documents + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type") + .setPropertyString("body", "tablet") + .build(), + /*logger=*/ null); + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id2", "type") + .setPropertyString("body", "tabby") + .build(), + /*logger=*/ null); + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id3", "type") + .setPropertyString("body", "grabby") + .build(), + /*logger=*/ null); + + // Now we should get a failure + GenericDocument document4 = + new GenericDocument.Builder<>("namespace", "id4", "type").build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document4, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + + // Run removebyquery, deleting nothing + mAppSearchImpl.removeByQuery( + "package", + "database", + "nothing", + new SearchSpec.Builder().build(), + /*removeStatsBuilder=*/ null); + + // Should still fail + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document4, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + + // Remove "tab*" + mAppSearchImpl.removeByQuery( + "package", + "database", + "tab", + new SearchSpec.Builder().build(), + /*removeStatsBuilder=*/ null); + + // Now doc4 and doc5 should work + mAppSearchImpl.putDocument("package", "database", document4, /*logger=*/ null); + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id5", "type").build(), + /*logger=*/ null); + + // We only deleted 2 docs so the next one should fail again + e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id6", "type") + .build(), + /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 3 documents"); + } + + @Test + public void testLimitConfig_Replace() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + mTemporaryFolder.newFolder(), + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 2; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList( + new AppSearchSchema.Builder("type") + .addProperty( + new AppSearchSchema.StringPropertyConfig.Builder("body") + .build()) + .build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index a document + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type") + .setPropertyString("body", "id1.orig") + .build(), + /*logger=*/ null); + // Replace it with another doc + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type") + .setPropertyString("body", "id1.new") + .build(), + /*logger=*/ null); + + // Index id2. This should pass but only because we check for replacements. + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id2", "type").build(), + /*logger=*/ null); + + // Now we should get a failure on id3 + GenericDocument document3 = + new GenericDocument.Builder<>("namespace", "id3", "type").build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document3, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 2 documents"); + } + + @Test + public void testLimitConfig_ReplaceReinit() throws Exception { + // Create a new mAppSearchImpl with a lower limit + mAppSearchImpl.close(); + File tempFolder = mTemporaryFolder.newFolder(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 2; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Insert schema + List<AppSearchSchema> schemas = + Collections.singletonList( + new AppSearchSchema.Builder("type") + .addProperty( + new AppSearchSchema.StringPropertyConfig.Builder("body") + .build()) + .build()); + mAppSearchImpl.setSchema( + "package", + "database", + schemas, + /*visibilityStore=*/ null, + /*schemasNotDisplayedBySystem=*/ Collections.emptyList(), + /*schemasVisibleToPackages=*/ Collections.emptyMap(), + /*forceOverride=*/ false, + /*version=*/ 0); + + // Index a document + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type") + .setPropertyString("body", "id1.orig") + .build(), + /*logger=*/ null); + // Replace it with another doc + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id1", "type") + .setPropertyString("body", "id1.new") + .build(), + /*logger=*/ null); + + // Reinitialize to make sure replacements are correctly accounted for by init + mAppSearchImpl.close(); + mAppSearchImpl = + AppSearchImpl.create( + tempFolder, + new LimitConfig() { + @Override + public int getMaxDocumentSizeBytes() { + return Integer.MAX_VALUE; + } + + @Override + public int getMaxDocumentCount() { + return 2; + } + }, + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); + + // Index id2. This should pass but only because we check for replacements. + mAppSearchImpl.putDocument( + "package", + "database", + new GenericDocument.Builder<>("namespace", "id2", "type").build(), + /*logger=*/ null); + + // Now we should get a failure on id3 + GenericDocument document3 = + new GenericDocument.Builder<>("namespace", "id3", "type").build(); + AppSearchException e = + assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + "package", "database", document3, /*logger=*/ null)); + assertThat(e.getResultCode()).isEqualTo(AppSearchResult.RESULT_OUT_OF_SPACE); + assertThat(e) + .hasMessageThat() + .contains("Package \"package\" exceeded limit of 2 documents"); + } } diff --git a/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchLoggerTest.java b/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchLoggerTest.java index 080c375ac7c6..7bacbb63f10c 100644 --- a/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchLoggerTest.java +++ b/services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchLoggerTest.java @@ -67,7 +67,10 @@ public class AppSearchLoggerTest { public void setUp() throws Exception { mAppSearchImpl = AppSearchImpl.create( - mTemporaryFolder.newFolder(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); mLogger = new TestLogger(); } @@ -290,7 +293,11 @@ public class AppSearchLoggerTest { public void testLoggingStats_initializeWithoutDocuments_success() throws Exception { // Create an unused AppSearchImpl to generated an InitializeStats. InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder(); - AppSearchImpl.create(mTemporaryFolder.newFolder(), initStatsBuilder, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + initStatsBuilder, + ALWAYS_OPTIMIZE); InitializeStats iStats = initStatsBuilder.build(); assertThat(iStats).isNotNull(); @@ -314,7 +321,11 @@ public class AppSearchLoggerTest { final File folder = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(folder, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + folder, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); List<AppSearchSchema> schemas = ImmutableList.of( new AppSearchSchema.Builder("Type1").build(), @@ -336,7 +347,7 @@ public class AppSearchLoggerTest { // Create another appsearchImpl on the same folder InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder(); - AppSearchImpl.create(folder, initStatsBuilder, ALWAYS_OPTIMIZE); + AppSearchImpl.create(folder, new UnlimitedLimitConfig(), initStatsBuilder, ALWAYS_OPTIMIZE); InitializeStats iStats = initStatsBuilder.build(); assertThat(iStats).isNotNull(); @@ -360,7 +371,11 @@ public class AppSearchLoggerTest { final File folder = mTemporaryFolder.newFolder(); AppSearchImpl appSearchImpl = - AppSearchImpl.create(folder, /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + AppSearchImpl.create( + folder, + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); List<AppSearchSchema> schemas = ImmutableList.of( @@ -393,7 +408,7 @@ public class AppSearchLoggerTest { // Create another appsearchImpl on the same folder InitializeStats.Builder initStatsBuilder = new InitializeStats.Builder(); - AppSearchImpl.create(folder, initStatsBuilder, ALWAYS_OPTIMIZE); + AppSearchImpl.create(folder, new UnlimitedLimitConfig(), initStatsBuilder, ALWAYS_OPTIMIZE); InitializeStats iStats = initStatsBuilder.build(); // Some of other fields are already covered by AppSearchImplTest#testReset() @@ -484,11 +499,13 @@ public class AppSearchLoggerTest { .setPropertyString("nonExist", "testPut example1") .build(); - // We mainly want to check the status code in stats. So we don't need to inspect the - // exception here. - Assert.assertThrows( - AppSearchException.class, - () -> mAppSearchImpl.putDocument(testPackageName, testDatabase, document, mLogger)); + AppSearchException exception = + Assert.assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.putDocument( + testPackageName, testDatabase, document, mLogger)); + assertThat(exception.getResultCode()).isEqualTo(AppSearchResult.RESULT_NOT_FOUND); PutDocumentStats pStats = mLogger.mPutDocumentStats; assertThat(pStats).isNotNull(); @@ -676,17 +693,17 @@ public class AppSearchLoggerTest { RemoveStats.Builder rStatsBuilder = new RemoveStats.Builder(testPackageName, testDatabase); - // We mainly want to check the status code in stats. So we don't need to inspect the - // exception here. - Assert.assertThrows( - AppSearchException.class, - () -> - mAppSearchImpl.remove( - testPackageName, - testDatabase, - testNamespace, - "invalidId", - rStatsBuilder)); + AppSearchException exception = + Assert.assertThrows( + AppSearchException.class, + () -> + mAppSearchImpl.remove( + testPackageName, + testDatabase, + testNamespace, + "invalidId", + rStatsBuilder)); + assertThat(exception.getResultCode()).isEqualTo(AppSearchResult.RESULT_NOT_FOUND); RemoveStats rStats = rStatsBuilder.build(); assertThat(rStats.getPackageName()).isEqualTo(testPackageName); diff --git a/services/tests/servicestests/src/com/android/server/appsearch/visibilitystore/VisibilityStoreImplTest.java b/services/tests/servicestests/src/com/android/server/appsearch/visibilitystore/VisibilityStoreImplTest.java index 07a728bac2a5..374642b676d2 100644 --- a/services/tests/servicestests/src/com/android/server/appsearch/visibilitystore/VisibilityStoreImplTest.java +++ b/services/tests/servicestests/src/com/android/server/appsearch/visibilitystore/VisibilityStoreImplTest.java @@ -38,6 +38,7 @@ import androidx.test.core.app.ApplicationProvider; import com.android.server.appsearch.external.localstorage.AppSearchImpl; import com.android.server.appsearch.external.localstorage.OptimizeStrategy; +import com.android.server.appsearch.external.localstorage.UnlimitedLimitConfig; import com.android.server.appsearch.external.localstorage.util.PrefixUtil; import com.android.server.appsearch.external.localstorage.visibilitystore.VisibilityStore; @@ -88,7 +89,10 @@ public class VisibilityStoreImplTest { // Give ourselves global query permissions AppSearchImpl appSearchImpl = AppSearchImpl.create( - mTemporaryFolder.newFolder(), /*initStatsBuilder=*/ null, ALWAYS_OPTIMIZE); + mTemporaryFolder.newFolder(), + new UnlimitedLimitConfig(), + /*initStatsBuilder=*/ null, + ALWAYS_OPTIMIZE); mVisibilityStore = VisibilityStoreImpl.create(appSearchImpl, mContext); mUid = mContext.getPackageManager().getPackageUid(mContext.getPackageName(), /*flags=*/ 0); } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java index 7ff253f3936e..3a9e629b6ed6 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java @@ -17,6 +17,8 @@ package com.android.server.biometrics.sensors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -133,6 +135,28 @@ public class UserAwareBiometricSchedulerTest { } @Test + public void testScheduleOperation_whenNoUser_notStarted_andReset() { + mCurrentUserId = UserHandle.USER_NULL; + mStartOperationsFinish = false; + + final BaseClientMonitor client = mock(BaseClientMonitor.class); + when(client.getTargetUserId()).thenReturn(5); + mScheduler.scheduleClientMonitor(client); + waitForIdle(); + + final TestStartUserClient startUserClient = + (TestStartUserClient) mScheduler.mCurrentOperation.mClientMonitor; + mScheduler.reset(); + assertNull(mScheduler.mCurrentOperation); + + final BiometricScheduler.Operation fakeOperation = new BiometricScheduler.Operation( + mock(BaseClientMonitor.class), new BaseClientMonitor.Callback() {}); + mScheduler.mCurrentOperation = fakeOperation; + startUserClient.mCallback.onClientFinished(startUserClient, true); + assertSame(fakeOperation, mScheduler.mCurrentOperation); + } + + @Test public void testScheduleOperation_whenSameUser() { mCurrentUserId = 10; @@ -173,7 +197,6 @@ public class UserAwareBiometricSchedulerTest { } private class TestUserStoppedCallback implements StopUserClient.UserStoppedCallback { - int numInvocations; @Override @@ -184,7 +207,6 @@ public class UserAwareBiometricSchedulerTest { } private class TestUserStartedCallback implements StartUserClient.UserStartedCallback<Object> { - int numInvocations; @Override @@ -221,6 +243,8 @@ public class UserAwareBiometricSchedulerTest { private static class TestStartUserClient extends StartUserClient<Object, Object> { private final boolean mShouldFinish; + Callback mCallback; + public TestStartUserClient(@NonNull Context context, @NonNull LazyDaemon<Object> lazyDaemon, @Nullable IBinder token, int userId, int sensorId, @NonNull UserStartedCallback<Object> callback, boolean shouldFinish) { @@ -236,6 +260,8 @@ public class UserAwareBiometricSchedulerTest { @Override public void start(@NonNull Callback callback) { super.start(callback); + + mCallback = callback; if (mShouldFinish) { mUserStartedCallback.onUserStarted(getTargetUserId(), new Object()); callback.onClientFinished(this, true /* success */); 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 cedf6361e33b..7b20bf0f6bc7 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -5428,6 +5428,205 @@ public class DevicePolicyManagerTest extends DpmTestBase { } @Test + public void isActivePasswordSufficient_SeparateWorkChallenge_ProfileQualityRequirementMet() + throws Exception { + // Create work profile with empty separate challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ true); + + // Set profile password quality requirement. No password added yet so + // profile.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + dpm.setPasswordQuality(admin1, DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + + // Set a work challenge and verify profile.isActivePasswordSufficient is now true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(managedProfileUserId)) + .thenReturn(computeForPasswordOrPin("abcdXYZ5".getBytes(), /* isPin */ false)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_SeparateWorkChallenge_ProfileComplexityRequirementMet() + throws Exception { + // Create work profile with empty separate challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ true); + + // Set profile password complexity requirement. No password added yet so + // profile.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + dpm.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_MEDIUM); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + + // Set a work challenge and verify profile.isActivePasswordSufficient is now true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(managedProfileUserId)) + .thenReturn(computeForPasswordOrPin("5156".getBytes(), /* isPin */ true)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_SeparateWorkChallenge_ParentQualityRequirementMet() + throws Exception { + // Create work profile with empty separate challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ true); + + // Set parent password quality requirement. No password added yet so + // parent.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + parentDpm.setPasswordQuality(admin1, DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify parent.isActivePasswordSufficient is now true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("acbdXYZ5".getBytes(), /* isPin */ false)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_SeparateWorkChallenge_ParentComplexityRequirementMet() + throws Exception { + // Create work profile with empty separate challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ true); + + // Set parent password complexity requirement. No password added yet so + // parent.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + parentDpm.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify parent.isActivePasswordSufficient is now true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("1234".getBytes(), /* isPin */ true)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_UnifiedWorkChallenge_ProfileQualityRequirementMet() + throws Exception { + // Create work profile with unified challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ false); + + // Set profile password quality requirement. No password added yet so + // {profile, parent}.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + dpm.setPasswordQuality(admin1, DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify {profile, parent}.isActivePasswordSufficient is true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("abcdXYZ5".getBytes(), /* isPin */ false)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_UnifiedWorkChallenge_ProfileComplexityRequirementMet() + throws Exception { + // Create work profile with unified challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ false); + + // Set profile password complexity requirement. No password added yet so + // {profile, parent}.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + dpm.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify {profile, parent}.isActivePasswordSufficient is true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("51567548".getBytes(), /* isPin */ true)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_UnifiedWorkChallenge_ParentQualityRequirementMet() + throws Exception { + // Create work profile with unified challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ false); + + // Set parent password quality requirement. No password added yet so + // {profile, parent}.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + parentDpm.setPasswordQuality(admin1, DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify {profile, parent}.isActivePasswordSufficient is true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("abcdXYZ5".getBytes(), /* isPin */ false)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + @Test + public void isActivePasswordSufficient_UnifiedWorkChallenge_ParentComplexityRequirementMet() + throws Exception { + // Create work profile with unified challenge + final int managedProfileUserId = 15; + final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436); + addManagedProfileForPasswordTests(managedProfileUserId, managedProfileAdminUid, + /* separateChallenge */ false); + + // Set parent password complexity requirement. No password added yet so + // {profile, parent}.isActivePasswordSufficient should return false + mContext.binder.callingUid = managedProfileAdminUid; + parentDpm.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_MEDIUM); + assertThat(dpm.isActivePasswordSufficient()).isFalse(); + assertThat(parentDpm.isActivePasswordSufficient()).isFalse(); + + // Set a device lockscreen and verify {profile, parent}.isActivePasswordSufficient is true + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(computeForPasswordOrPin("5156".getBytes(), /* isPin */ true)); + assertThat(dpm.isActivePasswordSufficient()).isTrue(); + assertThat(parentDpm.isActivePasswordSufficient()).isTrue(); + } + + private void addManagedProfileForPasswordTests(int userId, int adminUid, + boolean separateChallenge) throws Exception { + addManagedProfile(admin1, adminUid, admin1); + when(getServices().userManager.getProfileParent(userId)) + .thenReturn(new UserInfo(UserHandle.USER_SYSTEM, "user system", 0)); + doReturn(separateChallenge).when(getServices().lockPatternUtils) + .isSeparateProfileChallengeEnabled(userId); + when(getServices().userManager.getCredentialOwnerProfile(userId)) + .thenReturn(separateChallenge ? userId : UserHandle.USER_SYSTEM); + when(getServices().lockSettingsInternal.getUserPasswordMetrics(userId)) + .thenReturn(new PasswordMetrics(CREDENTIAL_TYPE_NONE)); + when(getServices().lockSettingsInternal.getUserPasswordMetrics(UserHandle.USER_SYSTEM)) + .thenReturn(new PasswordMetrics(CREDENTIAL_TYPE_NONE)); + } + + @Test public void testPasswordQualityAppliesToParentPreS() throws Exception { final int managedProfileUserId = CALLER_USER_HANDLE; final int managedProfileAdminUid = diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java index cae6c863ab02..a205a1d167fe 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java @@ -900,10 +900,57 @@ public class DisplayModeDirectorTest { } @Test + public void testAppRequestMinRefreshRate() { + // Confirm that the app min request range doesn't include flicker or min refresh rate + // settings but does include everything else. + assertTrue(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE + >= Vote.APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF); + + Display.Mode[] modes = new Display.Mode[3]; + modes[0] = new Display.Mode( + /*modeId=*/60, /*width=*/1000, /*height=*/1000, 60); + modes[1] = new Display.Mode( + /*modeId=*/75, /*width=*/1000, /*height=*/1000, 75); + modes[2] = new Display.Mode( + /*modeId=*/90, /*width=*/1000, /*height=*/1000, 90); + + DisplayModeDirector director = createDirectorFromModeArray(modes, modes[1]); + SparseArray<Vote> votes = new SparseArray<>(); + SparseArray<SparseArray<Vote>> votesByDisplay = new SparseArray<>(); + votesByDisplay.put(DISPLAY_ID, votes); + votes.put(Vote.PRIORITY_FLICKER_REFRESH_RATE_SWITCH, Vote.forDisableRefreshRateSwitching()); + votes.put(Vote.PRIORITY_FLICKER_REFRESH_RATE, Vote.forRefreshRates(60, 60)); + director.injectVotesByDisplay(votesByDisplay); + DesiredDisplayModeSpecs desiredSpecs = director.getDesiredDisplayModeSpecs(DISPLAY_ID); + assertThat(desiredSpecs.primaryRefreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(60); + assertThat(desiredSpecs.primaryRefreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(60); + assertThat(desiredSpecs.appRequestRefreshRateRange.min).isAtMost(60f); + assertThat(desiredSpecs.appRequestRefreshRateRange.max).isAtLeast(90f); + + votes.put(Vote.PRIORITY_USER_SETTING_MIN_REFRESH_RATE, + Vote.forRefreshRates(90, Float.POSITIVE_INFINITY)); + director.injectVotesByDisplay(votesByDisplay); + desiredSpecs = director.getDesiredDisplayModeSpecs(DISPLAY_ID); + assertThat(desiredSpecs.primaryRefreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(90); + assertThat(desiredSpecs.primaryRefreshRateRange.max).isAtLeast(90f); + assertThat(desiredSpecs.appRequestRefreshRateRange.min).isAtMost(60f); + assertThat(desiredSpecs.appRequestRefreshRateRange.max).isAtLeast(90f); + + votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE, + Vote.forRefreshRates(75, Float.POSITIVE_INFINITY)); + director.injectVotesByDisplay(votesByDisplay); + desiredSpecs = director.getDesiredDisplayModeSpecs(DISPLAY_ID); + assertThat(desiredSpecs.primaryRefreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(90); + assertThat(desiredSpecs.primaryRefreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(90); + assertThat(desiredSpecs.appRequestRefreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(75); + assertThat(desiredSpecs.appRequestRefreshRateRange.max).isAtLeast(90f); + } + + @Test public void testAppRequestMaxRefreshRate() { // Confirm that the app max request range doesn't include flicker or min refresh rate // settings but does include everything else. - assertTrue(Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE + assertTrue(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE >= Vote.APP_REQUEST_REFRESH_RATE_RANGE_PRIORITY_CUTOFF); Display.Mode[] modes = new Display.Mode[3]; @@ -936,7 +983,7 @@ public class DisplayModeDirectorTest { assertThat(desiredSpecs.appRequestRefreshRateRange.min).isAtMost(60f); assertThat(desiredSpecs.appRequestRefreshRateRange.max).isAtLeast(90f); - votes.put(Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE, Vote.forRefreshRates(0, 75)); + votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE, Vote.forRefreshRates(0, 75)); director.injectVotesByDisplay(votesByDisplay); desiredSpecs = director.getDesiredDisplayModeSpecs(DISPLAY_ID); assertThat(desiredSpecs.primaryRefreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(75); @@ -948,7 +995,7 @@ public class DisplayModeDirectorTest { @Test public void testAppRequestObserver_modeId() { DisplayModeDirector director = createDirectorFromFpsRange(60, 90); - director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 60, 0); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 60, 0, 0); Vote appRequestRefreshRate = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); @@ -969,11 +1016,11 @@ public class DisplayModeDirectorTest { assertThat(appRequestSize.height).isEqualTo(1000); assertThat(appRequestSize.width).isEqualTo(1000); - Vote appRequestMaxRefreshRate = - director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE); - assertNull(appRequestMaxRefreshRate); + Vote appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNull(appRequestRefreshRateRange); - director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 90, 0); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 90, 0, 0); appRequestRefreshRate = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); @@ -992,15 +1039,53 @@ public class DisplayModeDirectorTest { assertThat(appRequestSize.height).isEqualTo(1000); assertThat(appRequestSize.width).isEqualTo(1000); - appRequestMaxRefreshRate = - director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE); - assertNull(appRequestMaxRefreshRate); + appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNull(appRequestRefreshRateRange); + } + + @Test + public void testAppRequestObserver_minRefreshRate() { + DisplayModeDirector director = createDirectorFromFpsRange(60, 90); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 60, 0); + Vote appRequestRefreshRate = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); + assertNull(appRequestRefreshRate); + + Vote appRequestSize = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_SIZE); + assertNull(appRequestSize); + + Vote appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNotNull(appRequestRefreshRateRange); + assertThat(appRequestRefreshRateRange.refreshRateRange.min) + .isWithin(FLOAT_TOLERANCE).of(60); + assertThat(appRequestRefreshRateRange.refreshRateRange.max).isAtLeast(90); + assertThat(appRequestRefreshRateRange.height).isEqualTo(INVALID_SIZE); + assertThat(appRequestRefreshRateRange.width).isEqualTo(INVALID_SIZE); + + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 90, 0); + appRequestRefreshRate = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); + assertNull(appRequestRefreshRate); + + appRequestSize = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_SIZE); + assertNull(appRequestSize); + + appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNotNull(appRequestRefreshRateRange); + assertThat(appRequestRefreshRateRange.refreshRateRange.min) + .isWithin(FLOAT_TOLERANCE).of(90); + assertThat(appRequestRefreshRateRange.refreshRateRange.max).isAtLeast(90); + assertThat(appRequestRefreshRateRange.height).isEqualTo(INVALID_SIZE); + assertThat(appRequestRefreshRateRange.width).isEqualTo(INVALID_SIZE); } @Test public void testAppRequestObserver_maxRefreshRate() { DisplayModeDirector director = createDirectorFromFpsRange(60, 90); - director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 90); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 0, 90); Vote appRequestRefreshRate = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); assertNull(appRequestRefreshRate); @@ -1008,15 +1093,16 @@ public class DisplayModeDirectorTest { Vote appRequestSize = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_SIZE); assertNull(appRequestSize); - Vote appRequestMaxRefreshRate = - director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE); - assertNotNull(appRequestMaxRefreshRate); - assertThat(appRequestMaxRefreshRate.refreshRateRange.min).isZero(); - assertThat(appRequestMaxRefreshRate.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(90); - assertThat(appRequestMaxRefreshRate.height).isEqualTo(INVALID_SIZE); - assertThat(appRequestMaxRefreshRate.width).isEqualTo(INVALID_SIZE); + Vote appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNotNull(appRequestRefreshRateRange); + assertThat(appRequestRefreshRateRange.refreshRateRange.min).isZero(); + assertThat(appRequestRefreshRateRange.refreshRateRange.max) + .isWithin(FLOAT_TOLERANCE).of(90); + assertThat(appRequestRefreshRateRange.height).isEqualTo(INVALID_SIZE); + assertThat(appRequestRefreshRateRange.width).isEqualTo(INVALID_SIZE); - director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 60); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 0, 60); appRequestRefreshRate = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); assertNull(appRequestRefreshRate); @@ -1024,19 +1110,36 @@ public class DisplayModeDirectorTest { appRequestSize = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_SIZE); assertNull(appRequestSize); - appRequestMaxRefreshRate = - director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE); - assertNotNull(appRequestMaxRefreshRate); - assertThat(appRequestMaxRefreshRate.refreshRateRange.min).isZero(); - assertThat(appRequestMaxRefreshRate.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(60); - assertThat(appRequestMaxRefreshRate.height).isEqualTo(INVALID_SIZE); - assertThat(appRequestMaxRefreshRate.width).isEqualTo(INVALID_SIZE); + appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNotNull(appRequestRefreshRateRange); + assertThat(appRequestRefreshRateRange.refreshRateRange.min).isZero(); + assertThat(appRequestRefreshRateRange.refreshRateRange.max) + .isWithin(FLOAT_TOLERANCE).of(60); + assertThat(appRequestRefreshRateRange.height).isEqualTo(INVALID_SIZE); + assertThat(appRequestRefreshRateRange.width).isEqualTo(INVALID_SIZE); + } + + @Test + public void testAppRequestObserver_invalidRefreshRateRange() { + DisplayModeDirector director = createDirectorFromFpsRange(60, 90); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, -1, 90, 60); + Vote appRequestRefreshRate = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); + assertNull(appRequestRefreshRate); + + Vote appRequestSize = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_SIZE); + assertNull(appRequestSize); + + Vote appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNull(appRequestRefreshRateRange); } @Test - public void testAppRequestObserver_modeIdAndMaxRefreshRate() { + public void testAppRequestObserver_modeIdAndRefreshRateRange() { DisplayModeDirector director = createDirectorFromFpsRange(60, 90); - director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 60, 90); + director.getAppRequestObserver().setAppRequest(DISPLAY_ID, 60, 90, 90); Vote appRequestRefreshRate = director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE); @@ -1056,13 +1159,15 @@ public class DisplayModeDirectorTest { assertThat(appRequestSize.height).isEqualTo(1000); assertThat(appRequestSize.width).isEqualTo(1000); - Vote appRequestMaxRefreshRate = - director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE); - assertNotNull(appRequestMaxRefreshRate); - assertThat(appRequestMaxRefreshRate.refreshRateRange.min).isZero(); - assertThat(appRequestMaxRefreshRate.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(90); - assertThat(appRequestMaxRefreshRate.height).isEqualTo(INVALID_SIZE); - assertThat(appRequestMaxRefreshRate.width).isEqualTo(INVALID_SIZE); + Vote appRequestRefreshRateRange = + director.getVote(DISPLAY_ID, Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE); + assertNotNull(appRequestRefreshRateRange); + assertThat(appRequestRefreshRateRange.refreshRateRange.max) + .isWithin(FLOAT_TOLERANCE).of(90); + assertThat(appRequestRefreshRateRange.refreshRateRange.max) + .isWithin(FLOAT_TOLERANCE).of(90); + assertThat(appRequestRefreshRateRange.height).isEqualTo(INVALID_SIZE); + assertThat(appRequestRefreshRateRange.width).isEqualTo(INVALID_SIZE); } @Test @@ -1161,7 +1266,7 @@ public class DisplayModeDirectorTest { assertThat(desiredSpecs.baseModeId).isEqualTo(55); votes.clear(); - votes.put(Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE, Vote.forRefreshRates(0, 52)); + votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE, Vote.forRefreshRates(0, 52)); votes.put(Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE, Vote.forBaseModeRefreshRate(55)); votes.put(Vote.PRIORITY_LOW_POWER_MODE, Vote.forRefreshRates(0, 60)); @@ -1172,7 +1277,7 @@ public class DisplayModeDirectorTest { assertThat(desiredSpecs.baseModeId).isEqualTo(55); votes.clear(); - votes.put(Vote.PRIORITY_APP_REQUEST_MAX_REFRESH_RATE, Vote.forRefreshRates(0, 58)); + votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE, Vote.forRefreshRates(0, 58)); votes.put(Vote.PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE, Vote.forBaseModeRefreshRate(55)); votes.put(Vote.PRIORITY_LOW_POWER_MODE, Vote.forRefreshRates(0, 60)); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTest.java index 68803023c451..6502e4813171 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTest.java @@ -32,9 +32,15 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import android.content.Context; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiPortInfo; +import android.media.AudioManager; import android.os.test.TestLooper; import android.platform.test.annotations.Presubmit; @@ -45,6 +51,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Arrays; @@ -123,8 +131,12 @@ public class HdmiCecLocalDeviceTest { private boolean isControlEnabled; private int mPowerStatus; + @Mock + private AudioManager mAudioManager; + @Before public void SetUp() { + MockitoAnnotations.initMocks(this); Context context = InstrumentationRegistry.getTargetContext(); @@ -161,6 +173,11 @@ public class HdmiCecLocalDeviceTest { void wakeUp() { mWakeupMessageReceived = true; } + + @Override + AudioManager getAudioManager() { + return mAudioManager; + } }; mHdmiControlService.setIoLooper(mTestLooper.getLooper()); mHdmiControlService.setHdmiCecConfig(new FakeHdmiCecConfig(context)); @@ -419,6 +436,28 @@ public class HdmiCecLocalDeviceTest { } @Test + public void handleUserControlPressed_muteFunction() { + @Constants.HandleMessageResult int result = mHdmiLocalDevice.handleUserControlPressed( + HdmiCecMessageBuilder.buildUserControlPressed(ADDR_TV, ADDR_PLAYBACK_1, + HdmiCecKeycode.CEC_KEYCODE_MUTE_FUNCTION)); + + assertEquals(result, Constants.HANDLED); + verify(mAudioManager, times(1)) + .adjustStreamVolume(anyInt(), eq(AudioManager.ADJUST_MUTE), anyInt()); + } + + @Test + public void handleUserControlPressed_restoreVolumeFunction() { + @Constants.HandleMessageResult int result = mHdmiLocalDevice.handleUserControlPressed( + HdmiCecMessageBuilder.buildUserControlPressed(ADDR_TV, ADDR_PLAYBACK_1, + HdmiCecKeycode.CEC_KEYCODE_RESTORE_VOLUME_FUNCTION)); + + assertEquals(result, Constants.HANDLED); + verify(mAudioManager, times(1)) + .adjustStreamVolume(anyInt(), eq(AudioManager.ADJUST_UNMUTE), anyInt()); + } + + @Test public void handleVendorCommand_notHandled() { HdmiCecMessage vendorCommand = HdmiCecMessageBuilder.buildVendorCommand(ADDR_TV, ADDR_PLAYBACK_1, new byte[]{0}); diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java index 4e350b673b38..fb768a815624 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -286,9 +286,11 @@ public class ApexManagerTest { mApexManager.scanApexPackagesTraced(mPackageParser2, ParallelPackageParser.makeExecutorService()); - assertThat(mApexManager.isApkInApexInstallSuccess(activeApex.apexModuleName)).isTrue(); - mApexManager.reportErrorWithApkInApex(activeApex.apexDirectory.getAbsolutePath()); - assertThat(mApexManager.isApkInApexInstallSuccess(activeApex.apexModuleName)).isFalse(); + assertThat(mApexManager.getApkInApexInstallError(activeApex.apexModuleName)).isNull(); + mApexManager.reportErrorWithApkInApex(activeApex.apexDirectory.getAbsolutePath(), + "Some random error"); + assertThat(mApexManager.getApkInApexInstallError(activeApex.apexModuleName)) + .isEqualTo("Some random error"); } /** diff --git a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java index dc745cdc0c84..67dd0556e098 100644 --- a/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java @@ -83,17 +83,9 @@ public class AppsFilterTest { private static final int DUMMY_OVERLAY_APPID = 10756; private static final int SYSTEM_USER = 0; private static final int SECONDARY_USER = 10; - private static final int ADDED_USER = 11; private static final int[] USER_ARRAY = {SYSTEM_USER, SECONDARY_USER}; - private static final int[] USER_ARRAY_WITH_ADDED = {SYSTEM_USER, SECONDARY_USER, ADDED_USER}; - private static final UserInfo[] USER_INFO_LIST = toUserInfos(USER_ARRAY); - private static final UserInfo[] USER_INFO_LIST_WITH_ADDED = toUserInfos(USER_ARRAY_WITH_ADDED); - - private static UserInfo[] toUserInfos(int[] userIds) { - return Arrays.stream(userIds) - .mapToObj(id -> new UserInfo(id, Integer.toString(id), 0)) - .toArray(UserInfo[]::new); - } + private static final UserInfo[] USER_INFO_LIST = Arrays.stream(USER_ARRAY).mapToObj( + id -> new UserInfo(id, Integer.toString(id), 0)).toArray(UserInfo[]::new); @Mock AppsFilter.FeatureConfig mFeatureConfigMock; @@ -327,47 +319,6 @@ public class AppsFilterTest { } @Test - public void testOnUserCreated_FilterMatches() throws Exception { - final AppsFilter appsFilter = - new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, - mMockExecutor); - simulateAddBasicAndroid(appsFilter); - - appsFilter.onSystemReady(); - - PackageSetting target = simulateAddPackage(appsFilter, - pkgWithProvider("com.some.package", "com.some.authority"), DUMMY_TARGET_APPID); - PackageSetting calling = simulateAddPackage(appsFilter, - pkgQueriesProvider("com.some.other.package", "com.some.authority"), - DUMMY_CALLING_APPID); - - for (int subjectUserId : USER_ARRAY) { - for (int otherUserId : USER_ARRAY) { - assertFalse(appsFilter.shouldFilterApplication( - UserHandle.getUid(DUMMY_CALLING_APPID, subjectUserId), calling, target, - otherUserId)); - } - } - - // adds new user - doAnswer(invocation -> { - ((AppsFilter.StateProvider.CurrentStateCallback) invocation.getArgument(0)) - .currentState(mExisting, USER_INFO_LIST_WITH_ADDED); - return new Object(); - }).when(mStateProvider) - .runWithState(any(AppsFilter.StateProvider.CurrentStateCallback.class)); - appsFilter.onUserCreated(ADDED_USER); - - for (int subjectUserId : USER_ARRAY_WITH_ADDED) { - for (int otherUserId : USER_ARRAY_WITH_ADDED) { - assertFalse(appsFilter.shouldFilterApplication( - UserHandle.getUid(DUMMY_CALLING_APPID, subjectUserId), calling, target, - otherUserId)); - } - } - } - - @Test public void testQueriesDifferentProvider_Filters() throws Exception { final AppsFilter appsFilter = new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null, 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 38f976c32d6d..5eabc1bea148 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -761,6 +761,25 @@ public class PowerManagerServiceTest { } @Test + public void testInattentiveSleep_hideWarningIfInattentiveSleepIsDisabled() throws Exception { + setMinimumScreenOffTimeoutConfig(5); + setAttentiveWarningDuration(120); + setAttentiveTimeout(100); + + createService(); + startSystem(); + + verify(mInattentiveSleepWarningControllerMock, times(1)).show(); + verify(mInattentiveSleepWarningControllerMock, never()).dismiss(anyBoolean()); + when(mInattentiveSleepWarningControllerMock.isShown()).thenReturn(true); + + setAttentiveTimeout(-1); + mService.handleSettingsChangedLocked(); + + verify(mInattentiveSleepWarningControllerMock, atLeastOnce()).dismiss(true); + } + + @Test public void testInattentiveSleep_userActivityDismissesWarning() throws Exception { final DisplayInfo info = new DisplayInfo(); info.displayGroupId = Display.DEFAULT_DISPLAY_GROUP; diff --git a/services/tests/servicestests/src/com/android/server/vibrator/DeviceVibrationEffectAdapterTest.java b/services/tests/servicestests/src/com/android/server/vibrator/DeviceVibrationEffectAdapterTest.java index 14cab021edb0..b934ecb80564 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/DeviceVibrationEffectAdapterTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/DeviceVibrationEffectAdapterTest.java @@ -20,8 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.hardware.vibrator.IVibrator; +import android.os.Handler; import android.os.VibrationEffect; import android.os.VibratorInfo; +import android.os.test.TestLooper; import android.os.vibrator.PrebakedSegment; import android.os.vibrator.PrimitiveSegment; import android.os.vibrator.RampSegment; @@ -62,7 +64,9 @@ public class DeviceVibrationEffectAdapterTest { @Before public void setUp() throws Exception { - mAdapter = new DeviceVibrationEffectAdapter(InstrumentationRegistry.getContext()); + VibrationSettings vibrationSettings = new VibrationSettings( + InstrumentationRegistry.getContext(), new Handler(new TestLooper().getLooper())); + mAdapter = new DeviceVibrationEffectAdapter(vibrationSettings); } @Test diff --git a/services/tests/servicestests/src/com/android/server/vibrator/RampDownAdapterTest.java b/services/tests/servicestests/src/com/android/server/vibrator/RampDownAdapterTest.java new file mode 100644 index 000000000000..b90df21464ca --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/vibrator/RampDownAdapterTest.java @@ -0,0 +1,294 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.vibrator; + +import static org.junit.Assert.assertEquals; + +import android.os.VibrationEffect; +import android.os.VibratorInfo; +import android.os.vibrator.PrebakedSegment; +import android.os.vibrator.PrimitiveSegment; +import android.os.vibrator.RampSegment; +import android.os.vibrator.StepSegment; +import android.os.vibrator.VibrationEffectSegment; +import android.platform.test.annotations.Presubmit; + +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Tests for {@link RampDownAdapter}. + * + * Build/Install/Run: + * atest FrameworksServicesTests:RampDownAdapterTest + */ +@Presubmit +public class RampDownAdapterTest { + private static final int TEST_RAMP_DOWN_DURATION = 20; + private static final int TEST_STEP_DURATION = 5; + private static final VibratorInfo TEST_VIBRATOR_INFO = new VibratorInfo.Builder(0).build(); + + private RampDownAdapter mAdapter; + + @Before + public void setUp() throws Exception { + mAdapter = new RampDownAdapter(TEST_RAMP_DOWN_DURATION, TEST_STEP_DURATION); + } + + @Test + public void testPrebakedAndPrimitiveSegments_keepsListUnchanged() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new PrebakedSegment( + VibrationEffect.EFFECT_CLICK, false, VibrationEffect.EFFECT_STRENGTH_LIGHT), + new PrimitiveSegment(VibrationEffect.Composition.PRIMITIVE_TICK, 1, 10))); + List<VibrationEffectSegment> originalSegments = new ArrayList<>(segments); + + assertEquals(-1, mAdapter.apply(segments, -1, TEST_VIBRATOR_INFO)); + assertEquals(1, mAdapter.apply(segments, 1, TEST_VIBRATOR_INFO)); + + assertEquals(originalSegments, segments); + } + + @Test + public void testRampAndStepSegments_withNoOffSegment_keepsListUnchanged() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 100), + new RampSegment(/* startAmplitude= */ 0.8f, /* endAmplitude= */ 0.2f, + /* startFrequency= */ 10, /* endFrequency= */ -5, /* duration= */ 20))); + List<VibrationEffectSegment> originalSegments = new ArrayList<>(segments); + + assertEquals(-1, mAdapter.apply(segments, -1, TEST_VIBRATOR_INFO)); + assertEquals(0, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(originalSegments, segments); + } + + @Test + public void testRampAndStepSegments_withNoRampDownDuration_keepsOriginalSteps() { + mAdapter = new RampDownAdapter(/* rampDownDuration= */ 0, TEST_STEP_DURATION); + + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 100), + new RampSegment(/* startAmplitude= */ 0.8f, /* endAmplitude= */ 0.2f, + /* startFrequency= */ 10, /* endFrequency= */ -5, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ 0, /* endFrequency= */ 0, /* duration= */ 50))); + List<VibrationEffectSegment> originalSegments = new ArrayList<>(segments); + + assertEquals(-1, mAdapter.apply(segments, -1, TEST_VIBRATOR_INFO)); + assertEquals(2, mAdapter.apply(segments, 2, TEST_VIBRATOR_INFO)); + assertEquals(originalSegments, segments); + } + + @Test + public void testStepSegments_withShortZeroSegment_replaceWithStepsDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 0, /* duration= */ 100))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 0, /* duration= */ 100)); + + assertEquals(1, mAdapter.apply(segments, 1, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testStepSegments_withLongZeroSegment_replaceWithStepsDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 10), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ 0, /* endFrequency= */ 0, /* duration= */ 50), + new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 0, /* duration= */ 100))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0.75f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0.25f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 35), + new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 0, /* duration= */ 100)); + + // Repeat index fixed after intermediate steps added + assertEquals(5, mAdapter.apply(segments, 2, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testStepSegments_withRepeatToNonZeroSegment_keepsOriginalSteps() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 100))); + List<VibrationEffectSegment> originalSegments = new ArrayList<>(segments); + + assertEquals(0, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(originalSegments, segments); + } + + @Test + public void testStepSegments_withRepeatToShortZeroSegment_skipAndAppendRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ 0, /* endFrequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 30))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ 0, /* endFrequency= */ 0, /* duration= */ 10), + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 30), + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 5)); + + // Shift repeat index to the right to use append instead of zero segment. + assertEquals(1, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testStepSegments_withRepeatToLongZeroSegment_splitAndAppendRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 120), + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 30))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + // Split long zero segment to skip part of it. + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 20), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 100), + new StepSegment(/* amplitude= */ 1, /* frequency= */ 0, /* duration= */ 30), + new StepSegment(/* amplitude= */ 0.75f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0.25f, /* frequency= */ 0, /* duration= */ 5), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 5)); + + // Shift repeat index to the right to use append with part of the zero segment. + assertEquals(1, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testRampSegments_withShortZeroSegment_replaceWithRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude= */ 0, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30)); + + assertEquals(2, mAdapter.apply(segments, 2, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testRampSegments_withLongZeroSegment_splitAndAddRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), + new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 150), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude= */ 0, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 130), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30)); + + // Repeat index fixed after intermediate steps added + assertEquals(3, mAdapter.apply(segments, 2, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testRampSegments_withRepeatToNonZeroSegment_keepsOriginalSteps() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, + /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30))); + List<VibrationEffectSegment> originalSegments = new ArrayList<>(segments); + + assertEquals(0, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(originalSegments, segments); + } + + @Test + public void testRampSegments_withRepeatToShortZeroSegment_skipAndAppendRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 1, + /* startFrequency= */ 0, /* endFrequency= */ 1, /* duration= */ 20))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 1, + /* startFrequency= */ 0, /* endFrequency= */ 1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 0, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 20)); + + // Shift repeat index to the right to use append instead of zero segment. + assertEquals(1, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } + + @Test + public void testRampSegments_withRepeatToLongZeroSegment_splitAndAppendRampDown() { + List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 70), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30))); + List<VibrationEffectSegment> expectedSegments = Arrays.asList( + // Split long zero segment to skip part of it. + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 20), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 50), + new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 1, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30), + new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 0, + /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 20)); + + // Shift repeat index to the right to use append with part of the zero segment. + assertEquals(1, mAdapter.apply(segments, 0, TEST_VIBRATOR_INFO)); + + assertEquals(expectedSegments, segments); + } +} diff --git a/services/tests/servicestests/src/com/android/server/vibrator/StepToRampAdapterTest.java b/services/tests/servicestests/src/com/android/server/vibrator/StepToRampAdapterTest.java index 32988efbab2c..128cd2f9e0a1 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/StepToRampAdapterTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/StepToRampAdapterTest.java @@ -48,7 +48,7 @@ public class StepToRampAdapterTest { @Before public void setUp() throws Exception { - mAdapter = new StepToRampAdapter(/* rampDownDuration= */ 0); + mAdapter = new StepToRampAdapter(); } @Test @@ -101,8 +101,6 @@ public class StepToRampAdapterTest { @Test public void testStepAndRampSegments_withoutPwleCapability_keepsListUnchanged() { - mAdapter = new StepToRampAdapter(50); - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 10), new RampSegment(/* startAmplitude= */ 0.8f, /* endAmplitude= */ 0.2f, @@ -182,160 +180,6 @@ public class StepToRampAdapterTest { assertEquals(expectedSegments, segments); } - @Test - public void testStepSegments_withRampDownEndingAtNonZero_noRampDownAdded() { - int rampDownDuration = 50; - mAdapter = new StepToRampAdapter(rampDownDuration); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ 0, /* duration= */ 10), - new StepSegment(/* amplitude= */ 0.8f, /* frequency= */ 1, /* duration= */ 100))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, - /* startFrequency= */ 0, /* endFrequency= */ 0, /* duration= */ 10), - new RampSegment(/* startAmplitude= */ 0.8f, /* endAmplitude= */ 0.8f, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 100)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - assertEquals(-1, mAdapter.apply(segments, -1, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndShortZeroSegment_replaceWithRampDown() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ -1, /* duration= */ 10), - new StepSegment(/* amplitude= */ 0, /* frequency= */ 0, /* duration= */ 20), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude= */ 0, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 20), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - assertEquals(2, mAdapter.apply(segments, 2, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndLongZeroSegment_splitAndAddRampDown() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ -1, /* duration= */ 10), - new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 150), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude= */ 0, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 50), - new RampSegment(/* startAmplitude= */ 0, /* endAmplitude= */ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 100), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - // Repeat index fixed after intermediate steps added - assertEquals(3, mAdapter.apply(segments, 2, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndNoZeroSegment_noRampDownAdded() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ -1, /* duration= */ 10), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30), - new PrimitiveSegment(VibrationEffect.Composition.PRIMITIVE_TICK, 1, 10))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30), - new PrimitiveSegment(VibrationEffect.Composition.PRIMITIVE_TICK, 1, 10)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - assertEquals(-1, mAdapter.apply(segments, -1, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndRepeatToNonZeroSegment_noRampDownAdded() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0.5f, /* frequency= */ -1, /* duration= */ 10), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0.5f, /* endAmplitude*/ 0.5f, - /* startFrequency= */ -1, /* endFrequency= */ -1, /* duration= */ 10), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - assertEquals(0, mAdapter.apply(segments, 0, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndRepeatToShortZeroSegment_skipAndAppendRampDown() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 20), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 20), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 20)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - // Shift repeat index to the right to use append instead of zero segment. - assertEquals(1, mAdapter.apply(segments, 0, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - - @Test - public void testStepSegments_withRampDownAndRepeatToLongZeroSegment_splitAndAppendRampDown() { - mAdapter = new StepToRampAdapter(50); - - List<VibrationEffectSegment> segments = new ArrayList<>(Arrays.asList( - new StepSegment(/* amplitude= */ 0, /* frequency= */ 1, /* duration= */ 120), - new StepSegment(/* amplitude= */ 1, /* frequency= */ 1, /* duration= */ 30))); - List<VibrationEffectSegment> expectedSegments = Arrays.asList( - // Split long zero segment to skip part of it. - new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 50), - new RampSegment(/* startAmplitude= */ 0, /* endAmplitude*/ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 70), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 1, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 30), - new RampSegment(/* startAmplitude= */ 1, /* endAmplitude= */ 0, - /* startFrequency= */ 1, /* endFrequency= */ 1, /* duration= */ 50)); - - VibratorInfo vibratorInfo = createVibratorInfo(IVibrator.CAP_COMPOSE_PWLE_EFFECTS); - // Shift repeat index to the right to use append with part of the zero segment. - assertEquals(1, mAdapter.apply(segments, 0, vibratorInfo)); - - assertEquals(expectedSegments, segments); - } - private static VibratorInfo createVibratorInfo(int... capabilities) { return new VibratorInfo.Builder(0) .setCapabilities(IntStream.of(capabilities).reduce((a, b) -> a | b).orElse(0)) diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java index b8fdb552e453..6d25e8c55a51 100644 --- a/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java +++ b/services/tests/servicestests/src/com/android/server/vibrator/VibrationThreadTest.java @@ -36,6 +36,7 @@ import android.hardware.vibrator.Braking; import android.hardware.vibrator.IVibrator; import android.hardware.vibrator.IVibratorManager; import android.os.CombinedVibration; +import android.os.Handler; import android.os.IBinder; import android.os.PowerManager; import android.os.Process; @@ -108,7 +109,9 @@ public class VibrationThreadTest { mTestLooper = new TestLooper(); Context context = InstrumentationRegistry.getContext(); - mEffectAdapter = new DeviceVibrationEffectAdapter(context); + VibrationSettings vibrationSettings = new VibrationSettings(context, + new Handler(mTestLooper.getLooper())); + mEffectAdapter = new DeviceVibrationEffectAdapter(vibrationSettings); mWakeLock = context.getSystemService( PowerManager.class).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*vibrator*"); diff --git a/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml b/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml index 799ec53a6e33..78afb7b72c04 100644 --- a/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml +++ b/services/tests/servicestests/test-apps/SimpleServiceTestApp/AndroidManifest.xml @@ -24,6 +24,9 @@ android:exported="true" /> <service android:name=".SimpleFgService" android:exported="true" /> + <service android:name=".SimpleIsolatedService" + android:isolatedProcess="true" + android:exported="true" /> </application> </manifest> diff --git a/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleIsolatedService.java b/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleIsolatedService.java new file mode 100644 index 000000000000..8b281c127bb1 --- /dev/null +++ b/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleIsolatedService.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.servicestests.apps.simpleservicetestapp; + +import android.app.Service; +import android.content.Intent; +import android.os.Binder; +import android.os.Bundle; +import android.os.IBinder; +import android.os.IRemoteCallback; +import android.os.Parcel; +import android.os.Process; +import android.os.RemoteException; +import android.util.Log; + +public class SimpleIsolatedService extends Service { + private static final String TAG = "SimpleIsolatedService"; + private static final String EXTRA_CALLBACK = "callback"; + + private final IRemoteCallback.Stub mBinder = new IRemoteCallback.Stub() { + @Override + public void sendResult(Bundle bundle) { + final IBinder callback = bundle.getBinder(EXTRA_CALLBACK); + final Parcel data = Parcel.obtain(); + final Parcel reply = Parcel.obtain(); + try { + data.writeInt(Process.myPid()); + callback.transact(Binder.FIRST_CALL_TRANSACTION, data, reply, 0); + } catch (RemoteException e) { + Log.e(TAG, "Exception", e); + } finally { + data.recycle(); + reply.recycle(); + } + } + }; + + @Override + public IBinder onBind(Intent intent) { + Log.i(TAG, "onBind"); + return mBinder; + } +} diff --git a/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleService.java b/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleService.java index 674ce8aade4c..4e981b22cd32 100644 --- a/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleService.java +++ b/services/tests/servicestests/test-apps/SimpleServiceTestApp/src/com/android/servicestests/apps/simpleservicetestapp/SimpleService.java @@ -16,29 +16,106 @@ package com.android.servicestests.apps.simpleservicetestapp; import android.app.Service; +import android.content.ComponentName; import android.content.Intent; +import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.Process; +import android.os.RemoteException; +import android.util.ArrayMap; import android.util.Log; public class SimpleService extends Service { private static final String TAG = "SimpleService"; + private static final String TEST_CLASS = + "com.android.servicestests.apps.simpleservicetestapp.SimpleService"; + + private static final String EXTRA_CALLBACK = "callback"; + private static final String EXTRA_COMMAND = "command"; + private static final String EXTRA_FLAGS = "flags"; + private static final String EXTRA_TARGET_PACKAGE = "target_package"; + + private static final int COMMAND_INVALID = 0; + private static final int COMMAND_EMPTY = 1; + private static final int COMMAND_BIND_SERVICE = 2; + private static final int COMMAND_UNBIND_SERVICE = 3; + private static final int COMMAND_STOP_SELF = 4; + + private ArrayMap<String, ServiceConnection> mServiceConnections = new ArrayMap<>(); + private final IRemoteCallback.Stub mBinder = new IRemoteCallback.Stub() { @Override public void sendResult(Bundle bundle) { - Process.killProcess(Process.myPid()); + if (bundle == null) { + Process.killProcess(Process.myPid()); + } else { + // No-op for now. + } } }; @Override public int onStartCommand(Intent intent, int flags, int startId) { Log.i(TAG, "onStartCommand"); + int command = intent.getIntExtra(EXTRA_COMMAND, COMMAND_INVALID); + if (command != COMMAND_INVALID) { + final String targetPkg = intent.getStringExtra(EXTRA_TARGET_PACKAGE); + Log.i(TAG, "Received command " + command + " targetPkg=" + targetPkg); + switch (command) { + case COMMAND_BIND_SERVICE: + final Bundle extras = intent.getExtras(); + bindToService(targetPkg, intent.getIntExtra(EXTRA_FLAGS, 0), + IRemoteCallback.Stub.asInterface(extras.getBinder(EXTRA_CALLBACK))); + break; + case COMMAND_UNBIND_SERVICE: + unbindService(targetPkg); + break; + case COMMAND_STOP_SELF: + stopSelf(); + return START_NOT_STICKY; + } + } return START_STICKY; } + private void bindToService(String targetPkg, int flags, IRemoteCallback callback) { + Intent intent = new Intent(); + intent.setClassName(targetPkg, TEST_CLASS); + final ServiceConnection conn = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + if (callback != null) { + try { + callback.sendResult(new Bundle()); + } catch (RemoteException e) { + } + } + } + + @Override + public void onServiceDisconnected(ComponentName name) { + } + }; + if (getApplicationContext().bindService(intent, conn, BIND_AUTO_CREATE | flags)) { + mServiceConnections.put(targetPkg, conn); + } else if (callback != null) { + try { + callback.sendResult(null); + } catch (RemoteException e) { + } + } + } + + private void unbindService(String targetPkg) { + final ServiceConnection conn = mServiceConnections.remove(targetPkg); + if (conn != null) { + getApplicationContext().unbindService(conn); + } + } + @Override public IBinder onBind(Intent intent) { return mBinder; 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 3c6f62a0a42d..f57c416e4a97 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -4855,6 +4855,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testAreBubblesEnabled() throws Exception { + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.NOTIFICATION_BUBBLES, 1); + mService.mPreferencesHelper.updateBubblesEnabled(); assertTrue(mBinderService.areBubblesEnabled(UserHandle.getUserHandleForUid(mUid))); } @@ -5907,7 +5910,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { service.migrateDefaultNASShowNotificationIfNecessary(); assertFalse(service.isNASMigrationDone(userId)); - verify(service, times(1)).createNASUpgradeNotification(eq(userId)); + //TODO(b/192450820) + //verify(service, times(1)).createNASUpgradeNotification(eq(userId)); verify(mAssistants, times(0)).resetDefaultFromConfig(); //Test user clear data before enable/disable from onboarding notification @@ -5926,7 +5930,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { //The notification should be still there assertFalse(service.isNASMigrationDone(userId)); - verify(service, times(2)).createNASUpgradeNotification(eq(userId)); + //TODO(b/192450820) + //verify(service, times(2)).createNASUpgradeNotification(eq(userId)); verify(mAssistants, times(0)).resetDefaultFromConfig(); assertEquals(oldDefaultComponent, service.getApprovedAssistant(userId)); } @@ -5962,7 +5967,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertFalse(service.isNASMigrationDone(userId1)); assertTrue(service.isNASMigrationDone(userId2)); - verify(service, times(1)).createNASUpgradeNotification(any(Integer.class)); + //TODO(b/192450820) + //verify(service, times(1)).createNASUpgradeNotification(any(Integer.class)); // only user2's default get updated verify(mAssistants, times(1)).resetDefaultFromConfig(); } @@ -5997,9 +6003,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertFalse(service.isNASMigrationDone(userId1)); assertFalse(service.isNASMigrationDone(userId2)); - // only user1 get notification - verify(service, times(1)).createNASUpgradeNotification(eq(userId1)); - verify(service, times(0)).createNASUpgradeNotification(eq(userId2)); + // TODO(b/192450820): only user1 get notification + //verify(service, times(1)).createNASUpgradeNotification(eq(userId1)); + //verify(service, times(0)).createNASUpgradeNotification(eq(userId2)); } @@ -6029,8 +6035,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { //Test migrate flow again service.migrateDefaultNASShowNotificationIfNecessary(); - //The notification should not appear again - verify(service, times(0)).createNASUpgradeNotification(eq(userId)); + //TODO(b/192450820): The notification should not appear again + //verify(service, times(0)).createNASUpgradeNotification(eq(userId)); verify(mAssistants, times(0)).resetDefaultFromConfig(); } @@ -6055,9 +6061,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(mAssistants, times(1)).clearDefaults(); verify(mAssistants, times(0)).resetDefaultFromConfig(); - //No more notification after disabled - service.migrateDefaultNASShowNotificationIfNecessary(); - verify(service, times(0)).createNASUpgradeNotification(anyInt()); + //TODO(b/192450820):No more notification after disabled + //service.migrateDefaultNASShowNotificationIfNecessary(); + //verify(service, times(0)).createNASUpgradeNotification(anyInt()); } @Test @@ -6077,8 +6083,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { assertFalse(service.isNASMigrationDone(userId2)); verify(mAssistants, times(1)).resetDefaultFromConfig(); - service.migrateDefaultNASShowNotificationIfNecessary(); - verify(service, times(0)).createNASUpgradeNotification(eq(userId1)); + //TODO(b/192450820) + //service.migrateDefaultNASShowNotificationIfNecessary(); + //verify(service, times(0)).createNASUpgradeNotification(eq(userId1)); } @Test @@ -6093,7 +6100,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { verify(mContext, times(1)).startActivity(any(Intent.class)); assertFalse(service.isNASMigrationDone(userId)); - verify(service, times(0)).createNASUpgradeNotification(eq(userId)); + //TODO(b/192450820) + //verify(service, times(0)).createNASUpgradeNotification(eq(userId)); verify(mAssistants, times(0)).resetDefaultFromConfig(); } 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 57cf865268ef..c555612fef23 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -78,6 +78,24 @@ public class AppTransitionControllerTest extends WindowTestsBase { } @Test + public void testSkipOccludedActivityCloseTransition() { + final ActivityRecord behind = createActivityRecord(mDisplayContent, + WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); + final ActivityRecord topOpening = createActivityRecord(behind.getTask()); + topOpening.setOccludesParent(true); + topOpening.setVisible(true); + + mDisplayContent.prepareAppTransition(TRANSIT_OPEN); + mDisplayContent.prepareAppTransition(TRANSIT_CLOSE); + mDisplayContent.mClosingApps.add(behind); + + assertEquals(WindowManager.TRANSIT_OLD_UNSET, + AppTransitionController.getTransitCompatType(mDisplayContent.mAppTransition, + mDisplayContent.mOpeningApps, mDisplayContent.mClosingApps, + null, null, false)); + } + + @Test @FlakyTest(bugId = 131005232) public void testTranslucentOpen() { final ActivityRecord behind = createActivityRecord(mDisplayContent, 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 5bc4c82f8d43..d498d4663d78 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -100,7 +100,6 @@ import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; -import android.annotation.SuppressLint; import android.app.ActivityTaskManager; import android.app.WindowConfiguration; import android.app.servertransaction.FixedRotationAdjustmentsItem; @@ -792,15 +791,9 @@ public class DisplayContentTests extends WindowTestsBase { } @Test - @SuppressLint("InlinedApi") public void testOrientationDefinedByKeyguard() { - final DisplayContent dc = createNewDisplay(); - - // When display content is created its configuration is not yet initialized, which could - // cause unnecessary configuration propagation, so initialize it here. - final Configuration config = new Configuration(); - dc.computeScreenConfiguration(config); - dc.onRequestedOverrideConfigurationChanged(config); + final DisplayContent dc = mDisplayContent; + dc.getDisplayPolicy().setAwake(true); // Create a window that requests landscape orientation. It will define device orientation // by default. @@ -815,10 +808,12 @@ public class DisplayContentTests extends WindowTestsBase { SCREEN_ORIENTATION_LANDSCAPE, dc.getOrientation()); keyguard.mAttrs.screenOrientation = SCREEN_ORIENTATION_PORTRAIT; + mAtm.mKeyguardController.setKeyguardShown(true /* keyguardShowing */, + false /* aodShowing */); assertEquals("Visible keyguard must influence device orientation", SCREEN_ORIENTATION_PORTRAIT, dc.getOrientation()); - mWm.setKeyguardGoingAway(true); + mAtm.mKeyguardController.keyguardGoingAway(0 /* flags */); assertEquals("Keyguard that is going away must not influence device orientation", SCREEN_ORIENTATION_LANDSCAPE, dc.getOrientation()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java index 8981ab1a0e8a..223dc3121cd6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java @@ -22,6 +22,7 @@ import static android.content.ClipDescription.MIMETYPE_APPLICATION_SHORTCUT; import static android.content.ClipDescription.MIMETYPE_APPLICATION_TASK; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.view.DragEvent.ACTION_DRAG_STARTED; +import static android.view.DragEvent.ACTION_DROP; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; @@ -31,7 +32,9 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.eq; @@ -267,12 +270,32 @@ public class DragDropControllerTests extends WindowTestsBase { assertTrue(globalInterceptWindowDragEvents.get(0).getAction() == ACTION_DRAG_STARTED); + // Verify that only the global intercept window receives the clip data with the + // resolved activity info for the drag + assertNull(localWindowDragEvents.get(0).getClipData()); + assertTrue(globalInterceptWindowDragEvents.get(0).getClipData() + .willParcelWithActivityInfo()); + mTarget.reportDropWindow(globalInterceptWindow.mInputChannelToken, 0, 0); mTarget.handleMotionEvent(false, 0, 0); mToken = globalInterceptWindow.mClient.asBinder(); + + // Verify the drop event is only sent for the global intercept window + assertTrue(nonLocalWindowDragEvents.isEmpty()); + assertTrue(last(localWindowDragEvents).getAction() != ACTION_DROP); + assertTrue(last(globalInterceptWindowDragEvents).getAction() == ACTION_DROP); + + // Verify that item extras were not sent with the drop event + assertNull(last(localWindowDragEvents).getClipData()); + assertFalse(last(globalInterceptWindowDragEvents).getClipData() + .willParcelWithActivityInfo()); }); } + private DragEvent last(ArrayList<DragEvent> list) { + return list.get(list.size() - 1); + } + @Test public void testValidateAppActivityArguments() { final Session session = new Session(mWm, new IWindowSessionCallback.Stub() { diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java index 03944172db7c..a034ac267287 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java @@ -683,12 +683,12 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Test public void testCancelForStartHome() throws Exception { mWm.setRecentsAnimationController(mController); + final ActivityRecord homeActivity = createHomeActivity(); final ActivityRecord activity = createActivityRecord(mDefaultDisplay); final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1"); activity.addWindow(win1); - RecentsAnimationController.TaskAnimationAdapter adapter = mController.addAnimation( - activity.getTask(), false /* isRecentTaskInvisible */); + initializeRecentsAnimationController(mController, homeActivity); mController.setWillFinishToHome(true); // Verify cancel is called with a snapshot and that we've created an overlay diff --git a/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java index 20b987de9aa1..b41872bfa45f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java @@ -24,9 +24,11 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.os.Parcel; import android.platform.test.annotations.Presubmit; import android.view.Display.Mode; import android.view.DisplayInfo; +import android.view.WindowManager.LayoutParams; import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; @@ -50,6 +52,16 @@ public class RefreshRatePolicyTest extends WindowTestsBase { private RefreshRatePolicy mPolicy; private HighRefreshRateDenylist mDenylist = mock(HighRefreshRateDenylist.class); + // Parcel and Unparcel the LayoutParams in the window state to test the path the object + // travels from the app's process to system server + void parcelLayoutParams(WindowState window) { + Parcel parcel = Parcel.obtain(); + window.mAttrs.writeToParcel(parcel, 0); + parcel.setDataPosition(0); + window.mAttrs.copyFrom(new LayoutParams(parcel)); + parcel.recycle(); + } + @Before public void setUp() { DisplayInfo di = new DisplayInfo(mDisplayInfo); @@ -69,12 +81,15 @@ public class RefreshRatePolicyTest extends WindowTestsBase { final WindowState cameraUsingWindow = createWindow(null, TYPE_BASE_APPLICATION, "cameraUsingWindow"); cameraUsingWindow.mAttrs.packageName = "com.android.test"; + parcelLayoutParams(cameraUsingWindow); assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); assertEquals(0, mPolicy.getPreferredMaxRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); mPolicy.addNonHighRefreshRatePackage("com.android.test"); assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); assertEquals(60, mPolicy.getPreferredMaxRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); mPolicy.removeNonHighRefreshRatePackage("com.android.test"); assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow)); @@ -86,6 +101,7 @@ public class RefreshRatePolicyTest extends WindowTestsBase { final WindowState denylistedWindow = createWindow(null, TYPE_BASE_APPLICATION, "denylistedWindow"); denylistedWindow.mAttrs.packageName = "com.android.test"; + parcelLayoutParams(denylistedWindow); when(mDenylist.isDenylisted("com.android.test")).thenReturn(true); assertEquals(0, mPolicy.getPreferredModeId(denylistedWindow)); assertEquals(60, mPolicy.getPreferredRefreshRate(denylistedWindow), FLOAT_TOLERANCE); @@ -97,6 +113,7 @@ public class RefreshRatePolicyTest extends WindowTestsBase { "overrideWindow"); overrideWindow.mAttrs.packageName = "com.android.test"; overrideWindow.mAttrs.preferredDisplayModeId = LOW_MODE_ID; + parcelLayoutParams(overrideWindow); when(mDenylist.isDenylisted("com.android.test")).thenReturn(true); assertEquals(LOW_MODE_ID, mPolicy.getPreferredModeId(overrideWindow)); assertEquals(60, mPolicy.getPreferredRefreshRate(overrideWindow), FLOAT_TOLERANCE); @@ -108,9 +125,11 @@ public class RefreshRatePolicyTest extends WindowTestsBase { "overrideWindow"); overrideWindow.mAttrs.packageName = "com.android.test"; overrideWindow.mAttrs.preferredDisplayModeId = LOW_MODE_ID; + parcelLayoutParams(overrideWindow); mPolicy.addNonHighRefreshRatePackage("com.android.test"); assertEquals(LOW_MODE_ID, mPolicy.getPreferredModeId(overrideWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(overrideWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(overrideWindow), FLOAT_TOLERANCE); assertEquals(0, mPolicy.getPreferredMaxRefreshRate(overrideWindow), FLOAT_TOLERANCE); } @@ -120,12 +139,14 @@ public class RefreshRatePolicyTest extends WindowTestsBase { "overrideWindow"); overrideWindow.mAttrs.packageName = "com.android.test"; overrideWindow.mAttrs.preferredDisplayModeId = LOW_MODE_ID; + parcelLayoutParams(overrideWindow); overrideWindow.mActivityRecord.mSurfaceAnimator.startAnimation( overrideWindow.getPendingTransaction(), mock(AnimationAdapter.class), false /* hidden */, ANIMATION_TYPE_APP_TRANSITION); mPolicy.addNonHighRefreshRatePackage("com.android.test"); assertEquals(0, mPolicy.getPreferredModeId(overrideWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(overrideWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(overrideWindow), FLOAT_TOLERANCE); assertEquals(0, mPolicy.getPreferredMaxRefreshRate(overrideWindow), FLOAT_TOLERANCE); } @@ -134,10 +155,12 @@ public class RefreshRatePolicyTest extends WindowTestsBase { final WindowState cameraUsingWindow = createWindow(null, TYPE_BASE_APPLICATION, "cameraUsingWindow"); cameraUsingWindow.mAttrs.packageName = "com.android.test"; + parcelLayoutParams(cameraUsingWindow); mPolicy.addNonHighRefreshRatePackage("com.android.test"); assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); assertEquals(60, mPolicy.getPreferredMaxRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); cameraUsingWindow.mActivityRecord.mSurfaceAnimator.startAnimation( @@ -145,6 +168,7 @@ public class RefreshRatePolicyTest extends WindowTestsBase { false /* hidden */, ANIMATION_TYPE_APP_TRANSITION); assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow)); assertEquals(0, mPolicy.getPreferredRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); assertEquals(0, mPolicy.getPreferredMaxRefreshRate(cameraUsingWindow), FLOAT_TOLERANCE); } @@ -152,8 +176,10 @@ public class RefreshRatePolicyTest extends WindowTestsBase { public void testAppMaxRefreshRate() { final WindowState window = createWindow(null, TYPE_BASE_APPLICATION, "window"); window.mAttrs.preferredMaxDisplayRefreshRate = 60f; + parcelLayoutParams(window); assertEquals(0, mPolicy.getPreferredModeId(window)); assertEquals(0, mPolicy.getPreferredRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(window), FLOAT_TOLERANCE); assertEquals(60, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE); window.mActivityRecord.mSurfaceAnimator.startAnimation( @@ -161,6 +187,36 @@ public class RefreshRatePolicyTest extends WindowTestsBase { false /* hidden */, ANIMATION_TYPE_APP_TRANSITION); assertEquals(0, mPolicy.getPreferredModeId(window)); assertEquals(0, mPolicy.getPreferredRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE); + } + + @Test + public void testAppMinRefreshRate() { + final WindowState window = createWindow(null, TYPE_BASE_APPLICATION, "window"); + window.mAttrs.preferredMinDisplayRefreshRate = 60f; + parcelLayoutParams(window); + assertEquals(0, mPolicy.getPreferredModeId(window)); + assertEquals(0, mPolicy.getPreferredRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(60, mPolicy.getPreferredMinRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE); + + window.mActivityRecord.mSurfaceAnimator.startAnimation( + window.getPendingTransaction(), mock(AnimationAdapter.class), + false /* hidden */, ANIMATION_TYPE_APP_TRANSITION); + assertEquals(0, mPolicy.getPreferredModeId(window)); + assertEquals(0, mPolicy.getPreferredRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE); + } + + @Test + public void testAppPreferredRefreshRate() { + final WindowState window = createWindow(null, TYPE_BASE_APPLICATION, "window"); + window.mAttrs.preferredRefreshRate = 60f; + parcelLayoutParams(window); + assertEquals(0, mPolicy.getPreferredModeId(window)); + assertEquals(60, mPolicy.getPreferredRefreshRate(window), FLOAT_TOLERANCE); + assertEquals(0, mPolicy.getPreferredMinRefreshRate(window), FLOAT_TOLERANCE); assertEquals(0, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java b/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java new file mode 100644 index 000000000000..3714d9984a0c --- /dev/null +++ b/services/tests/wmtests/src/com/android/server/wm/SplashScreenExceptionListTest.java @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.wm; + +import static android.os.Build.VERSION_CODES; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import android.content.pm.ApplicationInfo; +import android.os.Bundle; +import android.os.Handler; +import android.os.HandlerExecutor; +import android.os.Looper; +import android.platform.test.annotations.Presubmit; +import android.provider.DeviceConfig; + +import androidx.test.filters.MediumTest; + +import junit.framework.Assert; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +/** + * Test for the splash screen exception list + * atest WmTests:SplashScreenExceptionListTest + */ +@MediumTest +@Presubmit +public class SplashScreenExceptionListTest { + + // Constant copied on purpose so it's not refactored by accident. + // If the key needs to be modified, the server side key also needs to be changed. + private static final String KEY_SPLASH_SCREEN_EXCEPTION_LIST = "splash_screen_exception_list"; + + private DeviceConfig.Properties mInitialWindowManagerProperties; + private final HandlerExecutor mExecutor = new HandlerExecutor( + new Handler(Looper.getMainLooper())); + private final SplashScreenExceptionList mList = new SplashScreenExceptionList(mExecutor); + + @Before + public void setUp() throws Exception { + mInitialWindowManagerProperties = DeviceConfig.getProperties( + DeviceConfig.NAMESPACE_WINDOW_MANAGER); + clearConstrainDisplayApisFlags(); + } + + private void clearConstrainDisplayApisFlags() { + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + KEY_SPLASH_SCREEN_EXCEPTION_LIST, + null, /* makeDefault= */ false); + } + + @After + public void tearDown() throws Exception { + DeviceConfig.setProperties(mInitialWindowManagerProperties); + DeviceConfig.removeOnPropertiesChangedListener(mList.mOnPropertiesChangedListener); + } + + @Test + public void packageFromDeviceConfigIgnored() { + setExceptionListAndWaitForCallback("com.test.nosplashscreen1,com.test.nosplashscreen2"); + + assertIsException("com.test.nosplashscreen1", null); + assertIsException("com.test.nosplashscreen2", null); + + assertIsNotException("com.test.nosplashscreen1", VERSION_CODES.S, null); + assertIsNotException("com.test.nosplashscreen2", VERSION_CODES.S, null); + assertIsNotException("com.test.splashscreen", VERSION_CODES.S, null); + assertIsNotException("com.test.splashscreen", VERSION_CODES.R, null); + } + + private void setExceptionListAndWaitForCallback(String commaSeparatedList) { + CountDownLatch latch = new CountDownLatch(1); + DeviceConfig.OnPropertiesChangedListener onPropertiesChangedListener = (p) -> { + if (commaSeparatedList.equals(p.getString(KEY_SPLASH_SCREEN_EXCEPTION_LIST, null))) { + latch.countDown(); + } + }; + DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + mExecutor, onPropertiesChangedListener); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + KEY_SPLASH_SCREEN_EXCEPTION_LIST, commaSeparatedList, false); + try { + assertTrue("Timed out waiting for DeviceConfig to be updated.", + latch.await(1, TimeUnit.SECONDS)); + } catch (InterruptedException e) { + Assert.fail(e.getMessage()); + } finally { + DeviceConfig.removeOnPropertiesChangedListener(onPropertiesChangedListener); + } + } + + @Test + public void metaDataOptOut() { + String packageName = "com.test.nosplashscreen_opt_out"; + setExceptionListAndWaitForCallback(packageName); + + Bundle metaData = new Bundle(); + ApplicationInfo activityInfo = new ApplicationInfo(); + activityInfo.metaData = metaData; + + // No Exceptions + metaData.putBoolean("android.splashscreen.exception_opt_out", true); + assertIsNotException(packageName, VERSION_CODES.R, activityInfo); + assertIsNotException(packageName, VERSION_CODES.S, activityInfo); + + // Exception Pre S + metaData.putBoolean("android.splashscreen.exception_opt_out", false); + assertIsException(packageName, activityInfo); + assertIsNotException(packageName, VERSION_CODES.S, activityInfo); + + // Edge Cases + activityInfo.metaData = null; + assertIsException(packageName, activityInfo); + assertIsException(packageName, null); + } + + private void assertIsNotException(String packageName, int targetSdk, + ApplicationInfo activityInfo) { + assertFalse(String.format("%s (sdk=%d) should have not been considered as an exception", + packageName, targetSdk), + mList.isException(packageName, targetSdk, () -> activityInfo)); + } + + private void assertIsException(String packageName, + ApplicationInfo activityInfo) { + assertTrue(String.format("%s (sdk=%d) should have been considered as an exception", + packageName, VERSION_CODES.R), + mList.isException(packageName, VERSION_CODES.R, () -> activityInfo)); + } +} diff --git a/services/translation/java/com/android/server/translation/TranslationManagerService.java b/services/translation/java/com/android/server/translation/TranslationManagerService.java index 41ee6b5d2ea0..27b254a304ff 100644 --- a/services/translation/java/com/android/server/translation/TranslationManagerService.java +++ b/services/translation/java/com/android/server/translation/TranslationManagerService.java @@ -246,6 +246,16 @@ public final class TranslationManagerService } @Override + public void onTranslationFinished(boolean activityDestroyed, IBinder token, + ComponentName componentName, int userId) { + TranslationManagerServiceImpl service; + synchronized (mLock) { + service = getServiceForUserLocked(userId); + service.onTranslationFinishedLocked(activityDestroyed, token, componentName); + } + } + + @Override public void getServiceSettingsActivity(IResultReceiver result, int userId) { final TranslationManagerServiceImpl service; synchronized (mLock) { diff --git a/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java b/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java index 6606fb0f482c..9f4fee8b00ab 100644 --- a/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java +++ b/services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java @@ -20,10 +20,12 @@ import static android.view.translation.TranslationManager.EXTRA_CAPABILITIES; import static android.view.translation.UiTranslationManager.EXTRA_SOURCE_LOCALE; import static android.view.translation.UiTranslationManager.EXTRA_STATE; import static android.view.translation.UiTranslationManager.EXTRA_TARGET_LOCALE; +import static android.view.translation.UiTranslationManager.STATE_UI_TRANSLATION_FINISHED; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ComponentName; +import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.os.Bundle; @@ -33,6 +35,7 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.ResultReceiver; import android.service.translation.TranslationServiceInfo; +import android.util.ArraySet; import android.util.Slog; import android.view.autofill.AutofillId; import android.view.inputmethod.InputMethodInfo; @@ -83,6 +86,7 @@ final class TranslationManagerServiceImpl extends new TranslationServiceRemoteCallback(); private final RemoteCallbackList<IRemoteCallback> mTranslationCapabilityCallbacks = new RemoteCallbackList<>(); + private final ArraySet<IBinder> mWaitingFinishedCallbackActivities = new ArraySet(); protected TranslationManagerServiceImpl( @NonNull TranslationManagerService master, @@ -169,6 +173,41 @@ final class TranslationManagerServiceImpl extends } } + private int getActivityUidByComponentName(Context context, ComponentName componentName, + int userId) { + int translationActivityUid = -1; + try { + if (componentName != null) { + translationActivityUid = context.getPackageManager().getApplicationInfoAsUser( + componentName.getPackageName(), 0, userId).uid; + } + } catch (PackageManager.NameNotFoundException e) { + Slog.d(TAG, "Cannot find packageManager for" + componentName); + } + return translationActivityUid; + } + + @GuardedBy("mLock") + public void onTranslationFinishedLocked(boolean activityDestroyed, IBinder token, + ComponentName componentName) { + int translationActivityUid = + getActivityUidByComponentName(getContext(), componentName, getUserId()); + if (activityDestroyed) { + // In the Activity destroy case, we only calls onTranslationFinished() in + // non-finisTranslation() state. If there is a finisTranslation() calls by apps, we + // should remove the waiting callback to avoid callback twice. + invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, /* sourceSpec= */ + null, /* targetSpec= */null, translationActivityUid); + mWaitingFinishedCallbackActivities.remove(token); + } else { + if (mWaitingFinishedCallbackActivities.contains(token)) { + invokeCallbacks(STATE_UI_TRANSLATION_FINISHED, /* sourceSpec= */ + null, /* targetSpec= */null, translationActivityUid); + mWaitingFinishedCallbackActivities.remove(token); + } + } + } + @GuardedBy("mLock") public void updateUiTranslationStateLocked(@UiTranslationState int state, TranslationSpec sourceSpec, TranslationSpec targetSpec, List<AutofillId> viewIds, @@ -178,10 +217,13 @@ final class TranslationManagerServiceImpl extends mActivityTaskManagerInternal.getTopActivityForTask(taskId); if (taskTopActivityTokens == null || taskTopActivityTokens.getShareableActivityToken() != token) { - Slog.w(TAG, "Unknown activity or it was finished to query for update " - + "translation state for token=" + token + " taskId=" + taskId); + Slog.w(TAG, "Unknown activity or it was finished to query for update translation " + + "state for token=" + token + " taskId=" + taskId + " for state= " + state); return; } + if (state == STATE_UI_TRANSLATION_FINISHED) { + mWaitingFinishedCallbackActivities.add(token); + } int translationActivityUid = -1; try { IBinder activityToken = taskTopActivityTokens.getActivityToken(); @@ -191,19 +233,14 @@ final class TranslationManagerServiceImpl extends mLastActivityTokens = new WeakReference<>(taskTopActivityTokens); ComponentName componentName = mActivityTaskManagerInternal.getActivityName(activityToken); - try { - if (componentName != null) { - translationActivityUid = - getContext().getPackageManager().getApplicationInfoAsUser( - componentName.getPackageName(), 0, getUserId()).uid; - } - } catch (PackageManager.NameNotFoundException e) { - Slog.d(TAG, "Cannot find package for" + componentName); - } + translationActivityUid = + getActivityUidByComponentName(getContext(), componentName, getUserId()); } catch (RemoteException e) { Slog.w(TAG, "Update UiTranslationState fail: " + e); } - invokeCallbacks(state, sourceSpec, targetSpec, translationActivityUid); + if (state != STATE_UI_TRANSLATION_FINISHED) { + invokeCallbacks(state, sourceSpec, targetSpec, translationActivityUid); + } } @GuardedBy("mLock") @@ -226,6 +263,14 @@ final class TranslationManagerServiceImpl extends } else { pw.print(prefix); pw.println("No requested UiTranslation Activity."); } + final int waitingFinishCallbackSize = mWaitingFinishedCallbackActivities.size(); + if (waitingFinishCallbackSize > 0) { + pw.print(prefix); pw.print("number waiting finish callback activities: "); + pw.println(waitingFinishCallbackSize); + for (IBinder activityToken : mWaitingFinishedCallbackActivities) { + pw.print(prefix); pw.print("activityToken: "); pw.println(activityToken); + } + } } private void invokeCallbacks( @@ -243,7 +288,6 @@ final class TranslationManagerServiceImpl extends LocalServices.getService(InputMethodManagerInternal.class) .getEnabledInputMethodListAsUser(mUserId); mCallbacks.broadcast((callback, uid) -> { - // callback to the application that is translated if registered. if ((int) uid == translationActivityUid) { try { callback.sendResult(res); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index beaca68b9a37..8ba41f35648e 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -79,7 +79,7 @@ import java.util.function.Function; final class HotwordDetectionConnection { private static final String TAG = "HotwordDetectionConnection"; // TODO (b/177502877): Set the Debug flag to false before shipping. - private static final boolean DEBUG = true; + static final boolean DEBUG = true; // TODO: These constants need to be refined. private static final long VALIDATION_TIMEOUT_MILLIS = 3000; @@ -283,6 +283,10 @@ final class HotwordDetectionConnection { if (mPerformingSoftwareHotwordDetection) { mSoftwareCallback.onDetected(result, null, null); mPerformingSoftwareHotwordDetection = false; + if (result != null) { + Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + + " bits from hotword trusted process"); + } } else { Slog.i(TAG, "Hotword detection has already completed"); } @@ -372,6 +376,10 @@ final class HotwordDetectionConnection { if (mValidatingDspTrigger) { mValidatingDspTrigger = false; externalCallback.onKeyphraseDetected(recognitionEvent, result); + if (result != null) { + Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + + " bits from hotword trusted process"); + } } else { Slog.i(TAG, "Ignored hotword detected since trigger has been handled"); } @@ -425,6 +433,10 @@ final class HotwordDetectionConnection { } mValidatingDspTrigger = false; externalCallback.onKeyphraseDetected(recognitionEvent, result); + if (result != null) { + Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + + " bits from hotword trusted process"); + } } } @@ -654,6 +666,10 @@ final class HotwordDetectionConnection { // TODO: noteOp here. callback.onDetected(triggerResult, null /* audioFormat */, null /* audioStream */); + if (triggerResult != null) { + Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize( + triggerResult) + " bits from hotword trusted process"); + } // TODO: Add a delay before closing. bestEffortClose(audioSource); } diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionBinderProxy.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionBinderProxy.java new file mode 100644 index 000000000000..dd9fee3887cb --- /dev/null +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionBinderProxy.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.voiceinteraction; + +import android.hardware.soundtrigger.SoundTrigger; +import android.os.RemoteException; + +import com.android.internal.app.IHotwordRecognitionStatusCallback; +import com.android.internal.app.IVoiceInteractionSoundTriggerSession; + +/** + * A remote object that simply proxies calls to a real {@link IVoiceInteractionSoundTriggerSession} + * implementation. This design pattern allows us to add decorators to the core implementation + * (simply wrapping a binder object does not work). + */ +final class SoundTriggerSessionBinderProxy extends IVoiceInteractionSoundTriggerSession.Stub { + + private final IVoiceInteractionSoundTriggerSession mDelegate; + + SoundTriggerSessionBinderProxy(IVoiceInteractionSoundTriggerSession delegate) { + mDelegate = delegate; + } + + @Override + public SoundTrigger.ModuleProperties getDspModuleProperties() throws RemoteException { + return mDelegate.getDspModuleProperties(); + } + + @Override + public int startRecognition(int i, String s, + IHotwordRecognitionStatusCallback iHotwordRecognitionStatusCallback, + SoundTrigger.RecognitionConfig recognitionConfig, boolean b) throws RemoteException { + return mDelegate.startRecognition(i, s, iHotwordRecognitionStatusCallback, + recognitionConfig, b); + } + + @Override + public int stopRecognition(int i, + IHotwordRecognitionStatusCallback iHotwordRecognitionStatusCallback) + throws RemoteException { + return mDelegate.stopRecognition(i, iHotwordRecognitionStatusCallback); + } + + @Override + public int setParameter(int i, int i1, int i2) throws RemoteException { + return mDelegate.setParameter(i, i1, i2); + } + + @Override + public int getParameter(int i, int i1) throws RemoteException { + return mDelegate.getParameter(i, i1); + } + + @Override + public SoundTrigger.ModelParamRange queryParameter(int i, int i1) throws RemoteException { + return mDelegate.queryParameter(i, i1); + } +} diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionPermissionsDecorator.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionPermissionsDecorator.java new file mode 100644 index 000000000000..bb7ca168fcaa --- /dev/null +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerSessionPermissionsDecorator.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.voiceinteraction; + +import static android.Manifest.permission.CAPTURE_AUDIO_HOTWORD; +import static android.Manifest.permission.RECORD_AUDIO; + +import static com.android.server.voiceinteraction.HotwordDetectionConnection.DEBUG; + +import android.annotation.NonNull; +import android.content.Context; +import android.content.PermissionChecker; +import android.hardware.soundtrigger.SoundTrigger; +import android.media.permission.Identity; +import android.media.permission.PermissionUtil; +import android.os.IBinder; +import android.os.RemoteException; +import android.os.ServiceSpecificException; +import android.text.TextUtils; +import android.util.Slog; + +import com.android.internal.app.IHotwordRecognitionStatusCallback; +import com.android.internal.app.IVoiceInteractionSoundTriggerSession; + +/** + * Decorates {@link IVoiceInteractionSoundTriggerSession} with permission checks for {@link + * android.Manifest.permission#RECORD_AUDIO} and + * {@link android.Manifest.permission#CAPTURE_AUDIO_HOTWORD}. + * <p> + * Does not implement {@link #asBinder()} as it's intended to be wrapped by an + * {@link IVoiceInteractionSoundTriggerSession.Stub} object. + */ +final class SoundTriggerSessionPermissionsDecorator implements + IVoiceInteractionSoundTriggerSession { + static final String TAG = "SoundTriggerSessionPermissionsDecorator"; + + private final IVoiceInteractionSoundTriggerSession mDelegate; + private final Context mContext; + private final Identity mOriginatorIdentity; + + SoundTriggerSessionPermissionsDecorator(IVoiceInteractionSoundTriggerSession delegate, + Context context, Identity originatorIdentity) { + mDelegate = delegate; + mContext = context; + mOriginatorIdentity = originatorIdentity; + } + + @Override + public SoundTrigger.ModuleProperties getDspModuleProperties() throws RemoteException { + // No permission needed. + return mDelegate.getDspModuleProperties(); + } + + @Override + public int startRecognition(int i, String s, + IHotwordRecognitionStatusCallback iHotwordRecognitionStatusCallback, + SoundTrigger.RecognitionConfig recognitionConfig, boolean b) throws RemoteException { + if (DEBUG) { + Slog.d(TAG, "startRecognition"); + } + enforcePermissions(); + return mDelegate.startRecognition(i, s, iHotwordRecognitionStatusCallback, + recognitionConfig, b); + } + + @Override + public int stopRecognition(int i, + IHotwordRecognitionStatusCallback iHotwordRecognitionStatusCallback) + throws RemoteException { + enforcePermissions(); + return mDelegate.stopRecognition(i, iHotwordRecognitionStatusCallback); + } + + @Override + public int setParameter(int i, int i1, int i2) throws RemoteException { + enforcePermissions(); + return mDelegate.setParameter(i, i1, i2); + } + + @Override + public int getParameter(int i, int i1) throws RemoteException { + enforcePermissions(); + return mDelegate.getParameter(i, i1); + } + + @Override + public SoundTrigger.ModelParamRange queryParameter(int i, int i1) throws RemoteException { + enforcePermissions(); + return mDelegate.queryParameter(i, i1); + } + + @Override + public IBinder asBinder() { + throw new UnsupportedOperationException( + "This object isn't intended to be used as a Binder."); + } + + // TODO: Share this code with SoundTriggerMiddlewarePermission. + private void enforcePermissions() { + enforcePermissionForPreflight(mContext, mOriginatorIdentity, RECORD_AUDIO); + enforcePermissionForPreflight(mContext, mOriginatorIdentity, CAPTURE_AUDIO_HOTWORD); + } + + /** + * Throws a {@link SecurityException} if originator permanently doesn't have the given + * permission, or a {@link ServiceSpecificException} with a {@link + * #TEMPORARY_PERMISSION_DENIED} if caller originator doesn't have the given permission. + * + * @param context A {@link Context}, used for permission checks. + * @param identity The identity to check. + * @param permission The identifier of the permission we want to check. + */ + private static void enforcePermissionForPreflight(@NonNull Context context, + @NonNull Identity identity, @NonNull String permission) { + final int status = PermissionUtil.checkPermissionForPreflight(context, identity, + permission); + switch (status) { + case PermissionChecker.PERMISSION_GRANTED: + return; + case PermissionChecker.PERMISSION_HARD_DENIED: + throw new SecurityException( + TextUtils.formatSimple("Failed to obtain permission %s for identity %s", + permission, toString(identity))); + case PermissionChecker.PERMISSION_SOFT_DENIED: + throw new ServiceSpecificException(TEMPORARY_PERMISSION_DENIED, + TextUtils.formatSimple("Failed to obtain permission %s for identity %s", + permission, toString(identity))); + default: + throw new RuntimeException("Unexpected permission check result."); + } + } + + private static String toString(Identity identity) { + return "{uid=" + identity.uid + + " pid=" + identity.pid + + " packageName=" + identity.packageName + + " attributionTag=" + identity.attributionTag + + "}"; + } + + // Temporary hack for using the same status code as SoundTrigger, so we don't change behavior. + // TODO: Reuse SoundTrigger code so we don't need to do this. + private static final int TEMPORARY_PERMISSION_DENIED = 3; +} diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 162acba8002d..91d17f74c676 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.ActivityManagerInternal; +import android.app.ActivityThread; import android.app.AppGlobals; import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; @@ -50,6 +51,7 @@ import android.hardware.soundtrigger.SoundTrigger.ModuleProperties; import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; import android.media.AudioFormat; import android.media.permission.Identity; +import android.media.permission.IdentityContext; import android.media.permission.PermissionUtil; import android.media.permission.SafeCloseable; import android.os.Binder; @@ -59,6 +61,7 @@ import android.os.IBinder; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PersistableBundle; +import android.os.Process; import android.os.RemoteCallback; import android.os.RemoteCallbackList; import android.os.RemoteException; @@ -104,11 +107,8 @@ import com.android.server.wm.ActivityTaskManagerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Objects; import java.util.concurrent.Executor; @@ -288,7 +288,6 @@ public class VoiceInteractionManagerService extends SystemService { private boolean mTemporarilyDisabled; private final boolean mEnableService; - private final List<WeakReference<SoundTriggerSession>> mSessions = new LinkedList<>(); VoiceInteractionManagerServiceStub() { mEnableService = shouldEnableService(mContext); @@ -299,15 +298,49 @@ public class VoiceInteractionManagerService extends SystemService { public @NonNull IVoiceInteractionSoundTriggerSession createSoundTriggerSessionAsOriginator( @NonNull Identity originatorIdentity, IBinder client) { Objects.requireNonNull(originatorIdentity); - try (SafeCloseable ignored = PermissionUtil.establishIdentityDirect( - originatorIdentity)) { - SoundTriggerSession session = new SoundTriggerSession( - mSoundTriggerInternal.attach(client)); - synchronized (mSessions) { - mSessions.add(new WeakReference<>(session)); + boolean forHotwordDetectionService; + synchronized (VoiceInteractionManagerServiceStub.this) { + enforceIsCurrentVoiceInteractionService(); + forHotwordDetectionService = + mImpl != null && mImpl.mHotwordDetectionConnection != null; + } + IVoiceInteractionSoundTriggerSession session; + if (forHotwordDetectionService) { + // Use our own identity and handle the permission checks ourselves. This allows + // properly checking/noting against the voice interactor or hotword detection + // service as needed. + if (HotwordDetectionConnection.DEBUG) { + Slog.d(TAG, "Creating a SoundTriggerSession for a HotwordDetectionService"); + } + originatorIdentity.uid = Binder.getCallingUid(); + originatorIdentity.pid = Binder.getCallingPid(); + session = new SoundTriggerSessionPermissionsDecorator( + createSoundTriggerSessionForSelfIdentity(client), + mContext, + originatorIdentity); + } else { + if (HotwordDetectionConnection.DEBUG) { + Slog.d(TAG, "Creating a SoundTriggerSession"); + } + try (SafeCloseable ignored = PermissionUtil.establishIdentityDirect( + originatorIdentity)) { + session = new SoundTriggerSession(mSoundTriggerInternal.attach(client)); } - return session; } + return new SoundTriggerSessionBinderProxy(session); + } + + private IVoiceInteractionSoundTriggerSession createSoundTriggerSessionForSelfIdentity( + IBinder client) { + Identity identity = new Identity(); + identity.uid = Process.myUid(); + identity.pid = Process.myPid(); + identity.packageName = ActivityThread.currentOpPackageName(); + return Binder.withCleanCallingIdentity(() -> { + try (SafeCloseable ignored = IdentityContext.create(identity)) { + return new SoundTriggerSession(mSoundTriggerInternal.attach(client)); + } + }); } // TODO: VI Make sure the caller is the current user or profile @@ -1334,7 +1367,11 @@ public class VoiceInteractionManagerService extends SystemService { return null; } - class SoundTriggerSession extends IVoiceInteractionSoundTriggerSession.Stub { + /** + * Implementation of SoundTriggerSession. Does not implement {@link #asBinder()} as it's + * intended to be wrapped by an {@link IVoiceInteractionSoundTriggerSession.Stub} object. + */ + private class SoundTriggerSession implements IVoiceInteractionSoundTriggerSession { final SoundTriggerInternal.Session mSession; private IHotwordRecognitionStatusCallback mSessionExternalCallback; private IRecognitionStatusCallback mSessionInternalCallback; @@ -1481,6 +1518,12 @@ public class VoiceInteractionManagerService extends SystemService { } } + @Override + public IBinder asBinder() { + throw new UnsupportedOperationException( + "This object isn't intended to be used as a Binder."); + } + private int unloadKeyphraseModel(int keyphraseId) { final long caller = Binder.clearCallingIdentity(); try { @@ -1709,22 +1752,6 @@ public class VoiceInteractionManagerService extends SystemService { } mSoundTriggerInternal.dump(fd, pw, args); - - // Dump all sessions. - synchronized (mSessions) { - ListIterator<WeakReference<SoundTriggerSession>> iter = - mSessions.listIterator(); - while (iter.hasNext()) { - SoundTriggerSession session = iter.next().get(); - if (session != null) { - session.dump(fd, args); - } else { - // Session is obsolete, now is a good chance to remove it from the list. - iter.remove(); - } - } - } - } @Override diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7f1ea8fa9614..e03e74c7fdad 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4370,7 +4370,7 @@ public class CarrierConfigManager { new String[] {}); defaults.putBoolean(KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL, false); defaults.putBoolean(KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false); - defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, true); + defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, false); defaults.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 30 * 24 * 60 * 60); defaults.putBoolean(KEY_RCS_REQUEST_FORBIDDEN_BY_SIP_489_BOOL, false); defaults.putLong(KEY_RCS_REQUEST_RETRY_INTERVAL_MILLIS_LONG, 20 * 60 * 1000); diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index 5fb60d7599ea..6a807665a103 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -506,6 +506,8 @@ public final class NetworkRegistrationInfo implements Parcelable { } /** + * Require {@link android.Manifest.permission#ACCESS_FINE_LOCATION}, otherwise return null. + * * @return The cell information. */ @Nullable diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 6da61b712916..d745dc215f34 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -758,6 +758,11 @@ public class ServiceState implements Parcelable { * In GSM/UMTS, long format can be up to 16 characters long. * In CDMA, returns the ERI text, if set. Otherwise, returns the ONS. * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return long name of operator, null if unregistered or unknown */ public String getOperatorAlphaLong() { @@ -766,6 +771,12 @@ public class ServiceState implements Parcelable { /** * Get current registered voice network operator name in long alphanumeric format. + * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return long name of operator * @hide */ @@ -780,6 +791,11 @@ public class ServiceState implements Parcelable { * * In GSM/UMTS, short format can be up to 8 characters long. * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return short name of operator, null if unregistered or unknown */ public String getOperatorAlphaShort() { @@ -788,6 +804,12 @@ public class ServiceState implements Parcelable { /** * Get current registered voice network operator name in short alphanumeric format. + * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not have neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return short name of operator, null if unregistered or unknown * @hide */ @@ -799,6 +821,12 @@ public class ServiceState implements Parcelable { /** * Get current registered data network operator name in short alphanumeric format. + * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not have neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return short name of operator, null if unregistered or unknown * @hide */ @@ -812,6 +840,11 @@ public class ServiceState implements Parcelable { * Get current registered operator name in long alphanumeric format if * available or short otherwise. * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @see #getOperatorAlphaLong * @see #getOperatorAlphaShort * @@ -832,6 +865,11 @@ public class ServiceState implements Parcelable { * In GSM/UMTS, numeric format is 3 digit country code plus 2 or 3 digit * network code. * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return numeric format of operator, null if unregistered or unknown */ /* @@ -844,6 +882,12 @@ public class ServiceState implements Parcelable { /** * Get current registered voice network operator numeric id. + * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return numeric format of operator, null if unregistered or unknown * @hide */ @@ -854,6 +898,12 @@ public class ServiceState implements Parcelable { /** * Get current registered data network operator numeric id. + * + * Require at least {@link android.Manifest.permission#ACCESS_FINE_LOCATION} or + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. Otherwise return null if the + * caller does not hold neither {@link android.Manifest.permission#ACCESS_FINE_LOCATION} nor + * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION}. + * * @return numeric format of operator, null if unregistered or unknown * @hide */ diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 64aa299411ff..e0ab0a368a4f 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15104,8 +15104,8 @@ public class TelephonyManager { /** * Indicates that the thermal mitigation request could not power off the radio due to the device - * either being in an active voice call, device pending an emergency call, or any other state - * that would dissallow powering off of radio. + * either being in an active emergency voice call, device pending an emergency call, or any + * other state that would disallow powering off of radio. * * @hide */ diff --git a/telephony/java/android/telephony/data/QosBearerFilter.java b/telephony/java/android/telephony/data/QosBearerFilter.java index 5642549d7313..54930d0266b7 100644 --- a/telephony/java/android/telephony/data/QosBearerFilter.java +++ b/telephony/java/android/telephony/data/QosBearerFilter.java @@ -57,6 +57,12 @@ public final class QosBearerFilter implements Parcelable { public static final int QOS_PROTOCOL_UDP = android.hardware.radio.V1_6.QosProtocol.UDP; public static final int QOS_PROTOCOL_ESP = android.hardware.radio.V1_6.QosProtocol.ESP; public static final int QOS_PROTOCOL_AH = android.hardware.radio.V1_6.QosProtocol.AH; + public static final int QOS_MIN_PORT = android.hardware.radio.V1_6.QosPortRange.MIN; + /** + * Hardcoded inplace of android.hardware.radio.V1_6.QosPortRange.MAX as it + * returns -1 due to uint16_t to int conversion in java. (TODO: Fix the HAL) + */ + public static final int QOS_MAX_PORT = 65535; // android.hardware.radio.V1_6.QosPortRange.MIN; @QosProtocol private int protocol; @@ -229,6 +235,12 @@ public final class QosBearerFilter implements Parcelable { return end; } + public boolean isValid() { + return start >= QOS_MIN_PORT && start <= QOS_MAX_PORT + && end >= QOS_MIN_PORT && end <= QOS_MAX_PORT + && start <= end; + } + @Override public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeInt(start); diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CommonAssertions.kt index 3dfa31d64f8c..7e34469b8188 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CommonAssertions.kt @@ -21,6 +21,22 @@ import com.android.server.wm.flicker.FlickerTestParameter const val IME_WINDOW_TITLE = "InputMethod" +fun FlickerTestParameter.imeLayerIsAlwaysVisible(rotatesScreen: Boolean = false) { + if (rotatesScreen) { + assertLayers { + this.isVisible(IME_WINDOW_TITLE) + .then() + .isInvisible(IME_WINDOW_TITLE) + .then() + .isVisible(IME_WINDOW_TITLE) + } + } else { + assertLayers { + this.isVisible(IME_WINDOW_TITLE) + } + } +} + fun FlickerTestParameter.imeLayerBecomesVisible() { assertLayers { this.isInvisible(IME_WINDOW_TITLE) @@ -49,6 +65,22 @@ fun FlickerTestParameter.imeAppWindowIsAlwaysVisible(testApp: IAppHelper) { } } +fun FlickerTestParameter.imeWindowIsAlwaysVisible(rotatesScreen: Boolean = false) { + if (rotatesScreen) { + assertWm { + this.showsNonAppWindow(IME_WINDOW_TITLE) + .then() + .hidesNonAppWindow(IME_WINDOW_TITLE) + .then() + .showsNonAppWindow(IME_WINDOW_TITLE) + } + } else { + assertWm { + this.showsNonAppWindow(IME_WINDOW_TITLE) + } + } +} + fun FlickerTestParameter.imeWindowBecomesVisible() { assertWm { this.hidesNonAppWindow(IME_WINDOW_TITLE) @@ -65,6 +97,25 @@ fun FlickerTestParameter.imeWindowBecomesInvisible() { } } +fun FlickerTestParameter.imeAppWindowIsAlwaysVisible( + testApp: IAppHelper, + rotatesScreen: Boolean = false +) { + if (rotatesScreen) { + assertWm { + this.showsAppWindow(testApp.getPackage()) + .then() + .hidesAppWindow(testApp.getPackage()) + .then() + .showsAppWindow(testApp.getPackage()) + } + } else { + assertWm { + this.showsAppWindow(testApp.getPackage()) + } + } +} + fun FlickerTestParameter.imeAppWindowBecomesVisible(windowName: String) { assertWm { this.hidesAppWindow(windowName) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index d61422f5d3d0..b7673d5b0107 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -112,12 +112,11 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Presubmit @Test - fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible() + fun imeWindowIsAlwaysVisible() = testSpec.imeWindowIsAlwaysVisible(true) @Presubmit @Test - fun imeAppWindowBecomesVisible() = - testSpec.imeAppWindowBecomesVisible(testAppComponentName.className) + fun imeAppWindowIsAlwaysVisible() = testSpec.imeAppWindowIsAlwaysVisible(testApp, true) @Presubmit @Test @@ -135,7 +134,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { @Presubmit @Test - fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible() + fun imeLayerIsAlwaysVisible() = testSpec.imeLayerIsAlwaysVisible(true) @Presubmit @Test @@ -171,7 +170,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { repetitions = 1, supportedRotations = listOf(Surface.ROTATION_0), supportedNavigationModes = listOf( - WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY + WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY ) ) } diff --git a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java index 039ba512e95b..0c5205c848da 100644 --- a/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java +++ b/tests/PlatformCompatGating/test-rules/src/android/compat/testing/PlatformCompatChangeRule.java @@ -118,7 +118,8 @@ public class PlatformCompatChangeRule extends CoreCompatChangeRule { Manifest.permission.LOG_COMPAT_CHANGE, Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG, Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD, - Manifest.permission.READ_COMPAT_CHANGE_CONFIG); + Manifest.permission.READ_COMPAT_CHANGE_CONFIG, + Manifest.permission.INTERACT_ACROSS_USERS_FULL); } } } |